From e8452584d2a89f0fbf1d531124274447dac3a517 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 31 Mar 2010 11:44:03 +0000 Subject: [PATCH] 2010-03-31 Miguel de Dios * include/functions_html.php: added new parameter for function "print_select" for style. In the function "print_input_hidden" added the parameter $class for set the class of input. * godmode/reporting/map_builder.php: delete old code, now it have only source code of paint list of visual consoles. * godmode/reporting/visual_console_builder.data.php: cleaned style the of form. * godmode/reporting/visual_console_builder.elements.php: cleaned the rows of table, delete label color field and change the text type for a icon. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2531 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 23 + .../godmode/reporting/map_builder.php | 811 +----------------- .../reporting/visual_console_builder.data.php | 13 +- .../visual_console_builder.elements.php | 116 +-- pandora_console/include/functions_html.php | 24 +- 5 files changed, 138 insertions(+), 849 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 4f04a6ccc3..614394dafa 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,26 @@ +2010-03-31 Miguel de Dios + + * include/functions_html.php: added new parameter for function + "print_select" for style. In the function "print_input_hidden" added the + parameter $class for set the class of input. + + * godmode/reporting/map_builder.php: delete old code, now it have only + source code of paint list of visual consoles. + + * godmode/reporting/visual_console_builder.data.php: cleaned style the of + form. + + * godmode/reporting/visual_console_builder.elements.php: cleaned the rows of + table, delete label color field and change the text type for a icon. + +2010-03-31 Miguel de Dios + + * include/styles/pandora.css, include/functions_visual_map.php, + include/ajax/visual_console_builder.ajax.php, + godmode/reporting/visual_console_builder.editor.php, + godmode/reporting/visual_console_builder.editor.js: cleaned source code and + changed the buttons. + 2010-03-30 Miguel de Dios * include/ajax/visual_console_builder.ajax.php: some cleaned the source diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php index a8935743de..914f1c29aa 100644 --- a/pandora_console/godmode/reporting/map_builder.php +++ b/pandora_console/godmode/reporting/map_builder.php @@ -15,793 +15,42 @@ global $config; -if (is_ajax ()) { - $search_agents = (bool) get_parameter ('search_agents'); - - if ($search_agents) { - - require_once ('include/functions_agents.php'); - - $id_agent = (int) get_parameter ('id_agent'); - $string = (string) get_parameter ('q'); /* q is what autocomplete plugin gives */ - - $filter = array (); - $filter[] = '(nombre COLLATE utf8_general_ci LIKE "%'.$string.'%" OR direccion LIKE "%'.$string.'%" OR comentarios LIKE "%'.$string.'%")'; - - $agents = get_agents ($filter, array ('nombre', 'direccion')); - if ($agents === false) - return; - - foreach ($agents as $agent) { - echo $agent['nombre']."|".$agent['direccion']."\n"; - } - - return; - } -} - -check_login (); - -if (! give_acl ($config['id_user'], 0, "IW")) { - audit_db ($config['id_user'], $_SERVER['REMOTE_ADDR'], "ACL Violation", "Trying to access map builder"); - require ("general/noaccess.php"); - return; -} - -require_once ('include/functions_visual_map.php'); - -$id_layout = (int) get_parameter ('id_layout'); -$edit_layout = (bool) get_parameter ('edit_layout'); -$create_layout = (bool) get_parameter ('create_layout'); -$update_layout = (bool) get_parameter ('update_layout'); -$delete_layout = (bool) get_parameter ('delete_layout'); -$create_layout_data = (bool) get_parameter ('create_layout_data'); -$update_layout_data = (bool) get_parameter ('update_layout_data'); -$delete_layout_data = (bool) get_parameter ('delete_layout_data'); -$update_layout_data_coords = (bool) get_parameter ('update_layout_data_coords'); -$get_layout_data = (bool) get_parameter ('get_layout_data'); -$get_background_info = (bool) get_parameter ('get_background_info'); - -$name = ''; -$id_group = 0; -$width = 0; -$height = 0; -$background = ''; - -// Header print_page_header (__('Visual console builder'), "", false, "map_builder", true); -if ($create_layout) { - $name = (string) get_parameter ('name'); - $id_group = (int) get_parameter ('id_group'); - $width = (int) get_parameter ('width'); - $height = (int) get_parameter ('height'); - $background = (string) get_parameter ('background'); - if ($background != '') { - $bg_info = getimagesize ('images/console/background/'.$background); - $width = $bg_info[0]; - $height = $bg_info[1]; - } - $values = array (); - $values['name'] = $name; - $values['id_group'] = $id_group; - $values['background'] = $background; - $values['height'] = $height; - $values['width'] = $width; - - $id_layout = process_sql_insert ('tlayout', $values); - if ($id_layout !== false) { - echo '

