Bug 1324171 - Use 'Search' as placeholder text instead of as a label in-front of search fields. r=jaws

MozReview-Commit-ID: 8eZ7Hy9DTuy

--HG--
extra : rebase_source : 048ea553743bf917508ae5016c7b8e3ecb5b7ed4

browser/components/preferences/cookies.xul

@@ -32,10 +32,11 @@
 
   <vbox flex="1" class="contentPane largeDialogContainer">
     <hbox align="center">
-      <label accesskey="&filter.accesskey;" control="filter">&filter.label;</label>
       <textbox type="search" id="filter" flex="1"
                aria-controls="cookiesList"
-               oncommand="gCookiesWindow.filter();"/>
+               oncommand="gCookiesWindow.filter();"
+               placeholder="&searchFilter.label;"
+               accesskey="&searchFilter.accesskey;"/>
     </hbox>
     <separator class="thin"/>
     <label control="cookiesList" id="cookiesIntro" value="&cookiesonsystem.label;"/>

browser/locales/en-US/chrome/browser/preferences/cookies.dtd

@@ -28,8 +28,8 @@
 <!ENTITY     focusSearch1.key               "f">
 <!ENTITY     focusSearch2.key               "k">
 
-<!ENTITY     filter.label                   "Search:">
-<!ENTITY     filter.accesskey               "S">
+<!ENTITY     searchFilter.label             "Search">
+<!ENTITY     searchFilter.accesskey         "S">
 
 <!ENTITY     button.close.label             "Close">
 <!ENTITY     button.close.accesskey         "C">

toolkit/components/passwordmgr/content/passwordManager.xul

@@ -56,10 +56,11 @@
   <vbox id="savedsignons" class="contentPane" flex="1">
     <!-- filter -->
     <hbox align="center">
-      <label accesskey="&filter.accesskey;" control="filter">&filter.label;</label>
       <textbox id="filter" flex="1" type="search"
                aria-controls="signonsTree"
-               oncommand="FilterPasswords();"/>
+               oncommand="FilterPasswords();"
+               placeholder="&searchFilter.label;"
+               accesskey="&searchFilter.accesskey;"/>
     </hbox>
 
     <label control="signonsTree" id="signonsIntro"/>

toolkit/locales/en-US/chrome/passwordmgr/passwordManager.dtd

@@ -26,8 +26,8 @@
 <!ENTITY      import.label                    "Import…">
 <!ENTITY      import.accesskey                "I">
 
-<!ENTITY      filter.label                    "Search:">
-<!ENTITY      filter.accesskey                "S">
+<!ENTITY      searchFilter.label              "Search">
+<!ENTITY      searchFilter.accesskey          "S">
 
 <!ENTITY      windowClose.key                 "w">
 <!ENTITY      focusSearch1.key                "f">