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

Merge pull request #145 from JDonadio/feat/open-tx-modal

Browse source 
Open tx/txp modal without navigation
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-21 12:10:03 -03:00 • committed by GitHub
commit e5b237bb7a
11 changed files with 226 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

50
public/views/includes/walletActivity.html
View file

@ -1,65 +1,65 @@
<span class="wallet-activity">
<div ng-if="x.type == 'NewCopayer' && x.wallet.n>1" translate>
Copayer joined
<div ng-if="notification.type == 'NewCopayer' && notification.wallet.n>1" translate>
Copayer joined
</div>
<div ng-if="x.type == 'NewCopayer' && x.wallet.n==1" translate>
<div ng-if="notification.type == 'NewCopayer' && notification.wallet.n==1" translate>
Wallet created
</div>
<div ng-if="x.type == 'NewOutgoingTx'">
<div ng-if="notification.type == 'NewOutgoingTx'">
<span translate>Payment Sent </span>
<div class="wallet-activity-amount">
{{x.amountStr}}
{{notification.amountStr}}
</div>
</div>
<div ng-if="x.type == 'NewIncomingTx'">
<div ng-if="notification.type == 'NewIncomingTx'">
<span translate>Payment Received</span>
<div class="wallet-activity-amount">
{{x.amountStr}}
{{notification.amountStr}}
</div>
</div>
<div ng-if="x.type == 'TxProposalRemoved'">
<span translate>Proposal Deleted</span>:
<b>{{x.message}}</b>
<div ng-if="notification.type == 'TxProposalRemoved'">
<span translate>Proposal Deleted</span>:
<b>{{notification.message}}</b>
<div class="wallet-activity-amount">
{{x.amountStr}}:
{{notification.amountStr}}:
</div>
</div>
<div ng-if="x.type == 'TxProposalRejectedBy'">
<div ng-if="notification.type == 'TxProposalRejectedBy'">
<span translate>Proposal Rejected</span>:
<b>{{x.message}}</b>
<b>{{notification.message}}</b>
<div class="wallet-activity-amount">
{{x.amountStr}}:
{{notification.amountStr}}:
</div>
</div>
<span ng-if="x.type == 'NewTxProposal'">
<span ng-if="notification.type == 'NewTxProposal'">
<span translate>New Proposal</span>:
<b>{{x.message}}</b>
<b>{{notification.message}}</b>
<div class="wallet-activity-amount">
{{x.amountStr}}
{{notification.amountStr}}
</div>
</span>
<span ng-if="x.type == 'TxProposalAcceptedBy'">
<span ng-if="notification.type == 'TxProposalAcceptedBy'">
<span translate>Proposal Accepted</span>:
<b>{{x.message}}</b>
<b>{{notification.message}}</b>
<div class="wallet-activity-amount">
{{x.amountStr}}
{{notification.amountStr}}
</div>
</span>
<p class="wallet-activity-note">
<!-- {{x.types}} -->
<i class="icon ion-record wallet-activity-note-child" ng-style="{'color':x.wallet.color}"></i>
<span ng-if="x.creatorName" class="wallet-activity-note-child">{{ x.creatorName}}@</span>
<span class="wallet-activity-note-child">{{x.wallet.name}}</span>
<time class="wallet-activity-note-child">{{ x.createdOn * 1000 | amTimeAgo}}</time>
<!-- {{notification.types}} -->
<i class="icon ion-record wallet-activity-note-child" ng-style="{'color':notification.wallet.color}"></i>
<span ng-if="notification.creatorName" class="wallet-activity-note-child">{{ notification.creatorName}}@</span>
<span class="wallet-activity-note-child">{{notification.wallet.name}}</span>
<time class="wallet-activity-note-child">{{ notification.createdOn * 1000 | amTimeAgo}}</time>
</p>
</span>