Bug 1434151 - Inline and remove the various certificate viewer overlays. r=keeler

This is part of the work to remove XUL overlays. All of these overlays are
used only once and do not need to be in their own overlay files.

MozReview-Commit-ID: 9NBBTg5KHxb

--HG--
extra : rebase_source : 675a5baa91b93eeb7253ad5773cb76e7db6be4fd

security/manager/pki/resources/content/certDump.xul

@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<overlay id="certDumpOverlay"
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:cert="http://netscape.com/rdf-cert#"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<vbox class="box-padded" id="certPrettyPrint" flex="1">
-  <label class="header" value="&certmgr.hierarchy.label;"
-         control="treesetDump" accesskey="&certmgr.hierarchy.accesskey2;"/>
-  <tree id="treesetDump" onselect="updateCertDump();" flex="1"
-        hidecolumnpicker="true" style="height: 8em;">
-    <treecols>
-      <treecol id="dumpCol" flex="1" primary="true" hideheader="true"/>
-    </treecols>
-  </tree>
-
-  <label class="header" value="&certmgr.details.label;"
-         control="prettyDumpTree" accesskey="&certmgr.details.accesskey;"/>
-  <tree id="prettyDumpTree" style="height: 15em" treelines="true" flex="1"
-            onselect="displaySelected();" hidecolumnpicker="true">
-    <treecols>
-      <treecol flex="1" id="certDataCol" primary="true" hideheader="true"/>
-    </treecols>
-    <treechildren/>
-  </tree>
-
-  <label class="header" value="&certmgr.fields.label;"
-         control="certDumpVal" accesskey="&certmgr.fields.accesskey;"/>
-  <textbox id="certDumpVal" multiline="true" flex="1"
-           readonly="true" style="height: 11em; font-family: -moz-fixed;"/>
-
-  <separator class="thin"/>
-  <hbox>
-    <button id="export_cert" class="normal" label="&certmgr.export.label;"
-            accesskey="&certmgr.export.accesskey;"
-            oncommand="exportToFile(window, getCurrentCert());"/>
-  </hbox>
-</vbox>
-</overlay>

security/manager/pki/resources/content/certViewer.js

@@ -6,9 +6,8 @@
 "use strict";
 
 /**
- * @file Implements functionality for certViewer.xul and its tabs certDump.xul
- *       and viewCertDetails.xul: a dialog that allows various attributes of a
- *       certificate to be viewed.
+ * @file Implements functionality for certViewer.xul and its general and details
+ *       tabs.
  * @argument {nsISupports} window.arguments[0]
  *           The cert to view, queryable to nsIX509Cert.
  */

security/manager/pki/resources/content/certViewer.xul

@@ -7,9 +7,6 @@
 
 <!DOCTYPE dialog SYSTEM "chrome://pippki/locale/certManager.dtd">
 
-<?xul-overlay href="chrome://pippki/content/viewCertDetails.xul"?>
-<?xul-overlay href="chrome://pippki/content/certDump.xul"?>
-
 <dialog id="certDetails"
   title="&certmgr.certdetail.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -32,8 +29,131 @@
            accesskey="&certmgr.detail.prettyprint_tab.accesskey;"/>
     </tabs>
     <tabpanels flex="1">
