From 93bd2f59d62c786789078d984c6d3364fd68190a Mon Sep 17 00:00:00 2001 From: raulmateos Date: Sun, 6 Jun 2010 21:01:10 +0000 Subject: [PATCH] 2010-06-06 Raul Mateos * godmode/reporting/reporting_builder.php, godmode/reporting/graphs.php, godmode/reporting/map_builder.php: Better table headers and table size. * godmode/reporting/reporting/visual_console_builder.editor.php: Added nice icons to buttons. * images/cancel.php: New icon file. * include/styles/pandora.css: New cancel input style. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2860 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 12 ++++++++++++ pandora_console/godmode/reporting/graphs.php | 8 ++++---- .../godmode/reporting/map_builder.php | 15 ++++++++++----- .../godmode/reporting/reporting_builder.php | 7 ++++--- .../reporting/visual_console_builder.editor.php | 12 ++++++------ pandora_console/images/cancel.png | Bin 0 -> 587 bytes pandora_console/include/styles/pandora.css | 5 ++++- 7 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 pandora_console/images/cancel.png diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 511e0beb4b..4317abcd07 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,15 @@ +2010-06-06 Raúl Mateos + + * godmode/reporting/reporting_builder.php, godmode/reporting/graphs.php, + godmode/reporting/map_builder.php: Better table headers and table size. + + * godmode/reporting/reporting/visual_console_builder.editor.php: Added + nice icons to buttons. + + * images/cancel.php: New icon file. + + * include/styles/pandora.css: New cancel input style. + 2010-06-04 Ramon Novoa * pandora_console.spec: Fixed. Upgrading an RPM broke the installation. diff --git a/pandora_console/godmode/reporting/graphs.php b/pandora_console/godmode/reporting/graphs.php index 88f530c77b..935904edff 100644 --- a/pandora_console/godmode/reporting/graphs.php +++ b/pandora_console/godmode/reporting/graphs.php @@ -59,20 +59,20 @@ if ($delete_graph) { $graphs = get_user_custom_graphs (); if (! empty ($graphs)) { - $table->width = '650px'; + $table->width = '720px'; $tale->class = 'databox_frame'; $table->align = array (); $table->align[0] = 'center'; $table->align[3] = 'right'; $table->align[4] = 'center'; $table->head = array (); - $table->head[0] = ''; + $table->head[0] = __('View'); $table->head[1] = __('Graph name'); $table->head[2] = __('Description'); $table->head[3] = __('Number of Graphs'); $table->head[4] = __('Group'); $table->size[0] = '20px'; - $table->size[3] = '80px'; + $table->size[3] = '125px'; $table->size[4] = '50px'; if (give_acl ($config['id_user'], 0, "AW")) { $table->align[5] = 'center'; @@ -108,7 +108,7 @@ else { } echo '
'; -echo '
'; +echo '
'; print_submit_button (__('Create graph'), 'create', false, 'class="sub next"'); echo "
"; echo ""; diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php index ea2d671d00..fc71571921 100644 --- a/pandora_console/godmode/reporting/map_builder.php +++ b/pandora_console/godmode/reporting/map_builder.php @@ -99,7 +99,7 @@ if ($copy_layout) { } -$table->width = '500px'; +$table->width = '550px'; $table->data = array (); $table->head = array (); $table->head[0] = __('Map name'); @@ -108,6 +108,8 @@ $table->head[2] = __('Items'); $table->head[3] = __('Copy'); $table->head[4] = __('Delete'); $table->align = array (); +$table->align[1] = 'center'; +$table->align[2] = 'center'; $table->align[3] = 'center'; $table->align[4] = 'center'; @@ -120,8 +122,7 @@ if (!$maps) { $data = array (); $data[0] = ''.$map['name'].''; - $data[1] = print_group_icon ($map['id_group'], true).' '; - $data[1] .= get_group_name ($map['id_group'], true); + $data[1] = print_group_icon ($map['id_group'], true); $data[2] = get_db_sql ("SELECT COUNT(*) FROM tlayout_data WHERE id_layout = ".$map['id']); $data[3] = ''.print_image ("images/copy.png", true).''; @@ -131,8 +132,12 @@ if (!$maps) { } print_table ($table); } - -echo '
'; +if (!$maps) { + echo '
'; +} +else { + echo '
'; +} echo '
'; print_input_hidden ('edit_layout', 1); print_submit_button (__('Create'), '', false, 'class="sub next"'); diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 92d4d5ef36..333f377ee3 100644 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -59,13 +59,14 @@ switch ($action) { $table->head = array (); $table->align = array (); $table->align[2] = 'center'; + $table->align[3] = 'center'; $table->align[4] = 'center'; $table->data = array (); $table->head[0] = __('Report name'); $table->head[1] = __('Description'); $table->head[2] = __('Private'); $table->head[3] = __('Group'); - $table->head[4] = ''; + $table->head[4] = __('Delete'); $table->size = array (); $table->size[4] = '40px'; @@ -88,7 +89,7 @@ switch ($action) { else $data[2] = __('No'); - $data[3] = get_group_name($report['id_group'], true); + $data[3] = print_group_icon($report['id_group'], true); $data[4] = ''; $data[4] .= print_input_hidden ('id_report', $report['id_report'], true); $data[4] .= print_input_hidden ('action','delete_report', true); @@ -303,7 +304,7 @@ switch ($action) { "; break; case 'type': - $sql = "SELECT id_rc FROM treport_content WHERE %s ORDER BY type %s"; + $sql = "SELECT id_rc FROM treport_content WHERE %s ORDER BY type %s"; break; } $sql = sprintf($sql, 'id_report = ' . $idReport, '%s'); diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.php b/pandora_console/godmode/reporting/visual_console_builder.editor.php index 23895e856b..c71aedd90f 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.php +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.php @@ -1,7 +1,7 @@ @@ -259,4 +259,4 @@ require_javascript_file('visual_console_builder.editor', 'godmode/reporting/'); \ No newline at end of file + diff --git a/pandora_console/images/cancel.png b/pandora_console/images/cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..c149c2bc017d5ce5a8ae9330dd7dbd012482e0f4 GIT binary patch literal 587 zcmV-R0<`^!P)FS^-G}e*;M)Q6>s#cP zI`Y#S($G6W`W@NI5g|L-MKl0Zmu$m^(0~^Lwo5OO~d#(vPfz