Merge pull request #5351 from JDonadio/ref/remove-menu-popover

remove menu popover
This commit is contained in:
Gabriel Edgardo Bazán 2016-12-28 14:47:43 +02:00 committed by GitHub
commit ec199aa1ff
10 changed files with 126 additions and 68 deletions

View file

@ -3,11 +3,6 @@
<ion-nav-title>{{'Wallet Addresses' | translate}}</ion-nav-title>
<ion-nav-back-button>
</ion-nav-back-button>
<ion-nav-buttons side="secondary">
<button class="button back-button" ng-click="showMenu(false, $event)">
<i class="icon ion-ios-more"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content>
@ -39,6 +34,9 @@
<span translate>View All Addresses</span>
<i class="icon ion-ios-arrow-thin-right"></i>
</div>
<div class="item view-all" ng-show="latestWithBalance[0]" ng-click="scan()">
<span translate>Scan addresses for funds</span>
</div>
<div class="item item-divider item-icon-right" ng-click="newAddress()">
<span translate>Unused Addresses</span>
<i class="icon ion-ios-plus-empty"></i>

View file

@ -3,17 +3,20 @@
<ion-nav-title>{{'All Addresses' | translate}}</ion-nav-title>
<ion-nav-back-button>
</ion-nav-back-button>
<ion-nav-buttons side="secondary">
<button class="button back-button" ng-click="showMenu(true, $event)" ng-hide="!isCordova && allAddressesView">
<i class="icon ion-ios-more"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content>
<div class="addr-list list">
<div class="item item-divider"></div>
<div ng-show="isCordova && allAddresses[0]">
<div class="item view-all" ng-click="sendByEmail()">
<span translate>Send addresses by email</span>
</div>
<div class="item item-divider"></div>
</div>
<div class="item" ng-repeat="a in allAddresses track by $index" copy-to-clipboard="a.address">
{{a.address}}
<div class="addr-path" ng-if="!a.balanceStr">

View file

@ -6,7 +6,7 @@
<ion-nav-back-button>
</ion-nav-back-button>
<ion-nav-buttons side="secondary">
<button class="button back-button" ng-click="showSendMaxMenu($event)" ng-if="showMenu">
<button class="button back-button" ng-click="showSendMaxMenu()" ng-if="showMenu">
<i class="icon ion-ios-more"></i>
</button>
</ion-nav-buttons>
@ -120,4 +120,8 @@
</div>
</div>
</ion-content>
<item-selector
item-selector-show="showSendMax"
item-selector-on-select="sendMax">
</item-selector>
</ion-view>

View file

@ -0,0 +1,12 @@
<action-sheet action-sheet-show="show" class="item-selector">
<img class="back-arrow" src="img/icon-back-arrow.svg" ng-click="hide()">
<div class="header">{{title}}</div>
<a class="item item-icon-left option no-border" ng-click="onSelect()">
<i class="icon ion-ios-speedometer-outline"></i>
<div class="item-selector-inner">
<div class="item-selector-details">
<div class="item-selector-name" translate>Send max amount</div>
</div>
</div>
</a>
</action-sheet>

View file

@ -1,9 +0,0 @@
<ion-popover-view ng-style="{'height': height + 'px'}" id="menu-popover">
<ion-content>
<div class="list">
<div class="item" ng-repeat="i in items track by $index" ng-click="i.action()">
{{i.text}}
</div>
</div>
</ion-content>
</ion-popover-view>