diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php index 8b8c2c95d7..d9443e6105 100644 --- a/pandora_console/include/graphs/fgraph.php +++ b/pandora_console/include/graphs/fgraph.php @@ -143,8 +143,12 @@ function progressbar($progress, $width, $height, $title, $font, $graph['mode'] = $mode; $id_graph = serialize_in_temp($graph, null, $ttl); - - return ""; + if (is_metaconsole()) { + return ""; + } + else { + return ""; + } } diff --git a/pandora_console/include/javascript/update_manager.js b/pandora_console/include/javascript/update_manager.js index b5fdde9121..bfa16d3a9c 100644 --- a/pandora_console/include/javascript/update_manager.js +++ b/pandora_console/include/javascript/update_manager.js @@ -234,7 +234,7 @@ function install_package (package, homeurl) { buttons: { "Apply MR": function () { var err = []; - err = apply_minor_release(data['mr'], package, 1, 1); + err = apply_minor_release(data['mr'], package, 1, 1, home_url); if (!err['error']) { if (err['message'] == 'bad_mr_filename') { @@ -271,7 +271,7 @@ function install_package (package, homeurl) { }); var dialog_accept_package_mr_fail_text = "
"; - dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text + "
"; + dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text + "
"; dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text + "

INFO

"; dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text + "

" + mr_not_accepted_code_yes + "

"; dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text + "
"; @@ -314,7 +314,7 @@ function install_package (package, homeurl) { }); var dialog_success_pkg_text = "
"; - dialog_success_pkg_text = dialog_success_pkg_text + "
"; + dialog_success_pkg_text = dialog_success_pkg_text + "
"; dialog_success_pkg_text = dialog_success_pkg_text + "

SUCCESS

"; dialog_success_pkg_text = dialog_success_pkg_text + "

" + package_success + "

"; dialog_success_pkg_text = dialog_success_pkg_text + "
"; @@ -345,7 +345,7 @@ function install_package (package, homeurl) { }); var dialog_error_pkg_text = "
"; - dialog_error_pkg_text = dialog_error_pkg_text + "
"; + dialog_error_pkg_text = dialog_error_pkg_text + "
"; dialog_error_pkg_text = dialog_error_pkg_text + "

ERROR

"; dialog_error_pkg_text = dialog_error_pkg_text + "

" + package_error + "

"; dialog_error_pkg_text = dialog_error_pkg_text + "
"; @@ -388,7 +388,7 @@ function install_package (package, homeurl) { }); var dialog_cancel_pkg_text = "
"; - dialog_cancel_pkg_text = dialog_cancel_pkg_text + "
"; + dialog_cancel_pkg_text = dialog_cancel_pkg_text + "
"; dialog_cancel_pkg_text = dialog_cancel_pkg_text + "

INFO

"; dialog_cancel_pkg_text = dialog_cancel_pkg_text + "

" + package_cancel + "

"; dialog_cancel_pkg_text = dialog_cancel_pkg_text + "
"; @@ -405,7 +405,7 @@ function install_package (package, homeurl) { }); var dialog_bad_message_text = "
"; - dialog_bad_message_text = dialog_bad_message_text + "
"; + dialog_bad_message_text = dialog_bad_message_text + "
"; dialog_bad_message_text = dialog_bad_message_text + "

ERROR

"; dialog_bad_message_text = dialog_bad_message_text + "

" + bad_mr_file + "

"; dialog_bad_message_text = dialog_bad_message_text + "
"; @@ -433,7 +433,7 @@ function install_package (package, homeurl) { }); var dialog_success_mr_text = "
"; - dialog_success_mr_text = dialog_success_mr_text + "
"; + dialog_success_mr_text = dialog_success_mr_text + "
"; dialog_success_mr_text = dialog_success_mr_text + "

SUCCESS

"; dialog_success_mr_text = dialog_success_mr_text + "

" + mr_success + "

"; dialog_success_mr_text = dialog_success_mr_text + "
"; @@ -476,7 +476,7 @@ function install_package (package, homeurl) { }); var dialog_success_pkg_text = "
"; - dialog_success_pkg_text = dialog_success_pkg_text + "
"; + dialog_success_pkg_text = dialog_success_pkg_text + "
"; dialog_success_pkg_text = dialog_success_pkg_text + "

SUCCESS

"; dialog_success_pkg_text = dialog_success_pkg_text + "

" + package_success + "

"; dialog_success_pkg_text = dialog_success_pkg_text + "
"; @@ -507,7 +507,7 @@ function install_package (package, homeurl) { }); var dialog_error_pkg_text = "
"; - dialog_error_pkg_text = dialog_error_pkg_text + "
"; + dialog_error_pkg_text = dialog_error_pkg_text + "
"; dialog_error_pkg_text = dialog_error_pkg_text + "

ERROR

"; dialog_error_pkg_text = dialog_error_pkg_text + "

" + package_error + "

"; dialog_error_pkg_text = dialog_error_pkg_text + "
"; @@ -529,7 +529,7 @@ function install_package (package, homeurl) { // Check the status of the update check_install_package(package, homeurl); - remove_rr_file(data['mr']); + remove_rr_file(data['mr'], home_url); } } else { @@ -552,7 +552,7 @@ function install_package (package, homeurl) { }); var dialog_error_mr_text = "
"; - dialog_error_mr_text = dialog_error_mr_text + "
"; + dialog_error_mr_text = dialog_error_mr_text + "
"; dialog_error_mr_text = dialog_error_mr_text + "

ERROR

"; dialog_error_mr_text = dialog_error_mr_text + "

" + mr_error + "

"; dialog_error_mr_text = dialog_error_mr_text + "
"; @@ -586,7 +586,7 @@ function install_package (package, homeurl) { }); var dialog_cancel_mr_text = "
"; - dialog_cancel_mr_text = dialog_cancel_mr_text + "
"; + dialog_cancel_mr_text = dialog_cancel_mr_text + "
"; dialog_cancel_mr_text = dialog_cancel_mr_text + "

INFO

"; dialog_cancel_mr_text = dialog_cancel_mr_text + "

" + mr_cancel + "

"; dialog_cancel_mr_text = dialog_cancel_mr_text + "
"; @@ -606,7 +606,7 @@ function install_package (package, homeurl) { $('button:contains(Cancel)').attr("id","cancel_rr_button"); var dialog_have_mr_text = "
"; - dialog_have_mr_text = dialog_have_mr_text + "
"; + dialog_have_mr_text = dialog_have_mr_text + "
"; dialog_have_mr_text = dialog_have_mr_text + "

There are a DB changes

"; dialog_have_mr_text = dialog_have_mr_text + "

" + text1_mr_file + "

"; dialog_have_mr_text = dialog_have_mr_text + "

" + text2_mr_file + "" + text3_mr_file + "" + text4_mr_file + "

"; @@ -653,7 +653,7 @@ function install_package (package, homeurl) { }); var dialog_success_pkg_text = "
"; - dialog_success_pkg_text = dialog_success_pkg_text + "
"; + dialog_success_pkg_text = dialog_success_pkg_text + "
"; dialog_success_pkg_text = dialog_success_pkg_text + "

SUCCESS

"; dialog_success_pkg_text = dialog_success_pkg_text + "

" + package_success + "

"; dialog_success_pkg_text = dialog_success_pkg_text + "
"; @@ -684,7 +684,7 @@ function install_package (package, homeurl) { }); var dialog_error_pkg_text = "
"; - dialog_error_pkg_text = dialog_error_pkg_text + "
"; + dialog_error_pkg_text = dialog_error_pkg_text + "
"; dialog_error_pkg_text = dialog_error_pkg_text + "

ERROR

"; dialog_error_pkg_text = dialog_error_pkg_text + "

" + package_error + "

"; dialog_error_pkg_text = dialog_error_pkg_text + "
"; @@ -706,7 +706,7 @@ function install_package (package, homeurl) { // Check the status of the update check_install_package(package, homeurl); - remove_rr_file_to_extras(); + remove_rr_file_to_extras(home_url); } } }); @@ -732,7 +732,7 @@ function install_package (package, homeurl) { }); var dialog_cancel_pkg_text = "
"; - dialog_cancel_pkg_text = dialog_cancel_pkg_text + "
"; + dialog_cancel_pkg_text = dialog_cancel_pkg_text + "
"; dialog_cancel_pkg_text = dialog_cancel_pkg_text + "

INFO

"; dialog_cancel_pkg_text = dialog_cancel_pkg_text + "

" + package_cancel + "

"; dialog_cancel_pkg_text = dialog_cancel_pkg_text + "
"; @@ -785,7 +785,7 @@ function install_package (package, homeurl) { }); var dialog_text = "
"; - dialog_text = dialog_text + "
"; + dialog_text = dialog_text + "
"; dialog_text = dialog_text + "

" + text1_package_file + "

"; dialog_text = dialog_text + "

" + text2_package_file + "

"; dialog_text = dialog_text + "
"; @@ -994,7 +994,7 @@ function install_free_package_prev_step(package, version, homeurl) { buttons: { "Apply MR": function () { var err = []; - err = apply_minor_release(data['mr'], package, 0, 0); + err = apply_minor_release(data['mr'], package, 0, 0, home_url); if (!err['error']) { if (err['message'] == 'bad_mr_filename') { $("#mr_dialog2").dialog("close"); @@ -1030,7 +1030,7 @@ function install_free_package_prev_step(package, version, homeurl) { }); var dialog_accept_package_mr_fail_text = "
"; - dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text + "
"; + dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text + "
"; dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text + "

INFO

"; dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text + "

" + mr_not_accepted_code_yes + "

"; dialog_accept_package_mr_fail_text = dialog_accept_package_mr_fail_text + "
"; @@ -1065,7 +1065,7 @@ function install_free_package_prev_step(package, version, homeurl) { "json" ); - remove_rr_file_to_extras(); + remove_rr_file_to_extras(home_url); }, "Cancel": function () { $(this).dialog("close"); @@ -1090,7 +1090,7 @@ function install_free_package_prev_step(package, version, homeurl) { }); var dialog_cancel_pkg_text = "
"; - dialog_cancel_pkg_text = dialog_cancel_pkg_text + "
"; + dialog_cancel_pkg_text = dialog_cancel_pkg_text + "
"; dialog_cancel_pkg_text = dialog_cancel_pkg_text + "

INFO

"; dialog_cancel_pkg_text = dialog_cancel_pkg_text + "

" + package_cancel + "

"; dialog_cancel_pkg_text = dialog_cancel_pkg_text + "
"; @@ -1104,7 +1104,7 @@ function install_free_package_prev_step(package, version, homeurl) { }); var dialog_bad_message_text = "
"; - dialog_bad_message_text = dialog_bad_message_text + "
"; + dialog_bad_message_text = dialog_bad_message_text + "
"; dialog_bad_message_text = dialog_bad_message_text + "

ERROR

"; dialog_bad_message_text = dialog_bad_message_text + "

" + bad_mr_file + "

"; dialog_bad_message_text = dialog_bad_message_text + "
"; @@ -1132,7 +1132,7 @@ function install_free_package_prev_step(package, version, homeurl) { }); var dialog_success_mr_text = "
"; - dialog_success_mr_text = dialog_success_mr_text + "
"; + dialog_success_mr_text = dialog_success_mr_text + "
"; dialog_success_mr_text = dialog_success_mr_text + "

SUCCESS

"; dialog_success_mr_text = dialog_success_mr_text + "

" + mr_success + "

"; dialog_success_mr_text = dialog_success_mr_text + "
"; @@ -1167,7 +1167,7 @@ function install_free_package_prev_step(package, version, homeurl) { "json" ); - remove_rr_file_to_extras(); + remove_rr_file_to_extras(home_url); } } else { @@ -1190,7 +1190,7 @@ function install_free_package_prev_step(package, version, homeurl) { }); var dialog_error_mr_text = "
"; - dialog_error_mr_text = dialog_error_mr_text + "
"; + dialog_error_mr_text = dialog_error_mr_text + "
"; dialog_error_mr_text = dialog_error_mr_text + "

ERROR

"; dialog_error_mr_text = dialog_error_mr_text + "

" + mr_error + "

"; dialog_error_mr_text = dialog_error_mr_text + "
"; @@ -1222,7 +1222,7 @@ function install_free_package_prev_step(package, version, homeurl) { }); var dialog_cancel_mr_text = "
"; - dialog_cancel_mr_text = dialog_cancel_mr_text + "
"; + dialog_cancel_mr_text = dialog_cancel_mr_text + "
"; dialog_cancel_mr_text = dialog_cancel_mr_text + "

INFO

"; dialog_cancel_mr_text = dialog_cancel_mr_text + "

" + mr_cancel + "

"; dialog_cancel_mr_text = dialog_cancel_mr_text + "
"; @@ -1241,7 +1241,7 @@ function install_free_package_prev_step(package, version, homeurl) { $('button:contains(Cancel)').attr("id","cancel_rr_button"); var dialog_have_mr_text = "
"; - dialog_have_mr_text = dialog_have_mr_text + "
"; + dialog_have_mr_text = dialog_have_mr_text + "
"; dialog_have_mr_text = dialog_have_mr_text + "

There are a DB changes

"; dialog_have_mr_text = dialog_have_mr_text + "

" + text1_mr_file + "

"; dialog_have_mr_text = dialog_have_mr_text + "

" + text2_mr_file + "" + text3_mr_file + "" + text4_mr_file + "

"; @@ -1278,7 +1278,7 @@ function install_free_package_prev_step(package, version, homeurl) { "json" ); - remove_rr_file_to_extras(); + remove_rr_file_to_extras(home_url); } }, "json" @@ -1305,7 +1305,7 @@ function install_free_package_prev_step(package, version, homeurl) { }); var dialog_cancel_pkg_text = "
"; - dialog_cancel_pkg_text = dialog_cancel_pkg_text + "
"; + dialog_cancel_pkg_text = dialog_cancel_pkg_text + "
"; dialog_cancel_pkg_text = dialog_cancel_pkg_text + "

INFO

"; dialog_cancel_pkg_text = dialog_cancel_pkg_text + "

" + package_cancel + "

"; dialog_cancel_pkg_text = dialog_cancel_pkg_text + "
"; @@ -1321,7 +1321,7 @@ function install_free_package_prev_step(package, version, homeurl) { }); var dialog_text = "
"; - dialog_text = dialog_text + "
"; + dialog_text = dialog_text + "
"; dialog_text = dialog_text + "

" + text1_package_file + "

"; dialog_text = dialog_text + "

" + text2_package_file + "

"; dialog_text = dialog_text + "
"; @@ -1364,7 +1364,7 @@ function install_free_package(package, version, homeurl) { }); var dialog_error_pkg_text = "
"; - dialog_error_pkg_text = dialog_error_pkg_text + "
"; + dialog_error_pkg_text = dialog_error_pkg_text + "
"; dialog_error_pkg_text = dialog_error_pkg_text + "

ERROR

"; dialog_error_pkg_text = dialog_error_pkg_text + "

" + data['message'] + "

"; dialog_error_pkg_text = dialog_error_pkg_text + "
"; @@ -1400,7 +1400,7 @@ function install_free_package(package, version, homeurl) { }); var dialog_success_pkg_text = "
"; - dialog_success_pkg_text = dialog_success_pkg_text + "
"; + dialog_success_pkg_text = dialog_success_pkg_text + "
"; dialog_success_pkg_text = dialog_success_pkg_text + "

SUCCESS

"; dialog_success_pkg_text = dialog_success_pkg_text + "

" + data['message'] + "

"; dialog_success_pkg_text = dialog_success_pkg_text + "
"; @@ -1434,7 +1434,7 @@ function install_free_package(package, version, homeurl) { }); var dialog_error_pkg_text = "
"; - dialog_error_pkg_text = dialog_error_pkg_text + "
"; + dialog_error_pkg_text = dialog_error_pkg_text + "
"; dialog_error_pkg_text = dialog_error_pkg_text + "

ERROR

"; dialog_error_pkg_text = dialog_error_pkg_text + "

" + data['message'] + "

"; dialog_error_pkg_text = dialog_error_pkg_text + "
"; @@ -1469,7 +1469,7 @@ function install_free_package(package, version, homeurl) { }); var dialog_error_pkg_text = "
"; - dialog_error_pkg_text = dialog_error_pkg_text + "
"; + dialog_error_pkg_text = dialog_error_pkg_text + "
"; dialog_error_pkg_text = dialog_error_pkg_text + "

ERROR

"; dialog_error_pkg_text = dialog_error_pkg_text + "

" + data['message'] + "

"; dialog_error_pkg_text = dialog_error_pkg_text + "
"; @@ -1481,7 +1481,8 @@ function install_free_package(package, version, homeurl) { }); } -function apply_minor_release (n_mr, pkg, ent, off) { +function apply_minor_release (n_mr, pkg, ent, off, homeurl) { + var home_url = (typeof homeurl !== 'undefined') ? homeurl + '/' : ''; var error = []; error['error'] = false; $('#mr_dialog2').empty(); @@ -1499,7 +1500,7 @@ function apply_minor_release (n_mr, pkg, ent, off) { async: false, dataType: "html", type: "POST", - url: "ajax.php", + url: home_url + "ajax.php", success: function (data) { $('#mr_dialog2').append("
"); if (data == 'bad_mr_filename') { @@ -1530,7 +1531,8 @@ function apply_minor_release (n_mr, pkg, ent, off) { return error; } -function remove_rr_file (number) { +function remove_rr_file (number, homeurl) { + var home_url = (typeof homeurl !== 'undefined') ? homeurl + '/' : ''; var params = {}; params["remove_rr"] = 1; params["number"] = number; @@ -1540,13 +1542,14 @@ function remove_rr_file (number) { data: params, dataType: "html", type: "POST", - url: "ajax.php", + url: home_url + "ajax.php", success: function (data) { } }); } -function remove_rr_file_to_extras () { +function remove_rr_file_to_extras (homeurl) { + var home_url = (typeof homeurl !== 'undefined') ? homeurl + '/' : ''; var params = {}; params["remove_rr_extras"] = 1; params["page"] = "include/ajax/rolling_release.ajax"; @@ -1555,7 +1558,7 @@ function remove_rr_file_to_extras () { data: params, dataType: "html", type: "POST", - url: "ajax.php", + url: home_url + "ajax.php", success: function (data) { } }); diff --git a/pandora_console/include/styles/jquery-ui-1.10.0.custom.css b/pandora_console/include/styles/jquery-ui-1.10.0.custom.css index 0516b0ffcb..b2af3fd6e1 100644 --- a/pandora_console/include/styles/jquery-ui-1.10.0.custom.css +++ b/pandora_console/include/styles/jquery-ui-1.10.0.custom.css @@ -451,13 +451,13 @@ button.ui-button::-moz-focus-inner { float: right; } .ui-dialog .ui-dialog-buttonpane button { - margin: .5em 1em .5em 0; - cursor: pointer; - background: white; - background-color: white; - border: 1px solid #82b92e; - height:30px; - width:90px; + margin: .5em 1em .5em 0 !important; + cursor: pointer !important; + background: white !important; + background-color: white !important; + border: 1px solid #82b92e !important; + height:30px !important; + width:90px !important; } .ui-dialog .ui-resizable-se { width: 12px;