From b37569653330231b1c5347da4e99fbf2b72664b8 Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 2 Mar 2010 07:17:07 +0000
Subject: [PATCH] Updated styles

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15823 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/html/themes/modern/style.css    | 19 ++++++++++++++----
 gosa-core/ihtml/themes/modern/headers.tpl |  5 +----
 gosa-core/include/class_listing.inc       | 24 +++++++++++------------
 gosa-core/include/functions.inc           |  7 +++++--
 4 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/gosa-core/html/themes/modern/style.css b/gosa-core/html/themes/modern/style.css
index abd788fd7..f69757487 100644
--- a/gosa-core/html/themes/modern/style.css
+++ b/gosa-core/html/themes/modern/style.css
@@ -85,18 +85,25 @@ img, input[type=image] {
 }
 
 /* Image with migration color */
-button.img{
-  background:none;
+
+input[type=submit].img{
   border:0;
-  margin:0;
   padding:0;
+  margin:0;
+  display:inline-block;
+  display:-moz-inline-block;
+  background-color:transparent;
+  background-repeat:no-repeat;
+  position:relative;
+  cursor:pointer;
 }
 
 div.img{
+  display:inline-block;
+  display:-moz-inline-block;
   background-color:transparent;
   background-repeat:no-repeat;
   position:relative;
-  float:left;
 }
 
 div.img div {
@@ -462,6 +469,10 @@ button:focus, .button:active {
   cursor:pointer;
 }
 
+.icon-menu-item div.img{
+  float:left;
+}
+
 .icon-menu-item div.dsc{
   margin-left:55px
 }
diff --git a/gosa-core/ihtml/themes/modern/headers.tpl b/gosa-core/ihtml/themes/modern/headers.tpl
index 3edac053a..8b43c3fe3 100644
--- a/gosa-core/ihtml/themes/modern/headers.tpl
+++ b/gosa-core/ihtml/themes/modern/headers.tpl
@@ -24,10 +24,7 @@
 
     <!-- Include correct theme icon sets -->
     <style type="text/css">
-      div.img{
-        background-image:url(themes/modern/img.png);
-      }
-      div.img div {
+      div.img, div.img div, input[type=submit].img{
         background-image:url(themes/modern/img.png);
       }
     </style>
diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index 37efe409d..3af94e18f 100644
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -416,7 +416,7 @@ class listing {
       foreach ($this->objectTypes as $objectType) {
         if (isset($this->objectTypeCount[$objectType['label']])) {
           $label= _($objectType['label']);
-          $result.= "<img class='center' src='".$objectType['image']."' title='$label' alt='$label'>&nbsp;".$this->objectTypeCount[$objectType['label']]."&nbsp;&nbsp;&nbsp;&nbsp;";
+          $result.= image($objectType['image'], null, null, $label)."&nbsp;".$this->objectTypeCount[$objectType['label']]."&nbsp;&nbsp;";
         }
       }
 
@@ -551,7 +551,7 @@ class listing {
       // Override base if we got signals from the navigation elements
       $action= "";
       foreach ($_POST as $key => $value) {
-        if (preg_match('/^(ROOT|BACK|HOME)_x$/', $key, $match)) {
+        if (preg_match('/^(ROOT|BACK|HOME)(_x)?$/', $key, $match)) {
           $action= $match[1];
           break;
         }
@@ -986,31 +986,29 @@ class listing {
 
     /* Draw root button */
     if($enableRoot){
-      $result["ROOT"]= "<input class='center' type='image' src='images/lists/root.png' align='middle' ".
-                       "title='"._("Go to root department")."' name='ROOT' alt='"._("Root")."'>";
+      $result["ROOT"]= image('images/lists/root.png', null, 'ROOT', _("Root"));
     }else{
-      $result["ROOT"]= "<img src='images/lists/root_grey.png' class='center' alt='"._("Root")."'>";
+      $result["ROOT"]= image('images/lists/root-grey.png', null, null, _("Root"));
     }
 
     /* Draw back button */
     if($enableBack){
-      $result["BACK"]= "<input class='center' type='image' align='middle' src='images/lists/back.png' ".
-                       "title='"._("Go up one department")."' alt='"._("Up")."' name='BACK'>";
+      $result["BACK"]= image('images/lists/back.png', null, 'BACK', _("Go up one department"));
     }else{
-      $result["BACK"]= "<img src='images/lists/back_grey.png' class='center' alt='"._("Up")."'>";
+      $result["BACK"]= image('images/lists/back-grey.png', null, null, _("Go up one department"));
     }
 
     /* Draw home button */
+   /* Draw home button */
     if($enableHome){
-      $result["HOME"]= "<input class='center' type='image' align='middle' src='images/lists/home.png' ".
-                       "title='"._("Go to users department")."' alt='"._("Home")."' name='HOME'>";
+      $result["HOME"]= image('images/lists/home.png', null, 'HOME', _("Go to users department"));
     }else{
-      $result["HOME"]= "<img src='images/lists/home_grey.png' class='center' alt='"._("Home")."'>";
+      $result["HOME"]= image('images/lists/home-grey.png', null, null, _("Go to users department"));
     }
 
+
     /* Draw reload button, this button is enabled everytime */
-    $result["RELOAD"]= "<input class='center' type='image' src='images/lists/reload.png' align='middle' ".
-                       "title='"._("Reload list")."' name='REFRESH' alt='"._("Submit")."'>";
+    $result["RELOAD"]= image('images/lists/reload.png', null, 'REFRESH', _("Reload list"));
 
     return ($result);
   }
diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index 9a9e2799c..24d9328ae 100644
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -3554,10 +3554,13 @@ function image($path, $label= null, $action= "", $title= "")
   }
 
   // Clickable image or not?
+  if ($title != "") {
+    $title= "title='$title'";
+  }
   if ($action == "") {
-    return "<div class='img' style='".$styles[$path]."'>$lbl</div>";
+    return "<div class='img' $title style='".$styles[$path]."'>$lbl</div>";
   } else {
-    return "<button class='img' id='$action' name='$action' title='$title' type='submit'><div class='img' style='".$styles[$path]."'>$lbl</div></button>";
+    return "<input type='submit' class='img' id='$action' value='' name='$action' $title style='".$styles[$path]."'>";
   }
 }
 
-- 
2.30.2