Bug 1534629 Non-bypassable cert error pages should use Advanced instead of More information r=johannh

Differential Revision: https://phabricator.services.mozilla.com/D23316

--HG--
extra : moz-landing-system : lando

browser/base/content/aboutNetError-new.xhtml

@@ -198,7 +198,6 @@
           <button id="openPortalLoginPageButton" class="primary">&openPortalLoginPage.label2;</button>
           <button id="errorTryAgain" class="primary">&retry.label;</button>
           <button id="advancedButton" data-telemetry-id="advanced_button">&advanced2.label;</button>
-          <button id="moreInformationButton">&moreInformation.label;</button>
         </div>
       </div>
 

browser/base/content/aboutNetError.js

@@ -84,7 +84,6 @@ function setupAdvancedButton() {
 
   // Register click handler for the weakCryptoAdvancedPanel
   document.getElementById("advancedButton").addEventListener("click", togglePanelVisibility);
-  document.getElementById("moreInformationButton").addEventListener("click", togglePanelVisibility);
 
   function togglePanelVisibility() {
     toggleDisplay(panel);

browser/base/content/aboutNetError.xhtml

@@ -157,7 +157,6 @@
           <button id="returnButton" class="primary" data-telemetry-id="return_button_top">&returnToPreviousPage.label;</button>
           <button id="openPortalLoginPageButton" class="primary">&openPortalLoginPage.label2;</button>
           <button id="advancedButton" data-telemetry-id="advanced_button">&advanced.label;</button>
-          <button id="moreInformationButton">&moreInformation.label;</button>
         </div>
       </div>
 

browser/base/content/browser.js

@@ -3219,7 +3219,6 @@ var BrowserOnClick = {
         break;
 
       case "advancedButton":
-      case "moreInformationButton":
         securityInfo = getSecurityInfo(securityInfoAsString);
         let errorInfo = getDetailedCertErrorInfo(location,
                                                  securityInfo);

browser/locales/en-US/chrome/overrides/netError.dtd

@@ -11,7 +11,6 @@
 <!ENTITY returnToPreviousPage1.label "Go Back (Recommended)">
 <!ENTITY advanced.label "Advanced">
 <!ENTITY advanced2.label "Advanced…">
-<!ENTITY moreInformation.label "More Information">
 <!ENTITY viewCertificate.label "View Certificate">
 
 <!-- Specific error messages -->

browser/themes/shared/aboutNetError-new.css

@@ -103,15 +103,11 @@ body:not(.clockSkewError) #advancedPanelErrorTryAgain {
   display: none;
 }
 
-body:not(:-moz-any(.clockSkewError,.badStsCert)) #moreInformationButton {
-  display: none;
-}
-
 #openPortalLoginPageButton {
   margin-inline-start: 0;
 }
 
-body:not(:-moz-any(.clockSkewError,.badStsCert,.neterror)) #advancedButton {
+body:not(.neterror) #advancedButton {
   display: block;
 }
 
@@ -243,8 +239,7 @@ body:not(:-moz-any(.clockSkewError,.badStsCert,.neterror)) #advancedButton {
 }
 
 .clockSkewError #advancedPanelErrorTryAgain,
-.clockSkewError #errorTryAgain,
-.clockSkewError #moreInformationButton {
+.clockSkewError #errorTryAgain {
   display: block;
   margin-top: 0.3em;
 }

browser/themes/shared/aboutNetError.css

@@ -59,10 +59,6 @@ body:not(.neterror) #netErrorButtonContainer {
   display: none;
 }
 
-#moreInformationButton {
-  display: none;
-}
-
 #errorTryAgain {
   margin-top: 1.2em;
 }