tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

2010-06-06 Raul Mateos <raulofpandora@gmail.com>

Browse Source 
* 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
This commit is contained in:
raulmateos 2010-06-06 21:01:10 +00:00
parent d5f753e6c8
commit 952940c7bc
7 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/ChangeLog
View File

@ -1,3 +1,15 @@
2010-06-06 Raúl Mateos <raulofpandora@gmail.com>
* 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 <rnovoa@artica.es> 2010-06-04 Ramon Novoa <rnovoa@artica.es>
* pandora_console.spec: Fixed. Upgrading an RPM broke the installation. * pandora_console.spec: Fixed. Upgrading an RPM broke the installation.

8
pandora_console/godmode/reporting/graphs.php
View File

@ -59,20 +59,20 @@ if ($delete_graph) {
$graphs = get_user_custom_graphs (); $graphs = get_user_custom_graphs ();
if (! empty ($graphs)) { if (! empty ($graphs)) {
$table->width = '650px'; $table->width = '720px';
$tale->class = 'databox_frame'; $tale->class = 'databox_frame';
$table->align = array (); $table->align = array ();
$table->align[0] = 'center'; $table->align[0] = 'center';
$table->align[3] = 'right'; $table->align[3] = 'right';
$table->align[4] = 'center'; $table->align[4] = 'center';
$table->head = array (); $table->head = array ();
$table->head[0] = ''; $table->head[0] = __('View');
$table->head[1] = __('Graph name'); $table->head[1] = __('Graph name');
$table->head[2] = __('Description'); $table->head[2] = __('Description');
$table->head[3] = __('Number of Graphs'); $table->head[3] = __('Number of Graphs');
$table->head[4] = __('Group'); $table->head[4] = __('Group');
$table->size[0] = '20px'; $table->size[0] = '20px';
$table->size[3] = '80px'; $table->size[3] = '125px';
$table->size[4] = '50px'; $table->size[4] = '50px';
if (give_acl ($config['id_user'], 0, "AW")) { if (give_acl ($config['id_user'], 0, "AW")) {
$table->align[5] = 'center'; $table->align[5] = 'center';
@ -108,7 +108,7 @@ else {
} }
echo '<form method="post" action="index.php?sec=greporting&sec2=godmode/reporting/graph_builder">'; echo '<form method="post" action="index.php?sec=greporting&sec2=godmode/reporting/graph_builder">';
echo '<div class="action-buttons" style="width: 650px;">'; echo '<div class="action-buttons" style="width: 720px;">';
print_submit_button (__('Create graph'), 'create', false, 'class="sub next"'); print_submit_button (__('Create graph'), 'create', false, 'class="sub next"');
echo "</div>"; echo "</div>";
echo "</form>"; echo "</form>";

15
pandora_console/godmode/reporting/map_builder.php
View File

@ -99,7 +99,7 @@ if ($copy_layout) {
} }
$table->width = '500px'; $table->width = '550px';
$table->data = array (); $table->data = array ();
$table->head = array (); $table->head = array ();
$table->head[0] = __('Map name'); $table->head[0] = __('Map name');
@ -108,6 +108,8 @@ $table->head[2] = __('Items');
$table->head[3] = __('Copy'); $table->head[3] = __('Copy');
$table->head[4] = __('Delete'); $table->head[4] = __('Delete');
$table->align = array (); $table->align = array ();
$table->align[1] = 'center';
$table->align[2] = 'center';
$table->align[3] = 'center'; $table->align[3] = 'center';
$table->align[4] = 'center'; $table->align[4] = 'center';
@ -120,8 +122,7 @@ if (!$maps) {
$data = array (); $data = array ();
$data[0] = '<a href="index.php?sec=gmap&sec2=godmode/reporting/visual_console_builder&tab=data&amp;action=edit&amp;id_visual_console='.$map['id'].'">'.$map['name'].'</a>'; $data[0] = '<a href="index.php?sec=gmap&sec2=godmode/reporting/visual_console_builder&tab=data&amp;action=edit&amp;id_visual_console='.$map['id'].'">'.$map['name'].'</a>';
$data[1] = print_group_icon ($map['id_group'], true).'&nbsp;'; $data[1] = print_group_icon ($map['id_group'], true);
$data[1] .= get_group_name ($map['id_group'], true);
$data[2] = get_db_sql ("SELECT COUNT(*) FROM tlayout_data WHERE id_layout = ".$map['id']); $data[2] = get_db_sql ("SELECT COUNT(*) FROM tlayout_data WHERE id_layout = ".$map['id']);
$data[3] = '<a href="index.php?sec=gmap&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$map['id'].'&amp;copy_layout=1">'.print_image ("images/copy.png", true).'</a>'; $data[3] = '<a href="index.php?sec=gmap&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$map['id'].'&amp;copy_layout=1">'.print_image ("images/copy.png", true).'</a>';
@ -131,8 +132,12 @@ if (!$maps) {
} }
print_table ($table); print_table ($table);
} }
if (!$maps) {
echo '<div class="action-buttons" style="width: '.$table->width.'">'; echo '<div class="action-buttons" style="width: 0px;">';
}
else {
echo '<div class="action-buttons" style="width: '.$table->width.'">';
}
echo '<form action="index.php?sec=gmap&amp;sec2=godmode/reporting/visual_console_builder" method="post">'; echo '<form action="index.php?sec=gmap&amp;sec2=godmode/reporting/visual_console_builder" method="post">';
print_input_hidden ('edit_layout', 1); print_input_hidden ('edit_layout', 1);
print_submit_button (__('Create'), '', false, 'class="sub next"'); print_submit_button (__('Create'), '', false, 'class="sub next"');

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

@ -59,13 +59,14 @@ switch ($action) {
$table->head = array (); $table->head = array ();
$table->align = array (); $table->align = array ();
$table->align[2] = 'center'; $table->align[2] = 'center';
$table->align[3] = 'center';
$table->align[4] = 'center'; $table->align[4] = 'center';
$table->data = array (); $table->data = array ();
$table->head[0] = __('Report name'); $table->head[0] = __('Report name');
$table->head[1] = __('Description'); $table->head[1] = __('Description');
$table->head[2] = __('Private'); $table->head[2] = __('Private');
$table->head[3] = __('Group'); $table->head[3] = __('Group');
$table->head[4] = ''; $table->head[4] = __('Delete');
$table->size = array (); $table->size = array ();
$table->size[4] = '40px'; $table->size[4] = '40px';
@ -88,7 +89,7 @@ switch ($action) {
else else
$data[2] = __('No'); $data[2] = __('No');
$data[3] = get_group_name($report['id_group'], true); $data[3] = print_group_icon($report['id_group'], true);
$data[4] = '<form method="post" style="display:inline" onsubmit="if (!confirm (\''.__('Are you sure?').'\')) return false">'; $data[4] = '<form method="post" style="display:inline" onsubmit="if (!confirm (\''.__('Are you sure?').'\')) return false">';
$data[4] .= print_input_hidden ('id_report', $report['id_report'], true); $data[4] .= print_input_hidden ('id_report', $report['id_report'], true);
$data[4] .= print_input_hidden ('action','delete_report', true); $data[4] .= print_input_hidden ('action','delete_report', true);
@ -303,7 +304,7 @@ switch ($action) {
"; ";
break; break;
case 'type': 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; break;
} }
$sql = sprintf($sql, 'id_report = ' . $idReport, '%s'); $sql = sprintf($sql, 'id_report = ' . $idReport, '%s');

10
pandora_console/godmode/reporting/visual_console_builder.editor.php
View File

@ -1,7 +1,7 @@
<?php <?php
// Pandora FMS - http://pandorafms.com // Pandora FMS - http://pandorafms.com
// ================================================== // ==================================================
// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas // Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list // Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
@ -159,16 +159,16 @@ echo '<div id="properties_panel" style="display: none; position: absolute; borde
<tr id="button_update_row" class="datos"> <tr id="button_update_row" class="datos">
<td colspan="2" style="text-align: right;"> <td colspan="2" style="text-align: right;">
<?php <?php
print_button(__('Cancel'), 'cancel_button', false, 'cancelAction();', 'class="sub"'); print_button(__('Cancel'), 'cancel_button', false, 'cancelAction();', 'class="sub cancel"');
print_button(__('Update'), 'update_button', false, 'updateAction();', 'class="sub"'); print_button(__('Update'), 'update_button', false, 'updateAction();', 'class="sub upd"');
?> ?>
</td> </td>
</tr> </tr>
<tr id="button_create_row" class="datos"> <tr id="button_create_row" class="datos">
<td colspan="2" style="text-align: right;"> <td colspan="2" style="text-align: right;">
<?php <?php
print_button(__('Cancel'), 'cancel_button', false, 'cancelAction();', 'class="sub"'); print_button(__('Cancel'), 'cancel_button', false, 'cancelAction();', 'class="sub cancel"');
print_button(__('Create'), 'create_button', false, 'createAction();', 'class="create sub"'); print_button(__('Create'), 'create_button', false, 'createAction();', 'class="sub wand"');
?> ?>
</td> </td>
</tr> </tr>

BIN
pandora_console/images/cancel.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 587 B

5
pandora_console/include/styles/pandora.css
View File

@ -281,7 +281,7 @@ input.sub[disabled] {
input.next, input.upd, input.ok, input.wand, input.delete, input.search, input.next, input.upd, input.ok, input.wand, input.delete, input.search,
input.copy, input.add, input.graph, input.percentile, input.binary, input.copy, input.add, input.graph, input.percentile, input.binary,
input.camera, input.config { input.camera, input.config, input.cancel {
padding-right: 21px; padding-right: 21px;
} }
input.next { input.next {
@ -323,6 +323,9 @@ input.camera {
input.config { input.config {
background: #e5e5e5 url(../../images/config.png) no-repeat right 3px; background: #e5e5e5 url(../../images/config.png) no-repeat right 3px;
} }
input.cancel {
background: #e5e5e5 url(../../images/cancel.png) no-repeat right 3px;
}
table, img { table, img {
border: 0px; border: 0px;
} }