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

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

* include/styles/pandora.css: Added a overflow hidden
	in left informative tab of pandoras interface to avoid
	ugly visual errors.

	* godmode/reporting/reporting_builder.list_items.php
	godmode/reporting/reporting_builder.item_editor.php: Change Avg
	strings by Rate strings in top N reports for incident #211



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8865 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-10-07 13:31:37 +00:00
parent cca2148e37
commit 84154e9619
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2013-10-07 Sergio Martin <sergio.martin@artica.es>
* include/styles/pandora.css: Added a overflow hidden
in left informative tab of pandoras interface to avoid
ugly visual errors.
* godmode/reporting/reporting_builder.list_items.php
godmode/reporting/reporting_builder.item_editor.php: Change Avg
strings by Rate strings in top N reports for incident #211
2013-10-07 Miguel de Dios <miguel.dedios@artica.es>
* godmode/massive/massive_delete_alerts.php,

14
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -1197,6 +1197,11 @@ function print_General_list($width, $action, $idItem = null) {
if (!isset($meta))
$meta = false;
$operation = array(
'avg' => __('rate'),
'max' => __('max'),
'min' => __('min'),
'sum' => __('sum'));
include_once($config['homedir'] . '/include/functions_html.php');
?>
@ -1248,7 +1253,7 @@ function print_General_list($width, $action, $idItem = null) {
echo '<tr id="general_' . $item['id'] . '" style="" class="datos">
<td>' . printSmallFont($nameAgent) . $server_name_element . '</td>
<td>' . printSmallFont($nameModule) . '</td>
<td>' . printSmallFont($item['operation']) . '</td>
<td>' . printSmallFont($operation[$item['operation']]) . '</td>
<td style="text-align: center;">
<a href="javascript: deleteGeneralRow(' . $item['id'] . ');">' . html_print_image("images/cross.png", true) . '</a>
</td>
@ -1292,13 +1297,6 @@ function print_General_list($width, $action, $idItem = null) {
?>
</td>
<td><select id="id_agent_module_general" name="id_agente_modulo_general" disabled="disabled" style="max-width: 180px"><option value="0"><?php echo __('Select an Agent first'); ?></option></select></td>
<?php
$operation = array(
'avg' => __('rate'),
'max' => __('max'),
'min' => __('min'),
'sum' => __('sum'));
?>
<td><?php html_print_select ($operation, 'id_operation_module_general', 0, false, '', '', false, false, true, 'width: 200px', false); ?></td>
<td style="text-align: center;"><a href="javascript: addGeneralRow();"><?php html_print_image("images/disk.png", false); ?></a></td>
</tr>

5
pandora_console/godmode/reporting/reporting_builder.list_items.php
View File

@ -237,7 +237,7 @@ if ($items) {
$table->size[0] = '5px';
$table->size[1] = '15%';
$table->size[4] = '8%';
$table->size[6] = '60px';
$table->size[6] = '90px';
$table->size[7] = '30px';
$table->head[0] = '<span title="' . __('Position') . '">' . __('P.') . '</span>';
@ -383,8 +383,9 @@ foreach ($items as $item) {
if (check_acl ($config['id_user'], $item['id_group'], "RM")) {
$row[6] .= '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=item_editor&action=edit&id_report=' . $idReport . '&id_item=' . $item['id_rc'] . '">' . html_print_image("images/wrench_orange.png", true, array("title" => __('Edit'))) . '</a>';
$row[6] .= '&nbsp;&nbsp;';
$row[6] .= '&nbsp;';
$row[6] .= '<a onClick="if (!confirm (\'Are you sure?\')) return false;" href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=delete&id_report=' . $idReport . '&id_item=' . $item['id_rc'] . $urlFilter . '">' . html_print_image("images/cross.png", true, array("title" => __('Delete'))) .'</a>';
$row[6] .= '&nbsp;';
$row[6] .= html_print_checkbox_extended ('delete_multiple[]', $item['id_rc'], false, false, '', 'class="check_delete"', true);
}
$row[7] = '';

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

@ -1400,6 +1400,7 @@ div.title_line {
-webkit-border-top-left-radius: 5px;
border-top-left-radius: 5px;
margin-left:0px;
overflow-y: hidden;
}
#menu_tab_left ul.mn li.nomn {