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

fix merge conflicts

Browse source
This commit is contained in:
Marty Alcala 2016-10-18 17:23:43 -04:00
commit 78bd523391
272 changed files with 8069 additions and 5496 deletions
Download patch file Download diff file Expand all files Collapse all files

17
www/views/includes/output.html
View file

@ -1,14 +1,17 @@
<li class="p10 oh" copy-to-clipboard="output.toAddress">
<div class="item" copy-to-clipboard="output.toAddress">
<span class="text-gray" translate>To</span>:
<span class="right enable_text_select">{{output.toAddress || output.address}}</span>
</li>
<li class="p10" copy-to-clipboard="output.amountStr">
</div>
<div class="item" copy-to-clipboard="output.amountStr">
<span class="text-gray" translate>Amount</span>:
<span class="right enable_text_select">{{output.amountStr}}
<span ng-show="output.alternativeAmountStr" class="label gray radius">{{output.alternativeAmountStr}}</span>
<span ng-show="output.alternativeAmountStr">({{output.alternativeAmountStr}})</span>
</span>
</li>
<li class="p10 oh" copy-to-clipboard="output.message">
</div>
<div class="item" copy-to-clipboard="output.message" ng-show-"output.message">
<span class="text-gray" translate>Note</span>:
<span class="right enable_text_select">{{output.message}}</span>
</li>
</div>

9
www/views/includes/wallets.html
View file

@ -1,12 +1,15 @@
<div class="wallets" ng-show="wallets[0]">
<ion-slides class="slides" slider="data.slider">
<ion-slides class="slides" slider="data.slider" options="sliderOptions">
<ion-slide-page ng-repeat="wallet in wallets track by $index">
<div class="card" ng-click="slider.slideTo($index)">
<div class="item item-icon-left text-right">
<div class="item item-icon-left text-right" ng-class="{'noBalance': !wallet.status.availableBalanceStr}">
<i class="icon big-icon-svg">
<img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}" class="bg"/>
</i>
<span>{{wallet.name || wallet.id}}</span>
<span class="wallet-name">{{wallet.name || wallet.id}}</span>
<span class="item-note m10l">
{{wallet.status.availableBalanceStr}}
</span>
<span class="item-note m10l" ng-show="wallet.n > 1 && wallet.isComplete()">
{{wallet.m}}-of-{{wallet.n}}
</span>