tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
mdtrooper 2010-06-07 09:07:35 +00:00
parent d613b04eeb
commit 023258ff76
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -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> 2010-06-07 Sergio Martin <sergio.martin@artica.es>
* install.php: Fixed typo bug for bug 3012385 * install.php: Fixed typo bug for bug 3012385

20
pandora_console/godmode/alerts/alert_list.list.php
View File

@ -246,11 +246,11 @@ foreach ($simple_alerts as $alert) {
} else { } else {
$data[5] = '<ul class="action_list">'; $data[5] = '<ul class="action_list">';
foreach ($actions as $action_id => $action) { foreach ($actions as $action_id => $action) {
$data[5] .= '<li><div>'; $data[5] .= '<li>';
if ($alert['disabled']) 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 else
$data[5] .= '<span class="action_name">'; $data[5] .= '<font class="action_name">';
$data[5] .= $action['name']; $data[5] .= $action['name'];
$data[5] .= ' <em>('; $data[5] .= ' <em>(';
if ($action['fires_min'] == $action['fires_max']) { if ($action['fires_min'] == $action['fires_max']) {
@ -258,25 +258,25 @@ foreach ($simple_alerts as $alert) {
$data[5] .= __('Always'); $data[5] .= __('Always');
else else
$data[5] .= __('On').' '.$action['fires_min']; $data[5] .= __('On').' '.$action['fires_min'];
} else { }
else {
if ($action['fires_min'] == 0) if ($action['fires_min'] == 0)
$data[5] .= __('Until').' '.$action['fires_max']; $data[5] .= __('Until').' '.$action['fires_max'];
else else
$data[5] .= __('From').' '.$action['fires_min']. $data[5] .= __('From').' '.$action['fires_min'].
' '.__('to').' '.$action['fires_max']; ' '.__('to').' '.$action['fires_max'];
} }
$data[5] .= ')</em>'; $data[5] .= ')</em>';
$data[5] .= '</span>'; $data[5] .= '</font>';
$data[5] .= ' <span class="delete" style="clear:right">'; // $data[5] .= ' <span class="delete" style="clear:right">';
$data[5] .= '<form method="post" class="delete_link">'; $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_image ('delete', 'images/cross.png', 1, '', true);
$data[5] .= print_input_hidden ('delete_action', 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_alert', $alert['id'], true);
$data[5] .= print_input_hidden ('id_action', $action_id, true); $data[5] .= print_input_hidden ('id_action', $action_id, true);
$data[5] .= '</form>'; $data[5] .= '</form>';
$data[5] .= '</span>'; // $data[5] .= '</span>';
$data[5] .= '</div></li>'; $data[5] .= '</li>';
} }
$data[5] .= '</ul>'; $data[5] .= '</ul>';
} }