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

Merge pull request #14 from matiu/guga5

Browse source 
hide broadcast button
This commit is contained in:
Gustavo Maximiliano Cortez 2015-09-08 23:35:36 -03:00
commit 1aede751a9
4 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
<div class="ng-animate-disabled row collapse last-transactions-content line-b"
ng-class="{'text-gray':!tx.pendingForUs}"
ng-click="home.openTxpModal(tx, index.copayers)">
ng-click="home.openTxpModal(tx, index.copayers, !!index.glideraStatus)">
<div class="small-1 columns text-center" >
<i class="icon-circle-active size-10" ng-show="tx.pendingForUs" ng-style="{'color':index.backgroundColor}" style="margin-top:8px;"></i>
&nbsp;

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

@ -133,31 +133,31 @@
</div>
<div class="text-center text-gray m20t" ng-show="tx.status != 'pending'">
<div class="m10t size-12"
ng-show="tx.status=='accepted'" translate>
Payment accepted...
</div>
<div
ng-show="!loading && tx.status!='broadcasted' && tx.status=='accepted' && tx.status!='rejected'">
<div class="m10b size-12" translate>But not broadcasted. Try to send manually</div>
<div ng-show="tx.status=='accepted' && !tx.isGlidera" >
<div class="m10b size-12" translate>Payment accepted, but not yet broadcasted</div>
<button class="primary round"
ng-click="broadcast(tx)"
ng-disabled="loading"> <i class="fi-upload-cloud"></i>
ng-disabled="loading"
> <i class="fi-upload-cloud"></i>
<span translate>Broadcast Payment</span>
</button>
</div>
<div ng-show="tx.status=='accepted' && tx.isGlidera" >
<div class="m10 size-12" translate>Payment accepted. It will be broadcasted by Glidera. It case there is a problem, it can be deleted after 6 hours it was created.</div>
</div>
<div class="text-success m10t"
ng-show="tx.status=='broadcasted'" translate>
Payment sent!
Payment sent
</div>
<div class="text-center text-warning m10t"
ng-show="tx.status=='rejected'" translate>
Payment finally rejected
Payment rejected
</div>
</div>
<div class="row columns text-center m20t" ng-if="tx.canBeRemoved">
<div class="text-gray size-12 m20b" show="tx.canBeRemoved" translate>
<div class="text-gray size-12 m20b" ng-if="!tx.isGlidera" translate>
* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created.
</div>
<button class="tiny round outline dark-gray warning" ng-click="remove(tx)"