'.__('Successfully created').'

'; - } else { - echo '

'.__('Could not be created').'

'; - } - if (is_ajax ()) { - return; - } -} +$table->width = '500px'; +$table->data = array (); +$table->head = array (); +$table->head[0] = __('Map name'); +$table->head[1] = __('Group'); +$table->head[2] = __('Items'); +$table->head[3] = __('Delete'); +$table->align = array (); +$table->align[3] = 'center'; -if ($delete_layout) { - process_sql_delete ('tlayout_data', array ('id_layout' => $id_layout)); - $result = process_sql_delete ('tlayout', array ('id' => $id_layout)); - if ($result) { - echo '

'.__('Successfully deleted').'

'; - clean_cache(); - } else { - echo '

'.__('Not deleted. Error deleting data').'

'; - } - $id_layout = 0; -} - -if ($update_layout) { - $name = (string) get_parameter ('name'); - $id_group = (int) get_parameter ('id_group', 1); - $width = (int) get_parameter ('width', 0); - $height = (int) get_parameter ('height', 0); - $background = (string) get_parameter ('background'); - $bg_info = array (0, 0); - if (file_exists ('images/console/background/'.$background)) - $bg_info = getimagesize ('images/console/background/'.$background); - - if (! $width) - $width = $bg_info[0]; - if (! $height) - $height = $bg_info[1]; - - $values = array ('name' => $name, - 'background' => $background, - 'height' => $height, - 'width' => $width, - 'id_group' => $id_group); - - $result = process_sql_update ('tlayout', $values, array ('id' => $id_layout)); - - print_result_message ($result, - __('Update layout successful'), - __('Update layout failed')); - - if (is_ajax ()) { - return; - } -} - -if ($get_background_info) { - $file = (string) get_parameter ('background'); - if (file_exists ('images/console/background/'.$file)){ - $info = getimagesize ('images/console/background/'.$file); - $info['width'] = $info[0]; - $info['height'] = $info[1]; - } - if (is_ajax ()) { - echo json_encode ($info); - return; - } -} - -if ($get_layout_data) { - $id_layout_data = (int) get_parameter ('id_layout_data'); - $layout_data = get_db_row ('tlayout_data', 'id', $id_layout_data); - if ($layout_data['id_agente_modulo']) { - $layout_data['id_agent'] = give_agent_id_from_module_id ($layout_data['id_agente_modulo']); - $layout_data['name_agent'] = get_agent_name ($layout_data['id_agent'], 'none'); - } - else { - if ($layout_data['id_agent']) { - $layout_data['name_agent'] = get_agent_name ($layout_data['id_agent'], 'none'); - } - } - - if (is_ajax ()) { - echo json_encode ($layout_data); - return; - } -} - -if ($create_layout_data) { - $layout_data_name_agent = (string) get_parameter ("agent"); - $layout_data_id_agent = get_agent_id ($layout_data_name_agent); - - $layout_data_type = (int) get_parameter ("type"); - $layout_data_label = (string) get_parameter ("label"); - $layout_data_image = (string) get_parameter ("image"); - //$layout_data_id_agent = (int) get_parameter ("agent"); - $layout_data_id_agent_module = (int) get_parameter ("module"); - $layout_data_label_color = (string) get_parameter ("label_color"); - $layout_data_parent_item = (int) get_parameter ("parent_item"); - $layout_data_period = (int) get_parameter ("period"); - $layout_data_map_linked = (int) get_parameter ("map_linked"); - $layout_data_width = (int) get_parameter ("width"); - $layout_data_height = (int) get_parameter ("height"); - - $values = array ('id_layout' => $id_layout, - 'label' => $layout_data_label, - 'id_layout_linked' => $layout_data_map_linked, - 'label_color' => $layout_data_label_color, - 'image' => $layout_data_image, - 'type' => $layout_data_type, - 'id_agent' => $layout_data_id_agent, - 'id_agente_modulo' => $layout_data_id_agent_module, - 'parent_item' => $layout_data_parent_item, - 'period' => $layout_data_period * 3600, - 'no_link_color' => 1, - 'width' => $layout_data_width, - 'height' => $layout_data_height); - $result = process_sql_insert ('tlayout_data', $values); - - if ($result !== false) { - echo '

