From 06ff988579539260e598b48114221b40b6da83cb Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 30 Nov 2009 16:55:07 +0100
Subject: [PATCH] Tweaked search form.

---
 kronolith/js/kronolith.js                             |  11 +++++++++++
 kronolith/templates/index/index.inc                   |   9 ++-------
 kronolith/themes/graphics/search-button.png           | Bin 0 -> 794 bytes
 kronolith/themes/screen.css                           |  18 +++++++-----------
 kronolith/themes/silver/graphics/search-button.png    | Bin 0 -> 662 bytes
 .../themes/tango-blue/graphics/search-button.png      | Bin 0 -> 794 bytes
 6 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 kronolith/themes/graphics/search-button.png
 create mode 100644 kronolith/themes/silver/graphics/search-button.png
 create mode 100644 kronolith/themes/tango-blue/graphics/search-button.png

diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js
index 32e4f5599..bde32bee9 100644
--- a/kronolith/js/kronolith.js
+++ b/kronolith/js/kronolith.js
@@ -3407,6 +3407,17 @@ KronolithCore = {
         document.observe('dblclick', KronolithCore.clickHandler.bindAsEventListener(KronolithCore, true));
         document.observe('mouseover', KronolithCore.mouseHandler.bindAsEventListener(KronolithCore, 'over'));
 
+        $('kronolithSearchTerm').observe('focus', function() {
+            if ($F(this) == this.readAttribute('default')) {
+                this.clear();
+            }
+        });
+        $('kronolithSearchTerm').observe('blur', function() {
+            if (!$F(this)) {
+                this.setValue(this.readAttribute('default'));
+            }
+        });
+
         if (Horde.dhtmlHistory.initialize()) {
             Horde.dhtmlHistory.addListener(this.go.bind(this));
         }
diff --git a/kronolith/templates/index/index.inc b/kronolith/templates/index/index.inc
index 948951268..7c6832490 100644
--- a/kronolith/templates/index/index.inc
+++ b/kronolith/templates/index/index.inc
@@ -62,14 +62,9 @@
     </table>
   </div>
 
-  <h3 class="search">
-    <span><?php echo _("Search") ?></span>
-  </h3>
-
   <form id="kronolithSearchForm" action="">
-    <input type="text" id="kronolithSearchTerm" />
-    <input id="kronolithSearchButton" type="button" value="OK" class="button ok" />
-    <input id="kronolithSearchAdvanced" type="button" value="+" class="button" />
+    <input type="text" id="kronolithSearchTerm" value="<?php echo _("Search") ?>" default="<?php echo _("Search") ?>" />
+    <input id="kronolithSearchButton" type="image" src="<?php echo $GLOBALS['registry']->getImageDir() ?>/search-button.png" />
   </form>
 
   <div id="kronolithMenuCalendars">
diff --git a/kronolith/themes/graphics/search-button.png b/kronolith/themes/graphics/search-button.png
new file mode 100644
index 0000000000000000000000000000000000000000..94c47d455e3eb1c758c79da1fd74f37831616196
GIT binary patch
literal 794
zcmV+#1LgdQP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008vNkl<Zc-p0r
z?N3s16vtib;cw`lX!W8uz35-)MYC4RHlGN%7mzC;GoLWf&@G=zDhni?!j`r2xff|n
zL@y%X19C3}ctIV34OE68+|%#2Vp?v!=xpEZxAXgbKj)m^Df%-MO1W85g{P{dB34|5
zfk+}esI61#ivATfO8Iq>1V6Mdku2@=!<vU;-Rl%=cxfQXMHUxhX#~1<s<}~BcU2<A
zk<kae<}VqM&YF}Poms-L4E!ETvTwwa2?PRwI?Agxsw;m1aIr8&(=@aVS&_-f+Ptw{
zCYFi?qx-pc3*i6)<)4_W86PTui3Iy6%ykX5ieb}GR{wr3gC4RTCb_foJspeh9VWuD
zRL&hr_;pi0i&VeNj(j3B1B1qNqpDs~00=N1&@=_S&KY<+&t#}b@+cHNI10xOvZ3fc
zEPvfiG!3t95PIj9YJdca@&e~60MJ~lm-Ydw0AowrcDpa`Slvv_Z$y%_>r7%xX>^OL
z4bEEPwX>aj!!QhRo@4V1vcX^w6#Wji;{!E1;n*IxQSpzntI-#4J_iS-2IpOw-i0Gb
zv-ss=j{67X$rJ#OG)=a-xw#|F5SbG^wOYAK$RsEF-S?~YE<&bv-jErbm8EUdGg`Af
zzqq(?sBUSVEdW}z>au3Fig8n$z^zU4%JE#PchwLER~eySR-vsF<2u_z?rwz&!2?0%
zH<?1(aAFfeoWEl-o8r@?|0m?0X4F;HM=B(J<iMS#5l1!3S(jFz=UF$~(yB@E1-!lD
z+cz&30FT==m(X14uI{d|kBLI>=n5!}4wi%I##Uk79|0l8&reNFf~HjsG6j+6@hhUZ
zNO<`K1a%T=Y^wKnbapTni)D}dTy2}yTfr;aEGa1|7l|>LoE!&j`(v=#Y<UDItn)ai
z6lnr=ltKdT%;mT{48vMDlif~&$K!!h0VvKOokco_bpDqv{63eLmscPoiv&owivBl#
Y06(<uguMjYApigX07*qoM6N<$g2(r6c>n+a

literal 0
HcmV?d00001

diff --git a/kronolith/themes/screen.css b/kronolith/themes/screen.css
index c5b4eef96..20a09408f 100644
--- a/kronolith/themes/screen.css
+++ b/kronolith/themes/screen.css
@@ -428,7 +428,7 @@ body.kronolithAjax {
 }
 #kronolithMenuCalendars {
     position: absolute;
-    top: 295px;
+    top: 265px;
     bottom: 0;
     width: 100%;
     overflow: auto;
@@ -444,13 +444,17 @@ body.kronolithAjax {
     border-bottom: 1px #000 dotted;
     cursor: default;
 }
-#kronolithMenu h3.search {
-    top: 15px;
+#kronolithMenu form {
+    padding: 0;
+    margin: 15px 0 5px 0;
 }
 #kronolithSearchForm {
     position: relative;
     top: 15px;
 }
+#kronolithSearchTerm {
+    width: 127px;
+}
 #kronolithMenu h3#kronolithCalendarsFirst {
     margin-top: 0;
 }
@@ -514,14 +518,6 @@ span#kronolithQuickEvent {
     color: transparent;
 }
 
-#kronolithMenu form {
-    padding: 0;
-    margin: 0 0 5px 0;
-}
-#kronolithSearchTerm {
-    width: 90px;
-}
-
 /* Quick edit */
 #kronolithQuickinsert {
     position: absolute;
diff --git a/kronolith/themes/silver/graphics/search-button.png b/kronolith/themes/silver/graphics/search-button.png
new file mode 100644
index 0000000000000000000000000000000000000000..a158b99324c8fca840e1da9254c2f670a8b1e663
GIT binary patch
literal 662
zcmV;H0%`q;P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007ANkl<Zc-n>1
zZ%7ky7zglPM)WEI-vmXku6LEu5t$UZoVm66=XToMwXF?xNh^$Kbvj3DGBL-Dk~t%#
zZX2zbFS0rI$L7p!u-%|Yp`xOoD~=%OMGzdnp0gVWC;8&@=6Jr}-#x#(EeN4CY^V!o
z!&Hn7oA^q^BCsK|P?|CDg()(&e6J0c=4Aeb!v<?5V&d2k#g=By(#88ERtV~_!X!cG
zCrLIxL2`?Jt#!i!@nkVvex&zQKL6SW+JPPP0X5j0^J_ghe;b$as&H9BIYh<E48_7A
z26}-5Tm@IaWuOOpvSS)H?N!A#cmpF}n(m}ws1;n3!u?XX57<CM+S5#DylP%nPzjrb
z;uI;KexZ8mx)pjsH_#_tN-Q&?5#%c{CLtdnFlo>ZE=pxR(lZMn=LZ#7+M|*e6d&mM
z{6xFBf>H|Fq_7p72S!jIzoDS#osIGpmIFHY&IBu76wpaQ3ouDx4cL`%HT{0>I9Zex
z<i=a@rMm=|^=ZV<xEq`RBp^VY7|x9oe_loHDARu&&D!faWk1r3(KFUXpO(vvsM(ae
ziB33AVetV47Qfy=XGdFwm1hq0r4&FPmTsfeO$~a|bEIZ{!J5>q(>REwJStwitdzT1
zhz~aYOuAI)-NG>X_U0k_zRIAt$srWA91|ku!!^}{|C+s2Z^({yppP$oh<iPaKIQMA
zV$g(!mDu~xx!P^w(59Z+jv7+#7PLAyfL7+5DCgIqXgB_Yp$=}BhBo)uiW``&T9g=4
w!V36T2=A1wu$i#&(2iioem6rM*jjz|7hG$(BTaoAzW@LL07*qoM6N<$f~m+fa{vGU

literal 0
HcmV?d00001

diff --git a/kronolith/themes/tango-blue/graphics/search-button.png b/kronolith/themes/tango-blue/graphics/search-button.png
new file mode 100644
index 0000000000000000000000000000000000000000..94c47d455e3eb1c758c79da1fd74f37831616196
GIT binary patch
literal 794
zcmV+#1LgdQP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008vNkl<Zc-p0r
z?N3s16vtib;cw`lX!W8uz35-)MYC4RHlGN%7mzC;GoLWf&@G=zDhni?!j`r2xff|n
zL@y%X19C3}ctIV34OE68+|%#2Vp?v!=xpEZxAXgbKj)m^Df%-MO1W85g{P{dB34|5
zfk+}esI61#ivATfO8Iq>1V6Mdku2@=!<vU;-Rl%=cxfQXMHUxhX#~1<s<}~BcU2<A
zk<kae<}VqM&YF}Poms-L4E!ETvTwwa2?PRwI?Agxsw;m1aIr8&(=@aVS&_-f+Ptw{
zCYFi?qx-pc3*i6)<)4_W86PTui3Iy6%ykX5ieb}GR{wr3gC4RTCb_foJspeh9VWuD
zRL&hr_;pi0i&VeNj(j3B1B1qNqpDs~00=N1&@=_S&KY<+&t#}b@+cHNI10xOvZ3fc
zEPvfiG!3t95PIj9YJdca@&e~60MJ~lm-Ydw0AowrcDpa`Slvv_Z$y%_>r7%xX>^OL
z4bEEPwX>aj!!QhRo@4V1vcX^w6#Wji;{!E1;n*IxQSpzntI-#4J_iS-2IpOw-i0Gb
zv-ss=j{67X$rJ#OG)=a-xw#|F5SbG^wOYAK$RsEF-S?~YE<&bv-jErbm8EUdGg`Af
zzqq(?sBUSVEdW}z>au3Fig8n$z^zU4%JE#PchwLER~eySR-vsF<2u_z?rwz&!2?0%
zH<?1(aAFfeoWEl-o8r@?|0m?0X4F;HM=B(J<iMS#5l1!3S(jFz=UF$~(yB@E1-!lD
z+cz&30FT==m(X14uI{d|kBLI>=n5!}4wi%I##Uk79|0l8&reNFf~HjsG6j+6@hhUZ
zNO<`K1a%T=Y^wKnbapTni)D}dTy2}yTfr;aEGa1|7l|>LoE!&j`(v=#Y<UDItn)ai
z6lnr=ltKdT%;mT{48vMDlif~&$K!!h0VvKOokco_bpDqv{63eLmscPoiv&owivBl#
Y06(<uguMjYApigX07*qoM6N<$g2(r6c>n+a

literal 0
HcmV?d00001

-- 
2.11.0