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

Fix Conflicts:

Browse source 
views/unsupported.html
This commit is contained in:
Gustavo Maximiliano Cortez 2014-08-06 18:51:04 -03:00
commit 0c2141c380
53 changed files with 1983 additions and 1297 deletions
Download patch file Download diff file Expand all files Collapse all files

7
views/copayers.html
View file

@ -3,6 +3,7 @@
<div class="row" ng-if='$root.wallet && !$root.wallet.isReady() && !loading'>
<div class="large-4 columns logo-setup">
<img src="img/logo-negative-beta.svg" alt="Copay">
<div ng-include="'views/includes/version.html'"></div>
</div>
<div class="large-8 columns line-dashed-setup-v">
<div class="box-setup oh">
@ -73,8 +74,12 @@
</div>
<div class="text-right">
<a class="text-warning" ng-really-click="deleteWallet()"
ng-really-message="Are you sure to delete this wallet from this
computer?">Delete wallet</a>
<span class="text-gray">|</span>
<a class="text-primary m20r" ng-click="downloadBackup()"
ng-show="!$root.wallet.publicKeyRing.isComplete()">Download seed backup</a>
ng-show="!$root.wallet.publicKeyRing.isComplete()">Download seed backup</a>
<button class="button primary m0"
ng-click="backup()"
ng-show="!$root.wallet.publicKeyRing.isBackupReady()"

1
views/home.html
View file

@ -2,6 +2,7 @@
<div class="row">
<div class="large-4 columns logo-setup">
<img src="img/logo-negative-beta.svg" alt="Copay">
<div ng-include="'views/includes/version.html'"></div>
</div>
<div class="large-8 columns line-dashed-setup-v">
<div class="button-setup" ng-show="hasWallets">

1
views/import.html
View file

@ -6,6 +6,7 @@
<div class="row" ng-init="choosefile=0; pastetext=0" ng-show="!loading">
<div class="large-4 columns logo-setup">
<img src="img/logo-negative-beta.svg" alt="Copay">
<div ng-include="'views/includes/version.html'"></div>
</div>
<div class="large-8 columns line-dashed-setup-v">
<div class="box-setup">

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

@ -25,7 +25,7 @@
src="./img/satoshi.gif"
alt="{{copayer}}">
<span ng-show="copayer.index == 0">you</span>
<span ng-show="copayer.index == 0">Me</span>
<span ng-show="copayer.index > 0">{{copayer.nick}}</span>
<span class="btn-copy" clip-copy="copayer.peerId"></span>
</li>

4
views/includes/sidebar-mobile.html
View file

@ -4,9 +4,7 @@
<a href="#!/addresses" class="db">
<img src="img/logo-negative-beta.svg" alt="" width="80">
</a>
<small>v{{version}}</small>
<small ng-if="$root.wallet.getNetworkName()=='livenet'">LIVENET</small>
<small ng-if="$root.wallet.getNetworkName()=='testnet'">TESTNET</small>
<div ng-include="'views/includes/version.html'"></div>
</div>
<div class="line-sidebar-b"></div>
<div class="founds size-12 text-center box-founds p10t">

8
views/includes/sidebar.html
View file

@ -4,11 +4,7 @@
<a href="#!/addresses" class="db">
<img src="img/logo-negative-beta.svg" alt="" width="100">
</a>
<div>
<small>v{{version}}</small>
<small ng-if="$root.wallet.getNetworkName()=='livenet'">LIVENET</small>
<small ng-if="$root.wallet.getNetworkName()=='testnet'">TESTNET</small>
</div>
<div ng-include="'views/includes/version.html'"></div>
</div>
<div class="line-sidebar"></div>
<div>
@ -64,7 +60,7 @@
</li>
</ul>
<div ng-include="'views/includes/peer-list.html'"></div>
<div ng-show="$root.wallet.isShared()" ng-include="'views/includes/peer-list.html'"></div>
</div>

5
views/includes/version.html Normal file
View file

@ -0,0 +1,5 @@
<div ng-controller="VersionController">
<small>v{{version}}</small>
<small ng-if="networkName=='testnet'">[ {{networkName}} ]</small>
</div>

2
views/includes/video.html
View file

@ -18,7 +18,7 @@
class="ellipsis"
tooltip="ID: {{copayer.peerId}}"
tooltip-placement="bottom">
<small class="text-gray" ng-show="copayer.index == 0"><i class="fi-check m5r"></i>you</small>
<small class="text-gray" ng-show="copayer.index == 0"><i class="fi-check m5r"></i>Me</small>
<small class="text-gray" ng-show="copayer.index > 0"><i class="fi-check m5r"></i>{{copayer.nick}}</small>
</div>

