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

fix UI

Browse source
This commit is contained in:
Javier 2016-07-25 11:23:05 -03:00
commit f6f9e5d7fc
4 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
public/views/modals/inputAmount.html
View file

@ -6,7 +6,7 @@
</a>
</div>
<h1 class="title ellipsis" translate>Enter amount</h1>
<div class="right-small m5r" ng-click="toggleAlternative()">
<div class="right-small m5r" ng-show="!specificAmount" ng-click="toggleAlternative()">
<a class="postfix" ng-show="showAlternativeAmount">{{alternativeIsoCode}}</a>
<a class="postfix" ng-show="!showAlternativeAmount">{{unitName}}</a>
</div>
@ -16,9 +16,9 @@
<div ng-show="!specificAmount">
<div class="send-amount row" ng-style="{'background-color':index.backgroundColor}">
<div class="size-48" ng-show="!showAlternativeAmount">{{amount}}</div>
<div class="size-21 text-light" ng-show="!showAlternativeAmount">{{amountResult}} {{alternativeIsoCode}}</div>
<div class="size-21 text-light" ng-show="!showAlternativeAmount">{{globalResult}} {{amountResult}} {{alternativeIsoCode}}</div>
<div class="size-48" ng-show="showAlternativeAmount">${{alternativeAmount}}</div>
<div class="size-21 text-light" ng-show="showAlternativeAmount">{{alternativeResult}} {{unitName}}</div>
<div class="size-21 text-light" ng-show="showAlternativeAmount">{{globalResult}} {{alternativeResult}} {{unitName}}</div>
</div>
<div class="button-content text-center size-10 df">
@ -55,7 +55,7 @@
<div class="columns">
<button class="round expand m0"
ng-style="{'background-color':index.backgroundColor}"
ng-disabled="alternativeResult == 0 && amountResult == 0"
ng-disabled="alternativeResult <= 0 && amountResult <= 0"
ng-click="finish()"
ng-show="!specificAmount">
<span translate ng-show="!address">Ok</span>

15
public/views/walletHome.html
View file

@ -303,16 +303,9 @@
</button>
</div>
<div class="small-12 columns" ng-show="home.addr">
<button class="button expand small round m10b" ng-click="openCustomAmountModal(home.addr)"
<button class="button expand small round m10b" ng-click="openAmountModal(home.addr)"
ng-style="{'background-color':index.backgroundColor}"
ng-disabled="home.generatingAddress"
ng-show="!index.isCordova">
<span translate>Request a specific amount</span>
</button>
<button class="button expand small round m10b" ng-click="openInputAmountModal(home.addr)"
ng-style="{'background-color':index.backgroundColor}"
ng-disabled="home.generatingAddress"
ng-show="index.isCordova">
ng-disabled="home.generatingAddress">
<span translate>Request a specific amount</span>
</button>
</div>
@ -432,8 +425,8 @@
<input type="amount" readonly="true" ng-show="showAlternative" id="alternative" ng-disabled="!home.isRateAvailable || home.lockAmount" name="alternative" ng-attr-placeholder="{{'Amount in'|translate}} {{ home.alternativeName }}" ng-model="_alternative" required autocomplete="off" ng-focus="openInputAmountModal()" ignore-mouse-wheel>
</div>
<div ng-if="!index.isCordova">
<input type="text" ng-show="!showAlternative" id="amount" ng-disabled="home.lockAmount" name="amount" ng-attr-placeholder="{{'Amount in'|translate}} {{home.unitName}}" ng-model="_amount" valid-amount required autocomplete="off" ignore-mouse-wheel>
<input type="text" ng-show="showAlternative" id="alternative" ng-disabled="!home.isRateAvailable || home.lockAmount" name="alternative" ng-attr-placeholder="{{'Amount in'|translate}} {{ home.alternativeName }}" ng-model="_alternative" required autocomplete="off" ignore-mouse-wheel>
<input type="number" ng-show="!showAlternative" id="amount" ng-disabled="home.lockAmount" name="amount" ng-attr-placeholder="{{'Amount in'|translate}} {{home.unitName}}" ng-model="_amount" valid-amount required autocomplete="off" ignore-mouse-wheel>
<input type="number" ng-show="showAlternative" id="alternative" ng-disabled="!home.isRateAvailable || home.lockAmount" name="alternative" ng-attr-placeholder="{{'Amount in'|translate}} {{ home.alternativeName }}" ng-model="_alternative" required autocomplete="off" ignore-mouse-wheel>
</div>
<a class="postfix button" ng-show="!showAlternative" ng-style="{'background-color':index.backgroundColor}" ng-click="showAlternative = !showAlternative">{{home.unitName}}</a>
<a class="postfix button black" ng-show="showAlternative" ng-click="showAlternative = !showAlternative">{{home.alternativeIsoCode}}</a>