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

fix conflict

Browse source
This commit is contained in:
bechi 2014-07-31 12:17:50 -03:00
commit 25bedef1fc
41 changed files with 799 additions and 526 deletions
Download patch file Download diff file Expand all files Collapse all files

5
views/addresses.html
View file

@ -10,10 +10,9 @@
<ul>
<li class="panel radius oh" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll">
<div class="large-8 small-6 column">
<div class="large-8 small-6 column" ng-click="openAddressModal(addr)">
<div class="ellipsis">
<a href="#" ng-click="openAddressModal(addr)"><i
class="fi-thumbnails">&nbsp;</i></a>
<i class="fi-thumbnails">&nbsp;</i>
<span><contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/></span>
<small ng-if="addr.isChange">change</small>
</div>

7
views/copayers.html
View file

@ -2,7 +2,7 @@
<div ng-if='$root.wallet && $root.wallet.isReady()' ng-init="goToWallet()"></div>
<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">
<img src="img/logo-negative-beta.svg" alt="Copay">
</div>
<div class="large-8 columns line-dashed-setup-v">
<div class="box-setup oh">
@ -10,8 +10,9 @@
<h1 class="text-primary line-sidebar-b">Waiting copayers</h1>
<h3>Share this secret with your other copayers</h3>
<div class="panel">
<div class="ellipsis text-gray
size-14">{{$root.wallet.getSecret()}}</div>
<qrcode size="250" data="{{$root.wallet.getSecret()}}"></qrcode>
<div class="secret text-gray size-14">{{$root.wallet.getSecret()}}</div>
<div style="clear:both;"></div>
</div>
</div>
<h1 class="text-white line-sidebar-b" ng-if="$root.wallet && $root.wallet.publicKeyRing.isComplete()">New Wallet Created </h1>

4
views/errors/404.html
View file

@ -1,7 +1,7 @@
<div class="text-center logo-setup">
<img src="../img/logo-negative-beta.svg" alt="Copay">
<img src="img/logo-negative-beta.svg" alt="Copay">
</div>
<h1 class="text-center text-white">404</h1>
<h3 class="text-center">Page not found</h3>
<p class="text-center"><a href="/">go back...</a></p>
<p class="text-center"><a href="#!/">go back...</a></p>

14
views/home.html
View file

@ -1,25 +1,25 @@
<div class="home" ng-controller="HomeController">
<div class="row">
<div class="large-4 columns logo-setup">
<img src="../img/logo-negative-beta.svg" alt="Copay">
<img src="img/logo-negative-beta.svg" alt="Copay">
</div>
<div class="large-8 columns line-dashed-setup-v">
<div class="button-setup" ng-show="hasWallets">
<a class="text-white" href="/open">Open a wallet</a>
<a class="text-white" href="#!/open">Open a wallet</a>
</div>
<div class="button-setup" ng-show="!hasWallets">
<a class="text-secondary" href="/setup">Create a new wallet</a>
<a class="text-secondary" href="#!/setup">Create a new wallet</a>
</div>
<div class="button-setup">
<a class="text-primary" href="/join">Join a Wallet in Creation</a>
<a class="text-primary" href="#!/join">Join a Wallet in Creation</a>
</div>
<div class="button-setup" ng-show="hasWallets">
<a class="text-secondary" href="/setup">Create a wallet</a>
<a class="text-secondary" href="#!/setup">Create a wallet</a>
</div>
<div class="footer-setup">
<a class="right size-12 text-gray" href="/settings"><i class="m10r size-14 fi-wrench"></i>Settings</a>
<a class="left size-12 text-gray" href="/import"><i class="m10r size-14 fi-upload"></i>Import a backup</a>
<a class="right size-12 text-gray" href="#!/settings"><i class="m10r size-14 fi-wrench"></i>Settings</a>
<a class="left size-12 text-gray" href="#!/import"><i class="m10r size-14 fi-upload"></i>Import a backup</a>
</div>
</div>
</div>

4
views/import.html
View file

