Bug 1498258 - Remove grouping from the PSM dialogs. r=mayhemer
authorPaolo Amadini <paolo.mozmail@amadzone.org>
Thu, 11 Oct 2018 16:09:16 +0100
changeset 489176 e009fe76cb87961baf55cb10b68f86cb3a258367
parent 489175 bfd5c4ba4632b62b0b47857c600fefba739593e7
child 489177 fbf50f6e40718aa2c8e1e1116e858ac5a3d3e26e
push id246
push userfmarier@mozilla.com
push dateSat, 13 Oct 2018 00:15:40 +0000
reviewersmayhemer
bugs1498258
milestone64.0a1
Bug 1498258 - Remove grouping from the PSM dialogs. r=mayhemer Differential Revision: https://phabricator.services.mozilla.com/D8394
security/manager/locales/en-US/chrome/pippki/certManager.dtd
security/manager/pki/resources/content/changepassword.xul
security/manager/pki/resources/content/choosetoken.xul
security/manager/pki/resources/content/clientauthask.xul
security/manager/pki/resources/content/exceptionDialog.xul
--- a/security/manager/locales/en-US/chrome/pippki/certManager.dtd
+++ b/security/manager/locales/en-US/chrome/pippki/certManager.dtd
@@ -74,17 +74,15 @@
 <!ENTITY certmgr.hierarchy.accesskey2         "H">
 <!ENTITY certmgr.addException.label           "Add Exception…">
 <!ENTITY certmgr.addException.accesskey       "x">
 
 <!ENTITY exceptionMgr.title                   "Add Security Exception">
 <!ENTITY exceptionMgr.exceptionButton.label   "Confirm Security Exception">
 <!ENTITY exceptionMgr.exceptionButton.accesskey "C">
 <!ENTITY exceptionMgr.supplementalWarning     "Legitimate banks, stores, and other public sites will not ask you to do this.">
-<!ENTITY exceptionMgr.certlocation.caption2   "Server">
 <!ENTITY exceptionMgr.certlocation.url        "Location:">
 <!ENTITY exceptionMgr.certlocation.download   "Get Certificate">
 <!ENTITY exceptionMgr.certlocation.accesskey  "G">
-<!ENTITY exceptionMgr.certstatus.caption      "Certificate Status">
 <!ENTITY exceptionMgr.certstatus.viewCert     "View…">
 <!ENTITY exceptionMgr.certstatus.accesskey    "V">
 <!ENTITY exceptionMgr.permanent.label         "Permanently store this exception">
 <!ENTITY exceptionMgr.permanent.accesskey     "P">
--- a/security/manager/pki/resources/content/changepassword.xul
+++ b/security/manager/pki/resources/content/changepassword.xul
@@ -20,17 +20,16 @@
 
 <hbox align="center">
   <label value="&setPassword.tokenName.label;: "/>
   <label id="tokenName" />
 </hbox>
 
 <separator/>
 
-<groupbox>
 <grid>
  <columns>
    <column/>
    <column/> 
  </columns>
  <rows>
    <row>
      <label value="&setPassword.oldPassword.label;"/> 
@@ -50,17 +49,13 @@
        oninput="setPasswordStrength(); checkPasswords();"/> 
    </row>
    <row>
      <label value="&setPassword.reenterPassword.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"/>
-</groupbox>
+<label control="pwmeter" value="&setPassword.meter.label;"/>
+<progressmeter id="pwmeter" mode="determined" value="0"/>
 
 </dialog>
--- a/security/manager/pki/resources/content/choosetoken.xul
+++ b/security/manager/pki/resources/content/choosetoken.xul
@@ -19,16 +19,14 @@
   ondialogcancel="return doCancel();"
   onload="onLoad();">
 
 <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
 
 <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
 <script type="application/javascript" src="chrome://pippki/content/choosetoken.js"/>
 
-  <groupbox>
-    <description>&chooseToken.message1;</description>
-    <menulist id="tokens">
-      <menupopup/>
-    </menulist>
-  </groupbox>
+<description>&chooseToken.message1;</description>
+<menulist id="tokens">
+  <menupopup/>
+</menulist>
 
 </dialog>
--- a/security/manager/pki/resources/content/clientauthask.xul
+++ b/security/manager/pki/resources/content/clientauthask.xul
@@ -20,29 +20,26 @@
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
 </stringbundleset>
 
 <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
 <script type="application/javascript" src="chrome://pippki/content/clientauthask.js"/>
 
