Updated styles

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

diff --git a/gosa-core/html/themes/modern/style.css b/gosa-core/html/themes/modern/style.css
index d3fff133e2e66c9b165a3eb3fd921e159c2c8096..947318d10fa12ca4e0f6941bbabfeabb0c508f1e 100644 (file)
--- a/gosa-core/html/themes/modern/style.css
+++ b/gosa-core/html/themes/modern/style.css
@@ -69,7 +69,6 @@ color:#000;
 background-color:#DDD;
 }                     
 
-
 h1, h2, h3 {
   margin-top:2px;
 }
@@ -79,6 +78,20 @@ h3 {
   font-weight:bold;
 }
 
+div.img{
+  background-color:transparent;
+  background-repeat:no-repeat;
+  position:relative;
+}
+
+div.img div {
+  background-color:transparent;
+  background-repeat:no-repeat;
+  bottom:0;
+  right:0;
+  position:absolute;
+}
+
 
 /* Title bar definitions */
 
@@ -517,7 +530,6 @@ fieldset textarea:hover{
 
 .icon-menu-item div.img{
   float:left;
-  position:relative;
 }
 
 .icon-menu-item div.dsc{

diff --git a/gosa-core/ihtml/themes/modern/headers.tpl b/gosa-core/ihtml/themes/modern/headers.tpl
index b741938e7f891af2a711e0ee9642e1f8a5cfc22f..c40aabcccc39e37fe843a7e89a88bffacbb415db 100644 (file)
--- a/gosa-core/ihtml/themes/modern/headers.tpl
+++ b/gosa-core/ihtml/themes/modern/headers.tpl
@@ -28,15 +28,11 @@
   <!-- Include correct theme icon sets -->
   <style type="text/css">
     div.img{
-      background:transparent url(themes/modern/img.png) no-repeat;
-      position:relative
+      background-image:url(themes/modern/img.png);
     }
     
     div.img div {
-      background:transparent url(themes/modern/img.png) no-repeat;
-      bottom:0;
-      right:0;
-      position:absolute;
+      background-image:url(themes/modern/img.png);
     }
   </style>
 

diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc
index 6e1c059a76836d7cd55364a359649213835cc8b2..8c0bfe39b09e537390dcd74a9c7ba263b2a6a838 100644 (file)
--- a/gosa-core/include/class_pluglist.inc
+++ b/gosa-core/include/class_pluglist.inc
@@ -270,8 +270,7 @@ class pluglist
 
 
           $this->iconmenu.= "\n  <div class='icon-menu-item' style='width: 25%;' onclick='openPlugin({$index})'>";
-          /* $this->iconmenu.= "\n   ".image($icon); */
-          $this->iconmenu.= "\n   <div class='img' style='width:48px;height:48px;background-image: url({$icon});'></div>";
+          $this->iconmenu.= "\n   ".image($icon);
           $this->iconmenu.= "\n   <div class='dsc'>";
           $this->iconmenu.= "\n    <h1>{$title}</h1>";
           $this->iconmenu.= "\n    <p>{$desc}</p>";

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index fd8252b1ff4e11c06ba8bf22bf764c4cd765e8fb..fc2ff20455550af311d61cec75e9f276fa4a758e 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -3521,6 +3521,9 @@ function mark($needle, $haystack, $ignorecase= true)
 /* Return an image description using the path */
 function image($path, $label= null)
 {
+  global $config;
+  global $BASE_DIR;
+
   // Bail out, if there's no style file
   if(!session::global_is_set("img-styles")){
 

diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa
index 0ae8950bbc48ef62b729a2f99c85d67072f42613..be1de84a2d90655e40ba4101bbf61538b427f95e 100755 (executable)
--- a/gosa-core/update-gosa
+++ b/gosa-core/update-gosa
@@ -727,17 +727,17 @@ function rescan_images($path, $theme)
     imageCopyResampled($dst, $src, $x, $y, 0, 0, $imageWidth, $imageHeight, $imageWidth, $imageHeight);
     imageDestroy($src);
 
-    // Store style
+    // Eventually overload with grey part
     if (isset($duplicates[$imagePath])){
       $imageHeight= $heights[$duplicates[$imagePath]];
       $imageWidth= $widths[$duplicates[$imagePath]];
       $x= $posX[$duplicates[$imagePath]];
       $y= $posY[$duplicates[$imagePath]];
-      $styles[$imagePath]= "background-position:-$x -$y;width:".$imageWidth."px;height:".$imageHeight."px";
-    } else {
-      $styles[$imagePath]= "background-position:-$x -$y;width:".$imageWidth."px;height:".$imageHeight."px";
     }
 
+    // Store style
+    $styles[$imagePath]= "background-position:-".$x."px -".$y."px;width:".$imageWidth."px;height:".$imageHeight."px";
+
     echo ".";
     flush();
   }