Nav and footer moved to bootstrap
diff --git a/applications/subscriberPortal/src/app/fw/foot/foot.html b/applications/subscriberPortal/src/app/fw/foot/foot.html
index ac21269..b8a7f62 100644
--- a/applications/subscriberPortal/src/app/fw/foot/foot.html
+++ b/applications/subscriberPortal/src/app/fw/foot/foot.html
@@ -1,10 +1,8 @@
<!--Foot partial html-->
-<div class="foot">
- <div class="left">
-
- </div>
-
- <div class="right">
- © ONOS Project. All rights reserved.
+<div class="footer">
+ <div class="container">
+ <div class="col-xs-12 text-right">
+ © CORD Project. All rights reserved.
+ </div>
</div>
</div>
diff --git a/applications/subscriberPortal/src/app/fw/mast/mast.html b/applications/subscriberPortal/src/app/fw/mast/mast.html
index 8a8571e..30bae4b 100644
--- a/applications/subscriberPortal/src/app/fw/mast/mast.html
+++ b/applications/subscriberPortal/src/app/fw/mast/mast.html
@@ -13,23 +13,20 @@
</a>
</div>
<div id="navbar" class="collapse navbar-collapse">
- <ul class="nav navbar-nav">
- <li class="active"><a href="#/">Home</a></li>
- <li><a href="#/about">About</a></li>
- <li><a href="#/contact">Contact</a></li>
+ <ul ng-show="page.curr !== 'login'" class="nav navbar-nav pull-right">
+ <li ng-class="{active: page.curr === 'dashboard'}">
+ <a href="#/home">Home</a>
+ </li>
+ <li ng-class="{active: page.curr === 'user'}">
+ <a href="#/user">User</a>
+ </li>
+ <li ng-class="{active: page.curr === 'bundle'}">
+ <a href="#/bundle">Bundle</a>
+ </li>
+ <li ng-click="logout()">
+ <a href="#/contact">Logout</a>
+ </li>
</ul>
</div><!--/.nav-collapse -->
</div>
</nav>
-<!--<div class="mast" ng-controller="CordMastCtrl">-->
- <!--<div class="left">-->
- <!--<img src="/imgs/logo.png">-->
- <!--</div>-->
-
- <!--<div class="right">-->
- <!--<nav ng-show="page.curr !== 'login'"></nav>-->
- <!--<li class="logout"-->
- <!--ng-show="page.curr !== 'login'"-->
- <!--ng-click="logout()">LOGOUT</li>-->
- <!--</div>-->
-<!--</div>-->
diff --git a/applications/subscriberPortal/src/app/fw/nav/nav.css b/applications/subscriberPortal/src/app/fw/nav/nav.css
deleted file mode 100644
index 464f95b..0000000
--- a/applications/subscriberPortal/src/app/fw/nav/nav.css
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-.nav ul {
- display: table;
- table-layout: fixed;
- list-style-type: none;
- width: 80%;
-}
-
-.nav li {
- padding: 2.5% 0;
- color: #3C3C3C;
-}
-.nav li:hover {
- border-bottom: 2px solid #CE5650;
- color: black;
-}
-.nav li.selected {
- font-weight: bolder;
- color: #3C3C3C;
- letter-spacing: 0.03em;
- border-bottom: 2px solid #CE5650;
-}
-
-.nav a,
-.nav a:visited {
- display: table-cell;
- text-align: center;
- text-decoration: none;
- color: black;
-}
diff --git a/applications/subscriberPortal/src/app/fw/nav/nav.html b/applications/subscriberPortal/src/app/fw/nav/nav.html
deleted file mode 100644
index d87f961..0000000
--- a/applications/subscriberPortal/src/app/fw/nav/nav.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--Nav HTML-->
-<div class="nav">
- <ul>
- <a href="#/home">
- <li ng-class="{selected: page.curr === 'dashboard'}"
- ng-click="$route.reload()">Home</li>
- </a>
- <a href="#/user">
- <li ng-class="{selected: page.curr === 'user'}"
- ng-click="$route.reload()">Users</li>
- </a>
- <a href="#/bundle">
- <li ng-class="{selected: page.curr === 'bundle'}"
- ng-click="$route.reload()">Bundles</li>
- </a>
- </ul>
-</div>
diff --git a/applications/subscriberPortal/src/app/fw/nav/nav.js b/applications/subscriberPortal/src/app/fw/nav/nav.js
deleted file mode 100644
index f22ca2f..0000000
--- a/applications/subscriberPortal/src/app/fw/nav/nav.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-angular.module('cordNav', [])
- .directive('navigation', function () {
- return {
- restrict: 'E',
- templateUrl: 'app/fw/nav/nav.html'
- };
- });