20
views/join.html
View file

@ -6,6 +6,7 @@
<div class="row" ng-show="!loading">
<div class="large-4 columns logo-setup">
<img src="img/logo-negative-beta.svg" alt="Copay">
<div ng-include="'views/includes/version.html'"></div>
</div>
<div class="large-8 columns line-dashed-setup-v">
<div class="box-setup">
@ -19,13 +20,17 @@
ng-show="joinForm.connectionId.$pristine" class="has-tip
text-gray" tooltip="Paste wallet secret here" >Required</small>
</label>
<input id="connectionId" type="text" class="small-9 columns" placeholder="Paste wallet secret here" name="connectionId" ng-model="connectionId" wallet-secret required style="width:85%;">
<div class="small-2 columns" style="padding:0px;width:15%;" ng-hide="showScanner">
<a class="postfix button primary" ng-click="openScanner()"><i class="fi-camera">&nbsp;</i></a>
</div>
<div class="small-2 columns" style="padding:0px;width:15%;" ng-show="showScanner">
<a class="postfix button warning" ng-click="cancelScanner()"><i class="fi-x">&nbsp;</i></a>
<div class="row collapse">
<div class="large-10 columns">
<input id="connectionId" type="text" class="small-9 columns" placeholder="Paste wallet secret here" name="connectionId" ng-model="connectionId" wallet-secret required>
</div>
<div class="small-2 columns" ng-hide="showScanner">
<a class="postfix button primary" ng-click="openScanner()"><i class="fi-camera">&nbsp;</i></a>
</div>
<div class="small-2 columns" ng-show="showScanner">
<a class="postfix button warning" ng-click="cancelScanner()"><i class="fi-x">&nbsp;</i></a>
</div>
</div>
<div id="scanner" class="row" ng-if="showScanner">
@ -46,7 +51,6 @@
</div>
</div>
<div style="clear: both;"></div>
<label for="joinPassword"> User info </label>
<input id="joinPassword" type="text" class="form-control" placeholder="Your name (optional)" name="nickname" ng-model="nickname">
<input type="password" class="form-control"

2
views/modals/qr-address.html
View file

@ -10,7 +10,7 @@
{{address.balance || 0|noFractionNumber}} {{$root.unitName}}
</p>
<button class="m15t button secondary" open-external address="{{address.address}}">
<i class="fi-link">&nbsp;</i> Open in external aplication
<i class="fi-link">&nbsp;</i> Open in external application
</button>
</div>
</div>

1
views/open.html
View file

@ -6,6 +6,7 @@
<div class="row" ng-show="!loading">
<div class="large-4 columns logo-setup">
<img src="img/logo-negative-beta.svg" alt="Copay">
<div ng-include="'views/includes/version.html'"></div>
</div>
<div class="large-8 columns line-dashed-setup-v">
<div class="box-setup">

4
views/send.html
View file

@ -77,7 +77,7 @@
</div>
</div>
<div class="row" ng-show="wallet.totalCopayers > 1">
<div class="row" ng-show="wallet.isShared()">
<div class="large-12 columns">
<div class="row collapse">
<label for="comment">Note
@ -116,7 +116,7 @@
Including fee of {{defaultFee|noFractionNumber}} {{$root.unitName}}
</small>
</p>
<div ng-show="wallet.totalCopayers > 1">
<div ng-show="wallet.isShared()">
<h6>Note</h6>
<p ng-class="{'hidden': !commentText}">{{commentText}}</p>
</div>

1
views/settings.html
View file

@ -2,6 +2,7 @@
<div class="row">
<div class="large-4 columns logo-setup">
<img src="img/logo-negative-beta.svg" alt="Copay">
<div ng-include="'views/includes/version.html'"></div>
</div>
<div class="large-8 columns line-dashed-setup-v">
<div class="box-setup">

3
views/setup.html
View file

@ -8,6 +8,7 @@
<div class="row">
<div class="large-4 columns logo-setup text-center">
<img src="img/logo-negative-beta.svg" alt="Copay">
<div ng-include="'views/includes/version.html'"></div>
</div>
<div class="large-8 columns line-dashed-setup-v">
<div class="box-setup oh">
@ -16,7 +17,7 @@
<input type="text" placeholder="Family vacation funds" class="form-control" ng-model="walletName">
</label>
<div class="row" ng-show="isSetupWalletPage">
<div>
<div ng-if="totalCopayers > 1">
<label for="Name">Your name</label>
<input id="Name" type="text" placeholder="Name" class="form-control" ng-model="myNickname">
</div>

30
views/transactions.html
View file

