tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-07-23 Sergio Martin <sergio.martin@artica.es> 

* include/functions_reporting.php: Few improvements
	of monitor item and top n item on the reports for
	bug #2331

	* godmode/users/user_list.php: Change the default 
	order of the user list to user id, and hide the
	useless first and second name from the view
	(this data is not editable)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8559 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-07-23 09:17:24 +00:00
parent 9f511c23d4
commit 49cc778651
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/ChangeLog
View File

@ -1,3 +1,14 @@
2013-07-23 Sergio Martin <sergio.martin@artica.es>
* include/functions_reporting.php: Few improvements
of monitor item and top n item on the reports for
bug #2331
* godmode/users/user_list.php: Change the default
order of the user list to user id, and hide the
useless first and second name from the view
(this data is not editable)
2013-07-22 Ramon Novoa <rnovoa@artica.es>
* include/help/es/help_field_match_snmp.php,

13
pandora_console/godmode/users/user_list.php
View File

@ -83,17 +83,16 @@ switch ($sortField) {
}
break;
default:
$selectUserIDUp = '';
$selectUserIDUp = $selected;
$selectUserIDDown = '';
$selectFullnameUp = $selected;
$selectFullnameUp = '';
$selectFullnameDown = '';
$selectLastConnectUp = '';
$selectLastConnectDown = '';
$order = array('field' => 'fullname', 'order' => 'ASC');
$order = array('field' => 'id_user', 'order' => 'ASC');
break;
}
$buttons[$tab]['active'] = true;
// Header
@ -312,9 +311,9 @@ foreach ($info as $user_id => $user_info) {
$data[0] = '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/configure_user&pure='.$pure.'&amp;id='.$user_id.'">'.$user_id.'</a>';
$data[1] = '<ul style="margin-top: 0 !important; margin-left: auto !important; padding-left: 10px !important; list-style-type: none !important;">';
$data[1] .= '<li>' . $user_info["fullname"] . '</li>';
$data[1] .= '<li><b>' . __('First name') . ':</b> ' . $user_info["firstname"] . '</li>';
$data[1] .= '<li><b>' . __('Last name') . ':</b> ' . $user_info["lastname"] . '</li>';
$data[1] .= '<li><b>' . __('Name') . ':</b> ' . $user_info["fullname"] . '</li>';
/*$data[1] .= '<li><b>' . __('First name') . ':</b> ' . $user_info["firstname"] . '</li>';
$data[1] .= '<li><b>' . __('Last name') . ':</b> ' . $user_info["lastname"] . '</li>';*/
$data[1] .= '<li><b>' . __('Phone') . ':</b> ' . $user_info["phone"] . '</li>';
$data[1] .= '<li><b>' . __('E-mail') . ':</b> ' . $user_info["email"] . '</li>';
$data[1] .= '</ul>';

10
pandora_console/include/functions_reporting.php
View File

@ -3557,13 +3557,13 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
else {
$monitor_value = format_numeric ($monitor_value);
}
$data[0] = '<p style="font: bold '.$sizem.'em Arial, Sans-serif; color: #000000;">';
$data[0] .= $monitor_value.' % ' . html_print_image("images/b_green.png", true, array("height" => "32", "width" => "32")) . '</p>';
$data[0] = '<p style="font: bold '.$sizem.'em Arial, Sans-serif; color: ' . COL_NORMAL . ';">';
$data[0] .= html_print_image("images/module_ok.png", true) . ' ' . __('OK') . ': ' . $monitor_value.' %</p>';
if ($monitor_value !== __('Unknown')) {
$monitor_value = format_numeric (100 - $monitor_value, 2) ;
}
$data[1] = '<p style="font: bold '.$sizem.'em Arial, Sans-serif; color: #ff0000;">';
$data[1] .= $monitor_value.' % ' . html_print_image("images/b_red.png", true, array("height" => "32", "width" => "32")) . '</p>';
$data[1] = '<p style="font: bold '.$sizem.'em Arial, Sans-serif; color: ' . COL_CRITICAL . ';">';
$data[1] .= html_print_image("images/module_critical.png", true) . ' ' .__('Not OK') . ': ' .$monitor_value.' % ' . '</p>';
array_push ($table->data, $data);
break;
@ -4950,7 +4950,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
}
reporting_header_content($mini, $content, $report, $table,
__('Top').' '.$content['top_n_value'] . '<br>' . $type_top_n);
'Top '.$content['top_n_value'] . '<br>' . $type_top_n);
$order_uptodown = $content['order_uptodown'];