Added images, updated style

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

diff --git a/gosa-core/html/images/filter.png b/gosa-core/html/images/filter.png
new file mode 100644 (file)
index 0000000..9cabc5a
Binary files /dev/null and b/gosa-core/html/images/filter.png differ

diff --git a/gosa-core/html/images/find.png b/gosa-core/html/images/find.png
new file mode 100644 (file)
index 0000000..ad916d1
Binary files /dev/null and b/gosa-core/html/images/find.png differ

diff --git a/gosa-core/html/themes/modern/style.css b/gosa-core/html/themes/modern/style.css
index 1d2244250f79dec5a5c2526a3d82ba4e472f78fc..5adbf65caa7539179a7ff230a498affff0afdd35 100644 (file)
--- a/gosa-core/html/themes/modern/style.css
+++ b/gosa-core/html/themes/modern/style.css
@@ -801,6 +801,7 @@ div.nlistFooter {
   color:#444;
   background: -webkit-gradient(linear, 0 0, 0 100%, from(#F8F8F8), to(#EEE));
   background: -moz-linear-gradient(top, #F8F8F8, #EEE);
+  border-top:1px solid #CCC;
   border-left:1px solid #CCC;
   border-right:1px solid #CCC;
   border-bottom:1px solid #CCC;
@@ -1177,8 +1178,25 @@ background-image:none;
 
 /* Filter */
 
-div.filter {
-  border:1px solid blue;
+div.search-filter {
+  border:1px solid #CCC;
+  background-color:white;
+  text-align:middle;
+  padding:0;
+  margin:0;
+  float:left;
+}
+
+div.search-filter input[type=text]{
+  border:0;
+  padding:3px;
+  margin:0;
+}
+
+button.search-filter {
+  padding:4px 2px 3px 2px;;
+  margin:0;
+  text-align:middle;
 }
 
 

diff --git a/gosa-core/include/class_filter.inc b/gosa-core/include/class_filter.inc
index 8a0a9dfc13abf12efef2246ae0c459aeccaceb5e..e759cb976b835cdebf51aa9760bdde99c5818adc 100644 (file)
--- a/gosa-core/include/class_filter.inc
+++ b/gosa-core/include/class_filter.inc
@@ -218,7 +218,9 @@ class filter {
 
   function render()
   {
-    $content= "Search comes here...";
+    $searchMenu= "MENU^";
+    $content= "<div class='search-filter'>$searchMenu<input type='text' name='search_filter' value='".$this->value."'></div>".
+              "&nbsp;<button class='search-filter' type='submit' title='"._("Search")."'>".image("images/find.png")."</button>";
 
     // Return meta data
     return ("<input type='hidden' name='FILTER_PID' value='".$this->pid."'>".$content);
@@ -262,7 +264,7 @@ class filter {
       if ($this->value == "") {
         $filter= preg_replace("/\\$/", '*', $filter);
       } else {
-        $filter= preg_replace("/\\$/", normalizeLdap($this->value), $filter);
+        $filter= preg_replace("/\\$/", "*".normalizeLdap($this->value)."*", $filter);
       }
 
       $result= array_merge($result, call_user_func(array($backend, 'query'), $this->base, $this->scope, $filter, $attributes, $this->category, $this->objectStorage));