anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix conflict

Browse source
This commit is contained in:
bechi 2014-07-31 12:17:50 -03:00
commit 25bedef1fc
41 changed files with 799 additions and 526 deletions
Download patch file Download diff file Expand all files Collapse all files

8
views/includes/sidebar-mobile.html
View file

@ -1,8 +1,8 @@
<div ng-controller="SidebarController">
<header class="text-center">
<div class="text-white m10v">
<a href="/" class="db">
<img src="../img/logo-negative-beta.svg" alt="" width="80">
<a href="#!/addresses" class="db">
<img src="img/logo-negative-beta.svg" alt="" width="80">
</a>
<small>v{{version}}</small>
<small ng-if="$root.wallet.getNetworkName()=='livenet'">LIVENET</small>
@ -39,8 +39,8 @@
</div>
</header>
<ul class="off-canvas-list">
<li data-ng-repeat="item in menu" ui-route="/{{item.link}}" class="nav-item" data-ng-class="{active: isActive(item)}">
<a href="{{item.link}}" ng-click="toggleCollapse()" class="db p20h">
<li data-ng-repeat="item in menu" ui-route="{{item.link}}" class="nav-item" data-ng-class="{active: isActive(item)}">
<a href="#!/{{item.link}}" ng-click="toggleCollapse()" class="db p20h">
<i class="size-24 m20r {{item.icon}}"></i> {{item.title}}
<span class="label alert round" ng-if="item.link=='transactions' && $root.pendingTxCount > 0">{{$root.pendingTxCount}}</span>
</a>

12
views/includes/sidebar.html
View file

@ -1,8 +1,8 @@
<div ng-controller="SidebarController">
<header class="p20">
<div class="text-center">
<a href="/" class="db">
<img src="../img/logo-negative-beta.svg" alt="" width="100">
<a href="#!/addresses" class="db">
<img src="img/logo-negative-beta.svg" alt="" width="100">
</a>
<div>
<small>v{{version}}</small>
@ -12,7 +12,7 @@
</div>
<div class="line-sidebar"></div>
<div>
<a href="/addresses" class="name-wallet" tooltip-placement="bottom" tooltip="ID: {{$root.wallet.id}}">
<a href="#!/addresses" class="name-wallet" tooltip-placement="bottom" tooltip="ID: {{$root.wallet.id}}">
<span>{{$root.wallet.getName()}}</span>
</a>
<a class="button gray small side-bar right" title="Manual Refresh"
@ -46,8 +46,8 @@
<div class="line-sidebar"></div>
</header>
<ul class="side-nav">
<li data-ng-repeat="item in menu" ui-route="/{{item.link}}" class="nav-item" data-ng-class="{active: isActive(item)}">
<a href="{{item.link}}" ng-click="toggleCollapse()" class="db p20h">
<li data-ng-repeat="item in menu" ui-route="{{item.link}}" class="nav-item" data-ng-class="{active: isActive(item)}">
<a href="#!/{{item.link}}" ng-click="toggleCollapse()" class="db p20h">
<i class="size-21 m20r {{item.icon}}"></i> {{item.title}}
<span class="right">
<span class="label alert" ng-if="item.link=='transactions' && $root.pendingTxCount > 0">{{$root.pendingTxCount}}</span>
@ -55,7 +55,7 @@
</a>
</li>
<li>
<a href="#" class="db p20h" title="Signout"
<a href="#!/" class="db p20h" title="Signout"
ng-click="signout()"><i class="size-21 m20r fi-power"></i> Signout</a>
</li>
</ul>