From 011517f61dfb14bd34d09fe1c6af2e050e9d5372 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Fri, 17 Mar 2017 11:29:12 +0100
Subject: [PATCH] Fixed "cancel" text in offline um dialogs
---
.../include/javascript/update_manager.js | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/pandora_console/include/javascript/update_manager.js b/pandora_console/include/javascript/update_manager.js
index c75640be6d..edc7421e93 100644
--- a/pandora_console/include/javascript/update_manager.js
+++ b/pandora_console/include/javascript/update_manager.js
@@ -396,7 +396,10 @@ function install_package (package, homeurl) {
$('#cancel_pkg').html(dialog_cancel_pkg_text);
$('#cancel_pkg').dialog('open');
- $("#box_online .content").html(mr_not_accepted);
+ $('#form-offline_update ul').find('li').removeClass('loading');
+ $('#form-offline_update ul').find('li').addClass('error');
+ $('#form-offline_update ul').find('li').find('p').html(mr_not_accepted)
+ .append("<i>"+data.message+"</i>");
}
}
});
@@ -589,11 +592,9 @@ function install_package (package, homeurl) {
$('#cancel_mr').html(dialog_cancel_mr_text);
$('#cancel_mr').dialog('open');
- $("#box_online .loading").hide();
- $("#box_online .downloading_package").hide();
- $("#box_online .content").html("MR not accepted");
+ $('#form-offline_update ul').find('li').removeClass('loading');
$('#form-offline_update ul').find('li').addClass('error');
- $('#form-offline_update ul').find('li').find('p').html(error_in_mr_accept)
+ $('#form-offline_update ul').find('li').find('p').html(mr_not_accepted)
.append("<i>"+data.message+"</i>");
}
}
@@ -732,6 +733,14 @@ function install_package (package, homeurl) {
dialog_cancel_pkg_text = dialog_cancel_pkg_text + "<p style='font-family:Verdana; font-size:12pt;'>" + package_cancel + "</p></div>";
dialog_cancel_pkg_text = dialog_cancel_pkg_text + "</div>";
+ $('#cancel_pkg').html(dialog_cancel_pkg_text);
+ $('#cancel_pkg').dialog('open');
+
+ $('#form-offline_update ul').find('li').removeClass('loading');
+ $('#form-offline_update ul').find('li').addClass('error');
+ $('#form-offline_update ul').find('li').find('p').html(package_not_accepted)
+ .append("<i>"+data.message+"</i>");
+
var parameters = {};
parameters['page'] = 'include/ajax/update_manager.ajax';
parameters['install_package'] = 1;