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

Merge branch 'master' into bugs/ui

Browse source
This commit is contained in:
bechi 2014-09-03 10:39:09 -03:00
commit 2d33dcfef6
40 changed files with 520 additions and 3158 deletions
Download patch file Download diff file Expand all files Collapse all files

4
views/copayers.html
View file

@ -51,10 +51,10 @@
<div class="box-setup-copayers p20">
<div class="oh">
<div ng-include="'views/includes/video.html'"></div>
<div ng-include="'views/includes/copayer.html'"></div>
<div ng-if="!$root.wallet.publicKeyRing.isComplete()">
<img
class="waiting br100 no-video"
class="waiting br100"
ng-if="!hasVideo(copayer)"
src="./img/satoshi.gif"
alt="Waiting Copayer"

2
views/setup.html → views/create.html
View file

@ -1,4 +1,4 @@
<div ng-controller="SetupController">
<div ng-controller="CreateController">
<div data-alert class="loading-screen" ng-show="loading">
<i class="size-60 fi-bitcoin-circle icon-rotate spinner"></i>
Creating wallet...

4
views/home.html
View file

@ -9,13 +9,13 @@
<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="#!/create">Create a new wallet</a>
</div>
<div class="button-setup">
<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="#!/create">Create a wallet</a>
</div>
<div class="footer-setup">

16
views/includes/video.html → views/includes/copayer.html
View file

@ -1,17 +1,9 @@
<div ng-controller="VideoController">
<div class="video-box" ng-repeat="copayer in copayersList()">
<video
ng-if="hasVideo(copayer)"
peer="{{copayer}}" avatar autoplay
ng-class="true || isConnected(copayer) ? 'online' : 'offline'"
ng-src="{{getVideoURL(copayer)}}"></video>
<div ng-controller="CopayersController">
<div class="copay-box" ng-repeat="copayer in copayersList()">
<img
class="br100 no-video"
ng-if="!hasVideo(copayer)"
ng-class="true || isConnected(copayer) ? 'online' : 'offline'"
class="br100 online"
src="./img/satoshi.gif"
alt="{{copayer}}"
alt="{{copayer.peerId}}"
width="70">
<div

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

@ -1,55 +1,22 @@
<div ng-controller="VideoController" class="copayers">
<div>
<h3>
<i class="fi-torsos-all size-21 m20r"></i>
Copayers
<small class="m15l">
{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}}
</small>
</h3>
</div>
<div ng-controller="CopayersController" class="copayers">
<h3>
<i class="fi-torsos-all size-21 m20r"></i>
Copayers
<small class="m15l">
{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}}
</small>
</h3>
<ul class="copayer-list" ng-repeat="copayer in copayers">
<li class="ellipsis">
<video
ng-if="hasVideo(copayer)"
peer="{{copayer}}" avatar autoplay
ng-class="isConnected(copayer) ? 'online' : 'offline'"
ng-src="{{getVideoURL(copayer)}}"></video>
<div class="copay-box-small" ng-repeat="copayer in copayers">
<img
class="br100 online"
src="./img/satoshi.gif"
alt="{{copayer.peerId}}"
width="30">
<img
class="br100 oh no-video m20r"
ng-if="!hasVideo(copayer)"
ng-class="isConnected(copayer) ? 'online' : 'offline'"
src="./img/satoshi.gif"
alt="{{copayer}}"
width="70">
<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>
</ul>
<div class="copayer-list-small-height" ng-repeat="copayer in copayers">
<span class="left" class="has-tip" tooltip-placement="top" tooltip="{{copayer.nick}}">
<video
ng-if="hasVideo(copayer)"
peer="{{copayer}}" avatar autoplay
ng-class="isConnected(copayer) ? 'online' : 'offline'"
ng-src="{{getVideoURL(copayer)}}"></video>
<img
class="br100 oh no-video m20r"
ng-if="!hasVideo(copayer)"
ng-class="isConnected(copayer) ? 'online' : 'offline'"
src="./img/satoshi.gif"
alt="{{copayer}}"
width="70">
<!-- <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> -->
</span>
</div>
<div class="ellipsis" tooltip-placement="top" tooltip="{{copayer.nick}}">
<small class="text-gray" ng-show="copayer.index == 0">Me</small>
<small class="text-gray" ng-show="copayer.index > 0">{{copayer.nick}}</small>
</div>
</div>
</div>

