From 319f1d769aa0bb38f0cfe4baf6dde615fa5cd15d Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Thu, 18 Jul 2013 09:50:35 +0000 Subject: [PATCH] 2013-07-18 Sergio Martin * operation/reporting/reporting_viewer.php images/report_list.png godmode/events/event_edit_filter.php godmode/reporting/reporting_builder.php: Fix the manage tabs wich appeared in the view report section even when the user hasnt RW permissions for bug #2347 Added some new buttons and icon to make more usable the reports section git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8544 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 11 +++++++ .../godmode/events/event_edit_filter.php | 2 +- .../godmode/reporting/reporting_builder.php | 4 +-- pandora_console/images/report_list.png | Bin 0 -> 1384 bytes .../operation/reporting/reporting_viewer.php | 29 ++++++++++++------ 5 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 pandora_console/images/report_list.png diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 8be490bc0c..a82ca64233 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,14 @@ +2013-07-18 Sergio Martin + + * operation/reporting/reporting_viewer.php + images/report_list.png + godmode/events/event_edit_filter.php + godmode/reporting/reporting_builder.php: Fix the manage + tabs wich appeared in the view report section even when + the user hasnt RW permissions for bug #2347 + Added some new buttons and icon to make more usable the + reports section + 2013-07-18 Sergio Martin * include/functions_events.php: Fixed the access to the diff --git a/pandora_console/godmode/events/event_edit_filter.php b/pandora_console/godmode/events/event_edit_filter.php index ad91d97ee2..d07526808f 100644 --- a/pandora_console/godmode/events/event_edit_filter.php +++ b/pandora_console/godmode/events/event_edit_filter.php @@ -153,7 +153,7 @@ $table->width = '98%'; $table->border = 0; $table->cellspacing = 3; $table->cellpadding = 5; -$table->class = "databox_color"; +$table->class = "databox"; $table->style[0] = 'vertical-align: top;'; $table->valign[1] = 'top'; diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 0b11834693..8c52c261ff 100644 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -233,7 +233,7 @@ switch ($action) { $buttons = array( 'list_reports' => array('active' => false, 'text' => '' . - html_print_image("images/op_reporting.png", true, array ("title" => __('Main'))) .'') + html_print_image("images/report_list.png", true, array ("title" => __('Reports list'))) .'') ); if ($enterpriseEnable) { @@ -1352,7 +1352,7 @@ switch ($action) { $buttons = array( 'list_reports' => 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" => __('Reports list'))) .'') ); $buttons = reporting_enterprise_add_main_Tabs($buttons); diff --git a/pandora_console/images/report_list.png b/pandora_console/images/report_list.png new file mode 100644 index 0000000000000000000000000000000000000000..110565701cea3dfc5057b4bcedfe24d12de466a7 GIT binary patch literal 1384 zcmbVMZA=?w9DhoYZrI|sY%2KncpZxx>AldmJLu@kwX{mRrqs#IFkG((z0uy??v7E& z;#wVMY$Rf~uzfL^(`-bhfkjOgO6e{mQR_#*SSy!V7 zT!pCJ9%L=3wrCs%M45vQ8&=0+P8>SzHr$SpcJft7U^s^21d6%paEx-eC=7?|52AUK z)16d;4z2srBoC5NRf$5;-rinYZ@o>FyHK1YNfaYcf~eCFbxNP0GWj||v6d{*oWjby zr1GKwb&E_&>`^_47U^0FIVl?5Ff1tRh0;of<{1gaZ5W!%>3OZ96*a;A6UL@!CD|u& zXo6G39+}np(P=G_wc0(}kq*?Nq4vqV))Xd7i)>Gh6VwRpL9{=%G@qt0ha1CjmmPBv znA45pZl9A51ziLg^y73rj+Ja|%5{=BPB@)GmoJ3lLBi)GT%mfxPdIUhi^RwhHzFu1 zBd}b_FR%Mu<2oM6r2;a?sG^({#cXK;;u%pDm5eCCK&!)s!zjb@g09gUw3aW;$@~#6 z9g@WyT&*z0Zx#XZ-^>F6IzR-lpwI27N7lLN|5G(o3kKE4<6q-aQfV`&A2)_y6E@a| z6SSR?wdL4R-hgQPITE3L$^7lqUn?t3Ml{D1O_S>O*g$H zydNrn)V28goy6?5m2ly)NQ2p3cDT_C@Oh&0)4NU9*#XJwd!_oo@J9n?Z>ZRFe(w7B z$EW@@O85M4JmqiS4R#o}z;k2c4VJm=iJp$1k;fOOFU)M8YM<$t?l!hOPvgvo^w!kq zywUraq1Gl{eTI}Kn)e#OHt+84!oaO#{@8ncHBY`~$@@nQBz<7mz4iRkz{Pi7{Bh^& zcKAzVVdCVT{U4xL=gqaLR)q)0!Jy?2yVZ7TW)2ua@>|F**nIt1 z#vl!wmBr$$;q!x&HKV5Dp_-0b%l11Ux$H|FEj-Jb!sEvmp#SAg@7sHBnM~oY!JNr^ zb7vu0R<&FepPv2XUOmisW0%IiyzOoIc+mK*Y1duv(HBN8PK->Z!SFt`fQ`ny=;?DW zVN2lhh2s7$daBrX`9X78MZD&>8&AwEJvcG8FxgeK8osKSy+I$$UKx8XVE`wk_J_Y_ Rg@^jx7YWAbFZ>' . - html_print_image("images/op_reporting.png", true, array ("title" => __('Main data'))) .''; +if (check_acl ($config['id_user'], 0, "RW")) { + $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['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'))) .''; + $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); + 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'))) .''); +$options['list_reports'] = array('active' => false, + 'text' => '' . + html_print_image("images/report_list.png", true, array ("title" => __('Report list'))) .''); + if (!defined('METACONSOLE')) { if ($config["pure"] == 0) { $options['screen']['text'] = "" @@ -118,7 +123,7 @@ if ($enable_init_date) { } $table->id = 'controls_table'; -$table->width = '99%'; +$table->width = '98%'; $table->class = 'databox'; $table->style = array (); $table->style[0] = 'width: 60px;'; @@ -167,6 +172,8 @@ $table->data[1][2] .= html_print_input_text ('date', $date, '', 12, 10, true). ' $table->data[1][2] .= html_print_input_text ('time', $time, '', 10, 7, true). ' '; $table->data[1][2] .= html_print_submit_button (__('Update'), 'date_submit', false, 'class="sub next"', true); +enterprise_hook('open_meta_frame'); + echo '
'; html_print_table ($table); html_print_input_hidden ('id_report', $id_report); @@ -320,4 +327,6 @@ foreach ($contents as $content) { flush (); } + +enterprise_hook('close_meta_frame'); ?>