From 82373f34b069a3a101d0fac963d29fdddd97f8d8 Mon Sep 17 00:00:00 2001
From: juanmanuelr <noreply@pandorafms.org>
Date: Thu, 9 Feb 2012 14:15:12 +0000
Subject: [PATCH] 2012-02-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/snmpconsole/snmp_alert.php: Changed position of tables
'Alert filters' and 'Alert configuration' in this view.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5531 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_console/ChangeLog | 5 ++
.../godmode/snmpconsole/snmp_alert.php | 78 ++++++++++---------
2 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 64e3deeac3..59a778fe6d 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+ * godmode/snmpconsole/snmp_alert.php: Changed position of tables
+ 'Alert filters' and 'Alert configuration' in this view.
+
2012-02-09 Ramon Novoa <rnovoa@artica.es>
* operation/events/events_list.php: Removed short tags.
diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php
index 88a7d51b42..8b6148428f 100644
--- a/pandora_console/godmode/snmpconsole/snmp_alert.php
+++ b/pandora_console/godmode/snmpconsole/snmp_alert.php
@@ -185,6 +185,46 @@ if (isset ($_GET["delete_alert"])) { // Delete alert
if (isset ($_GET["update_alert"])) {
//the update_alert means the form should be displayed. If update_alert > 1 then an existing alert is updated
echo '<form name="agente" method="post" action="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_alert&submit='.$id_as.'">';
+
+ /* SNMP alert filters */
+
+ echo '<table cellpadding="4" cellspacing="4" width="98%" class="databox_color" style="border:1px solid #A9A9A9;">';
+
+ echo '<tr><td class="datos"><b>' . __('Alert filters') . ui_print_help_icon("snmp_alert_filters", true) . '</b></td></tr>';
+
+ // Custom
+ echo '<tr id="tr-custom_value"><td class="datos" valign="top">'.__('Custom Value/OID');
+ echo ui_print_help_icon ("snmp_alert_custom", true);
+
+ echo '</td><td class="datos">';
+ html_print_textarea ("custom_value", $custom_value, 2, $custom_value, 'style="width:400px;"');
+
+ echo '</td></tr>';
+
+ // SNMP Agent
+ echo '<tr id="tr-source_ip"><td class="datos2">'.__('SNMP Agent').' (IP)</td><td class="datos2">';
+ html_print_input_text ("source_ip", $source_ip, '', 20);
+ echo '</td></tr>';
+
+ // Trap type
+ echo '<tr><td class="datos">'.__('Trap type').'</td><td class="datos">';
+ $trap_types = array(0 => 'Cold start (0)', 1 => 'Warm start (1)', 2 => 'Link down (2)', 3 => 'Link up (3)', 4 => 'Authentication failure (4)', -1 => 'Other');
+ echo html_print_select ($trap_types, 'trap_type', $trap_type, '', '', '', false, false, false);
+ echo '</td></tr>';
+
+ // Single value
+ echo '<tr><td class="datos">'.__('Single value').'</td><td class="datos">';
+ html_print_input_text ("single_value", $single_value, '', 20);
+ echo '</td></tr>';
+
+ //Button
+ //echo '<tr><td></td><td align="right">';
+
+ // End table
+ echo "</td></tr></table>";
+
+ // Alert configuration
+
echo '<table cellpadding="4" cellspacing="4" width="98%" class="databox_color" style="border:1px solid #A9A9A9;">';
echo '<tr><td class="datos"><b>' . __('Alert configuration') . ui_print_help_icon("snmp_alert_configuration", true) . '</b></td></tr>';
@@ -325,44 +365,6 @@ if (isset ($_GET["update_alert"])) {
echo '</td></tr>';
echo '</table>';
- /* SNMP alert filters */
-
- echo '<table cellpadding="4" cellspacing="4" width="98%" class="databox_color" style="border:1px solid #A9A9A9;">';
-
- echo '<tr><td class="datos"><b>' . __('Alert filters') . ui_print_help_icon("snmp_alert_filters", true) . '</b></td></tr>';
-
- // Custom
- echo '<tr id="tr-custom_value"><td class="datos" valign="top">'.__('Custom Value/OID');
- echo ui_print_help_icon ("snmp_alert_custom", true);
-
- echo '</td><td class="datos">';
- html_print_textarea ("custom_value", $custom_value, 2, $custom_value, 'style="width:400px;"');
-
- echo '</td></tr>';
-
- // SNMP Agent
- echo '<tr id="tr-source_ip"><td class="datos2">'.__('SNMP Agent').' (IP)</td><td class="datos2">';
- html_print_input_text ("source_ip", $source_ip, '', 20);
- echo '</td></tr>';
-
- // Trap type
- echo '<tr><td class="datos">'.__('Trap type').'</td><td class="datos">';
- $trap_types = array(0 => 'Cold start (0)', 1 => 'Warm start (1)', 2 => 'Link down (2)', 3 => 'Link up (3)', 4 => 'Authentication failure (4)', -1 => 'Other');
- echo html_print_select ($trap_types, 'trap_type', $trap_type, '', '', '', false, false, false);
- echo '</td></tr>';
-
- // Single value
- echo '<tr><td class="datos">'.__('Single value').'</td><td class="datos">';
- html_print_input_text ("single_value", $single_value, '', 20);
- echo '</td></tr>';
-
- //Button
- //echo '<tr><td></td><td align="right">';
-
-
- // End table
- echo "</td></tr></table>";
-
echo "<table style='width:98%'>";
echo '<tr><td></td><td align="right">';
if ($id_as > 0) {