From 93ff86b1473dee0a90c3d02f1748739592ee0b81 Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Sun, 7 Mar 2010 15:58:38 +0000
Subject: [PATCH] Added images, updated style

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16317 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/html/images/filter.png       | Bin 0 -> 429 bytes
 gosa-core/html/images/find.png         | Bin 0 -> 627 bytes
 gosa-core/html/themes/modern/style.css |  22 ++++++++++++++++++++--
 gosa-core/include/class_filter.inc     |   6 ++++--
 4 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 gosa-core/html/images/filter.png
 create mode 100644 gosa-core/html/images/find.png

diff --git a/gosa-core/html/images/filter.png b/gosa-core/html/images/filter.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cabc5a3a8e87ef685aa7f1b96ef063fb91ce95b
GIT binary patch
literal 429
zcmV;e0aE^nP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00002b3#c}2nbc|
zMg#x=010qNS#tmY0lNSI0lNV@?Bn79000?uMObuGZ)S9NVRB^vcXxL#X>MzCV_|S*
zE^l&Yo9;Xs0003jNkl<ZD9>Z~&+wnYNi@8tV0q!1{Pnr(Qs;+vdQ@0uYR9;Vg5*Gm
zE#>6yUwdEeJ->JB-r0K__onal-D|v3Mx}&-6|CStL&mZ-KPG<6e;NBm<Fnic(~IuQ
zV~di5Wx}8){AaK>ng3|-`-iVSzyJ3B<*5S&dxJOH+PX0)!4>>x2+ZB|;ne+~-+z7m
zaCLv--q6Z0L1%~zRKb6S*jc-7e|-1j<NGUnix#G-Ccwnu3K*CZ7G1mk>G_M3+bXRK
z7??2>0GaHC%bs1ow=1NcffGseKN9rL`t;_=a<c?vF;oRPU*4WsZk~u!fmiP5w`W#a
zB;i(&4^*()G8v}=&%#gd&aAb<t-!q)s9=M23Qh%9`7hru*=dN|4gVR$-PkM{c#uT^
XJ1+?220Dz<00000NkvXXu0mjfm#W6F

literal 0
HcmV?d00001

diff --git a/gosa-core/html/images/find.png b/gosa-core/html/images/find.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad916d13fbb94acf8ca90abd4a83307ce26b29fc
GIT binary patch
literal 627
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH}&M
z2DUdK%qUlCVG0zKEOCt}3C>R|DNig)WhgH%*UQYyE>2D?NY%?PN}v7CMv8%fktx6@
z#P$FG|3LNR0Y*kfphgxJ7A`K3iv<J(1O)}Txw-lH_=JRnq@|_h<>i5DgoTAgMMcHL
z#KgtLB_t$(;xaNa%F4<rDk^HK%IfOs8X6kf+S)ogI=Z^LMn*;^Muuh@a%LLxW?Cv{
zW@Z)|@|HTPHU=85P7WT53|?MdzP`SGnw)-qe!<2vp}|36VPTOTwiyw=85tRw;cl6k
znORv`MFsiA#l>YwK@}Ahjdisx4(u)ACT-5#?a|f~Jh>+%+D=TepIQ{MdSX@e5v!R%
z*DI6+`2{mDa&QTYNUEr5x+gXEO`b7#>Ao}PFTQ^B_Ved2-@g6+(|b3-6R38(r;B5V
zgk<l*cCkhV2G$GHIc^FrJd-m~S4nx|nx6mvMg5Mmm*_w6(vW03bW-5oiboqodA9Vq
za`DZ2`*n3wz|<<8UitciQ>HE2C^~&o<OgOCpAhG`>E5eyR!nAb2>;T3_05&6xywo~
zYMabBTd~X9bl2TqndY+j5-HDaecmV@tXWuJow?a$$Hhl^^DEa+x4(V;>ICN{wH5VK
zGz3EJ-aA_}`RkaUIPTfd^PK(W40eWx$`2H3SYm!Koj)#dH2k~RCZHD>JYD@<);T3K
F0Ra4-y$1jQ

literal 0
HcmV?d00001

diff --git a/gosa-core/html/themes/modern/style.css b/gosa-core/html/themes/modern/style.css
index 1d2244250..5adbf65ca 100644
--- 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 8a0a9dfc1..e759cb976 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...";
+    $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));
-- 
2.30.2