From f079153730b2ce0c252faea5483da44de97f3e4c Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Fri, 12 Apr 2013 11:12:20 +0000 Subject: [PATCH] 2013-04-12 Miguel de Dios * include/javascript/pandora_modules.js: fixed the change the type of module when select network or local component. Fixes: #3610671 * general/header.php: cleaned source code style. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7973 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/general/header.php | 14 +++++++------- .../include/javascript/pandora_modules.js | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index 12a9619908..83641807c7 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -57,7 +57,7 @@ config_check(); $table->width = "100%"; $table->styleTable = 'margin: auto; margin-top: 0px;'; $table->rowclass[0] = ''; - + // Servers check $servers = array(); $servers["all"] = (int) db_get_value ('COUNT(id_server)','tserver'); @@ -121,7 +121,7 @@ config_check(); unset ($values); } } - + $autorefresh_link_open_img = ''; $autorefresh_link_open_txt = ''; $autorefresh_link_close = ''; @@ -146,7 +146,7 @@ config_check(); else { $maintenance_img = html_print_image ("images/header_ready.png", true, array ("title" => __('There are not warnings'), "id" => "yougotalert", "class" => "bot")); } - + $table->data[0][3] = $maintenance_img; // Main help icon @@ -195,10 +195,10 @@ config_check(); $search_bar .= "value='" . __("Enter keywords to search") . "'"; else $search_bar .= "value='" . $config['search_keywords'] . "'"; - + $search_bar .= 'onfocus="javascript: if (fieldKeyWordEmpty) $(\'#keywords\').val(\'\');" - style="margin-top:5px;" class="search_input" />'; - + style="margin-top:5px;" class="search_input" />'; + //$search_bar .= 'onClick="javascript: document.quicksearch.submit()"'; $search_bar .= ""; @@ -235,7 +235,7 @@ config_check(); /* Temporal fix to hide graphics when ui_dialog are displayed */ $("#yougotalert").click(function () { - $("#agent_access").css("display", "none"); + $("#agent_access").css("display", "none"); }); $("#ui_close_dialog_titlebar").click(function () { $("#agent_access").css("display",""); diff --git a/pandora_console/include/javascript/pandora_modules.js b/pandora_console/include/javascript/pandora_modules.js index 93212828e6..49d475fc85 100644 --- a/pandora_console/include/javascript/pandora_modules.js +++ b/pandora_console/include/javascript/pandora_modules.js @@ -112,7 +112,7 @@ function configure_modules_form () { $("#textarea_description").attr ("value", js_html_entity_decode (data["description"])); $("#textarea_configuration_data").val(configuration_data); $("#component_loading").hide (); - $("#id_module_type option[value="+data["type"]+"]").select (1); + $("#id_module_type").val(data["type"]); $("#text-max").attr ("value", data["max"]); $("#text-min").attr ("value", data["min"]); // Workaround to update the advanced select control from html and ajax @@ -264,7 +264,7 @@ function configure_modules_form () { function (data, status) { $("#text-name").attr ("value", js_html_entity_decode (data["name"])); $("#textarea_description").attr ("value", js_html_entity_decode (data["description"])); - $("#id_module_type option[value="+data["type"]+"]").select (1); + $("#id_module_type").val(data["type"]); $("#text-max").attr ("value", data["max"]); $("#text-min").attr ("value", data["min"]); // Workaround to update the advanced select control from html and ajax