Added a last modifications to um offline and online open

This commit is contained in:
Arturo Gonzalez 2017-03-15 13:53:25 +01:00
parent b580793d5f
commit d9d01a453a
3 changed files with 124 additions and 12 deletions

View File

@ -44,15 +44,16 @@ $baseurl = ui_get_full_url(false, false, false, false);
var if_there_are_any_database_change = "<?php echo __('If there are any database change, it will be applied on the next login.'); ?>\n";
var mr_available = "<?php echo __('Minor release available'); ?>\n";
var package_available = "<?php echo __('New package available'); ?>\n";
var mr_not_accepted = "<?php echo __('Minor release rejected'); ?>\n";
var mr_cancel = "<?php echo __('These database changes will not apply.'); ?>\n";
var package_cancel = "<?php echo __('These changes will not apply.'); ?>\n";
var package_not_accepted = "<?php echo __('Package rejected'); ?>\n";
var mr_not_accepted = "<?php echo __('Minor release rejected. Changes will not apply.'); ?>\n";
var mr_not_accepted_code_yes = "<?php echo __('Minor release rejected. Package will apply.'); ?>\n";
var mr_cancel = "<?php echo __('Minor release rejected. Changes will not apply.'); ?>\n";
var package_cancel = "<?php echo __('These package changes will not apply.'); ?>\n";
var package_not_accepted = "<?php echo __('Package rejected. These package changes will not apply.'); ?>\n";
var mr_success = "<?php echo __('Database successfully updated'); ?>\n";
var mr_error = "<?php echo __('Error in MR file'); ?>\n";
var package_success = "<?php echo __('Package updated successfully'); ?>\n";
var package_error = "<?php echo __('Error in package update'); ?>\n";
var bad_mr_file = "<?php echo __('Bad MR filename, do you want to apply the package?'); ?>\n";
var package_error = "<?php echo __('Error in package updated'); ?>\n";
var bad_mr_file = "<?php echo __('Database MR version is inconsistent, do you want to apply the package?'); ?>\n";
var text1_mr_file = "<?php echo __('There are a new database changes available to apply. Do you want to start the DB update process?'); ?>\n";
var text2_mr_file = "<?php echo __('We recommend launch a '); ?>\n";
var text3_mr_file = "<?php echo __('planned downtime'); ?>\n";

View File

