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

2013-04-11 Sergio Martin <sergio.martin@artica.es> 

* operation/visual_console/render_view.php
	operation/reporting/reporting_viewer.php
	operation/reporting/graph_viewer.php
	godmode/reporting/visual_console_builder.php
	godmode/reporting/graph_builder.php
	godmode/reporting/reporting_builder.php: Redistribute
	the options of some sections to improve the usability

	* images/cross_undo.png
	images/load.png: Change some images

	* operation/agentes/stat_win.php: Fix the problem of 
	the height of module graphs form layer adding a scroll
	div



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7961 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-04-11 11:13:44 +00:00
parent b02bd57de4
commit 976bd1b478
10 changed files with 121 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_console/ChangeLog
View File

@ -1,3 +1,20 @@
2013-04-11 Sergio Martin <sergio.martin@artica.es>
* operation/visual_console/render_view.php
operation/reporting/reporting_viewer.php
operation/reporting/graph_viewer.php
godmode/reporting/visual_console_builder.php
godmode/reporting/graph_builder.php
godmode/reporting/reporting_builder.php: Redistribute
the options of some sections to improve the usability
* images/cross_undo.png
images/load.png: Change some images
* operation/agentes/stat_win.php: Fix the problem of
the height of module graphs form layer adding a scroll
div
2013-04-10 Sergio Martin <sergio.martin@artica.es>
* include/styles/pandora.css

2
pandora_console/godmode/reporting/graph_builder.php
View File

