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

Changed visual of metaconsole

Browse Source
This commit is contained in:
m-lopez-f 2015-03-09 16:33:27 +01:00
parent d2accaae68
commit e38f31caaa
9 changed files with 248 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/godmode/alerts/configure_alert_command.php
View File

@ -41,7 +41,6 @@ else
ui_print_page_header (__('Alerts') . ' » ' . ui_print_page_header (__('Alerts') . ' » ' .
__('Configure alert command'), "images/gm_alerts.png", false, "alerts_config", true); __('Configure alert command'), "images/gm_alerts.png", false, "alerts_config", true);
enterprise_hook('open_meta_frame');
if ($update_command) { if ($update_command) {
$id = (int) get_parameter ('id'); $id = (int) get_parameter ('id');

94
pandora_console/godmode/events/event_edit_filter.php
View File

@ -158,11 +158,19 @@ $table->style[0] = 'vertical-align: top;';
$table->valign[1] = 'top'; $table->valign[1] = 'top';
if (defined('METACONSOLE')){ if (defined('METACONSOLE')){
echo '<div class="title_tactical">' . __('Create Filter') . '</div>';
$table->width = '100%'; $table->width = '100%';
$table->border = 0; $table->border = 0;
$table->cellspacing = 3; $table->cellspacing = 3;
$table->cellpadding = 5; $table->cellpadding = 5;
if ($id) {
$table->head[0] = __('Update Filter');
}
else {
$table->head[0] = __('Create Filter');
}
$table->head_colspan[0] = 4;
$table->headstyle[0] = 'text-align: center';
$table->class = "databox data"; $table->class = "databox data";
$table->style[0] = ''; $table->style[0] = '';
$table->valign[1] = ''; $table->valign[1] = '';
@ -276,39 +284,67 @@ $remove_with_tag_disabled = empty($tag_with_temp);
$add_without_tag_disabled = empty($tags_select_without); $add_without_tag_disabled = empty($tags_select_without);
$remove_without_tag_disabled = empty($tag_without_temp); $remove_without_tag_disabled = empty($tag_without_temp);
$table->colspan[13][0] = '2';
$table->data[13][0] = '<b>' . __('Events with following tags') . '</b>';
$table->data[14][0] = html_print_select ($tags_select_with, 'select_with',
'', '', '', 0, true, false, true, '', false, 'width: 120px;');
$table->data[14][1] = html_print_button(__('Add'), 'add_whith', $add_with_tag_disabled,
'', 'class="add sub"', true);
$table->data[15][0] = html_print_select ($tag_with_temp, if (defined("METACONSOLE")){
'tag_with_temp', array(), '', '', 0, true, true,
true, '', false, "width: 120px; height: 50px;"); $table->data[13][0] = '<b>' . __('Events with following tags') . '</b>';
$table->data[15][0] .= html_print_input_hidden('tag_with', $table->data[13][0] .= '<br>' . html_print_select ($tags_select_with, 'select_with',
$tag_with_base64, true); '', '', '', 0, true, false, true, '', false, 'width: 120px;');
$table->data[15][1] = html_print_button(__('Remove'), $table->data[13][0] .= '&nbsp;' . html_print_button(__('Add'), 'add_whith', $add_with_tag_disabled,
'remove_whith', $remove_with_tag_disabled, '', 'class="delete sub"', true); '', 'class="add sub"', true);
$table->data[13][0] .= '<br>' . html_print_select ($tag_with_temp,
'tag_with_temp', array(), '', '', 0, true, true,
true, '', false, "width: 120px; height: 50px;");
$table->data[13][0] .= '&nbsp;' . html_print_button(__('Remove'),
'remove_whith', $remove_with_tag_disabled, '', 'class="delete sub"', true);
$table->data[13][0] .= html_print_input_hidden('tag_with',
$tag_with_base64, true);
$table->data[13][1] = '<b>' . __('Events without following tags') . '</b>';
$table->data[13][1] .= '<br>' . html_print_select ($tags_select_without, 'select_without',
'', '', '', 0, true, false, true, '', false, 'width: 120px;');
$table->data[13][1] .= '&nbsp;' . html_print_button(__('Add'), 'add_whithout', $add_without_tag_disabled,
'', 'class="add sub"', true);
$table->data[13][1] .= '<br>' . html_print_select ($tag_without_temp,
'tag_without_temp', array(), '', '', 0, true, true,
true, '', false, "width: 120px; height: 50px;");
$table->data[13][1] .= '&nbsp;' . html_print_button(__('Remove'), 'remove_whithout', $remove_without_tag_disabled,
'', 'class="delete sub"', true);
$table->data[13][1] .= html_print_input_hidden('tag_without',
$tag_without_base64, true);
}
else{
$table->colspan[13][0] = '2';
$table->data[13][0] = '<b>' . __('Events with following tags') . '</b>';
$table->data[14][0] = html_print_select ($tags_select_with, 'select_with',
'', '', '', 0, true, false, true, '', false, 'width: 120px;');
$table->data[14][1] = html_print_button(__('Add'), 'add_whith', $add_with_tag_disabled,
'', 'class="add sub"', true);
$table->data[15][0] = html_print_select ($tag_with_temp,
'tag_with_temp', array(), '', '', 0, true, true,
true, '', false, "width: 120px; height: 50px;");
$table->data[15][0] .= html_print_input_hidden('tag_with',
$tag_with_base64, true);
$table->data[15][1] = html_print_button(__('Remove'),
'remove_whith', $remove_with_tag_disabled, '', 'class="delete sub"', true);
$table->colspan[16][0] = '2'; $table->colspan[16][0] = '2';
$table->data[16][0] = '<b>' . __('Events without following tags') . '</b>'; $table->data[16][0] = '<b>' . __('Events without following tags') . '</b>';
$table->data[17][0] = html_print_select ($tags_select_without, 'select_without', $table->data[17][0] = html_print_select ($tags_select_without, 'select_without',
'', '', '', 0, true, false, true, '', false, 'width: 120px;'); '', '', '', 0, true, false, true, '', false, 'width: 120px;');
$table->data[17][1] = html_print_button(__('Add'), 'add_whithout', $add_without_tag_disabled, $table->data[17][1] = html_print_button(__('Add'), 'add_whithout', $add_without_tag_disabled,
'', 'class="add sub"', true); '', 'class="add sub"', true);
$table->data[18][0] = html_print_select ($tag_without_temp,
'tag_without_temp', array(), '', '', 0, true, true,
true, '', false, "width: 120px; height: 50px;");
$table->data[18][0] .= html_print_input_hidden('tag_without',
$tag_without_base64, true);
$table->data[18][1] = html_print_button(__('Remove'), 'remove_whithout', $remove_without_tag_disabled,
'', 'class="delete sub"', true);
$table->data[18][0] = html_print_select ($tag_without_temp,
'tag_without_temp', array(), '', '', 0, true, true,
true, '', false, "width: 120px; height: 50px;");
$table->data[18][0] .= html_print_input_hidden('tag_without',
$tag_without_base64, true);
$table->data[18][1] = html_print_button(__('Remove'), 'remove_whithout', $remove_without_tag_disabled,
'', 'class="delete sub"', true);
}
$table->data[19][0] = '<b>' . __('Alert events') . '</b>'; $table->data[19][0] = '<b>' . __('Alert events') . '</b>';
$table->data[19][1] = html_print_select( $table->data[19][1] = html_print_select(

15
pandora_console/godmode/events/event_filter.php
View File

@ -86,7 +86,7 @@ if ($filters === false)
$table->width = '98%'; $table->width = '98%';
if(defined("METACONSOLE")) if(defined("METACONSOLE"))
$table->width = '98%'; $table->width = '100%';
$table->head = array (); $table->head = array ();
$table->head[0] = __('Name'); $table->head[0] = __('Name');
$table->head[1] = __('Filter group'); $table->head[1] = __('Filter group');
@ -100,7 +100,8 @@ $table->style[0] = 'font-weight: bold';
$table->align = array (); $table->align = array ();
$table->align[1] = 'center'; $table->align[1] = 'center';
$table->align[2] = 'center'; $table->align[2] = 'center';
$table->align[3] = 'center'; if(!defined("METACONSOLE"))
$table->align[3] = 'center';
$table->align[4] = 'center'; $table->align[4] = 'center';
$table->align[5] = 'center'; $table->align[5] = 'center';
$table->size = array (); $table->size = array ();
@ -137,7 +138,10 @@ if (isset($data)) {
echo "<form method='post' action='index.php?sec=geventos&sec2=godmode/events/events&amp;pure=".$config['pure']."'>"; echo "<form method='post' action='index.php?sec=geventos&sec2=godmode/events/events&amp;pure=".$config['pure']."'>";
html_print_input_hidden('multiple_delete', 1); html_print_input_hidden('multiple_delete', 1);
html_print_table ($table); html_print_table ($table);
echo "<div style='padding-bottom: 20px; text-align: right; width:" . $table->width . "'>"; if(!defined("METACONSOLE"))
echo "<div style='padding-bottom: 20px; text-align: right; width:100%;'>";
else
echo "<div style='text-align: right; width:100%;'>";
html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"'); html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
echo "</div>"; echo "</div>";
echo "</form>"; echo "</form>";
@ -148,7 +152,10 @@ else {
} }
echo '<form method="post" action="index.php?sec=geventos&sec2=godmode/events/events&section=edit_filter&amp;pure='.$config['pure'].'">'; echo '<form method="post" action="index.php?sec=geventos&sec2=godmode/events/events&section=edit_filter&amp;pure='.$config['pure'].'">';
echo "<div style='padding-bottom: 20px; text-align: right; width:" . $table->width . "'>"; if(!defined("METACONSOLE"))
echo "<div style='padding-bottom: 20px; text-align: right; width:100%;'>";
else
echo "<div style='text-align: right; width:100%;'>";
html_print_submit_button (__('Create filter'), 'crt', false, 'class="sub wand"'); html_print_submit_button (__('Create filter'), 'crt', false, 'class="sub wand"');
echo "</div>"; echo "</div>";
echo '</form>'; echo '</form>';

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

@ -515,7 +515,7 @@ else
echo "<thead> echo "<thead>
<tr> <tr>
<th align=center colspan=5> <th align=center colspan=5>
" . __('Wizard') . " " . __('Item Editor') . "
</th> </th>
</tr> </tr>
</thead>"; </thead>";
@ -1140,6 +1140,8 @@ else
</tr> </tr>
</tbody> </tbody>
</table> </table>
<br />
<br />
<?php <?php
print_SLA_list('95%', $action, $idItem); print_SLA_list('95%', $action, $idItem);
print_General_list('95%', $action, $idItem); print_General_list('95%', $action, $idItem);
@ -1220,17 +1222,17 @@ function print_SLA_list($width, $action, $idItem = null) {
$server_name_element = ''; $server_name_element = '';
if ($meta && $server_name != '') if ($meta && $server_name != '')
$server_name_element .= ' (' . $server_name . ')'; $server_name_element .= ' (' . $server_name . ')';
echo '<tr id="sla_' . $item['id'] . '" style="" class="datos">'; echo '<tr id="sla_' . $item['id'] . '" style="" class="datos">';
echo '<td class="sla_list_agent_col">' . printSmallFont($nameAgent) . $server_name_element . '</td>'; echo '<td class="sla_list_agent_col">' . printSmallFont($nameAgent) . $server_name_element . '</td>';
echo '<td class="sla_list_module_col">' . printSmallFont($nameModule) . '</td>'; echo '<td class="sla_list_module_col">' . printSmallFont($nameModule) . '</td>';
if (enterprise_installed() && $report_item_type == 'SLA_services') { if (enterprise_installed() && $report_item_type == 'SLA_services') {
enterprise_include_once("include/functions_services.php"); enterprise_include_once("include/functions_services.php");
$nameService = enterprise_hook('services_get_name', array($item['id_agent_module'])); $nameService = enterprise_hook('services_get_name', array($item['id_agent_module']));
echo '<td class="sla_list_service_col">' . printSmallFont($nameService) . '</th>'; echo '<td class="sla_list_service_col">' . printSmallFont($nameService) . '</th>';
} }
echo '<td class="sla_list_sla_min_col">' . $item['sla_min'] . '</td>'; echo '<td class="sla_list_sla_min_col">' . $item['sla_min'] . '</td>';
echo '<td class="sla_list_sla_max_col">' . $item['sla_max'] . '</td>'; echo '<td class="sla_list_sla_max_col">' . $item['sla_max'] . '</td>';
echo '<td class="sla_list_sla_limit_col">' . $item['sla_limit'] . '</td>'; echo '<td class="sla_list_sla_limit_col">' . $item['sla_limit'] . '</td>';
@ -1458,8 +1460,7 @@ $(document).ready (function () {
minuteText: '<?php echo __('Minute');?>', minuteText: '<?php echo __('Minute');?>',
secondText: '<?php echo __('Second');?>', secondText: '<?php echo __('Second');?>',
currentText: '<?php echo __('Now');?>', currentText: '<?php echo __('Now');?>',
closeText: '<?php echo __('Close');?>' closeText: '<?php echo __('Close');?>'});
});
}); });
function create_custom_graph() { function create_custom_graph() {
@ -1698,13 +1699,13 @@ function addSLARow() {
var slaMin = $("input[name=sla_min]").val(); var slaMin = $("input[name=sla_min]").val();
var slaMax = $("input[name=sla_max]").val(); var slaMax = $("input[name=sla_max]").val();
var slaLimit = $("input[name=sla_limit]").val(); var slaLimit = $("input[name=sla_limit]").val();
var serviceId = $("select#id_service>option:selected").val(); var serviceId = $("select#id_service>option:selected").val();
var serviceName = $("select#id_service>option:selected").text(); var serviceName = $("select#id_service>option:selected").text();
if (((idAgent != '') && (slaMin != '') && (slaMax != '') if (((idAgent != '') && (slaMin != '') && (slaMax != '')
&& (slaLimit != '')) || serviceId != '') { && (slaLimit != '')) || serviceId != '') {
if (nameAgent != '') { if (nameAgent != '') {
//Truncate nameAgent //Truncate nameAgent
var params = []; var params = [];
@ -1721,7 +1722,7 @@ function addSLARow() {
nameAgent = data; nameAgent = data;
} }
}); });
//Truncate nameModule //Truncate nameModule
var params = []; var params = [];
params.push("truncate_text=1"); params.push("truncate_text=1");
@ -1747,7 +1748,7 @@ function addSLARow() {
params.push("sla_max=" + slaMax); params.push("sla_max=" + slaMax);
params.push("sla_limit=" + slaLimit); params.push("sla_limit=" + slaLimit);
params.push("server_id=" + serverId); params.push("server_id=" + serverId);
if (serviceId != '') { if (serviceId != '') {
params.push("id_service=" + serviceId); params.push("id_service=" + serviceId);
} }
@ -2023,7 +2024,7 @@ function chooseType() {
$("#row_only_display_wrong").show(); $("#row_only_display_wrong").show();
$("#row_working_time").show(); $("#row_working_time").show();
$("#row_sort").show(); $("#row_sort").show();
$(".sla_list_agent_col").hide(); $(".sla_list_agent_col").hide();
$(".sla_list_module_col").hide(); $(".sla_list_module_col").hide();
$(".sla_list_service_col").show(); $(".sla_list_service_col").show();
@ -2177,7 +2178,7 @@ function chooseType() {
$("#row_event_filter").show(); $("#row_event_filter").show();
$("#row_event_graphs").show(); $("#row_event_graphs").show();
$("#row_event_graph_by_agent").hide(); $("#row_event_graph_by_agent").hide();
$('#agent_autocomplete').hide(); $('#agent_autocomplete').hide();
$('#agent_autocomplete_events').show(); $('#agent_autocomplete_events').show();
break; break;

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

@ -475,7 +475,10 @@ switch ($action) {
$table->head[$next] = __('Private'); $table->head[$next] = __('Private');
$table->size[$next] = '40px'; $table->size[$next] = '40px';
$table->align[$next] = 'center'; if(defined('METACONSOLE'))
$table->align[$next] = '';
else
$table->align[$next] = 'center';
$next++; $next++;
$table->head[$next] = __('Group'); $table->head[$next] = __('Group');
$table->align[$next] = 'center'; $table->align[$next] = 'center';
@ -1590,9 +1593,9 @@ switch ($action) {
else else
ui_print_page_header (__('Reporting') . $subsection, "images/op_reporting.png", false, "", false, $buttons); ui_print_page_header (__('Reporting') . $subsection, "images/op_reporting.png", false, "", false, $buttons);
enterprise_hook('open_meta_frame');
reporting_enterprise_select_main_tab($action); reporting_enterprise_select_main_tab($action);
enterprise_hook('close_meta_frame');
} }
return; return;
@ -1661,7 +1664,7 @@ else {
"reporting_" . $activeTab . "_tab", false, $buttons); "reporting_" . $activeTab . "_tab", false, $buttons);
} }
enterprise_hook('open_meta_frame');
if ($resultOperationDB !== null) { if ($resultOperationDB !== null) {
ui_print_result_message ($resultOperationDB, __('Successfull action'), __('Unsuccessfull action')); ui_print_result_message ($resultOperationDB, __('Successfull action'), __('Unsuccessfull action'));

32
pandora_console/include/functions_reporting.php
View File

@ -1512,14 +1512,25 @@ function reporting_get_stats_modules_status($data, $graph_width = 250, $graph_he
$table_mbs->data[] = $tdata; $table_mbs->data[] = $tdata;
} }
$output = ' if(!defined("METACONSOLE")){
<fieldset class="databox tactical_set"> $output = '
<legend>' . <fieldset class="databox tactical_set">
__('Monitors by status') . <legend>' .
'</legend>' . __('Monitors by status') .
html_print_table($table_mbs, true) . '</legend>' .
'</fieldset>'; html_print_table($table_mbs, true) .
'</fieldset>';
}
else{
$table_mbs->class = "tactical_view";
$output = '
<fieldset class="tactical_set">
<legend>' .
__('Monitors by status') .
'</legend>' .
html_print_table($table_mbs, true) .
'</fieldset>';
}
return $output; return $output;
} }
@ -8375,7 +8386,8 @@ function reporting_get_last_activity() {
} }
if(defined("METACONSOLE")) if(defined("METACONSOLE"))
$table->class = "databox_tactical"; $table->class="databox_tactical";
return html_print_table ($table, true); return html_print_table ($table, true);
} }
@ -8458,7 +8470,7 @@ function reporting_get_event_histogram ($events) {
} }
else{ else{
$table->class='tactical_view'; $table->class='tactical_view';
$event_graph = '<fieldset class="tactical_set">' . $event_graph = '<fieldset id="event_tactical" class="tactical_set">' .
html_print_table($table, true) . '</fieldset>'; html_print_table($table, true) . '</fieldset>';
} }

