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

wip

Browse source
This commit is contained in:
Javier 2016-08-24 15:47:36 -03:00
commit 79aa8c44d6
3 changed files with 34 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
public/views/confirm.html
View file

@ -23,7 +23,7 @@
</div>
<div class="list card">
<div class="item">Fee: {{feeLevel}}
<div class="item">Fee: {{feeLevel}}
<span class="item-note">
{{fee || '...'}}
</span>
@ -49,7 +49,7 @@
<ul class="pr">
<li ng-show="wallets[0]" class="item item-icon-left">
<i class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i>
{{item.name || item.id}}
{{item.name || item.id}}
<span class="item-note" ng-show="item.isComplete()">
{{item.availableBalanceStr}}
</span>
@ -61,9 +61,11 @@
</div>
<div class="item item-icon-right">
Add Description (not yet working...)
<i class="icon ion-ios-arrow-right size-21"></i>
<div class="item item-icon-left item-icon-right" ng-click="showCommentPopup()">
<span ng-show="!comment">Add Description</span>
<span ng-show="comment">{{comment}}</span>
<i class="icon ion-ios-chatbubble-outline size-21"></i>
<i class="icon ion-ios-plus-empty size-21"></i>
</div>
</div>

18
public/views/includes/note.html
View file

@ -1,15 +1,11 @@
<div class="columns m20t">
<label class="size-14 text-center">
<span ng-show="!comment" translate>Add comment</span>
<span ng-show="comment" translate>Edit comment</span>
</label>
<div class="padding">
<input type="text" ng-model="data.comment" autofocus>
</div>
<div class="row m20t dib">
<div class="half-row left">
<button class="round outline dark-gray expand" ng-click="commentPopupClose()" translate>Cancel</button>
<div class="row">
<div class="col">
<button class="button button-dark button-block" ng-click="commentPopupClose()" translate>Cancel</button>
</div>
<div class="half-row left">
<button ng-style="{'background-color': index.backgroundColor}" class="round outline expand" ng-click="commentPopupSave()" translate>Save</button>
<div class="col">
<button class="button button-dark button-block" ng-click="commentPopupSave()" translate>Save</button>
</div>
</div>
</div>

22
src/js/controllers/confirm.js
View file

@ -1,12 +1,12 @@
'use strict';
angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, $ionicPopup, txStatus, gettext, txFormatService) {
angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, $ionicPopup, txStatus, gettext, txFormatService) {
var cachedTxp = {};
// An alert dialog
var showAlert = function(title, msg, cb) {
$log.warn(title + ":" + msg);
$log.warn(title + ": " + msg);
var alertPopup = $ionicPopup.alert({
title: title,
template: msg
@ -17,6 +17,22 @@ angular.module('copayApp.controllers').controller('confirmController', function(
alertPopup.then(cb);
};
$scope.showCommentPopup = function() {
var commentPopup = $ionicPopup.show({
templateUrl: "views/includes/note.html",
title: $scope.data.comment ? gettextCatalog.getString('Edit comment') : gettextCatalog.getString('Add comment'),
scope: $scope,
});
$scope.commentPopupClose = function() {
commentPopup.close();
};
$scope.commentPopupSave = function() {
$log.debug('Saving comment');
$scope.comment = $scope.data.comment;
commentPopup.close();
};
};
$scope.init = function() {
// TODO (URL , etc)
@ -160,6 +176,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.approve = function() {
console.log($scope.comment);
return;
var wallet = $scope.wallet;
var txp = $scope.txp;
if (!wallet) {