'.__('Successfully created').'

'; - } else { - echo '

'.__('Could not be created').'

'; - } - if (is_ajax ()) { - return; - } -} - -if ($update_layout_data_coords) { - $id_layout_data = (int) get_parameter ('id_layout_data'); - $layout_data_x = (int) get_parameter ("coord_x"); - $layout_data_y = (int) get_parameter ("coord_y"); - - $sql = sprintf ('UPDATE tlayout_data SET - pos_x = %d, pos_y = %d - WHERE id = %d', - $layout_data_x, $layout_data_y, $id_layout_data); - process_sql_update ('tlayout_data', - array ('pos_x' => $layout_data_x, 'pos_y' => $layout_data_y), - array ('id' => $id_layout_data)); - - if (is_ajax ()) { - return; - } -} - -if ($delete_layout_data) { - //delete_element - - $delete_element = get_parameter('delete_element',0); - $id_layout = get_parameter('id_layout'); - - process_sql_delete ('tlayout_data', array ('id' => $delete_element)); - - -// $ids_layout_data = (array) get_parameter ('ids_layout_data'); -// -// foreach ($ids_layout_data as $id_layout_data) { -// process_sql_update ('tlayout_data', array ('parent_item' => 0), -// array ('parent_item' => $id_layout_data)); -// $sql = sprintf ('DELETE FROM tlayout_data WHERE id = %d', -// $id_layout_data); -// process_sql_delete ('tlayout_data', array ('id' => $id_layout_data)); -// } - - if (is_ajax ()) { - return; - } -} - -if ($update_layout_data) { - $id_layout_data = (int) get_parameter ('id_layout_data'); - $layout_data_type = (int) get_parameter ("type"); - $layout_data_label = (string) get_parameter ("label"); - $layout_data_image = (string) get_parameter ("image"); - $layout_data_id_agent = (int) get_parameter ("agent"); - $layout_data_id_agent_module = (int) get_parameter ("module"); - $layout_data_label_color = (string) get_parameter ("label_color"); - $layout_data_parent_item = (int) get_parameter ("parent_item"); - $layout_data_period = (int) get_parameter ("period"); - $layout_data_map_linked = (int) get_parameter ("map_linked"); - $layout_data_width = (int) get_parameter ("width"); - $layout_data_height = (int) get_parameter ("height"); - - $values = array (); - $values['image'] = $layout_data_image; - $values['label'] = $layout_data_label; - $values['label_color'] = $layout_data_label_color; - $values['id_agent'] = $layout_data_id_agent; - $values['id_agente_modulo'] = $layout_data_id_agent_module; - $values['type'] = $layout_data_type; - $values['parent_item'] = $layout_data_parent_item; - $values['period'] = $layout_data_period; - $values['id_layout_linked'] = $layout_data_map_linked; - $values['height'] = $layout_data_height; - $values['width'] = $layout_data_width; - $result = process_sql_update ('tlayout_data', $values, array ('id' => $id_layout_data)); - - if ($result !== false) { - echo '

'.__('Updated successfully').'

'; - } else { - echo '

'.__('Not updated. Error updating data').'

