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

Merge pull request #172 from cmgustavo/matias/bug/notif3-layout-pending

Browse source 
Clean pendingForUs when change wallet. Fix root.go
This commit is contained in:
Matias Alejo Garcia 2015-04-24 03:19:36 -03:00
commit dc0e0bb91f
4 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
public/views/includes/topbar.html
View file

@ -1,6 +1,6 @@
<nav ng-controller="topbarController as topbar" class="tab-bar animated fadeIn">
<section class="left-small">
<a class="p10" ng-show="!goBackToState && !closeToState && !index.noFocusedWallet"
<a class="p10" ng-show="!goBackToState && !closeToHome && !index.noFocusedWallet"
ng-click="index.openMenu()"><i class="fi-list size-24"></i>
</a>
<a ng-show="goBackToState"
@ -10,11 +10,11 @@
</section>
<section class="right-small" ng-show="index.isComplete && !goBackToState">
<a ng-show="!closeToState" class="p10"
<a ng-show="!closeToHome" class="p10"
ng-click="topbar.openScanner()"><i class="fi-camera size-24"></i></a>
<a ng-show="closeToState" class="p10"
ng-click="$root.go(closeToState); closeToState = null">
{{'Done'|translate}}
<a ng-show="closeToHome"
ng-click="topbar.goHome(); closeToHome = null">
<span class="text-close">{{'Close'|translate}}</span>
</a>
</section>