diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 886d4cfde1..f5916c7e6e 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2011-04-04 Miguel de Dios + + * operation/events/events_list.php, operation/events/events.php: fixed + nested forms incompatible with some browsers that fail when validate + several events and some errors in javascript when validate individual error. + 2011-04-04 Miguel de Dios * include/functions_fsgraph.php: added check if loaded the class. diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index 76a0975920..e00283c233 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -13,7 +13,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. - // Load global vars global $config; @@ -383,7 +382,7 @@ $(document).ready( function() { }, function (data, status) { if (data == "ok") { - $("#status_img_"+id).attr ("src", "images/spiner.gif"); + $("#status_img_"+id).attr ("src", "images/spinner.gif"); location.reload(); } else { $("#result") @@ -393,7 +392,7 @@ $(document).ready( function() { }, "html" ); - toggleCommentForm(id); + //toggleCommentForm(id); }); $("a.delete_event").click (function () { diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index 8dcb989845..de952ecf19 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -452,7 +452,7 @@ foreach ($result as $event) { array_push ($table->data, $data); //Hiden row with description form - $string = '
'; + $string = '';//$string = ''; $string .= ''; $string .= ''; @@ -472,7 +472,7 @@ foreach ($result as $event) { if($event["id_alert_am"] != 0) { $string .= ''; } - $string .= '
'; $string .= '' . __('Comment:') . '' . print_textarea("comment_".$event["id_evento"], 2, 10, '', 'style="min-height: 10px; width: 250px;"', true) . '
'; + $string .= ''; //'; $data = array($string); @@ -598,7 +598,8 @@ echo '
'; if (!empty ($table->data)) { pagination ($total_events, $url."&pure=".$config["pure"], $offset, $pagination); - echo '
'; + echo ''; + echo ""; print_table ($table); @@ -607,7 +608,16 @@ if (!empty ($table->data)) { print_submit_button (__('Change status'), 'validate_btn', false, 'class="sub ok"'); } if (check_acl ($config["id_user"], 0,"IM") == 1) { - print_submit_button (__('Delete'), 'delete', false, 'class="sub delete"'); + + print_button(__('Delete'), 'delete_button', false, 'submit_delete();', 'class="sub delete"'); + ?> + +
';