From 126d0f00dcabb995f49040a3a550ffc45717f668 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Mon, 7 Jun 2010 09:07:35 +0000
Subject: [PATCH] 2010-06-07  Miguel de Dios  <miguel.dedios@artica.es>

	* godmode/alerts/alert_list.list.php: fixed the style of action list in the
	alert list.

	Fixes: #3000991



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2866 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |  7 +++++++
 .../godmode/alerts/alert_list.list.php        | 20 +++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 7479eb0b6a..ff1158d131 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-07  Miguel de Dios  <miguel.dedios@artica.es>
+
+	* godmode/alerts/alert_list.list.php: fixed the style of action list in the
+	alert list.
+	
+	Fixes: #3000991
+
 2010-06-07  Sergio Martin <sergio.martin@artica.es>
 
 	* install.php: Fixed typo bug for bug 3012385
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index 8d9af0956f..921d49c645 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -246,11 +246,11 @@ foreach ($simple_alerts as $alert) {
 	} else {
 		$data[5] = '<ul class="action_list">';
 		foreach ($actions as $action_id => $action) {
-			$data[5] .= '<li><div>';
+			$data[5] .= '<li>';
 			if ($alert['disabled'])
-				$data[5] .= '<span class="action_name" style="font-style: italic; color: #aaaaaa;">';
+				$data[5] .= '<font class="action_name" style="font-style: italic; color: #aaaaaa;">';
 			else
-				$data[5] .= '<span class="action_name">';
+				$data[5] .= '<font class="action_name">';
 			$data[5] .= $action['name'];
 			$data[5] .= ' <em>(';
 			if ($action['fires_min'] == $action['fires_max']) {
@@ -258,25 +258,25 @@ foreach ($simple_alerts as $alert) {
 					$data[5] .= __('Always');
 				else
 					$data[5] .= __('On').' '.$action['fires_min'];
-			} else {
+			}
+			else {
 				if ($action['fires_min'] == 0)
 					$data[5] .= __('Until').' '.$action['fires_max'];
 				else
 					$data[5] .= __('From').' '.$action['fires_min'].
 						' '.__('to').' '.$action['fires_max'];
 			}
-		
 			$data[5] .= ')</em>';
-			$data[5] .= '</span>';
-			$data[5] .= ' <span class="delete" style="clear:right">';
-			$data[5] .= '<form method="post" class="delete_link">';
+			$data[5] .= '</font>';
+//			$data[5] .= ' <span class="delete" style="clear:right">';
+			$data[5] .= '<form method="post" class="delete_link" style="display: inline; vertical-align: -50%;">';
 			$data[5] .= print_input_image ('delete', 'images/cross.png', 1, '', true);
 			$data[5] .= print_input_hidden ('delete_action', 1, true);
 			$data[5] .= print_input_hidden ('id_alert', $alert['id'], true);
 			$data[5] .= print_input_hidden ('id_action', $action_id, true);
 			$data[5] .= '</form>';
-			$data[5] .= '</span>';
-			$data[5] .= '</div></li>';
+//			$data[5] .= '</span>';
+			$data[5] .= '</li>';
 		}
 		$data[5] .= '</ul>';
 	}