Bug 1434016 - Inline and remove the various security manager 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: Ecwq2UN52o9

--HG--
extra : rebase_source : 5a9692c7d9965940847ae1d488d1b94a2abf66c7

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

@@ -1,55 +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/. -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<overlay id="CAOverlay"
-         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 id="CACerts">
-    <description>&certmgr.cas2;</description>
-    <separator class="thin"/>
-    <tree id="ca-tree" flex="1" enableColumnDrag="true"
-              onselect="ca_enableButtons()">
-      <treecols>
-        <treecol id="certcol" label="&certmgr.certname;" primary="true"
-                     persist="hidden width ordinal" flex="1"/>
-        <splitter class="tree-splitter"/>
-        <treecol id="tokencol" label="&certmgr.tokenname;"
-                     persist="hidden width ordinal" flex="1"/>
-      </treecols>
-      <treechildren ondblclick="viewCerts();"/>
-    </tree>
-
-    <separator class="thin"/>
-
-    <hbox>
-      <button id="ca_viewButton"
-              label="&certmgr.view2.label;"
-              accesskey="&certmgr.view2.accesskey;"
-              disabled="true" oncommand="viewCerts();"/>
-      <button id="ca_editButton"
-              label="&certmgr.edit3.label;"
-              accesskey="&certmgr.edit3.accesskey;"
-              disabled="true" oncommand="editCerts();"/>
-      <button id="ca_addButton"
-              label="&certmgr.restore2.label;"
-              accesskey="&certmgr.restore2.accesskey;"
-              oncommand="addCACerts();"/>
-      <button id="ca_exportButton"
-              label="&certmgr.export.label;"
-              accesskey="&certmgr.export.accesskey;"
-              disabled="true" oncommand="exportCerts();"/>
-      <button id="ca_deleteButton"
-              label="&certmgr.delete_builtin.label;"
-              accesskey="&certmgr.delete_builtin.accesskey;"
-              disabled="true" oncommand="deleteCerts();"/>
-    </hbox>
-  </vbox>
-</overlay>

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

@@ -1,64 +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/. -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<overlay id="MineOverlay"
-         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 id="myCerts">
-    <description>&certmgr.mine2;</description>
-    <separator class="thin"/>
-    <tree id="user-tree" flex="1" enableColumnDrag="true"
-              onselect="mine_enableButtons()">
-      <treecols>
-        <treecol id="certcol" label="&certmgr.certname;" primary="true"
-                     persist="hidden width ordinal" flex="1"/>
-        <splitter class="tree-splitter"/>
-        <treecol id="tokencol" label="&certmgr.tokenname;"
-                     persist="hidden width ordinal" flex="1"/>
-        <splitter class="tree-splitter"/>
-        <treecol id="serialnumcol" label="&certmgr.serial;"
-                     persist="hidden width ordinal" flex="1"/>
-        <splitter class="tree-splitter"/>
-        <treecol id="issuedcol" label="&certmgr.begins;"
-                     hidden="true" persist="hidden width ordinal" flex="1"/>
-        <splitter class="tree-splitter"/>
-        <treecol id="expiredcol" label="&certmgr.expires;"
-                     persist="hidden width ordinal" flex="1"/>
-      </treecols>
-      <treechildren ondblclick="viewCerts();"/>
-    </tree>
-    
-    <separator class="thin"/>
-
-    <hbox>
-       <button id="mine_viewButton" class="normal" 
-               label="&certmgr.view2.label;"
-               accesskey="&certmgr.view2.accesskey;"
-               disabled="true" oncommand="viewCerts();"/>
-       <button id="mine_backupButton" class="normal" 
-               label="&certmgr.backup2.label;"
-               accesskey="&certmgr.backup2.accesskey;"
-               disabled="true" oncommand="backupCerts();"/>
-       <button id="mine_backupAllButton" class="normal" 
-               label="&certmgr.backupall2.label;"
-               accesskey="&certmgr.backupall2.accesskey;"
-               oncommand="backupAllCerts();"/>
-       <button id="mine_restoreButton" class="normal" 
-               label="&certmgr.restore2.label;"
-               accesskey="&certmgr.restore2.accesskey;"
-               oncommand="restoreCerts();"/>
-       <button id="mine_deleteButton" class="normal" 
-               label="&certmgr.delete2.label;"
-               accesskey="&certmgr.delete2.accesskey;"
-               disabled="true" oncommand="deleteCerts();"/>
-    </hbox>
-  </vbox>
-</overlay>

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

