Merge pull request #160 from colkito/feature/collapse-header-change-page

added a rootScope to handle the header bar visibility
This commit is contained in:
Gustavo Maximiliano Cortez 2014-01-27 11:12:01 -08:00
commit feeb30583d
3 changed files with 7 additions and 7 deletions

View File

@ -52,5 +52,6 @@ angular.module('insight')
//Change page title, based on Route information
$rootScope.titleDetail = '';
$rootScope.title = $route.current.title;
$rootScope.isCollapsed = true;
});
});

View File

@ -1,7 +1,7 @@
'use strict';
angular.module('insight.system').controller('HeaderController',
function($scope, getSocket, Global, Block) {
function($scope, $rootScope, getSocket, Global, Block) {
$scope.global = Global;
$scope.menu = [
@ -32,6 +32,5 @@ angular.module('insight.system').controller('HeaderController',
_getBlock(blockHash);
});
$scope.isCollapsed = true;
$rootScope.isCollapsed = true;
});

View File

@ -1,7 +1,7 @@
<div class="container">
<div data-ng-controller="HeaderController">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse" data-ng-click="isCollapsed = !isCollapsed">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse" data-ng-click="$root.isCollapsed = !$root.isCollapsed">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@ -9,7 +9,7 @@
</button>
<a class="insight navbar-brand" href="/">Insight</a>
</div>
<div class="navbar-collapse collapse" collapse="isCollapsed">
<div class="navbar-collapse collapse" collapse="$root.isCollapsed">
<ul class="nav navbar-nav">
<li data-ng-repeat="item in menu" ui-route="/{{item.link}}" data-ng-class="{active: $uiRoute}">
<a href="/{{item.link}}">{{item.title}}</a>
@ -28,10 +28,10 @@
<span class="t text-danger" data-ng-show="sync.error" tooltip="{{sync.error}}" tooltip-placement="bottom"> ERROR </span>
<span class="t text-warning " tooltip="{{sync.syncedBlocks}} / {{sync.blockChainHeight}} synced. {{sync.skippedBlocks}} skipped" tooltip-placement="bottom" data-ng-show="sync.status==='syncing'"> {{sync.status}} {{sync.syncPercentage}}%</span>
<span class="t text-default" tooltip="Historic sync finished" tooltip-placement="bottom" data-ng-show="sync.status==='finished'"> On sync</span>
</a> &middot;
</a> &middot;
<span data-ng-init="getStatus('Info')">
<strong>Conn</strong> {{info.connections}}
</span> &middot;
</span> &middot;
<strong>Height</strong> {{totalBlocks || info.blocks}}
</div>
</li>