Branch move for patch in bug 444237.
authorReed Loden <reed@reedloden.com>
Sat, 12 Jul 2008 03:53:26 -0500
changeset 15843 b07c8fd4bd2659e5f4be9887324ee89d227fee4f
parent 15842 31f5da857994a4ba91afe90777cad532ab37fa0b (current diff)
parent 15841 25c5f7adddc0061c88238c3ed6d5cd4577b8bc0f (diff)
child 15844 3dd50dd527f402ce733d6e175d80032886aa588a
child 15855 62f9945e5a5d419d9547869408942d1878f47c4e
push idunknown
push userunknown
push dateunknown
bugs444237
milestone1.9.1a1pre
Branch move for patch in bug 444237.
--- a/browser/components/places/content/organizer.css
+++ b/browser/components/places/content/organizer.css
@@ -14,23 +14,20 @@ button.commandButton {
 .filterList {
   -moz-binding: url("chrome://browser/content/places/places.xml#filter-button");
 }
 
 #contentTitle {
   width: 0px;
 }
 
-.textbox-input-closebutton {
+#searchFilter[filtered="true"] .textbox-input-searchimage ,
+#searchFilter:not([filtered="true"]) .textbox-input-closebutton {
   display: none;
 }
 
-#searchFilter[filtered="true"] .textbox-input-closebutton {
-  display: -moz-box;
-}
-
 /* Edit Item Panel */
 
 #infoBox[minimal="true"] #editBMPanel_descriptionRow,
 #infoBox[minimal="true"] #editBMPanel_loadInSidebarCheckbox,
 #infoBox[minimal="true"] #editBMPanel_keywordRow {
   visibility: collapse;
 }
--- a/browser/components/places/content/places.xml
+++ b/browser/components/places/content/places.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0"?>
 
+<!DOCTYPE bindings [
+<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
+%globalDTD;
+]>
+
 <bindings id="placesBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xbl="http://www.mozilla.org/xbl"
           xmlns:html="http://www.w3.org/1999/xhtml"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
   <!-- XXXben - replace this upon checkin by allowing generic textboxes to show
                 arbitrary content before the html:input itself using a 
@@ -17,16 +22,18 @@
     <content>
       <children/>
       <xul:hbox class="textbox-input-box" flex="1" xbl:inherits="context">
         <html:input class="textbox-input" flex="1" anonid="input"
                     xbl:inherits="onfocus,onblur,value,type,maxlength,disabled,size,readonly,tabindex,accesskey"/>
       </xul:hbox>
       <xul:hbox>
         <xul:button class="textbox-input-closebutton"/>
+        <xul:image class="textbox-input-searchimage"
+                   chromedir="&locale.dir;"/>
       </xul:hbox>
     </content>
     <implementation>
       <method name="reset">
         <body><![CDATA[ 
           this.removeAttribute("filtered");
         ]]></body>
       </method>
--- a/browser/themes/gnomestripe/browser/places/organizer.css
+++ b/browser/themes/gnomestripe/browser/places/organizer.css
@@ -83,16 +83,27 @@
   padding: 5px;
 }
 
 /* Search Bar */
 #searchbar {
   margin: 6px -4px 0px 2px;
 }
 
+.textbox-input-searchimage {
+  margin: 2px 0;
+  -moz-margin-end: 2px;
+  list-style-image: url("chrome://global/skin/icons/Search-glass.png");
+  cursor: default;
+}
+
+.textbox-input-searchimage[chromedir="rtl"] {
+  list-style-image: url("chrome://global/skin/icons/Search-glass-rtl.png");
+}
+
 .textbox-input-closebutton {
   -moz-appearance: none;
   margin: 1px 2px 1px 1px;
   min-width: 0;
   background-color: transparent;
   border: none;
   padding: 0 !important;
   list-style-image: url("moz-icon://stock/gtk-clear?size=menu");
--- a/browser/themes/pinstripe/browser/places/organizer.css
+++ b/browser/themes/pinstripe/browser/places/organizer.css
@@ -302,16 +302,20 @@
 
 /* Search Bar */
 #searchbar {
   margin-top: 6px;
   -moz-margin-start: 2px;
   -moz-margin-end: -4px;
 }
 