2
pandora_console/include/styles/jquery-ui-1.10.0.custom.css vendored
View File

@ -423,7 +423,7 @@ button.ui-button::-moz-focus-inner {
position: absolute; position: absolute;
right: .3em; right: .3em;
width: 21px; width: 21px;
margin: -2px 0 0 0; margin: 0px 0 0 0;
padding: 1px; padding: 1px;
height: 20px; height: 20px;
} }

90
pandora_console/operation/events/events.build_table.php
View File

@ -37,7 +37,10 @@ else {
//headers //headers
$i = 0; $i = 0;
$table->head[$i] = __('ID'); $table->head[$i] = __('ID');
$table->align[$i] = 'center'; if(defined("METACONSOLE"))
$table->align[$i] = 'left';
else
$table->align[$i] = 'center';
$i++; $i++;
if (in_array('server_name', $show_fields)) { if (in_array('server_name', $show_fields)) {
$table->head[$i] = __('Server'); $table->head[$i] = __('Server');
@ -51,7 +54,10 @@ if (in_array('estado', $show_fields)) {
} }
if (in_array('id_evento', $show_fields)) { if (in_array('id_evento', $show_fields)) {
$table->head[$i] = __('Event ID'); $table->head[$i] = __('Event ID');
$table->align[$i] = 'center'; if(defined("METACONSOLE"))
$table->align[$i] = 'left';
else
$table->align[$i] = 'center';
$i++; $i++;
} }
if (in_array('evento', $show_fields)) { if (in_array('evento', $show_fields)) {
@ -68,79 +74,124 @@ if (in_array('id_agente', $show_fields)) {
} }
if (in_array('timestamp', $show_fields)) { if (in_array('timestamp', $show_fields)) {
$table->head[$i] = __('Timestamp'); $table->head[$i] = __('Timestamp');
$table->align[$i] = 'center'; if(defined("METACONSOLE"))
$table->align[$i] = 'left';
else
$table->align[$i] = 'center';
$i++; $i++;
} }
if (in_array('id_usuario', $show_fields)) { if (in_array('id_usuario', $show_fields)) {
$table->head[$i] = __('User'); $table->head[$i] = __('User');
$table->align[$i] = 'center'; if(defined("METACONSOLE"))
$table->align[$i] = 'left';
else
$table->align[$i] = 'center';
$i++; $i++;
} }
if (in_array('owner_user', $show_fields)) { if (in_array('owner_user', $show_fields)) {
$table->head[$i] = __('Owner'); $table->head[$i] = __('Owner');
$table->align[$i] = 'center'; if(defined("METACONSOLE"))
$table->align[$i] = 'left';
else
$table->align[$i] = 'center';
$i++; $i++;
} }
if (in_array('id_grupo', $show_fields)) { if (in_array('id_grupo', $show_fields)) {
$table->head[$i] = __('Group'); $table->head[$i] = __('Group');
$table->align[$i] = 'center'; if(defined("METACONSOLE"))
$table->align[$i] = 'left';
else
$table->align[$i] = 'center';
$i++; $i++;
} }
if (in_array('event_type', $show_fields)) { if (in_array('event_type', $show_fields)) {
$table->head[$i] = __('Event type'); $table->head[$i] = __('Event type');
$table->align[$i] = 'center'; if(defined("METACONSOLE"))
$table->align[$i] = 'left';
else
$table->align[$i] = 'center';
$table->style[$i] = 'min-width: 85px;'; $table->style[$i] = 'min-width: 85px;';
$i++; $i++;
} }
if (in_array('id_agentmodule', $show_fields)) { if (in_array('id_agentmodule', $show_fields)) {
$table->head[$i] = __('Agent Module'); $table->head[$i] = __('Agent Module');
$table->align[$i] = 'center'; if(defined("METACONSOLE"))
$table->align[$i] = 'left';
else
$table->align[$i] = 'center';
$i++; $i++;
} }
if (in_array('id_alert_am', $show_fields)) { if (in_array('id_alert_am', $show_fields)) {
$table->head[$i] = __('Alert'); $table->head[$i] = __('Alert');
$table->align[$i] = 'center'; if(defined("METACONSOLE"))
$table->align[$i] = 'left';
else
$table->align[$i] = 'center';
$i++; $i++;
} }
if (in_array('criticity', $show_fields)) { if (in_array('criticity', $show_fields)) {
$table->head[$i] = __('Severity'); $table->head[$i] = __('Severity');
$table->align[$i] = 'center'; if(defined("METACONSOLE"))
$table->align[$i] = 'left';
else
$table->align[$i] = 'center';
$i++; $i++;
} }
if (in_array('user_comment', $show_fields)) { if (in_array('user_comment', $show_fields)) {
$table->head[$i] = __('Comment'); $table->head[$i] = __('Comment');
$table->align[$i] = 'center'; if(defined("METACONSOLE"))
$table->align[$i] = 'left';
else
$table->align[$i] = 'center';
$i++; $i++;
} }
if (in_array('tags', $show_fields)) { if (in_array('tags', $show_fields)) {
$table->head[$i] = __('Tags'); $table->head[$i] = __('Tags');
$table->align[$i] = 'center'; if(defined("METACONSOLE"))
$table->align[$i] = 'left';
else
$table->align[$i] = 'center';
$i++; $i++;
} }
if (in_array('source', $show_fields)) { if (in_array('source', $show_fields)) {
$table->head[$i] = __('Source'); $table->head[$i] = __('Source');
$table->align[$i] = 'center'; if(defined("METACONSOLE"))
$table->align[$i] = 'left';
else
$table->align[$i] = 'center';
$i++; $i++;
} }
if (in_array('id_extra', $show_fields)) { if (in_array('id_extra', $show_fields)) {
$table->head[$i] = __('Extra ID'); $table->head[$i] = __('Extra ID');
$table->align[$i] = 'center'; if(defined("METACONSOLE"))
$table->align[$i] = 'left';
else
$table->align[$i] = 'center';
$i++; $i++;
} }
if (in_array('ack_utimestamp', $show_fields)) { if (in_array('ack_utimestamp', $show_fields)) {
$table->head[$i] = __('ACK Timestamp'); $table->head[$i] = __('ACK Timestamp');
$table->align[$i] = 'center'; if(defined("METACONSOLE"))
$table->align[$i] = 'left';
else
$table->align[$i] = 'center';
$i++; $i++;
} }
if (in_array('instructions', $show_fields)) { if (in_array('instructions', $show_fields)) {
$table->head[$i] = __('Instructions'); $table->head[$i] = __('Instructions');
$table->align[$i] = 'center'; if(defined("METACONSOLE"))
$table->align[$i] = 'left';
else
$table->align[$i] = 'center';
$i++; $i++;
} }
if ($i != 0 && $allow_action) { if ($i != 0 && $allow_action) {
$table->head[$i] = __('Action'); $table->head[$i] = __('Action');
$table->align[$i] = 'center'; if(defined("METACONSOLE"))
$table->align[$i] = 'left';
else
$table->align[$i] = 'center';
$table->size[$i] = '80px'; $table->size[$i] = '80px';
$i++; $i++;
if (check_acl ($config["id_user"], 0, "EW") == 1 && !$readonly) { if (check_acl ($config["id_user"], 0, "EW") == 1 && !$readonly) {
@ -597,7 +648,10 @@ if (!empty ($table->data)) {
echo "<input type='hidden' name='delete' id='hidden_delete_events' value='0' />"; echo "<input type='hidden' name='delete' id='hidden_delete_events' value='0' />";
} }
echo '<div style="width: ' . $table->width . '; overflow-x: auto;">'; if (defined("METACONSOLE"))
echo '<div style="width: ' . $table->width . ';">';
else
echo '<div style="width: ' . $table->width . '; overflow-x: auto;">';
html_print_table ($table); html_print_table ($table);
echo '</div>'; echo '</div>';

88
pandora_console/operation/events/events_list.php
View File

@ -125,9 +125,6 @@ if (is_ajax()) {
// Get the tags where the user have permissions in Events reading tasks // Get the tags where the user have permissions in Events reading tasks
$tags = tags_get_user_tags($config['id_user'], 'ER'); $tags = tags_get_user_tags($config['id_user'], 'ER');
// Error div for ajax messages
echo "<div id='show_filter_error'>";
echo "</div>";
if ($id_agent == 0 && $text_agent != __('All')) { if ($id_agent == 0 && $text_agent != __('All')) {
$id_agent = -1; $id_agent = -1;
@ -147,7 +144,8 @@ require('events.build_query.php');
$id_name = get_parameter('id_name', ''); $id_name = get_parameter('id_name', '');
echo "<br>"; if(!defined("METACONSOLE"))
echo "<br>";
// Trick to catch if any filter button has been pushed (don't collapse filter) // Trick to catch if any filter button has been pushed (don't collapse filter)
@ -158,23 +156,22 @@ $update_pressed = (int) !empty($update_pressed);
if ($update_pressed || $open_filter) { if ($update_pressed || $open_filter) {
$open_filter = true; $open_filter = true;
} }
if(!defined("METACONSOLE")){
$table = html_get_predefined_table('transparent', 2);
$table->styleTable = 'width: 23px; float: right; background: #ECECEC;';
$table->width = '98%';
$table->style[0] = 'text-align: left;';
$table->style[1] = 'text-align: right;';
$table = html_get_predefined_table('transparent', 2); $table->data[0][1] = '<a id="events_graph_link" href="javascript: show_events_graph_dialog()">' . html_print_image('images/chart_curve.png', true, array('title' => __('Show events graph'))) . '</a>';
$table->styleTable = 'width: 23px; float: right; background: #ECECEC;'; $table->cellstyle[0][1] = 'background: #ECECEC;';
$table->width = '98%';
$table->style[0] = 'text-align: left;';
$table->style[1] = 'text-align: right;';
$table->data[0][1] = '<a id="events_graph_link" href="javascript: show_events_graph_dialog()">' . html_print_image('images/chart_curve.png', true, array('title' => __('Show events graph'))) . '</a>'; if(defined('METACONSOLE')){
$table->cellstyle[0][1] = 'background: #ECECEC;'; $table->width = '100%';
$table->class='events_list';
if(defined('METACONSOLE')){ }
$table->width = '100%'; html_print_table($table);
$table->class='events_list';
} }
html_print_table($table);
unset($table); unset($table);
$filters = events_get_event_filter_select(); $filters = events_get_event_filter_select();
@ -238,6 +235,7 @@ if (check_acl ($config["id_user"], 0, "EW") || check_acl ($config["id_user"], 0,
$data[0] .= html_print_select ($_filters_update, "overwrite_filter", '', '', '', 0, true); $data[0] .= html_print_select ($_filters_update, "overwrite_filter", '', '', '', 0, true);
$data[1] = html_print_submit_button (__('Update filter'), 'update_filter', false, 'class="sub upd"', true); $data[1] = html_print_submit_button (__('Update filter'), 'update_filter', false, 'class="sub upd"', true);
$table->data[] = $data; $table->data[] = $data;
$table->rowclass[] = ''; $table->rowclass[] = '';
@ -500,7 +498,7 @@ $table->cellspacing = 4;
$table->cellpadding = 4; $table->cellpadding = 4;
$table->class = 'databox'; $table->class = 'databox';
if (defined('METACONSOLE')){ if (defined('METACONSOLE')){
$table->width = '70%'; $table->width = '96%';
$table->class = 'databox_filters'; $table->class = 'databox_filters';
} }
$table->styleTable = 'font-weight: bold; color: #555;'; $table->styleTable = 'font-weight: bold; color: #555;';
@ -536,7 +534,7 @@ $fields = events_get_all_status();
$data[0] .= html_print_select ($fields, 'status', $status, '', '', '', true); $data[0] .= html_print_select ($fields, 'status', $status, '', '', '', true);
$data[1] = __('Max. hours old') . $jump; $data[1] = __('Max. hours old') . $jump;
$data[1] .= html_print_input_text ('event_view_hr', $event_view_hr, '', 5, 255, true); $data[1] .= html_print_input_text ('event_view_hr', $event_view_hr, '', 5, 255, true);
$data[2] = __("Repeated") . '<br>'; $data[2] = __("Repeated") . $jump;
$repeated_sel[0] = __("All events"); $repeated_sel[0] = __("All events");
$repeated_sel[1] = __("Group events"); $repeated_sel[1] = __("Group events");
$data[2] .= html_print_select ($repeated_sel, "group_rep", $group_rep, '', '', 0, true); $data[2] .= html_print_select ($repeated_sel, "group_rep", $group_rep, '', '', 0, true);
@ -561,18 +559,42 @@ $table->rowclass[] = '';
$data = array(); $data = array();
$data[0] = '<div style="width:100%; text-align:left">'; $data[0] = '<div style="width:100%; text-align:left">';
if (check_acl ($config["id_user"], 0, "EW")) { if (check_acl ($config["id_user"], 0, "EW")) {
$data[0] .= '<a href="javascript:" onclick="show_save_filter_dialog();">' . html_print_image("images/disk.png", true, array("border" => '0', "title" => __('Save filter'), "alt" => __('Save filter'))) . '</a> &nbsp;'; $data[0] .= '<a href="javascript:" onclick="show_save_filter_dialog();">' .
html_print_image("images/disk.png", true, array("border" => '0', "title" => __('Save filter'), "alt" => __('Save filter'))) . '</a> &nbsp;';
} }
$data[0] .= '<a href="javascript:" onclick="show_load_filter_dialog();">' . html_print_image("images/load.png", true, array("border" => '0', "title" => __('Load filter'), "alt" => __('Load filter'))) . '</a><br>'; if(defined("METACONSOLE")){
if (empty($id_name)) { $data[0] .= '<a href="javascript:" onclick="show_load_filter_dialog();">' .
$data[0] .= '[<span id="filter_loaded_span" style="font-weight: normal">' . html_print_image("images/load.png", true, array("border" => '0', "title" => __('Load filter'), "alt" => __('Load filter'))) . '</a> &nbsp;';
__('No filter loaded') . $data[0] .= '<a id="events_graph_link" href="javascript: show_events_graph_dialog()">' .
'</span>]'; html_print_image('images/chart_curve.png', true, array('title' => __('Show events graph'))) . '</a> <br />';
} }
else { else
$data[0] .= '[<span id="filter_loaded_span" style="font-weight: normal">' . $data[0] .= '<a href="javascript:" onclick="show_load_filter_dialog();">' .
__('Filter loaded') . ': ' . $id_name . html_print_image("images/load.png", true, array("border" => '0', "title" => __('Load filter'), "alt" => __('Load filter'))) . '</a> <br />';
'</span>]'; if(defined("METACONSOLE")){
if (empty($id_name)) {
$data[0] .= '<div id="filter_loaded_span" style="font-weight: normal">[' .
__('No filter loaded') .
']</div>';
}
else {
$data[0] .= '<div id="filter_loaded_span" style="font-weight: normal">[' .
__('Filter loaded') . ': ' . $id_name .
']</div>';
}
}
else{
if (empty($id_name)) {
$data[0] .= '<span id="filter_loaded_span" style="font-weight: normal">[' .
__('No filter loaded') .
']</span>';
}
else {
$data[0] .= '[<span id="filter_loaded_span" style="font-weight: normal">' .
__('Filter loaded') . ': ' . $id_name .
'</span>]';
}
} }
$data[0] .= '</div>'; $data[0] .= '</div>';
@ -593,6 +615,10 @@ if (defined('METACONSOLE'))
else else
ui_toggle($events_filter, __('Event control filter'), '', !$open_filter); ui_toggle($events_filter, __('Event control filter'), '', !$open_filter);
// Error div for ajax messages
echo "<div id='show_filter_error'>";
echo "</div>";
$event_table = events_get_events_table($meta, $history); $event_table = events_get_events_table($meta, $history);
if ($group_rep == 0) { if ($group_rep == 0) {
@ -637,7 +663,7 @@ if (!empty($result)) {
//~ Checking the event tags exactly. The event query filters approximated tags to keep events //~ Checking the event tags exactly. The event query filters approximated tags to keep events
//~ with several tags //~ with several tags
$acltags = tags_get_user_module_and_tags ($config['id_user'],'ER', true); $acltags = tags_get_user_module_and_tags ($config['id_user'],'ER', true);
foreach ($result as $key=>$event_data) { foreach ($result as $key=>$event_data) {
$has_tags = events_checks_event_tags($event_data, $acltags); $has_tags = events_checks_event_tags($event_data, $acltags);
if (!$has_tags) { if (!$has_tags) {