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

Cleaning main screen

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-02-03 18:24:13 -03:00
commit f5dabcc218
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
11 changed files with 40 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

22
public/views/includes/walletInfo.html
View file

@ -1,16 +1,20 @@
<span ng-show="index.isShared"><span translate>{{index.m}}-of-{{index.n}}</span></span>
<img style="height:1em" ng-show="index.network != 'livenet'" src="img/icon-testnet.svg">
<img style="height:1em" ng-show="!index.canSign && !index.isPrivKeyExternal" src="img/icon-read-only.svg">
<span ng-show="index.isShared" class="size-12"><span translate>{{index.m}}-of-{{index.n}}</span></span>
<img style="height:0.6em; margin-right: 1px;" ng-show="index.network != 'livenet'" src="img/icon-testnet-white.svg">
<img style="height:0.6em; margin-right: 1px;" ng-show="!index.canSign && !index.isPrivKeyExternal"
src="img/icon-read-only-white.svg">
<img style="height:1em" ng-show="index.externalSource == 'trezor'" src="img/icon-trezor.svg">
<img style="height:1em" ng-show="index.externalSource == 'ledger'" src="img/icon-ledger.svg">
<span style="height:1em" ng-show="index.account">#{{index.account || 0}} </span>
<img style="height:0.6em; margin-right: 1px;" ng-show="index.externalSource == 'trezor'"
src="img/icon-trezor-white.svg">
<img style="height:0.6em; margin-right: 1px;" ng-show="index.externalSource == 'ledger'"
src="img/icon-ledger-white.svg">
<span class="size-12 dib" style="height:0.6em; margin-right: 1px;" ng-show="index.account">#{{index.account || 0}} </span>
<img style="height:1em" ng-show="index.isPrivKeyEncrypted" src="img/icon-lock.svg">
<img style="height:0.6em; margin-right: 1px;" ng-show="index.isPrivKeyEncrypted" src="img/icon-lock-white.svg">
<!-- <img style="height:1em" ng&#45;show="index.preferences.email" src="img/icon&#45;email.svg"> -->
<img style="height:1em" ng-show="index.usingCustomBWS" src="img/icon-bws.svg">
<img style="height:0.6em; margin-right: 1px;" ng-show="index.usingCustomBWS" src="img/icon-bws-white.svg">
<img style="height:1em" class="animated flash infinite" ng-show="index.loadingWallet || index.updatingTxHistory[index.walletId]" src="img/icon-sync.svg">
<img style="height:0.6em" class="animated flash infinite" ng-show="index.loadingWallet ||
index.updatingTxHistory[index.walletId]" src="img/icon-sync-white.svg">

33
public/views/walletHome.html
View file

@ -107,29 +107,8 @@
</div>
</div> <!-- amount -->
<div class="avatar-name columns line-b">
<div class="avatar-wallet left"
ng-style="{'background-color':index.backgroundColor}">
<i class="icon-wallet size-24"></i>
</div>
<div class="wallet-info">
<div ng-show="index.isShared">
<p class="m0">
{{(index.alias || index.walletName)}}
</p>
<div class="size-12 text-gray">
<span ng-include="'views/includes/walletInfo.html'"></span>
</div>
</div>
<div ng-show="!index.isShared">
<p class="m0">
{{(index.alias || index.walletName)}}
</p>
<div class="size-12 text-gray">
<span ng-include="'views/includes/walletInfo.html'"></span>
</div>
</div>
</div>
<div class="wallet-info">
<span ng-include="'views/includes/walletInfo.html'"></span>
</div>
<div class="camera-icon" ng-show="index.isComplete">
<qr-scanner on-scan="home.onQrCodeScanned(data)"></qr-scanner>
@ -137,7 +116,7 @@
</div> <!-- oh -->
<div class="m20t" ng-show="index.notAuthorized && ! index.anyOnGoingProcess">
<div class="oh pr m20t" ng-show="index.notAuthorized && ! index.anyOnGoingProcess">
<div class="text-center text-warning">
<i class="fi-alert"></i>
<span translate>
@ -155,7 +134,7 @@
</div>
</div>
<div ng-if="index.txps[0]">
<div class="oh pr" ng-if="index.txps[0]">
<h4 ng-show="index.requiresMultipleSignatures" class="title m0" translate>Payment Proposals</h4>
<h4 ng-show="!index.requiresMultipleSignatures" class="title m0" translate>Unsent transactions</h4>
<div class="last-transactions pr" ng-repeat="tx in index.txps">
@ -174,7 +153,7 @@
<!-- Activity -->
<div
class="m20t text-gray size-12 text-center"
class="oh pr m20t text-gray size-12 text-center"
ng-show="!index.loadingWallet && !index.txHistory[0] && !index.updatingTxHistory[index.walletId] &&
!index.txHistoryError && !index.updateError" translate>
No transactions yet
@ -198,7 +177,7 @@
</div>
</div>
<div ng-show="index.txHistory[0]">
<div class="oh pr" ng-show="index.txHistory[0]">
<h4 class="title m0">
<span translate>Activity</span>
</h4>