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

complete import process

Browse source
This commit is contained in:
Javier 2016-09-06 16:40:57 -03:00
commit 9632fe8b64
5 changed files with 41 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

19
public/views/import.html
View file

@ -1,4 +1,4 @@
<ion-view>
<ion-view ng-controller="tabsController" ng-init="importInit()">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Import Wallet' | translate}}</ion-nav-title>
<ion-nav-back-button>
@ -6,7 +6,7 @@
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="importController" ng-init="phrase = true; importInit()">
<ion-content ng-controller="importController" ng-init="phrase = true; init()">
<div class="row text-center">
<div class="col" ng-click="phrase = true; file = hardware = false" ng-style="phrase && {'border-bottom': '2px solid'}">
<span translate>Recovery phrase</span>
@ -24,18 +24,3 @@
<div ng-include="'views/tab-import-hardware.html'" ng-if="hardware"></div>
</ion-content>
</ion-view>
<!-- <ion-view ng-controller="tabsController" ng-init="importInit()">
<ion-tabs class="tabs-striped tabs-color-positive tabs-color-active-positive tabs-top">
<div ng-if="!fromOnboarding">
<div ng-include="'views/tab-import'"></div>
</div>
<div ng-if="fromOnboarding">
<div ng-include="'views/tab-import'"></div>
</div>
</ion-tabs>
</ion-view> -->

2
public/views/onboarding/welcome.html
View file

@ -14,7 +14,7 @@
<button class="button button-block get-started col col-75" href ui-sref="onboarding.tour" translate>Get started</button>
</div>
<div class="row">
<button class="button button-block restore col col-75" translate href ui-sref="onboarding.import.phrase({'fromOnboarding':true})">Restore</button>
<button class="button button-block restore col col-75" translate href ui-sref="onboarding.import({'fromOnboarding':true})">Restore</button>
</div>
</ion-content>
</ion-view>

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

@ -11,21 +11,16 @@
<div class="input-label" translate>
Wallet Type
</div>
<select ng-model="seedSource"
ng-options="seed as seed.label for seed in seedOptions"
ng-change="setSeedSource()">
</select>
<select ng-model="seedSource" ng-options="seed as seed.label for seed in seedOptions"></select>
</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="seedSource.id == 'trezor' || seedSource.id == 'ledger'">
<span class="input-label" translate>Account Number</span>
<input type="number" id="account" ng-model="account" ignore-mouse-wheel>
<input type="number" ng-model="formData.account" ignore-mouse-wheel>
</label>
<ion-toggle ng-show="seedSourceId == 'trezor'"
ng-model="isMultisig"
toggle-class="toggle-positive">
<ion-toggle ng-show="seedSource.id == 'trezor'" ng-model="formData.isMultisig" toggle-class="toggle-positive">
<span translate>Shared Wallet</span>
</ion-toggle>
@ -37,9 +32,8 @@
<div ng-show="showAdv">
<label class="item item-input item-stacked-label">
<span class="input-label">Wallet Service URL</span>
<input type="text" id="bwsurl" name="bwsurl" ng-model="bwsurl">
<input type="text" ng-model="formData.bwsurl">
</label>
</div>
</div>