bug 1029797 - remove redundant "Security information for this page" section of Page Info window r=dao

browser/base/content/pageinfo/pageInfo.js

@@ -442,14 +442,6 @@ function loadTab(args)
   radioGroup.focus();
 }
 
-function onClickMore()
-{
-  var radioGrp = document.getElementById("viewGroup");
-  var radioElt = document.getElementById("securityTab");
-  radioGrp.selectedItem = radioElt;
-  showTab('security');
-}
-
 function toggleGroupbox(id)
 {
   var elt = document.getElementById(id);

browser/base/content/pageinfo/pageInfo.xul

@@ -155,16 +155,6 @@
           <treechildren id="metatreechildren" flex="1"/>
         </tree>        
       </groupbox>
-      <groupbox id="securityBox">
-        <caption id="securityBoxCaption" label="&securityHeader;"/>
-        <description id="general-security-identity" class="header"/>
-        <description id="general-security-privacy"  class="header"/>
-        <hbox id="securityDetailsButtonBox" align="right">
-          <button id="security-view-details" label="&generalSecurityDetails;"
-                  accesskey="&generalSecurityDetails.accesskey;"
-                  oncommand="onClickMore();"/>
-        </hbox>
-      </groupbox>
     </vbox>
 
     <!-- Media information -->

browser/base/content/pageinfo/security.js

@@ -154,12 +154,10 @@ function securityOnLoad() {
   var info = security._getSecurityInfo();
   if (!info) {
     document.getElementById("securityTab").hidden = true;
-    document.getElementById("securityBox").collapsed = true;
     return;
   }
   else {
     document.getElementById("securityTab").hidden = false;
-    document.getElementById("securityBox").collapsed = false;
   }
 
   const pageInfoBundle = document.getElementById("pageinfobundle");
@@ -167,7 +165,7 @@ function securityOnLoad() {
   /* Set Identity section text */
   setText("security-identity-domain-value", info.hostName);
   
-  var owner, verifier, generalPageIdentityString;
+  var owner, verifier;
   if (info.cert && !info.isBroken) {
     // Try to pull out meaningful values.  Technically these fields are optional
     // so we'll employ fallbacks where appropriate.  The EV spec states that Org
@@ -175,8 +173,6 @@ function securityOnLoad() {
     if (info.isEV) {
       owner = info.cert.organization;
       verifier = security.mapIssuerOrganization(info.cAName);
-      generalPageIdentityString = pageInfoBundle.getFormattedString("generalSiteIdentity",
-                                                                    [owner, verifier]);
     }
     else {
       // Technically, a non-EV cert might specify an owner in the O field or not,
@@ -188,19 +184,16 @@ function securityOnLoad() {
       verifier = security.mapIssuerOrganization(info.cAName ||
                                                 info.cert.issuerCommonName ||
                                                 info.cert.issuerName);
-      generalPageIdentityString = owner;
     }
   }
   else {
     // We don't have valid identity credentials.
     owner = pageInfoBundle.getString("securityNoOwner");
     verifier = pageInfoBundle.getString("notset");
-    generalPageIdentityString = owner;
   }
 
   setText("security-identity-owner-value", owner);
   setText("security-identity-verifier-value", verifier);
-  setText("general-security-identity", generalPageIdentityString);
 
   /* Manage the View Cert button*/
   var viewCert = document.getElementById("security-view-cert");
@@ -269,7 +262,6 @@ function securityOnLoad() {
   setText("security-technical-shortform", hdr);
   setText("security-technical-longform1", msg1);
   setText("security-technical-longform2", msg2); 
-  setText("general-security-privacy", hdr);
 }
 
 function setText(id, value)

browser/locales/en-US/chrome/browser/pageInfo.dtd

@@ -25,8 +25,6 @@
 <!ENTITY  generalEncoding       "Encoding:">
 <!ENTITY  generalMetaName       "Name">
 <!ENTITY  generalMetaContent    "Content">
-<!ENTITY  generalSecurityDetails   "Details">
-<!ENTITY  generalSecurityDetails.accesskey "D">
 
 <!ENTITY  mediaTab              "Media">
 <!ENTITY  mediaTab.accesskey    "M">
@@ -65,7 +63,6 @@
 
 <!ENTITY  securityTab           "Security">
 <!ENTITY  securityTab.accesskey "S">
-<!ENTITY  securityHeader        "Security information for this page">
 <!ENTITY  securityView.certView "View Certificate">
 <!ENTITY  securityView.accesskey "V">
 <!ENTITY  securityView.unknown   "Unknown">

browser/locales/en-US/chrome/browser/pageInfo.properties

@@ -38,7 +38,6 @@ generalStrictMode=Standards compliance mode
 generalSize=%S KB (%S bytes)
 generalMetaTag=Meta (1 tag)
 generalMetaTags=Meta (%S tags)
-generalSiteIdentity=This website is owned by %S\nThis has been verified by %S
 
 feedRss=RSS
 feedAtom=Atom