-  <groupbox>
-    <description style="font-weight: bold;">&clientAuthAsk.message1;</description>
-    <description id="hostname"/>
-    <description id="organization"/>
-    <description id="issuer"/>
-    </groupbox>
-    <groupbox>
-    <description style="font-weight: bold;">&clientAuthAsk.message2;</description>
-    <!-- The items in this menulist must never be sorted,
-         but remain in the order filled by the application
-    -->
-    <menulist id="nicknames" oncommand="onCertSelected();">
-        <menupopup/>
-    </menulist>
-    <description>&clientAuthAsk.message3;</description>
-    <textbox readonly="true" id="details" multiline="true"
-      style="height: 11em;"/>
-    <checkbox id="rememberBox" checked="true"/>
-  </groupbox>
+<description style="font-weight: bold;">&clientAuthAsk.message1;</description>
+<description id="hostname"/>
+<description id="organization"/>
+<description id="issuer"/>
+
+<description style="font-weight: bold;">&clientAuthAsk.message2;</description>
+<!-- The items in this menulist must never be sorted,
+     but remain in the order filled by the application
+-->
+<menulist id="nicknames" oncommand="onCertSelected();">
+    <menupopup/>
+</menulist>
+<description>&clientAuthAsk.message3;</description>
+<textbox readonly="true" id="details" multiline="true"
+  style="height: 11em;"/>
+<checkbox id="rememberBox" checked="true"/>
 
 </dialog>
--- a/security/manager/pki/resources/content/exceptionDialog.xul
+++ b/security/manager/pki/resources/content/exceptionDialog.xul
@@ -42,46 +42,38 @@
       <description id="warningText"
                    style="white-space: pre-wrap"/>
       <description id="warningSupplemental"
                    style="font-weight: bold; white-space: pre-wrap;"
                    >&exceptionMgr.supplementalWarning;</description>
     </vbox>
   </hbox>
 
-  <groupbox id="locationGroupBox">
-    <caption label="&exceptionMgr.certlocation.caption2;"/>
-    <hbox align="center">
-      <label control="locationTextBox" value="&exceptionMgr.certlocation.url;"/>
-      <textbox id="locationTextBox" flex="1" oninput="handleTextChange();"
-               value="https://" class="uri-element"/>
-      <button id="checkCertButton" disabled="true" dlgtype="extra2"
-              accesskey="&exceptionMgr.certlocation.accesskey;"
-              label="&exceptionMgr.certlocation.download;"/>
-    </hbox>
-  </groupbox>
+  <hbox align="center">
+    <label control="locationTextBox" value="&exceptionMgr.certlocation.url;"/>
+    <textbox id="locationTextBox" flex="1" oninput="handleTextChange();"
+             value="https://" class="uri-element"/>
+    <button id="checkCertButton" disabled="true" dlgtype="extra2"
+            accesskey="&exceptionMgr.certlocation.accesskey;"
+            label="&exceptionMgr.certlocation.download;"/>
+  </hbox>
 
-  <groupbox id="certStatusGroupBox" flex="1">
-    <caption label="&exceptionMgr.certstatus.caption;"/>
-    <hbox>
-      <description id="headerDescription" style="white-space: pre-wrap;"
-                   flex="1"/>
-      <vbox>
-        <button id="viewCertButton" label="&exceptionMgr.certstatus.viewCert;"
-                accesskey="&exceptionMgr.certstatus.accesskey;"
-                disabled="true" oncommand="viewCertButtonClick();"/>
-      </vbox>
-    </hbox>
-    <description id="statusDescription"
-                 style="font-weight: bold; padding-bottom: 1em;"/>
-    <description id="statusLongDescription" style="white-space: pre-wrap;"/>
-    <description id="status2Description"
-                 style="font-weight: bold; padding-bottom: 1em;"/>
-    <description id="status2LongDescription" style="white-space: pre-wrap;"/>
-    <description id="status3Description"
-                 style="font-weight: bold; padding-bottom: 1em;"/>
-    <description id="status3LongDescription" style="white-space: pre-wrap;"/>
-    <spacer flex="1"/>
-    <checkbox id="permanent" disabled="true"
-              label="&exceptionMgr.permanent.label;"
-              accesskey="&exceptionMgr.permanent.accesskey;"/>
-  </groupbox>
+  <hbox align="center">
+    <description id="headerDescription" style="white-space: pre-wrap;"
+                 flex="1"/>
+    <button id="viewCertButton" label="&exceptionMgr.certstatus.viewCert;"
+            accesskey="&exceptionMgr.certstatus.accesskey;"
+            disabled="true" oncommand="viewCertButtonClick();"/>
+  </hbox>
+  <description id="statusDescription"
+               style="font-weight: bold; padding-bottom: 1em;"/>
+  <description id="statusLongDescription" style="white-space: pre-wrap;"/>
+  <description id="status2Description"
+               style="font-weight: bold; padding-bottom: 1em;"/>
+  <description id="status2LongDescription" style="white-space: pre-wrap;"/>
+  <description id="status3Description"
+               style="font-weight: bold; padding-bottom: 1em;"/>
+  <description id="status3LongDescription" style="white-space: pre-wrap;"/>
+  <spacer flex="1"/>
+  <checkbox id="permanent" disabled="true"
+            label="&exceptionMgr.permanent.label;"
+            accesskey="&exceptionMgr.permanent.accesskey;"/>
 </dialog>