From a2c395e0a23aa0a1c3db95062d63ac4e048c3551 Mon Sep 17 00:00:00 2001
From: Candid Dauth <cdauth@cdauth.eu>
Date: Tue, 4 Oct 2016 14:21:20 +0300
Subject: [PATCH] Migrate "Save View" and "Manage Views" dialogs to bootstrap

---
 frontend/app/app.css                     |   9 --
 frontend/app/map/views/manage-views.html |  23 +++--
 frontend/app/map/views/save-view.html    |  29 +++---
 frontend/app/map/views/views.js          | 109 +++++++++++++----------
 4 files changed, 98 insertions(+), 72 deletions(-)

diff --git a/frontend/app/app.css b/frontend/app/app.css
index 8a114cef..841607f8 100644
--- a/frontend/app/app.css
+++ b/frontend/app/app.css
@@ -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;
diff --git a/frontend/app/map/views/manage-views.html b/frontend/app/map/views/manage-views.html
index 5b2d5227..39da9708 100644
--- a/frontend/app/map/views/manage-views.html
+++ b/frontend/app/map/views/manage-views.html
@@ -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>
\ No newline at end of file
+	</table>
+</div>
+<div class="modal-footer">
+	<button type="button" class="btn btn-default" ng-click="$dismiss()">Close</button>
+</div>
\ No newline at end of file
diff --git a/frontend/app/map/views/save-view.html b/frontend/app/map/views/save-view.html
index fdce94af..8f1ba8ac 100644
--- a/frontend/app/map/views/save-view.html
+++ b/frontend/app/map/views/save-view.html
@@ -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>
\ No newline at end of file
+<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>
\ No newline at end of file
diff --git a/frontend/app/map/views/views.js b/frontend/app/map/views/views.js
index 0a3bed3e..e789b631 100644
--- a/frontend/app/map/views/views.js
+++ b/frontend/app/map/views/views.js
@@ -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);
\ No newline at end of file