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 8b43c3fe35057978c1c8ec0a0dd52e5f4a5c9a7c..703db968fa9f7d9f5295a79ddbad0654208b3c55 100644 (file)
--- 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 c94fe9809fc0b7fc9212729fc86ed57d57cf831b..25a5dab2d54a99a5f040d99373dc9e26ab2e0bac 100755 (executable)
--- 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