tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 08:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

2012-05-03 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* include/styles/pandora.css: fixed ".is_submenu2 li" because there
	is not ":".
	
	* include/functions_reporting.php: cleaned source code style.
	
	* godmode/reporting/reporting_builder.php: removed a PHP notice
	message about a uninicialized var.
	
	* godmode/reporting/graphs.php: fixed lost icon in the header bar
	in this page.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6248 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-05-03 13:57:55 +00:00
parent a9281ed51f
commit a64560c081
5 changed files with 61 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandora_console/ChangeLog
View File

@ -1,3 +1,18 @@
2012-05-03 Miguel de Dios <miguel.dedios@artica.es>
* include/styles/pandora.css: fixed ".is_submenu2 li" because there
is not ":".
* include/functions_reporting.php: cleaned source code style.
* godmode/reporting/reporting_builder.php: removed a PHP notice
message about a uninicialized var.
* godmode/reporting/graphs.php: fixed lost icon in the header bar
in this page.
MERGED FROM 4.0.2
2012-05-03 Miguel de Dios <miguel.dedios@artica.es>
* include/styles/menu.css: fixed bad colour name "#grey" for correct

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

@ -65,7 +65,7 @@ $id = (int) get_parameter ('id');
$multiple_delete = (bool)get_parameter('multiple_delete', 0);
// Header
ui_print_page_header (__('Reporting')." &raquo; ".__('Custom graphs'), "images/reporting", false, "", false, $buttons);
ui_print_page_header (__('Reporting')." &raquo; ".__('Custom graphs'), "images/reporting.png", false, "", false, $buttons);
// Delete module SQL code
if ($delete_graph) {
@ -82,7 +82,8 @@ if ($delete_graph) {
if ($result) {
db_pandora_audit("Report management", "Delete graph #$id");
$result = "<h3 class=suc>".__('Successfully deleted')."</h3>";
} else {
}
else {
db_pandora_audit("Report management", "Fail try to delete graph #$id");
$result = "<h3 class=error>".__('Not deleted. Error deleting data')."</h3>";
}

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

@ -427,10 +427,13 @@ switch ($action) {
$values['id_agent'] = get_parameter('id_agent');
$values['id_gs'] = get_parameter('id_custom_graph');
if (($type == 'alert_report_agent') or ($type == 'event_report_agent'))
$values['id_agent_module'] = '';
else
$values['id_agent_module'] = get_parameter('id_agent_module');
$values['id_agent_module'] = '';
if (isset($type)) {
if (($type == 'alert_report_agent') or ($type == 'event_report_agent'))
$values['id_agent_module'] = '';
else
$values['id_agent_module'] = get_parameter('id_agent_module');
}
$values['only_display_wrong'] = get_parameter('checkbox_only_display_wrong');
$values['monday'] = get_parameter('monday', 0);
$values['tuesday'] = get_parameter('tuesday', 0);

1
pandora_console/include/functions_reporting.php
View File

@ -3489,6 +3489,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$i++;
$x++;
}
foreach ($agent_list as $a) {
$data = array();
$data[0] = $a;

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

@ -1611,7 +1611,7 @@ td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yel
}
.menu li.selected {
background-color: #B1B1B1 !important;
background-color: #B1B1B1 !important;
}
.menu li {
@ -1619,7 +1619,7 @@ td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yel
}
.submenu li a{
background-color: #E4E4E4 !important;
background-color: #E4E4E4 !important;
}
.menu li a:hover,
@ -1628,11 +1628,11 @@ td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yel
}
.is_submenu2 li {
background-color #ff0000;
background-color: #ff0000;
}
.is_submenu2 {
background-color: #222222 !important;
background-color: #222222 !important;
}
.menu li.submenu_selected a {
@ -1659,5 +1659,5 @@ td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yel
input#text-id_parent.ac_input, input, textarea, select {
background-color: #ffffff !important;
border: 1px solid #cbcbcb;
}
}