Merge pull request #6341 from gabrielbazan7/ref/tabs

remove unused file and adding tabs to coibase.html and copayers.html
This commit is contained in:
Gustavo Maximiliano Cortez 2017-06-30 16:08:19 -03:00 committed by GitHub
commit 3e19bf1c09
5 changed files with 6 additions and 59 deletions

View File

@ -132,10 +132,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
})
}
})
.state('uripayment', {
url: '/uri-payment/:url',
templateUrl: 'views/paymentUri.html'
})
/*
*

View File

@ -1,4 +1,4 @@
<ion-view hide-tabs id="addresses" class="addr">
<ion-view id="addresses" class="addr" hide-tabs>
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'All Addresses' | translate}}</ion-nav-title>
<ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view id="coinbase">
<ion-view id="coinbase" show-tabs>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
</ion-nav-back-button>

View File

@ -1,14 +1,13 @@
<ion-view id="copayers-invitation">
<ion-view id="copayers-invitation" hide-tabs>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
</ion-nav-back-button>
<ion-nav-title>{{wallet.name}}</ion-nav-title>
<ion-nav-buttons side="secondary">
<button class="button-share ng-hide" ng-show="isCordova && secret" ng-click="shareSecret()">
<i class="icon"
<i class="icon"
ng-class="{
'ion-ios-upload-outline': shareIcon == 'iOS',
'ion-ios-upload-outline': shareIcon == 'iOS',
'ion-android-share-alt': shareIcon != 'iOS'
}"></i>
</button>
@ -34,7 +33,7 @@
</div>
</div>
<button ng-if="secret" class="button-cancel" ng-click="showDeletePopup()">
<span translate>Cancel invitation</span>
<span translate>Cancel invitation</span>
</button>
</div>
</div>

View File

@ -1,48 +0,0 @@
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Choose wallet'; closeToHome = true">
</div>
<div class="content p20v row payment-uri" ng-controller="paymentUriController as payment">
<div class="large-12 columns" ng-init="payment.init()">
<div class="panel text-center" ng-if="!payment.uri">
<h1 translate>Bitcoin URI is NOT valid!</h1>
</div>
<div ng-if="payment.uri" ng-init="payment.getWallets(payment.uri.network)">
<h1 translate>Make a payment to</h1>
<div class="panel size-14">
<div class="ellipsis"><b translate>Address</b>: {{payment.uri.address.toString()}}</div>
<div ng-show="payment.uri.amount"><b translate>Amount</b>: {{payment.uri.amount}}</div>
<div ng-show="payment.uri.message"><b translate>Message</b>: {{payment.uri.message}}</div>
<div ng-show="payment.uri.network == 'testnet'"><b translate>Network</b>: {{payment.uri.network}}</div>
</div>
<div ng-if="!wallets || !wallets.length">
<div class="box-notification">
<span class="text-warning">
<b translate>There are no wallets to make this payment</b>
<span ng-show="payment.uri.network == 'testnet'">[testnet]</span>
</span>
</div>
</div>
<div ng-if="wallets.length">
<h2 translate>Select a wallet</h2>
<ul class="no-bullet">
<li class="panel" ng-repeat="w in wallets">
<a ng-click="payment.selectWallet(w.id)">
<div class="avatar-wallet"
ng-class="{'wallet-background-color-default': !w.color}" ng-style="{'background-color':w.color}">
<i class="icon-wallet size-21"></i>
</div>
<div class="ellipsis">{{w.name || w.id}}</div>
<div class="size-12">{{w.m}} of {{w.n}}
<span ng-show="w.network=='testnet'">[Testnet]</span>
</div>
</a>
</li>
</ul>
</div>
</div>
</div>
</div>