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

Merge pull request #1046 from bechi/bugs/scann-wallet-secret

Browse source 
fix scann wallet secret
This commit is contained in:
Yemel Jardi 2014-08-06 15:06:09 -03:00
commit b715c9c46d
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
views/join.html
View file

@ -20,12 +20,16 @@
text-gray" tooltip="Paste wallet secret here" >Required</small> text-gray" tooltip="Paste wallet secret here" >Required</small>
</label> </label>
<input id="connectionId" type="text" class="small-9 columns" placeholder="Paste wallet secret here" name="connectionId" ng-model="connectionId" wallet-secret required style="width:85%;"> <div class="row collapse">
<div class="small-2 columns" style="padding:0px;width:15%;" ng-hide="showScanner"> <div class="large-10 columns">
<a class="postfix button primary" ng-click="openScanner()"><i class="fi-camera">&nbsp;</i></a> <input id="connectionId" type="text" class="small-9 columns" placeholder="Paste wallet secret here" name="connectionId" ng-model="connectionId" wallet-secret required>
</div> </div>
<div class="small-2 columns" style="padding:0px;width:15%;" ng-show="showScanner"> <div class="small-2 columns" ng-hide="showScanner">
<a class="postfix button warning" ng-click="cancelScanner()"><i class="fi-x">&nbsp;</i></a> <a class="postfix button primary" 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>
</div>
</div> </div>
<div id="scanner" class="row" ng-if="showScanner"> <div id="scanner" class="row" ng-if="showScanner">
@ -46,7 +50,6 @@
</div> </div>
</div> </div>
<div style="clear: both;"></div>
<label for="joinPassword"> User info </label> <label for="joinPassword"> User info </label>
<input id="joinPassword" type="text" class="form-control" placeholder="Your name (optional)" name="nickname" ng-model="nickname"> <input id="joinPassword" type="text" class="form-control" placeholder="Your name (optional)" name="nickname" ng-model="nickname">
<input type="password" class="form-control" <input type="password" class="form-control"