-      <vbox id="general_info"/>
-      <vbox id="certPrettyPrint"/>
+      <vbox class="box-padded" id="general_info">
+        <vbox id="verify_info_box">
+          <label id="verify_pending" value="&certmgr.pending.label;"/>
+          <label class="header" id="verified"/>
+        </vbox>
+        <separator class="groove"/>
+        <vbox flex="1">
+          <grid>
+            <columns>
+              <column/>
+              <column flex="1"/>
+            </columns>
+            <rows>
+              <row>
+                <label class="header" value="&certmgr.subjectinfo.label;"/>
+                <spacer/>
+                <spacer/>
+              </row>
+              <row>
+                <label value="&certmgr.certdetail.cn;"/>
+                <textbox id="commonname" class="plain" readonly="true"/>
+              </row>
+              <row>
+                <label value="&certmgr.certdetail.o;"/>
+                <textbox id="organization" class="plain" readonly="true"/>
+              </row>
+              <row>
+                <label value="&certmgr.certdetail.ou;"/>
+                <textbox id="orgunit" class="plain" readonly="true"/>
+              </row>
+              <row>
+                <label value="&certmgr.certdetail.serialnumber;"/>
+                <textbox id="serialnumber" class="plain" readonly="true"/>
+              </row>
+              <row>
+                <separator class="thin"/>
+                <spacer/>
+              </row>
+              <row>
+                <label class="header" value="&certmgr.issuerinfo.label;"/>
+                <spacer/>
+              </row>
+              <row>
+                <label value="&certmgr.certdetail.cn;"/>
+                <textbox id="issuercommonname" class="plain" readonly="true"/>
+              </row>
+              <row>
+                <label value="&certmgr.certdetail.o;"/>
+                <textbox id="issuerorganization" class="plain" readonly="true"/>
+              </row>
+              <row>
+                <label value="&certmgr.certdetail.ou;"/>
+                <textbox id="issuerorgunit" class="plain" readonly="true"/>
+              </row>
+              <row>
+                <separator class="thin"/>
+                <spacer/>
+              </row>
+              <row>
+                <label class ="header" value="&certmgr.periodofvalidity.label;"/>
+                <spacer/>
+              </row>
+              <row>
+                <label value="&certmgr.begins;"/>
+                <textbox id="validitystart" class="plain" readonly="true"/>
+              </row>
+              <row>
+                <label value="&certmgr.expires;"/>
+                <textbox id="validityend" class="plain" readonly="true"/>
+              </row>
+              <row>
+                <separator class="thin"/>
+                <spacer/>
+              </row>
+              <row>
+                <label class="header" value="&certmgr.fingerprints.label;"/>
+                <spacer/>
+              </row>
+              <row>
+                <label value="&certmgr.certdetail.sha256fingerprint;"/>
+                <hbox>
+                  <textbox id="sha256fingerprint" class="plain" readonly="true" multiline="true"
+                           style="height: 6ex; width: 48ch; font-family: monospace;"/>
+                </hbox>
+              </row>
+              <row>
+                <label value="&certmgr.certdetail.sha1fingerprint;"/>
+                <textbox id="sha1fingerprint" class="plain" readonly="true" style="min-width:34em;"/>
+              </row>
+            </rows>
+          </grid>
+        </vbox>
+      </vbox>
+      <vbox class="box-padded" id="certPrettyPrint" flex="1">
+        <label class="header" value="&certmgr.hierarchy.label;"
+               control="treesetDump" accesskey="&certmgr.hierarchy.accesskey2;"/>
+        <tree id="treesetDump" onselect="updateCertDump();" flex="1"
+              hidecolumnpicker="true" style="height: 8em;">
+          <treecols>
+            <treecol id="dumpCol" flex="1" primary="true" hideheader="true"/>
+          </treecols>
+        </tree>
+
+        <label class="header" value="&certmgr.details.label;"
+               control="prettyDumpTree" accesskey="&certmgr.details.accesskey;"/>
+        <tree id="prettyDumpTree" style="height: 15em" treelines="true" flex="1"
+                  onselect="displaySelected();" hidecolumnpicker="true">
+          <treecols>
+            <treecol flex="1" id="certDataCol" primary="true" hideheader="true"/>
+          </treecols>
+          <treechildren/>
+        </tree>
+
+        <label class="header" value="&certmgr.fields.label;"
+               control="certDumpVal" accesskey="&certmgr.fields.accesskey;"/>
+        <textbox id="certDumpVal" multiline="true" flex="1"
+                 readonly="true" style="height: 11em; font-family: -moz-fixed;"/>
+
+        <separator class="thin"/>
+        <hbox>
+          <button id="export_cert" class="normal" label="&certmgr.export.label;"
+                  accesskey="&certmgr.export.accesskey;"
+                  oncommand="exportToFile(window, getCurrentCert());"/>
+        </hbox>
+      </vbox>
     </tabpanels>
   </tabbox>
 

security/manager/pki/resources/content/viewCertDetails.xul

