diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 50a7d5374c..475a2f920f 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,20 @@ +2013-04-11 Sergio Martin + + * 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 * include/styles/pandora.css diff --git a/pandora_console/godmode/reporting/graph_builder.php b/pandora_console/godmode/reporting/graph_builder.php index 322a79682b..4756d575ff 100644 --- a/pandora_console/godmode/reporting/graph_builder.php +++ b/pandora_console/godmode/reporting/graph_builder.php @@ -181,7 +181,7 @@ if ($edit_graph) { $buttons = array( 'main' => array('active' => false, 'text' => '' . - html_print_image("images/setup.png", true, array ("title" => __('Setup'))) .''), + html_print_image("images/chart.png", true, array ("title" => __('Main data'))) .''), 'graph_editor' => array('active' => false, 'text' => '' . html_print_image("images/builder.png", true, array ("title" => __('Graph editor'))) .''), diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index f83c3de7e0..b9cd721f5c 100644 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -1396,7 +1396,7 @@ if ($enterpriseEnable) { $buttons = array( 'main' => array('active' => false, 'text' => '' . - html_print_image("images/op_reporting.png", true, array ("title" => __('Main'))) .''), + html_print_image("images/op_reporting.png", true, array ("title" => __('Main data'))) .''), 'list_items' => array('active' => false, 'text' => '' . html_print_image("images/list.png", true, array ("title" => __('List items'))) .''), diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php index f5ca36d0b9..49417ad6e4 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.php +++ b/pandora_console/godmode/reporting/visual_console_builder.php @@ -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' => '' . - html_print_image ("images/operation.png", true, array ("title" => __('View'))) .''), + 'consoles_list' => array('active' => false, + 'text' => '' . + html_print_image ("images/visual_console.png", true, array ("title" => __('Visual consoles list'))) .''), + 'public_link' => array('active' => false, + 'text' => ''. + html_print_image ("images/camera_mc.png", true, array ("title" => __('Show link to public Visual Console'))).''), 'data' => array('active' => false, 'text' => '' . html_print_image ("images/op_reporting.png", true, array ("title" => __('Main data'))) .''), @@ -418,7 +422,10 @@ $buttons = array( html_print_image ("images/wand.png", true, array ("title" => __('Wizard'))) .''), 'editor' => array('active' => false, 'text' => '' . - html_print_image ("images/builder.png", true, array ("title" => __('Builder'))) .'')); + html_print_image ("images/builder.png", true, array ("title" => __('Builder'))) .''), + 'view' => array('active' => false, + 'text' => '' . + html_print_image ("images/operation.png", true, array ("title" => __('View'))) .'')); 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') . " » " . $visualConsoleName, "images/op_reporting.png", false, "visual_console_editor_" . $activeTab . "_tab", false, $buttons); -else { - // Print header - //ui_meta_print_header(__('Visual console') . " » " . $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; } -?> \ No newline at end of file +?> diff --git a/pandora_console/images/cross_undo.png b/pandora_console/images/cross_undo.png index b542e9b776..e6512f4768 100644 Binary files a/pandora_console/images/cross_undo.png and b/pandora_console/images/cross_undo.png differ diff --git a/pandora_console/images/load.png b/pandora_console/images/load.png index b71fd933b8..80ce7173fd 100644 Binary files a/pandora_console/images/load.png and b/pandora_console/images/load.png differ diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index 1a5f3c03b6..9b5370e129 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -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] = '
' . html_print_submit_button (__('Reload'), "submit", false, 'class="sub next"', true) . "
"; + $data[0] = html_print_div(array('content' => $form_table, 'style' => 'overflow: auto; height: 220px'), true); + $table->data[] = $data; + $table->rowclass[] = ''; + + $data = array(); + $data[0] = '
' . html_print_submit_button (__('Reload'), "submit", false, 'class="sub next"', true) . "
"; $table->data[] = $data; $table->rowclass[] = ''; diff --git a/pandora_console/operation/reporting/graph_viewer.php b/pandora_console/operation/reporting/graph_viewer.php index 3eb2e18f46..7ac1650077 100644 --- a/pandora_console/operation/reporting/graph_viewer.php +++ b/pandora_console/operation/reporting/graph_viewer.php @@ -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'] = "" - . html_print_image ("images/setup.png", true, array ("title" => __('Setup'))) - . ""; + $options = array(); + + if (check_acl ($config['id_user'], 0, "RW")) { + $options = array( + 'main' => array('active' => false, + 'text' => '' . + html_print_image("images/chart.png", true, array ("title" => __('Main data'))) .''), + 'graph_editor' => array('active' => false, + 'text' => '' . + html_print_image("images/builder.png", true, array ("title" => __('Graph editor'))) .'') + ); } + + $options['view']['text'] = '' . + html_print_image("images/operation.png", true, array ("title" => __('View graph'))) .''; + $options['view']['active'] = true; if ($config["pure"] == 0) { $options['screen']['text'] = "" @@ -120,6 +131,9 @@ if ($view_graph) { $options['screen']['text'] = "" . html_print_image ("images/normal_screen.png", true, array ("title" => __('Back to normal mode'))) . ""; + + // In full screen, the manage options are not available + $options = array('view' => $options['view'], 'screen' => $options['screen']); } // Header diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php index 0ef7037238..17af7c2ed6 100644 --- a/pandora_console/operation/reporting/reporting_viewer.php +++ b/pandora_console/operation/reporting/reporting_viewer.php @@ -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'] = "" -. html_print_image ("images/setup.png", true, array ("title" => __('Setup'))) -. ""; +$options['main']['text'] = '' . + html_print_image("images/op_reporting.png", true, array ("title" => __('Main data'))) .''; + +$options['list_items']['text'] = '' . + html_print_image("images/list.png", true, array ("title" => __('List items'))) .''; + +$options['item_editor']['text'] = '' . + html_print_image("images/pen.png", true, array ("title" => __('Item editor'))) .''; + +if (enterprise_installed()) { + $options = reporting_enterprise_add_Tabs($options, $id_report); +} + +$options['view'] = array('active' => true, + 'text' => '' . + html_print_image("images/operation.png", true, array ("title" => __('View report'))) .''); if(!defined('METACONSOLE')) { if ($config["pure"] == 0) { @@ -77,6 +90,9 @@ if(!defined('METACONSOLE')) { $options['screen']['text'] = "" . html_print_image ("images/normal_screen.png", true, array ("title" => __('Back to normal mode'))) . ""; + + // 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'). " » ". __('Custom reporting'). " - ".$report["name"], "images/op_reporting.png", false, "", false, $options); +} if ($enable_init_date) { if ($datetime_init > $datetime) { diff --git a/pandora_console/operation/visual_console/render_view.php b/pandora_console/operation/visual_console/render_view.php index 3c67481822..890674f5cd 100644 --- a/pandora_console/operation/visual_console/render_view.php +++ b/pandora_console/operation/visual_console/render_view.php @@ -61,28 +61,31 @@ if (! check_acl ($config["id_user"], $id_group, "RR")) { // Render map $options = array(); +$options['consoles_list']['text'] = '' . + html_print_image ("images/visual_console.png", true, array ("title" => __('Visual consoles list'))) .''; + 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'] = ''.html_print_image ("images/setup.png", true, array ("title" => __('Setup'))).''; - else { - $pure = get_parameter('pure', 0); - $options['setup']['text'] = ''.html_print_image ("images/setup.png", true, array ("title" => __('Setup'))).''; - } - $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'] = ''. - - html_print_image ("images/camera_mc.png", true, array ("title" => __('Show link to public Visual Console'))).''; + + $options['public_link']['text'] = ''. + html_print_image ("images/camera_mc.png", true, array ("title" => __('Show link to public Visual Console'))).''; $options['public_link']['active'] = false; + + $options['data']['text'] = '' . + html_print_image ("images/op_reporting.png", true, array ("title" => __('Main data'))) .''; + $options['list_elements']['text'] = '' . + html_print_image ("images/list.png", true, array ("title" => __('List elements'))) .''; + $options['wizard']['text'] = '' . + html_print_image ("images/wand.png", true, array ("title" => __('Wizard'))) .''; + $options['editor']['text'] = '' . + html_print_image ("images/builder.png", true, array ("title" => __('Builder'))) .''; } +$options['view']['text'] = '' . html_print_image ("images/operation.png", true, array ("title" => __('View'))) .''; +$options['view']['active'] = true; + if (!defined('METACONSOLE')) { if ($config["pure"] == 0) { $options['pure']['text'] = '' . html_print_image ("images/full_screen.png", true, array ("title" => __('Full screen mode'))) @@ -92,22 +95,20 @@ if (!defined('METACONSOLE')) { $options['pure']['text'] = '' . html_print_image ("images/normal_screen.png", true, array ("title" => __('Back to normal mode'))) . ""; + + // 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") . " » " . $layout_name, "images/op_reporting.png", false, '', false, $options); -else - //ui_meta_print_header(__('Visual console') . " » " . $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") . " » " . $layout_name, "images/op_reporting.png", false, '', false, $options); } visual_map_print_visual_map ($id_layout);