diff --git a/pandora_console/operation/events/events.build_table.php b/pandora_console/operation/events/events.build_table.php index 8a506c979e..a7a7048679 100644 --- a/pandora_console/operation/events/events.build_table.php +++ b/pandora_console/operation/events/events.build_table.php @@ -666,8 +666,12 @@ else { if ($i != 0 && $allow_action) { //Actions - $data[$i] = ''; - + $data[$i] = ''; + $data[$i] .= html_print_input_hidden('event_title_'.$event["id_evento"], "#".$event["id_evento"]." - " . strip_tags(io_safe_output($event["evento"])), true); + $data[$i] .= html_print_image ("images/eye.png", true, + array ("title" => __('Show more'))); + $data[$i] .= ''; + if(!$readonly) { // Validate event if (($event["estado"] != 1) && (tags_checks_event_acl ($config["id_user"], $event["id_grupo"], "EW", $event['clean_tags'], $childrens_ids))) { @@ -676,6 +680,13 @@ else { $data[$i] .= html_print_image ("images/ok.png", true, array ("title" => __('Validate event'))); $data[$i] .= ''; + // Display the go to in progress status button + if ($event["estado"] != 2) { + $data[$i] .= ''; + $data[$i] .= html_print_image ("images/hourglass.png", true, + array ("title" => __('Change to in progress status'))); + $data[$i] .= ''; + } } // Delete event @@ -693,13 +704,7 @@ else { } } } - - $data[$i] .= ''; - $data[$i] .= html_print_input_hidden('event_title_'.$event["id_evento"], "#".$event["id_evento"]." - " . strip_tags(io_safe_output($event["evento"])), true); - $data[$i] .= html_print_image ("images/eye.png", true, - array ("title" => __('Show more'))); - $data[$i] .= ''; - + $table->cellstyle[count($table->data)][$i] = 'background: #F3F3F3;'; $i++; diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index 9564e87b5e..6532285ef9 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -966,6 +966,7 @@ function validate_event_advanced(id, new_status) { // Change state image $("#validate-"+id).css("display", "none"); + $("#in-progress-"+id).css("display", "none"); $("#status_img_"+id).attr ("src", "images/tick.png"); $("#status_img_"+id).attr ("title", ); $("#status_img_"+id).attr ("alt", ); @@ -986,9 +987,21 @@ function validate_event_advanced(id, new_status) { // Change state image $("#status_img_"+id).attr ("src", "images/hourglass.png"); - $("#status_img_"+id).attr ("title", ); + $("#status_img_"+id).attr ("data-title", ); $("#status_img_"+id).attr ("alt", ); - + $("#status_img_"+id).attr ("data-use_title_for_force_title", 1); + $("#status_img_"+id).attr ("class", "forced_title"); + + // Change the actions buttons + $("#delete-"+id).remove(); + $("#in-progress-"+id).remove(); + // Format the new disabled delete icon. + $("#validate-"+id).parent().append(""); + $("#delete-"+id).attr ("data-title", ); + $("#delete-"+id).attr ("alt", ); + $("#delete-"+id).attr ("data-use_title_for_force_title", 1); + $("#delete-"+id).attr ("class", "forced_title"); + // Remove row due to new state if (($("#status").val() == 0) || ($("#status").val() == 1)) {