From e50bd98831bb8430a7042e80dea6364be538bac0 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Tue, 30 Apr 2013 10:16:58 +0000 Subject: [PATCH] 2013-04-30 Sergio Martin * godmode/modules/manage_network_components.php: Added type (network/plugin/wmi) icon near the other type (numeric/string/proc...) in the Type column in network components list for bug #3609655 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8086 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ .../godmode/modules/manage_network_components.php | 14 +++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 1c52dc231d..4c2bf64417 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2013-04-30 Sergio Martin + + * godmode/modules/manage_network_components.php: Added + type (network/plugin/wmi) icon near the other type + (numeric/string/proc...) in the Type column in + network components list for bug #3609655 + 2013-04-30 Sergio Martin * include/styles/pandora.css diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php index 6c629020c9..460b862568 100644 --- a/pandora_console/godmode/modules/manage_network_components.php +++ b/pandora_console/godmode/modules/manage_network_components.php @@ -473,7 +473,7 @@ $filter['offset'] = (int) get_parameter ('offset'); $filter['limit'] = (int) $config['block_size']; $components = network_components_get_network_components (false, $filter, array ('id_nc', 'name', 'description', 'id_group', 'type', 'max', 'min', - 'module_interval')); + 'module_interval', 'id_modulo')); if ($components === false) $components = array (); @@ -489,6 +489,7 @@ $table->head[5] = __('Max/Min'); $table->head[6] = __('Action') . html_print_checkbox('all_delete', 0, false, true, false, 'check_all_checkboxes();'); $table->size = array (); +$table->size[1] = '75px'; $table->size[6] = '60px'; $table->align[6] = 'center'; $table->data = array (); @@ -504,6 +505,17 @@ foreach ($components as $component) { $data[0] .= io_safe_output($component['name']); $data[0] .= ''; $data[1] = ui_print_moduletype_icon ($component['type'], true); + switch($component['id_modulo']) { + case MODULE_NETWORK: + $data[1] .= html_print_image('images/network.png', true, array('title' => __('Network module'))); + break; + case MODULE_WMI: + $data[1] .= html_print_image('images/wmi.png', true, array('title' => __('WMI module'))); + break; + case MODULE_PLUGIN: + $data[1] .= html_print_image('images/plugin.png', true, array('title' => __('Plug-in module'))); + break; + } $data[3] = "". mb_strimwidth (io_safe_output($component['description']), 0, 60, "...") . ""; $data[4] = network_components_get_group_name ($component['id_group']); $data[5] = $component['max']." / ".$component['min'];