UI improvements for the theme panel.

mail/components/prefwindow/content/pref-themes.js

@@ -37,7 +37,6 @@
  * ***** END LICENSE BLOCK ***** */
 
 
-var gShowDescription = false;
 var gData;
 
 try {
@@ -83,16 +82,6 @@ function Startup()
       }
     }      
   }
-
-  var navbundle = document.getElementById("bundle_navigator");
-  var showSkinsDescription = navbundle.getString("showskinsdescription");
-  if( showSkinsDescription == "false" )
-  {
-    gShowDescription = false;
-    var description = document.getElementById("description");
-    while (description.hasChildNodes())
-      description.removeChild(description.firstChild);
-  }
 }
 
 function applySkin()
@@ -193,14 +182,9 @@ function themeSelect()
     var nameField = document.getElementById("displayName");
     var author = document.getElementById("author");
     var image = document.getElementById("previewImage");
-    var descText = document.createTextNode(selectedItem.getAttribute("description"));
-    var description = document.getElementById("description");
     var uninstallButton = document.getElementById("uninstallSkin");
     var uninstallLabel = prefbundle.getString("uninstallThemePrefix");
 
-    while (description.hasChildNodes())
-      description.removeChild(description.firstChild);
-
     nameField.setAttribute("value", themeName);
     author.setAttribute("value", selectedItem.getAttribute("author"));
     image.setAttribute("src", selectedItem.getAttribute("image"));
@@ -216,8 +200,6 @@ function themeSelect()
     catch (e) {
     }
     if (!oldTheme) {    
-      if( gShowDescription ) 
-        description.appendChild(descText);
 
       var locType = selectedItem.getAttribute("loctype");
       uninstallButton.disabled = (selectedSkin == skinName) || (locType == "install");
@@ -238,10 +220,6 @@ function themeSelect()
       
       newText = newText.replace(/%brand%/g, brandbundle.getString("brandShortName"));
 
-      if( gShowDescription )  {
-        descText = document.createTextNode(newText);
-        description.appendChild(descText);
-      }
     }
   }
   else {

mail/components/prefwindow/content/pref-themes.xul

@@ -82,18 +82,16 @@
 
       <hbox>
         <image style="margin-left: 4px; margin-bottom: 4px;" id="previewImage"/>
-        <spring flex="1"/>
-        <vbox>
-        <spring flex="1"/>
-        <button id="uninstallSkin" label="&uninstallSkin.label;" oncommand="uninstallSkin();"
-                accesskey="&uninstallSkin.accesskey;"/>
-        </vbox>
       </hbox>
     </vbox>
-
   </hbox>
 
-  <label id="description"/>
+  <hbox>
+    <spring flex="1"/>
+    <button id="uninstallSkin" label="&uninstallSkin.label;" oncommand="uninstallSkin();"
+            accesskey="&uninstallSkin.accesskey;"/>
+  </hbox>
+
   <separator class="thin"/>
   <description>&newThemeDescription.label;</description>
   <separator class="thin"/>

mail/components/prefwindow/jar.mn

@@ -18,6 +18,7 @@ comm.jar:
 
 en-US.jar:
 +   locale/en-US/communicator/pref/pref-fonts.dtd                      (locale/pref-fonts.dtd)
++   locale/en-US/communicator/pref/pref-themes.dtd                     (locale/pref-themes.dtd)
 +   locale/en-US/messenger/messengercompose/pref-formatting.dtd        (locale/pref-formatting.dtd)
 +   locale/en-US/messenger/messengercompose/pref-composing_messages.dtd (locale/pref-composing_messages.dtd)
 +   locale/en-US/messenger/pref-mailnews.dtd                           (locale/pref-mailnews.dtd)

mail/components/prefwindow/locale/pref-themes.dtd

@@ -3,7 +3,7 @@
 <!ENTITY  lHeader                 "Themes">
 
 <!ENTITY  skinIntro.label         "Selecting a new theme changes the look of buttons, dialog boxes, menus, toolbars, and other items. It does not change the way these items function.">
-<!ENTITY  installedThemes.label   "Theme to use:">
+<!ENTITY  installedThemes.label   "Select a theme to use:">
 
 <!ENTITY  selectSkin.label        "Apply Theme">
 <!ENTITY  selectSkin.accesskey    "a">
@@ -13,14 +13,14 @@
 
 <!ENTITY  general.label           "General">
 <!ENTITY  preview.label           "Preview Image">
-<!ENTITY  author.label            "Author">
+<!ENTITY  author.label            "Author:">
 
 <!ENTITY  newThemesCaption.label  "New Themes">
 
 <!ENTITY  getNewThemes.label      "Download new themes">
 
 <!ENTITY  newThemeDescription.label "In order to install a new theme for Mozilla Thunderbird, you must first download the theme using a browser." >
-<!ENTITY  installSkin.label        "Install Theme">
+<!ENTITY  installSkin.label        "Install New Theme">
 <!ENTITY  installSkin.accesskey    "I">
 
 <!ENTITY  installPicker.title      "Select a theme to install">