7
views/includes/sidebar.html
View file

@ -24,10 +24,9 @@
class="has-tip"
data-options="disable_for_touch:true"
tooltip-popup-delay='500'
tooltip="{{totalBalanceBTC |noFractionNumber:8}} BTC"
tooltip="{{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}"
tooltip-trigger="mouseenter"
tooltip-placement="bottom">{{totalBalance || 0
|noFractionNumber}} {{$root.unitName}}
tooltip-placement="bottom">{{totalBalance || 0 |noFractionNumber}} {{$root.unitName}}
</span>
<br>
Locked &nbsp;
@ -38,7 +37,7 @@
class="has-tip"
data-options="disable_for_touch:true"
tooltip-popup-delay='500'
tooltip="{{lockedBalanceBTC |noFractionNumber:8}} BTC"
tooltip="{{lockedBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}"
tooltip-trigger="mouseenter"
tooltip-placement="bottom">{{lockedBalance || 0|noFractionNumber}} {{$root.unitName}}
</span> &nbsp;<i class="fi-info medium" tooltip="Balance locked in pending transaction proposals" tooltip-placement="bottom"></i>

4
views/more.html
View file

@ -1,8 +1,8 @@
<div class="backup" ng-controller="MoreController">
<h1>Backup & Delete </h1>
<h1>Settings </h1>
<div class="oh large-12 columns panel">
<h3><i class="fi-download m10r"></i> Backup </h3>
<p class="large-8 columns text-gray"> Its important to back up your wallet so that you can recover your wallet in case of disaster </p>
<p class="large-8 columns text-gray"> It's important to backup your wallet so that you can recover it in case of disaster</p>
<div class="large-4 columns">
<a class="button primary expand" ng-click="downloadBackup()">Download File</a>
</div>

23
views/send.html
View file

@ -83,6 +83,22 @@
</div>
</div>
</div>
<div class="large-6 medium-6 columns">
<div class="row collapse">
<label for="alternative">Amount in {{ alternativeName }} </label>
<div class="small-9 columns">
<input type="number" id="alternative_amount"
ng-disabled="loading || !isRateAvailable "
name="alternative" placeholder="Amount" ng-model="alternative"
required
autocomplete="off"
>
</div>
<div class="small-3 columns">
<span class="postfix">{{alternativeIsoCode}}</span>
</div>
</div>
</div>
</div>
<div class="row" ng-show="wallet.isShared()">
@ -110,7 +126,7 @@
</form>
</div>
<div class="large-6 columns show-for-large-up">
<div class="large-6 columns show-for-large-up" ng-show="!!$root.merchant">
<div class="send-note">
<h6>Send to</h6>
<p class="text-gray" ng-class="{'hidden': sendForm.address.$invalid || !address}">
@ -119,8 +135,11 @@
<h6>Total amount for this transaction:</h6>
<p class="text-gray" ng-class="{'hidden': sendForm.amount.$invalid || !amount > 0}">
<b>{{amount + defaultFee |noFractionNumber}}</b> {{$root.unitName}}
<small ng-if="isRateAvailable">
{{ rateService.toFiat((amount + defaultFee) * unitToSatoshi, alternativeIsoCode) | noFractionNumber: 2 }} {{ alternativeIsoCode }}
<br>
</small>
<small>
{{ ((amount + defaultFee) * unitToBtc)|noFractionNumber:8}} BTC <br/>
Including fee of {{defaultFee|noFractionNumber}} {{$root.unitName}}
</small>
</p>

6
views/settings.html
View file

@ -27,9 +27,9 @@
</select>
</fieldset>
<fieldset>
<legend>Videoconferencing</legend>
<input id="disableVideo-opt" type="checkbox" ng-model="disableVideo" class="form-control">
<label for="disableVideo-opt">Disable videoconferencing (for slow networks)</label>
<legend>Alternative Currency</legend>
<select class="form-control" ng-model="selectedAlternative" ng-options="alternative.name for alternative in alternativeOpts" required>
</select>
</fieldset>
<fieldset>
<legend>Insight API server</legend>