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

Merge pull request #222 from JDonadio/ref/wallets-view

Browse source 
Ref/wallets view
This commit is contained in:
Matias Alejo Garcia 2016-08-25 17:46:50 -03:00 • committed by GitHub
commit 0c81e49fac
10 changed files with 167 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

8
public/views/amount.html
View file

@ -2,11 +2,9 @@
<ion-nav-bar class="bar-stable">
<ion-nav-title>Enter Amount</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button" href ui-sref="tabs.send">
<i class="ion-arrow-left-c"></i> Back
<button class="button no-border" ui-sref="tabs.send">
<i class="icon ion-chevron-left"></i> Back
</button>
</ion-nav-buttons>
</ion-nav-bar>
@ -17,7 +15,7 @@
<div class="list card">
<div class="item item-divider">
Recipient
Recipient
</div>
<div class="item item-text-wrap item-icon-left">

46
public/views/confirm.html
View file

@ -3,15 +3,13 @@
<ion-pane>
<ion-nav-bar class="bar-stable">
<ion-nav-title>Confirm</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button" href ui-sref="tabs.send">
<i class="ion-arrow-left-c"></i> Back
<button class="button no-border" ui-sref="tabs.send">
<i class="icon ion-chevron-left"></i> Back
</button>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content scroll="false" ng-controller="confirmController" ng-init="init()">
<div class="card">
@ -24,9 +22,9 @@
<div class="list card">
<div class="item">Fee: {{feeLevel}}
<span class="item-note">
{{fee || '...'}}
</span>
<span class="item-note">
{{fee || '...'}}
</span>
</div>
<div class="item item-icon-left">
@ -42,30 +40,12 @@
</div>
<div class="item item-icon-left">
<i class="icon icon-wallet size-21" ng-style="{'color':recipientColor}"></i>
<i class="icon ion-briefcase size-21"></i>
<label translate>From</label>
<p ng-show="network=='testnet'">[Only showing testnet wallets]</p>
<p ng-show="someFiltered">[Filtering wallets with no enought balance]</p>
</div>
<div class="item item-text-wrap" ng-style="{'height' : '200px'}">
<ion-slides class="slides" options="options" slider="data.slider">
<ion-slide-page ng-repeat="item in wallets track by $index" >
<div class="list card">
<ul class="pr">
<li ng-show="wallets[0]" class="item item-icon-left">
<i class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i>
{{item.name || item.id}}
<span class="item-note" ng-show="item.isComplete()">
{{item.availableBalanceStr}}
</span>
</li>
</ul>
</div>
</ion-slide-page>
</ion-slides>
<span class="badge badge-assertive" ng-show="notAvailable" translate>Not available</span>
</div>
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
<div class="item item-icon-left item-icon-right" ng-click="showDescriptionPopup()">
<span ng-show="!description">Add Description</span>
@ -75,11 +55,9 @@
</div>
</div>
<div class="card">
<button class="item button button-full button-balanced" ng-click="approve()" ng-disabled="!txp" ng-show="wallet.canSign()"> Approve </button>
<button class="item button button-full button-balanced" ng-click="approve()" ng-disabled="!txp" ng-show="!wallet.canSign()"> Send </button>
</div>
</div>
<button class="item button button-block button-balanced" ng-click="approve()" ng-disabled="!txp">
<span ng-show="wallet.canSign()" translate>Approve</span>
<span ng-show="!wallet.canSign()" translate>Send</span>
</button>
</ion-content>
</ion-view>

6
public/views/includes/note.html
View file

@ -1,11 +1,11 @@
<div class="padding">
<input type="text" ng-model="data.comment" autofocus>
<input type="text" ng-model="comment" autofocus>
</div>
<div class="row">
<div class="col">
<button class="button button-dark button-block" ng-click="commentPopupClose()" translate>Cancel</button>
<button class="button button-dark button-block" ng-click="commentPopupClose(comment)" translate>Cancel</button>
</div>
<div class="col">
<button class="button button-dark button-block" ng-click="commentPopupSave()" translate>Save</button>
<button class="button button-dark button-block" ng-click="commentPopupSave(comment)" translate>Save</button>
</div>
</div>

16
public/views/includes/wallets.html Normal file
View file

