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

Merge pull request #1704 from cmgustavo/bug/04-ui

Browse source 
Bug/04 ui
This commit is contained in:
Matias Alejo Garcia 2014-11-03 18:15:35 -03:00
commit e9eb311339
12 changed files with 165 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

52
views/copayers.html
View file

@ -1,35 +1,37 @@
<div class="waiting-copayers" ng-controller="CopayersController">
<div ng-controller="CopayersController">
<div ng-if='$root.wallet && $root.wallet.isReady()' ng-init="goToWallet()"></div>
<div class="row collapse">
<h1 translate class="hide-for-large-up">
Waiting copayers for {{$root.wallet.getName()}}
<small>{{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}}</small>
</h1>
<div class="row">
<div class="large-12 columns">
<div ng-if="!$root.wallet.isReady()">
<h2>
<span translate>Waiting copayers for</span>
{{$root.wallet.getName()}}
<small>{{$root.wallet.requiredCopayers}}-{{'of'|translate}}-{{$root.wallet.totalCopayers}}</small>
<div ng-if="!$root.wallet.isReady()">
<div class="panel oh">
<h2 class="line-b">
Share this secret with your other copayers
<small>{{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}}</small>
</h2>
<div class="panel oh">
<qrcode size="350" data="{{$root.wallet.getSecret()}}"></qrcode>
<div class="secret">
<h3 translate>Share this secret with your other copayers</h3>
{{$root.wallet.getSecret()}}
<span class="btn-copy" clip-copy="$root.wallet.getSecret()"></span>
</div>
<div class="text-center">
<qrcode size="250" data="{{$root.wallet.getSecret()}}"></qrcode>
</div>
<div class="secret m20t">
{{$root.wallet.getSecret()}}
<span class="btn-copy" clip-copy="$root.wallet.getSecret()"></span>
</div>
</div>
<div class="panel p20">
<div class="oh">
<div ng-include="'views/includes/copayer.html'"></div>
<div class="copay-box" ng-if="!$root.wallet.isReady()">
<span ng-include="'views/includes/photo.html'"></span>
<p class="size-12 text-white text-light m0">
<i class="fi-loop icon-rotate spinner"></i>
<span translate>Waiting...</span>
</p>
</div>
</div>
</div>
<div class="panel oh">
<div ng-include="'views/includes/copayer.html'"></div>
<div class="copay-box" ng-if="!$root.wallet.isReady()">
<span ng-include="'views/includes/photo.html'"></span>
<p class="size-12 text-white text-light m0">
<i class="fi-loop icon-rotate spinner"></i>
<span translate>Waiting...</span>
</p>
</div>
</div>
</div>
</div> <!-- end of row -->
</div>

139
views/history.html
View file

