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

Fix spinner when sign/reject/remove/broadcast a transaction

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-04-24 15:02:14 -03:00
commit 68cc09f4ab
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
11 changed files with 52 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,7 @@
<section class="right-small" ng-show="!goBackToState">
<a ng-show="!closeToHome && index.isComplete" class="p10"
ng-click="topbar.openScanner()"><i class="fi-camera size-24"></i></a>
<a ng-show="closeToHome"
<a ng-show="closeToHome" class="p10"
ng-click="topbar.goHome(); closeToHome = null">
<span class="text-close">{{'Close'|translate}}</span>
</a>

2
public/views/modals/copayers.html
View file

@ -1,6 +1,6 @@
<nav class="tab-bar">
<section class="right-small">
<a ng-click="cancel()">
<a ng-click="cancel()" class="p10">
<span class="text-close" translate>Close</span>
</a>
</section>

2
public/views/modals/paypro.html
View file

@ -1,6 +1,6 @@
<nav class="tab-bar">
<section class="right-small">
<a ng-click="cancel()">
<a ng-click="cancel()" class="p10">
<span class="text-close" translate>Close</span>
</a>
</section>

2
public/views/modals/scanner.html
View file

@ -1,6 +1,6 @@
<nav class="tab-bar">
<section class="right-small">
<a ng-click="cancel()">
<a ng-click="cancel()" class="p10">
<span class="text-close" translate>Close</span>
</a>
</section>

2
public/views/modals/tx-details.html
View file

@ -1,6 +1,6 @@
<nav class="tab-bar">
<section class="right-small">
<a ng-click="cancel()">
<a ng-click="cancel()" class="p10">
<span class="text-close" translate>Close</span>
</a>
</section>

2
public/views/modals/txp-details.html
View file

@ -1,6 +1,6 @@
<nav class="tab-bar">
<section class="right-small">
<a ng-click="cancel()">
<a ng-click="cancel()" class="p10">
<span class="text-close" translate>Close</span>
</a>
</section>

18
public/views/walletHome.html
View file

@ -7,7 +7,8 @@
<button class="button black expand" ng-click="$root.go('add')" translate>Create</button>
</div>
<div class="onGoingProcess" ng-show="index.isOffline" style="background-color:#222">
<div class="onGoingProcess" ng-show="index.isOffline">
<div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
<div class="spinner">
<div class="rect1"></div>
<div class="rect2"></div>
@ -16,9 +17,11 @@
<div class="rect5"></div>
</div>
<span translate>Reconnecting to Wallet Service...</span>
</div>
</div>
<div class="onGoingProcess" ng-show="index.anyOnGoingProcess && !index.isOffline" ng-style="{'background-color':index.backgroundColor}">
<div class="onGoingProcess" ng-show="index.anyOnGoingProcess && !index.isOffline">
<div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}">
<div class="spinner">
<div class="rect1"></div>
<div class="rect2"></div>
@ -27,15 +30,17 @@
<div class="rect5"></div>
</div>
<span translate ng-show="
index.onGoingProcessName == 'openingWallet'
|| index.onGoingProcessName == 'updatingStatus'
|| index.onGoingProcessName == 'updatingBalance'
"> Updating Wallet... </span>
index.onGoingProcessName == 'openingWallet'
|| index.onGoingProcessName == 'updatingStatus'
|| index.onGoingProcessName == 'updatingBalance'
"> Updating Wallet... </span>
<span translate ng-show="index.onGoingProcessName == 'scanning'">Scanning Wallet funds...</span>
<span translate ng-show="index.onGoingProcessName == 'recreating'">Recreating Wallet...</span>
</div>
</div>
<div class="onGoingProcess" ng-show="home.onGoingProcess && !index.anyOnGoingProcess">
<div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}">
<div class="spinner">
<div class="rect1"></div>
<div class="rect2"></div>
@ -44,6 +49,7 @@ index.onGoingProcessName == 'openingWallet'
<div class="rect5"></div>
</div>
{{home.onGoingProcess|translate}}...
</div>
</div>
<div class="oh" ng-show="!index.noFocusedWallet">