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

Merge pull request #1331 from isocolsky/fix/open_button

Browse source 
Removed loading indicator from all buttons
This commit is contained in:
Gustavo Maximiliano Cortez 2014-09-09 17:57:22 -03:00
commit 067361e1c6
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
views/addresses.html
View file

@ -2,7 +2,7 @@
<div ng-show='$root.wallet.isReady()'>
<h1>
<span translate>Addresses</span>
<span class="button primary small side-bar" ng-click="newAddr()" ng-disabled="loading" loading="Creating"><i class="fi-plus"></i></span>
<span class="button primary small side-bar" ng-click="newAddr()" ng-disabled="loading"><i class="fi-plus"></i></span>
</h1>
<div class="large-12 medium-12" ng-if="!!(addresses|removeEmpty).length">

2
views/import.html
View file

@ -51,7 +51,7 @@
<div class="text-right">
<a class="back-button text-white m20r" href="#!/">&laquo; <span translate>Back</span></a>
<button translate type="submit" class="button primary m0" ng-disabled="importForm.$invalid" loading="Importing">
<button translate type="submit" class="button primary m0" ng-disabled="importForm.$invalid">
Import backup
</button>
</div>

10
views/includes/transaction.html
View file

@ -71,24 +71,24 @@
<div class="large-5 medium-7 small-12 columns" ng-show="!tx.sentTs">
<div ng-show="!tx.signedByUs && !tx.rejectedByUs && !tx.finallyRejected && tx.missingSignatures">
<div class="hide-for-small-only">
<button class="primary m15r" ng-click="sign(tx.ntxid)" ng-disabled="loading" loading="Signing">
<button class="primary m15r" ng-click="sign(tx.ntxid)" ng-disabled="loading">
<i class="fi-check"></i> <span translate>Sign</span>
</button>
<button class="warning" ng-click="reject(tx.ntxid)" ng-disabled="loading" loading="Rejecting">
<button class="warning" ng-click="reject(tx.ntxid)" ng-disabled="loading">
<i class="fi-x" ></i> <span translate>Reject</span>
</button>
</div>
<div class="show-for-small-only row m10b">
<button class="primary small-5 columns" ng-click="sign(tx.ntxid)" ng-disabled="loading" loading="Signing">
<button class="primary small-5 columns" ng-click="sign(tx.ntxid)" ng-disabled="loading">
<i class="fi-check"></i> <span translate>Sign</span>
</button>
<button class="warning small-5 columns" ng-click="reject(tx.ntxid)" ng-disabled="loading" loading="Rejecting">
<button class="warning small-5 columns" ng-click="reject(tx.ntxid)" ng-disabled="loading">
<i class="fi-x" ></i> <span translate>Reject</span>
</button>
</div>
</div>
<div ng-show="!tx.missingSignatures && !tx.sentTs">
<button class="primary" ng-click="send(tx.ntxid)" ng-disabled="loading" loading="Broadcasting"> <i class=".fi-upload-cloud"></i>
<button class="primary" ng-click="send(tx.ntxid)" ng-disabled="loading"> <i class=".fi-upload-cloud"></i>
<span translate>Broadcast Transaction</span>
</button>
</div>

2
views/join.html
View file

@ -85,7 +85,7 @@
<div class="text-right">
<a href="#!/" class="back-button text-primary m20r">&laquo; <span translate>Back</span></a>
<button translate type="submit" class="button primary m0" ng-disabled="joinForm.$invalid || loading" loading="Joining">Join</button>
<button translate type="submit" class="button primary m0" ng-disabled="joinForm.$invalid || loading">Join</button>
</div>

2
views/open.html
View file

@ -18,7 +18,7 @@
placeholder="{{'Your password'|translate}}" name="openPassword" ng-model="openPassword" required>
<div class="text-right">
<a href="#!/" class="back-button text-white m20r">&laquo; <span translate>Back</span></a>
<button translate type="submit" class="button white m0" ng-disabled="openForm.$invalid || loading" loading="Opening">Open</button>
<button translate type="submit" class="button white m0" ng-disabled="openForm.$invalid || loading">Open</button>
</div>
</form>
</div>

2
views/send.html
View file

@ -118,7 +118,7 @@
<div class="row">
<div class="large-5 medium-3 small-4 columns">
<button type="submit" class="button primary expand text-center" ng-disabled="sendForm.$invalid || loading" loading="Sending">
<button type="submit" class="button primary expand text-center" ng-disabled="sendForm.$invalid || loading">
Send
</button>
</div>