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

Merge pull request #2381 from bechi/home/structure

Browse source 
New structure
This commit is contained in:
Gustavo Maximiliano Cortez 2015-02-02 17:25:43 -03:00
commit 5150df6615
7 changed files with 97 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

11
views/copayers.html
View file

@ -6,7 +6,7 @@
</div>
<div class="row">
<div class="large-12 columns">
<div class="large-8 columns">
<div ng-if="!$root.wallet.isComplete()">
<div class="panel oh">
@ -35,18 +35,21 @@
</div>
</div>
</div>
</div>
<div class="large-4 columns">
<div class="panel oh">
<h3>Waiting for copayers</h3>
<div ng-include="'views/includes/copayers.html'"></div>
<div class="copay-box" ng-if="!$root.wallet.isComplete()">
<span ng-include="'views/includes/photo.html'"></span>
<p class="size-12 text-white text-light m0">
<div ng-if="!$root.wallet.isComplete()" class="m15t">
<div class="left m10r" ng-include="'views/includes/photo.html'"></div>
<p class="size-12 m0 m5t left mv">
<i class="fi-loop icon-rotate spinner"></i>
<span translate>Waiting...</span>
</p>
</div>
</div>
</div>
</div>
<!-- end of row -->
<div class="row">

81
views/homeWallet.html
View file

@ -4,51 +4,43 @@
<h1 translate>Home</h1>
</div>
</div>
<div class="row">
<div class="large-12 columns">
<div class="columns">
<div class="panel oh">
<div class="row p10b">
<div class="large-8 medium-6 small-4 columns">
<div class="oh">
<div class="avatar-wallet left">{{$root.wallet.getName() | limitTo: 1}}</div>
<h2 class="m10t ellipsis hide-for-small-only">
{{$root.wallet.getName()}}
</h2>
</div>
</div>
<div class="large-4 medium-6 small-8 columns">
<div class="text-right">
<span class="size-21">
<strong>
<span ng-if="!$root.updatingBalance">{{$root.wallet.balanceInfo.totalBalance || 0}}</span>
<span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
{{$root.wallet.settings.unitName}}
</strong>
</span>
<span class="size-14 db m5t text-gray">
<span ng-if="!$root.wallet.balanceInfo.updatingBalance && $root.wallet.balanceInfo.alternativeBalanceAvailable">{{$root.wallet.balanceInfo.totalBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}}</span>
<span ng-if="!$root.wallet.balanceInfo.updatingBalance && !$root.wallet.balanceInfo.alternativeBalanceAvailable">N/A</span>
<span ng-if="$root.wallet.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
</span>
</div>
</div>
<div class="amount hide-for-large-up">
<span class="size-36">
<strong>
<span ng-if="!$root.updatingBalance">{{$root.wallet.balanceInfo.totalBalance || 0}}</span>
<span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
{{$root.wallet.settings.unitName}}
</strong>
</span>
<span class="size-14 db m5t text-gray">
<span ng-if="!$root.wallet.balanceInfo.updatingBalance && $root.wallet.balanceInfo.alternativeBalanceAvailable">{{$root.wallet.balanceInfo.totalBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}}</span>
<span ng-if="!$root.wallet.balanceInfo.updatingBalance && !$root.wallet.balanceInfo.alternativeBalanceAvailable">N/A</span>
<span ng-if="$root.wallet.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
</span>
</div>
<div class="row line-t">
<div class="small-4 medium-4 columns m5t size-12 hide-for-large-up">
<a ng-click="$root.go('more')"><i class="fi-widget"></i> Settings</a>
</div>
<div class="small-8 medium-8 columns m5t">
<div class="text-right size-12">
<span ng-if="!$root.wallet.isShared()">Personal Wallet</span>
<span ng-if="$root.wallet.isShared()">
Multisignature wallet [{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ]
</span>
<span ng-if="$root.wallet.isTestnet()"> in TESTNET</span>
<div class="pr">
<div class="avatar-wallet left">{{$root.wallet.getName() | limitTo: 1}}</div>
<div class="wallet-info">
<p class="m0">
{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}}
</p>
<div class="size-12 text-gray">
<span ng-if="$root.wallet.isShared() && !$root.wallet.isTestnet()">Multisignature wallet </span>
<span ng-if="!$root.wallet.isShared() && !$root.wallet.isTestnet()">Personal Wallet</span>
<span ng-if="$root.wallet.isTestnet()"> Testnet</span>
</div>
</div>
<div class="right">
<a ng-click="$root.go('more')" class="button outline light-gray tiny m0">
<i class="fi-widget size-18 vm"></i>
<span class="show-for-medium-up">Settings</span>
</a>
</div>
</div>
</div>
</div>
@ -78,14 +70,5 @@
</div>
</div>
<div class="row" ng-if="$root.wallet.isShared()">
<!-- List of copayers -->
<div class="large-12 columns">
<div class="panel oh">
<h2 class="line-b" translate>Copayers</h2>
<div ng-include="'views/includes/copayers.html'"></div>
</div>
</div>
</div>
</div>
<div class="extra-margin-bottom"></div>

19
views/includes/copayers.html
View file

@ -1,12 +1,11 @@
<div>
<div class="copay-box" ng-repeat="copayer in $root.wallet.getRegisteredPeerIds()">
<div class="photo-container">
<img gravatar-src="'{{copayer.nick}}'" gravatar-size="35">
<ul class="no-bullet m0">
<li class="oh m15t" ng-repeat="copayer in $root.wallet.getRegisteredPeerIds()">
<div class="left m10r" >
<div class="photo-container">
<img gravatar-src="'{{copayer.nick}}'" gravatar-size="35">
</div>
</div>
<div
class="ellipsis"
tooltip="ID: {{copayer.peerId}}"
tooltip-placement="bottom">
<div class="left" tooltip="ID: {{copayer.peerId}}" tooltip-placement="bottom">
<small class="text-gray" ng-show="copayer.index == 0">
<i class="fi-check m5r"></i> {{'Me'|translate}}
</small>
@ -14,5 +13,5 @@
<i class="fi-check m5r"></i> {{copayer.nick}}
</small>
</div>
</div>
</div>
</li>
</ul>

13
views/more.html
View file

@ -22,9 +22,8 @@
</div>
</div>
</form>
<div class="row" ng-init="isComplete = wallet.isComplete(); networkName = wallet.getNetworkName()">
<div class="large-12 columns">
<div class="row">
<div class="large-8 columns" ng-init="isComplete = wallet.isComplete(); networkName = wallet.getNetworkName()">
<h4>Wallet info</h4>
<table>
<tr>
@ -49,10 +48,16 @@
</tr>
</table>
</div>
<div class="large-4 columns" ng-if="$root.wallet.isShared()">
<h4>Copayers</h4>
<div class="panel oh">
<div ng-include="'views/includes/copayers.html'"></div>
</div>
</div>
</div>
<div class="row" ng-show="!backupWalletPlainText && !error">
<div class="large-12 medium-12 small-12 columns">
<div class="large-8 medium-12 small-12 columns">
<button class="primary expand" ng-click="downloadWalletBackup()" ng-disabled="loading"
ng-show="!isSafari && !isCordova"><i class="fi-download"></i> Download backup</button>
<button class="primary expand" ng-click="viewWalletBackup()" ng-disabled="loading"