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

Merge branch 'master' into bugs/ui-07

Browse source
This commit is contained in:
bechi 2014-10-30 16:51:38 -03:00
commit efab427de1
13 changed files with 111 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

11
views/transactions.html → views/history.html
View file

@ -1,4 +1,4 @@
<div class="transactions" data-ng-controller="TransactionsController" data-ng-init="update()">
<div class="transactions" data-ng-controller="HistoryController" data-ng-init="update()">
<div ng-show='$root.wallet.isReady()'>
<h2 ng-show="wallet.isShared()">
<span translate>Transaction Proposals</span> <small>({{txs.length}})</small></h2>
@ -20,14 +20,7 @@
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</small>
</h2>
<div class="large-12">
<div class="m10b size-12" ng-hide="wallet.totalCopayers == 1">
<a class="text-gray active" ng-click="toogleLast()" ng-disabled="loading" loading="Updating" ng-hide="lastShowed && !loading">[ <span translate>Show</span> ]</a>
<a class="text-gray" ng-click="toogleLast()" ng-disabled="loading" loading="Updating" ng-show="lastShowed && !loading">[ <span translate>Hide</span> ]</a>
</div>
<div class="btransactions" ng-if="lastShowed">
<div class="btransactions">
<div ng-if="!blockchain_txs[0].txid && !loading">
<em><strong translate>No transactions yet.</strong></em></div>
<div class="panel large-12 columns" ng-repeat="btx in blockchain_txs | orderBy: 'time':true">

9
views/home.html
View file

@ -9,6 +9,15 @@
<img src="img/logo-negative-beta.svg" alt="Copay" width="146" height="59">
<div ng-include="'views/includes/version.html'"></div>
</div>
<div class="p10 box-setup bg-success m10b" ng-show="confirmedEmail">
<div class="left">
<i class="size-36 fi-alert m10r"></i>
</div>
<div class="size-12" translate>
<b>Copay now needs a confirmation.</b><br />
You have to sign in to confirm your email
</div>
</div>
<div class="box-setup">
<h1><span translate>Sign in to</span> <b>Copay</b></h1>
<form name="loginForm" ng-submit="openProfile(loginForm)" novalidate>

4
views/addresses.html → views/receive.html
View file

@ -1,6 +1,6 @@
<div class="addresses" ng-controller="AddressesController">
<div class="addresses" ng-controller="ReceiveController">
<div ng-show='$root.wallet.isReady()'>
<h1 class="hide-for-large-up">{{$root.title}}</h1>
<h1 translate class="hide-for-large-up">Receive</h1>
<div ng-show="!addresses[0]">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</div>

10
views/settings.html
View file

@ -26,6 +26,16 @@
Insight API server is open-source software. You can run your own instances, check <a href="http://insight.is" target="_blank">Insight API Homepage</a>
</div>
</fieldset>
<fieldset>
<legend translate>Wallet and profile storage</legend>
<label for="insightTestnet">Store wallet and profiles on</label>
<select class="form-control" ng-model="selectedStorage" ng-options="o.name for o in availableStorages" required>
</select>
<div translate class="small">
Wallets and profiles are stored encrypted using your password as a key. You can store the encrypted data locally, on your platform, or remotely on the Insight Server. <a target="_blank" href="https://github.com/bitpay/copay/tree/master/js/plugins">More pluggins are welcomed!</a>
</div>
</fieldset>
<button translate type="submit" class="button primary radius expand m0" ng-disabled="settingsForm.$invalid || loading" ng-click="save()">
Save
</button>