From 7dd54976a5adcdccaf31b9cfd4a9858d6ae0b062 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 9 Dec 2014 16:11:56 -0300 Subject: [PATCH 1/3] open external link --- cordova/build.sh | 3 +++ js/controllers/history.js | 5 ++++- js/services/go.js | 4 ++++ views/modals/tx-details.html | 7 +++++-- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/cordova/build.sh b/cordova/build.sh index ffe2fff2b..a638ea1e4 100755 --- a/cordova/build.sh +++ b/cordova/build.sh @@ -83,6 +83,9 @@ if [ ! -d $PROJECT ]; then cordova plugin add https://github.com/EddyVerbruggen/LaunchMyApp-PhoneGap-Plugin.git --variable URL_SCHEME=bitcoin checkOK + cordova plugin add org.apache.cordova.inappbrowser + checkOK + fi echo "${OpenColor}${Green}* Generating copay bundle...${CloseColor}" diff --git a/js/controllers/history.js b/js/controllers/history.js index 77c632d97..3e79b337a 100644 --- a/js/controllers/history.js +++ b/js/controllers/history.js @@ -2,7 +2,7 @@ var bitcore = require('bitcore'); angular.module('copayApp.controllers').controller('HistoryController', - function($scope, $rootScope, $filter, $timeout, $modal, rateService, notification) { + function($scope, $rootScope, $filter, $timeout, $modal, rateService, notification, go) { var w = $rootScope.wallet; $rootScope.title = 'History'; @@ -145,6 +145,9 @@ angular.module('copayApp.controllers').controller('HistoryController', return w.getNetworkName().substring(0, 4); }; + $scope.go = function(url) { + go.openExternalLink(url); + }; $scope.cancel = function() { $modalInstance.dismiss('cancel'); diff --git a/js/services/go.js b/js/services/go.js index ac9d9d85b..550693288 100644 --- a/js/services/go.js +++ b/js/services/go.js @@ -40,6 +40,10 @@ angular.module('copayApp.services').factory('go', function($window, $location) { } }; + root.openExternalLink = function(url) { + var ref = window.open(url, '_blank', 'location=no'); + }; + root.go = function(path) { var parts = path.split('#'); $location.path(parts[0]); diff --git a/views/modals/tx-details.html b/views/modals/tx-details.html index 529fec962..f54559708 100644 --- a/views/modals/tx-details.html +++ b/views/modals/tx-details.html @@ -79,8 +79,11 @@ -
- See it on the blockchain +
+ + See it on the blockchain +

From 6facb748868ebb2ddee5ae5e7ff5c8d073106012 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 9 Dec 2014 16:20:19 -0300 Subject: [PATCH 2/3] better function name --- js/controllers/createProfile.js | 6 +++++- js/controllers/history.js | 2 +- views/createProfile.html | 3 ++- views/modals/tx-details.html | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/js/controllers/createProfile.js b/js/controllers/createProfile.js index bd857cd46..13dcd9dd5 100644 --- a/js/controllers/createProfile.js +++ b/js/controllers/createProfile.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('CreateProfileController', function($scope, $rootScope, $location, $timeout, notification, pluginManager, identityService, pinService, isMobile, configService) { +angular.module('copayApp.controllers').controller('CreateProfileController', function($scope, $rootScope, $location, $timeout, notification, pluginManager, identityService, pinService, isMobile, configService, go) { var _credentials, _firstpin; @@ -172,4 +172,8 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun }); }; + $scope.openExternalLink = function(url) { + go.openExternalLink(url); + }; + }); diff --git a/js/controllers/history.js b/js/controllers/history.js index 3e79b337a..2e8382620 100644 --- a/js/controllers/history.js +++ b/js/controllers/history.js @@ -145,7 +145,7 @@ angular.module('copayApp.controllers').controller('HistoryController', return w.getNetworkName().substring(0, 4); }; - $scope.go = function(url) { + $scope.openExternalLink = function(url) { go.openExternalLink(url); }; diff --git a/views/createProfile.html b/views/createProfile.html index 1d79d6622..a3e322417 100644 --- a/views/createProfile.html +++ b/views/createProfile.html @@ -120,7 +120,8 @@
- + Learn more about this option
diff --git a/views/modals/tx-details.html b/views/modals/tx-details.html index f54559708..9ef101e81 100644 --- a/views/modals/tx-details.html +++ b/views/modals/tx-details.html @@ -81,7 +81,7 @@
+ ng-click="openExternalLink('http://' + getShortNetworkName() + '.insight.is/tx/' + btx.txid)"> See it on the blockchain

From 6637643772e81614e026ee0eae63b788da37b0fe Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 9 Dec 2014 17:03:24 -0300 Subject: [PATCH 3/3] fix forms, show advanced option as button, fix shadows --- css/src/main.css | 25 ++----------------------- views/create.html | 28 ++++++++++++++++++---------- views/import.html | 22 ++++++++++++---------- views/join.html | 19 ++++++++++++------- views/more.html | 5 +++-- views/profile.html | 24 +++++++++++------------- 6 files changed, 58 insertions(+), 65 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index c1f1c83ab..a20a227e3 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -975,24 +975,13 @@ table tr.deleting { background: #FCD5D5; } -/* SECONDARY */ - -input[type='submit'] -{ - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; -} - - input[type=date], input[type=datetime-local], input[type=datetime], input[type=email], input[type=month], input[type=number], input[type=password], input[type=search], input[type=tel], input[type=text], input[type=time], input[type=url], input[type=week], textarea { color: #343c43; margin-bottom: 1.3rem; height: 40px; - border-radius: 3px; background: #F2F5F8; - -moz-box-shadow: inset 1px 1px 0px 0px rgba(0,0,0,0.05); - box-shadow: inset 1px 1px 0px 0px rgba(0,0,0,0.05); + -moz-box-shadow: none; + box-shadow: none; border: none; padding-left: 45px; } @@ -1001,8 +990,6 @@ button.secondary, .button.secondary { color: #fff; background: #008CC1; - -moz-box-shadow: 1px 1px 0px 0px #10769D; - box-shadow: 1px 1px 0px 0px #10769D; } button.secondary:hover, button.secondary:focus, @@ -1034,8 +1021,6 @@ button.primary, color: #fff; border-radius: 3px; border-radius: 3px; - -moz-box-shadow: 1px 1px 0px 0px #16A085; - box-shadow: 1px 1px 0px 0px #16A085; } button.primary:hover, button.primary:focus, @@ -1056,8 +1041,6 @@ button[disabled].primary:focus, .button.disabled.primary:focus, .button[disabled].primary:hover, .button[disabled].primary:focus { - -moz-box-shadow: 1px 1px 0px 0px #687D80; - box-shadow: 1px 1px 0px 0px #687D80; background-color: #95a5a6; color: #E6E6E6; } @@ -1068,8 +1051,6 @@ button.warning, background-color: #C0392A; color: #fff; border-radius: 3px; - -moz-box-shadow: 1px 1px 0px 0px #A02F23; - box-shadow: 1px 1px 0px 0px #A02F23; } button.warning:hover, button.warning:focus, @@ -1128,8 +1109,6 @@ button[disabled].white:focus, /* BLACK */ button.black, .button.black { - -moz-box-shadow: 1px 1px 0px 0px #1B2937; - box-shadow: 1px 1px 0px 0px #1B2937; background-color: #2C3E50; color: #fff; } diff --git a/views/create.html b/views/create.html index 2b61e5873..b1c33c403 100644 --- a/views/create.html +++ b/views/create.html @@ -30,7 +30,7 @@
-