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

fix paypro loading notification

This commit is contained in:
Matias Alejo Garcia 2014-12-10 20:59:05 -03:00
parent 621e85f9b0
commit 4d31b39f94
3 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
css/src/main.css
View File

@ -414,6 +414,13 @@ a:hover {
background-color: #C0392A; background-color: #C0392A;
} }
.box-notification .box-icon.secondary {
background-color: #3498DB;
}
.box-notification a.close-notification { .box-notification a.close-notification {
position: absolute; position: absolute;
top: 8px; top: 8px;

6
js/controllers/send.js
View File

@ -399,7 +399,11 @@ angular.module('copayApp.controllers').controller('SendController',
if (err) { if (err) {
copay.logger.warn(err); copay.logger.warn(err);
$scope.resetForm(); $scope.resetForm();
$scope.error = err.toString(); var msg = err.toString();
if (msg.match('HTTP')) {
msg = 'Could not fetch payment information';
}
$scope.error = msg;
} else { } else {
$scope._merchantData = merchantData; $scope._merchantData = merchantData;
$scope._domain = merchantData.domain; $scope._domain = merchantData.domain;

36
views/send.html
View File

@ -6,7 +6,22 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row" ng-show="fetchingURL">
<div class="large-12 columns">
<div class="panel">
<div class="box-notification">
<div class="box-icon secondary">
<i class="fi-bitcoin-circle icon-rotate spinner size-24"></i>
</div>
<span class="text-secondary size-14">
Fetching Payment Information...
</span>
</div>
</div>
</div>
</div>
<div class="row" ng-show="!fetchingURL">
<div class="large-12 columns"> <div class="large-12 columns">
<form name="sendForm" ng-submit="submitForm(sendForm)" novalidate> <form name="sendForm" ng-submit="submitForm(sendForm)" novalidate>
<div class="panel"> <div class="panel">
@ -17,6 +32,7 @@
<span class="text-warning size-14"> <span class="text-warning size-14">
{{error|translate}} {{error|translate}}
</span> </span>
<a class="close-notification text-warning" ng-click="error=null">&#215;</a>
</div> </div>
<div class="box-notification" ng-show="success"> <div class="box-notification" ng-show="success">
<div class="box-icon success"> <div class="box-icon success">
@ -25,6 +41,7 @@
<span class="text-success size-14"> <span class="text-success size-14">
{{success|translate}} {{success|translate}}
</span> </span>
<a class="close-notification text-success" ng-click="success=null">&#215;</a>
</div> </div>
<div ng-if="!_merchantData"> <div ng-if="!_merchantData">
@ -67,10 +84,10 @@
<span translate>Payment to</span> <span translate>Payment to</span>
</label> </label>
<div class="input"> <div class="input">
<input type="text" id="domain" name="domain" ng-model="_domain" ng-disabled="1"> <input type="text" id="domain" name="domain" ng-model="_domain" ng-disabled="1">
<i class="fi-lock color-greeni"></i> <i class="fi-lock color-greeni"></i>
</div> </div>
</div> </div>
</div> </div>
@ -120,15 +137,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row" ng-show="fetchingURL">
<div class="large-12 columns">
<p>>>
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
Fetching payment request
</div>
</div>
<div class="row"> <div class="row">
<div class="large-12 columns"> <div class="large-12 columns">
<label for="comment"><span translate>Note</span> <label for="comment"><span translate>Note</span>