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

Merge pull request #2537 from bechi/layout-details-03

Browse source 
Layout details 03
This commit is contained in:
Matias Alejo Garcia 2015-04-17 16:19:50 -03:00
commit 736e6c8a9b
7 changed files with 29 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

6
public/views/history.html
View file

@ -20,10 +20,10 @@
ng-click="history.openTxModal(btx)" ng-click="history.openTxModal(btx)"
class="row collapse last-transactions-content"> class="row collapse last-transactions-content">
<div class="large-3 medium-3 small-3 columns"> <div class="large-3 medium-3 small-3 columns">
<span class="label tu" ng-show="btx.action == 'received'" <span class="label tu radius" ng-show="btx.action == 'received'"
ng-style="{'background-color':index.backgroundColor}">Received</span> ng-style="{'background-color':index.backgroundColor}">Received</span>
<span class="label tu gray" ng-show="btx.action == 'sent'">Sent</span> <span class="label tu gray radius" ng-show="btx.action == 'sent'">Sent</span>
<span class="label tu gray" ng-show="btx.action == 'moved'">Moved</span> <span class="label tu gray radius" ng-show="btx.action == 'moved'">Moved</span>
</div> </div>
<div class="large-5 medium-5 small-5 columns"> <div class="large-5 medium-5 small-5 columns">

4
public/views/modals/tx-details.html
View file

@ -55,11 +55,11 @@
</li> </li>
<li ng-if="btx.time" class="line-b p10"> <li ng-if="btx.time" class="line-b p10">
<span class="text-gray" translate>Confirmations:</span> <span class="text-gray" translate>Confirmations:</span>
<span class="right"> <span class="right" >
<span class="text-warning" ng-show="!btx.confirmations || btx.confirmations == 0" translate> <span class="text-warning" ng-show="!btx.confirmations || btx.confirmations == 0" translate>
Unconfirmed Unconfirmed
</span> </span>
<span class="text-secondary" ng-show="btx.confirmations>0"> <span class="label gray radius" ng-show="btx.confirmations>0">
{{btx.confirmations}} {{btx.confirmations}}
</span> </span>
</span> </span>

4
public/views/modals/txp-details.html
View file

@ -108,7 +108,7 @@
<div class="large-5 medium-5 small-6 columns"> <div class="large-5 medium-5 small-6 columns">
<button class="button outline dark-gray m0 expand" ng-click="hideTxInfo = true; reject(tx);" <button class="button outline dark-gray m0 expand" ng-click="hideTxInfo = true; reject(tx);"
ng-disabled="loading"> ng-disabled="loading">
<i class="fi-x icon-sign x"></i> <i class="fi-x"></i>
<span translate>Reject</span> <span translate>Reject</span>
</button> </button>
</div> </div>
@ -116,7 +116,7 @@
<button class="button primary m0 expand" ng-click="hideTxInfo = true; sign(tx)" <button class="button primary m0 expand" ng-click="hideTxInfo = true; sign(tx)"
ng-style="{'background-color':color}" ng-style="{'background-color':color}"
ng-disabled="loading"> ng-disabled="loading">
<i class="fi-check icon-sign check"></i> <i class="fi-check"></i>
<span translate>Sign</span> <span translate>Sign</span>
</button> </button>
</div> </div>

18
public/views/send.html
View file

@ -27,23 +27,11 @@
</span> </span>
</div> </div>
<form ng-show="!send.fetchingURL" name="sendForm" ng-submit="send.submitForm(sendForm)" ng-disabled="send.blockUx" novalidate> <form ng-show="!send.fetchingURL" name="sendForm" ng-submit="send.submitForm(sendForm)" ng-disabled="send.blockUx" novalidate>
<div class="box-notification" ng-show="send.error"> <div class="box-notification" ng-show="send.error" ng-click="send.resetError()">
<div class="box-icon error"> <span class="text-warning">
<i class="fi-x size-24"></i>
</div>
<span class="text-warning size-14">
{{send.error|translate}} {{send.error|translate}}
</span> </span>
<a class="close-notification text-warning" ng-click="send.resetForm(sendForm)">&#215;</a> <a class="close-notification text-warning">&#215;</a>
</div>
<div class="box-notification" ng-show="success">
<div class="box-icon success">
<i class="fi-check size-24"></i>
</div>
<span class="text-success size-14">
{{success|translate}}
</span>
<a class="close-notification text-success" ng-click="success=null">&#215;</a>
</div> </div>
<div ng-hide="send._paypro || send.hideAddress"> <div ng-hide="send._paypro || send.hideAddress">

