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

fix conflicts

Browse source
This commit is contained in:
Mario Colque 2014-05-13 14:29:17 -03:00
commit 8325c2b02a
8 changed files with 98 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

28
index.html
View file

@ -42,6 +42,7 @@
<span ng-if="!$root.loading">{{availableBalance || 0}}</span>
<i class="fi-bitcoin"></i>
</div>
</div>
</div>
@ -56,7 +57,9 @@
<section class="top-bar-section {{isCollapsed && 'hide_menu' || 'show_menu'}}">
<ul>
<li data-ng-repeat="item in menu" ui-route="/{{item.link}}" class="text-center" data-ng-class="{active: isActive(item)}">
<a href="{{item.link}}"> <i class="{{item.icon}}"></i> {{item.title}}</a>
<a href="{{item.link}}"> <i class="{{item.icon}}"></i> {{item.title}}
<span class="label alert round" ng-if="item.link=='#/transactions' && $root.pendingTxCount > 0">{{$root.pendingTxCount}}</span>
</a>
</li>
</ul>
</section>
@ -387,10 +390,10 @@
<div class="row m15">
<div class="large-4 columns" ng-show="!tx.sentTs" style="padding-left: 5px;">
<div ng-show="!tx.signedByUs && !tx.rejectedByUs && !tx.finallyRejected && tx.missingSignatures">
<button class="secondary radius m10r" ng-click="sign(tx.ntxid)" ng-disabled="loading" loading="Signing">
<button class="secondary radius m10r" ng-click="sign(tx.ntxid)" ng-disabled="loading">
<i class="fi-check"></i> Sign
</button>
<button class="warning radius" ng-click="reject(tx.ntxid)" ng-disabled="loading" loading>
<button class="warning radius" ng-click="reject(tx.ntxid)" ng-disabled="loading">
<i class="fi-x" ></i> Reject
</button>
</div>
@ -602,7 +605,6 @@
<input type="number" ng-model="blockchainPort">
</div>
</fieldset>
<fieldset>
<legend>Socket</legend>
<div class="row">
@ -626,8 +628,22 @@
</div>
</script>
<!-- / <div class="large-4 columns box-backup">Backup to Dropbox</div>
// <div class="large-4 columns box-backup">Backup to email</div> -->
<!-- UNSUPPORTED -->
<script type="text/ng-template" id="unsupported.html">
<h2 class="text-center">Browser unsupported</h2>
<h3 class="text-center">
Copay uses webRTC for peer-to-peer communications,
but your browser does not support it.
Please use
a current version of Google Chrome, Mozilla Firefox, or Opera.
<br><br>
For more information
on supported browsers please check <a href="http://www.webrtc.org/">http://www.webrtc.org/</a>
</h3>
</script>
<!-- NOT FOUND -->
<script type="text/ng-template" id="404.html">
<h2 class="text-center">404</h2>