Nav and footer moved to bootstrap
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>-->