From de01d11002e8cb88af4b24d4e7c390a0ebb9c3e2 Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 3 Mar 2010 10:27:44 +0000
Subject: [PATCH] Fixed labeling

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15896 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/html/images/{new.png => label-new.png} | Bin
 gosa-core/include/class_listing.inc              |   4 ++--
 gosa-core/include/functions.inc                  |   2 ++
 gosa-core/plugins/admin/users/user-list.xml      |   4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)
 rename gosa-core/html/images/{new.png => label-new.png} (100%)

diff --git a/gosa-core/html/images/new.png b/gosa-core/html/images/label-new.png
similarity index 100%
rename from gosa-core/html/images/new.png
rename to gosa-core/html/images/label-new.png
diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index 53d50519d..a1f6a3c80 100644
--- 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 9ee6532c7..aeb543b7e 100644
--- 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 6cc1dcbd8..6997ba743 100644
--- 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>
-- 
2.30.2