ONOS-1933 - CORD-GUI -- Basic login page layout created, skeleton of mast head and footer created.
Change-Id: Ifca7a70e9063cd10678426e81bffba3801576cf4
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js b/apps/demo/cord-gui/src/main/webapp/app/fw/foot/foot.css
similarity index 68%
copy from apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js
copy to apps/demo/cord-gui/src/main/webapp/app/fw/foot/foot.css
index 3fb2f3b..193e4c5 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js
+++ b/apps/demo/cord-gui/src/main/webapp/app/fw/foot/foot.css
@@ -14,11 +14,24 @@
* limitations under the License.
*/
-(function () {
- 'use strict';
+div.foot {
+ width: 100%;
+ height: 20px;
+ background-color: gray;
+ position: absolute;
+ bottom: 0;
+}
- angular.module('cordSub', [])
- .controller('CordSubCtrl', ['$log', function ($log) {
- $log.debug('Cord Sub Ctrl has been created.');
- }]);
-}());
+.foot div {
+ position: absolute;
+ top: 50%;
+ transform: translate(0, -50%);
+}
+
+.foot div.left {
+ left: 25px;
+}
+
+.foot div.right {
+ right: 25px;
+}
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.html b/apps/demo/cord-gui/src/main/webapp/app/fw/foot/foot.html
similarity index 80%
copy from apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.html
copy to apps/demo/cord-gui/src/main/webapp/app/fw/foot/foot.html
index c56616a..4c09fd9 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.html
+++ b/apps/demo/cord-gui/src/main/webapp/app/fw/foot/foot.html
@@ -1,4 +1,3 @@
-<!DOCTYPE html>
<!--
~ Copyright 2015 Open Networking Laboratory
~
@@ -15,13 +14,12 @@
~ limitations under the License.
-->
-<html>
-<head lang="en">
- <meta charset="UTF-8">
- <title></title>
-</head>
-<body>
-<h2>Subscriptions Page</h2>
+<div class="foot">
+ <div class="left">
-</body>
-</html>
\ No newline at end of file
+ </div>
+
+ <div class="right">
+
+ </div>
+</div>
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js b/apps/demo/cord-gui/src/main/webapp/app/fw/foot/foot.js
similarity index 74%
copy from apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js
copy to apps/demo/cord-gui/src/main/webapp/app/fw/foot/foot.js
index 3fb2f3b..fdaabb8 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js
+++ b/apps/demo/cord-gui/src/main/webapp/app/fw/foot/foot.js
@@ -14,11 +14,10 @@
* limitations under the License.
*/
-(function () {
- 'use strict';
-
- angular.module('cordSub', [])
- .controller('CordSubCtrl', ['$log', function ($log) {
- $log.debug('Cord Sub Ctrl has been created.');
- }]);
-}());
+angular.module('cordFoot', [])
+ .directive('foot', function () {
+ return {
+ restrict: 'E',
+ templateUrl: 'app/fw/foot/foot.html'
+ };
+ });
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js b/apps/demo/cord-gui/src/main/webapp/app/fw/mast/mast.css
similarity index 67%
copy from apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js
copy to apps/demo/cord-gui/src/main/webapp/app/fw/mast/mast.css
index 3fb2f3b..4eb917f 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js
+++ b/apps/demo/cord-gui/src/main/webapp/app/fw/mast/mast.css
@@ -14,11 +14,24 @@
* limitations under the License.
*/
-(function () {
- 'use strict';
+div.mast {
+ width: 100%;
+ height: 50px;
+ background-color: gray;
+ position: relative;
+ margin-bottom: 2%;
+}
- angular.module('cordSub', [])
- .controller('CordSubCtrl', ['$log', function ($log) {
- $log.debug('Cord Sub Ctrl has been created.');
- }]);
-}());
+.mast div {
+ position: absolute;
+ top: 50%;
+ transform: translate(0, -50%);
+}
+
+.mast div.left {
+ left: 25px;
+}
+
+.mast div.right {
+ right: 25px;
+}
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.html b/apps/demo/cord-gui/src/main/webapp/app/fw/mast/mast.html
similarity index 80%
copy from apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.html
copy to apps/demo/cord-gui/src/main/webapp/app/fw/mast/mast.html
index c56616a..a6aae78 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.html
+++ b/apps/demo/cord-gui/src/main/webapp/app/fw/mast/mast.html
@@ -1,4 +1,3 @@
-<!DOCTYPE html>
<!--
~ Copyright 2015 Open Networking Laboratory
~
@@ -15,13 +14,14 @@
~ limitations under the License.
-->
-<html>
-<head lang="en">
- <meta charset="UTF-8">
- <title></title>
-</head>
-<body>
-<h2>Subscriptions Page</h2>
+<!--Mast HTML-->
-</body>
-</html>
\ No newline at end of file
+<div class="mast">
+ <div class="left">
+ <h1>CORD</h1>
+ </div>
+
+ <div class="right">
+
+ </div>
+</div>
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js b/apps/demo/cord-gui/src/main/webapp/app/fw/mast/mast.js
similarity index 74%
rename from apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js
rename to apps/demo/cord-gui/src/main/webapp/app/fw/mast/mast.js
index 3fb2f3b..4ffb64d 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js
+++ b/apps/demo/cord-gui/src/main/webapp/app/fw/mast/mast.js
@@ -14,11 +14,10 @@
* limitations under the License.
*/
-(function () {
- 'use strict';
-
- angular.module('cordSub', [])
- .controller('CordSubCtrl', ['$log', function ($log) {
- $log.debug('Cord Sub Ctrl has been created.');
- }]);
-}());
+angular.module('cordMast', [])
+ .directive('mast', function () {
+ return {
+ restrict: 'E',
+ templateUrl: 'app/fw/mast/mast.html'
+ };
+ });
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.html b/apps/demo/cord-gui/src/main/webapp/app/view/bundle/bundle.html
similarity index 95%
rename from apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.html
rename to apps/demo/cord-gui/src/main/webapp/app/view/bundle/bundle.html
index c56616a..06dbbbd 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.html
+++ b/apps/demo/cord-gui/src/main/webapp/app/view/bundle/bundle.html
@@ -21,7 +21,7 @@
<title></title>
</head>
<body>
-<h2>Subscriptions Page</h2>
+<h2>Subscriber Bundle</h2>
</body>
</html>
\ No newline at end of file
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js b/apps/demo/cord-gui/src/main/webapp/app/view/bundle/bundle.js
similarity index 72%
copy from apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js
copy to apps/demo/cord-gui/src/main/webapp/app/view/bundle/bundle.js
index 3fb2f3b..d4e0403 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js
+++ b/apps/demo/cord-gui/src/main/webapp/app/view/bundle/bundle.js
@@ -17,8 +17,10 @@
(function () {
'use strict';
- angular.module('cordSub', [])
- .controller('CordSubCtrl', ['$log', function ($log) {
- $log.debug('Cord Sub Ctrl has been created.');
+ angular.module('cordBundle', [])
+ .controller('CordBundleCtrl', ['$log', function ($log) {
+ $log.debug('Cord Bundle Ctrl has been created.');
}]);
+
+ // can have a directive here that uses templateUrl for editable and readonly
}());
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js b/apps/demo/cord-gui/src/main/webapp/app/view/common/common.css
similarity index 71%
copy from apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js
copy to apps/demo/cord-gui/src/main/webapp/app/view/common/common.css
index 3fb2f3b..a780a75 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js
+++ b/apps/demo/cord-gui/src/main/webapp/app/view/common/common.css
@@ -14,11 +14,15 @@
* limitations under the License.
*/
-(function () {
- 'use strict';
+head, body, footer, h1, h2, h3, h4, h5, h6, p, div, a {
+ padding: 0;
+ margin: 0;
+}
- angular.module('cordSub', [])
- .controller('CordSubCtrl', ['$log', function ($log) {
- $log.debug('Cord Sub Ctrl has been created.');
- }]);
-}());
+h1, h2, h3, h4, h5, h6, p, a {
+ font-family: "Lucida Grande", "Droid Sans", Arial, Helvetica, sans-serif;
+}
+
+#view h2 {
+ text-align: center;
+}
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 2a85e83..b535e50 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
@@ -21,7 +21,7 @@
<title></title>
</head>
<body>
-<h2>Home Page</h2>
+<h2>Dashboard</h2>
</body>
</html>
\ No newline at end of file
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js b/apps/demo/cord-gui/src/main/webapp/app/view/login/login.css
similarity index 74%
copy from apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js
copy to apps/demo/cord-gui/src/main/webapp/app/view/login/login.css
index 3fb2f3b..a23c612 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/sub/sub.js
+++ b/apps/demo/cord-gui/src/main/webapp/app/view/login/login.css
@@ -14,11 +14,15 @@
* limitations under the License.
*/
-(function () {
- 'use strict';
+#login-header h2 {
+ margin: 1%;
+}
- angular.module('cordSub', [])
- .controller('CordSubCtrl', ['$log', function ($log) {
- $log.debug('Cord Sub Ctrl has been created.');
- }]);
-}());
+div#login-form {
+ width: 135px;
+ margin: 0 auto;
+}
+
+#login-form form {
+ line-height: 150%;
+}
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 337fb0f..399779d 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
@@ -21,10 +21,19 @@
<title></title>
</head>
<body>
-<h2>Login Page</h2>
-<p>Hooray!</p>
-<br>
-<a href="#/home">Click to login</a>
+<div id="login-header">
+ <h2>Login to Subscriber Portal</h2>
+</div>
+
+<div id="login-form">
+ <form>
+ <input type="text" placeholder="email">
+ <br>
+ <input type="password" placeholder="password">
+ <br>
+ <a href="#/home"><input type="submit" value="Submit"></a>
+ </form>
+</div>
</body>
</html>
\ No newline at end of file
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 6cbafea..a90e701 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
@@ -21,7 +21,7 @@
<title></title>
</head>
<body>
-<h2>Users Page</h2>
+<h2>Users</h2>
</body>
</html>
\ No newline at end of file
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 1dcce0a..12c2930 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
@@ -21,4 +21,6 @@
.controller('CordUserCtrl', ['$log', function ($log) {
$log.debug('Cord User Ctrl has been created.');
}]);
+
+ // can have a directive here that uses templateUrl for editable and readonly
}());