From 449f2382207f8c4325521dffa39f4c21f268ddb8 Mon Sep 17 00:00:00 2001
From: Cykesiopka <cykesiopka@hotmail.com>
Date: Wed, 27 Mar 2013 13:56:40 -0400
Subject: [PATCH] Bug 801266 - Add label next to Error Console's filter box.
 r=dao

---
 toolkit/components/console/content/console.xul  | 10 +++++-----
 toolkit/locales/en-US/chrome/global/console.dtd |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/toolkit/components/console/content/console.xul b/toolkit/components/console/content/console.xul
index 2b017b9de1e8..d7450f0940c9 100644
--- a/toolkit/components/console/content/console.xul
+++ b/toolkit/components/console/content/console.xul
@@ -57,7 +57,7 @@
                 label="&copyCmd.label;" accesskey="&copyCmd.accesskey;"/>
     </menupopup>
   </popupset>
-  
+
   <toolbox id="console-toolbox">
     <toolbar class="chromeclass-toolbar" id="ToolbarMode">
       <hbox id="viewGroup">
@@ -78,7 +78,7 @@
       <toolbarbutton id="Console:clear" oncommand="clearConsole();"
                      label="&clear.label;" accesskey="&clear.accesskey;"/>
     </toolbar>
-  
+
     <toolbar class="chromeclass-toolbar" id="ToolbarEval" align="center" nowindowdrag="true">
       <label value="&codeEval.label;" accesskey="&codeEval.accesskey;" control="TextboxEval"/>
       <textbox id="TextboxEval" class="toolbar" value="" onkeypress="onEvalKeyPress(event)" flex="1"/>
@@ -86,15 +86,15 @@
                      accesskey="&evaluate.accesskey;" oncommand="evaluateTypein()"/>
     </toolbar>
   </toolbox>
-  
+
   <vbox id="ConsoleBox" class="console-box" flex="1" context="ConsoleContext" persist="sortOrder"/>
 
   <iframe name="Evaluator" id="Evaluator" collapsed="true"/>
 
   <statusbar>
     <statusbarpanel flex="1" pack="start">
-      <textbox placeholder="&filter.label;" accesskey="&filter.accesskey;" type="search"
-               id="Filter" oncommand="changeFilter();"/>
+      <label value="&filter2.label;" accesskey="&filter2.accesskey;" control="Filter"/>
+      <textbox type="search" id="Filter" oncommand="changeFilter();"/>
     </statusbarpanel>
   </statusbar>
 </window>
diff --git a/toolkit/locales/en-US/chrome/global/console.dtd b/toolkit/locales/en-US/chrome/global/console.dtd
index 876f0284d412..b5611fad4d0e 100644
--- a/toolkit/locales/en-US/chrome/global/console.dtd
+++ b/toolkit/locales/en-US/chrome/global/console.dtd
@@ -22,8 +22,8 @@
 <!ENTITY codeEval.accesskey "o">
 <!ENTITY evaluate.label     "Evaluate">
 <!ENTITY evaluate.accesskey "v">
-<!ENTITY filter.label       "Filter">
-<!ENTITY filter.accesskey   "F">
+<!ENTITY filter2.label      "Filter:">
+<!ENTITY filter2.accesskey  "F">
 
 <!ENTITY copyCmd.label       "Copy">  
 <!ENTITY copyCmd.accesskey   "C">