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

Merge pull request #234 from cmgustavo/ref/design-16

Browse source 
Fix addressbook. Modal can be opened from anywhere
This commit is contained in:
Matias Alejo Garcia 2016-08-25 17:47:04 -03:00 • committed by GitHub
commit 9c6ccd3ede
7 changed files with 172 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

15
public/views/modals/addressbook.html
View file

@ -1,4 +1,4 @@
<ion-modal-view>
<ion-modal-view ng-controller="addressbookModalController" ng-init="initAddressbook()">
<ion-header-bar align-title="center" class="bar-stable">
<button class="button button-clear button-positive"
ng-click="closeAddressbookModal()">
@ -22,14 +22,17 @@
<i class="icon ion-ios-search placeholder-icon"></i>
<input type="search"
placeholder="Search"
ng-model="search"
ng-change="findContact(search, {onlyContacts: true})" ng-model-onblur>
ng-model="addrSearch"
ng-change="findAddressbook(addrSearch)" ng-model-onblur>
</label>
</div>
<div ng-show="!addAddressbookEntry">
<ion-list>
<ion-item ng-repeat="addrEntry in list" class="item-icon-left" ng-show="!addrEntry.isWallet" ng-click="goToAmount(addrEntry)">
<ion-item ng-repeat="addrEntry in addressbook"
class="item-icon-left"
ng-show="!addrEntry.isWallet"
ng-click="sendTo(addrEntry)">
<i class="icon ion-ios-person-outline"></i>
<h2>{{addrEntry.label}}</h2>
<p>{{addrEntry.address}}</p>
@ -50,8 +53,6 @@
<form name="addressbookForm" ng-show="addAddressbookEntry" no-validate>
<div class="padding-vertical assertive" ng-show="error">{{error|translate}}</div>
<div class="list">
<label class="item item-input item-stacked-label">
@ -63,7 +64,7 @@
ng-show="addressbookForm.address.$invalid && addressbookEntry.address"></i>
</div>
<div class="qr-scan-icon">
<qr-scanner on-scan="onQrCodeScanned(data)"></qr-scanner>
<qr-scanner on-scan="onQrCodeScanned(data, addressbookForm)"></qr-scanner>
<input type="text"
id="address"
name="address"

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

@ -20,7 +20,7 @@
<h3>Contacts & Wallets</h3>
</div>
<div class="col col-20 text-right">
<a class="button button-light" ng-click="openAddressbookModal(list)">
<a class="button button-light" ng-click="openAddressbookModal()">
<i class="size-36 icon ion-person-add"></i>
</a>
</div>