Inserted bootstrap
diff --git a/applications/subscriberPortal/bs-config.js b/applications/subscriberPortal/bs-config.js
index c4fc07b..e7820dc 100644
--- a/applications/subscriberPortal/bs-config.js
+++ b/applications/subscriberPortal/bs-config.js
@@ -38,7 +38,11 @@
"files": [
'./src/**/*.css',
'./src/**/*.js',
- './src/**/*.json'
+ './src/**/*.json',
+ './src/**/*.html',
+ './src/**/*.jpg',
+ './src/**/*.png',
+ './src/**/*.gif'
],
"server": {
baseDir: './src',
diff --git a/applications/subscriberPortal/src/app/fw/mast/mast.html b/applications/subscriberPortal/src/app/fw/mast/mast.html
index 2ff7f94..8a8571e 100644
--- a/applications/subscriberPortal/src/app/fw/mast/mast.html
+++ b/applications/subscriberPortal/src/app/fw/mast/mast.html
@@ -1,14 +1,35 @@
<!--Mast HTML-->
-
-<div class="mast" ng-controller="CordMastCtrl">
- <div class="left">
- <img src="/imgs/logo.png">
+<nav class="navbar navbar-default navbar-fixed-top" ng-controller="CordMastCtrl">
+ <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">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="#/home">
+ <img src="/imgs/logo.png">
+ </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>
+ </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>
+ <!--<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.js b/applications/subscriberPortal/src/app/fw/nav/nav.js
index 9ba3e37..f22ca2f 100644
--- a/applications/subscriberPortal/src/app/fw/nav/nav.js
+++ b/applications/subscriberPortal/src/app/fw/nav/nav.js
@@ -15,7 +15,7 @@
*/
angular.module('cordNav', [])
- .directive('nav', function () {
+ .directive('navigation', function () {
return {
restrict: 'E',
templateUrl: 'app/fw/nav/nav.html'
diff --git a/applications/subscriberPortal/src/imgs/logo.png b/applications/subscriberPortal/src/imgs/logo.png
index f8b11df..c8b396b 100644
--- a/applications/subscriberPortal/src/imgs/logo.png
+++ b/applications/subscriberPortal/src/imgs/logo.png
Binary files differ
diff --git a/applications/subscriberPortal/src/index.html b/applications/subscriberPortal/src/index.html
index 60e83d8..3b68278 100644
--- a/applications/subscriberPortal/src/index.html
+++ b/applications/subscriberPortal/src/index.html
@@ -41,20 +41,13 @@
<script src="cord.js"></script>
<script src="app/fw/services/rest.js"></script>
<script src="app/fw/services/helpers.js"></script>
-
<script src="app/fw/mast/mast.js"></script>
<script src="app/fw/foot/foot.js"></script>
-
<script src="app/fw/nav/nav.js"></script>
-
<script src="app/fw/icon/icon.js"></script>
-
<script src="app/view/login/login.js"></script>
-
<script src="app/view/home/home.js"></script>
-
<script src="app/view/user/user.js"></script>
-
<script src="app/view/bundle/bundle.js"></script>
</head>
diff --git a/applications/subscriberPortal/src/sass/main.scss b/applications/subscriberPortal/src/sass/main.scss
index 81e4080..abe2359 100644
--- a/applications/subscriberPortal/src/sass/main.scss
+++ b/applications/subscriberPortal/src/sass/main.scss
@@ -9,3 +9,28 @@
@import '../app/view/user/user.css';
@import '../app/view/bundle/bundle.css';
+/* Sticky footer styles
+-------------------------------------------------- */
+html {
+ position: relative;
+ min-height: 100%;
+}
+body {
+ /* Margin bottom by footer height */
+ margin-bottom: 60px;
+}
+.footer {
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ /* Set the fixed height of the footer here */
+ height: 60px;
+ background-color: #f5f5f5;
+}
+
+.navbar-brand {
+ padding-top: 0;
+ img {
+ width: 130px;
+ }
+}
\ No newline at end of file
diff --git a/applications/subscriberPortal/src/style/main.css b/applications/subscriberPortal/src/style/main.css
index c7fa790..74128c0 100644
--- a/applications/subscriberPortal/src/style/main.css
+++ b/applications/subscriberPortal/src/style/main.css
@@ -6,5 +6,27 @@
@import url(../app/view/home/home.css);
@import url(../app/view/user/user.css);
@import url(../app/view/bundle/bundle.css);
+/* Sticky footer styles
+-------------------------------------------------- */
+html {
+ position: relative;
+ min-height: 100%; }
-/*# sourceMappingURL=data:application/json;base64,ewoJInZlcnNpb24iOiAzLAoJImZpbGUiOiAic3JjL3N0eWxlL21haW4uY3NzIiwKCSJzb3VyY2VzIjogWwoJCSJzcmMvc2Fzcy9tYWluLnNjc3MiCgldLAoJIm1hcHBpbmdzIjogIkFBQUEsT0FBTyxDQUFQLGtDQUFPO0FBRVAsT0FBTyxDQUFQLDRCQUFPO0FBQ1AsT0FBTyxDQUFQLDBCQUFPO0FBQ1AsT0FBTyxDQUFQLDRCQUFPO0FBRVAsT0FBTyxDQUFQLGdDQUFPO0FBQ1AsT0FBTyxDQUFQLDhCQUFPO0FBQ1AsT0FBTyxDQUFQLDhCQUFPO0FBQ1AsT0FBTyxDQUFQLGtDQUFPIiwKCSJuYW1lcyI6IFtdCn0= */
\ No newline at end of file
+body {
+ /* Margin bottom by footer height */
+ margin-bottom: 60px; }
+
+.footer {
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ /* Set the fixed height of the footer here */
+ height: 60px;
+ background-color: #f5f5f5; }
+
+.navbar-brand {
+ padding-top: 0; }
+ .navbar-brand img {
+ width: 130px; }
+
+/*# sourceMappingURL=data:application/json;base64,ewoJInZlcnNpb24iOiAzLAoJImZpbGUiOiAic3JjL3N0eWxlL21haW4uY3NzIiwKCSJzb3VyY2VzIjogWwoJCSJzcmMvc2Fzcy9tYWluLnNjc3MiCgldLAoJIm1hcHBpbmdzIjogIkFBQUEsT0FBTyxDQUFQLGtDQUFPO0FBRVAsT0FBTyxDQUFQLDRCQUFPO0FBQ1AsT0FBTyxDQUFQLDBCQUFPO0FBQ1AsT0FBTyxDQUFQLDRCQUFPO0FBRVAsT0FBTyxDQUFQLGdDQUFPO0FBQ1AsT0FBTyxDQUFQLDhCQUFPO0FBQ1AsT0FBTyxDQUFQLDhCQUFPO0FBQ1AsT0FBTyxDQUFQLGtDQUFPO0FBRVA7cURBQ3FEO0FBQ3JELElBQUksQ0FBQztFQUNILFFBQVEsRUFBRSxRQUFTO0VBQ25CLFVBQVUsRUFBRSxJQUFLLEdBQ2xCOztBQUNELElBQUksQ0FBQztFQUNILG9DQUFvQztFQUNwQyxhQUFhLEVBQUUsSUFBSyxHQUNyQjs7QUFDRCxPQUFPLENBQUM7RUFDTixRQUFRLEVBQUUsUUFBUztFQUNuQixNQUFNLEVBQUUsQ0FBRTtFQUNWLEtBQUssRUFBRSxJQUFLO0VBQ1osNkNBQTZDO0VBQzdDLE1BQU0sRUFBRSxJQUFLO0VBQ2IsZ0JBQWdCLEVBQUUsT0FBUSxHQUMzQjs7QUFFRCxhQUFhLENBQUM7RUFDWixXQUFXLEVBQUUsQ0FBRSxHQUloQjtFQUxELGFBQWEsQ0FFWCxHQUFHLENBQUM7SUFDRixLQUFLLEVBQUUsS0FBTSxHQUNkIiwKCSJuYW1lcyI6IFtdCn0= */
\ No newline at end of file