@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<overlay id="certViewerOverlay" 
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
-         xmlns:cert="http://netscape.com/rdf-cert#" 
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<vbox class="box-padded" id="general_info">
-  <vbox id="verify_info_box">
-    <label id="verify_pending" value="&certmgr.pending.label;"/>
-    <label class="header" id="verified"/>
-  </vbox>
-  <separator class="groove"/>
-  <vbox flex="1">
-    <grid> 
-      <columns>
-        <column/>
-        <column flex="1"/>
-      </columns>
-      <rows>
-        <row>
-          <label class="header" value="&certmgr.subjectinfo.label;"/>
-          <spacer/>
-          <spacer/>
-        </row>
-        <row>
-          <label value="&certmgr.certdetail.cn;"/>
-          <textbox id="commonname" class="plain" readonly="true"/>
-        </row>
-        <row>
-          <label value="&certmgr.certdetail.o;"/>
-          <textbox id="organization" class="plain" readonly="true"/>
-        </row>
-        <row>
-          <label value="&certmgr.certdetail.ou;"/>
-          <textbox id="orgunit" class="plain" readonly="true"/>
-        </row>
-        <row>
-          <label value="&certmgr.certdetail.serialnumber;"/>
-          <textbox id="serialnumber" class="plain" readonly="true"/>
-        </row>
-        <row>
-          <separator class="thin"/>
-          <spacer/>
-        </row>
-        <row>
-          <label class="header" value="&certmgr.issuerinfo.label;"/>
-          <spacer/>
-        </row>
-        <row>
-          <label value="&certmgr.certdetail.cn;"/>
-          <textbox id="issuercommonname" class="plain" readonly="true"/>
-        </row>
-        <row>
-          <label value="&certmgr.certdetail.o;"/>
-          <textbox id="issuerorganization" class="plain" readonly="true"/>
-        </row>
-        <row>
-          <label value="&certmgr.certdetail.ou;"/>
-          <textbox id="issuerorgunit" class="plain" readonly="true"/>
-        </row>
-        <row>
-          <separator class="thin"/>
-          <spacer/>
-        </row>
-        <row>
-          <label class ="header" value="&certmgr.periodofvalidity.label;"/>
-          <spacer/>
-        </row>
-        <row>
-          <label value="&certmgr.begins;"/>
-          <textbox id="validitystart" class="plain" readonly="true"/>
-        </row>
-        <row>
-          <label value="&certmgr.expires;"/>
-          <textbox id="validityend" class="plain" readonly="true"/>
-        </row>
-        <row>
-          <separator class="thin"/>
-          <spacer/>
-        </row>
-        <row>
-          <label class="header" value="&certmgr.fingerprints.label;"/>
-          <spacer/>
-        </row>
-        <row>
-          <label value="&certmgr.certdetail.sha256fingerprint;"/>
-          <hbox>
-            <textbox id="sha256fingerprint" class="plain" readonly="true" multiline="true"
-                     style="height: 6ex; width: 48ch; font-family: monospace;"/>
-          </hbox>
-        </row>
-        <row>
-          <label value="&certmgr.certdetail.sha1fingerprint;"/>
-          <textbox id="sha1fingerprint" class="plain" readonly="true" style="min-width:34em;"/>
-        </row>
-      </rows>
-    </grid>
-  </vbox>
-</vbox>
-</overlay>

security/manager/pki/resources/jar.mn

@@ -8,7 +8,6 @@ pippki.jar:
     content/pippki/MineOverlay.xul           (content/MineOverlay.xul)
     content/pippki/OthersOverlay.xul         (content/OthersOverlay.xul)
     content/pippki/WebSitesOverlay.xul       (content/WebSitesOverlay.xul)
-    content/pippki/certDump.xul              (content/certDump.xul)
     content/pippki/certManager.js            (content/certManager.js)
     content/pippki/certManager.xul           (content/certManager.xul)
     content/pippki/certViewer.js             (content/certViewer.js)
@@ -40,4 +39,3 @@ pippki.jar:
     content/pippki/resetpassword.xul         (content/resetpassword.xul)
     content/pippki/setp12password.js         (content/setp12password.js)
     content/pippki/setp12password.xul        (content/setp12password.xul)
-    content/pippki/viewCertDetails.xul       (content/viewCertDetails.xul)