Updated styles and images for listings

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15825 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/html/themes/modern/style.css b/gosa-core/html/themes/modern/style.css
index f69757487f111ce54ceffb2710bd5340dc719bb9..4304e81f47c429709e6ad6943c4d8f51a7696afc 100644 (file)
--- a/gosa-core/html/themes/modern/style.css
+++ b/gosa-core/html/themes/modern/style.css
@@ -764,6 +764,14 @@ div.listContainer {
   padding-right:20px;
 }
 
+.listScrollContent td div.img {
+  padding-right:1px;
+}
+
+.listScrollContent td input[type=submit].img {
+  margin-right:1px;
+}
+
 .listBodyFormat tr td {
   color:#000;
   margin:3px;

diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index 3af94e18f995405171b30086a6d5cb215d3860e3..7b2cab1807c9923965c06e46a7888a3ddfddac02 100644 (file)
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -818,7 +818,7 @@ class listing {
     $objectType= $this->getObjectType($this->objectTypes, $classes);
     if ($objectType) {
       $this->objectDnMapping[$dn]= $objectType["objectClass"];
-      $result= "<img class='center' title='".LDAP::fix($dn)."' src='".$objectType["image"]."'>";
+      $result= image($objectType["image"], null, null, LDAP::fix($dn));
       if (!isset($this->objectTypeCount[$objectType['label']])) {
         $this->objectTypeCount[$objectType['label']]= 0;
       }
@@ -842,7 +842,7 @@ class listing {
     foreach($actions as $action) {
       // Skip the entry completely if there's no permission to execute it
       if (!$this->hasActionPermission($action, $dn, $classes)) {
-        $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+        $result.= image('images/empty.png');
         continue;
       }
 
@@ -852,12 +852,12 @@ class listing {
         if (preg_match('/^(.*)!$/', $fa, $m)){
           $fa= $m[1];
           if (isset($this->entries[$row][$fa]) && $this->entries[$row][$fa][0] == $fv) {
-            $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+            $result.= image('images/empty.png');
             continue;
           }
         } else {
           if (!isset($this->entries[$row][$fa]) && !$this->entries[$row][$fa][0] == $fv) {
-            $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+            $result.= image('images/empty.png');
             continue;
           }
         }
@@ -871,17 +871,17 @@ class listing {
         if (preg_match('/^!(.*)$/', $objectclass, $m)){
           $objectclass= $m[1];
           if(in_array($objectclass, $classes)) {
-            $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+            $result.= image('images/empty.png');
             continue;
           }
         } elseif (is_string($objectclass)) {
           if(!in_array($objectclass, $classes)) {
-            $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+            $result.= image('images/empty.png');
             continue;
           }
         } elseif (is_array($objectclass)) {
           if(count(array_intersect($objectclass, $classes)) != count($objectclass)){
-            $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+            $result.= image('images/empty.png');
             continue;
           }
         }
@@ -891,8 +891,7 @@ class listing {
       if ($action['type'] == "entry") {
         $label= $this->processElementFilter($action['label'], $this->entries[$row], $row);
         $image= $this->processElementFilter($action['image'], $this->entries[$row], $row);
-        $result.="<input class='center' type='image' src='$image' title='$label' ".
-                 "name='listing_".$action['name']."_$row' style='padding:1px'>";
+        $result.= image($image, null, "listing_".$action['name']."_$row", $label);
       }
 
       // Handle special types
@@ -1413,20 +1412,18 @@ class listing {
     // Render cut entries
     if($cut){
       if($ui->is_cutable($dn, $category, $class)){
-        $result .= "<input class='center' type='image'
-          src='images/lists/cut.png' alt='"._("Cut")."' name='listing_cut_$row' title='"._("Cut this entry")."' style='padding:1px'>";
+        $result.= image('images/lists/cut.png', null, "listing_cut_$row", _("Cut this entry"));
       }else{
-        $result.="<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+        $result.= image('images/empty.png');
       }
     }
 
     // Render copy entries
     if($copy){
       if($ui->is_copyable($dn, $category, $class)){
-        $result.= "<input class='center' type='image'
-          src='images/lists/copy.png' alt='"._("Copy")."' name='listing_copy_$row' title='"._("Copy this entry")."' style='padding:1px'>";
+        $result.= image('images/lists/copy.png', null, "listing_copy_$row", _("Copy this entry"));
       }else{
-        $result.="<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+        $result.= image('images/empty.png');
       }
     }
 
@@ -1506,21 +1503,17 @@ class listing {
 
         // Do we have snapshots for this dn?
         if($this->snapshotHandler->hasSnapshots($dn)){
-          $result.= "<input class='center' type='image' src='images/lists/restore.png' ".
-                     "alt='"._("Restore snapshot")."' name='listing_restore_$row' title='".
-                     _("Restore snapshot")."' style='padding:1px'>";
+          $result.= image('images/lists/restore.png', null, "listing_restore_$row", _("Restore snapshot"));
         } else {
-          $result.= "<img src='images/lists/restore_grey.png' alt=' ' class='center' style='padding:1px'>";
+          $result.= image('images/lists/restore_grey.png');
         }
       }
 
       // Draw snapshot button
       if($ui->allow_snapshot_create($dn, $category)){
-          $result.= "<input class='center' type='image' src='images/snapshot.png' ".
-                     "alt='"._("Create snapshot")."' name='listing_snapshot_$row' title='".
-                     _("Create a new snapshot from this object")."' style='padding:1px'>";
+          $result.= image('images/snapshot.png', null, "listing_snapshot_$row", _("Create a new snapshot from this object"));
       }else{
-          $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+          $result.= image('images/empty.png');
       }
     }
 

diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index 0eb5197f37b368e8948ae5c0aa8bb582b5324224..03a72b4eeab1c69ec69565cbf55cf2a80036d9f8 100644 (file)
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -786,11 +786,9 @@ class userManagement extends management
     // Walk thru map
     foreach ($map as $oc => $properties) {
       if (in_array_ics($oc, $classes)) {
-        $result.="<input class='center' type='image' src='".$properties['image']."' ".
-                 "alt='".$properties['alt']."' title='".$properties['title'].
-                 "' name='listing_edit_".$properties['plugin']."_$row' style='padding:1px'>";
+        $result.= image($properties['image'], null, "listing_edit_".$properties['plugin']."_$row", $properties['title']);
       } else {
-        $result.="<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+        $result.= image('images/empty.png');
       }
     }
     return $result;