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

Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/external_link_open_system_browser

Browse source 
# Conflicts:
#	www/views/tab-settings.html
This commit is contained in:
Jamal Jackson 2016-10-13 11:57:24 -04:00
commit 794e0a304e
78 changed files with 1066 additions and 678 deletions
Download patch file Download diff file Expand all files Collapse all files

62
www/views/tab-settings.html
View file

@ -1,12 +1,12 @@
<ion-view id="tab-settings" class="settings">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Global Settings' | translate}}</ion-nav-title>
<ion-nav-title>{{'Settings' | translate}}</ion-nav-title>
</ion-nav-bar>
<ion-content>
<div class="list">
<div class="settings-list list">
<div class="item item-divider"></div>
<a class="item item-icon-left item-icon-right" ng-hide="true">
<a class="ng-hide item item-icon-left item-icon-right" ng-hide="true">
<i class="icon big-icon-svg">
<img src="img/icon-exchange.svg" class="bg"/>
</i>
@ -20,7 +20,16 @@
<span translate>Address Book</span>
<i class="icon bp-arrow-right"></i>
</a>
<a class="item item-icon-left item-icon-right" ng-hide="true">
<a class="item item-icon-left item-icon-right" ng-click=openExternalLink("https://help.bitpay.com")>
<i class="icon big-icon-svg">
<img src="img/icon-help-support.svg" class="bg"/>
</i>
<span translate>Help &amp; Support</span>
<i class="icon big-icon-svg">
<img src="img/icon-link.svg" class="bg just-a-hint"/>
</i>
</a>
<a class="ng-hide item item-icon-left item-icon-right" ng-hide="true">
<i class="icon big-icon-svg">
<img src="img/icon-send-feedback.svg" class="bg"/>
</i>
@ -53,8 +62,8 @@
<i class="icon big-icon-svg">
<img src="img/icon-unit.svg" class="bg"/>
</i>
<span translate>Unit</span>
<span class="item-note">
<span class="setting-title" translate>Bitcoin Unit</span>
<span class="setting-value">
{{unitName}}
</span>
<i class="icon bp-arrow-right"></i>
@ -64,8 +73,8 @@
<i class="icon big-icon-svg">
<img src="img/icon-alternative-currency.svg" class="bg"/>
</i>
<span translate>Alternative Currency</span>
<span class="item-note">
<span class="setting-title" translate>Alternative Currency</span>
<span class="setting-value">
{{selectedAlternative.name}}
</span>
<i class="icon bp-arrow-right"></i>
@ -75,21 +84,15 @@
<i class="icon big-icon-svg">
<img src="img/icon-network.svg" class="bg"/>
</i>
<span translate>Bitcoin Network Fee Policy</span>
<span class="item-note">
<span class="setting-title" translate>Bitcoin Network Fee Policy</span>
<span class="setting-value">
{{feeOpts[currentFeeLevel]|translate}}
</span>
<i class="icon bp-arrow-right"></i>
</a>
<a class="item item-icon-right item-icon-left" href ui-sref="tabs.advanced">
<i class="icon big-icon-svg">
<img src="img/icon-advanced.svg" class="bg"/>
</i>
<span translate>Advanced</span>
<i class="icon bp-arrow-right"></i>
</a>
<div class="item item-divider" ng-show="wallets[0]" translate>Wallets &amp; Integrations</div>
<a class="item item-icon-left item-icon-right" href
ui-sref="tabs.preferences({'walletId': item.id})"
ng-repeat="item in wallets track by $index">
@ -107,6 +110,24 @@
</a>
<div class="item item-divider"></div>
<a class="ng-hide item item-icon-left item-icon-right" href ng-hide="true">
<i class="icon big-icon-svg">
<img src="img/icon-heart.svg" class="bg"/>
</i>
<span translate>Tell a friend</span>
<i class="icon bp-arrow-right"></i>
</a>
<div class="ng-hide item item-divider" ng-hide="true"></div>
<a class="item item-icon-right item-icon-left" href ui-sref="tabs.advanced">
<i class="icon big-icon-svg">
<img src="img/icon-advanced.svg" class="bg"/>
</i>
<span translate>Advanced</span>
<i class="icon bp-arrow-right"></i>
</a>
<a class="item item-icon-left item-icon-right" href ui-sref="tabs.about">
<i class="icon big-icon-svg">
<img src="img/icon-about.svg" class="bg"/>
@ -114,13 +135,6 @@
<span translate>About</span> {{appName}}
<i class="icon bp-arrow-right"></i>
</a>
<a class="item item-icon-left item-icon-right" href ng-hide="true">
<i class="icon big-icon-svg">
<img src="img/icon-heart.svg" class="bg"/>
</i>
<span translate>Tell a friend</span>
<i class="icon bp-arrow-right"></i>
</a>
<div class="item item-divider"></div>
<a class="item item-icon-left item-icon-right" ng-click="openExternalLink('https://help.bitpay.com', true, 'BitPay Help Center', 'Help and support information is available at the BitPay Help Center website. Would you like to go there now?', 'Open Help Center', 'Go Back')">