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

Merge pull request #29 from cmgustavo/ref/design-11

Browse source 
Missing ion-view element and bar-stable class for topbar
This commit is contained in:
Matias Alejo Garcia 2016-09-01 10:10:54 -03:00 • committed by GitHub
commit 8adeb075ad
33 changed files with 483 additions and 471 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/add.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-title>{{'Add wallet' | translate}}</ion-nav-title> <ion-nav-title>{{'Add wallet' | translate}}</ion-nav-title>
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.home"> <button class="button no-border" ui-sref="tabs.home">

2
public/views/amount.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button no-border" ng-click="$ionicGoBack()"> <button class="button no-border" ng-click="$ionicGoBack()">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}} <i class="icon ion-chevron-left"></i> {{'Back' | translate}}

2
public/views/backup.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-back-button> <ion-nav-back-button>
{{'Back' | translate}} {{'Back' | translate}}
</ion-nav-back-button> </ion-nav-back-button>

2
public/views/confirm.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-back-button> <ion-nav-back-button>
{{'Back' | translate}} {{'Back' | translate}}
</ion-nav-back-button> </ion-nav-back-button>

2
public/views/preferences.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-back-button> <ion-nav-back-button>
{{'Back' | translate}} {{'Back' | translate}}
</ion-nav-back-button> </ion-nav-back-button>

2
public/views/preferencesAbout.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button button-stable no-border" ui-sref="tabs.settings"> <button class="button button-stable no-border" ui-sref="tabs.settings">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}} <i class="icon ion-chevron-left"></i> {{'Back' | translate}}

2
public/views/preferencesAdvanced.html
View file

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

2
public/views/preferencesAlias.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-back-button> <ion-nav-back-button>
{{'Back' | translate}} {{'Back' | translate}}
</ion-nav-back-button> </ion-nav-back-button>

2
public/views/preferencesAltCurrency.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-back-button> <ion-nav-back-button>
{{'Back' | translate}} {{'Back' | translate}}
</ion-nav-back-button> </ion-nav-back-button>

2
public/views/preferencesBwsUrl.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-back-button> <ion-nav-back-button>
{{'Back' | translate}} {{'Back' | translate}}
</ion-nav-back-button> </ion-nav-back-button>

2
public/views/preferencesColor.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-back-button> <ion-nav-back-button>
{{'Back' | translate}} {{'Back' | translate}}
</ion-nav-back-button> </ion-nav-back-button>

2
public/views/preferencesDeleteWallet.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-back-button> <ion-nav-back-button>
{{'Back' | translate}} {{'Back' | translate}}
</ion-nav-back-button> </ion-nav-back-button>

2
public/views/preferencesDeleteWords.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-back-button> <ion-nav-back-button>
{{'Back' | translate}} {{'Back' | translate}}
</ion-nav-back-button> </ion-nav-back-button>

2
public/views/preferencesEmail.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-back-button> <ion-nav-back-button>
{{'Back' | translate}} {{'Back' | translate}}
</ion-nav-back-button> </ion-nav-back-button>

2
public/views/preferencesFee.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-back-button> <ion-nav-back-button>
{{'Back' | translate}} {{'Back' | translate}}
</ion-nav-back-button> </ion-nav-back-button>

2
public/views/preferencesHistory.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-back-button> <ion-nav-back-button>
{{'Back' | translate}} {{'Back' | translate}}
</ion-nav-back-button> </ion-nav-back-button>

2
public/views/preferencesInformation.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-back-button> <ion-nav-back-button>
{{'Back' | translate}} {{'Back' | translate}}
</ion-nav-back-button> </ion-nav-back-button>

2
public/views/preferencesLanguage.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-back-button> <ion-nav-back-button>
{{'Back' | translate}} {{'Back' | translate}}
</ion-nav-back-button> </ion-nav-back-button>

2
public/views/preferencesLogs.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-back-button> <ion-nav-back-button>
{{'Back' | translate}} {{'Back' | translate}}
</ion-nav-back-button> </ion-nav-back-button>

2
public/views/preferencesUnit.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-back-button> <ion-nav-back-button>
{{'Back' | translate}} {{'Back' | translate}}
</ion-nav-back-button> </ion-nav-back-button>

10
public/views/tab-create-shared.html
View file

