From 43cdabcc1eba87d2a918603b21f95b7ea36c5fee Mon Sep 17 00:00:00 2001 From: raulmateos Date: Sat, 29 Aug 2009 15:56:14 +0000 Subject: [PATCH] 2009-08-29 Raul Mateos * include/config_process.php: Update build after last changes * operation/events/event_statistics.php, operation/extensions.php, godmode/alerts/alert*.php, godmode/alerts/configure_alert_compound.php: Unify titles, adding parent and change from h1 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1891 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 ++++++++- pandora_console/godmode/alerts/alert_actions.php | 3 ++- pandora_console/godmode/alerts/alert_commands.php | 3 ++- pandora_console/godmode/alerts/alert_compounds.php | 3 ++- pandora_console/godmode/alerts/alert_list.php | 4 ++-- pandora_console/godmode/alerts/alert_templates.php | 3 ++- .../godmode/alerts/configure_alert_compound.php | 3 ++- pandora_console/include/config_process.php | 2 +- pandora_console/operation/events/event_statistics.php | 1 + pandora_console/operation/extensions.php | 4 ++-- 10 files changed, 24 insertions(+), 11 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 29d51303cf..5fa74168f6 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2009-08-29 Raul Mateos + + * include/config_process.php: Update build after last changes + + * operation/events/event_statistics.php, operation/extensions.php, + godmode/alerts/alert*.php, godmode/alerts/configure_alert_compound.php: + Unify titles, adding parent and change from h1 to h2. + 2009-08-28 Miguel de Dios * extensions/module_groups, extensions/module_groups/icon_menu.png, @@ -27,7 +35,6 @@ into menu, now you can add extension with icon and into the submenu in any position of submenu. Change the example "hello" for to show as be. - 2009-08-26 Miguel de Dios * operation/extensions.php, godmode/extensions.php: fix hidden bug that show diff --git a/pandora_console/godmode/alerts/alert_actions.php b/pandora_console/godmode/alerts/alert_actions.php index c818911bb6..aefe6aca92 100644 --- a/pandora_console/godmode/alerts/alert_actions.php +++ b/pandora_console/godmode/alerts/alert_actions.php @@ -38,7 +38,8 @@ if (is_ajax ()) { return; } -echo '

'.__('Alert actions').'

'; +echo "

".__('Alerts')." » "; +echo __('Alert actions').'

'; $update_action = (bool) get_parameter ('update_action'); $create_action = (bool) get_parameter ('create_action'); diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php index 2bba239c34..d902f386d9 100644 --- a/pandora_console/godmode/alerts/alert_commands.php +++ b/pandora_console/godmode/alerts/alert_commands.php @@ -37,7 +37,8 @@ if (is_ajax ()) { return; } -echo '

'.__('Alert commands').'

'; +echo "

".__('Alerts')." » "; +echo __('Alert commands').'

'; $update_command = (bool) get_parameter ('update_command'); $create_command = (bool) get_parameter ('create_command'); $delete_command = (bool) get_parameter ('delete_command'); diff --git a/pandora_console/godmode/alerts/alert_compounds.php b/pandora_console/godmode/alerts/alert_compounds.php index b38aff4871..1fedd3e045 100644 --- a/pandora_console/godmode/alerts/alert_compounds.php +++ b/pandora_console/godmode/alerts/alert_compounds.php @@ -76,7 +76,8 @@ if ($disable_alert) { return; } -echo '

'.__('Correlated alerts').'

'; +echo "

".__('Alerts')." » "; +echo __('Correlated alerts').'

'; $table->id = 'filter_compound_table'; $table->width = '90%'; diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php index 73e21546d3..211f7528e7 100644 --- a/pandora_console/godmode/alerts/alert_list.php +++ b/pandora_console/godmode/alerts/alert_list.php @@ -184,10 +184,10 @@ if ($disable_alert) { } if ($id_agente) { - echo '

'.__('Agent configuration').' » '.__('Alerts').'

'; + echo '

'.__('Agent configuration').' » '.__('Alerts').'

'; $agents = array ($id_agente => get_agent_name ($id_agente)); } else { - echo '

'.__('Alerts').'

'; + echo '

'.__('Alerts').'

'; $groups = get_user_groups (); $agents = get_group_agents (array_keys ($groups), false, "none"); } diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php index bdc5bdd355..397dd9b11e 100644 --- a/pandora_console/godmode/alerts/alert_templates.php +++ b/pandora_console/godmode/alerts/alert_templates.php @@ -103,7 +103,8 @@ if (is_ajax ()) { return; } -echo '

'.__('Alert templates').'

'; +echo "

".__('Alerts')." » "; +echo __('Alert templates')."

"; $update_template = (bool) get_parameter ('update_template'); $delete_template = (bool) get_parameter ('delete_template'); diff --git a/pandora_console/godmode/alerts/configure_alert_compound.php b/pandora_console/godmode/alerts/configure_alert_compound.php index 30320c594a..16dbb68f1c 100644 --- a/pandora_console/godmode/alerts/configure_alert_compound.php +++ b/pandora_console/godmode/alerts/configure_alert_compound.php @@ -269,7 +269,8 @@ if ($update_compound) { } } -echo '

'.__('Configure correlated alert').'

'; +echo "

".__('Alerts')." » "; +echo __('Configure correlated alert').'

'; print_alert_compound_steps ($step, $id); diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 13632799f9..7eb880a689 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC090623'; +$build_version = 'PC090829'; $pandora_version = 'v3.0-dev'; $config['start_time'] = microtime (true); diff --git a/pandora_console/operation/events/event_statistics.php b/pandora_console/operation/events/event_statistics.php index bcfc59e116..e8bf8e8953 100644 --- a/pandora_console/operation/events/event_statistics.php +++ b/pandora_console/operation/events/event_statistics.php @@ -27,6 +27,7 @@ if (! give_acl ($config['id_user'], 0, "AR")) { require ("general/noaccess.php"); return; } +echo "

".__('Events')." » ".__('Statistics'). "

"; echo ""; echo "
"; echo "

".__('Event graph')."

"; diff --git a/pandora_console/operation/extensions.php b/pandora_console/operation/extensions.php index dc5124e6c8..4db10026d8 100644 --- a/pandora_console/operation/extensions.php +++ b/pandora_console/operation/extensions.php @@ -26,8 +26,8 @@ if (sizeof ($config['extensions']) == 0) { echo '

'.__('There are no extensions defined').'

'; return; } - -echo '

'.__('Defined extensions')."

"; +echo "

".__('Extensions')." » "; +echo __('Defined extensions')."

"; $table->width = '95%'; $table->head = array (); $table->head[0] = __('Name');