@ -344,15 +344,16 @@ function update_manager_check_online_free_packages ($is_ajax=true) {
<script type="text/javascript">
var mr_available = "<?php echo __('Minor release available'); ?>\n";
var package_available = "<?php echo __('New package available'); ?>\n";
var mr_not_accepted = "<?php echo __('Minor release rejected'); ?>\n";
var mr_cancel = "<?php echo __('These database changes will not apply.'); ?>\n";
var package_cancel = "<?php echo __('These changes will not apply.'); ?>\n";
var package_not_accepted = "<?php echo __('Package rejected'); ?>\n";
var mr_not_accepted = "<?php echo __('Minor release rejected. Changes will not apply.'); ?>\n";
var mr_not_accepted_code_yes = "<?php echo __('Minor release rejected. Package will apply.'); ?>\n";
var mr_cancel = "<?php echo __('Minor release rejected. Changes will not apply.'); ?>\n";
var package_cancel = "<?php echo __('These package changes will not apply.'); ?>\n";
var package_not_accepted = "<?php echo __('Package rejected. These package changes will not apply.'); ?>\n";
var mr_success = "<?php echo __('Database successfully updated'); ?>\n";
var mr_error = "<?php echo __('Error in MR file'); ?>\n";
var package_success = "<?php echo __('Package updated successfully'); ?>\n";
var package_error = "<?php echo __('Error in package update'); ?>\n";
var bad_mr_file = "<?php echo __('Bad MR filename, do you want to apply the package?'); ?>\n";
var package_error = "<?php echo __('Error in package updated'); ?>\n";
var bad_mr_file = "<?php echo __('Database MR version is inconsistent, do you want to apply the package?'); ?>\n";
var text1_mr_file = "<?php echo __('There are a new database changes available to apply. Do you want to start the DB update process?'); ?>\n";
var text2_mr_file = "<?php echo __('We recommend launch a '); ?>\n";
var text3_mr_file = "<?php echo __('planned downtime'); ?>\n";

View File

@ -249,6 +249,33 @@ function install_package (package, homeurl) {
buttons: {
"Apply": function() {
$(this).dialog("close");
$("<div id='accept_package_mr_fail' class='dialog ui-dialog-content' title='" + mr_available + "'></div>").dialog ({
resizable: true,
draggable: true,
modal: true,
overlay: {
opacity: 0.5,
background: 'black'
},
width: 600,
height: 250,
buttons: {
"Ok": function () {
$(this).dialog("close");
}
}
});
var dialog_accept_package_mr_fail_text = "<div>";
dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text + "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_info_mr.png'></div>";
dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text + "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>";
dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text + "<p style='font-family:Verdana; font-size:12pt;'>" + mr_not_accepted_code_yes + "</p></div>";
dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text + "</div>";
$('#accept_package_mr_fail').html(dialog_accept_package_mr_fail_text);
$('#accept_package_mr_fail').dialog('open');
var parameters = {};
parameters['page'] = 'include/ajax/update_manager.ajax';
parameters['install_package'] = 1;
@ -339,6 +366,33 @@ function install_package (package, homeurl) {
},
"Cancel": function () {
$(this).dialog("close");
$("<div id='cancel_pkg' class='dialog ui-dialog-content' title='" + package_available + "'></div>").dialog ({
resizable: true,
draggable: true,
modal: true,
overlay: {
opacity: 0.5,
background: 'black'
},
width: 600,
height: 220,
buttons: {
"Ok": function () {
$(this).dialog("close");
}
}
});
var dialog_cancel_pkg_text = "<div>";
dialog_cancel_pkg_text = dialog_cancel_pkg_text + "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_info_mr.png'></div>";
dialog_cancel_pkg_text = dialog_cancel_pkg_text + "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>";
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');
$("#box_online .content").html(mr_not_accepted);
}
}
@ -847,6 +901,33 @@ function update_last_package(package, version, homeurl) {
buttons: {
"Apply": function() {
$(this).dialog("close");
$("<div id='accept_package_mr_fail' class='dialog ui-dialog-content' title='" + mr_available + "'></div>").dialog ({
resizable: true,
draggable: true,
modal: true,
overlay: {
opacity: 0.5,
background: 'black'
},
width: 600,
height: 250,
buttons: {
"Ok": function () {
$(this).dialog("close");
}
}
});
var dialog_accept_package_mr_fail_text = "<div>";
dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text + "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_info_mr.png'></div>";
dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text + "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>";
dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text + "<p style='font-family:Verdana; font-size:12pt;'>" + mr_not_accepted_code_yes + "</p></div>";
dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text + "</div>";
$('#accept_package_mr_fail').html(dialog_accept_package_mr_fail_text);
$('#accept_package_mr_fail').dialog('open');
var parameters2 = {};
parameters2['page'] = 'include/ajax/update_manager.ajax';
parameters2['update_last_free_package'] = 1;
@ -878,6 +959,35 @@ function update_last_package(package, version, homeurl) {
},
"Cancel": function () {
$(this).dialog("close");
$(this).dialog("close");
$("<div id='cancel_pkg' class='dialog ui-dialog-content' title='" + package_available + "'></div>").dialog ({
resizable: true,
draggable: true,
modal: true,
overlay: {
opacity: 0.5,
background: 'black'
},
width: 600,
height: 220,
buttons: {
"Ok": function () {
$(this).dialog("close");
}
}
});
var dialog_cancel_pkg_text = "<div>";
dialog_cancel_pkg_text = dialog_cancel_pkg_text + "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_info_mr.png'></div>";
dialog_cancel_pkg_text = dialog_cancel_pkg_text + "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>";
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');
$("#box_online .content").html(package_not_accepted);
}
}