@ -1,13 +1,14 @@
<ion-nav-bar class="bar-stable"> <ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.add"> <button class="button no-border" ui-sref="tabs.add">
<i class="icon ion-chevron-left"></i> Back <i class="icon ion-chevron-left"></i> Back
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>
<ion-nav-title>Create new wallet</ion-nav-title> <ion-nav-title>Create new wallet</ion-nav-title>
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="createController as create" ng-init="create.setTotalCopayers(3)"> <ion-content ng-controller="createController as create" ng-init="create.setTotalCopayers(3)">
<div class="padding assertive" ng-show="create.error"> <div class="padding assertive" ng-show="create.error">
{{create.error|translate}} {{create.error|translate}}
@ -158,4 +159,5 @@
</button> </button>
</form> </form>
</ion-content> </ion-content>
</ion-view>

10
public/views/tab-export-file.html
View file

@ -1,13 +1,14 @@
<ion-nav-bar class="bar-stable"> <ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-title>Export Wallet</ion-nav-title> <ion-nav-title>Export Wallet</ion-nav-title>
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.preferences.preferencesAdvanced"> <button class="button no-border" ui-sref="tabs.preferences.preferencesAdvanced">
<i class="icon ion-chevron-left"></i> Back <i class="icon ion-chevron-left"></i> Back
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="exportController" ng-init="init()" cache-view="true"> <ion-content ng-controller="exportController" ng-init="init()" cache-view="true">
<div ng-show="!backupWalletPlainText"> <div ng-show="!backupWalletPlainText">
<div class="size-14" ng-show="error"> <div class="size-14" ng-show="error">
@ -99,4 +100,5 @@
</div> </div>
</div> </div>
</div> </div>
</ion-content> </ion-content>
</ion-view>

10
public/views/tab-export-qrCode.html
View file

@ -1,13 +1,14 @@
<ion-nav-bar class="bar-stable"> <ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-title>Export Wallet</ion-nav-title> <ion-nav-title>Export Wallet</ion-nav-title>
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.preferences.preferencesAdvanced"> <button class="button no-border" ui-sref="tabs.preferences.preferencesAdvanced">
<i class="icon ion-chevron-left"></i> Back <i class="icon ion-chevron-left"></i> Back
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="exportController" ng-init="init()"> <ion-content ng-controller="exportController" ng-init="init()">
<div class="m20t text-gray" ng-show="supported"> <div class="m20t text-gray" ng-show="supported">
<div class="text-center m20b"> <div class="text-center m20b">
@ -20,4 +21,5 @@
<div class="text-center size-12 m10" translate>Exporting via QR not supported for this wallet</div> <div class="text-center size-12 m10" translate>Exporting via QR not supported for this wallet</div>
</div> </div>
</ion-content> </ion-content>
</ion-view>

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

@ -1,4 +1,4 @@
<ion-view id="tab-home"> <ion-view>
<ion-nav-bar class="bar-stable"> <ion-nav-bar class="bar-stable">
<ion-nav-title>Home</ion-nav-title> <ion-nav-title>Home</ion-nav-title>
</ion-nav-bar> </ion-nav-bar>

10
public/views/tab-import-file.html
View file

@ -1,13 +1,14 @@
<ion-nav-bar class="bar-stable" ng-controller="backController"> <ion-view>
<ion-nav-bar class="bar-stable" ng-controller="backController">
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button no-border" ng-click="importGoBack()"> <button class="button no-border" ng-click="importGoBack()">
<i class="icon ion-chevron-left"></i> Back <i class="icon ion-chevron-left"></i> Back
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>
<ion-nav-title>Import wallet</ion-nav-title> <ion-nav-title>Import wallet</ion-nav-title>
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="importController" ng-init="type='file'"> <ion-content ng-controller="importController" ng-init="type='file'">
<div class="padding assertive" ng-show="error"> <div class="padding assertive" ng-show="error">
{{error|translate}} {{error|translate}}
@ -62,4 +63,5 @@
</button> </button>
</form> </form>
</ion-content> </ion-content>
</ion-view>

10
public/views/tab-import-hardware.html
View file

@ -1,13 +1,14 @@
<ion-nav-bar class="bar-stable" ng-controller="backController"> <ion-view>
<ion-nav-bar class="bar-stable" ng-controller="backController">
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button no-border" ng-click="importGoBack()"> <button class="button no-border" ng-click="importGoBack()">
<i class="icon ion-chevron-left"></i> Back <i class="icon ion-chevron-left"></i> Back
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>
<ion-nav-title>Import wallet</ion-nav-title> <ion-nav-title>Import wallet</ion-nav-title>
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="importController" ng-init="type='hwWallet'"> <ion-content ng-controller="importController" ng-init="type='hwWallet'">
<div class="padding assertive" ng-show="error"> <div class="padding assertive" ng-show="error">
{{error|translate}} {{error|translate}}
@ -68,4 +69,5 @@
</form> </form>
</ion-content> </ion-content>
</ion-view>

10
public/views/tab-import-phrase.html
View file

