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.

This commit is contained in:
mdtrooper 2014-12-02 11:39:45 +01:00
parent b0ee3ed266
commit 673d0bd34f
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

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

12
pandora_console/include/functions_visual_map.php
View File

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

11
pandora_console/include/functions_visual_map_editor.php
View File

@ -444,7 +444,8 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
')</td>';
$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');
$form_items_advance['size_row']['html'] = '<td align="left">' .
__('Size') .
@ -459,7 +460,8 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
$parents = visual_map_get_items_parents($visualConsole_id);
$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',
'simple_value', 'label', 'icon', 'datos');
$form_items_advance['parent_row']['html'] = '<td align="left">' .
@ -471,8 +473,9 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
$form_items_advance['map_linked_row'] = array();
$form_items_advance['map_linked_row']['items'] = array(
'static_graph', 'percentile_bar', 'percentile_item',
'module_graph', 'simple_value', 'icon', 'label', 'datos');
'group_item', 'static_graph', 'percentile_bar',
'percentile_item', 'module_graph', 'simple_value',
'icon', 'label', 'datos');
$form_items_advance['map_linked_row']['html'] = '<td align="left">'.
__('Map linked') . '</td>' .
'<td align="left">' . html_print_select_from_sql (