10
src/css/main.css
View file

@ -163,8 +163,8 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
.box-notification { .box-notification {
position: relative; position: relative;
font-size: 12px; font-size: 12px;
padding: 0.7rem 3rem; padding: 0.5rem 2rem 0.5rem 0.7rem;
border-radius: 4px; border-radius: 2px;
background: #F2F5F8; background: #F2F5F8;
margin: 0 auto; margin: 0 auto;
margin-bottom: 1.6rem; margin-bottom: 1.6rem;
@ -198,10 +198,9 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
a.close-notification { a.close-notification {
position: absolute; position: absolute;
top: 0; top: -4px;
right: 0; right: 10px;
font-size: 24px; font-size: 24px;
padding: 10px;
} }
ul.tx-copayers { ul.tx-copayers {
@ -597,7 +596,6 @@ button.outline:hover,
button.outline:focus { button.outline:focus {
border-radius: 3px; border-radius: 3px;
background: transparent; background: transparent;
text-transform: none;
} }
.button.outline.dark-gray, .button.outline.dark-gray,

10
src/css/mobile.css
View file

@ -521,15 +521,15 @@ a.pin-button:active {
} }
.dr-notification-content { .dr-notification-content {
line-height: 100%; line-height: 90%;
padding: 7px 50px 5px 60px; padding: 10px 50px 5px 60px;
} }
.dr-notification-title { .dr-notification-title {
color: #fff; color: #fff;
font-size: 14px; font-size: 12px;
margin-bottom: 0; margin-bottom: 0;
font-weight: 500; font-weight: 700;
} }
.dr-notification { .dr-notification {
@ -545,7 +545,7 @@ a.pin-button:active {
} }
.dr-notification-text { .dr-notification-text {
font-size: 12px; font-size: 11px;
color: #fff; color: #fff;
} }

13
src/js/controllers/send.js
View file

@ -5,6 +5,10 @@ angular.module('copayApp.controllers').controller('sendController',
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
var self = this; var self = this;
this.resetError = function() {
this.error = this.success = null;
};
this.init = function() { this.init = function() {
this.isMobile = isMobile.any(); this.isMobile = isMobile.any();
this.isWindowsPhoneApp = isMobile.Windows() && isCordova; this.isWindowsPhoneApp = isMobile.Windows() && isCordova;
@ -12,7 +16,7 @@ angular.module('copayApp.controllers').controller('sendController',
$rootScope.title = fc.credentials.m > 1 ? 'Send Proposal' : 'Send'; $rootScope.title = fc.credentials.m > 1 ? 'Send Proposal' : 'Send';
this.blockUx = false; this.blockUx = false;
this.error = this.success = null; this.resetError();
this.isRateAvailable = false; this.isRateAvailable = false;
this.showScanner = false; this.showScanner = false;
@ -106,6 +110,7 @@ angular.module('copayApp.controllers').controller('sendController',
$scope.__alternative = 0; $scope.__alternative = 0;
} }
self.alternativeAmount = $scope.__alternative; self.alternativeAmount = $scope.__alternative;
self.resetError();
}, },
enumerable: true, enumerable: true,
configurable: true configurable: true
@ -272,8 +277,10 @@ angular.module('copayApp.controllers').controller('sendController',
} }
}; };
this.resetForm = function(form) { this.resetForm = function(form) {
this.error = this.success = null; this.resetError();
this.fetchingURL = null; this.fetchingURL = null;
this._paypro = null; this._paypro = null;
@ -395,7 +402,7 @@ angular.module('copayApp.controllers').controller('sendController',
}; };
this.onAddressChange = function(value) { this.onAddressChange = function(value) {
this.error = this.success = null; this.resetError();
if (!value) return ''; if (!value) return '';
if (this._paypro) if (this._paypro)