Moved to SASS bootstrap and refactored
diff --git a/applications/subscriberPortal/src/app/fw/foot/foot.css b/applications/subscriberPortal/src/app/fw/foot/foot.css
deleted file mode 100644
index b8746d6..0000000
--- a/applications/subscriberPortal/src/app/fw/foot/foot.css
+++ /dev/null
@@ -1,46 +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.
- */
-
-div.foot {
- width: 100%;
- height: 30px;
- background-color: white;
- position: absolute;
- left: 0;
- right: 0;
- bottom: 0;
- margin-left: auto;
- margin-right: auto;
- z-index: 100;
- box-shadow: 0 10px 5px 10px gray;
-}
-
-.foot div {
- position: absolute;
- top: 50%;
- transform: translate(0, -50%);
- font-style: italic;
- font-size: 12px;
- color: #3C3C3C;
-}
-
-.foot div.left {
- left: 25px;
-}
-
-.foot div.right {
- right: 25px;
-}
diff --git a/applications/subscriberPortal/src/app/fw/mast/mast.css b/applications/subscriberPortal/src/app/fw/mast/mast.css
deleted file mode 100644
index b79d89e..0000000
--- a/applications/subscriberPortal/src/app/fw/mast/mast.css
+++ /dev/null
@@ -1,63 +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.
- */
-
-div.mast {
- width: 100%;
- height: 85px;
- background-color: white;
- position: relative;
- box-shadow: 0 10px 5px -7px gray;
- z-index: 100;
-}
-
-.mast div {
- position: absolute;
- top: 50%;
- transform: translate(0, -50%);
-}
-
-.mast div.left {
- left: 25px;
-}
-
-.mast div.right {
- right: 7%;
- width: 37%;
-}
-
-.mast img {
- width: 220px;
-}
-
-.mast a,
-.mast a:visited {
- text-decoration: none;
- color: #3C3C3C;
-}
-
-.mast li.logout {
- list-style-type: none;
- position: absolute;
- right: 0;
- top: 50%;
- transform: translate(0, -50%);
- font-size: 90%;
-}
-.mast li.logout:hover {
- font-weight: bold;
- list-style-type: none;
- cursor: pointer;
-}
diff --git a/applications/subscriberPortal/src/app/fw/mast/mast.html b/applications/subscriberPortal/src/app/fw/mast/mast.html
index 30bae4b..d11e66e 100644
--- a/applications/subscriberPortal/src/app/fw/mast/mast.html
+++ b/applications/subscriberPortal/src/app/fw/mast/mast.html
@@ -1,8 +1,8 @@
<!--Mast HTML-->
-<nav class="navbar navbar-default navbar-fixed-top" ng-controller="CordMastCtrl">
+<nav class="navbar navbar-default navbar-fixed-top">
<div class="container">
<div class="navbar-header">
- <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+ <button ng-if="page.curr !== 'login'" type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@@ -12,8 +12,8 @@
<img src="/imgs/logo.png">
</a>
</div>
- <div id="navbar" class="collapse navbar-collapse">
- <ul ng-show="page.curr !== 'login'" class="nav navbar-nav pull-right">
+ <div id="navbar" class="collapse navbar-collapse" close-on-route-change>
+ <ul ng-if="page.curr !== 'login'" class="nav navbar-nav pull-right">
<li ng-class="{active: page.curr === 'dashboard'}">
<a href="#/home">Home</a>
</li>
diff --git a/applications/subscriberPortal/src/app/fw/mast/mast.js b/applications/subscriberPortal/src/app/fw/mast/mast.js
index 9b27628..eb08d79 100644
--- a/applications/subscriberPortal/src/app/fw/mast/mast.js
+++ b/applications/subscriberPortal/src/app/fw/mast/mast.js
@@ -31,7 +31,19 @@
.directive('mast', function () {
return {
restrict: 'E',
- templateUrl: 'app/fw/mast/mast.html'
+ templateUrl: 'app/fw/mast/mast.html',
+ controller: 'CordMastCtrl',
+ controllerAs: ''
};
- });
+ })
+ .directive('closeOnRouteChange', function(){
+ return {
+ restrict: 'A',
+ link: function(scope, elem){
+ scope.$on('$routeChangeStart', function(next, current) {
+ elem.removeClass('in');
+ });
+ }
+ }
+ });
}());