Fixed labeling

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

diff --git a/gosa-core/html/images/label-new.png b/gosa-core/html/images/label-new.png
new file mode 100644 (file)
index 0000000..dff21d7
Binary files /dev/null and b/gosa-core/html/images/label-new.png differ

diff --git a/gosa-core/html/images/new.png b/gosa-core/html/images/new.png
deleted file mode 100644 (file)
index dff21d7..0000000
Binary files a/gosa-core/html/images/new.png and /dev/null differ

diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index 53d50519d5507bfc91c0059c862e5243582844f3..a1f6a3c80ef7e763d757f44651823348ec0b4042 100644 (file)
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -1454,7 +1454,7 @@ class listing {
       if($restore){
         $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"restore\";document.getElementById(\"exec_act\").click();'>".image('images/lists/restore.png')."&nbsp;"._("Restore snapshots")."</a></li>";
       }else{
-        $result.= "<li$separator><a href='#'>".image('images/lists/restore_grey.png')."&nbsp;"._("Restore snapshots")."</a></li>";
+        $result.= "<li$separator><a href='#'>".image('images/lists/restore-grey.png')."&nbsp;"._("Restore snapshots")."</a></li>";
       }
     }
 
@@ -1504,7 +1504,7 @@ class listing {
         if($this->snapshotHandler->hasSnapshots($dn)){
           $result.= image('images/lists/restore.png', "listing_restore_$row", _("Restore snapshot"));
         } else {
-          $result.= image('images/lists/restore_grey.png');
+          $result.= image('images/lists/restore-grey.png');
         }
       }
 

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index 9ee6532c779f6e20a429f09cc21d9ba8ed13a3ba..aeb543b7e0c7e89c3243e312f90c2284b6ec1769 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -3557,6 +3557,8 @@ function image($path, $action= "", $title= "", $align= "middle")
     } else {
       die("Invalid label specified: $label\n");
     }
+
+    $path= preg_replace("/\[.*\]$/", "", $path);
   }
 
   // Non middle layout?

diff --git a/gosa-core/plugins/admin/users/user-list.xml b/gosa-core/plugins/admin/users/user-list.xml
index 6cc1dcbd83deb1e448179952eb7ec6ee07d5d47d..6997ba74364d6d71310d97440f72cb900ae464ea 100644 (file)
--- a/gosa-core/plugins/admin/users/user-list.xml
+++ b/gosa-core/plugins/admin/users/user-list.xml
@@ -91,14 +91,14 @@
      <action>
       <name>new</name>
       <type>entry</type>
-      <image>plugins/users/images/select_user.png</image>
+      <image>plugins/users/images/select_user.png[new]</image>
       <label>User</label>
      </action>
 
      <action>
       <name>new_template</name>
       <type>entry</type>
-      <image>plugins/users/images/select_template.png</image>
+      <image>plugins/users/images/select_template.png[new]</image>
       <label>Template</label>
      </action>
     </action>