@ -5,7 +5,7 @@
</div>
<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">
<img src="img/logo-negative-beta.svg" alt="Copay">
</div>
<div class="large-8 columns line-dashed-setup-v">
<div class="box-setup">
@ -20,7 +20,7 @@
<input type="password" class="form-control" placeholder="Your wallet password" name="password" ng-model="password" required>
<div class="text-right">
<a class="back-button text-white m20r" href="/">&laquo; Back</a>
<a class="back-button text-white m20r" href="#!/">&laquo; Back</a>
<button type="submit" class="button primary m0" ng-disabled="importForm.$invalid" loading="Importing">
Import backup
</button>

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

@ -1,8 +1,8 @@
<div ng-controller="SidebarController">
<header class="text-center">
<div class="text-white m10v">
<a href="/" class="db">
<img src="../img/logo-negative-beta.svg" alt="" width="80">
<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>
@ -39,8 +39,8 @@
</div>
</header>
<ul class="off-canvas-list">
<li data-ng-repeat="item in menu" ui-route="/{{item.link}}" class="nav-item" data-ng-class="{active: isActive(item)}">
<a href="{{item.link}}" ng-click="toggleCollapse()" class="db p20h">
<li data-ng-repeat="item in menu" ui-route="{{item.link}}" class="nav-item" data-ng-class="{active: isActive(item)}">
<a href="#!/{{item.link}}" ng-click="toggleCollapse()" class="db p20h">
<i class="size-24 m20r {{item.icon}}"></i> {{item.title}}
<span class="label alert round" ng-if="item.link=='transactions' && $root.pendingTxCount > 0">{{$root.pendingTxCount}}</span>
</a>

12
views/includes/sidebar.html
View file

@ -1,8 +1,8 @@
<div ng-controller="SidebarController">
<header class="p20">
<div class="text-center">
<a href="/" class="db">
<img src="../img/logo-negative-beta.svg" alt="" width="100">
<a href="#!/addresses" class="db">
<img src="img/logo-negative-beta.svg" alt="" width="100">
</a>
<div>
<small>v{{version}}</small>
@ -12,7 +12,7 @@
</div>
<div class="line-sidebar"></div>
<div>
<a href="/addresses" class="name-wallet" tooltip-placement="bottom" tooltip="ID: {{$root.wallet.id}}">
<a href="#!/addresses" class="name-wallet" tooltip-placement="bottom" tooltip="ID: {{$root.wallet.id}}">
<span>{{$root.wallet.getName()}}</span>
</a>
<a class="button gray small side-bar right" title="Manual Refresh"
@ -46,8 +46,8 @@
<div class="line-sidebar"></div>
</header>
<ul class="side-nav">
<li data-ng-repeat="item in menu" ui-route="/{{item.link}}" class="nav-item" data-ng-class="{active: isActive(item)}">
<a href="{{item.link}}" ng-click="toggleCollapse()" class="db p20h">
<li data-ng-repeat="item in menu" ui-route="{{item.link}}" class="nav-item" data-ng-class="{active: isActive(item)}">
<a href="#!/{{item.link}}" ng-click="toggleCollapse()" class="db p20h">
<i class="size-21 m20r {{item.icon}}"></i> {{item.title}}
<span class="right">
<span class="label alert" ng-if="item.link=='transactions' && $root.pendingTxCount > 0">{{$root.pendingTxCount}}</span>
@ -55,7 +55,7 @@
</a>
</li>
<li>
<a href="#" class="db p20h" title="Signout"
<a href="#!/" class="db p20h" title="Signout"
ng-click="signout()"><i class="size-21 m20r fi-power"></i> Signout</a>
</li>
</ul>

31
views/join.html
View file

