From 59676cb89c84ccc22aa75b6fc7c672f2f3d93c67 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Thu, 25 Mar 2010 13:26:07 -0400
Subject: [PATCH] Bug 554957 - No hint of what each field does in the 'Add a
 new preference' feature [r=mark.finkle]

---
 mobile/chrome/content/config.xul       | 4 ++--
 mobile/locales/en-US/chrome/config.dtd | 4 +++-
 mobile/themes/hildon/config.css        | 2 +-
 mobile/themes/wince/config.css         | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mobile/chrome/content/config.xul b/mobile/chrome/content/config.xul
index 25a1f404fc3c..7c5f576e3fcb 100644
--- a/mobile/chrome/content/config.xul
+++ b/mobile/chrome/content/config.xul
@@ -77,8 +77,8 @@
 
             <vbox id="editor" hidden="true">
               <hbox align="center">
-                <textbox id="editor-name" flex="1"/>
-                <setting id="editor-setting" onlabel="true" offlabel="false" flex="1"/>
+                <textbox id="editor-name" emptytext="&addpref.name;" flex="1"/>
+                <setting id="editor-setting" emptytext="&addpref.value;" onlabel="true" offlabel="false" flex="1"/>
               </hbox>
               <hbox id="editor-buttons">
                 <button id="editor-cancel" label="&cancel.label;" oncommand="ViewConfig.close(false)"/>
diff --git a/mobile/locales/en-US/chrome/config.dtd b/mobile/locales/en-US/chrome/config.dtd
index 7a791c5b7584..112a6b6843d2 100644
--- a/mobile/locales/en-US/chrome/config.dtd
+++ b/mobile/locales/en-US/chrome/config.dtd
@@ -1,5 +1,7 @@
 <!ENTITY empty.label            "Search">
-<!ENTITY newpref.label          "Add a new preference">
+<!ENTITY newpref.label          "Add a New Preference">
+<!ENTITY addpref.name           "Name">
+<!ENTITY addpref.value          "Value">
 
 <!ENTITY cancel.label           "Cancel">
 <!ENTITY reset.label            "Reset">
diff --git a/mobile/themes/hildon/config.css b/mobile/themes/hildon/config.css
index 2606ec1646ca..01f5b115b1e3 100644
--- a/mobile/themes/hildon/config.css
+++ b/mobile/themes/hildon/config.css
@@ -75,7 +75,7 @@ richlistitem .prefvalue {
 #editor-container > #editor > hbox > #editor-name,
 #editor-container > #editor > hbox > #editor-cancel,
 #editor-container > #editor > hbox > #editor-done {
-  display: block;
+  display: -moz-box;
 }
 
 #editor-container > #editor > hbox > #editor-reset {
diff --git a/mobile/themes/wince/config.css b/mobile/themes/wince/config.css
index 016a7ef9d0ef..e91f4cb5bc76 100644
--- a/mobile/themes/wince/config.css
+++ b/mobile/themes/wince/config.css
@@ -75,7 +75,7 @@ richlistitem .prefvalue {
 #editor-container > #editor > hbox > #editor-name,
 #editor-container > #editor > hbox > #editor-cancel,
 #editor-container > #editor > hbox > #editor-done {
-  display: block;
+  display: -moz-box;
 }
 
 #editor-container > #editor > hbox > #editor-reset {