Merge branch 'feature/settings_views_polish' of https://github.com/jamal-jackson/bitpay-wallet into feature/address_book

# Conflicts:
#	src/sass/views/address-book.scss
This commit is contained in:
Jamal Jackson 2016-09-23 10:11:19 -04:00
commit 4004efd5e4
16 changed files with 138 additions and 36 deletions

View file

@ -1,4 +1,4 @@
<ion-view>
<ion-view class="settings">
<ion-nav-bar class="bar-royal">
<ion-nav-title>
{{'Wallet Preferences'|translate}}

View file

@ -1,4 +1,4 @@
<ion-view >
<ion-view class="settings">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Advanced Preferences' | translate}}</ion-nav-title>
<ion-nav-back-button>

View file

@ -1,4 +1,4 @@
<ion-view>
<ion-view class="settings">
<ion-nav-bar class="bar-royal">
<ion-nav-title>
{{'Alternative Currency'|translate}}

View file

@ -7,8 +7,9 @@
</ion-nav-back-button>
</ion-nav-bar>
<ion-content>
<ion-radio ng-repeat="c in colorList" ng-value="c" ng-model="currentColor" ng-click="save(c)">
<span ng-style="{'color': c}">&block;</span>
<ion-radio ng-repeat="c in colorList" ng-value="c.color" ng-model="currentColor" ng-click="save(c.color)">
<span ng-style="{'color': c.color}">&block;</span>
<span> {{c.name}}</span>
</ion-radio>
</ion-content>
</ion-view>

View file

@ -1,4 +1,4 @@
<ion-view>
<ion-view class="settings">
<ion-nav-bar class="bar-royal">
<ion-nav-title>
{{'Bitcoin Network Fee Policy'|translate}}

View file

@ -1,4 +1,4 @@
<ion-view>
<ion-view class="settings">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Wallet Information' | translate}}</ion-nav-title>
<ion-nav-back-button>

View file

@ -1,4 +1,4 @@
<ion-view>
<ion-view id="preferences-language" class="settings">
<ion-nav-bar class="bar-royal">
<ion-nav-title>
{{'Language'|translate}}
@ -7,9 +7,11 @@
</ion-nav-back-button>
</ion-nav-bar>
<ion-content>
<ion-radio ng-repeat="lang in availableLanguages" ng-value="lang.isoCode" ng-model="currentLanguage"
ng-click="save(lang.isoCode)">{{lang.name}}
</ion-radio>
<div class="list">
<ion-radio ng-repeat="lang in availableLanguages" ng-value="lang.isoCode" ng-model="currentLanguage"
ng-click="save(lang.isoCode)">{{lang.name}}
</ion-radio>
</div>
<div class="padding">
<span translate>All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at</span>
<a ng-click="openExternalLink('https://crowdin.com/project/copay', '_system')">https://crowdin.com/project/copay</a>.
@ -18,4 +20,4 @@
</span>
</div>
</ion-content>
</ion-view>
</ion-view>

View file

@ -1,4 +1,4 @@
<ion-view>
<ion-view class="settings">
<ion-nav-bar class="bar-royal">
<ion-nav-title>
{{'Unit'|translate}}

View file

@ -1,4 +1,4 @@
<ion-view id="tab-settings">
<ion-view id="tab-settings" class="settings">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Global Settings' | translate}}</ion-nav-title>
</ion-nav-bar>

View file

@ -1,4 +1,4 @@
<ion-view>
<ion-view class="settings">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Translators' | translate}}</ion-nav-title>
<ion-nav-back-button>