Bug 481237 : Layout and sizing changes to Publish window

git-svn-id: http://svn.mozilla.org/addons/trunk@23426 4eb1ac78-321c-0410-a911-ec516a8615a5

3 files changed, 15 insertions, 10 deletions

diff --git a/bandwagon/content/ui/publish.xul b/bandwagon/content/ui/publish.xul
index 18ea217..380a4c2 100644
--- a/bandwagon/content/ui/publish.xul
+++ b/bandwagon/content/ui/publish.xul
@@ -20,7 +20,7 @@
   - the Initial Developer. All Rights Reserved.
   -
   - Contributor(s): David McNamara
-  -                 Brian King
+  -                 Brian King <brian (at) briks (dot) si>
   -
   - Alternatively, the contents of this file may be used under the terms of
   - either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -45,6 +45,7 @@
         windowtype="Bandwagon:Publish"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&window.title;"
+        style="&publish.style;"
         buttons="accept,cancel"
         buttonlabelcancel="&cancel.label;"
         buttonlabelaccept="&publish.label;"
@@ -54,9 +55,7 @@
     <script src="chrome://bandwagon/content/ui/dialog.js"/>
     <script src="chrome://bandwagon/content/ui/publishController.js"/>
 
-    <stringbundleset>
-        <stringbundle id="bandwagon-strings" src="chrome://bandwagon/locale/publish.properties"/>
-    </stringbundleset>
+    <stringbundle id="bandwagon-strings" src="chrome://bandwagon/locale/publish.properties"/>
 
     <vbox>
         <!--<label id="dialog-desc"/>-->
@@ -67,7 +66,7 @@
             </hbox>
 
             <hbox id="sharing-with-box">
-                <label id="sharing-with" class="dialog-header"/>
+                <description id="sharing-with" class="dialog-header" flex="1"/>
             </hbox>
  
             <groupbox id="new-email-box">
@@ -78,11 +77,13 @@
             </groupbox>
        </deck>
 
-        <label value="&enter.a.personal.note.label;"/>
+        <separator class="thin"/>
+
+        <description flex="1">&enter.a.personal.note.label;</description>
 
         <textbox id="personal-note" multiline="true"/>
 
-        <label id="sharing-with-new"/>
+        <description id="sharing-with-new" flex="1"/>
 
         <hbox>
             <image id="spinner" src="chrome://bandwagon/skin/images/spinner-small.gif" collapsed="true"/>
diff --git a/bandwagon/content/ui/publishController.js b/bandwagon/content/ui/publishController.js
index a011423..1ff0d27 100644
--- a/bandwagon/content/ui/publishController.js
+++ b/bandwagon/content/ui/publishController.js
@@ -19,6 +19,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s): David McNamara
+ *                 Brian King <brian (at) briks (dot) si>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -76,7 +77,7 @@ Bandwagon.Controller.Publish.init = function()
             document.getElementById("sharing-with-new").collapsed = true;
             break;
         case Bandwagon.Controller.Publish.TYPE_EXISTING_EMAIL:
-            document.getElementById("sharing-with").value = Bandwagon.Controller.Publish.stringBundle.getFormattedString("sharing.with", [Bandwagon.Controller.Publish.publishDestination, Bandwagon.Controller.Publish.publishExtension.name]);
+            document.getElementById("sharing-with").textContent = Bandwagon.Controller.Publish.stringBundle.getFormattedString("sharing.with", [Bandwagon.Controller.Publish.publishDestination, Bandwagon.Controller.Publish.publishExtension.name]);
             document.getElementById("new-email-box").collapsed = true;
             document.getElementById("sharing-with-box").collapsed = false;
             document.getElementById("publishing-to-box").collapsed = true;
@@ -84,7 +85,7 @@ Bandwagon.Controller.Publish.init = function()
             document.getElementById("bandwagon-publish").getButton("accept").label = Bandwagon.Controller.Publish.stringBundle.getString("send.email");
             break;
         case Bandwagon.Controller.Publish.TYPE_NEW_EMAIL:
-            document.getElementById("sharing-with-new").value = Bandwagon.Controller.Publish.stringBundle.getFormattedString("sharing.with.new", [Bandwagon.Controller.Publish.publishExtension.name]);
+            document.getElementById("sharing-with-new").textContent = Bandwagon.Controller.Publish.stringBundle.getFormattedString("sharing.with.new", [Bandwagon.Controller.Publish.publishExtension.name]);
             document.getElementById("sharing-with-new").collapsed = false;
             document.getElementById("new-email-box").collapsed = false;
             document.getElementById("sharing-with-box").collapsed = true;
diff --git a/bandwagon/locale/en-US/publish.dtd b/bandwagon/locale/en-US/publish.dtd
index f70766b..0e3ec14 100644
--- a/bandwagon/locale/en-US/publish.dtd
+++ b/bandwagon/locale/en-US/publish.dtd
@@ -19,7 +19,7 @@
   - the Initial Developer. All Rights Reserved.
   -
   - Contributor(s): David McNamara
-  -                 Brian King
+  -                 Brian King <brian (at) briks (dot) si>
   -
   - Alternatively, the contents of this file may be used under the terms of
   - either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -35,6 +35,9 @@
   - 
   - ***** END LICENSE BLOCK ***** -->
 
+<!-- For localisers to change the width of the window -->
+<!ENTITY publish.style                    "width: 35em;">
+
 <!ENTITY window.title                     "Publish">
 <!ENTITY cancel.label                     "Cancel">
 <!ENTITY publish.label                    "Publish">