Bug 1172406 - Wrap the labels in the Master Password subdialog. r=Gijs
authorJared Wein <jwein@mozilla.com>
Thu, 18 Jun 2015 12:26:53 -0400
changeset 280322 7cab8e8734c7940716567cb45215ca68cc49631f
parent 280321 a36b8e56b6f7dab1ece69681617fe4f42f1f1564
child 280323 89736b1c392b6cc8eadae40322da09c5f5807831
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-beta@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs
bugs1172406
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1172406 - Wrap the labels in the Master Password subdialog. r=Gijs
toolkit/mozapps/preferences/changemp.xul
--- a/toolkit/mozapps/preferences/changemp.xul
+++ b/toolkit/mozapps/preferences/changemp.xul
@@ -9,54 +9,54 @@
 <!DOCTYPE dialog [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 <!ENTITY % changempDTD SYSTEM "chrome://mozapps/locale/preferences/changemp.dtd" >
 %brandDTD;
 %changempDTD;
 ]>
 
 <dialog id="changemp" title="&setPassword.title;"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-        style="width: 35em;" 
-        ondialogaccept="setPassword();" 
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        style="width: 40em;" 
+        ondialogaccept="setPassword();"
         onload="init()">
 
   <script type="application/javascript" src="chrome://mozapps/content/preferences/changemp.js"/>
 
   <stringbundle id="bundlePreferences" src="chrome://mozapps/locale/preferences/preferences.properties"/>
 
   <description control="pw1">&masterPasswordDescription.label;</description>
 
   <groupbox>
     <grid>
       <columns>
+        <column flex="1"/>
         <column/>
-        <column/> 
       </columns>
       <rows>
         <row>
-          <label control="oldpw" value="&setPassword.oldPassword.label;"/> 
+          <label control="oldpw">&setPassword.oldPassword.label;</label>
           <textbox id="oldpw" type="password"/>
-          <!-- This textbox is inserted as a workaround to the fact that making the 'type' 
-                & 'disabled' property of the 'oldpw' textbox toggle between ['password' & 
-                'false'] and ['text' & 'true'] - as would be necessary if the menu has more 
-                than one tokens, some initialized and some not - does not work properly. So, 
-                either the textbox 'oldpw' or the textbox 'message' would be displayed, 
-                depending on the state of the token selected 
+          <!-- This textbox is inserted as a workaround to the fact that making the 'type'
+                & 'disabled' property of the 'oldpw' textbox toggle between ['password' &
+                'false'] and ['text' & 'true'] - as would be necessary if the menu has more
+                than one tokens, some initialized and some not - does not work properly. So,
+                either the textbox 'oldpw' or the textbox 'message' would be displayed,
+                depending on the state of the token selected
           -->
           <textbox id="message" disabled="true" />
         </row>
         <row>
-          <label control="pw1" value="&setPassword.newPassword.label;"/> 
-          <textbox id="pw1" type="password" 
-                   oninput="setPasswordStrength(); checkPasswords();"/> 
+          <label control="pw1">&setPassword.newPassword.label;</label>
+          <textbox id="pw1" type="password"
+                   oninput="setPasswordStrength(); checkPasswords();"/>
         </row>
         <row>
-          <label control="pw2" value="&setPassword.reenterPassword.label;"/> 
-          <textbox id="pw2" type="password" oninput="checkPasswords();"/>  
+          <label control="pw2">&setPassword.reenterPassword.label;</label>
+          <textbox id="pw2" type="password" oninput="checkPasswords();"/>
         </row>
       </rows>
     </grid>
   </groupbox>
 
   <groupbox>
     <caption label="&setPassword.meter.label;"/>
     <progressmeter id="pwmeter" mode="determined" value="0"/>