X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_filter.inc;h=e8b65ac78b4810013f8d70ef4973834fe57d57ac;hb=8ae8745c45a91ec8d98216398721ccadab3ac65a;hp=8a0a9dfc13abf12efef2246ae0c459aeccaceb5e;hpb=a36c018156b0df7ae8c85d14230a64f47a689da1;p=gosa.git

diff --git a/gosa-core/include/class_filter.inc b/gosa-core/include/class_filter.inc
index 8a0a9dfc1..e8b65ac78 100644
--- 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...";
+    $content= "<table class='filter-wrapper'><tr><td>".$this->renderFilterMenu()."</td><td>";
+    $content.= "<div class='search-filter'><input type='text' name='search_filter' value='".$this->value."'></div>".
+              "&nbsp;<button class='search-filter' type='submit' title='"._("Search")."'>".image("images/find.png")."</button></td></tr></table>";
 
     // 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));
@@ -384,6 +386,29 @@ class filter {
 
     return $base;
   }
+
+
+
+  function renderFilterMenu()
+  {
+    // Load shortcut
+    $result= "<input type='hidden' name='act' id='filter' value=''><div style='display:none'><input type='submit' name='exec_filter' id='exec_filter' value=''></div>".
+             "<ul class='level1' id='filter-root'><li><a href='#'>".image("images/filter.png")._("...")."&nbsp;".image("images/lists/sort-down.png")."</a>";
+
+    // Build ul/li list
+    $result.= "<ul class='level2'>";
+    $result.= "<li><a href='#'>Dummy placeholder</a></li>";
+    #$result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"".$action['name']."\";mainform.submit();'>$img"._($action['label'])."</a></li>";
+
+    # AUTOCOMPLETER and getTextbox
+
+    $result.= "</ul>";
+
+    $script= '<script type="text/javascript" language="JavaScript">var menu2; menu2= new Menu("filter-root", "menu2", configMenu)</script>';
+
+    return "<div id='filtermenu'>".$result."</li></ul><div>$script";
+  }
+
 }