This commit is contained in:
Matias Alejo Garcia 2016-08-19 13:07:18 -03:00
commit a8cf875def
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
22 changed files with 53 additions and 1392 deletions

View file

@ -163,7 +163,7 @@
<button
class="button round expand"
href ui-sref="walletHome"
href ui-sref="tabs.home"
translate>Finish
</button>
<!-- hide this in multisig just to show less text -->

View file

@ -1,14 +0,0 @@
<a ng-click="index.setTab(item, false, 0, true)"
ng-style="{'color': index.tab == item.link ? index.backgroundColor : '#A5B2BF'}"
id="menu-{{item.link}}">
<i class="size-18 {{item.icon[index.tab == item.link]}} db"></i>
<span class="size-10 tu">
{{ item.title|translate }}
<span class="label round"
ng-style="{'background-color':index.backgroundColor}"
ng-if="item.link=='walletHome' && index.pendingTxProposalsCountForUs > 0">
{{ index.pendingTxProposalsCountForUs }}
</span>
</span>
<div ng-if="item.link == 'walletHome'" class="menu-wallet-home"></div>
</a>

View file

@ -1,57 +0,0 @@
<div class="sidebar" ng-controller="sidebarController as sidebar">
<header>
<img ng-if="sidebar.isWindowsPhoneApp" src="img/logo-negative.png" alt="Copay" width="80">
<img ng-if="!sidebar.isWindowsPhoneApp" src="img/logo-negative.svg" alt="Copay" width="80">
<div ng-include="'views/includes/version.html'"></div>
</header>
<ion-content>
<ul class="pr">
<li ng-show="sidebar.wallets[0]"
ng-repeat="item in sidebar.wallets track by $index" ng-class="{'selected': item.id == index.walletId}" class="nav-item"
menu-toggle href ui-sref="walletHome" on-tap="sidebar.switchWallet(item.id, index.walletId)">
<div class="avatar-wallet" ng-style="{'background-color':item.color}">
<i class="icon-wallet size-21"></i>
</div>
<div class="name-wallet" ng-class="{'m8t':item.n == 1}">{{item.name || item.id}}</div>
<div class="size-12" ng-show="item.n > 1" translate>{{item.m}}-of-{{item.n}}</div>
</li>
<li menu-toggle href ui-sref="add">
<i class="icon-arrow-right3 size-18 right m10t vm"></i>
<i class="fi-plus size-24 icon vm"></i>
<div class="tu text-bold">
<span class="size-12" translate>Add wallet</span>
</div>
<div translate>Create, join or import</div>
</li>
<li menu-toggle href ui-sref="bitpayCard" ng-show="index.isComplete && sidebar.bitpayCardEnabled">
<i class="icon-arrow-right3 size-18 right m10t vm"></i>
<i class="fi-credit-card size-24 icon vm"></i>
<div class="tu text-bold m10t">
<span class="size-12" translate>BitPay Card</span>
</div>
</li>
<li ng-show="!index.noFocusedWallet && !index.isWindowsPhoneApp && (index.glideraEnabled || index.coinbaseEnabled)" menu-toggle href ui-sref="buyandsell">
<i class="icon-arrow-right3 size-18 right m10t vm"></i>
<i class="icon-bank size-24 icon vm"></i>
<div class="tu text-bold m5t">
<span class="size-12" translate>Buy and Sell</span>
</div>
</li>
<li menu-toggle href ui-sref="amazon" ng-show="index.isComplete">
<i class="icon-arrow-right3 size-18 right m10t vm"></i>
<i class="fi-shopping-bag size-24 icon vm"></i>
<div class="tu text-bold m10t">
<span class="size-12" translate>Gift Cards</span>
</div>
</li>
<li ng-show="!index.noFocusedWallet" menu-toggle href ui-sref="preferencesGlobal">
<i class="icon-arrow-right3 size-18 right m10t vm"></i>
<i class="fi-widget size-24 icon vm"></i>
<div class="tu text-bold">
<span class="size-12" translate>Settings</span>
</div>
<div translate>Global preferences</div>
</li>
</ul>
</ion-content>
</div>

View file

@ -104,10 +104,10 @@
<div translate>
Only Main (not change) addresses are shown. The addresses on this list were not verified locally at this time.
</div>
<button class="button button-block" ng-style="{'color':wallet.color}" href ui-sref="walletHome" ng-click="index.retryScan()" translate>
<button class="button button-block button-positive" href ui-sref="walletHome" ng-click="scan()" translate>
Scan addresses for funds
</button>
<button class="button button-block" ng-style="{'color':wallet.color}" ng-show="isCordova" ng-click="sendAddrs()" translate>
<button class="button button-block button-positive" ng-show="isCordova" ng-click="sendAddrs()" translate>
Send addresses by email
</button>