'; - } -} - -if ($id_layout) { - $layout = get_db_row ('tlayout', 'id', $id_layout); - $name = $layout['name']; - $background = $layout['background']; - $id_group = $layout['id_group']; - $width = $layout['width']; - $height = $layout['height']; -} - -if (! $edit_layout && ! $id_layout) { - $table->width = '500px'; - $table->data = array (); - $table->head = array (); - $table->head[0] = __('Map name'); - $table->head[1] = __('Group'); - $table->head[2] = __('Items'); - $table->head[3] = __('Wizard'); - $table->head[4] = __('Delete'); - $table->align = array (); - $table->align[3] = 'center'; - $table->align[4] = 'center'; - - $maps = get_db_all_rows_in_table ('tlayout','name'); - if (!$maps) { - echo '
'.('No maps defined').'
'; - } else { - foreach ($maps as $map) { - if (give_acl ($config['id_user'], $map['id_group'], "AW")){ - $data = array (); - $data[0] = ''.$map['name'].''; - - $data[1] = print_group_icon ($map['id_group'], true).' '; - $data[1] .= get_group_name ($map['id_group']); - $data[2] = get_db_sql ("SELECT COUNT(*) FROM tlayout_data WHERE id_layout = ".$map['id']); - $data[3] = ''.print_image ("images/pill.png", true).''; - - $data[4] = ''.print_image ("images/cross.png", true).''; - array_push ($table->data, $data); - } - } - print_table ($table); - } - - echo '
'; - echo '
'; - print_input_hidden ('edit_layout', 1); - print_submit_button (__('Create'), '', false, 'class="sub next"'); - echo '
'; - echo '
'; +$maps = get_db_all_rows_in_table ('tlayout','name'); +if (!$maps) { + echo '
'.('No maps defined').'
'; } else { - $backgrounds_list = list_files ('images/console/background/', "jpg", 1, 0); - $backgrounds_list = array_merge ($backgrounds_list, list_files ('images/console/background/', "png", 1, 0)); - $groups = get_user_groups ($config['id_user']); - - $table->width = '340px'; - $table->data = array (); - $table->data[0][0] = __('Name'); - $table->data[0][1] = print_input_text ('name', $name, '', 15, 50, true); - - if ($id_layout){ - $table->data[0][1] .= '  '.print_image ("images/pill.png", true).''; + foreach ($maps as $map) { + if (give_acl ($config['id_user'], $map['id_group'], "AW")){ + $data = array (); + $data[0] = ''.$map['name'].''; - $table->data[0][1] .= '  '.print_image ("images/eye.png", true).''; + $data[1] = print_group_icon ($map['id_group'], true).' '; + $data[1] .= get_group_name ($map['id_group']); + $data[2] = get_db_sql ("SELECT COUNT(*) FROM tlayout_data WHERE id_layout = ".$map['id']); + + $data[3] = ''.print_image ("images/cross.png", true).''; + array_push ($table->data, $data); + } } - - $table->data[1][0] = __('Group'); - $table->data[1][1] = print_select ($groups, 'id_group', $id_group, '', '', '', true); - $table->data[2][0] = __('Background'); - $table->data[2][1] = print_select ($backgrounds_list, 'background', $background, '', 'None', '', true); - - if ($id_layout) { - $table->data[3][0] = __('Width'); - $table->data[3][1] = print_input_text ('width', $width, '', 3, 5, true); - $table->data[4][0] = __('Height'); - $table->data[4][1] = print_input_text ('height', $height, '', 3, 5, true); - } - echo '
'; print_table ($table); - - echo '
'; - if ($id_layout) { - print_submit_button (__('Update'), 'update_layout', false, 'class="sub upd"'); - print_input_hidden ('update_layout', 1); - print_input_hidden ('id_layout', $id_layout); - } else { - print_submit_button (__('Add'), 'create_layout', false, 'class="sub wand"'); - print_input_hidden ('create_layout', 1); - } - echo '
'; - echo '
'; - - if ($id_layout) { - /* Show visual map preview */ - echo '

'.__('preview').'

'; - print_pandora_visual_map ($id_layout, false, true); - - $images_list = array (); - $all_images = list_files ('images/console/icons/', "png", 1, 0); - foreach ($all_images as $image_file) { - if (strpos ($image_file, "_bad")) - continue; - if (strpos ($image_file, "_ok")) - continue; - if (strpos ($image_file, "_warning")) - continue; - $image_file = substr ($image_file, 0, strlen ($image_file) - 4); - $images_list[$image_file] = $image_file; - } - - echo '
'; - /* Layout data trash */ - echo '
'; - echo '
'; - echo '

'.__('Map element trash').'

'; - // DISABLE UNTIL FIX THE BUG WITH ELEMENTS WITH BIG DIMENSIONS -// echo __('Drag an element here to delete from the map'); - echo ' '; - - print_input_hidden ('delete_layout_data', 1); - print_input_hidden ('id_layout', $id_layout); -// echo '
'; -// print_submit_button (__('Delete'), 'delete_buttons', true, 'class="sub delete"'); -// echo '
'; - - echo __('Select an element to delete:'); - - echo "

