Updated ACL checks.

[gosa.git] / gosa-core / plugins / admin / departments / class_divListDepartment.inc

diff --git a/gosa-core/plugins/admin/departments/class_divListDepartment.inc b/gosa-core/plugins/admin/departments/class_divListDepartment.inc
index dde8370567f7af1054a55f9d8406528b43d579fa..f4f85944fcbf24fc778b29330194827ca502aea2 100644 (file)
--- a/gosa-core/plugins/admin/departments/class_divListDepartment.inc
+++ b/gosa-core/plugins/admin/departments/class_divListDepartment.inc
@@ -58,7 +58,7 @@ class divListDepartment extends MultiSelectWindow
 
 
    /* Toggle all selected / deselected */
-    $chk = "<input type='checkbox' id='select_all' name='select_all'
+    $chk = "<input type='checkbox' id='select_all' name='select_all' title='"._("Select all")."'
                onClick='toggle_all_(\"^item_selected_[a-zA-Z0-9\\/\=]*$\",\"select_all\");' >";
 
     /* set Page header */
@@ -142,20 +142,20 @@ class divListDepartment extends MultiSelectWindow
 
     $listhead .=  
       " "._("Base")."&nbsp;<select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
-      " <input class='center' type='image' src='images/list_submit.png' align='middle' ".
+      " <input class='center' type='image' src='images/lists/submit.png' align='middle' ".
       "   title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;";
 
     /* Create Layers menu */
     $s  = ".|"._("Actions")."|\n";
-    $s .= "..|<img src='images/list_new.png' alt='' border='0' class='center'>".
-      "&nbsp;"._("Create")."|\n";
 
     /* Append create options */
     if(preg_match("/c/",$acl)) {
-      $s.= "...|<input class='center' type='image' src='images/list_new_department' alt=''>".
+      $s .= "..|<img src='images/lists/new.png' alt='' border='0' class='center'>".
+        "&nbsp;"._("Create")."|\n";
+      $s.= "...|<input class='center' type='image' src='plugins/departments/images/department.png' alt=''>".
         "&nbsp;"._("Department")."|dep_new|\n";
+      $s.= "..|---|\n";
     }
-    $s.= "..|---|\n";
     $s.= "..|<img src='images/lists/trash.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Remove")."|"."remove_multiple|\n";
 
@@ -180,12 +180,12 @@ class divListDepartment extends MultiSelectWindow
       $actions= "";      
 
       $acl = $ui->get_permissions($this->config->departments[$key] ,"department/department");
-      if(preg_match("/r/",$acl)){
-        $actions.= "<input class='center' type='image' src='images/edit.png'
-          alt='"._("edit")."'   name='dep_edit_%KEY%' title='"._("Edit this entry")."'>";
-      }
+      $acl_all = $ui->has_complete_category_acls($this->config->departments[$key] ,"department");
+
+      $actions.= "<input class='center' type='image' src='images/lists/edit.png'
+        alt='"._("edit")."'   name='dep_edit_%KEY%' title='"._("Edit this entry")."'>";
 
-      if(preg_match("/c/",$acl)){
+      if(preg_match("/d/",$acl)){
         $actions.= "<input class='center' type='image' src='images/lists/trash.png'
           alt='"._("delete")."'   name='dep_del_%KEY%' title='"._("Delete this entry")."'>";
       }
@@ -216,7 +216,7 @@ class divListDepartment extends MultiSelectWindow
             "attach" => "style='width:20px;'");
       }
 
-      $field0 = array("string" => "<img src='images/".$non_empty."folder.png' title='"._("department")."' alt='department'>", "attach" => "style='text-align:center;width:20px;'");
+      $field0 = array("string" => "<img src='images/".$non_empty."lists/folder.png' title='"._("department")."' alt='department'>", "attach" => "style='text-align:center;width:20px;'");
       $field1 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style='' title='".$title."'");
       $field2 = array("string" => preg_replace("/%KEY%/", base64_encode($key), $actions), "attach" => "style='width:60px;border-right:0px;text-align:
           right;'");
@@ -227,7 +227,7 @@ class divListDepartment extends MultiSelectWindow
     /* Create summary string for list footer */
     $num_deps=count($list);
     $num_dep_str = _("Number of listed departments");
-    $str = "<img class='center' src='images/folder.png'
+    $str = "<img class='center' src='images/lists/folder.png'
               title='".$num_dep_str."' alt='".$num_dep_str."'>&nbsp;".$num_deps."&nbsp;&nbsp;&nbsp;&nbsp;";
     $this->set_List_Bottom_Info($str);