mirror
/
facilmap
kopia lustrzana https://github.com/FacilMap/facilmap
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Migrate "Save View" and "Manage Views" dialogs to bootstrap

before-leaflet
Candid Dauth 2016-10-04 14:21:20 +03:00
rodzic 768d0fab8f
commit a2c395e0a2
4 zmienionych plików z 98 dodań i 72 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
frontend/app/app.css
Wyświetl plik

@ -162,15 +162,6 @@ table th.sort .ui-icon {
vertical-align: middle;
}
table td.button {
width: 1px;
white-space: nowrap;
}
table td.button button {
white-space: nowrap;
}
table.border td, table.border th {
border: 1px solid #ddd;
padding: .5em;

23
frontend/app/map/views/manage-views.html
Wyświetl plik

@ -1,10 +1,21 @@
<p class="error" ng-hide="!error">{{error}}</p>
<table>
<div class="modal-header">
<button class="close" ng-click="$dismiss()"><span aria-hidden="true">&times;</span></button>
<h3 class="modal-title">Manage Views</h3>
</div>
<div class="modal-body">
<div uib-alert class="alert-danger" ng-if="error">{{error}}</div>
<table class="table table-striped">
<tbody>
<tr ng-class="{selected: view.id == padData.defaultView.id}" ng-repeat="view in views">
<tr ng-class="{success: view.id == padData.defaultView.id}" ng-repeat="view in views">
<td><a href="javascript:" ng-click="display(view)">{{view.name}}</a></td>
<td class="button"><button ng-hide="view.id == padData.defaultView.id" ng-click="makeDefault(view)">Make default</button></td>
<td class="button"><button ng-click="delete(view)">Delete</button></td>
<td class="text-right">
<button ng-hide="view.id == padData.defaultView.id" ng-click="makeDefault(view)" class="btn btn-default">Make default</button>
<button ng-click="delete(view)" class="btn btn-default">Delete</button>
</td>
</tr>
</tbody>
</table>
</table>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" ng-click="$dismiss()">Close</button>
</div>

29
frontend/app/map/views/save-view.html
Wyświetl plik

@ -1,11 +1,18 @@
<form>
<p class="error" ng-hide="!error">{{error}}</p>
<dl>
<dt><label for="save-view-name">Name</label></dt>
<dd><input id="save-view-name" ng-model="name"></dd>
</dl>
<div>
<button type="submit" ng-click="save(false)">Save</button>
<button ng-click="save(true)">Save and make default view</button>
</div>
</form>
<div class="modal-header">
<button class="close" ng-click="$dismiss()"><span aria-hidden="true">&times;</span></button>
<h3 class="modal-title">Save current view</h3>
</div>
<div class="modal-body">
<form class="form-horizontal">
<div uib-alert class="alert-danger" ng-if="error">{{error}}</div>
<div. class="form-group">
<label for="save-view-name" class="col-sm-3 control-label">Name</label>
<div class="col-sm-9"><input id="save-view-name" ng-model="name" class="form-control"></div>
</div.>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" ng-click="$dismiss()">Cancel</button>
<button type="button" class="btn btn-primary" ng-click="save(false)">Save</button>
<button type="button" class="btn btn-success" ng-click="save(true)">Save and make default view</button>
</div>

109
frontend/app/map/views/views.js
Wyświetl plik

@ -1,56 +1,29 @@
(function(fp, $, ng, undefined) {
fp.app.factory("fpMapViews", function(fpDialogs) {
fp.app.factory("fpMapViews", function($uibModal) {
return function(map) {
var ret = {
saveView : function() {
var scope = map.socket.$new();
scope.name = null;
scope.save = function(makeDefault) {
var view = map.getCurrentView();
view.name = scope.name;
map.socket.emit("addView", view, function(err, view) {
if(err)
return scope.error = err;
if(makeDefault) {
map.socket.emit("editPad", { defaultViewId: view.id }, function(err) {
if(err)
return scope.error = err;
scope.dialog.close();
});
}
else
scope.dialog.close();
});
};
scope.dialog = fpDialogs.open("map/views/save-view.html", scope, "Save current view");
$uibModal.open({
templateUrl: "map/views/save-view.html",
scope: map.socket,
controller: "fpMapViewsSaveCtrl",
size: "lg",
resolve: {
map: function() { return map; }
}
});
},
manageViews : function() {
var scope = map.socket.$new();
scope.display = function(view) {
};
scope.makeDefault = function(view) {
map.socket.emit("editPad", { defaultViewId: view.id }, function(err) {
if(err)
scope.error = err;
});
};
scope['delete'] = function(view) {
map.socket.emit("deleteView", { id: view.id }, function(err) {
if(err)
scope.error = err;
});
};
scope.dialog = fpDialogs.open("map/views/manage-views.html", scope, "Manage views");
$uibModal.open({
templateUrl: "map/views/manage-views.html",
scope: map.socket,
controller: "fpMapViewsManageCtrl",
size: "lg",
resolve: {
map: function() { return map; }
}
});
}
};
@ -58,4 +31,48 @@
};
});
fp.app.controller("fpMapViewsSaveCtrl", function($scope, map) {
$scope.name = null;
$scope.save = function(makeDefault) {
var view = map.getCurrentView();
view.name = $scope.name;
map.socket.emit("addView", view, function(err, view) {
if(err)
return $scope.error = err;
if(makeDefault) {
map.socket.emit("editPad", { defaultViewId: view.id }, function(err) {
if(err)
return $scope.error = err;
$scope.$close();
});
}
else
$scope.$close();
});
};
});
fp.app.controller("fpMapViewsManageCtrl", function($scope, map) {
$scope.display = function(view) {
};
$scope.makeDefault = function(view) {
map.socket.emit("editPad", { defaultViewId: view.id }, function(err) {
if(err)
$scope.error = err;
});
};
$scope['delete'] = function(view) {
map.socket.emit("deleteView", { id: view.id }, function(err) {
if(err)
$scope.error = err;
});
};
});
})(FacilPad, jQuery, angular);