@@ -1,54 +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/. -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<overlay id="OthersOverlay"
-         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 id="othersCerts">
-    <description>&certmgr.others2;</description>
-    <separator class="thin"/>
-    <tree id="email-tree" flex="1"
-              onselect="email_enableButtons()">
-      <treecols>
-        <treecol id="certcol" label="&certmgr.certname;" primary="true"
-                     flex="1"/>
-        <splitter class="tree-splitter"/>
-        <treecol id="emailcol" label="&certmgr.email;"
-                     flex="1"/>
-        <splitter class="tree-splitter"/>
-        <treecol id="expiredcol" label="&certmgr.expires;"
-                 flex="1"/>
-      </treecols>
-      <treechildren flex="1" ondblclick="viewCerts();"/>
-    </tree>
-
-    <separator class="thin"/>
-
-    <hbox>
-      <button id="email_viewButton"
-              label="&certmgr.view2.label;"
-              accesskey="&certmgr.view2.accesskey;"
-              disabled="true" oncommand="viewCerts();"/>
-      <button id="email_addButton"
-              label="&certmgr.restore2.label;"
-              accesskey="&certmgr.restore2.accesskey;"
-              oncommand="addEmailCert();"/>
-      <button id="email_exportButton"
-              label="&certmgr.export.label;"
-              accesskey="&certmgr.export.accesskey;"
-              disabled="true" oncommand="exportCerts();"/>
-      <button id="email_deleteButton"
-              label="&certmgr.delete2.label;"
-              accesskey="&certmgr.delete2.accesskey;"
-              disabled="true" oncommand="deleteCerts();"/>
-    </hbox>
-  </vbox>
-</overlay>

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

@@ -1,57 +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/. -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<overlay id="WebSitesOverlay"
-         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 id="webCerts">
-    <description>&certmgr.websites3;</description>
-    <separator class="thin"/>
-    <tree id="server-tree" flex="1" enableColumnDrag="true"
-              onselect="websites_enableButtons()">
-      <treecols>
-        <treecol id="certcol" label="&certmgr.certname;" primary="true"
-                     persist="hidden width ordinal" flex="1"/>
-        <splitter class="tree-splitter"/>
-        <treecol id="sitecol" label="&certmgr.certserver;"
-                 persist="hidden width ordinal" flex="1"/>
-        <splitter class="tree-splitter"/>
-        <treecol id="lifetimecol" label="&certmgr.override_lifetime;"
-                 persist="hidden width ordinal" flex="1"/>
-        <splitter class="tree-splitter"/>
-        <treecol id="expiredcol" label="&certmgr.expires;"
-                 persist="hidden width ordinal" flex="1"/>
-      </treecols>
-      <treechildren ondblclick="viewCerts();"/>
-    </tree>
-
-    <separator class="thin"/>
-
-    <hbox>
-      <button id="websites_viewButton"
-              label="&certmgr.view2.label;"
-              accesskey="&certmgr.view2.accesskey;"
-              disabled="true" oncommand="viewCerts();"/>
-      <button id="websites_exportButton"
-              label="&certmgr.export.label;"
-              accesskey="&certmgr.export.accesskey;"
-              disabled="true" oncommand="exportCerts();"/>
-      <button id="websites_deleteButton"
-              label="&certmgr.delete2.label;"
-              accesskey="&certmgr.delete2.accesskey;"
-              disabled="true" oncommand="deleteCerts();"/>
-      <button id="websites_exceptionButton"
-              label="&certmgr.addException.label;"
-              accesskey="&certmgr.addException.accesskey;"
-              oncommand="addException();"/>
-    </hbox>
-  </vbox>
-</overlay>

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

@@ -5,11 +5,6 @@
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
-<?xul-overlay href="chrome://pippki/content/MineOverlay.xul"?>
-<?xul-overlay href="chrome://pippki/content/OthersOverlay.xul"?>
-<?xul-overlay href="chrome://pippki/content/WebSitesOverlay.xul"?>
-<?xul-overlay href="chrome://pippki/content/CAOverlay.xul"?>
-
 <!DOCTYPE dialog SYSTEM "chrome://pippki/locale/certManager.dtd">
 
 <dialog id="certmanager"
@@ -35,10 +30,176 @@
         <tab id="ca_tab" label="&certmgr.tab.ca;" selected="true"/>
       </tabs>
       <tabpanels flex="1">
