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

Merge pull request #1620 from bechi/bugs/ui-08

Browse source 
fix create, join & import
This commit is contained in:
Matias Alejo Garcia 2014-10-30 18:39:59 -03:00
commit 8009ab4f86
5 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

11
css/src/main.css
View file

@ -890,7 +890,6 @@ button.radius, .button.radius {
label small.has-error {
font-size: 11px;
color: #FFA59B;
}
/* SECONDARY */
@ -1299,9 +1298,9 @@ a.text-white:hover {color: #ccc;}
a.text-warning:hover {color: #FD7262;}
.box-setup-copayers {
background: #2C3E50;
-moz-box-shadow: 0px 0px 0px 0px rgba(255,255,255,0.09), inset 0px 0px 2px 0px rgba(0,0,0,0.20);
box-shadow: 0px 0px 0px 0px rgba(255,255,255,0.09), inset 0px 0px 2px 0px rgba(0,0,0,0.20);
background: #F8F8FB;
-moz-box-shadow: inset 0px 0px 5px 0px rgba(0,0,0,0.20);
box-shadow: inset 0px 0px 5px 0px rgba(0,0,0,0.20);
margin-bottom: 15px;
}
@ -1382,8 +1381,8 @@ a.text-warning:hover {color: #FD7262;}
.panel {
border-radius: 3px;
background: #FFFFFF;
-moz-box-shadow: 1px 1px 0px 0px rgba(32,48,64,0.10);
box-shadow: 1px 1px 0px 0px rgba(32,48,64,0.10);
-moz-box-shadow: 1.5px 1.5px 0px 0px rgba(32,48,64,0.10);
box-shadow: 1.5px 1.5px 0px 0px rgba(32,48,64,0.10);
border: none;
}

18
views/create.html
View file

@ -7,8 +7,8 @@
<form name="setupForm" ng-submit="create(setupForm)" novalidate>
<h1 class="hide-for-large-up">{{$root.title}}</h1>
<div class="row">
<div class="large-12 columns">
<div class="large-12 columns panel">
<div class="row collapse">
<label><span translate>Wallet name</span>
<input type="text" placeholder="{{'Family vacation funds'|translate}}" class="form-control" ng-model="walletName">
</label>
@ -33,15 +33,17 @@
</div>
<p translate class="comment" ng-show="totalCopayers>1">(*) The limits are imposed by the bitcoin network.</p>
<div class="m10b">
<a class="expand small" ng-click="hideAdv=!hideAdv">
<div class="line-dashed-h"></div>
<div class="m20t m20b">
<a class="small" ng-click="hideAdv=!hideAdv">
<i class="fi-widget m3r"></i>
<span translate ng-hide="!hideAdv">Show</span>
<span translate ng-hide="hideAdv">Hide</span>
<span translate>advanced options</span>
</a>
</div>
<div ng-hide="hideAdv">
<div ng-hide="hideAdv" class="row">
<input id="network-name" type="checkbox" ng-model="networkName" ng-true-value="testnet" ng-false-value="livenet" class="form-control" ng-checked="networkName == 'testnet' ? true : false">
<label for="network-name" translate>Use test network</label>
@ -51,11 +53,11 @@
<div class="text-right">
<a class="back-button m20r" href="#!/manage">
<i class="fi-arrow-left"></i>
<a class="back-button m20r text-primary" href="#!/manage">
<i class="icon-arrow-left2 vm"></i>
<span translate>Back</span>
</a>
<button translate type="submit" class="button secondary m0" ng-disabled="setupForm.$invalid || loading">
<button translate type="submit" class="button primary m0" ng-disabled="setupForm.$invalid || loading">
Create {{requiredCopayers}}-of-{{totalCopayers}} wallet
</button>
</div>

10
views/import.html
View file

@ -5,7 +5,7 @@
</div>
<div class="row" ng-show="!loading">
<div class="large-12 columns">
<div class="large-12 columns panel">
<h1 class="hide-for-large-up">{{$root.title}}</h1>
<form name="importForm" ng-submit="import(importForm)" novalidate>
@ -41,6 +41,8 @@
<label for="password" class="m10b"><span translate>Password</span> <small translate>Required</small></label>
<input type="password" class="form-control"
placeholder="{{'Your wallet password'|translate}}" name="password" ng-model="password" required>
<div class="line-dashed-h m10b m20t"></div>
<a class="expand small" ng-click="hideAdv=!hideAdv">
<i class="fi-widget m3r"></i>
@ -71,11 +73,11 @@
<div class="text-right m20t">
<a class="back-button m20r" href="#!/manage">
<i class="fi-arrow-left"></i>
<a class="back-button m20r text-black" href="#!/manage">
<i class="icon-arrow-left2 vm"></i>
<span translate>Back</span>
</a>
<button translate type="submit" class="button primary m0" ng-disabled="importForm.$invalid">
<button translate type="submit" class="button black m0" ng-disabled="importForm.$invalid">
Import backup
</button>
</div>

14
views/join.html
View file

@ -6,8 +6,8 @@
<div ng-show="!loading">
<h1 class="hide-for-large-up">{{$root.title}}</h1>
<div class="row collapse">
<div class="large-12 columns">
<div class="large-12 columns panel">
<div class="row collapse">
<form name="joinForm" ng-submit="join(joinForm)" novalidate>
<label for="connectionId"><span translate>Wallet Secret</span>
@ -27,7 +27,7 @@
&& !joinForm.connectionId.$pristine"><i class="fi-check"></i></small>
</div>
<div class="small-2 columns" ng-hide="showScanner || disableScanner">
<a class="postfix button primary" ng-click="openScanner()"><i class="fi-camera">&nbsp;</i></a>
<a class="postfix button black" ng-click="openScanner()"><i class="fi-camera">&nbsp;</i></a>
</div>
<div class="small-2 columns" ng-show="showScanner">
<a class="postfix button warning" ng-click="cancelScanner()"><i class="fi-x">&nbsp;</i></a>
@ -52,7 +52,9 @@
</div>
</div>
<div class="m10b">
<div class="line-dashed-h"></div>
<div class="m20t m20b">
<a class="expand small" ng-click="hideAdv=!hideAdv">
<i class="fi-widget m3r"></i>
<span translate ng-hide="!hideAdv">Show</span>
@ -67,10 +69,10 @@
<div class="text-right">
<a class="back-button m20r" href="#!/manage">
<i class="fi-arrow-left"></i>
<i class="icon-arrow-left2 vm"></i>
<span translate>Back</span>
</a>
<button translate type="submit" class="button primary m0" ng-disabled="joinForm.$invalid">Join</button>
<button translate type="submit" class="button secondary m0" ng-disabled="joinForm.$invalid">Join</button>
</div>
</form>
</div>

2
views/manage.html
View file

@ -29,7 +29,7 @@
<div class="large-12 columns line-dashed-h m30v"></div>
<div class="oh large-12 columns panel">
<h3><i class="fi-download m10r"></i> <span translate>Manage Wallets</span> </h3>
<h3><i class="fi-download m10r"></i> <span translate>Backup Profile</span> </h3>
<p translate class="large-8 columns text-gray">It's important to backup your profile so that you can recover it in case of disaster. The backup will include all your profile's wallets</p>
<div class="large-4 columns">
<a translate class="button primary m0" ng-click="downloadBackup()"