From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 30 Mar 2010 15:28:02 +0000 (+0000)
Subject: Updated img location
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8806fe126aae8449b1a3d50cf6b545aab6993fb5;p=gosa.git

Updated img location


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

diff --git a/gosa-core/ihtml/themes/modern/headers.tpl b/gosa-core/ihtml/themes/modern/headers.tpl
index 8b43c3fe3..703db968f 100644
--- a/gosa-core/ihtml/themes/modern/headers.tpl
+++ b/gosa-core/ihtml/themes/modern/headers.tpl
@@ -25,7 +25,7 @@
     <!-- Include correct theme icon sets -->
     <style type="text/css">
       div.img, div.img div, input[type=submit].img{
-        background-image:url(themes/modern/img.png);
+        background-image:url(themes/modern/images/img.png);
       }
     </style>
     <link rel="shortcut icon" href="favicon.ico">
diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa
index c94fe9809..25a5dab2d 100755
--- a/gosa-core/update-gosa
+++ b/gosa-core/update-gosa
@@ -551,7 +551,7 @@ function rescan_images($path, $theme)
       // We're only interested in png files
       $indexPath= substr($fileInfo->getPathname(), $baseLength + 1);
       $path= $fileInfo->getPathname();
-      if (preg_match('/\.png$/', $indexPath) && !preg_match('/\.svn/', $path) && !preg_match('/themes\/[^\/]+\/img.png$/', $path)){
+      if (preg_match('/\.png$/', $indexPath) && !preg_match('/\.svn/', $path) && !preg_match('/themes\/[^\/]+\/images/img.png$/', $path)){
   
          // Grey image if it is not already one
          if (preg_match('/grey/', $indexPath)) {
@@ -739,7 +739,7 @@ function rescan_images($path, $theme)
     $styles[$imagePath]= $styles[$realPath];
   }
 
-  imagePNG($dst, "html/themes/$theme/img.png", 9);
+  imagePNG($dst, "html/themes/$theme/images/img.png", 9);
   imageDestroy($dst);
 
   // Show warnings images