@ -5,14 +5,39 @@
</div>
<div class="row" ng-show="!loading">
<div class="large-4 columns logo-setup">
<img src="../img/logo-negative-beta.svg" alt="Copay">
<img src="img/logo-negative-beta.svg" alt="Copay">
</div>
<div class="large-8 columns line-dashed-setup-v">
<div class="box-setup">
<h1 class="text-primary line-sidebar-b">Join a Wallet in Creation</h1>
<form name="joinForm" ng-submit="join(joinForm)" novalidate>
<label for="connectionId"> Wallet Setting </label>
<input id="connectionId" type="text" class="form-control" placeholder="Paste wallet secret here" name="connectionId" ng-model="connectionId" wallet-secret required>
<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>
<div id="scanner" class="row" ng-if="showScanner">
<div class="text-centered">
<canvas id="qr-canvas" width="200" height="150"></canvas>
<div ng-show="isMobile">
<div id="file-input-wrapper" class="btn btn-primary">
<span class="pull-left text-centered">
<i class="glyphicon glyphicon-refresh icon-rotate"></i>
Get QR code
</span>
<input id="qrcode-camera" type="file" capture="camera" accept="image/*">
</div>
</div>
<div ng-hide="isMobile">
<video id="qrcode-scanner-video" width="300" height="225" ng-hide="isMobile"></video>
</div>
</div>
</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"
@ -29,7 +54,7 @@
ng-model="joinPasswordConfirm"
match="joinPassword" required>
<div class="text-right">
<a href="/" class="back-button text-primary m20r">&laquo; Back</a>
<a href="#!/" class="back-button text-primary m20r">&laquo; Back</a>
<button type="submit" class="button primary m0" ng-disabled="joinForm.$invalid || loading" loading="Joining">Join</button>
</div>
</form>

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

@ -8,6 +8,11 @@
<span ng-if="!$root.updatingBalance">
{{address.balance || 0|noFractionNumber}} {{$root.unitName}}
</span>
<div style="margin-top:10px;">
<span class="label pointer" ng-click="openExternal(address.address)">
<i class="fi-link">&nbsp;</i> Open in external aplication
</span>
</div>
</div>
</div>
<a class="close-reveal-modal" ng-click="cancel()">&#215;</a>

4
views/open.html
View file

@ -5,7 +5,7 @@
</div>
<div class="row" ng-show="!loading">
<div class="large-4 columns logo-setup">
<img src="../img/logo-negative-beta.svg" alt="Copay">
<img src="img/logo-negative-beta.svg" alt="Copay">
</div>
<div class="large-8 columns line-dashed-setup-v">
<div class="box-setup">
@ -15,7 +15,7 @@
</select>
<input type="password" class="form-control" placeholder="Your password" name="openPassword" ng-model="openPassword" required>
<div class="text-right">
<a href="/" class="back-button text-white m20r">&laquo; Back</a>
<a href="#!/" class="back-button text-white m20r">&laquo; Back</a>
<button type="submit" class="button white m0" ng-disabled="openForm.$invalid || loading" loading="Opening">Open</button>
</div>
</form>

4
views/send.html
View file

@ -18,10 +18,10 @@
<small class="icon-input" ng-show="!sendForm.address.$invalid && address"><i class="fi-check"></i></small>
<small class="icon-input" ng-show="sendForm.address.$invalid && address"><i class="fi-x"></i></small>
</div>
<div class="small-2 columns" ng-hide="showScanner || !isHttp">
<div class="small-2 columns" ng-hide="showScanner">
<a class="postfix button black" ng-click="openScanner()"><i class="fi-camera"></i></a>
</div>
<div class="small-2 columns" ng-show="showScanner && isHttp">
<div class="small-2 columns" ng-show="showScanner">
<a class="postfix button warning" ng-click="cancelScanner()">Cancel</a>
</div>
</div>

4
views/settings.html
View file

@ -1,7 +1,7 @@
<div class="settings" ng-controller="SettingsController">
<div class="row">
<div class="large-4 columns logo-setup">
<img src="../img/logo-negative-beta.svg" alt="Copay">
<img src="img/logo-negative-beta.svg" alt="Copay">
</div>
<div class="large-8 columns line-dashed-setup-v">
<div class="box-setup">
@ -63,7 +63,7 @@
</fieldset>
<div class="text-right">
<a class="back-button text-white m20r" href="/">&laquo; Back</a>
<a class="back-button text-white m20r" href="#!/">&laquo; Back</a>
<button type="submit" class="button primary m0 ng-binding" ng-disabled="setupForm.$invalid || loading" disabled="disabled" ng-click="save()">
Save
</button>

