From 3169f7fa3799100c45f829a7b43c971f42032c77 Mon Sep 17 00:00:00 2001
From: raulmateos <noreply@pandorafms.org>
Date: Fri, 23 Jul 2010 10:04:12 +0000
Subject: [PATCH] =?UTF-8?q?2010-07-23=20=20Ra=C3=BAl=20Mateos=20=20=20<rau?=
=?UTF-8?q?lofpandora@gmail.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* godmode/alerts/aler_list*.php: Cleaned code. Removed old title style.
* godmode/agentes/massive_operations.php: Updated year.
* godmode/agentes/massive_config.php: Use better text in title and button.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3055 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_console/ChangeLog | 8 ++++++++
pandora_console/godmode/agentes/massive_config.php | 6 +++---
pandora_console/godmode/agentes/massive_operations.php | 2 +-
pandora_console/godmode/alerts/alert_list.builder.php | 4 +---
pandora_console/godmode/alerts/alert_list.list.php | 2 --
pandora_console/godmode/alerts/alert_list.php | 2 +-
6 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 343cd5b137..b10ea70bf1 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-23 Raúl Mateos <raulofpandora@gmail.com>
+
+ * godmode/alerts/aler_list*.php: Cleaned code. Removed old title style.
+
+ * godmode/agentes/massive_operations.php: Updated year.
+
+ * godmode/agentes/massive_config.php: Use better text in title and button.
+
2010-07-21 Miguel de Dios <miguel.dedios@artica.es>
* operation/snmpconsole/snmp_view.php: added the show more data when click
diff --git a/pandora_console/godmode/agentes/massive_config.php b/pandora_console/godmode/agentes/massive_config.php
index c18755d4ba..c63f6e25cf 100644
--- a/pandora_console/godmode/agentes/massive_config.php
+++ b/pandora_console/godmode/agentes/massive_config.php
@@ -2,7 +2,7 @@
// Pandora FMS - http://pandorafms.com
// ==================================================
-// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
+// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
@@ -28,7 +28,7 @@ require_once ('include/functions_agents.php');
require_once ('include/functions_alerts.php');
require_once ('include/functions_modules.php');
-echo '<h3>'.__('Configuration management').'</h3>';
+echo '<h3>'.__('Massive copy').'</h3>';
$source_id_group = (int) get_parameter ('source_id_group');
$source_id_agent = (int) get_parameter ('source_id_agent');
@@ -158,7 +158,7 @@ echo '</fieldset>';
echo '<div class="action-buttons" style="width: '.$table->width.'">';
print_input_hidden ('do_operation', 1);
-print_submit_button (__('Go'), 'go', false, 'class="sub next"');
+print_submit_button (__('Copy'), 'go', false, 'class="sub wand"');
echo '</div>';
echo '</form>';
diff --git a/pandora_console/godmode/agentes/massive_operations.php b/pandora_console/godmode/agentes/massive_operations.php
index e5f4180d30..1610ec239e 100644
--- a/pandora_console/godmode/agentes/massive_operations.php
+++ b/pandora_console/godmode/agentes/massive_operations.php
@@ -2,7 +2,7 @@
// Pandora FMS - http://pandorafms.com
// ==================================================
-// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
+// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
diff --git a/pandora_console/godmode/alerts/alert_list.builder.php b/pandora_console/godmode/alerts/alert_list.builder.php
index d47ba79d04..91b1ade6a3 100644
--- a/pandora_console/godmode/alerts/alert_list.builder.php
+++ b/pandora_console/godmode/alerts/alert_list.builder.php
@@ -25,8 +25,6 @@ if (! give_acl ($config['id_user'], 0, "LW")) {
exit;
}
-echo '<h3>'.__('Add alert').'</h3>';
-
$table->id = 'add_alert_table';
$table->class = 'databox';
$table->head = array ();
@@ -98,7 +96,7 @@ echo '<form class="add_alert_form" method="post">';
print_table ($table);
echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_submit_button (__('Add'), 'add', false, 'class="sub wand"');
+print_submit_button (__('Add alert'), 'add', false, 'class="sub wand"');
print_input_hidden ('create_alert', 1);
echo '</div></form>';
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index 1b2cca2082..7992bbab3f 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -34,8 +34,6 @@ if (! give_acl ($config['id_user'], 0, "LW")) {
exit;
}
-echo "<h2>".__('Alerts')."</h2>";
-
echo '<a href="#" id="tgl_alert_control"><b>'.__('Alert control filter').'</b> '.print_image ("images/down.png", true, array ("title" => __('Toggle filter(s)'))).'</a><br><br>';
//INI DIV OF FORM FILTER
diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php
index 44ae3bc772..ea4aff3cf5 100644
--- a/pandora_console/godmode/alerts/alert_list.php
+++ b/pandora_console/godmode/alerts/alert_list.php
@@ -184,7 +184,7 @@ else {
print_page_header(__('Alerts') . ' » ' . __('Manage alerts') . ' » ' . __('Create'), "images/god2.png", false, "manage_alert_list", true, $buttons);
} else {
print_page_header(__('Alerts') . ' » ' . __('Manage alerts') . ' » ' . __('List'), "images/god2.png", false, "manage_alert_list", true, $buttons);
- }
+ }
echo $messageAction;