BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix payment protocol message on send page

This commit is contained in:
Gustavo Maximiliano Cortez 2014-11-04 16:32:43 -03:00
parent d5f7e46084
commit 861f3c584d
2 changed files with 181 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
css/src/main.css
View File

@ -401,7 +401,7 @@ table.last-transactions-content {
padding: 0; padding: 0;
border: 0; border: 0;
background-color: #F8F8FB; background-color: #F8F8FB;
margin: 0; margin: 10px 0;
} }
.last-transactions-content .box-status { .last-transactions-content .box-status {
@ -465,19 +465,18 @@ table.last-transactions-content {
} }
.send-note { .send-note {
font-style: italic;
color: gray;
background-color: #EDEDF5; background-color: #EDEDF5;
padding: 1.5rem; padding: 10px;
width: 400px; margin-bottom: 10px;
} }
.box-note { .send-note p {
text-align: center; margin-bottom: 5px;
clear: both; font-size: 12px;
font-style: italic; }
color: gray;
margin-bottom: 10px; .send-note b {
color: #000;
} }
a.button-setup.add-wallet { a.button-setup.add-wallet {

129
views/send.html
View File

@ -12,7 +12,7 @@
<div ng-show="txs.length != 0" class="line-dashed-h m20b"></div> <div ng-show="txs.length != 0" class="line-dashed-h m20b"></div>
<h1 class="hide-for-large-up">{{$root.title}}</h1> <h1 class="hide-for-large-up">{{$root.title}}</h1>
<div class="row collapse m0"> <div class="row">
<div class="large-6 columns"> <div class="large-6 columns">
<form name="sendForm" ng-submit="submitForm(sendForm)" novalidate> <form name="sendForm" ng-submit="submitForm(sendForm)" novalidate>
<p class="text-warning size-16" <p class="text-warning size-16"
@ -22,14 +22,14 @@
</p> </p>
<div class="row collapse"> <div class="row collapse">
<div class="large-12 columns"> <label for="address">
<div class="row collapse"> <span translate>To</span>
<label for="address"><span translate>To </span><a class="has-tip size-12" href="#" <i class="fi-info size-12" href="#"
data-options="disable_for_touch:true" data-options="disable_for_touch:true"
tooltip-popup-delay='500' tooltip-popup-delay='500'
tooltip="{{'Enter a valid Bitcoin address. Payment Protocol URLs are also supported'|translate}}" tooltip="{{'Enter a valid Bitcoin address. Payment Protocol URLs are also supported'|translate}}"
tooltip-trigger="mouseenter" tooltip-trigger="mouseenter"
tooltip-placement="right">(?)</a> tooltip-placement="right"></i>
<small translate ng-hide="!sendForm.address.$pristine || address">required</small> <small translate ng-hide="!sendForm.address.$pristine || address">required</small>
<small translate class="is-valid" ng-show="!sendForm.address.$invalid && address">valid!</small> <small translate class="is-valid" ng-show="!sendForm.address.$invalid && address">valid!</small>
<small translate class="has-error" ng-show="sendForm.address.$invalid && address">not valid</small> <small translate class="has-error" ng-show="sendForm.address.$invalid && address">not valid</small>
@ -47,7 +47,7 @@
<a translate class="postfix button warning" ng-click="cancelScanner()">Cancel</a> <a translate class="postfix button warning" ng-click="cancelScanner()">Cancel</a>
</div> </div>
</div> </div>
<div id="scanner" class="row" ng-if="showScanner"> <div id="scanner" ng-if="showScanner">
<div class="text-centered"> <div class="text-centered">
<canvas id="qr-canvas" width="200" height="150"></canvas> <canvas id="qr-canvas" width="200" height="150"></canvas>
<div ng-show="isMobile"> <div ng-show="isMobile">
@ -64,10 +64,8 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div class="row collapse"> <div class="row">
<div class="large-6 medium-6 columns"> <div class="large-6 medium-6 columns">
<div class="row collapse"> <div class="row collapse">
<label for="amount"><span translate>Amount</span> <label for="amount"><span translate>Amount</span>
@ -100,7 +98,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="large-5 medium-5 columns"> <div class="large-6 medium-6 columns">
<div class="row collapse"> <div class="row collapse">
<label for="alternative"><span translate>Amount in</span> {{ alternativeName }} </label> <label for="alternative"><span translate>Amount in</span> {{ alternativeName }} </label>
<div class="small-9 columns"> <div class="small-9 columns">
@ -118,87 +116,78 @@
</div> </div>
</div> </div>
<div class="row collapse"> <div class="row">
<div class="large-12 columns"> <div class="large-12 columns" ng-show="!!$root.merchant">
<div class="row collapse"> <h3>This is a payment protocol transaction</h3>
<label for="comment"><span translate>Note</span>
<small translate ng-hide="!sendForm.comment.$pristine">optional</small>
<small translate class="has-error" ng-show="sendForm.comment.$invalid && !sendForm.comment.$pristine">too long!</small>
</label>
<div class="large-12 columns">
<textarea id="comment" ng-disabled="loading"
name="comment" placeholder="{{(wallet.isShared() ? 'Leave a private message to your copayers' : 'Add a private comment to identify the transaction') |translate}}" ng-model="commentText" ng-maxlength="100"></textarea>
</div>
</div>
</div>
</div>
<div class="row collapse">
<span ng-if="!$root.alternativeConversionRate">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
<span class="left m5t text-gray size-14" ng-if="$root.alternativeConversionRate > 0">1 BTC = {{alternativeConversionRate|noFractionNumber:2}} {{alternativeIsoCode}}
</span>
<div class="large-5 medium-3 small-6 columns right">
<button type="submit" class="button primary expand text-center" ng-disabled="sendForm.$invalid || loading">
Send
</button>
</div>
</div>
</form>
</div>
</div><!-- end of row -->
<div class="large-6 columns show-for-large-up" ng-show="!!$root.merchant">
<div class="send-note"> <div class="send-note">
<h6 translate>Send to</h6> <p>
<p class="text-gray" ng-class="{'hidden': sendForm.address.$invalid || !address}" <b translate>Send to</b>:
title="{{$root.merchant.request_url}}"> {{$root.merchant.domain}}
{{$root.merchant.domain}}&nbsp;
</p> </p>
<h6 translate>Total amount for this transaction:</h6> <p>
<p class="text-gray" ng-class="{'hidden': sendForm.amount.$invalid || !amount > 0}"> <b translate>Total amount for this transaction</b>:
<b>{{amount + defaultFee |noFractionNumber}}</b> {{$root.wallet.settings.unitName}} <i>{{amount + defaultFee |noFractionNumber}} {{$root.wallet.settings.unitName}}</i>
<small ng-if="isRateAvailable"> <small ng-if="isRateAvailable">
{{ rateService.toFiat((amount + defaultFee) * unitToSatoshi, alternativeIsoCode) | noFractionNumber: 2 }} {{ alternativeIsoCode }} {{ rateService.toFiat((amount + defaultFee) * unitToSatoshi, alternativeIsoCode) | noFractionNumber: 2 }} {{ alternativeIsoCode }}
<br>
</small> </small>
<small> <small>
<span translate>Including fee of</span> {{defaultFee|noFractionNumber}} {{$root.wallet.settings.unitName}} (<span translate>Including fee of</span>
{{defaultFee|noFractionNumber}}
{{$root.wallet.settings.unitName}})
</small> </small>
</p> </p>
<div ng-show="wallet.isShared()"> <p>
<h6 translate>Note</h6> <b translate>Server Says</b>:
<p ng-class="{'hidden': !commentText}">{{commentText}}</p>
</div>
<div ng-show="!!$root.merchant">
<h6 translate>Merchant Data:</h6>
<p class="text-gray">
Note: This is a payment protocol transaction.
</p>
<h6 translate>Server Says:</h6>
<p class="text-gray">
{{$root.merchant.pr.pd.memo}} {{$root.merchant.pr.pd.memo}}
</p> </p>
<h6 translate>Certificate:</h6> <p>
<p class="text-gray"> <b translate>Certificate</b>:
<span ng-show="!!$root.merchant.pr.ca">{{$root.merchant.pr.ca}}</span> <span ng-show="!!$root.merchant.pr.ca">{{$root.merchant.pr.ca}}</span>
<span ng-show="!$root.merchant.pr.ca" style="color:red;weight:bold;">Untrusted</span> <span ng-show="!$root.merchant.pr.ca" style="color:red;weight:bold;">Untrusted</span>
</p> </p>
<h6 translate>Payment Expiration:</h6> <p>
<p class="text-gray"> <b translate>Payment Expiration</b>:
{{$root.merchant.expiration}} {{$root.merchant.expiration}}
</p> </p>
</div> </div>
</div> </div>
</div> </div>
<div class="row">
<div class="large-12 columns">
<label for="comment"><span translate>Note</span>
<small translate ng-hide="!sendForm.comment.$pristine">optional</small>
<small translate class="has-error" ng-show="sendForm.comment.$invalid && !sendForm.comment.$pristine">too long!</small>
</label>
<textarea id="comment" ng-disabled="loading"
name="comment" placeholder="{{(wallet.isShared() ? 'Leave a private message to your copayers' : 'Add a private comment to identify the transaction') |translate}}" ng-model="commentText" ng-maxlength="100"></textarea>
</div>
</div>
<div class="row">
<div class="large-12 columns text-right">
<button type="submit" class="button primary m0" ng-disabled="sendForm.$invalid || loading">
Send
</button>
</div>
</div>
</form>
</div>
</div><!-- end of row -->
<div class="row m20b" ng-show="$root.alternativeConversionRate > 0">
<div class="large-6 columns size-12">
<i class="fi-bitcoin-circle"></i>
1 BTC = {{alternativeConversionRate|noFractionNumber:2}} {{alternativeIsoCode}}
</div>
</div>
<div class="line-dashed-h m20b"></div> <div class="line-dashed-h m20b"></div>
<div class="row">
<div class="large-12 columns"> <div class="large-12 columns">
<h2 translate>Address Book</h2> <h2 translate>Address Book</h2>
<p translate class="text-gray m15b" ng-hide="showAddressBook()">Empty. Create an alias for your addresses</p> <p translate class="text-gray m15b" ng-hide="showAddressBook()">Empty. Create an alias for your addresses</p>
<table class="large-12 medium-12 small-12" ng-show="showAddressBook()"> <table ng-show="showAddressBook()">
<thead> <thead>
<tr> <tr>
<th translate>Label</th> <th translate>Label</th>
@ -221,7 +210,9 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<button translate class="button tiny primary text-center" ng-click="openAddressBookModal()"><i class="fi-plus m5r"></i>Add</button> <button translate class="button tiny primary" ng-click="openAddressBookModal()">
<i class="fi-plus m5r"></i> Add</button>
</div>
</div> </div>
</div> </div>
</div> </div>