4
views/setup.html
View file

@ -7,7 +7,7 @@
<form name="setupForm" ng-submit="create(setupForm)" novalidate>
<div class="row">
<div class="large-4 columns logo-setup text-center">
<img src="../img/logo-negative-beta.svg" alt="Copay">
<img src="img/logo-negative-beta.svg" alt="Copay">
</div>
<div class="large-8 columns line-dashed-setup-v">
<div class="box-setup oh">
@ -66,7 +66,7 @@
</div>
</div>
<div class="text-right">
<a ng-show="!isSetupWalletPage" class="back-button m20r" href="/">&laquo; Back</a>
<a ng-show="!isSetupWalletPage" class="back-button m20r" href="#!/">&laquo; Back</a>
<a ng-show="isSetupWalletPage" class="back-button m20r"
ng-click="setupWallet()">&laquo; Back</a>
<button ng-show="isSetupWalletPage" type="submit" class="button secondary m0" ng-disabled="setupForm.$invalid || loading">

14
views/transactions.html
View file

@ -41,21 +41,21 @@
<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)}}">
<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}}">
</a>
<div class="box-status">
<span ng-repeat="(action, ts) in actions">
<a ng-if="action == 'create'" href="/transactions" tooltip-popup-delay="1000" tooltip="Created {{ts | amTimeAgo}}">
<a ng-if="action == 'create'" href="#!/transactions" tooltip-popup-delay="1000" tooltip="Created {{ts | amTimeAgo}}">
<i class="fi-crown icon-status icon-active"></i>
</a>
<a ng-if="action == 'seen'" href="/transactions" tooltip-popup-delay="1000" tooltip="Seen {{ts | amTimeAgo}}">
<a ng-if="action == 'seen'" href="#!/transactions" tooltip-popup-delay="1000" tooltip="Seen {{ts | amTimeAgo}}">
<i class="fi-eye icon-status icon-active"></i>
</a>
<a ng-if="action == 'sign'" href="/transactions" tooltip-popup-delay="1000" tooltip="Signed {{ts | amTimeAgo}}">
<a ng-if="action == 'sign'" href="#!/transactions" tooltip-popup-delay="1000" tooltip="Signed {{ts | amTimeAgo}}">
<i class="fi-check icon-status icon-active-check"></i>
</a>
<a ng-if="action == 'rejected'" href="/transactions" tooltip-popup-delay="1000" tooltip="Rejected {{ts | amTimeAgo}}">
<a ng-if="action == 'rejected'" href="#!/transactions" tooltip-popup-delay="1000" tooltip="Rejected {{ts | amTimeAgo}}">
<i class="fi-x icon-status icon-active-x"></i>
</a>
</span>
@ -106,7 +106,7 @@
</div>
<div class="ellipsis small">
Transaction ID:
<a href="http://{{getShortNetworkName()}}.insight.is/tx/{{tx.sentTxid}}" target="blank">
<a href="http://{{getShortNetworkName()}}.insight.is/tx/{{tx.sentTxid}}" target="_blank">
{{tx.sentTxid}}
</a>
</div>
@ -148,7 +148,7 @@
<div class="last-transactions" ng-repeat="btx in blockchain_txs | orderBy: 'time':true">
<div class="last-transactions-header">
<div class="large-8 columns">
<a class="ellipsis" href="http://{{getShortNetworkName()}}.insight.is/tx/{{btx.txid}}" target="blank">
<a class="ellipsis" href="http://{{getShortNetworkName()}}.insight.is/tx/{{btx.txid}}" target="_blank">
{{btx.txid}}
</a>
</div>

2
views/unsupported.html
View file

@ -1,5 +1,5 @@
<div class="text-center logo-setup">
<img src="../img/logo-negative-beta.svg" alt="Copay">
<img src="img/logo-negative-beta.svg" alt="Copay">
</div>
<h1 class="text-center text-white">Browser unsupported</h1>
<h3 class="text-center">