Bri Prebilic Cole

ONOS-1933 - CORD-GUI -- Basic login page layout created, skeleton of mast head and footer created.

Change-Id: Ifca7a70e9063cd10678426e81bffba3801576cf4
1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +div.foot {
18 + width: 100%;
19 + height: 20px;
20 + background-color: gray;
21 + position: absolute;
22 + bottom: 0;
23 +}
24 +
25 +.foot div {
26 + position: absolute;
27 + top: 50%;
28 + transform: translate(0, -50%);
29 +}
30 +
31 +.foot div.left {
32 + left: 25px;
33 +}
34 +
35 +.foot div.right {
36 + right: 25px;
37 +}
1 +<!--
2 + ~ Copyright 2015 Open Networking Laboratory
3 + ~
4 + ~ Licensed under the Apache License, Version 2.0 (the "License");
5 + ~ you may not use this file except in compliance with the License.
6 + ~ You may obtain a copy of the License at
7 + ~
8 + ~ http://www.apache.org/licenses/LICENSE-2.0
9 + ~
10 + ~ Unless required by applicable law or agreed to in writing, software
11 + ~ distributed under the License is distributed on an "AS IS" BASIS,
12 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + ~ See the License for the specific language governing permissions and
14 + ~ limitations under the License.
15 + -->
16 +
17 +<div class="foot">
18 + <div class="left">
19 +
20 + </div>
21 +
22 + <div class="right">
23 +
24 + </div>
25 +</div>
1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +angular.module('cordFoot', [])
18 + .directive('foot', function () {
19 + return {
20 + restrict: 'E',
21 + templateUrl: 'app/fw/foot/foot.html'
22 + };
23 + });
1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +div.mast {
18 + width: 100%;
19 + height: 50px;
20 + background-color: gray;
21 + position: relative;
22 + margin-bottom: 2%;
23 +}
24 +
25 +.mast div {
26 + position: absolute;
27 + top: 50%;
28 + transform: translate(0, -50%);
29 +}
30 +
31 +.mast div.left {
32 + left: 25px;
33 +}
34 +
35 +.mast div.right {
36 + right: 25px;
37 +}
1 +<!--
2 + ~ Copyright 2015 Open Networking Laboratory
3 + ~
4 + ~ Licensed under the Apache License, Version 2.0 (the "License");
5 + ~ you may not use this file except in compliance with the License.
6 + ~ You may obtain a copy of the License at
7 + ~
8 + ~ http://www.apache.org/licenses/LICENSE-2.0
9 + ~
10 + ~ Unless required by applicable law or agreed to in writing, software
11 + ~ distributed under the License is distributed on an "AS IS" BASIS,
12 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + ~ See the License for the specific language governing permissions and
14 + ~ limitations under the License.
15 + -->
16 +
17 +<!--Mast HTML-->
18 +
19 +<div class="mast">
20 + <div class="left">
21 + <h1>CORD</h1>
22 + </div>
23 +
24 + <div class="right">
25 +
26 + </div>
27 +</div>
1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +angular.module('cordMast', [])
18 + .directive('mast', function () {
19 + return {
20 + restrict: 'E',
21 + templateUrl: 'app/fw/mast/mast.html'
22 + };
23 + });
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 <title></title> 21 <title></title>
22 </head> 22 </head>
23 <body> 23 <body>
24 -<h2>Subscriptions Page</h2> 24 +<h2>Subscriber Bundle</h2>
25 25
26 </body> 26 </body>
27 </html> 27 </html>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -17,8 +17,10 @@ ...@@ -17,8 +17,10 @@
17 (function () { 17 (function () {
18 'use strict'; 18 'use strict';
19 19
20 - angular.module('cordSub', []) 20 + angular.module('cordBundle', [])
21 - .controller('CordSubCtrl', ['$log', function ($log) { 21 + .controller('CordBundleCtrl', ['$log', function ($log) {
22 - $log.debug('Cord Sub Ctrl has been created.'); 22 + $log.debug('Cord Bundle Ctrl has been created.');
23 }]); 23 }]);
24 +
25 + // can have a directive here that uses templateUrl for editable and readonly
24 }()); 26 }());
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -h1, h2, h3, h4, h5, h6, p, div, a { 17 +head, body, footer, h1, h2, h3, h4, h5, h6, p, div, a {
18 padding: 0; 18 padding: 0;
19 margin: 0; 19 margin: 0;
20 } 20 }
...@@ -22,3 +22,7 @@ h1, h2, h3, h4, h5, h6, p, div, a { ...@@ -22,3 +22,7 @@ h1, h2, h3, h4, h5, h6, p, div, a {
22 h1, h2, h3, h4, h5, h6, p, a { 22 h1, h2, h3, h4, h5, h6, p, a {
23 font-family: "Lucida Grande", "Droid Sans", Arial, Helvetica, sans-serif; 23 font-family: "Lucida Grande", "Droid Sans", Arial, Helvetica, sans-serif;
24 } 24 }
25 +
26 +#view h2 {
27 + text-align: center;
28 +}
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 <title></title> 21 <title></title>
22 </head> 22 </head>
23 <body> 23 <body>
24 -<h2>Home Page</h2> 24 +<h2>Dashboard</h2>
25 25
26 </body> 26 </body>
27 </html> 27 </html>
...\ No newline at end of file ...\ No newline at end of file
......
1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +#login-header h2 {
18 + margin: 1%;
19 +}
20 +
21 +div#login-form {
22 + width: 135px;
23 + margin: 0 auto;
24 +}
25 +
26 +#login-form form {
27 + line-height: 150%;
28 +}
...@@ -21,10 +21,19 @@ ...@@ -21,10 +21,19 @@
21 <title></title> 21 <title></title>
22 </head> 22 </head>
23 <body> 23 <body>
24 -<h2>Login Page</h2> 24 +<div id="login-header">
25 -<p>Hooray!</p> 25 + <h2>Login to Subscriber Portal</h2>
26 -<br> 26 +</div>
27 -<a href="#/home">Click to login</a> 27 +
28 +<div id="login-form">
29 + <form>
30 + <input type="text" placeholder="email">
31 + <br>
32 + <input type="password" placeholder="password">
33 + <br>
34 + <a href="#/home"><input type="submit" value="Submit"></a>
35 + </form>
36 +</div>
28 37
29 </body> 38 </body>
30 </html> 39 </html>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 <title></title> 21 <title></title>
22 </head> 22 </head>
23 <body> 23 <body>
24 -<h2>Users Page</h2> 24 +<h2>Users</h2>
25 25
26 </body> 26 </body>
27 </html> 27 </html>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -21,4 +21,6 @@ ...@@ -21,4 +21,6 @@
21 .controller('CordUserCtrl', ['$log', function ($log) { 21 .controller('CordUserCtrl', ['$log', function ($log) {
22 $log.debug('Cord User Ctrl has been created.'); 22 $log.debug('Cord User Ctrl has been created.');
23 }]); 23 }]);
24 +
25 + // can have a directive here that uses templateUrl for editable and readonly
24 }()); 26 }());
......
...@@ -18,13 +18,15 @@ ...@@ -18,13 +18,15 @@
18 'use strict'; 18 'use strict';
19 19
20 var modules = [ 20 var modules = [
21 - 'ngRoute' 21 + 'ngRoute',
22 + 'cordMast',
23 + 'cordFoot'
22 ], 24 ],
23 viewIds = [ 25 viewIds = [
24 'login', 26 'login',
25 'home', 27 'home',
26 'user', 28 'user',
27 - 'sub' 29 + 'bundle'
28 ], 30 ],
29 viewDependencies = [], 31 viewDependencies = [],
30 dependencies; 32 dependencies;
......
...@@ -23,23 +23,32 @@ ...@@ -23,23 +23,32 @@
23 23
24 <script src="tp/angular.js"></script> 24 <script src="tp/angular.js"></script>
25 <script src="tp/angular-route.js"></script> 25 <script src="tp/angular-route.js"></script>
26 + <script src="tp/angular-animate.js"></script>
26 <script src="tp/jquery-2.1.4.js"></script> 27 <script src="tp/jquery-2.1.4.js"></script>
27 28
28 <script src="cord.js"></script> 29 <script src="cord.js"></script>
29 - <link rel="stylesheet" href="common.css"> 30 + <link rel="stylesheet" href="app/view/common/common.css">
31 +
32 + <script src="app/fw/mast/mast.js"></script>
33 + <link rel="stylesheet" href="app/fw/mast/mast.css">
34 + <script src="app/fw/foot/foot.js"></script>
35 + <link rel="stylesheet" href="app/fw/foot/foot.css">
30 36
31 <script src="app/view/login/login.js"></script> 37 <script src="app/view/login/login.js"></script>
38 + <link rel="stylesheet" href="app/view/login/login.css">
32 39
33 <script src="app/view/home/home.js"></script> 40 <script src="app/view/home/home.js"></script>
34 41
35 <script src="app/view/user/user.js"></script> 42 <script src="app/view/user/user.js"></script>
36 43
37 - <script src="app/view/sub/sub.js"></script> 44 + <script src="app/view/bundle/bundle.js"></script>
38 </head> 45 </head>
39 <body ng-app="cordGui"> 46 <body ng-app="cordGui">
40 <div id="frame" ng-controller="CordCtrl as cordCtrl"></div> 47 <div id="frame" ng-controller="CordCtrl as cordCtrl"></div>
41 48
49 +<mast></mast>
42 <div id="view" ng-view></div> 50 <div id="view" ng-view></div>
51 +<foot></foot>
43 52
44 </body> 53 </body>
45 </html> 54 </html>
......
This diff could not be displayed because it is too large.