From f601388d613c3ef9ee4e93814060779aa9bd16ee Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 25 Oct 2007 10:10:44 +0000 Subject: [PATCH] Added status col git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7653 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../addons/gotomasses/class_divListMasses.inc | 26 +++++++++++++------ .../addons/gotomasses/class_gotomasses.inc | 6 +++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/plugins/addons/gotomasses/class_divListMasses.inc b/plugins/addons/gotomasses/class_divListMasses.inc index 1cfbe1021..f504380cc 100644 --- a/plugins/addons/gotomasses/class_divListMasses.inc +++ b/plugins/addons/gotomasses/class_divListMasses.inc @@ -94,6 +94,10 @@ class divListMasses extends MultiSelectWindow $colors[1] = "#EEEEEE"; $c_keys = array(); $last_c = 0; + if($this->parent->sort_dir=="down"){ + $last_c = !$last_c; + } + foreach($tasks as $key => $task){ /* Skip unchecked actions */ @@ -101,6 +105,9 @@ class divListMasses extends MultiSelectWindow continue; } + + + /* Handle coloring */ $color=""; if($this->parent->sort_by == "TaskID"){ if(!in_array($task['TASK_ID'],$c_keys)){ @@ -110,30 +117,33 @@ class divListMasses extends MultiSelectWindow $color = "background-color: ".$colors[$last_c]; } - + /* Create actions */ $id = $task['ID']; $queue_pos = $task['Queue_Position']; $prio_actions = " "; $prio_actions.= " "; $prio_actions.= " "; $prio_actions.= " "; - $action = ""; if($this->parent->acl_is_removeable()){ $action.= ""; } - /* Create each field */ - $field0 = array("string" => "" , - "attach" => "style='width:20px;".$color."'"); + + $display = preg_replace(array("/%id%/","/%str%/"),array($id,$this->parent->target_to_string($task)),$edit_link); + $display2= $this->parent->get_additional_entry_informations($task); /* Create each field */ - $field0a = array("string" => $queue_pos ,"attach" => "style='width:20px;".$color."'"); - $field1 = array("string" => preg_replace(array("/%id%/","/%str%/"),array($id,$this->parent->target_to_string($task)),$edit_link), + $field0 = array("string" => "" , + "attach" => "style='width:20px;".$color."'"); + $field0a= array("string" => $queue_pos ,"attach" => "style='width:20px;".$color."'"); + $field1 = array("string" => $display, "attach" => "style='".$color."'"); + $field1a= array("string" => $display2, + "attach" => "style='".$color.";width:80px;'"); $field2 = array("string" => $this->parent->time_to_string($task),"attach" => "style='".$color.";width:100px;'"); $field3 = array("string" => $this->parent->action_to_string($task),"attach" => "style='".$color.";width:80px;'"); $field4 = array("string" => $prio_actions.$action,"attach" => "style='".$color.";text-align:right;width:120px;border-right:0px;'"); - $this->AddElement(array($field0,$field0a,$field1,$field2,$field3,$field4)); + $this->AddElement(array($field0,$field0a,$field1,$field1a,$field2,$field3,$field4)); } } diff --git a/plugins/addons/gotomasses/class_gotomasses.inc b/plugins/addons/gotomasses/class_gotomasses.inc index 3fb9061ec..6e364c2b8 100644 --- a/plugins/addons/gotomasses/class_gotomasses.inc +++ b/plugins/addons/gotomasses/class_gotomasses.inc @@ -267,6 +267,12 @@ class gotomasses extends plugin } + function get_additional_entry_informations($data) + { + return("
 
"); + } + + function target_to_string($data) { $ret = ""; -- 2.30.2