-        <vbox id="myCerts" flex="1"/>
-        <vbox id="othersCerts" flex="1"/>
-        <vbox id="webCerts" flex="1"/>
-        <vbox id="CACerts" flex="1"/>
+        <vbox id="myCerts" flex="1">
+          <description>&certmgr.mine2;</description>
+          <separator class="thin"/>
+          <tree id="user-tree" flex="1" enableColumnDrag="true"
+                    onselect="mine_enableButtons()">
+            <treecols>
+              <treecol id="certcol" label="&certmgr.certname;" primary="true"
+                           persist="hidden width ordinal" flex="1"/>
+              <splitter class="tree-splitter"/>
+              <treecol id="tokencol" label="&certmgr.tokenname;"
+                           persist="hidden width ordinal" flex="1"/>
+              <splitter class="tree-splitter"/>
+              <treecol id="serialnumcol" label="&certmgr.serial;"
+                           persist="hidden width ordinal" flex="1"/>
+              <splitter class="tree-splitter"/>
+              <treecol id="issuedcol" label="&certmgr.begins;"
+                           hidden="true" persist="hidden width ordinal" flex="1"/>
+              <splitter class="tree-splitter"/>
+              <treecol id="expiredcol" label="&certmgr.expires;"
+                           persist="hidden width ordinal" flex="1"/>
+            </treecols>
+            <treechildren ondblclick="viewCerts();"/>
+          </tree>
+
+          <separator class="thin"/>
+
+          <hbox>
+             <button id="mine_viewButton" class="normal"
+                     label="&certmgr.view2.label;"
+                     accesskey="&certmgr.view2.accesskey;"
+                     disabled="true" oncommand="viewCerts();"/>
+             <button id="mine_backupButton" class="normal"
+                     label="&certmgr.backup2.label;"
+                     accesskey="&certmgr.backup2.accesskey;"
+                     disabled="true" oncommand="backupCerts();"/>
+             <button id="mine_backupAllButton" class="normal"
+                     label="&certmgr.backupall2.label;"
+                     accesskey="&certmgr.backupall2.accesskey;"
+                     oncommand="backupAllCerts();"/>
+             <button id="mine_restoreButton" class="normal"
+                     label="&certmgr.restore2.label;"
+                     accesskey="&certmgr.restore2.accesskey;"
+                     oncommand="restoreCerts();"/>
+             <button id="mine_deleteButton" class="normal"
+                     label="&certmgr.delete2.label;"
+                     accesskey="&certmgr.delete2.accesskey;"
+                     disabled="true" oncommand="deleteCerts();"/>
+          </hbox>
+        </vbox>
+        <vbox id="othersCerts" flex="1">
+          <description>&certmgr.others2;</description>
+          <separator class="thin"/>
+          <tree id="email-tree" flex="1"
+                    onselect="email_enableButtons()">
+            <treecols>
+              <treecol id="certcol" label="&certmgr.certname;" primary="true"
+                           flex="1"/>
+              <splitter class="tree-splitter"/>
+              <treecol id="emailcol" label="&certmgr.email;"
+                           flex="1"/>
+              <splitter class="tree-splitter"/>
+              <treecol id="expiredcol" label="&certmgr.expires;"
+                       flex="1"/>
+            </treecols>
+            <treechildren flex="1" ondblclick="viewCerts();"/>
+          </tree>
+
+          <separator class="thin"/>
+
+          <hbox>
+            <button id="email_viewButton"
+                    label="&certmgr.view2.label;"
+                    accesskey="&certmgr.view2.accesskey;"
+                    disabled="true" oncommand="viewCerts();"/>
+            <button id="email_addButton"
+                    label="&certmgr.restore2.label;"
+                    accesskey="&certmgr.restore2.accesskey;"
+                    oncommand="addEmailCert();"/>
+            <button id="email_exportButton"
+                    label="&certmgr.export.label;"
+                    accesskey="&certmgr.export.accesskey;"
+                    disabled="true" oncommand="exportCerts();"/>
+            <button id="email_deleteButton"
+                    label="&certmgr.delete2.label;"
+                    accesskey="&certmgr.delete2.accesskey;"
+                    disabled="true" oncommand="deleteCerts();"/>
+          </hbox>
+        </vbox>
+        <vbox id="webCerts" flex="1">
+          <description>&certmgr.websites3;</description>
+          <separator class="thin"/>
+          <tree id="server-tree" flex="1" enableColumnDrag="true"
+                    onselect="websites_enableButtons()">
+            <treecols>
+              <treecol id="certcol" label="&certmgr.certname;" primary="true"
+                           persist="hidden width ordinal" flex="1"/>
+              <splitter class="tree-splitter"/>
+              <treecol id="sitecol" label="&certmgr.certserver;"
+                       persist="hidden width ordinal" flex="1"/>
+              <splitter class="tree-splitter"/>
+              <treecol id="lifetimecol" label="&certmgr.override_lifetime;"
+                       persist="hidden width ordinal" flex="1"/>
+              <splitter class="tree-splitter"/>
+              <treecol id="expiredcol" label="&certmgr.expires;"
+                       persist="hidden width ordinal" flex="1"/>
+            </treecols>
+            <treechildren ondblclick="viewCerts();"/>
+          </tree>
+
+          <separator class="thin"/>
+
+          <hbox>
+            <button id="websites_viewButton"
+                    label="&certmgr.view2.label;"
+                    accesskey="&certmgr.view2.accesskey;"
+                    disabled="true" oncommand="viewCerts();"/>
+            <button id="websites_exportButton"
+                    label="&certmgr.export.label;"
+                    accesskey="&certmgr.export.accesskey;"
+                    disabled="true" oncommand="exportCerts();"/>
+            <button id="websites_deleteButton"
+                    label="&certmgr.delete2.label;"
+                    accesskey="&certmgr.delete2.accesskey;"
+                    disabled="true" oncommand="deleteCerts();"/>
+            <button id="websites_exceptionButton"
+                    label="&certmgr.addException.label;"
+                    accesskey="&certmgr.addException.accesskey;"
+                    oncommand="addException();"/>
+          </hbox>
+        </vbox>
+        <vbox id="CACerts" flex="1">
+          <description>&certmgr.cas2;</description>
+          <separator class="thin"/>
+          <tree id="ca-tree" flex="1" enableColumnDrag="true"
+                    onselect="ca_enableButtons()">
+            <treecols>
+              <treecol id="certcol" label="&certmgr.certname;" primary="true"
+                           persist="hidden width ordinal" flex="1"/>
+              <splitter class="tree-splitter"/>
+              <treecol id="tokencol" label="&certmgr.tokenname;"
+                           persist="hidden width ordinal" flex="1"/>
+            </treecols>
+            <treechildren ondblclick="viewCerts();"/>
+          </tree>
+
+          <separator class="thin"/>
+
+          <hbox>
+            <button id="ca_viewButton"
+                    label="&certmgr.view2.label;"
+                    accesskey="&certmgr.view2.accesskey;"
+                    disabled="true" oncommand="viewCerts();"/>
+            <button id="ca_editButton"
+                    label="&certmgr.edit3.label;"
+                    accesskey="&certmgr.edit3.accesskey;"
+                    disabled="true" oncommand="editCerts();"/>
+            <button id="ca_addButton"
+                    label="&certmgr.restore2.label;"
+                    accesskey="&certmgr.restore2.accesskey;"
+                    oncommand="addCACerts();"/>
+            <button id="ca_exportButton"
+                    label="&certmgr.export.label;"
+                    accesskey="&certmgr.export.accesskey;"
+                    disabled="true" oncommand="exportCerts();"/>
+            <button id="ca_deleteButton"
+                    label="&certmgr.delete_builtin.label;"
+                    accesskey="&certmgr.delete_builtin.accesskey;"
+                    disabled="true" oncommand="deleteCerts();"/>
+          </hbox>
+        </vbox>
       </tabpanels>
     </tabbox>
 

security/manager/pki/resources/jar.mn

@@ -4,10 +4,6 @@
 
 pippki.jar:
 % content pippki %content/pippki/
-    content/pippki/CAOverlay.xul             (content/CAOverlay.xul)
-    content/pippki/MineOverlay.xul           (content/MineOverlay.xul)
-    content/pippki/OthersOverlay.xul         (content/OthersOverlay.xul)
-    content/pippki/WebSitesOverlay.xul       (content/WebSitesOverlay.xul)
     content/pippki/certManager.js            (content/certManager.js)
     content/pippki/certManager.xul           (content/certManager.xul)
     content/pippki/certViewer.js             (content/certViewer.js)