diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index e5e0d63698..175c0164fa 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2009-11-03 Raul Mateos + + * godmode/alerts/configure*.php: Improving integrity of + appareance in title. + + * godmode/alerts/alert_actions.php, godmode/alerts/alert_templates.php: + Added text if no action, list or template defined. + + * godmode/alerts/alert_list.php: Small fix + 2009-11-02 Sancho Lerena * include/config_process.php: Updated build/version. diff --git a/pandora_console/godmode/alerts/alert_actions.php b/pandora_console/godmode/alerts/alert_actions.php index aefe6aca92..31ee361426 100644 --- a/pandora_console/godmode/alerts/alert_actions.php +++ b/pandora_console/godmode/alerts/alert_actions.php @@ -129,8 +129,11 @@ foreach ($actions as $action) { array_push ($table->data, $data); } - -print_table ($table); +if (isset($data)){ + print_table ($table); +} else { + echo "
".__('No alert actions configured')."
"; +} echo '
'; echo '
'; diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php index bd7d3e24bc..547be4db80 100644 --- a/pandora_console/godmode/alerts/alert_list.php +++ b/pandora_console/godmode/alerts/alert_list.php @@ -193,7 +193,7 @@ if ($id_agente) { echo '

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

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

'.__('Alerts').' » '.__('Manage alerts').'

';; + echo '

'.__('Alerts').' » '.__('Manage 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 c55b702ba1..1a96b6bea6 100644 --- a/pandora_console/godmode/alerts/alert_templates.php +++ b/pandora_console/godmode/alerts/alert_templates.php @@ -225,8 +225,11 @@ foreach ($templates as $template) { } pagination ($total_templates, $url); -print_table ($table); - +if (isset($data)){ + print_table ($table); +} else { + echo "
".__('No alert templates defined')."
"; +} echo '
'; echo ''; print_submit_button (__('Create'), 'create', false, 'class="sub next"'); diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php index f590ca858a..2524bd8079 100644 --- a/pandora_console/godmode/alerts/configure_alert_action.php +++ b/pandora_console/godmode/alerts/configure_alert_action.php @@ -42,7 +42,7 @@ if ($id) { $field3 = $action['field3']; } -echo '

'.__('Configure alert action').'

'; +echo "

".__('Alerts')." » ".__('Configure alert action')."

"; $table->width = '90%'; $table->style = array (); diff --git a/pandora_console/godmode/alerts/configure_alert_command.php b/pandora_console/godmode/alerts/configure_alert_command.php index 54372324d5..e0de6da772 100644 --- a/pandora_console/godmode/alerts/configure_alert_command.php +++ b/pandora_console/godmode/alerts/configure_alert_command.php @@ -38,7 +38,7 @@ if ($id) { $description = $alert['description']; } -echo '

'.__('Configure alert command').'

'; +echo '

'.__('Alerts').' » '.__('Configure alert command').'

'; $table->width = '90%'; $table->style = array (); diff --git a/pandora_console/godmode/alerts/configure_alert_compound.php b/pandora_console/godmode/alerts/configure_alert_compound.php index 16dbb68f1c..d9b2b96443 100644 --- a/pandora_console/godmode/alerts/configure_alert_compound.php +++ b/pandora_console/godmode/alerts/configure_alert_compound.php @@ -520,7 +520,7 @@ echo ''; /* Show alert search when we're on the first step */ if ($step == 1) { - echo '

'.__('Add condition').'

'; + echo '

'.__('Add condition').'

'; $id_group = (int) get_parameter ('id_group'); diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php index f064dc8fd2..446f7cc15e 100644 --- a/pandora_console/godmode/alerts/configure_alert_template.php +++ b/pandora_console/godmode/alerts/configure_alert_template.php @@ -294,7 +294,7 @@ if ($id && ! $create_template) { $priority = $template['priority']; } -echo '

'.__('Configure alert template').'

'; +echo '

'.__('Alerts').' » '.__('Configure alert template').'

'; print_alert_template_steps ($step, $id); diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 45a8c1885b..98f26ede3f 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -124,8 +124,8 @@ h1#log { color: #000; } h1#log_f { - color: #f00; - border-bottom: 1px solid #f00; + color: #c00; + border-bottom: 1px solid #c00; padding-bottom: 3px; } div#login { @@ -324,27 +324,21 @@ td.datos4 { text-align: center !important; background-color: #d4ddc6; } - td.datos_id { color: #1a313a; } - tr.rowPair { background-color: #fff; } - tr.rowOdd { background-color: #EEEEEE; } - tr.rowPair:hover { background-color: #E0E0E0; } - tr.rowOdd:hover { background-color: #E0E0E0 } - .bg { /* op menu */ background-color: #786; } @@ -399,7 +393,7 @@ tr.rowOdd:hover { background: url(../../images/help.png) no-repeat; } .red, .redb, .redi, .error { - color: #f00; + color: #c00; } .sep {