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

fix conflict

Browse source
This commit is contained in:
Bechi 2014-04-29 16:39:54 -03:00
commit 64cde1378e
3 changed files with 66 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

73
index.html
View file

@ -14,22 +14,23 @@
<div data-ng-init="init()" data-ng-controller="HeaderController">
<div class="header">
<div class="header-content">
<div class="large-3 columns">
<a href="#" class="logo" title="copay"></a>
<div class="large-3 medium-3 columns">
<span class="logo"></span>
</div>
<div class="text-center large-9 columns m10t" ng-show="$root.wallet">
<h6 class="large-6 columns line-dashed-v">
<span ng-if="!$root.wallet.name && $root.wallet.id">{{$root.wallet.id}}</span>
<span ng-if="$root.wallet.name">Wallet: {{$root.wallet.name}} &lt;{{$root.wallet.id}}&gt;</span>
({{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}})
<a class="button radius small-icon" href="#" ng-click="signout()"><i class="fi-power"></i></a>
</h6>
<p class="large-3 columns line-dashed-v">
<div class="large-9 medium-9 columns text-center p10t" ng-show="$root.wallet">
<div class="large-4 medium-4 columns line-dashed-v">
<a href="#/peer" class="has-tip" tooltip-placement="bottom" tooltip="{{$root.wallet.id}}">
<span ng-if="!$root.wallet.name && $root.wallet.id">{{$root.wallet.id}}</span>
<span ng-if="$root.wallet.name">{{$root.wallet.name}}</span>
</a>
<a class="button radius small-icon" href="#" title="Signout" ng-click="signout()"><i class="fi-power"></i></a>
</div>
<div class="large-4 medium-4 columns line-dashed-v">
Balance: {{totalBalance || 0}} <i class="fi-bitcoin"></i><br>
</p>
<p class="large-3 columns">
</div>
<div class="large-4 medium-4 columns">
Available to Spend: {{availableBalance || 0}} <i class="fi-bitcoin"></i>
</p>
</div>
</div>
</div>
@ -96,9 +97,13 @@
</div>
</div>
<div id="footer" class="row" data-ng-controller="FooterController">
<div class="large-12 columns text-center">
<link rel="stylesheet" ng-href="{{theme}}">
<div id="footer" data-ng-controller="FooterController" ng-show="$root.wallet">
<link rel="stylesheet" ng-href="{{theme}}">
<div class="large-4 columns">
<span class="size-12">Copayers
{{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}}</span>
</div>
<div class="large-8 columns text-right">
<a class="size-12" ng-if="themes.length > 1" ng-click="change_theme(th)" ng-repeat="th in themes">{{th}} {{$last ? '' : '&middot; '}}</a>
</div>
</div>
@ -250,24 +255,24 @@
<script type="text/ng-template" id="addresses.html">
<div class="addresses" data-ng-controller="AddressesController">
<div ng-show='$root.wallet.publicKeyRing.isComplete()'>
<h3>Addresses (available to spend)</h3>
<div class="row">
<div class="large-6 columns">
<a class="panel db" ng-repeat="addr in addrs" ng-click="selectAddr(addr)">{{addr}}
<span ng-if="!isMain[addr]">(change)</span>
<span class="right">({{balanceByAddr[addr] || 0}} <i class="fi-bitcoin"></i>)</span></a>
</div>
<div class="large-3 columns line-dashed-v text-center">
<qrcode size="160" data="{{selectedAddr}}"></qrcode>
<p class="m10t" ng-repeat="addr in addrs" ng-if="selectedAddr==addr"> <strong> {{balanceByAddr[addr]}} <i class="fi-bitcoin"></i> </strong> </p>
</div>
<div class="large-3 columns text-center">
<p> Create a New <strong> Address </strong> </p>
<button class="secondary round expand" ng-click="newAddr()" ng-disabled="loading" loading="Creating"> Create </button>
</div>
</div>
<div class="row">
<div class="large-9 columns" ng-if="addrs[0]">
<h3>Addresses (available to spend)</h3>
<div class="large-8 columns">
<a class="panel db" ng-repeat="addr in addrs" ng-click="selectAddr(addr)">{{addr}}
<span ng-if="!isMain[addr]">(change)</span>
<span class="right">({{balanceByAddr[addr] || 0}} <i class="fi-bitcoin"></i>)</span></a>
</div>
<div class="large-4 columns line-dashed-v text-center">
<qrcode size="160" data="{{selectedAddr}}"></qrcode>
<p class="m10t" ng-repeat="addr in addrs" ng-if="selectedAddr==addr"> <strong> {{balanceByAddr[addr]}} <i class="fi-bitcoin"></i> </strong> </p>
</div>
</div>
<div class="columns text-center" ng-class="{'large-3' : addrs[0]}">
<p> Create a New <strong> Address </strong> </p>
<button class="secondary round expandi new-address" ng-click="newAddr()" ng-disabled="loading" loading="Creating"> Create </button>
</div>
</div>
</div>
</div>
</script>