CORD GUI -- Images updated and other CSS added. CORD logo no longer goes to Home page.
Change-Id: I1f6c26dd0918b801d1c4f0b517f0dd50d2cadfb0
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/bundle/bundle.html b/apps/demo/cord-gui/src/main/webapp/app/view/bundle/bundle.html
index 9eeb8dc..8852d86 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/bundle/bundle.html
+++ b/apps/demo/cord-gui/src/main/webapp/app/view/bundle/bundle.html
@@ -15,7 +15,7 @@
</table>
</div>
<div class="main-right">
- <img src="imgs/binary.jpg">
+ <img src="imgs/bundle.jpg">
<div ng-click="showBundles()">
<h2>Available Bundles</h2>
</div>
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/common/common.css b/apps/demo/cord-gui/src/main/webapp/app/view/common/common.css
index 5974749..a3848ee 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/common/common.css
+++ b/apps/demo/cord-gui/src/main/webapp/app/view/common/common.css
@@ -142,6 +142,18 @@
fill: rgb(68, 189, 83)
}
+th.user-pic {
+ background-color: white;
+}
+th.user-pic,
+td.user-pic {
+ width: 30px;
+ padding-left: 4%;
+}
+td.user-pic img {
+ width: 25px;
+}
+
/* animation */
.fadein {
transition: all linear 0.5s;
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/home/home.css b/apps/demo/cord-gui/src/main/webapp/app/view/home/home.css
index addb453..58f07a5 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/home/home.css
+++ b/apps/demo/cord-gui/src/main/webapp/app/view/home/home.css
@@ -33,8 +33,6 @@
#home div.main-left img {
width: 100%;
- opacity: 0.8;
- box-shadow: 10px 0 12px 1px rgba(54, 136, 210, 0.25);
}
#home div.main-right div.bundle-title {
@@ -65,16 +63,3 @@
text-align: left;
padding: 2%;
}
-
-#home table.users th.user-pic {
- background-color: white;
-}
-#home table.users th.user-pic,
-#home table.users td.user-pic {
- width: 30px;
- padding-left: 4%;
-}
-#home table.users td.user-pic img {
- width: 25px;
- opacity: 0.5;
-}
\ No newline at end of file
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/home/home.html b/apps/demo/cord-gui/src/main/webapp/app/view/home/home.html
index bdab3fc..e7f8010 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/home/home.html
+++ b/apps/demo/cord-gui/src/main/webapp/app/view/home/home.html
@@ -1,13 +1,13 @@
<!-- Home page partial html -->
<div id="home" class="container">
<div class="main-left">
- <img src="/imgs/bin_ball.jpg">
+ <img src="/imgs/home.jpg">
</div>
<div class="main-right">
<div class="move-down">
<div class="bundle-title">
- <h4>Welcome {{shared.login}}!</h4>
+ <h4>Welcome Dad!</h4>
<h5>You are subscribed to the</h5>
<h3>{{bundle}}</h3>
</div>
@@ -35,7 +35,7 @@
<tr ng-repeat="user in users" class="fadein">
<td class="user-pic">
- <img ng-src="{{'/imgs/' + user.icon_id + '.png'}}">
+ <img ng-src="{{'/imgs/' + user.icon_id + '.jpg'}}">
</td>
<td>{{user.name}}</td>
<td>{{shared.userActivity[user.id]}}</td>
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/login/login.css b/apps/demo/cord-gui/src/main/webapp/app/view/login/login.css
index 3202930..f7d5f67 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/login/login.css
+++ b/apps/demo/cord-gui/src/main/webapp/app/view/login/login.css
@@ -14,9 +14,12 @@
* limitations under the License.
*/
-div#login{
- /*background: url("/imgs/login.png") no-repeat;*/
- height: 100%;
+div#login {
+ background: url("/imgs/login.jpg") no-repeat center;
+ background-size: contain;
+ position: absolute;
+ top: 3%;
+ left: 5%;
}
div#login-wrapper {
@@ -40,6 +43,8 @@
#login div.outline {
position: absolute;
border: 1px solid rgba(115, 115, 115, 0.7);
+ background-color: white;
+ opacity: .6;
top: -160px;
left: -25px;
width: 300px;
@@ -51,7 +56,7 @@
margin-left: 2.5%;
position: relative;
width: 255px;
- margin-top: 30%;
+ margin-top: 33.5%;
}
#login-form form {
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/login/login.html b/apps/demo/cord-gui/src/main/webapp/app/view/login/login.html
index 34c188d..19c5940 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/login/login.html
+++ b/apps/demo/cord-gui/src/main/webapp/app/view/login/login.html
@@ -3,12 +3,12 @@
<div id="login-wrapper">
<div id="login-form">
<div class="outline"></div>
- <h2>Subscriber Portal</h2>
- <form>
- <input ng-model="email" type="text" placeholder="email" required>
- <input ng-model="password" type="password" placeholder="password" required>
- <input ng-click="login()" type="button" value="Log In">
- </form>
+ <h2>Subscriber Portal</h2>
+ <form>
+ <input ng-model="email" type="text" placeholder="email" required>
+ <input ng-model="password" type="password" placeholder="password" required>
+ <input ng-click="login()" type="button" value="Log In">
+ </form>
</div>
</div>
</div>
\ No newline at end of file
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/login/login.js b/apps/demo/cord-gui/src/main/webapp/app/view/login/login.js
index b4d92ff..eae16d5 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/login/login.js
+++ b/apps/demo/cord-gui/src/main/webapp/app/view/login/login.js
@@ -35,12 +35,10 @@
}
$scope.login = function () {
-
if ($scope.email && $scope.password) {
getResource($scope.email);
+ $scope.shared.login = $scope.email;
}
-
- $scope.shared.login = $scope.email;
};
$log.debug('Cord Login Ctrl has been created.');
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 eab26d3..ad03110 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
@@ -43,7 +43,6 @@
#user table.user-info th,
#user table.user-form th {
text-align: left;
- background-color: #7AB6EA;
padding: 2% 1%;
}
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 ee942b2..089f5ff 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
@@ -4,10 +4,14 @@
<div class="main-left" ng-class="{family: isFamily}">
<table class="user-info">
<tr>
+ <th class="user-pic"></th>
<th>Name</th>
<th>Last Login</th>
</tr>
<tr ng-repeat="user in users" class="fadein">
+ <td class="user-pic">
+ <img ng-src="{{'/imgs/' + user.icon_id + '.jpg'}}">
+ </td>
<td>{{user.name}}</td>
<td>{{shared.userActivity[user.id]}}</td>
</tr>