CORD GUI -- Dashboard and login pages have new look. WIP.
Change-Id: Ib38870c8acb5f443d2aedb6580180f5457f944df
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/user/user.css b/apps/demo/cord-gui/src/main/webapp/app/view/user/user.css
index 6dcb40d..6a8f4b3 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/user/user.css
+++ b/apps/demo/cord-gui/src/main/webapp/app/view/user/user.css
@@ -112,6 +112,9 @@
width: 30%;
}
+#user td.buttons div {
+ display: inline;
+}
#user td.buttons svg {
vertical-align: middle;
}
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/user/user.html b/apps/demo/cord-gui/src/main/webapp/app/view/user/user.html
index adc672f..38aae59 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/user/user.html
+++ b/apps/demo/cord-gui/src/main/webapp/app/view/user/user.html
@@ -1,6 +1,5 @@
<!-- Users page partial html -->
<div class="container">
- <nav></nav>
<div id="user">
<div class="main-left" ng-class="{family: isFamily}">
<table class="user-info">
@@ -32,8 +31,9 @@
</tr>
<tr>
<td class="buttons">
- <icon size="20px" id="checkMark"
- ng-show="showCheck"></icon>
+ <div ng-show="showCheck">
+ <icon size="20px" id="checkMark"></icon>
+ </div>
<input type="reset" value="Cancel"
ng-click="cancelChanges(changeLevels)"
ng-disabled="changeLevels.$pristine">
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/user/user.js b/apps/demo/cord-gui/src/main/webapp/app/view/user/user.js
index 032abea..76bf16a 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/user/user.js
+++ b/apps/demo/cord-gui/src/main/webapp/app/view/user/user.js
@@ -26,7 +26,7 @@
.controller('CordUserCtrl', ['$log', '$scope', '$resource', '$timeout',
function ($log, $scope, $resource, $timeout) {
var BundleData, bundleResource;
- $scope.page = 'user';
+ $scope.page.curr = 'user';
$scope.isFamily = false;
$scope.newLevels = {};
$scope.showCheck = false;