"; - $elements = get_db_all_rows_sql("SELECT t1.id, t1.label, - (SELECT t2.nombre - FROM tagente AS t2 - WHERE t2.id_agente = t1.id_agent) AS name_agent, - (SELECT t3.nombre - FROM tagente_modulo AS t3 - WHERE t3.id_agente_modulo = t1.id_agente_modulo) AS name_module - FROM tlayout_data AS t1 - WHERE t1.id_layout = $id_layout"); - $tempArraySelect = array(); - if (is_array($elements)) { - foreach ($elements as $element) { - $tempArraySelect[$element['id']] = $element['label'] . " - " . - $element['name_agent'] . " - " . $element['name_module']; - } - } - print_select($tempArraySelect, 'delete_element', '', '', __('None'), 0); - print " "; - print_submit_button (__('Delete'), 'delete_buttons', false, 'class="sub delete"'); - echo "

"; - - echo '
'; - echo '
'; - - /* Layout_data editor form */ - $intervals = array (); - $intervals[3600] = "1 ".__('hour'); - $intervals[7200] = "2 ".__('hours'); - $intervals[10800] = "3 ".__('hours'); - $intervals[21600] = "6 ".__('hours'); - $intervals[43200] = "12 ".__('hours'); - $intervals[86400] = __('Last day'); - $intervals[172800] = "2 ". __('days'); - $intervals[1209600] = __('Last week'); - $intervals[2419200] = "15 ".__('days'); - $intervals[4838400] = __('Last month'); - $intervals[9676800] = "2 ".__('months'); - $intervals[29030400] = "6 ".__('months'); - - $agents = get_group_agents ($id_group); - - echo '
'; - echo '

'.__('Map element editor').'

