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

Updates tx-status, new design

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-03 16:22:44 -03:00
commit afc52d69ce
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
4 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

27
public/views/modals/tx-status.html
View file

@ -1,18 +1,21 @@
<div ng-if="type == 'broadcasted'" class="popup-txsent">
<i class="small-centered columns fi-check m20tp"></i>
<div class="text-center size-18 text-white text-bold tu p20">
<span translate>Payment Sent</span>
<div ng-if="type == 'broadcasted'" class="popup-txsent text-center">
<i class="small-centered columns fi-check m30tp" ng-style="{'color':color, 'border-color':color}"></i>
<div ng-show="tx.amountStr" class="m20t size-36 text-white">
{{tx.amountStr}}
</div>
<div class="text-center">
<a class="button outline round white tiny small-4" ng-click="cancel()">OKAY</a>
<div class="size-16 text-gray">
<span translate>Sent</span>
</div>
<div class="text-center m20t">
<a class="button outline round light-gray tiny small-4" ng-click="cancel()">OKAY</a>
</div>
</div>
<div ng-if="type == 'created'" class="popup-txsigned">
<i class="small-centered columns fi-check m20tp"></i>
<div class="text-center size-18 text-primary tu text-bold p20">
<i class="small-centered columns fi-check m30tp" ng-style="{'color':color, 'border-color':color}"></i>
<div class="text-center size-18 tu text-bold p20" ng-style="{'color':color}">
<span translate>Payment Proposal Created</span>
</div>
<div class="text-center">
@ -23,8 +26,8 @@
<div ng-if="type == 'accepted'" class="popup-txsigned">
<i class="small-centered columns fi-check m20tp"></i>
<div class="text-center size-18 text-primary tu text-bold p20">
<i class="small-centered columns fi-check m30tp" ng-style="{'color':color, 'border-color':color}"></i>
<div class="text-center size-18 text-primary tu text-bold p20" ng-style="{'color':color}">
<span translate>Payment Accepted</span>
</div>
<div class="text-center">
@ -33,8 +36,8 @@
</div>
<div ng-if="type=='rejected'" class="popup-txrejected">
<i class="fi-x small-centered columns m20tp"></i>
<div class="text-center size-18 tu text-warning text-bold p20">
<i class="fi-x small-centered columns m30tp" ng-style="{'color':color, 'border-color':color}"></i>
<div class="text-center size-18 tu text-bold p20" ng-style="{'color':color}">
<span translate>Payment Rejected</span>
</div>
<div class="text-center">

1
src/css/main.css
View file

@ -513,6 +513,7 @@ ul.manage li {
.m20r {margin-right: 20px;}
.m20t {margin-top: 20px;}
.m20tp {margin-top: 20%;}
.m30tp {margin-top: 30%;}
.m15 {margin: 15px;}
.m15h {margin: 0 15px;}
.p10t {padding-top: 10px;}

17
src/css/mobile.css
View file

@ -705,14 +705,15 @@ textarea:focus
position: absolute;
width: 100%;
height: 100%;
background: #1ABC9C;
background: rgba(24,44,58,0.90);
}
.popup-txsent i {
font-size: 5rem;
background-color: #fff;
color: #1ABC9C;
color: #4A90E2;
border-radius: 100%;
border-color: #4A90E2;
border: 2px solid;
width: 150px;
height: 150px;
display: block;
@ -722,9 +723,10 @@ textarea:focus
.popup-txsigned i {
font-size: 5rem;
background-color: #1ABC9C;
color: #fff;
color: #4A90E2;
border-radius: 100%;
border-color: #4A90E2;
border: 2px solid;
width: 150px;
height: 150px;
display: block;
@ -734,9 +736,10 @@ textarea:focus
.popup-txrejected i {
font-size: 5rem;
background-color: #ED4A43;
color: #fff;
color: #4A90E2;
border-radius: 100%;
border-color: #4A90E2;
border: 2px solid;
width: 150px;
height: 150px;
display: block;

5
src/js/services/txStatus.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.services').factory('txStatus', function($modal, lodash, profileService, $timeout) {
angular.module('copayApp.services').factory('txStatus', function($modal, lodash, profileService, $timeout, txFormatService) {
var root = {};
root.notify = function(txp, cb) {
@ -42,8 +42,11 @@ angular.module('copayApp.services').factory('txStatus', function($modal, lodash,
};
var openModal = function(type, txp, cb) {
var fc = profileService.focusedClient;
var ModalInstanceCtrl = function($scope, $modalInstance) {
$scope.type = type;
$scope.tx = txFormatService.processTx(txp);
$scope.color = fc.backgroundColor;
$scope.cancel = function() {
$modalInstance.dismiss('cancel');
};