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

Merge pull request #2750 from cmgustavo/bug/paypro-modal

Browse source 
Fix paypro modal
This commit is contained in:
Matias Alejo Garcia 2015-05-19 12:38:58 -03:00
commit 2d7f85dce1
2 changed files with 36 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

75
public/views/modals/paypro.html
View file

@ -6,53 +6,48 @@
</section>
<section class="middle tab-bar-section">
<h1 class="title ellipsis" ng-style="{'color':color}" translate>
Payment protocol request
Payment request
</h1>
</section>
</nav>
<div class="row p60t">
<div class="large-12 columns">
<div class="text-center">
<div class="size-48">
{{unitTotal}} {{unitName}}
</div>
<div class="size-18 m5t text-gray">
{{ alternative }} {{ alternativeIsoCode }}
</div>
<div class="p45t">
<div class="header-modal text-center">
<div class="size-42">
{{unitTotal}} {{unitName}}
</div>
<div class="line-b m10v"></div>
<div class="ellipsis m10v">
<i translate>To</i>: {{paypro.domain}}
</div>
<div ng-if="paypro.toAddress" class="m10v lh140">
<i translate>Address</i>:
<span class="text-gray">
{{paypro.toAddress}}
</span>
</div>
<div class="m10v">
<i translate>Certified by</i>:
<span ng-show="paypro.verified"><i class="fi-lock color-greeni"></i> {{paypro.verifyData.caName}}</span>
<span ng-show="!paypro.verified"><i class="fi-unlock color-yellowi"></i> <span translate>Untrusted</span></span>
</div>
<div ng-if="paypro.memo" class="m10v lh140">
<i translate>Merchant message</i>:
<span class="text-gray">
{{paypro.memo}}
</span>
</div>
<div ng-if="paypro.expires" class="m10v">
<i translate>Expires</i>: {{paypro.expires * 1000 | amTimeAgo }}
<div class="size-18 m5t text-gray" ng-show="alternative">
{{ alternative }} {{ alternativeIsoCode }}
</div>
</div>
<h4 class="title m0" translate>Details</h4>
<ul class="no-bullet size-14 m0">
<li class="line-b p10 oh">
<span class="text-gray" translate>Pay To</span>:
<span class="right enable_text_select">{{paypro.domain}}</span>
</li>
<li class="line-b p10 oh" ng-if="paypro.toAddress">
<span class="text-gray" translate>Address</span>:
<span class="right enable_text_select">{{paypro.toAddress}}</span>
</li>
<li class="line-b p10 oh">
<span class="text-gray" translate>Certified by</span>:
<span class="right">
<span ng-show="paypro.verified"><i class="fi-lock color-greeni"></i>
{{paypro.verifyData.caName || paypro.verifyData}}</span>
<span ng-show="!paypro.verified"><i class="fi-unlock color-yellowi"></i> <span translate>Untrusted</span></span>
</span>
</li>
<li class="line-b p10 oh" ng-if="paypro.memo">
<span class="text-gray" translate>Memo</span>:
<span class="right">{{paypro.memo}}</span>
</li>
<li class="line-b p10 oh" ng-if="paypro.expires">
<span class="text-gray" translate>Expires</span>:
<span class="right">{{paypro.expires * 1000 | amTimeAgo }}</span>
</li>
</ul>
</div>
<div class="extra-margin-bottom"></div>

4
src/css/main.css
View file

@ -835,8 +835,8 @@ label.postfix, a.postfix {
.input.block i {
position: absolute;
top: 5px;
left: 10px;
top: 2px;
left: 15px;
font-size: 20px;
color: #7A8C9E;
border-right: 1px solid #ccc;