@ -0,0 +1,16 @@
<div class="wallets" ng-show="wallets[0]">
<ion-slides class="slides" slider="data.slider">
<ion-slide-page ng-repeat="wallet in wallets track by $index">
<div class="item item-icon-left">
<i class="icon ion-briefcase size-21" ng-style="{'color':wallet.color}"></i>
{{wallet.name || wallet.id}}
<span class="item-note" ng-show="wallet.n > 1 && wallet.isComplete()">
{{wallet.m}}-of-{{wallet.n}}
</span>
<span class="badge badge-assertive" ng-show="!wallet.isComplete()" translate>
Incomplete
</span>
</div>
</ion-slide-page>
</ion-slides>
</div>

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

@ -3,48 +3,33 @@
<ion-nav-title>Receive</ion-nav-title>
</ion-nav-bar>
<ion-content ng-controller="tabReceiveController" ng-init="init()" >
<div class="text-center m30v" copy-to-clipboard="addr" ng-show="addr" >
<ion-content ng-controller="tabReceiveController" ng-init="init()">
<div class="text-center m30v" copy-to-clipboard="addr" ng-show="addr">
<qrcode size="220" data="bitcoin:{{addr}}" ng-show="addr"></qrcode>
</div>
<div class="padding assertive" ng-show="error">
{{error|translate}}
</div>
<div ng-show="generatingAddress" class="m30v">
<div style="height:220px; width:220px; margin:auto; background: #eee; text-align:center">
<ion-spinner class="spinner-stable" icon="lines" style="stroke:black; margin-top: 85px"></ion-spinner>
<div class="padding-top">
<ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
</div>
</div>
</div>
<div ng-show="incomplete">
<div style="height:220px; width:220px; margin: 30px auto; background: #eee; text-align:center">
incomplete wallet
</div>
<div class="item item-icon-left" ng-click="shareAddress(addr)" ng-show="isCordova && addr" ng-disabled="generatingAddress">
<i class="icon ion-ios-upload-outline"></i>
</div>
<div class="item item-icon-left" ng-click="setAddress(true)" ng-show="!generatingAddress">
<i class="icon ion-ios-loop"></i>
</div>
<div class="item item-icon-left">
<i class="icon ion-social-bitcoin-outline"></i>
</div>
<div class="list card padding text-center" ng-if="!wallets[0]">
<span translate>No Wallet</span>
</div>
<div ng-show="addrError">
<div style="height:220px; width:220px; margin: 30px auto; background: #eee; text-align:center">
Error: {{addrError}}
</div>
</div>
<div ng-show="!incomplete">
<div class="list" ng-if="wallets[0]">
<div class="item item-icon-left" ng-click="shareAddress(addr)" ng-show="isCordova && addr" ng-disabled="generatingAddress">
<i class="icon ion-ios-upload-outline"></i>
<span translate>Share address</span>
</div>
<div class="item item-icon-left" ng-click="setAddress(true)" ng-disabled="">
<div class="item item-icon-left" ng-click="setAddress(null, true)" ng-disabled="">
<i class="icon ion-ios-loop"></i>
<span translate>Next Address</span>
</div>
@ -53,27 +38,8 @@ Error: {{addrError}}
<span ng-show="generatingAddress">...</span>
<span ng-show="!generatingAddress" copy-to-clipboard="addr">{{addr}}</span>
</div>
</div>
<div class="item item-text-wrap" ng-style="{'height' : '200px'}">
<ion-slides class="slides" options="options" slider="data.slider">
<ion-slide-page ng-repeat="item in wallets track by $index" >
<div class="list card">
<ul class="pr">
<li ng-show="wallets[0]" class="item item-icon-left">
<i class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i>
{{item.name || item.id}}
<span class="item-note" ng-show="item.n > 1 && item.isComplete()">
{{item.m}}-of-{{item.n}}
</span>
<span class="badge badge-assertive" ng-show="!item.isComplete()" translate>
Incomplete
</span>
</li>
</ul>
</div>
</ion-slide-page>
</ion-slides>
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
</div>
</ion-content>
</ion-view>

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

@ -26,7 +26,11 @@
</div>
</div>
<div class="list card">
<div class="list card padding text-center" ng-if="!list[0]">
<span translate>No Wallet - Contact</span>
</div>
<div class="list card" ng-if="list[0]">
<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-ios-person-outline"></i>