From 024a80d72541a21a7eda4cb2337c22c667688027 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 6 Jan 2015 16:10:28 -0300 Subject: [PATCH 1/3] fixes buttons on receive section --- css/src/main.css | 1 + views/receive.html | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 9ce43d298..d034d8cfa 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -536,6 +536,7 @@ a.button-setup { .m10b {margin-bottom: 10px;} .m15b {margin-bottom: 15px;} .m20b {margin-bottom: 20px;} +.m30b {margin-bottom: 30px;} .m10r {margin-right: 10px;} .m15l {margin-left: 15px;} .m15t {margin-top: 15px;} diff --git a/views/receive.html b/views/receive.html index 3ebe3dcff..a80f09886 100644 --- a/views/receive.html +++ b/views/receive.html @@ -50,13 +50,19 @@
- - Generate new address - - - Show all my addresses - Hide them - +
+
+ + Generate new address + +
+
+ + Show all my addresses + Hide them + +
+
From 99de32fc5ddf1793a7f7ae2e598f2a6baa855646 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 6 Jan 2015 17:10:28 -0300 Subject: [PATCH 2/3] refactory of the confirmation popup --- js/directives.js | 17 ----------------- views/modals/wallet-info.html | 34 ++++++++++++++++++++++++---------- views/profile.html | 18 +++++++++++++++--- 3 files changed, 39 insertions(+), 30 deletions(-) diff --git a/js/directives.js b/js/directives.js index 6649261f8..6e79ac871 100644 --- a/js/directives.js +++ b/js/directives.js @@ -256,23 +256,6 @@ angular.module('copayApp.directives') } }; }) -// From https://gist.github.com/asafge/7430497 -.directive('ngReallyClick', [ - - function() { - return { - restrict: 'A', - link: function(scope, element, attrs) { - element.bind('click', function() { - var message = attrs.ngReallyMessage; - if (message && confirm(message)) { - scope.$apply(attrs.ngReallyClick); - } - }); - } - } - } -]) .directive('showFocus', function($timeout) { return function(scope, element, attrs) { scope.$watch(attrs.showFocus, diff --git a/views/modals/wallet-info.html b/views/modals/wallet-info.html index fd25372db..300024827 100644 --- a/views/modals/wallet-info.html +++ b/views/modals/wallet-info.html @@ -1,4 +1,5 @@ -
+
+

{{item.name || item.id }}

{{item.requiredCopayers}} of {{item.totalCopayers}} - {{networkName}} @@ -29,16 +30,9 @@ ng-show="isSafari || isCordova"> View Backup

- +
@@ -54,4 +48,24 @@
+ +
+

Are you sure you want to delete the wallet + {{(item.name || item.id)}} +

+
+ +
+
+ +
+
diff --git a/views/profile.html b/views/profile.html index 54ac59ef3..f291758a7 100644 --- a/views/profile.html +++ b/views/profile.html @@ -128,9 +128,21 @@ Delete Profile

Permanently delete this profile and all its wallets. WARNING: this action cannot be reversed.

- Delete Profile - +
+ Delete Profile + +
+
+

Are you sure you want to delete this profile?

+
+
+ Cancel +
+
+ Delete +
+
+
From 20b51bc70a377f8bfde601442d2df512c1f004cb Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 6 Jan 2015 17:15:44 -0300 Subject: [PATCH 3/3] colorized --- views/modals/wallet-info.html | 2 +- views/profile.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/views/modals/wallet-info.html b/views/modals/wallet-info.html index 300024827..1db258d4a 100644 --- a/views/modals/wallet-info.html +++ b/views/modals/wallet-info.html @@ -54,7 +54,7 @@ {{(item.name || item.id)}}
-
diff --git a/views/profile.html b/views/profile.html index f291758a7..4a6bb1a8b 100644 --- a/views/profile.html +++ b/views/profile.html @@ -136,7 +136,7 @@

Are you sure you want to delete this profile?

- Cancel + Cancel
Delete