From 2897aa3e4ce1722f5a09d6b5836b3d2742316613 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 23 Aug 2016 12:10:48 -0300 Subject: [PATCH] fix status --- .../views/includes => old}/notifications.html | 0 {src/js/services => old}/notifications.js | 37 +----- .../services => old}/notificationsService.js | 0 public/index.html | 1 - public/views/includes/walletInfo.html | 3 +- public/views/modals/txp-details.html | 2 +- public/views/walletDetails.html | 21 ++-- src/js/services/profileService.js | 6 +- src/sass/main.scss | 106 ++---------------- 9 files changed, 21 insertions(+), 155 deletions(-) rename {public/views/includes => old}/notifications.html (100%) rename {src/js/services => old}/notifications.js (87%) rename {src/js/services => old}/notificationsService.js (100%) diff --git a/public/views/includes/notifications.html b/old/notifications.html similarity index 100% rename from public/views/includes/notifications.html rename to old/notifications.html diff --git a/src/js/services/notifications.js b/old/notifications.js similarity index 87% rename from src/js/services/notifications.js rename to old/notifications.js index e6e464c8d..b87dddb28 100644 --- a/src/js/services/notifications.js +++ b/old/notifications.js @@ -257,39 +257,4 @@ factory('notification', function($timeout, platformInfo) { }; } -).directive('notifications', function(notification, $compile) { - /** - * - * It should also parse the arguments passed to it that specify - * its position on the screen like "bottom right" and apply those - * positions as a class to the container element - * - * Finally, the directive should have its own controller for - * handling all of the notifications from the notification service - */ - function link(scope, element, attrs) { - var position = attrs.notifications; - position = position.split(' '); - element.addClass('dr-notification-container'); - for (var i = 0; i < position.length; i++) { - element.addClass(position[i]); - } - } - - return { - restrict: 'A', - scope: {}, - templateUrl: 'views/includes/notifications.html', - link: link, - controller: ['$scope', - function NotificationsCtrl($scope) { - $scope.queue = notification.getQueue(); - - $scope.removeNotification = function(noti) { - $scope.queue.splice($scope.queue.indexOf(noti), 1); - }; - } - ] - - }; -}); +); diff --git a/src/js/services/notificationsService.js b/old/notificationsService.js similarity index 100% rename from src/js/services/notificationsService.js rename to old/notificationsService.js diff --git a/public/index.html b/public/index.html index b65f8b06b..cef1fb09e 100644 --- a/public/index.html +++ b/public/index.html @@ -13,7 +13,6 @@ -
diff --git a/public/views/includes/walletInfo.html b/public/views/includes/walletInfo.html index 24ff6d48c..c0f06a134 100644 --- a/public/views/includes/walletInfo.html +++ b/public/views/includes/walletInfo.html @@ -16,5 +16,4 @@ src="img/icon-ledger-white.svg"> - + diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 5112763ff..026ba2df2 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -1,5 +1,5 @@ - +
Close diff --git a/public/views/walletDetails.html b/public/views/walletDetails.html index 3836efb03..14552cdaa 100644 --- a/public/views/walletDetails.html +++ b/public/views/walletDetails.html @@ -130,15 +130,15 @@ translate>No transactions yet {{status.totalBalanceStr}}
-
-
-
+
+
-
-
-
{{updatingTxHistoryProgress}} transactions downloaded
-
Updating transaction history. Please stand by.
-
+
+
+
Updating transaction history. Please stand by.
+
+
+
{{updatingTxHistoryProgress}} transactions downloaded
@@ -215,11 +215,6 @@
-
- Updating... - -
-