From 0a388c73ca33b1995bbdf47ff7d05524d5561f66 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 5 Aug 2014 11:52:51 -0300 Subject: [PATCH] Added version and networkName label bellow Copay logo --- index.html | 1 + js/controllers/sidebar.js | 19 ------------------- views/copayers.html | 1 + views/home.html | 1 + views/import.html | 1 + views/includes/sidebar-mobile.html | 4 +--- views/includes/sidebar.html | 6 +----- views/includes/version.html | 5 +++++ views/join.html | 1 + views/open.html | 1 + views/settings.html | 1 + views/setup.html | 1 + views/unsupported.html | 1 + 13 files changed, 16 insertions(+), 27 deletions(-) create mode 100644 views/includes/version.html diff --git a/index.html b/index.html index f09603637..1df6aa092 100644 --- a/index.html +++ b/index.html @@ -107,6 +107,7 @@ + diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js index 7606483b9..ea185383e 100644 --- a/js/controllers/sidebar.js +++ b/js/controllers/sidebar.js @@ -3,8 +3,6 @@ angular.module('copayApp.controllers').controller('SidebarController', function($scope, $rootScope, $sce, $location, $http, notification, controllerUtils) { - $scope.version = copay.version; - $scope.networkName = config.networkName; $scope.menu = [{ 'title': 'Addresses', 'icon': 'fi-address-book', @@ -62,23 +60,6 @@ angular.module('copayApp.controllers').controller('SidebarController', return new Array(num); } - $http.get('https://api.github.com/repos/bitpay/copay/tags').success(function(data) { - var toInt = function(s) { - return parseInt(s); - }; - var latestVersion = data[0].name.replace('v', '').split('.').map(toInt); - var currentVersion = copay.version.split('.').map(toInt); - var title = 'Copay ' + data[0].name + ' available.'; - var content; - if (currentVersion[0] < latestVersion[0]) { - content = 'It\'s important that you update your wallet at https://copay.io'; - notification.version(title, content, true); - } else if (currentVersion[0] == latestVersion[0] && currentVersion[1] < latestVersion[1]) { - var content = 'Please update your wallet at https://copay.io'; - notification.version(title, content, false); - } - }); - // Init socket handlers (with no wallet yet) controllerUtils.setSocketHandlers(); diff --git a/views/copayers.html b/views/copayers.html index e71e2d6c0..8d3d32685 100644 --- a/views/copayers.html +++ b/views/copayers.html @@ -3,6 +3,7 @@
Copay +
diff --git a/views/home.html b/views/home.html index 8b9a0119c..463f5ebbf 100644 --- a/views/home.html +++ b/views/home.html @@ -2,6 +2,7 @@
Copay +
diff --git a/views/import.html b/views/import.html index 417eab447..101b5aa04 100644 --- a/views/import.html +++ b/views/import.html @@ -6,6 +6,7 @@
Copay +
diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html index 506fcc54a..ef78fecf9 100644 --- a/views/includes/sidebar-mobile.html +++ b/views/includes/sidebar-mobile.html @@ -4,9 +4,7 @@ - v{{version}} - LIVENET - TESTNET +
diff --git a/views/includes/sidebar.html b/views/includes/sidebar.html index 00e71bcd5..4896d9dc6 100644 --- a/views/includes/sidebar.html +++ b/views/includes/sidebar.html @@ -4,11 +4,7 @@ -
- v{{version}} - LIVENET - TESTNET -
+
diff --git a/views/includes/version.html b/views/includes/version.html new file mode 100644 index 000000000..664152ca4 --- /dev/null +++ b/views/includes/version.html @@ -0,0 +1,5 @@ +
+ v{{version}} + [ {{networkName}} ] +
+ diff --git a/views/join.html b/views/join.html index 23332f2e0..8eb9e3fd1 100644 --- a/views/join.html +++ b/views/join.html @@ -6,6 +6,7 @@
Copay +
diff --git a/views/open.html b/views/open.html index e6055ce71..f58445e24 100644 --- a/views/open.html +++ b/views/open.html @@ -6,6 +6,7 @@
Copay +
diff --git a/views/settings.html b/views/settings.html index 69be68884..328c1bd45 100644 --- a/views/settings.html +++ b/views/settings.html @@ -2,6 +2,7 @@
Copay +
diff --git a/views/setup.html b/views/setup.html index 0d5cc6dd7..99ee4c25c 100644 --- a/views/setup.html +++ b/views/setup.html @@ -8,6 +8,7 @@
Copay +
diff --git a/views/unsupported.html b/views/unsupported.html index e3df0d3a5..073e5d4b2 100644 --- a/views/unsupported.html +++ b/views/unsupported.html @@ -1,5 +1,6 @@
Copay +

Browser unsupported