Fixed duplicate handling

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

diff --git a/gosa-core/html/themes/modern/style.css b/gosa-core/html/themes/modern/style.css
index d42a50133c51a51845923d3f42620982155ddfb1..ce02f658bc1824c700976ca66b3b7b8ecfa5e419 100644 (file)
--- a/gosa-core/html/themes/modern/style.css
+++ b/gosa-core/html/themes/modern/style.css
@@ -41,16 +41,16 @@ input[type=checkbox]{
   border:1px solid #CCC;
 }
 
-input[type=text]{
+input[type=text], input[type=password]{
   border:1px solid #CCC;
   padding:3px;
 }
 
-input[type=text]:active, input[type=text]:focus{
+input[type=text]:active, input[type=text]:focus, input[type=password]:active, input[type=password]:focus,{
   border:1px solid #777;
 }
 
-input[type=text]:hover{
+input[type=text]:hover, input[type=password]:hover{
   border-color:#777;
 }
 

diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa
index ace236ae48befbb608990b2b8adcf192093c23c2..6e5eece048256789a46f1e40a9ea5f6b78026f9c 100755 (executable)
--- a/gosa-core/update-gosa
+++ b/gosa-core/update-gosa
@@ -587,6 +587,7 @@ function rescan_images($path, $theme)
            $warnings[]= "Warning: images $indexPath seems to be a duplicate of ".array_search($checksum, $checksums);
            $duplicates[$indexPath]= array_search($checksum, $checksums);
            $duplicates[$greyIndexPath]= preg_replace('/\.png$/', '-grey.png', array_search($checksum, $checksums));
+           continue;
          } else {
            $checksums[$indexPath]= $checksum;
          }
@@ -686,7 +687,7 @@ function rescan_images($path, $theme)
     // Move X cursor to the next position
     $cursorX+= $imageWidth;
 
-    $maxX=($colX > $maxX)?$colX:$maxX;
+    $maxX=($colX+$imageWidth > $maxX)?$colX+$imageWidth:$maxX;
   }
   
   // Print maximum dimensions
@@ -709,32 +710,23 @@ function rescan_images($path, $theme)
 
     // Insert source image...
 
-    // Duplicate?
-    if (isset($duplicates[$imagePath])){
-      $imageHeight= $heights[$duplicates[$imagePath]];
-      $imageWidth= $widths[$duplicates[$imagePath]];
-      $x= $posX[$duplicates[$imagePath]];
-      $y= $posY[$duplicates[$imagePath]];
-    } else {
-
-      // Eventually convert it to grey before
-      if (preg_match('/-grey\.png$/', $imagePath)) {
-        if (!function_exists("imageFilter")){
-          exec("convert ".$paths[$imagePath]." -colorspace Gray /tmp/grey-converted.png");
-          $src= imageCreateFromPng("/tmp/grey-converted.png");
-        } else {
-          $src= imageCreateFromPng($paths[$imagePath]);
-          imageFilter($src, IMG_FILTER_GRAYSCALE);
-        }
+    // Eventually convert it to grey before
+    if (preg_match('/-grey\.png$/', $imagePath)) {
+      if (!function_exists("imageFilter")){
+        exec("convert ".$paths[$imagePath]." -colorspace Gray /tmp/grey-converted.png");
+        $src= imageCreateFromPng("/tmp/grey-converted.png");
       } else {
         $src= imageCreateFromPng($paths[$imagePath]);
+        imageFilter($src, IMG_FILTER_GRAYSCALE);
       }
-
-      // Merge image
-      imageCopyResampled($dst, $src, $x, $y, 0, 0, $imageWidth, $imageHeight, $imageWidth, $imageHeight);
-      imageDestroy($src);
+    } else {
+      $src= imageCreateFromPng($paths[$imagePath]);
     }
 
+    // Merge image
+    imageCopyResampled($dst, $src, $x, $y, 0, 0, $imageWidth, $imageHeight, $imageWidth, $imageHeight);
+    imageDestroy($src);
+
     // Store style
     $styles[$imagePath]= "background-position:-".$x."px -".$y."px;width:".$imageWidth."px;height:".$imageHeight."px";
 
@@ -742,6 +734,11 @@ function rescan_images($path, $theme)
     flush();
   }
 
+  /* Add duplicates */
+  foreach ($duplicates as $imagePath => $realPath) {
+    $styles[$imagePath]= $styles[$realPath];
+  }
+
   imagePNG($dst, "html/themes/$theme/img.png", 9);
   imageDestroy($dst);