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

fix offline notifications

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-04-14 12:51:49 -03:00
commit d21c9320c4
8 changed files with 40 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

21
public/views/history.html
View file

@ -2,16 +2,15 @@
<div class="row m20t" ng-show="!index.txHistory[0]">
<div class="large-12 columns">
<div class="oh text-center">
<span ng-if="index.updatingTxHistory" class="text-gray" translate>Getting transactions...</span>
<div class="box-notification" ng-show="index.txHistoryError">
<div class="box-icon error">
<i class="fi-x size-24"></i>
</div>
<span class="text-warning size-14" translate> Could not fetch transaction history
</span>
</div>
<span ng-if="!index.updatingTxHistory && !index.txHistoryError">No transactions yet</span>
<span ng-if="index.updatingTxHistory" class="text-gray animated flash infinite" translate>Getting transactions...</span>
<span ng-if="!index.updatingTxHistory">
<span ng-show="index.txHistoryError">
Could not fetch transaction history
</span>
<span ng-if="!index.txHistoryError">
No transactions yet
</span>
</span>
</div>
</div>
</div>
@ -30,7 +29,7 @@
<span class="size-18">
<span ng-if="btx.action == 'received'">+</span>
<span ng-if="btx.action == 'sent'">-</span>
{{history.formatAmount(btx.amount)}}
{{btx.amountStr}}
{{history.getUnitName()}}
</span>
</div>

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

@ -4,7 +4,7 @@
<i class="fi-alert"></i>
</div>
<div class="dr-notification-content">
<h3 class="dr-notification-title">Connection error</h3>
<h3 class="dr-notification-title">Wallet Service Error</h3>
<div class="dr-notification-text ellipsis">{{index.clientError.message || index.clientError}}</div>
</div>
</div>

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

@ -5,7 +5,7 @@
</div>
<div class="dr-notification-content">
<h3 class="dr-notification-title">{{'Could not connect to Wallet Service'|translate}}</h3>
<div class="dr-notification-text ellipsis">{{'Trying to reconnnect...'|translate}}</div>
<div class="dr-notification-text ellipsis animated infinite flash">{{'Trying to reconnnect...'|translate}}</div>
</div>
</div>
</div>

37
public/views/walletHome.html
View file

@ -2,20 +2,23 @@
<div class="row" ng-show="!index.noFocusedWallet">
<div class="amount" ng-style="{'background-color':index.backgroundColor}">
<div class="size-36">
<div class="size-36" ng-show="!index.anyOnGoingProcess">
<strong>
<span ng-show="!index.hideBalance">
<span ng-class="{'animated pulse':!index.hideBalance}">{{index.totalBalanceStr || '...'}}</span>
<span>
<span ng-class="{'animated pulse':!index.anyOnGoingProcess}">{{index.totalBalanceStr }}</span>
</span>
<span ng-show="index.hideBalance">...</span>
</strong>
</div>
<div class="size-14" ng-show="!index.hideBalance">
<span ng-if="index.alternativeBalanceAvailable" ng-class="{'animated fadeIn':!index.hideBalance}">{{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}</span>
<span ng-if="!index.alternativeBalanceAvailable">N/A</span>
<div class="text-white text-center animated infinite flash" ng-show="index.anyOnGoingProcess" >
<span translate ng-show="index.onGoingProcessName == 'openingWallet'">Opening Wallet...</span>
<span translate ng-show="index.onGoingProcessName == 'updatingStatus'">Updating Status...</span>
<span translate ng-show="index.onGoingProcessName == 'updatingBalance'">Updating Balance...</span>
<span translate ng-show="index.onGoingProcessName == 'updatingPendingTxps'">Updating Pending Transactions...</span>
<span translate ng-show="index.onGoingProcessName == 'scanning'">Scanning Wallet funds...</span>
<span translate ng-show="index.onGoingProcessName == 'recreating'">Recreating Wallet on BWS...</span>
</div>
<div class="size-14" ng-show="index.hideBalance">
&nbsp;
<div class="size-14" ng-show="!index.anyOnGoingProcess">
<span ng-if="index.alternativeBalanceAvailable" ng-class="{'animated fadeIn':!index.hideBalance}">{{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}</span>
</div>
</div>
<div class="pr columns line-b">
@ -41,13 +44,7 @@
</div>
<div ng-show="index.updateError && !index.notAuthorized">
<div class="text-center text-warning m10t">
<i class="fi-alert"></i>
<span translate>
Could not update Wallet
</span>
</div>
</div>
</div>
<div ng-show="index.notAuthorized">
@ -109,16 +106,6 @@ You can recreate it from the local information.
<button class="button black expand" ng-click="$root.go('add')" translate>Create</button>
</div>
<div class="text-gray text-center m10t animated infinite flash" ng-show="index.anyOnGoingProcess" >
<span translate ng-show="index.onGoingProcessName == 'openingWallet'">Opening Wallet...</span>
<span translate ng-show="index.onGoingProcessName == 'updatingStatus'">Updating Status...</span>
<span translate ng-show="index.onGoingProcessName == 'updatingBalance'">Updating Balance...</span>
<span translate ng-show="index.onGoingProcessName == 'updatingPendingTxps'">Updating Pending Transactions...</span>
<span translate ng-show="index.onGoingProcessName == 'scanning'">Scanning Wallet funds...</span>
<span translate ng-show="index.onGoingProcessName == 'recreating'">Recreating Wallet on BWS...</span>
</div>
</div>
<div class="extra-margin-bottom"></div>