tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added the lost fields for item group in the editor. 

(cherry picked from commit a3e6b09758)
This commit is contained in:
mdtrooper 2014-12-02 11:39:45 +01:00
parent 4f7bfea51c
commit 7f4d642679
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/godmode/reporting/visual_console_builder.elements.php
View File

@ -208,6 +208,7 @@ foreach ($layoutDatas as $layoutData) {
',' . html_print_input_text('top_' . $idLayoutData, $layoutData['pos_y'], '', 2, 5, true) . ',' . html_print_input_text('top_' . $idLayoutData, $layoutData['pos_y'], '', 2, 5, true) .
')'; ')';
//Parent //Parent
switch ($layoutData['type']) { switch ($layoutData['type']) {
case BOX_ITEM: case BOX_ITEM:
@ -215,14 +216,10 @@ foreach ($layoutDatas as $layoutData) {
$table->data[$i + 1][4] = ""; $table->data[$i + 1][4] = "";
break; break;
default: default:
$table->data[$i + 1][4] = html_print_select_from_sql( $parents = visual_map_get_items_parents($idVisualConsole);
'SELECT id, label $table->data[$i + 1][4] = html_print_select($parents,
FROM tlayout_data
WHERE id_layout = '. $idVisualConsole . '
AND id !=' . $idLayoutData,
'parent_' . $idLayoutData, $layoutData['parent_item'], 'parent_' . $idLayoutData, $layoutData['parent_item'],
'', 'None', 0, true, false, true, false, '', __('None'), 0, true);
'width: 120px;');
} }
//Delete row button //Delete row button
@ -243,6 +240,7 @@ foreach ($layoutDatas as $layoutData) {
//Second row //Second row
$table->data[$i + 2]['icon'] = ''; $table->data[$i + 2]['icon'] = '';
//Agent //Agent
switch ($layoutData['type']) { switch ($layoutData['type']) {
case GROUP_ITEM: case GROUP_ITEM:

12
pandora_console/include/functions_visual_map.php
View File

@ -2246,6 +2246,10 @@ function visual_map_create_internal_name_item($label = null, $type, $image, $age
case LABEL: case LABEL:
$text = __('Label'); $text = __('Label');
break; break;
case GROUP_ITEM:
case 'group_item':
$text = __('Group') . " - ";
break;
case 'icon': case 'icon':
case ICON: case ICON:
$text = __('Icon') . " - " . $text = __('Icon') . " - " .
@ -2285,8 +2289,12 @@ function visual_map_get_items_parents($idVisual) {
$agent = io_safe_output(agents_get_name($item['id_agent'])); $agent = io_safe_output(agents_get_name($item['id_agent']));
} }
$return[$item['id']] = visual_map_create_internal_name_item($item['label'], $return[$item['id']] = visual_map_create_internal_name_item(
$item['type'], $item['image'], $agent, $item['id_agente_modulo'], $item['label'],
$item['type'],
$item['image'],
$agent,
$item['id_agente_modulo'],
$item['id']); $item['id']);
} }

11
pandora_console/include/functions_visual_map_editor.php
View File

@ -367,7 +367,8 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
')</td>'; ')</td>';
$form_items_advance['size_row'] = array(); $form_items_advance['size_row'] = array();
$form_items_advance['size_row']['items'] = array('background', $form_items_advance['size_row']['items'] = array(
'group_item', 'background',
'static_graph', 'icon datos'); 'static_graph', 'icon datos');
$form_items_advance['size_row']['html'] = '<td align="left">' . $form_items_advance['size_row']['html'] = '<td align="left">' .
__('Size') . __('Size') .
@ -382,7 +383,8 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
$parents = visual_map_get_items_parents($visualConsole_id); $parents = visual_map_get_items_parents($visualConsole_id);
$form_items_advance['parent_row'] = array(); $form_items_advance['parent_row'] = array();
$form_items_advance['parent_row']['items'] = array('static_graph', $form_items_advance['parent_row']['items'] = array(
'group_item', 'static_graph',
'percentile_bar', 'percentile_item', 'module_graph', 'percentile_bar', 'percentile_item', 'module_graph',
'simple_value', 'label', 'icon', 'datos'); 'simple_value', 'label', 'icon', 'datos');
$form_items_advance['parent_row']['html'] = '<td align="left">' . $form_items_advance['parent_row']['html'] = '<td align="left">' .
@ -394,8 +396,9 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
$form_items_advance['map_linked_row'] = array(); $form_items_advance['map_linked_row'] = array();
$form_items_advance['map_linked_row']['items'] = array( $form_items_advance['map_linked_row']['items'] = array(
'static_graph', 'percentile_bar', 'percentile_item', 'group_item', 'static_graph', 'percentile_bar',
'module_graph', 'simple_value', 'icon', 'label', 'datos'); 'percentile_item', 'module_graph', 'simple_value',
'icon', 'label', 'datos');
$form_items_advance['map_linked_row']['html'] = '<td align="left">'. $form_items_advance['map_linked_row']['html'] = '<td align="left">'.
__('Map linked') . '</td>' . __('Map linked') . '</td>' .
'<td align="left">' . html_print_select_from_sql ( '<td align="left">' . html_print_select_from_sql (