From e38f31caaa365718356593d3eb1f2ed7ccb38821 Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Mon, 9 Mar 2015 16:33:27 +0100 Subject: [PATCH] Changed visual of metaconsole --- .../alerts/configure_alert_command.php | 1 - .../godmode/events/event_edit_filter.php | 94 +++++++++++++------ .../godmode/events/event_filter.php | 15 ++- .../reporting_builder.item_editor.php | 25 ++--- .../godmode/reporting/reporting_builder.php | 11 ++- .../include/functions_reporting.php | 32 +++++-- .../styles/jquery-ui-1.10.0.custom.css | 2 +- .../operation/events/events.build_table.php | 90 ++++++++++++++---- .../operation/events/events_list.php | 88 +++++++++++------ 9 files changed, 248 insertions(+), 110 deletions(-) diff --git a/pandora_console/godmode/alerts/configure_alert_command.php b/pandora_console/godmode/alerts/configure_alert_command.php index d6ff7354bc..10be94b601 100644 --- a/pandora_console/godmode/alerts/configure_alert_command.php +++ b/pandora_console/godmode/alerts/configure_alert_command.php @@ -41,7 +41,6 @@ else ui_print_page_header (__('Alerts') . ' » ' . __('Configure alert command'), "images/gm_alerts.png", false, "alerts_config", true); -enterprise_hook('open_meta_frame'); if ($update_command) { $id = (int) get_parameter ('id'); diff --git a/pandora_console/godmode/events/event_edit_filter.php b/pandora_console/godmode/events/event_edit_filter.php index a29b1c7aac..af44c2a72a 100644 --- a/pandora_console/godmode/events/event_edit_filter.php +++ b/pandora_console/godmode/events/event_edit_filter.php @@ -158,11 +158,19 @@ $table->style[0] = 'vertical-align: top;'; $table->valign[1] = 'top'; if (defined('METACONSOLE')){ - echo '
' . __('Create Filter') . '
'; $table->width = '100%'; $table->border = 0; $table->cellspacing = 3; $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->style[0] = ''; $table->valign[1] = ''; @@ -276,39 +284,67 @@ $remove_with_tag_disabled = empty($tag_with_temp); $add_without_tag_disabled = empty($tags_select_without); $remove_without_tag_disabled = empty($tag_without_temp); -$table->colspan[13][0] = '2'; -$table->data[13][0] = '' . __('Events with following tags') . ''; -$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); +if (defined("METACONSOLE")){ + + $table->data[13][0] = '' . __('Events with following tags') . ''; + $table->data[13][0] .= '
' . html_print_select ($tags_select_with, 'select_with', + '', '', '', 0, true, false, true, '', false, 'width: 120px;'); + $table->data[13][0] .= ' ' . html_print_button(__('Add'), 'add_whith', $add_with_tag_disabled, + '', 'class="add sub"', true); + $table->data[13][0] .= '
' . html_print_select ($tag_with_temp, + 'tag_with_temp', array(), '', '', 0, true, true, + true, '', false, "width: 120px; height: 50px;"); + $table->data[13][0] .= ' ' . 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] = '' . __('Events without following tags') . ''; + $table->data[13][1] .= '
' . html_print_select ($tags_select_without, 'select_without', + '', '', '', 0, true, false, true, '', false, 'width: 120px;'); + $table->data[13][1] .= ' ' . html_print_button(__('Add'), 'add_whithout', $add_without_tag_disabled, + '', 'class="add sub"', true); + $table->data[13][1] .= '
' . html_print_select ($tag_without_temp, + 'tag_without_temp', array(), '', '', 0, true, true, + true, '', false, "width: 120px; height: 50px;"); + $table->data[13][1] .= ' ' . 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] = '' . __('Events with following tags') . ''; + $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->data[16][0] = '' . __('Events without following tags') . ''; -$table->data[17][0] = html_print_select ($tags_select_without, 'select_without', - '', '', '', 0, true, false, true, '', false, 'width: 120px;'); -$table->data[17][1] = html_print_button(__('Add'), 'add_whithout', $add_without_tag_disabled, - '', '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->colspan[16][0] = '2'; + $table->data[16][0] = '' . __('Events without following tags') . ''; + $table->data[17][0] = html_print_select ($tags_select_without, 'select_without', + '', '', '', 0, true, false, true, '', false, 'width: 120px;'); + $table->data[17][1] = html_print_button(__('Add'), 'add_whithout', $add_without_tag_disabled, + '', '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[19][0] = '' . __('Alert events') . ''; $table->data[19][1] = html_print_select( diff --git a/pandora_console/godmode/events/event_filter.php b/pandora_console/godmode/events/event_filter.php index b1e8597801..ad3c544c9e 100644 --- a/pandora_console/godmode/events/event_filter.php +++ b/pandora_console/godmode/events/event_filter.php @@ -86,7 +86,7 @@ if ($filters === false) $table->width = '98%'; if(defined("METACONSOLE")) - $table->width = '98%'; + $table->width = '100%'; $table->head = array (); $table->head[0] = __('Name'); $table->head[1] = __('Filter group'); @@ -100,7 +100,8 @@ $table->style[0] = 'font-weight: bold'; $table->align = array (); $table->align[1] = 'center'; $table->align[2] = 'center'; -$table->align[3] = 'center'; +if(!defined("METACONSOLE")) + $table->align[3] = 'center'; $table->align[4] = 'center'; $table->align[5] = 'center'; $table->size = array (); @@ -137,7 +138,10 @@ if (isset($data)) { echo "
"; html_print_input_hidden('multiple_delete', 1); html_print_table ($table); - echo "
"; + if(!defined("METACONSOLE")) + echo "
"; + else + echo "
"; html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"'); echo "
"; echo ""; @@ -148,7 +152,10 @@ else { } echo '
'; - echo "
"; + if(!defined("METACONSOLE")) + echo "
"; + else + echo "
"; html_print_submit_button (__('Create filter'), 'crt', false, 'class="sub wand"'); echo "
"; echo ''; diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 242215e5bb..5cc76ae83a 100644 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -515,7 +515,7 @@ else echo " - " . __('Wizard') . " + " . __('Item Editor') . " "; @@ -1140,6 +1140,8 @@ else +
+
'; echo '' . printSmallFont($nameAgent) . $server_name_element . ''; echo '' . printSmallFont($nameModule) . ''; - + if (enterprise_installed() && $report_item_type == 'SLA_services') { enterprise_include_once("include/functions_services.php"); $nameService = enterprise_hook('services_get_name', array($item['id_agent_module'])); echo '' . printSmallFont($nameService) . ''; } - + echo '' . $item['sla_min'] . ''; echo '' . $item['sla_max'] . ''; echo '' . $item['sla_limit'] . ''; @@ -1458,8 +1460,7 @@ $(document).ready (function () { minuteText: '', secondText: '', currentText: '', - closeText: '' - }); + closeText: ''}); }); function create_custom_graph() { @@ -1698,13 +1699,13 @@ function addSLARow() { var slaMin = $("input[name=sla_min]").val(); var slaMax = $("input[name=sla_max]").val(); var slaLimit = $("input[name=sla_limit]").val(); - + var serviceId = $("select#id_service>option:selected").val(); var serviceName = $("select#id_service>option:selected").text(); if (((idAgent != '') && (slaMin != '') && (slaMax != '') && (slaLimit != '')) || serviceId != '') { - + if (nameAgent != '') { //Truncate nameAgent var params = []; @@ -1721,7 +1722,7 @@ function addSLARow() { nameAgent = data; } }); - + //Truncate nameModule var params = []; params.push("truncate_text=1"); @@ -1747,7 +1748,7 @@ function addSLARow() { params.push("sla_max=" + slaMax); params.push("sla_limit=" + slaLimit); params.push("server_id=" + serverId); - + if (serviceId != '') { params.push("id_service=" + serviceId); } @@ -2023,7 +2024,7 @@ function chooseType() { $("#row_only_display_wrong").show(); $("#row_working_time").show(); $("#row_sort").show(); - + $(".sla_list_agent_col").hide(); $(".sla_list_module_col").hide(); $(".sla_list_service_col").show(); @@ -2177,7 +2178,7 @@ function chooseType() { $("#row_event_filter").show(); $("#row_event_graphs").show(); $("#row_event_graph_by_agent").hide(); - + $('#agent_autocomplete').hide(); $('#agent_autocomplete_events').show(); break; diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index e693e8c2dd..02003ef075 100644 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -475,7 +475,10 @@ switch ($action) { $table->head[$next] = __('Private'); $table->size[$next] = '40px'; - $table->align[$next] = 'center'; + if(defined('METACONSOLE')) + $table->align[$next] = ''; + else + $table->align[$next] = 'center'; $next++; $table->head[$next] = __('Group'); $table->align[$next] = 'center'; @@ -1590,9 +1593,9 @@ switch ($action) { else ui_print_page_header (__('Reporting') . $subsection, "images/op_reporting.png", false, "", false, $buttons); - enterprise_hook('open_meta_frame'); + reporting_enterprise_select_main_tab($action); - enterprise_hook('close_meta_frame'); + } return; @@ -1661,7 +1664,7 @@ else { "reporting_" . $activeTab . "_tab", false, $buttons); } -enterprise_hook('open_meta_frame'); + if ($resultOperationDB !== null) { ui_print_result_message ($resultOperationDB, __('Successfull action'), __('Unsuccessfull action')); diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 144f4f8e91..a73774e7e6 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -1512,14 +1512,25 @@ function reporting_get_stats_modules_status($data, $graph_width = 250, $graph_he $table_mbs->data[] = $tdata; } - $output = ' -
- ' . - __('Monitors by status') . - '' . - html_print_table($table_mbs, true) . - '
'; - + if(!defined("METACONSOLE")){ + $output = ' +
+ ' . + __('Monitors by status') . + '' . + html_print_table($table_mbs, true) . + '
'; + } + else{ + $table_mbs->class = "tactical_view"; + $output = ' +
+ ' . + __('Monitors by status') . + '' . + html_print_table($table_mbs, true) . + '
'; + } return $output; } @@ -8375,7 +8386,8 @@ function reporting_get_last_activity() { } if(defined("METACONSOLE")) - $table->class = "databox_tactical"; + $table->class="databox_tactical"; + return html_print_table ($table, true); } @@ -8458,7 +8470,7 @@ function reporting_get_event_histogram ($events) { } else{ $table->class='tactical_view'; - $event_graph = '
' . + $event_graph = '
' . html_print_table($table, true) . '
'; } diff --git a/pandora_console/include/styles/jquery-ui-1.10.0.custom.css b/pandora_console/include/styles/jquery-ui-1.10.0.custom.css index a1b1b23020..97c7191e7e 100644 --- a/pandora_console/include/styles/jquery-ui-1.10.0.custom.css +++ b/pandora_console/include/styles/jquery-ui-1.10.0.custom.css @@ -423,7 +423,7 @@ button.ui-button::-moz-focus-inner { position: absolute; right: .3em; width: 21px; - margin: -2px 0 0 0; + margin: 0px 0 0 0; padding: 1px; height: 20px; } diff --git a/pandora_console/operation/events/events.build_table.php b/pandora_console/operation/events/events.build_table.php index 993e2da8b0..9276f496a2 100644 --- a/pandora_console/operation/events/events.build_table.php +++ b/pandora_console/operation/events/events.build_table.php @@ -37,7 +37,10 @@ else { //headers $i = 0; $table->head[$i] = __('ID'); -$table->align[$i] = 'center'; +if(defined("METACONSOLE")) + $table->align[$i] = 'left'; + else + $table->align[$i] = 'center'; $i++; if (in_array('server_name', $show_fields)) { $table->head[$i] = __('Server'); @@ -51,7 +54,10 @@ if (in_array('estado', $show_fields)) { } if (in_array('id_evento', $show_fields)) { $table->head[$i] = __('Event ID'); - $table->align[$i] = 'center'; + if(defined("METACONSOLE")) + $table->align[$i] = 'left'; + else + $table->align[$i] = 'center'; $i++; } if (in_array('evento', $show_fields)) { @@ -68,79 +74,124 @@ if (in_array('id_agente', $show_fields)) { } if (in_array('timestamp', $show_fields)) { $table->head[$i] = __('Timestamp'); - $table->align[$i] = 'center'; + if(defined("METACONSOLE")) + $table->align[$i] = 'left'; + else + $table->align[$i] = 'center'; $i++; } if (in_array('id_usuario', $show_fields)) { $table->head[$i] = __('User'); - $table->align[$i] = 'center'; + if(defined("METACONSOLE")) + $table->align[$i] = 'left'; + else + $table->align[$i] = 'center'; $i++; } if (in_array('owner_user', $show_fields)) { $table->head[$i] = __('Owner'); - $table->align[$i] = 'center'; + if(defined("METACONSOLE")) + $table->align[$i] = 'left'; + else + $table->align[$i] = 'center'; $i++; } if (in_array('id_grupo', $show_fields)) { $table->head[$i] = __('Group'); - $table->align[$i] = 'center'; + if(defined("METACONSOLE")) + $table->align[$i] = 'left'; + else + $table->align[$i] = 'center'; $i++; } if (in_array('event_type', $show_fields)) { $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;'; $i++; } if (in_array('id_agentmodule', $show_fields)) { $table->head[$i] = __('Agent Module'); - $table->align[$i] = 'center'; + if(defined("METACONSOLE")) + $table->align[$i] = 'left'; + else + $table->align[$i] = 'center'; $i++; } if (in_array('id_alert_am', $show_fields)) { $table->head[$i] = __('Alert'); - $table->align[$i] = 'center'; + if(defined("METACONSOLE")) + $table->align[$i] = 'left'; + else + $table->align[$i] = 'center'; $i++; } if (in_array('criticity', $show_fields)) { $table->head[$i] = __('Severity'); - $table->align[$i] = 'center'; + if(defined("METACONSOLE")) + $table->align[$i] = 'left'; + else + $table->align[$i] = 'center'; $i++; } if (in_array('user_comment', $show_fields)) { $table->head[$i] = __('Comment'); - $table->align[$i] = 'center'; + if(defined("METACONSOLE")) + $table->align[$i] = 'left'; + else + $table->align[$i] = 'center'; $i++; } if (in_array('tags', $show_fields)) { $table->head[$i] = __('Tags'); - $table->align[$i] = 'center'; + if(defined("METACONSOLE")) + $table->align[$i] = 'left'; + else + $table->align[$i] = 'center'; $i++; } if (in_array('source', $show_fields)) { $table->head[$i] = __('Source'); - $table->align[$i] = 'center'; + if(defined("METACONSOLE")) + $table->align[$i] = 'left'; + else + $table->align[$i] = 'center'; $i++; } if (in_array('id_extra', $show_fields)) { $table->head[$i] = __('Extra ID'); - $table->align[$i] = 'center'; + if(defined("METACONSOLE")) + $table->align[$i] = 'left'; + else + $table->align[$i] = 'center'; $i++; } if (in_array('ack_utimestamp', $show_fields)) { $table->head[$i] = __('ACK Timestamp'); - $table->align[$i] = 'center'; + if(defined("METACONSOLE")) + $table->align[$i] = 'left'; + else + $table->align[$i] = 'center'; $i++; } if (in_array('instructions', $show_fields)) { $table->head[$i] = __('Instructions'); - $table->align[$i] = 'center'; + if(defined("METACONSOLE")) + $table->align[$i] = 'left'; + else + $table->align[$i] = 'center'; $i++; } if ($i != 0 && $allow_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'; $i++; if (check_acl ($config["id_user"], 0, "EW") == 1 && !$readonly) { @@ -597,7 +648,10 @@ if (!empty ($table->data)) { echo ""; } - echo '
'; + if (defined("METACONSOLE")) + echo '
'; + else + echo '
'; html_print_table ($table); echo '
'; diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index 25eedf2e7a..f167b7128b 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -125,9 +125,6 @@ if (is_ajax()) { // Get the tags where the user have permissions in Events reading tasks $tags = tags_get_user_tags($config['id_user'], 'ER'); -// Error div for ajax messages -echo "
"; -echo "
"; if ($id_agent == 0 && $text_agent != __('All')) { $id_agent = -1; @@ -147,7 +144,8 @@ require('events.build_query.php'); $id_name = get_parameter('id_name', ''); -echo "
"; +if(!defined("METACONSOLE")) + echo "
"; // 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) { $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->styleTable = 'width: 23px; float: right; background: #ECECEC;'; -$table->width = '98%'; -$table->style[0] = 'text-align: left;'; -$table->style[1] = 'text-align: right;'; + $table->data[0][1] = '' . html_print_image('images/chart_curve.png', true, array('title' => __('Show events graph'))) . ''; + $table->cellstyle[0][1] = 'background: #ECECEC;'; -$table->data[0][1] = '' . html_print_image('images/chart_curve.png', true, array('title' => __('Show events graph'))) . ''; -$table->cellstyle[0][1] = 'background: #ECECEC;'; - -if(defined('METACONSOLE')){ - $table->width = '100%'; - $table->class='events_list'; + if(defined('METACONSOLE')){ + $table->width = '100%'; + $table->class='events_list'; + } + html_print_table($table); } - -html_print_table($table); - unset($table); $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[1] = html_print_submit_button (__('Update filter'), 'update_filter', false, 'class="sub upd"', true); + $table->data[] = $data; $table->rowclass[] = ''; @@ -500,7 +498,7 @@ $table->cellspacing = 4; $table->cellpadding = 4; $table->class = 'databox'; if (defined('METACONSOLE')){ - $table->width = '70%'; + $table->width = '96%'; $table->class = 'databox_filters'; } $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[1] = __('Max. hours old') . $jump; $data[1] .= html_print_input_text ('event_view_hr', $event_view_hr, '', 5, 255, true); -$data[2] = __("Repeated") . '
'; +$data[2] = __("Repeated") . $jump; $repeated_sel[0] = __("All events"); $repeated_sel[1] = __("Group events"); $data[2] .= html_print_select ($repeated_sel, "group_rep", $group_rep, '', '', 0, true); @@ -561,18 +559,42 @@ $table->rowclass[] = ''; $data = array(); $data[0] = '
'; if (check_acl ($config["id_user"], 0, "EW")) { - $data[0] .= '' . html_print_image("images/disk.png", true, array("border" => '0', "title" => __('Save filter'), "alt" => __('Save filter'))) . '  '; + $data[0] .= '' . + html_print_image("images/disk.png", true, array("border" => '0', "title" => __('Save filter'), "alt" => __('Save filter'))) . '  '; } -$data[0] .= '' . html_print_image("images/load.png", true, array("border" => '0', "title" => __('Load filter'), "alt" => __('Load filter'))) . '
'; -if (empty($id_name)) { - $data[0] .= '[' . - __('No filter loaded') . - ']'; +if(defined("METACONSOLE")){ + $data[0] .= '' . + html_print_image("images/load.png", true, array("border" => '0', "title" => __('Load filter'), "alt" => __('Load filter'))) . '  '; + $data[0] .= '' . + html_print_image('images/chart_curve.png', true, array('title' => __('Show events graph'))) . '
'; } -else { - $data[0] .= '[' . - __('Filter loaded') . ': ' . $id_name . - ']'; +else + $data[0] .= '' . + html_print_image("images/load.png", true, array("border" => '0', "title" => __('Load filter'), "alt" => __('Load filter'))) . '
'; +if(defined("METACONSOLE")){ + if (empty($id_name)) { + $data[0] .= '
[' . + __('No filter loaded') . + ']
'; + } + else { + $data[0] .= '
[' . + __('Filter loaded') . ': ' . $id_name . + ']
'; + } +} +else{ + if (empty($id_name)) { + $data[0] .= '[' . + __('No filter loaded') . + ']'; + } + else { + $data[0] .= '[' . + __('Filter loaded') . ': ' . $id_name . + ']'; + } + } $data[0] .= '
'; @@ -593,6 +615,10 @@ if (defined('METACONSOLE')) else ui_toggle($events_filter, __('Event control filter'), '', !$open_filter); +// Error div for ajax messages +echo "
"; +echo "
"; + $event_table = events_get_events_table($meta, $history); 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 //~ with several tags $acltags = tags_get_user_module_and_tags ($config['id_user'],'ER', true); - + foreach ($result as $key=>$event_data) { $has_tags = events_checks_event_tags($event_data, $acltags); if (!$has_tags) {