@ -1,80 +1,87 @@
<div class="transactions" data-ng-controller="HistoryController" data-ng-init="update()">
<div ng-show='$root.wallet.isReady()'>
<div ng-if="loading" class="m10b">
<div ng-if="loading" class="m20b">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
<span translate>Loading...</span>
</div>
<div ng-if="!blockchain_txs[0].txid && !loading">
<em><strong translate>No transactions yet.</strong></em>
</div>
<div class="panel large-12 columns" ng-repeat="btx in blockchain_txs | orderBy: 'time':true" ng-click="btx.showDetails = !btx.showDetails">
<div class="row collapse size-14">
<div class="large-2 medium-2 small-4 columns">
<span ng-hide="btx.ts">&nbsp;</span>
<time ng-if="btx.ts">{{btx.ts | amCalendar}}</time>
<span class="label alert" ng-show="!btx.ts && (!btx.confirmations || btx.confirmations == 0)">
<span translate>Unconfirmed</span>
</span>
</div>
<div
class="row"
ng-if="blockchain_txs[0].txid">
<div class="large-12 colums">
<div class="panel oh"
ng-repeat="btx in blockchain_txs | orderBy: 'time':true" ng-click="btx.showDetails = !btx.showDetails">
<div class="row size-14">
<div class="large-2 medium-3 small-12 columns">
<span ng-hide="btx.ts">&nbsp;</span>
<time ng-if="btx.ts">{{btx.ts | amCalendar}}</time>
<span class="label alert" ng-show="!btx.ts && (!btx.confirmations || btx.confirmations == 0)">
<span translate>Unconfirmed</span>
</span>
</div>
<div class="large-2 medium-3 small-6 columns text-right">
<div ng-class="{
'text-primary' : btx.action == 'received',
'text-warning': btx.action == 'sent',
'text-gray': btx.action == 'moved'}">
<b>{{btx.amount| noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
<i class="m15h"
ng-class="{
'fi-arrow-left' : btx.action == 'received',
'fi-arrow-right': btx.action == 'sent',
'fi-arrow-loop': btx.action == 'moved'}"></i>
</div>
</div>
<div class="large-3 medium-3 small-6 columns text-gray">
<span ng-hide="btx.labelTo">&nbsp;</span>
<span ng-show="btx.labelTo">{{btx.labelTo}}</span>
</div>
<div class="large-4 medium-3 small-12 columns text-gray">
<span ng-show="btx.comment"><i class="fi-comment-quotes"></i> {{btx.comment}} </span>
</div>
<div class="large-1 columns show-for-large-up text-gray text-right" ng-init="btx.showDetails = false">
<a>
<i ng-if="!btx.showDetails" class="icon-arrow-down4"></i>
<i ng-if="btx.showDetails" class="icon-arrow-up4 size-12"></i>
</a>
</div>
<div class="large-2 medium-2 small-5 columns text-right">
<div ng-if="btx.action == 'received' " class="text-primary">
<b>{{btx.amount| noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
<i class="m15h fi-arrow-left" tooltip="{{'received'|translate}}" tooltip-placement="bottom"></i>
</div>
<div ng-if="btx.action == 'sent' " class="text-warning">
<b>{{btx.amount| noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
<i class="m15h fi-arrow-right" tooltip="{{'Sent'|translate}}" tooltip-placement="bottom"></i>
<div ng-show="btx.showDetails">
<table class="last-transactions-content" ng-if="btx.actionList.0">
<tbody>
<tr ng-repeat="c in btx.actionList">
<td class="copayer-name text-gray" width="100%">{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}
</td>
<td>
<i ng-if="c.actions.create" class="fi-crown icon-status icon-active"></i>
<i ng-if="!c.actions.create" class="fi-crown icon-status"></i>
</td>
<td>
<i ng-if="c.actions.seen" class="fi-eye icon-status icon-active"></i>
<i ng-if="!c.actions.seen" class="fi-eye icon-status"></i>
</td>
<td>
<i ng-if="c.actions.rejected" class="fi-x icon-status icon-active-x"></i>
<i ng-if="c.actions.sign" class="fi-check icon-status icon-active-check"></i>
<i ng-if="!c.actions.sign && !c.actions.rejected && tx.missingSignatures" class="fi-loop icon-rotate"></i>
</td>
</tr>
</tbody>
</table>
<div class="line"></div>
<div class="size-12 text-gray">
<span class="left hide-for-small-only">Transaction ID: {{btx.txid}} </span>
<a href="http://{{getShortNetworkName()}}.insight.is/tx/{{btx.txid}}" target="_blank" class="right"> More details <i class="icon-arrow-right2 vm"></i> </a>
</div>
</div>
<div ng-if="btx.action == 'moved' " class="text-gray">
<b>{{btx.amount| noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
<i class="m15h fi-loop" tooltip="{{'Moved'|translate}}" tooltip-placement="bottom"></i>
</div>
</div>
<div class="large-3 medium-3 columns hide-for-small-only text-gray">
<span ng-hide="btx.labelTo">&nbsp;</span>
<span ng-show="btx.labelTo">{{btx.labelTo}}</span>
</div>
<div class="large-3 medium-3 small-4 columns hide-for-small-only text-gray">
<span ng-show="btx.comment"><i class="fi-comment-quotes"></i> {{btx.comment}} </span>
</div>
<div class="large-1 medium-1 small-1 columns text-right"
ng-init="btx.showDetails = false">
<a>
<i ng-if="!btx.showDetails" class="icon-arrow-down4"></i>
<i ng-if="btx.showDetails" class="icon-arrow-up4 size-12"></i>
</a>
</div>
</div>
<div ng-show="btx.showDetails">
<table class="last-transactions-content" ng-if="btx.actionList.0">
<tbody>
<tr ng-repeat="c in btx.actionList">
<td class="copayer-name text-gray" width="100%">{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}
</td>
<td>
<i ng-if="c.actions.create" class="fi-crown icon-status icon-active"></i>
<i ng-if="!c.actions.create" class="fi-crown icon-status"></i>
</td>
<td>
<i ng-if="c.actions.seen" class="fi-eye icon-status icon-active"></i>
<i ng-if="!c.actions.seen" class="fi-eye icon-status"></i>
</td>
<td>
<i ng-if="c.actions.rejected" class="fi-x icon-status icon-active-x"></i>
<i ng-if="c.actions.sign" class="fi-check icon-status icon-active-check"></i>
<i ng-if="!c.actions.sign && !c.actions.rejected && tx.missingSignatures" class="fi-loop icon-rotate"></i>
</td>
</tr>
</tbody>
</table>
<div class="line"></div>
<div class="size-12 text-gray">
<span class="left hide-for-small-only">Transaction ID: {{btx.txid}} </span>
<a href="http://{{getShortNetworkName()}}.insight.is/tx/{{btx.txid}}" target="_blank" class="right"> More details <i class="icon-arrow-right2 vm"></i> </a>
</div>
</div>
</div>

2
views/home.html
View file

@ -4,7 +4,7 @@
<i class="size-60 fi-bitcoin-circle icon-rotate spinner"></i>
<span translate>Accessing your profile...</span>
</div>
<div class="large-4 large-centered medium-6 medium-centered columns" ng-show="!loading && !retreiving">
<div class="large-4 large-centered medium-6 medium-centered columns" ng-if="!loading && !retreiving">
<div class="logo-setup">
<img src="img/logo-negative-beta.svg" alt="Copay" width="146" height="59">
<div ng-include="'views/includes/version.html'"></div>

56
views/homeWallet.html
View file

@ -1,19 +1,32 @@
<div class="home-wallet" ng-controller="HomeWalletController">
<div ng-show='$root.wallet.isReady()'>
<h1 translate class="hide-for-large-up">Home</h1>
<h1 translate class="hide-for-large-up">Home</h1>
<!-- Wallet name and balance -->
<div class="panel">
<div class="row collapse">
<div class="large-1 small-2 columns">
<div class="avatar-wallet">{{$root.wallet.getName() | limitTo: 1}}</div>
</div>
<div class="large-9 small-5 columns">
<h2 class="ellipsis m10t">{{$root.wallet.getName()}}</h2>
</div>
<div class="large-2 small-5 columns text-right text-black" ng-if="$root.wallet && !$root.updatingBalance" data-options="disable_for_touch:true">
<b class="db m5b size-21">{{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
<span class="size-14 m5t text-gray">{{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}</span>
<div class="row">
<div class="large-12 columns">
<div class="panel oh">
<div class="row">
<div class="large-8 medium-6 small-3 columns">
<div class="avatar-wallet left">{{$root.wallet.getName() | limitTo: 1}}</div>
<h2 class="ellipsis m10t left hide-for-small-only">{{$root.wallet.getName()}}</h2>
</div>
<div class="large-4 medium-6 small-9 columns">
<div class="text-right">
<span class="size-21">
<strong>
<span ng-if="!$root.updatingBalance">{{totalBalance || 0 |noFractionNumber}}</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.updatingBalance">{{totalBalanceAlternative |noFractionNumber:2}}</span>
<span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
{{alternativeIsoCode}}
</span>
</div>
</div>
</div>
</div>
</div>
</div>
@ -40,28 +53,15 @@
</div>
</div>
</div>
<!-- List of copayers -->
<div class="large-6 columns">
<div class="panel oh">
<h2 class="line-b" translate>Copayers</h2>
<div class="copay-box" ng-repeat="copayer in copayersList()">
<span ng-include="'views/includes/photo.html'"></span>
<div
class="ellipsis"
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>
<small class="text-gray" ng-show="copayer.index > 0"><i class="fi-check m5r"></i>{{copayer.nick}}</small>
</div>
<div translate class="success label m10t" ng-show="isBackupReady(copayer)">Ready</div>
</div>
<div ng-include="'views/includes/copayer.html'"></div>
</div>
</div>
</div>
</div>
</div>

9
views/includes/copayer.html
View file

@ -6,10 +6,11 @@
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>
<small class="text-gray" ng-show="copayer.index > 0"><i class="fi-check m5r"></i>{{copayer.nick}}</small>
<i class="fi-check m5r"></i> {{'Me'|translate}}
</small>
<small class="text-gray" ng-show="copayer.index > 0">
<i class="fi-check m5r"></i> {{copayer.nick}}
</small>
</div>
<div translate class="success label m10t" ng-show="isBackupReady(copayer)">Ready</div>
</div>
</div>

19
views/includes/head.html
View file

@ -1,5 +1,15 @@
<div class="title">
<h1>{{$root.title}}</h1>
<h1>
{{$root.title}}
<small>
<a class="text-gray" ng-click="refresh()" ng-if="!$root.updatingBalance">
<i class="fi-refresh"></i>
</a>
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
</small>
</h1>
</div>
@ -17,11 +27,6 @@
</ul>
</div>
<div class="right">
<a class="button tiny secondary radius oh" href="#!/manage" title="Manage wallets"><i class="fi-plus"></i> {{'Manage wallets' | translate }}</a>
</div>
<div class="right m20r m5t">
<a ng-click="refresh()" class="size-18 text-gray">
<i class="fi-refresh right"></i>
</a>
<a class="button tiny secondary radius m0" href="#!/manage" title="Manage wallets"><i class="fi-plus"></i> {{'Manage wallets' | translate }}</a>
</div>

26
views/includes/peer-list.html
View file

@ -1,26 +0,0 @@
<div ng-controller="CopayersController"
class="copayers"
ng-mouseenter="showCopayers=1"
ng-mouseleave="showCopayers=0">
<h3>
<i class="fi-torsos-all size-21 m20r"></i>
<span translate>Copayers</span>
<small class="m15l">
{{$root.wallet.requiredCopayers}} <span translate>of</span> {{$root.wallet.totalCopayers}}
</small>
</h3>
<div class="copay-box-small" ng-repeat="copayer in copayersList()"
ng-show="showCopayers">
<img
class="br100 online"
src="./img/satoshi.gif"
alt="{{copayer.peerId}}"
width="30">
<div tooltip-placement="top" tooltip="{{copayer.nick}}">
<small class="text-gray db" ng-show="copayer.index == 0">{{'Me'|translate}}</small>
<small class="text-gray ellipsis" ng-show="copayer.index > 0">{{copayer.nick}}</small>
</div>
</div>
</div>