@ -1,7 +1,7 @@
<div class="transactions" data-ng-controller="TransactionsController">
<div ng-show='$root.wallet.isReady()'>
<h1 ng-show="wallet.totalCopayers > 1"> Transaction proposals <small>({{txs.length}})</small></h1>
<div class="large-12" ng-show="wallet.totalCopayers > 1">
<h1 ng-show="wallet.isShared()"> Transaction proposals <small>({{txs.length}})</small></h1>
<div class="large-12" ng-show="wallet.isShared()">
<ul class="inline-list">
<li> <a class="text-gray size-12" ng-click="show(true)" ng-disabled="loading || onlyPending" loading="Updating" ng-class="{'active' : onlyPending}"> [ Pending ] </a> </li>
<li> <a class="text-gray size-12" ng-click="show()" ng-disabled="loading || !onlyPending" loading="Updating" ng-class="{'active' : !onlyPending}"> [ All ] </a> </li>
@ -40,37 +40,37 @@
</div>
<div class="last-transactions-content">
<div class="box-copayer" ng-repeat="(cId, actions) in tx.peerActions">
<a href="#!/transactions" class="has-tip" tooltip-popup-delay="1000" tooltip="{{cId === $root.wallet.getMyCopayerId() ? 'You' : $root.wallet.publicKeyRing.nicknameForCopayer(cId)}}">
<img class="copayer-ico br100" src="./img/satoshi.gif" alt="{{cId}}">
<div class="box-copayer" ng-repeat="c in tx.actionList">
<a href="#!/transactions" class="has-tip">
<img class="copayer-ico br100" src="./img/satoshi.gif" alt="{{c.cId}}">
</a>
<div class="box-status">
<a ng-if="actions.create" tooltip-popup-delay="1000" tooltip="Created {{ts | amTimeAgo}}">
<a ng-if="c.actions.create" tooltip-popup-delay="1000" tooltip="Created {{c.actions.create | amTimeAgo}}">
<i class="fi-crown icon-status icon-active"></i>
</a>
<a ng-if="!actions.create"><i class="fi-crown icon-status"></i></a>
<a ng-if="!c.actions.create"><i class="fi-crown icon-status"></i></a>
<a ng-if="actions.seen" tooltip-popup-delay="1000" tooltip="Seen {{ts | amTimeAgo}}">
<a ng-if="c.actions.seen" tooltip-popup-delay="1000" tooltip="Seen {{c.actions.seen | amTimeAgo}}">
<i class="fi-eye icon-status icon-active"></i>
</a>
<a ng-if="!actions.seen"><i class="fi-eye icon-status"></i></a>
<a ng-if="!c.actions.seen"><i class="fi-eye icon-status"></i></a>
<a ng-if="actions.rejected" tooltip-popup-delay="1000" tooltip="Rejected {{ts | amTimeAgo}}">
<a ng-if="c.actions.rejected" tooltip-popup-delay="1000" tooltip="Rejected {{c.actions.rejected | amTimeAgo}}">
<i class="fi-x icon-status icon-active-x"></i>
</a>
<a ng-if="actions.sign" tooltip-popup-delay="1000" tooltip="Signed {{ts | amTimeAgo}}">
<a ng-if="c.actions.sign" tooltip-popup-delay="1000" tooltip="Signed {{c.actions.sign | amTimeAgo}}">
<i class="fi-check icon-status icon-active-check"></i>
</a>
<a ng-if="!actions.sign && !actions.rejected" href="#!/transactions" class="icon-status">
<a ng-if="!c.actions.sign && !c.actions.rejected" href="#!/transactions" class="icon-status">
<i class="fi-loop icon-rotate"></i>
</a>
</div>
<div class="text-center">
<p class="size-12 text-gray ellipsis">
{{$root.wallet.publicKeyRing.nicknameForCopayer(cId)}}
{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}
</p>
</div>
</div>
@ -135,9 +135,9 @@
<pagination ng-show="!onlyPending && txs.length > txpItemsPerPage" total-items="txs.length" items-per-page="txpItemsPerPage" page="txpCurrentPage" on-select-page="show()" class="pagination-small primary"></pagination>
</div>
<h1 ng-class="{'line-dashed': wallet.totalCopayers > 1}">
<h1 ng-class="{'line-dashed': wallet.isShared()}">
Last transactions
<small ng-hide="wallet.totalCopayers > 1 || !loading">
<small ng-hide="wallet.isShared() || !loading">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</small>
</h1>

1
views/unsupported.html
View file

@ -1,6 +1,7 @@
<div class="wide-page">
<div class="text-center">
<img src="img/logo-negative-beta.svg" alt="Copay">
<div class="text-white" ng-include="'views/includes/version.html'"></div>
</div>
<h1 class="text-center text-white">Browser unsupported</h1>
<h3 class="text-center text-white">