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

Fixed Conflicts:

Browse source 
bower.json
	js/directives.js
	views/includes/sidebar.html
This commit is contained in:
Gustavo Maximiliano Cortez 2014-08-01 11:12:35 -03:00
commit b94f66f32e
17 changed files with 79 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,16 +24,16 @@
</span>
</div>
<div>
Available
Locked
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
<span ng-show="!$root.updatingBalance"
data-options="disable_for_touch:true"
tooltip="{{availableBalanceBTC || 0 |noFractionNumber:8}} BTC"
tooltip="{{lockedBalanceBTC || 0 |noFractionNumber:8}} BTC"
tooltip-trigger="mouseenter"
tooltip-placement="bottom">{{availableBalance || 0|noFractionNumber}} {{$root.unitName}}
</span>
tooltip-placement="bottom">{{lockedBalance || 0|noFractionNumber}} {{$root.unitName}}
</span> &nbsp;<i class="fi-info medium" tooltip="Balance locked in pending transaction proposals" tooltip-placement="bottom"></i>
</div>
<div class="line-sidebar-b"></div>
</div>

8
views/includes/sidebar.html
View file

@ -34,7 +34,7 @@
|noFractionNumber}} {{$root.unitName}}
</span>
<br>
Available
Locked &nbsp;
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
@ -42,10 +42,10 @@
class="has-tip"
data-options="disable_for_touch:true"
tooltip-popup-delay='500'
tooltip="{{availableBalanceBTC || 0 |noFractionNumber:8}} BTC"
tooltip="{{lockedBalanceBTC || 0 |noFractionNumber:8}} BTC"
tooltip-trigger="mouseenter"
tooltip-placement="bottom">{{availableBalance || 0|noFractionNumber}} {{$root.unitName}}
</span>
tooltip-placement="bottom">{{lockedBalance || 0|noFractionNumber}} {{$root.unitName}}
</span> &nbsp;<i class="fi-info medium" tooltip="Balance locked in pending transaction proposals" tooltip-placement="bottom"></i>
</div>
<div class="line-sidebar"></div>
</header>

4
views/modals/qr-address.html
View file

@ -10,8 +10,8 @@
{{address.balance || 0|noFractionNumber}} {{$root.unitName}}
</span>
<div style="margin-top:10px;">
<span class="label pointer" ng-click="openExternal(address.address)">
<i class="fi-link">&nbsp;</i> Open in external aplication
<span class="label pointer" open-external address="{{address.address}}">
<i class="fi-link">&nbsp;</i> Open in external application
</span>
</div>
</div>