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

clean up merge

Browse source
This commit is contained in:
Nick Cardin 2016-09-01 12:46:25 -04:00
commit a2052b3f3a
5 changed files with 29 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,12 @@
<ion-nav-bar class="bar-royal"> <ion-view>
<ion-nav-title>Export Wallet</ion-nav-title> <ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary"> <ion-nav-title>{{'Export Wallet' | translate}}</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button back-button" ui-sref="tabs.preferences.preferencesAdvanced"> <button class="button back-button" ui-sref="tabs.preferences.preferencesAdvanced">
<i class="icon ion-ios-arrow-thin-left"></i> <i class="icon ion-ios-arrow-thin-left"></i>
</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">

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

@ -1,25 +1,25 @@
<ion-view> <ion-view>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>Export Wallet</ion-nav-title> <ion-nav-title>{{'Export Wallet' | translate}}</ion-nav-title>
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button back-button" ui-sref="tabs.preferences.preferencesAdvanced"> <button class="button back-button" ui-sref="tabs.preferences.preferencesAdvanced">
<i class="icon ion-ios-arrow-thin-left"></i> <i class="icon ion-ios-arrow-thin-left"></i>
</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">
<qrcode size="220" version="8" error-correction-level="M" data="{{exportWalletInfo}}"></qrcode> <qrcode size="220" version="8" error-correction-level="M" data="{{exportWalletInfo}}"></qrcode>
</div>
<div class="text-center size-12 m10" translate>From the destination device, go to Add wallet &gt; Import wallet and scan this QR code</div>
</div> </div>
<div class="text-center size-12 m10" translate>From the destination device, go to Add wallet &gt; Import wallet and scan this QR code</div>
</div>
<div class="m20t text-gray" ng-show="!supported"> <div class="m20t text-gray" ng-show="!supported">
<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> </ion-view>

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

@ -35,12 +35,15 @@
</select> </select>
</label> </label>
<label class="item item-input item-stacked-label" ng-show="seedSourceId == 'trezor' || seedSourceId == 'ledger'"> <label class="item item-input item-stacked-label"
ng-show="seedSourceId == 'trezor' || seedSourceId == 'ledger'">
<span class="input-label" translate>Account Number</span> <span class="input-label" translate>Account Number</span>
<input type="number" id="account" ng-model="account" ignore-mouse-wheel> <input type="number" id="account" ng-model="account" ignore-mouse-wheel>
</label> </label>
<ion-toggle ng-show="seedSourceId == 'trezor'" ng-model="isMultisig" toggle-class="toggle-positive"> <ion-toggle ng-show="seedSourceId == 'trezor'"
ng-model="isMultisig"
toggle-class="toggle-positive">
<span translate>Shared Wallet</span> <span translate>Shared Wallet</span>
</ion-toggle> </ion-toggle>
@ -62,8 +65,7 @@
<button translate type="submit" class="button button-block button-positive"> <button translate type="submit" class="button button-block button-positive">
Import Import
</button> </button>
</div> </div> <!-- seedoptions show -->
<!-- seedoptions show -->
</form> </form>

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

@ -82,7 +82,9 @@
</div> </div>
</div> </div>
<button type="submit" class="button button-block button-positive" ng-disabled="importForm12.$invalid" translate>Import</button> <button type="submit"
class="button button-block button-positive"
ng-disabled="importForm12.$invalid" translate>Import</button>
</form> </form>
</ion-content> </ion-content>
</ion-view> </ion-view>

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

@ -27,7 +27,8 @@
<div class="item text-center" ng-show="!list[0]" translate>No Wallet - Contact</div> <div class="item text-center" ng-show="!list[0]" translate>No Wallet - Contact</div>
<a class="item item-icon-left" ng-repeat="item in list" ng-click="goToAmount(item)"> <a class="item item-icon-left" ng-repeat="item in list" ng-click="goToAmount(item)">
<i ng-show="item.isWallet" class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i> <i ng-show="item.isWallet" class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i>
<i ng-show="!item.isWallet" class="icon ion-ios-person-outline"></i> {{item.label}} <i ng-show="!item.isWallet" class="icon ion-ios-person-outline"></i>
{{item.label}}
</a> </a>
</div> </div>
</ion-content> </ion-content>