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

fix join form notification

Browse source
This commit is contained in:
bechi 2014-11-19 10:32:40 -03:00
commit 0e750836e8
2 changed files with 38 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
css/src/main.css
View file

@ -1181,7 +1181,7 @@ button.gray:focus,
width: 38px; width: 38px;
height: 28px; height: 28px;
right: 7px; right: 7px;
top: 29px; top: 28px;
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;
line-height: 1.7rem; line-height: 1.7rem;

33
views/join.html
View file

@ -10,26 +10,26 @@
<div class="large-12 columns"> <div class="large-12 columns">
<form name="joinForm" ng-submit="join(joinForm)" novalidate> <form name="joinForm" ng-submit="join(joinForm)" novalidate>
<div class="panel"> <div class="panel">
<label for="connectionId"><span translate>Wallet Secret</span> <div class="row collapse">
<small translate class="has-error" ng-show="joinForm.connectionId.$invalid <label for="connectionId" class="left"><span translate>Wallet Secret</span>
&& !joinForm.connectionId.$pristine">Wallet Secret is not valid!</small>
<small translate data-options="disable_for_touch:true" ng-show="joinForm.connectionId.$pristine" class="has-tip <small translate data-options="disable_for_touch:true" ng-show="joinForm.connectionId.$pristine" class="has-tip
text-gray" tooltip="Paste wallet secret here">Required</small> text-gray" tooltip="Paste wallet secret here">Required</small>
</label> </label>
<span translate class="has-error right size-12" ng-show="joinForm.connectionId.$invalid
<div class="row collapse"> && !joinForm.connectionId.$pristine">
<div class="large-10 medium-10 small-10 columns pr"> <span class="icon-input"><i class="fi-x"></i></span>
<input id="connectionId" type="text" class="small-9 columns" Wallet Secret is not valid!
placeholder="{{'Paste wallet secret here'|translate}}" </span>
name="connectionId" ng-model="connectionId" wallet-secret required> <small class="icon-input right" ng-show="joinForm.connectionId.$valid
<small class="icon-input" ng-show="joinForm.connectionId.$invalid && !joinForm.connectionId.$pristine"><i class="fi-x"></i></small>
<small class="icon-input" ng-show="joinForm.connectionId.$valid
&& !joinForm.connectionId.$pristine"><i class="fi-check"></i></small> && !joinForm.connectionId.$pristine"><i class="fi-check"></i></small>
</div>
<div class="small-2 columns" ng-hide="showScanner || disableScanner">
<div class="pr">
<input id="connectionId" type="text" class="small-9 columns" placeholder="{{'Paste wallet secret here'|translate}}" name="connectionId" ng-model="connectionId" wallet-secret required>
<div ng-hide="showScanner || disableScanner">
<a class="postfix button black" 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>
<div class="small-2 columns" ng-show="showScanner"> <div ng-show="showScanner">
<a class="postfix button warning" ng-click="cancelScanner()"><i class="fi-x">&nbsp;</i></a> <a class="postfix button warning" ng-click="cancelScanner()"><i class="fi-x">&nbsp;</i></a>
</div> </div>
</div> </div>
@ -51,10 +51,11 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="line-dashed-h"></div> <div class="line-dashed-h"></div>
<div class="m20t m20b"> <div class="m20t m20b left">
<a class="expand small" ng-click="hideAdv=!hideAdv"> <a class="expand small" ng-click="hideAdv=!hideAdv">
<i class="fi-widget m3r"></i> <i class="fi-widget m3r"></i>
<span translate ng-hide="!hideAdv">Show</span> <span translate ng-hide="!hideAdv">Show</span>
@ -69,7 +70,7 @@
<input type="text" placeholder="BIP32 master extended private key (hex)" name="private" ng-model="$parent.private"> <input type="text" placeholder="BIP32 master extended private key (hex)" name="private" ng-model="$parent.private">
</div> </div>
<div class="text-right"> <div class="text-right m20t">
<button translate type="submit" class="button secondary m0" ng-disabled="joinForm.$invalid">Join</button> <button translate type="submit" class="button secondary m0" ng-disabled="joinForm.$invalid">Join</button>
</div> </div>
</div> </div>