'; - echo __('Drag an element here to edit the properties'); - - $table->data = array (); - $table->id = 'table_layout_data'; - $table->rowstyle = array (); - - $table->data[0][0] = __('Label'); - $table->data[0][1] = print_input_text ('label', '', '', 20, 200, true); - $table->data[1][0] = __('Label color'); - $table->data[1][1] = print_input_text ('label_color', '#000000', '', 7, 7, true); - $table->data[2][0] = __('Type'); - $table->data[2][1] = print_select (get_layout_data_types (), 'type', '', '', '', 0, true, false, false); // Dont want to be sorted ! - $table->data[3][0] = __('Height'); - $table->data[3][1] = print_input_text ('height', '', '', 5, 5, true); - $table->data[4][0] = __('Width'); - $table->data[4][1] = print_input_text ('width', '', '', 5, 5, true); - $table->data[5][0] = __('Agent') . ' ' . __("Type at least two characters to search") . ''; -// $table->data[5][1] = print_select ($agents, 'agent', '', '', '--', 0, true); - $table->data[5][1] = print_input_text_extended ('agent', '', 'text-agent', '', 30, 100, false, '', - array('style' => 'background: url(images/lightning.png) no-repeat right;'), true); - $table->data[6][0] = __('Module'); - $table->data[6][1] = print_select (array (), 'module', '', '', __('Any'), 0, true); - $table->data[7][0] = __('Period'); - $table->data[7][1] = print_select ($intervals, 'period', '', '', '--', 0, true); - $table->data[8][0] = __('Image'); - $table->data[8][1] = print_select ($images_list, 'image', '', '', 'None', '', true); - $table->data[8][1] .= '
'; - $table->data[9][0] = __('Parent'); - $table->data[9][1] = print_select_from_sql ('SELECT id, label FROM tlayout_data WHERE id_layout = '.$id_layout, - 'parent_item', '', '', 'None', '', true); - $table->data[10][0] = __('Map linked'); - $table->data[10][1] = print_select_from_sql ('SELECT id, name FROM tlayout WHERE id != '.$id_layout, - 'map_linked', '', '', 'None', '', true); - - echo '
'; - print_table ($table); - print_input_hidden ('create_layout_data', 1); - print_input_hidden ('update_layout_data', 0); - print_input_hidden ('id_layout', $id_layout); - print_input_hidden ('id_layout_data', 0); - echo '
'; - print_submit_button (__('Create'), 'create_layout_data_button', false, 'class="sub wand"'); - echo '
'; - echo '
'; - echo '
'; - echo '
'; - } } -require_css_file ('color-picker'); - -require_jquery_file ('ui.core'); -require_jquery_file ('ui.draggable'); -require_jquery_file ('ui.droppable'); -require_jquery_file ('colorpicker'); -require_jquery_file ('pandora.controls'); -require_javascript_file ('wz_jsgraphics'); -require_javascript_file ('pandora_visual_console'); -require_jquery_file ('ajaxqueue'); -require_jquery_file ('bgiframe'); -require_jquery_file ('autocomplete'); -?> - +echo '
'; +echo '
'; +print_input_hidden ('edit_layout', 1); +print_submit_button (__('Create'), '', false, 'class="sub next"'); +echo '
'; +echo '
'; +?> \ No newline at end of file diff --git a/pandora_console/godmode/reporting/visual_console_builder.data.php b/pandora_console/godmode/reporting/visual_console_builder.data.php index e7245bd0a7..3fc720870a 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.data.php +++ b/pandora_console/godmode/reporting/visual_console_builder.data.php @@ -49,11 +49,10 @@ $table->data[0][1] = print_input_text ('name', $visualConsoleName, '', 15, 50, t $table->data[1][0] = __('Group:'); $groups = get_user_groups ($config['id_user']); $table->data[1][1] = print_select ($groups, 'id_group', $idGroup, '', '', '', true); -$table->data[2][0] = ''; $backgrounds_list = list_files ('images/console/background/', "jpg", 1, 0); $backgrounds_list = array_merge ($backgrounds_list, list_files ('images/console/background/', "png", 1, 0)); -$table->data[3][0] = __('Background'); -$table->data[3][1] = print_select ($backgrounds_list, 'background', $background, '', 'None', '', true); +$table->data[2][0] = __('Background'); +$table->data[2][1] = print_select ($backgrounds_list, 'background', $background, '', 'None', '', true); if ($action == 'new') { $textButtonSubmit = __('Save'); $classButtonSubmit = 'sub wand'; @@ -62,10 +61,12 @@ else { $textButtonSubmit = __('Update'); $classButtonSubmit = 'sub upd'; } -$table->rowstyle[4] = "text-align: right;"; -$table->data[4][0] = ''; -$table->data[4][1] = print_submit_button ($textButtonSubmit, 'update_layout', false, 'class="' . $classButtonSubmit . '"', true); print_table($table); + +echo '
'; +print_submit_button ($textButtonSubmit, 'update_layout', false, 'class="' . $classButtonSubmit . '"'); +echo '
'; + echo ""; ?> \ No newline at end of file diff --git a/pandora_console/godmode/reporting/visual_console_builder.elements.php b/pandora_console/godmode/reporting/visual_console_builder.elements.php index 3760f76ef3..224102a1bd 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.elements.php +++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php @@ -63,42 +63,26 @@ $intervals[29030400] = "6 ".__('months'); $table->width = '100%'; $table->head = array (); -$table->head[0] = __('Label') . ' / ' . __('Type') . ' / ' . __('Parent'); -$table->head[1] = __('Image') . ' / ' . __('Agent') . ' / ' . __('Map linked'); -$table->head[2] = __('Height / Max value') . ' / ' . __('Module') . ' / ' . __('Label color'); -$table->head[3] = __('Width') . ' / ' . __('Period'); -$table->head[4] = __('Left'); -$table->head[5] = __('Top'); -$table->head[6] = __('Action'); +$table->head['icon'] = ''; +$table->head[0] = __('Label') . ' / ' . __('Agent'); +$table->head[1] = __('Image') . ' / ' . __('Module'); +$table->head[2] = __('Width x Height - Max value'); +$table->head[3] = __('Period') . ' / ' . __('Position'); +$table->head[4] = __('Parent') . ' / ' . __('Map linked'); +$table->head[5] = __('Action'); $table->data = array(); //Background +$table->data[0]['icon'] = ''; $table->data[0][0] = __('Background'); -$table->data[0][1] = print_select($backgrounds_list, 'background', $visualConsole['background'], '', 'None', '', true); -$table->data[0][2] = print_input_text('width', $visualConsole['width'], '', 3, 5, true); -$table->data[0][3] = print_input_text('height', $visualConsole['height'], '', 3, 5, true); -$table->data[0][4] = ''; -$table->data[0][5] = ''; -$table->data[0][6] = ''; +$table->data[0][1] = print_select($backgrounds_list, 'background', $visualConsole['background'], '', 'None', '', true, false, true, '', false, 'width: 100px;'); +$table->data[0][2] = print_input_text('width', $visualConsole['width'], '', 3, 5, true) . + 'x' . + print_input_text('height', $visualConsole['height'], '', 3, 5, true); +$table->data[0][3] = $table->data[0][4] = $table->data[0][5] = ''; -$table->data[1][0] = __('Background'); -$table->data[1][1] = ''; -$table->data[1][2] = ''; -$table->data[1][3] = ''; -$table->data[1][4] = ''; -$table->data[1][5] = ''; -$table->data[1][6] = ''; - -$table->data[2][0] = ''; -$table->data[2][1] = ''; -$table->data[2][2] = ''; -$table->data[2][3] = ''; -$table->data[2][4] = ''; -$table->data[2][5] = ''; -$table->data[2][6] = ''; - -$i = 2; +$i = 1; $layoutDatas = get_db_all_rows_field_filter ('tlayout_data', 'id_layout', $idVisualConsole); if ($layoutDatas === false) $layoutDatas = array(); @@ -107,55 +91,71 @@ $alternativeStyle = true; foreach ($layoutDatas as $layoutData) { $idLayoutData = $layoutData['id']; - $table->data[$i][0] = print_input_text ('label_' . $idLayoutData, $layoutData['label'], '', 20, 200, true); + //line between rows + $table->data[$i][0] = '
'; + $table->colspan[$i][0] = '8'; + + switch ($layoutData['type']) { + case STATIC_GRAPH: + $table->data[$i + 1]['icon'] = print_image('images/camera.png', true); + break; + case PERCENTILE_BAR: + $table->data[$i + 1]['icon'] = print_image('images/chart_bar.png', true); + break; + case MODULE_GRAPH: + $table->data[$i + 1]['icon'] = print_image('images/chart_curve.png', true); + break; + case SIMPLE_VALUE: + $table->data[$i + 1]['icon'] = print_image('images/binary.png', true); + break; + default: + $table->data[$i + 1]['icon'] = ''; + break; + } + + $table->data[$i + 1][0] = '' . + print_input_text ('label_' . $idLayoutData, $layoutData['label'], '', 10, 200, true) . + print_input_text_extended ('label_color_' . $idLayoutData, $layoutData['label_color'], 'text-'.'label_color_' . $idLayoutData, '', 7, 7, false, '', 'style="visibility: hidden; width: 0px;" class="label_color"', true) . + ''; if ($layoutData['type'] == STATIC_GRAPH) { - $table->data[$i][1] = print_select ($images_list, 'image_' . $idLayoutData, $layoutData['image'], '', 'None', '', true); + $table->data[$i + 1][1] = print_select ($images_list, 'image_' . $idLayoutData, $layoutData['image'], '', 'None', '', true); } else { - $table->data[$i][1] = ''; + $table->data[$i + 1][1] = ''; } - $table->data[$i][2] = print_input_text('width_' . $idLayoutData, $layoutData['width'], '', 3, 5, true); - $table->data[$i][3] = print_input_text('height_' . $idLayoutData, $layoutData['height'], '', 3, 5, true); - $table->data[$i][4] = print_input_text('left_' . $idLayoutData, $layoutData['pos_x'], '', 3, 5, true); - $table->data[$i][5] = print_input_text('top_' . $idLayoutData, $layoutData['pos_y'], '', 3, 5, true); - $table->data[$i][6] = ''; - $table->data[$i + 1][0] = $layoutDataTypes[$layoutData['type']]; - $table->data[$i + 1][1] = print_input_text_extended ('agent_' . $idLayoutData, get_agent_name($layoutData['id_agent']), 'text-agent_' . $idLayoutData, '', 25, 100, false, '', + $table->data[$i + 2]['icon'] = ''; + $table->data[$i + 2][0] = ' ' . __("Type at least two characters to search.") . '' . print_input_text_extended ('agent_' . $idLayoutData, get_agent_name($layoutData['id_agent']), 'text-agent_' . $idLayoutData, '', 15, 100, false, '', array('class' => 'text-agent', 'style' => 'background: #ffffff url(images/lightning.png) no-repeat right;'), true); - $table->data[$i + 1][2] = print_select_from_sql('SELECT id_agente_modulo, nombre FROM tagente_modulo WHERE id_agente = ' . $layoutData['id_agent'], + $table->data[$i + 2][1] = print_select_from_sql('SELECT id_agente_modulo, nombre FROM tagente_modulo WHERE id_agente = ' . $layoutData['id_agent'], 'module_' . $idLayoutData, $layoutData['id_agente_modulo'], '', '---', 0, true); + $table->data[$i + 2][2] = ''; if ($layoutData['type'] == MODULE_GRAPH) { - $table->data[$i + 1][3] = print_select ($intervals, 'period_' . $idLayoutData, $layoutData['period'], '', '--', 0, true); + $table->data[$i + 2][3] = print_select ($intervals, 'period_' . $idLayoutData, $layoutData['period'], '', '--', 0, true); } else { - $table->data[$i + 1][3] = ''; + $table->data[$i + 2][3] = ''; } - $table->data[$i + 1][4] = ''; - $table->data[$i + 1][5] = ''; - $table->data[$i + 1][6] = ''; - - $table->data[$i + 2][0] = print_select_from_sql ('SELECT id, label FROM tlayout_data WHERE id_layout = '. $idVisualConsole . ' AND id !=' . $idLayoutData, - 'parent_' . $idLayoutData, $layoutData['parent_item'], '', 'None', 0, true); - $table->data[$i + 2][1] = print_select_from_sql ('SELECT id, name FROM tlayout WHERE id != ' . $idVisualConsole, + $table->data[$i + 2][4] = print_select_from_sql ('SELECT id, name FROM tlayout WHERE id != ' . $idVisualConsole, 'map_linked_' . $idLayoutData, $layoutData['id_layout_linked'], '', 'None', '', true); - //$table->data[$i + 2][2] = print_input_text ('label_color_' . $idLayoutData, '#000000', $layoutData['label_color'], 7, 7, true); - $table->data[$i + 2][2] = print_input_text_extended ('label_color_' . $idLayoutData, $layoutData['label_color'], 'text-'.'label_color_' . $idLayoutData - , '', 7, 7, false, '', 'class="label_color"', true); - $table->data[$i + 2][3] = ''; - $table->data[$i + 2][4] = ''; $table->data[$i + 2][5] = ''; - $table->data[$i + 2][6] = ''; if ($alternativeStyle) { - $table->rowclass[$i] = 'rowOdd'; $table->rowclass[$i + 1] = 'rowOdd'; $table->rowclass[$i + 2] = 'rowOdd'; } else { - $table->rowclass[$i] = 'rowPair'; $table->rowclass[$i + 1] = 'rowPair'; $table->rowclass[$i + 2] = 'rowPair'; } diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index 78be975d17..e6b3015cac 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -155,11 +155,12 @@ function print_select_style ($fields, $name, $selected = '', $style='', $script * @param bool Whether to return an output string or echo now (optional, echo by default). * @param bool Set the input to allow multiple selections (optional, single selection by default). * @param bool Whether to sort the options or not (optional, unsorted by default). + * @param string $style The string of style. * * @return string HTML code if return parameter is true. */ function print_select ($fields, $name, $selected = '', $script = '', $nothing = '', $nothing_value = 0, $return = false, - $multiple = false, $sort = true, $class = '', $disabled = false) { + $multiple = false, $sort = true, $class = '', $disabled = false, $style = false) { $output = "\n"; @@ -187,8 +188,15 @@ function print_select ($fields, $name, $selected = '', $script = '', $nothing = if (!empty ($disabled)) { $attributes .= ' disabled="disabled"'; } + + if ($style === false) { + $styleText = ''; + } + else { + $styleText = 'style="' . $style . '"'; + } - $output .= ''; if ($nothing != '' || empty ($fields)) { if ($nothing == '') { @@ -474,11 +482,19 @@ function print_input_image ($name, $src, $value, $style = '', $return = false, $ * @param string $name Input name. * @param string $value Input value. * @param bool $return Whether to return an output string or echo now (optional, echo by default). + * @param string $class Set the class of input. * * @return string HTML code if return parameter is true. */ -function print_input_hidden ($name, $value, $return = false) { - $output = ''; +function print_input_hidden ($name, $value, $return = false, $class = false) { + if ($class !== false) { + $classText = 'class="' . $class . '"'; + } + else { + $classText = ''; + } + + $output = ''; if ($return) return $output;