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

Merge branch 'ref/design' of github.com:matiu/copay into ref/design

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-08-23 16:53:33 -03:00
commit c83c2e7550
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
26 changed files with 95 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/includes/confirm-tx.html
View file

@ -7,7 +7,7 @@
<div class="size-36">{{tx.amountStr}}</div>
<div class="size-12 label gray radius" ng-show="tx.alternativeAmountStr">{{tx.alternativeAmountStr}}</div>
<i class="db fi-arrow-down size-24 m10v"></i>
<div class="payment-proposal-to" ng-click="copyToClipboard(tx.toAddress, $event)">
<div class="payment-proposal-to" copy-to-clipboard="tx.toAddress">
<i class="fi-bitcoin left m10l"></i>
<contact ng-if="!tx.hasMultiplesOutputs" class="dib enable_text_select ellipsis m5t m5b m15l size-14" address="{{tx.toAddress}}"></contact>
<span ng-if="tx.hasMultiplesOutputs" translate>

6
public/views/includes/output.html
View file

@ -1,14 +1,14 @@
<li class="p10 oh" ng-click="copyToClipboard(output.toAddress, $event)">
<li class="p10 oh" 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" ng-click="copyToClipboard(output.amountStr, $event)">
<li class="p10" 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>
</li>
<li class="p10 oh" ng-click="copyToClipboard(output.message, $event)">
<li class="p10 oh" copy-to-clipboard="output.message">
<span class="text-gray" translate>Note</span>:
<span class="right enable_text_select">{{output.message}}</span>
</li>

10
public/views/modals/tx-details.html
View file

@ -25,7 +25,7 @@
<p class="m0 text-gray size-14" translate>Moved</p>
</div>
<div class="size-36" ng-click="copyToClipboard(btx.amountStr, $event)">
<div class="size-36" copy-to-clipboard="btx.amountStr">
<span class="enable_text_select">{{btx.amountStr}}</span>
</div>
<div class="alternative-amount" ng-click="showRate=!showRate" ng-init="showRate = false">
@ -46,7 +46,7 @@
<ul class="no-bullet size-14 m0">
<li ng-if="!btx.hasMultiplesOutputs && btx.addressTo && btx.addressTo != 'N/A'" class="line-b p10 oh"
ng-click="copyToClipboard(btx.addressTo, $event)">
copy-to-clipboard="btx.addressTo">
<span class="text-gray" translate>To</span>
<span class="right">
<span ng-if="btx.merchant">
@ -89,19 +89,19 @@
</li>
<li class="line-b p10" ng-show="btx.action != 'received'"
ng-click="copyToClipboard(btx.feeStr, $event)">
copy-to-clipboard="btx.feeStr">
<span class="text-gray" translate>Fee</span>
<span class="right enable_text_select">{{btx.feeStr}}</span>
</li>
<li class="line-b p10 oh" ng-if="btx.message && btx.action != 'received'"
ng-click="copyToClipboard(btx.message, $event)">
copy-to-clipboard="btx.message">
<span class="text-gray" translate>Description</span>
<span class="right enable_text_select">{{btx.message}}</span>
</li>
<li ng-if="btx.merchant" class="line-b p10 oh"
ng-click="copyToClipboard(btx.merchant.pr.pd.memo, $event)">
copy-to-clipboard="btx.merchant.pr.pd.memo">
<span class="text-gray" translate>Merchant message</span>
<span class="right enable_text_select">
{{btx.merchant.pr.pd.memo}}

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

@ -16,7 +16,7 @@
<div class="size-36">{{tx.amountStr}}</div>
<div class="size-14 text-light" ng-show="tx.alternativeAmountStr">{{tx.alternativeAmountStr}}</div>
<i class="db fi-arrow-down size-24 m10v"></i>
<span class="payment-proposal-to" ng-click="copyToClipboard(tx.toAddress, $event)">
<span class="payment-proposal-to" copy-to-clipboard="tx.toAddress">
<i class="fi-bitcoin left"></i>
<contact ng-if="!tx.hasMultiplesOutputs" class="dib enable_text_select ellipsis m5t m5b size-14" address="{{tx.toAddress}}"></contact>
<span ng-if="tx.hasMultiplesOutputs" translate>Multiple recipients</span>

8
public/views/preferencesInformation.html
View file