@ -1,13 +1,14 @@
<ion-nav-bar class="bar-stable" ng-controller="backController"> <ion-view>
<ion-nav-bar class="bar-stable" ng-controller="backController">
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button no-border" ng-click="importGoBack()"> <button class="button no-border" ng-click="importGoBack()">
<i class="icon ion-chevron-left"></i> Back <i class="icon ion-chevron-left"></i> Back
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>
<ion-nav-title>Import wallet</ion-nav-title> <ion-nav-title>Import wallet</ion-nav-title>
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="importController" ng-init="type='12'"> <ion-content ng-controller="importController" ng-init="type='12'">
<div ng-show="importErr || error" class="padding assertive" ng-click="importErr = error = null"> <div ng-show="importErr || error" class="padding assertive" ng-click="importErr = error = null">
<div ng-show="importErr"> <div ng-show="importErr">
@ -85,4 +86,5 @@
class="button button-block button-positive" class="button button-block button-positive"
ng-disabled="importForm12.$invalid" translate>Import</button> ng-disabled="importForm12.$invalid" translate>Import</button>
</form> </form>
</ion-content> </ion-content>
</ion-view>

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

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-title>{{'Receive' | translate}}</ion-nav-title> <ion-nav-title>{{'Receive' | translate}}</ion-nav-title>
</ion-nav-bar> </ion-nav-bar>

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

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-title>{{'Send' | translate}}</ion-nav-title> <ion-nav-title>{{'Send' | translate}}</ion-nav-title>
</ion-nav-bar> </ion-nav-bar>

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

@ -67,9 +67,12 @@
<span class="toggle-label" translate>Enable Glidera Service</span> <span class="toggle-label" translate>Enable Glidera Service</span>
</ion-toggle> </ion-toggle>
<!-- disable coinbase for this release -->
<!--
<ion-toggle ng-show="!isWP" ng-model="coinbaseEnabled" toggle-class="toggle-balanced" ng-change="coinbaseChange()"> <ion-toggle ng-show="!isWP" ng-model="coinbaseEnabled" toggle-class="toggle-balanced" ng-change="coinbaseChange()">
<span class="toggle-label" translate>Enable Coinbase Service</span> <span class="toggle-label" translate>Enable Coinbase Service</span>
</ion-toggle> </ion-toggle>
-->
<div class="item item-divider">Others</div> <div class="item item-divider">Others</div>
@ -77,10 +80,10 @@
<span class="toggle-label" translate>Use Unconfirmed Funds</span> <span class="toggle-label" translate>Use Unconfirmed Funds</span>
</ion-toggle> </ion-toggle>
<div class="list">
<div class="item item-divider">Wallets Settings</div> <div class="item item-divider">Wallets Settings</div>
<div ng-repeat="item in wallets track by $index"> <div class="item item-icon-left" href
<div class="item item-icon-left" href ui-sref="tabs.preferences.main({'walletId': item.id})"> ui-sref="tabs.preferences.main({'walletId': item.id})"
ng-repeat="item in wallets track by $index">
<i class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i> <i class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i>
{{item.name || item.id}} {{item.name || item.id}}
<span ng-show="item.n > 1" class="text-light"> <span ng-show="item.n > 1" class="text-light">
@ -90,14 +93,13 @@
Incomplete Incomplete
</span> </span>
</div> </div>
</div>
</div>
<div class="item item-divider"></div> <div class="item item-divider"></div>
<div class="item item-icon-left" href ui-sref="tabs.about"> <div class="item item-icon-left" href ui-sref="tabs.about">
<i class="icon ion-ios-film-outline"></i> <i class="icon ion-ios-film-outline"></i>
<span translate>About Bitpay Wallet</span> <span translate>About Bitpay Wallet</span>
</div> </div>
<div class="item item-divider"></div>
</div> </div>
</ion-content> </ion-content>
</ion-view> </ion-view>

2
public/views/termsOfUse.html
View file

@ -1,5 +1,5 @@
<ion-view> <ion-view>
<ion-nav-bar> <ion-nav-bar class="bar-stable">
<ion-nav-back-button> <ion-nav-back-button>
{{'Back' | translate}} {{'Back' | translate}}
</ion-nav-back-button> </ion-nav-back-button>

2
public/views/translators.html
View file

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

2
public/views/walletDetails.html
View file

@ -1,5 +1,3 @@
<ion-view> <ion-view>
<ion-nav-bar class="bar-stable"> <ion-nav-bar class="bar-stable">
<ion-nav-title>{{wallet.name}}</ion-nav-title> <ion-nav-title>{{wallet.name}}</ion-nav-title>