+.textbox-input-searchimage {
+  display: none;
+}
+
 .textbox-input-closebutton {
   -moz-appearance: none;
   margin: -2px 0;
   -moz-margin-end: -2px;
   min-width: 0;
   background-color: transparent;
   border: none;
   padding: 0 !important;
--- a/browser/themes/winstripe/browser/places/organizer.css
+++ b/browser/themes/winstripe/browser/places/organizer.css
@@ -136,16 +136,28 @@
   margin: 6px -4px 0px 2px;
 }
 
 #infoPaneBox {
   border-top: 1px solid ThreeDShadow;
   padding: 5px;
 }
 
+.textbox-input-searchimage {
+  margin: 2px 0;
+  -moz-margin-end: 2px;
+  list-style-image: url("chrome://global/skin/icons/Search-glass.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+  cursor: default;
+}
+
+.textbox-input-searchimage[chromedir="rtl"] {
+  list-style-image: url("chrome://global/skin/icons/Search-glass-rtl.png");
+}
+
 .textbox-input-closebutton {
   -moz-appearance: none;
   margin: 1px 2px 1px 1px;
   min-width: 0;
   background-color: transparent;
   border: none;
   padding: 0 !important;
   list-style-image: url("chrome://global/skin/icons/Search-close.png");
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..01fb204fd6be02c981df6565e5fc0ef91ffe747c
GIT binary patch
literal 840
zc$@)91GoH%P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iO4^
z4<{)JUk?@l00PKKL_t(I%av2zOH*MSe%^E5bI#VBb7!W`k7Q~e&_y4tyyydyOsCQ}
zA`wIoT@`dQ7Q65&1QDydA{B}XL@Y>+a_K)%f}w>&D{5}FRx{6LbLZ^ryj_%n;)Ole
zzvqMJ;YS!_SPvbY?QQ^90JtfomAbA60gMB<?eqHIFW-^10v(<00)RGImM=9nG{@|A
zxrFC=2ZQlF{xcpOdj70LQIrk<H+^2eLDw;F+r4Yg$^F#_tzA#v@n2%oHpU3R49C`D
z8|S-lSsV!rUkV1N8Gx=;2|7C4-LhRCI(_Dx_1e8Ryv1rURTk&LVxq7}JVM_UOn-{0
z_q|7!y1VaW7k@7v;MTZbsjv6M?!K5w$@W~6Ws?a2ke@4IM`<pa_LXDr_G0PQz*NTL
zY5D}<;#vWBo-MEBM?$le6<U#N7VuluVG=kvazqr^B<yrK5DYKa3JVH018}eEfKpmX
zIL^fL6mpIPNzjo<WiS_C0wDlLIK-1_fIy&BZ~`E!1aw^wGQ)711WvZ+2!bSV;0Qq?
zmBGiT0g?U<EQ(Z9)pQuZ?AjH^Bav`zu?+?Di8P$D1&je%!@ztp1IiO5lPS2X@)shJ
z$S(lnt2zjU=Eh%*1zatMTqGP*5RNZG5;&Me9%hL{bbb-ptdVRzT*d`PM_d4US7vN!
zJ=;JjeOgiBGH<QghDJ{_249C+Xn|>J79tE|X=kZ*;Y77l7#<!>&4oiZd|rPKVT`Si
zJ&g@!O;s^F^8rOgMXaW#cD8&=xhRT)Q&qL_x9GQDqhkSAI-S1m^ZI)LfVQ-rJ+@5F
zXc`nHfymdd=|nPlRn^og0B!&T!0f+Y==FL1pI4R>1p271?x<N)H7JULiHWyqRaH+t
zeDL@sHULTp7mdY!I4GsuGP%ERU_)d8pqi!~pPZZ;WXveaWc2g>eFFjf2mSzNk}!GD
SI``%P0000<MNUMnLSTX$(`4xY
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..fd006f4cda7a1412c85677e0cc413107c8fd30b3
GIT binary patch
literal 862
zc$@)V1EKthP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10^3PMK~y-6jgw7CRACf`-|xG>&ei#5939P+8n7I(MT$XDxhXWU
z%)~6Hjb*zQ{SZRXriCO1Eo#xCXcJ^21QlxjR7M1ar4m$>{mke%7YFamIHS(oxpQwD
z4V8%A%~_p?_nh+{Vp$ee)X~{q2H+fkN}lJvhGBdMFbd#S+oj8+_=|{TS?K6&rvNT6
z#@Y_m9S*p1T=@hvFP%=$g~M8)xBsbI)3iGPuC`seoLUXwm+N`2x3smU`k>hH;6uT;
znNLm-3PLQl$(?ClY&v0k_x5$e_{10hTv-j^G8C~SQ^~w{?AVE{mg_HMcP_J6cnfHL
zE<?5>iw43;<?)+e=BfIf?AOo9Z9~HYBYSr5oml};04=q(bw6(Od`wl86i9VDHo;qH
zM~+<r04O#Y*-pEByYK5_O-=1AfU~O|Pym&AZg=jN=?E+HxZq|IT$v(dfnp(Pz@8zX
zC@%}4d7U|!V<Ujd^*bo$c_AMJLTEmL2_IluCZ^_=AaE3Rn*c@P5#)H0Q0n4&URe+L
zoJ=MRQREBbiL?|?EI>C*Ea_=D6cG+ZfKB2c3p8b!re+vMaQz6Qfj}T!S)3E`%|xKZ
zbVTAQC=v%|6W~-tX!8jaFz|uE^uls3)&TAf3_bH4uPUPHv>8*iI5H%P43UE*P)yIo
zF+Cea^Ii`b93Jra{ZnfI+~B})WaQNgO;y!hXBu~t_+l#R55>9gg3fEvMcpZ;xRX^y
zq_^)0rl$NP7!2-v*xmL1XjAj#pCkf6M`wGhEX&vS@2mc~A%BBYlEgw?PX&E`pZ@aY
z^DU~Xk}X?{AxaYZdi$3Q!)Wa8>ggxzeql3!)61tS1uzL<)aUb0#$vIX<>lLDhl4>7
z#T7`y8o<BQe7xy^BuS6T%eTvnF>oBk;NVb*{#Q4E?yjExWHNbVY-~IcjYcs$8!`!@
o>VG>}<)m5=`1^!VRoC_U-_24j#;&EI-~a#s07*qoM6N<$g1e)I`Tzg`
--- a/toolkit/themes/gnomestripe/global/jar.mn
+++ b/toolkit/themes/gnomestripe/global/jar.mn
@@ -36,16 +36,18 @@ classic.jar:
 +  skin/classic/global/icons/errorGhosted-64.png               (icons/errorGhosted-64.png)
 +  skin/classic/global/icons/find.png                          (icons/find.png)
 +  skin/classic/global/icons/folder-item.png                   (icons/folder-item.png)
 +  skin/classic/global/icons/informationGhosted-64.png         (icons/informationGhosted-64.png)
 +  skin/classic/global/icons/loading_16.png                    (icons/loading_16.png)
 +  skin/classic/global/icons/notloading_16.png                 (icons/notloading_16.png)
 +  skin/classic/global/icons/notfound.png                      (icons/notfound.png)
 +  skin/classic/global/icons/questionGhosted-64.png            (icons/questionGhosted-64.png)
++  skin/classic/global/icons/Search-glass.png                  (icons/Search-glass.png)
++  skin/classic/global/icons/Search-glass-rtl.png              (icons/Search-glass-rtl.png)
 +  skin/classic/global/icons/sslWarning.png                    (icons/sslWarning.png)
 +  skin/classic/global/icons/warningGhosted-64.png             (icons/warningGhosted-64.png)
 +  skin/classic/global/icons/wrap.png                          (icons/wrap.png)
 +  skin/classic/global/menu/Menu-arrow.png                     (menu/Menu-arrow.png)
 +  skin/classic/global/menu/Menu-arrow-rtl.png                 (menu/Menu-arrow-rtl.png)
 +  skin/classic/global/menu/Menu-arrow-disabled.png            (menu/Menu-arrow-disabled.png)
 +  skin/classic/global/menu/Menu-arrow-disabled-rtl.png        (menu/Menu-arrow-disabled-rtl.png)
 +  skin/classic/global/menu/Menu-arrow-hover.png               (menu/Menu-arrow-hover.png)
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..90dc860826d919e029c3a47ae9f947f899e3a3d2
GIT binary patch
literal 406
zc$@*20crk;P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ-3`s;mRCwB?lQB*MF%U)HSjz>{0#z=6Ql)|mpqz!H
z1dbAM0SXXRlmjGE5L76sD3je!^DV61MJvdcEK6h0_x$<eki;pd+JT5jKmf_129Ts?
zkRT$?fGKbVj2+$ptB81&bm%;oB{+Eo+!n7>RPhKb+9Xv`_SDH=z!R|aoe6N`v(Jcl
zF6Cqi;j)vH7r@bHAKqua^HNrjial#y0!JAp%GHe9@)9Sav}#jmuEMa)N#RJ-XQO~s
z(J*?N7{L0!Hs-<F0{6hq{rMpn7^F3D4V(jSz(Xd9_FwpAlmSM-9dK!qxuku^1xbyh
zTGGL*mQ({fU=F+k7n1fJ2}7_eqn!L_f<Al?016O<>tDRE+W-In07*qoM6N<$f<;`M
A+W-In
--- a/toolkit/themes/pinstripe/global/jar.mn
+++ b/toolkit/themes/pinstripe/global/jar.mn
@@ -121,16 +121,17 @@ classic.jar:
 +  skin/classic/global/icons/menuselected.png                         (icons/menuselected.png)
 +  skin/classic/global/icons/minimize.gif                             (icons/minimize.gif)
 +  skin/classic/global/icons/notloading_16.png                        (icons/notloading_16.png)
 +  skin/classic/global/icons/notfound.png                             (icons/notfound.png)
 +  skin/classic/global/icons/popup-icon-spacer.png                    (icons/popup-icon-spacer.png)
 +  skin/classic/global/icons/popup-overlay.png                        (icons/popup-overlay.png)
 +  skin/classic/global/icons/question-mark.png                        (icons/question-mark.png)
 +  skin/classic/global/icons/restore.gif                              (icons/restore.gif)
++  skin/classic/global/icons/Search-glass.png                         (icons/Search-glass.png)
 +  skin/classic/global/icons/search-textbox.png                       (icons/search-textbox.png)
 +  skin/classic/global/icons/small-document.png                       (icons/small-document.png)
 +  skin/classic/global/icons/small-globe-sunken-grey.png              (icons/small-globe-sunken-grey.png)
 +  skin/classic/global/icons/small-globe-sunken.png                   (icons/small-globe-sunken.png)
 +  skin/classic/global/icons/white-gray-gradient.gif                  (icons/white-gray-gradient.gif)
 +  skin/classic/global/icons/white-gray-gradient-active.gif           (icons/white-gray-gradient-active.gif)
 +  skin/classic/global/icons/warning-16.png                           (icons/warning-16.png)
 +  skin/classic/global/icons/warning-24.png                           (icons/warning-24.png)