@ -18,7 +18,7 @@
{{walletName}}
</span>
</div>
<div class="item" ng-click="copyToClipboard(walletId)">
<div class="item" copy-to-clipboard="walletId">
<span translate>Wallet Id</span>
<span class="item-note">
{{walletId}}
@ -81,7 +81,7 @@
Extended Public Keys
</div>
<div class="item" ng-repeat="pk in pubKeys" ng-click="copyToClipboard(pk)">
<div class="item" ng-repeat="pk in pubKeys" copy-to-clipboard="pk">
<span translate>Copayer {{$index}}<</span>
<i class="icon ion-ios-checkmark-outline"></i>
<span class="item-note">
@ -96,7 +96,7 @@
Last Wallet Addresses
</div>
<div class="item" ng-repeat="a in addrs" class="oh" ng-click="copyToClipboard(a.address)">
<div class="item" ng-repeat="a in addrs" class="oh" copy-to-clipboard="a.address">
<span>{{a.address}}</span>
<span>{{a.path}} &middot; {{a.createdOn *1000 | amDateFormat:'MMMM Do YYYY, h:mm a' }}</span>
<i class="icon ion-ios-checkmark-outline"></i>
@ -115,7 +115,7 @@
<div class="item item-divider">
Balance By Address
</div>
<div class="item" ng-repeat="a in wallet.balanceByAddress" ng-click="copyToClipboard(a.address)">
<div class="item" ng-repeat="a in wallet.balanceByAddress" copy-to-clipboard="a.address">
<span>{{a.address}}</span>
<span class="item-note">
{{(a.amount/1e8).toFixed(8)}} BTC

2
public/views/preferencesLogs.html
View file

@ -2,7 +2,7 @@
<ion-nav-bar class="bar-stable">
<ion-nav-title>Session log</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="about">
<button class="button no-border" ui-sref="settings.about">
<i class="icon ion-chevron-left"></i> Back
</button>
</ion-nav-buttons>

5
public/views/tab-receive.html
View file

@ -6,7 +6,7 @@
<ion-content ng-controller="tabReceiveController" ng-init="init()" cache-view="false">
<div class="text-center m30v" ng-click="copyToClipboard(addr, $event)" ng-show="addr" >
<div class="text-center m30v" copy-to-clipboard="addr" ng-show="addr" >
<qrcode size="220" data="bitcoin:{{addr}}" ng-show="addr"></qrcode>
</div>
@ -50,7 +50,8 @@ Error: {{addrError}}
</div>
<div class="item item-icon-left">
<i class="icon ion-social-bitcoin-outline"></i>
{{generatingAddress ? '...' : addr}}
<span ng-show="generatingAddress">...</span>
<span ng-show="!generatingAddress" copy-to-clipboard="addr">{{addr}}</span>
</div>
</div>
<div class="item item-text-wrap" ng-style="{'height' : '200px'}">

2
public/views/tab-settings.html
View file

@ -10,7 +10,7 @@
<i class="icon ion-ios-book-outline"></i>
<span translate>Address Book</span>
</div>
<div class="item item-icon-left" href ui-sref="feedback">
<div class="item item-icon-left" href ui-sref="settings.feedback">
<i class="icon ion-ios-heart-outline"></i>
<span translate>Feedback</span>
</div>

2
public/views/termOfUse.html
View file

@ -2,7 +2,7 @@
<ion-nav-bar class="bar-stable">
<ion-nav-title>Terms of Use</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="about">
<button class="button no-border" ui-sref="settings.about">
<i class="icon ion-chevron-left"></i> Back
</button>
</ion-nav-buttons>

2
public/views/translators.html
View file

@ -2,7 +2,7 @@
<ion-nav-bar class="bar-stable">
<ion-nav-title>Translators</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="about">
<button class="button no-border" ui-sref="settings.about">
<i class="icon ion-chevron-left"></i> Back
</button>
</ion-nav-buttons>

2
public/views/walletDetails.html
View file

@ -45,7 +45,7 @@
</div>
<div ng-click='updateAll()' ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !hideBalance" on-hold="hideToggle()">
<div ng-click='updateAll()' ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !shouldHideBalance" on-hold="hideToggle()">
<strong class="size-36">{{status.totalBalanceStr}}</strong>
<div class="size-14" ng-if="status.totalBalanceAlternative">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</div>
<div class="size-14" ng-if="status.pendingAmount">