@ -181,7 +181,7 @@ if ($edit_graph) {
$buttons = array(
'main' => array('active' => false,
'text' => '<a href="index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=main&edit_graph=1&id=' . $id_graph . '">' .
html_print_image("images/setup.png", true, array ("title" => __('Setup'))) .'</a>'),
html_print_image("images/chart.png", true, array ("title" => __('Main data'))) .'</a>'),
'graph_editor' => array('active' => false,
'text' => '<a href="index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=graph_editor&edit_graph=1&id=' . $id_graph . '">' .
html_print_image("images/builder.png", true, array ("title" => __('Graph editor'))) .'</a>'),

2
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -1396,7 +1396,7 @@ if ($enterpriseEnable) {
$buttons = array(
'main' => array('active' => false,
'text' => '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=main&action=edit&id_report=' . $idReport . '&pure='.$pure.'">' .
html_print_image("images/op_reporting.png", true, array ("title" => __('Main'))) .'</a>'),
html_print_image("images/op_reporting.png", true, array ("title" => __('Main data'))) .'</a>'),
'list_items' => array('active' => false,
'text' => '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report=' . $idReport . '&pure='.$pure.'">' .
html_print_image("images/list.png", true, array ("title" => __('List items'))) .'</a>'),

26
pandora_console/godmode/reporting/visual_console_builder.php
View File

@ -401,12 +401,16 @@ else {
$url_view = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id_visualmap=' . $idVisualConsole . '&refr=' . $view_refresh;
}
// Hash for auto-auth in public link
$hash = md5($config["dbpass"]. $id_layout. $config["id_user"]);
$buttons = array(
'view' => array('active' => false,
'text' => '<a href="' . $url_view . '">' .
html_print_image ("images/operation.png", true, array ("title" => __('View'))) .'</a>'),
'consoles_list' => array('active' => false,
'text' => '<a href="index.php?sec=reporting&sec2=godmode/reporting/map_builder&refr=' . $refr . '">' .
html_print_image ("images/visual_console.png", true, array ("title" => __('Visual consoles list'))) .'</a>'),
'public_link' => array('active' => false,
'text' => '<a href="' . ui_get_full_url('operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$id_layout.'&id_user='.$config["id_user"]) . '">'.
html_print_image ("images/camera_mc.png", true, array ("title" => __('Show link to public Visual Console'))).'</a>'),
'data' => array('active' => false,
'text' => '<a href="' . $url_base . $action . '&tab=data&id_visual_console=' . $idVisualConsole . '">' .
html_print_image ("images/op_reporting.png", true, array ("title" => __('Main data'))) .'</a>'),
@ -418,7 +422,10 @@ $buttons = array(
html_print_image ("images/wand.png", true, array ("title" => __('Wizard'))) .'</a>'),
'editor' => array('active' => false,
'text' => '<a href="' . $url_base . $action . '&tab=editor&id_visual_console=' . $idVisualConsole . '">' .
html_print_image ("images/builder.png", true, array ("title" => __('Builder'))) .'</a>'));
html_print_image ("images/builder.png", true, array ("title" => __('Builder'))) .'</a>'),
'view' => array('active' => false,
'text' => '<a href="' . $url_view . '">' .
html_print_image ("images/operation.png", true, array ("title" => __('View'))) .'</a>'));
if ($action == 'new' || $idVisualConsole === false) {
$buttons = array('data' => $buttons['data']); //Show only the data tab
@ -429,11 +436,8 @@ if ($action == 'new' || $idVisualConsole === false) {
$buttons[$activeTab]['active'] = true;
if (!defined('METACONSOLE'))
if (!defined('METACONSOLE')) {
ui_print_page_header(__('Visual console') . " &raquo; " . $visualConsoleName, "images/op_reporting.png", false, "visual_console_editor_" . $activeTab . "_tab", false, $buttons);
else {
// Print header
//ui_meta_print_header(__('Visual console') . " &raquo; " . $visualConsoleName, "", $buttons);
}
//The source code for PAINT THE PAGE
@ -455,4 +459,4 @@ switch ($activeTab) {
require_once($config['homedir'] . '/godmode/reporting/visual_console_builder.editor.php');
break;
}
?>
?>

BIN
pandora_console/images/cross_undo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
pandora_console/images/load.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

32
pandora_console/operation/agentes/stat_win.php
View File

@ -230,13 +230,15 @@ $label = base64_decode(get_parameter('label', ''));
$params['body_text'] .= html_print_input_hidden ("type", $type, true);
}
$table->id = 'stat_win_form';
$table->width = '100%';
$table->size[0] = '50%';
$table->cellspacing = 2;
$table->cellpadding = 2;
$table->class = 'databox_frame';
// FORM TABLE
$table = html_get_predefined_table('transparent', 2);
$table->width = '98%';
$table->id = 'stat_win_form_div';
$table->style[0] = 'text-align:left;';
$table->style[1] = 'text-align:left;';
$table->size[0] = '60%';
$data = array();
$data[0] = __('Refresh time');
$data[1] = html_print_extended_select_for_time("refresh", $refresh, '', '', 0, 7, true);
@ -318,9 +320,23 @@ $label = base64_decode(get_parameter('label', ''));
break;
}
$form_table = html_print_table($table, true);
unset($table);
$table->id = 'stat_win_form';
$table->width = '100%';
$table->cellspacing = 2;
$table->cellpadding = 2;
$table->class = 'databox_frame';
$data = array();
$data[0] = '';
$data[1] = '<div style="width:100%; text-align:right;">' . html_print_submit_button (__('Reload'), "submit", false, 'class="sub next"', true) . "</div>";
$data[0] = html_print_div(array('content' => $form_table, 'style' => 'overflow: auto; height: 220px'), true);
$table->data[] = $data;
$table->rowclass[] = '';
$data = array();
$data[0] = '<div style="width:100%; text-align:right;">' . html_print_submit_button (__('Reload'), "submit", false, 'class="sub next"', true) . "</div>";
$table->data[] = $data;
$table->rowclass[] = '';

22
pandora_console/operation/reporting/graph_viewer.php
View File

@ -105,11 +105,22 @@ if ($view_graph) {
$url = "index.php?sec=reporting&sec2=operation/reporting/graph_viewer&id=$id_graph&view_graph=1";
if (check_acl ($config['id_user'], 0, "IW")) {
$options['setup']['text'] = "<a href='index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=graph_editor&edit_graph=1&id=$id_graph'>"
. html_print_image ("images/setup.png", true, array ("title" => __('Setup')))
. "</a>";
$options = array();
if (check_acl ($config['id_user'], 0, "RW")) {
$options = array(
'main' => array('active' => false,
'text' => '<a href="index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=main&edit_graph=1&id=' . $id_graph . '">' .
html_print_image("images/chart.png", true, array ("title" => __('Main data'))) .'</a>'),
'graph_editor' => array('active' => false,
'text' => '<a href="index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=graph_editor&edit_graph=1&id=' . $id_graph . '">' .
html_print_image("images/builder.png", true, array ("title" => __('Graph editor'))) .'</a>')
);
}
$options['view']['text'] = '<a href="index.php?sec=reporting&sec2=operation/reporting/graph_viewer&view_graph=1&id=' . $id_graph . '">' .
html_print_image("images/operation.png", true, array ("title" => __('View graph'))) .'</a>';
$options['view']['active'] = true;
if ($config["pure"] == 0) {
$options['screen']['text'] = "<a href='$url&pure=1'>"
@ -120,6 +131,9 @@ if ($view_graph) {
$options['screen']['text'] = "<a href='$url&pure=0'>"
. html_print_image ("images/normal_screen.png", true, array ("title" => __('Back to normal mode')))
. "</a>";
// In full screen, the manage options are not available
$options = array('view' => $options['view'], 'screen' => $options['screen']);
}
// Header

25
pandora_console/operation/reporting/reporting_viewer.php
View File

@ -63,9 +63,22 @@ $enable_init_date = get_parameter('enable_init_date', 0);
$url = "index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id=$id_report&date=$date&time=$time&pure=$pure";
$options['setup']['text'] = "<a href='index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&action=new&tab=item_editor&id_report=$id_report&pure=$pure'>"
. html_print_image ("images/setup.png", true, array ("title" => __('Setup')))
. "</a>";
$options['main']['text'] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=main&action=edit&id_report=' . $id_report . '&pure='.$pure.'">' .
html_print_image("images/op_reporting.png", true, array ("title" => __('Main data'))) .'</a>';
$options['list_items']['text'] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report=' . $id_report . '&pure='.$pure.'">' .
html_print_image("images/list.png", true, array ("title" => __('List items'))) .'</a>';
$options['item_editor']['text'] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=item_editor&action=new&id_report=' . $id_report . '&pure='.$pure.'">' .
html_print_image("images/pen.png", true, array ("title" => __('Item editor'))) .'</a>';
if (enterprise_installed()) {
$options = reporting_enterprise_add_Tabs($options, $id_report);
}
$options['view'] = array('active' => true,
'text' => '<a href="index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id=' . $id_report . '&pure='.$pure.'">' .
html_print_image("images/operation.png", true, array ("title" => __('View report'))) .'</a>');
if(!defined('METACONSOLE')) {
if ($config["pure"] == 0) {
@ -77,6 +90,9 @@ if(!defined('METACONSOLE')) {
$options['screen']['text'] = "<a href='$url&pure=0&enable_init_date=$enable_init_date&date_init=$date_init&time_init=$time_init'>"
. html_print_image ("images/normal_screen.png", true, array ("title" => __('Back to normal mode')))
. "</a>";
// In full screen, the manage options are not available
$options = array('view' => $options['view'], 'screen' => $options['screen']);
}
}
@ -90,9 +106,10 @@ if ($config['metaconsole'] == 1 and defined('METACONSOLE')) {
// Print header
ui_meta_print_header(__('Reporting'), "", $options);
}
else
else {
ui_print_page_header (__('Reporting'). " &raquo; ". __('Custom reporting'). " - ".$report["name"],
"images/op_reporting.png", false, "", false, $options);
}
if ($enable_init_date) {
if ($datetime_init > $datetime) {

47
pandora_console/operation/visual_console/render_view.php
View File

@ -61,28 +61,31 @@ if (! check_acl ($config["id_user"], $id_group, "RR")) {
// Render map
$options = array();
$options['consoles_list']['text'] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/map_builder&refr=' . $refr . '">' .
html_print_image ("images/visual_console.png", true, array ("title" => __('Visual consoles list'))) .'</a>';
if (check_acl ($config["id_user"], $id_group, "RW")) {
$url_base = 'index.php?sec=reporting&sec2=godmode/reporting/visual_console_builder&action=';
$hash = md5($config["dbpass"]. $id_layout. $config["id_user"]);
if (!defined('METACONSOLE'))
$options['setup']['text'] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/visual_console_builder&tab=editor&action=edit&id_visual_console='.$id_layout.'">'.html_print_image ("images/setup.png", true, array ("title" => __('Setup'))).'</a>';
else {
$pure = get_parameter('pure', 0);
$options['setup']['text'] = '<a href="index.php?action2=edit&tab=editor&operation=edit_visualmap&sec=screen&sec2=screens/screens&action=visualmap&pure=' . $pure . '&id_visual_console='.$id_layout.'">'.html_print_image ("images/setup.png", true, array ("title" => __('Setup'))).'</a>';
}
$options['setup']['active'] = false;
if (!defined('METACONSOLE'))
$url = ui_get_full_url('operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$id_layout.'&id_user='.$config["id_user"]);
else
$url = ui_get_full_url('operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$id_layout.'&id_user='.$config["id_user"], false, false, false);
$options['public_link']['text'] = '<a href="' . $url . '">'.
html_print_image ("images/camera_mc.png", true, array ("title" => __('Show link to public Visual Console'))).'</a>';
$options['public_link']['text'] = '<a href="' . ui_get_full_url('operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$id_layout.'&id_user='.$config["id_user"]) . '" target="_blank">'.
html_print_image ("images/camera_mc.png", true, array ("title" => __('Show link to public Visual Console'))).'</a>';
$options['public_link']['active'] = false;
$options['data']['text'] = '<a href="' . $url_base . $action . '&tab=data&id_visual_console=' . $id_layout . '">' .
html_print_image ("images/op_reporting.png", true, array ("title" => __('Main data'))) .'</a>';
$options['list_elements']['text'] = '<a href="' . $url_base . $action . '&tab=list_elements&id_visual_console=' . $id_layout . '">' .
html_print_image ("images/list.png", true, array ("title" => __('List elements'))) .'</a>';
$options['wizard']['text'] = '<a href="' . $url_base . $action . '&tab=wizard&id_visual_console=' . $id_layout . '">' .
html_print_image ("images/wand.png", true, array ("title" => __('Wizard'))) .'</a>';
$options['editor']['text'] = '<a href="' . $url_base . $action . '&tab=editor&id_visual_console=' . $id_layout . '">' .
html_print_image ("images/builder.png", true, array ("title" => __('Builder'))) .'</a>';
}
$options['view']['text'] = '<a href="index.php?sec=reporting&sec2=operation/visual_console/render_view&id=' . $id_layout . '&refr=' . $view_refresh . '">' . html_print_image ("images/operation.png", true, array ("title" => __('View'))) .'</a>';
$options['view']['active'] = true;
if (!defined('METACONSOLE')) {
if ($config["pure"] == 0) {
$options['pure']['text'] = '<a href="index.php?sec=reporting&amp;sec2=operation/visual_console/render_view&amp;id='.$id_layout.'&amp;refr='.$config["refr"].'&amp;pure=1">' . html_print_image ("images/full_screen.png", true, array ("title" => __('Full screen mode')))
@ -92,22 +95,20 @@ if (!defined('METACONSOLE')) {
$options['pure']['text'] = '<a href="index.php?sec=reporting&amp;sec2=operation/visual_console/render_view&amp;id='.$id_layout.'&amp;refr='.$config["refr"].'">'
. html_print_image ("images/normal_screen.png", true, array ("title" => __('Back to normal mode')))
. "</a>";
// In full screen, the manage options are not available
$options = array('view' => $options['view'], 'pure' => $options['pure']);
}
$options['pure']['active'] = false;
}
if (!defined('METACONSOLE'))
ui_print_page_header (__("Visual console") . " &raquo; " . $layout_name, "images/op_reporting.png", false, '', false, $options);
else
//ui_meta_print_header(__('Visual console') . " &raquo; " . $layout_name, "", $options);
//Set the hidden value for the javascript
if (defined('METACONSOLE')) {
html_print_input_hidden('metaconsole', 1);
}
else {
html_print_input_hidden('metaconsole', 0);
ui_print_page_header (__("Visual console") . " &raquo; " . $layout_name, "images/op_reporting.png", false, '', false, $options);
}
visual_map_print_visual_map ($id_layout);