Bug 1534629 Non-bypassable cert error pages should use Advanced instead of More information r=johannh
authorMellina Yonashiro <yonashiro.mellina@gmail.com>
Mon, 18 Mar 2019 17:11:50 +0000
changeset 465023 38ccf27da0454a86d1185a9a4973cd5cf8a23fa2
parent 465022 8cd5c2339ca11b720f8b0e067c463f66b1f0ad5c
child 465024 dc8935d7c0b10afc0401049936cc9d5f9fc5b003
push id35730
push userrmaries@mozilla.com
push dateTue, 19 Mar 2019 21:51:47 +0000
treeherdermozilla-central@4f6d8ed9e948 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjohannh
bugs1534629
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1534629 Non-bypassable cert error pages should use Advanced instead of More information r=johannh Differential Revision: https://phabricator.services.mozilla.com/D23316
browser/base/content/aboutNetError-new.xhtml
browser/base/content/aboutNetError.js
browser/base/content/aboutNetError.xhtml
browser/base/content/browser.js
browser/locales/en-US/chrome/overrides/netError.dtd
browser/themes/shared/aboutNetError-new.css
browser/themes/shared/aboutNetError.css
--- a/browser/base/content/aboutNetError-new.xhtml
+++ b/browser/base/content/aboutNetError-new.xhtml
@@ -193,17 +193,16 @@
           <button id="prefResetButton" class="primary">&prefReset.label;</button>
         </div>
 
         <div id="certErrorAndCaptivePortalButtonContainer" class="button-container">
           <button id="returnButton" class="primary" data-telemetry-id="return_button_top">&returnToPreviousPage1.label;</button>
           <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>
 
       <div id="netErrorButtonContainer" class="button-container">
         <button id="errorTryAgain" class="primary">&retry.label;</button>
       </div>
 
       <div id="advancedPanelContainer">
--- a/browser/base/content/aboutNetError.js
+++ b/browser/base/content/aboutNetError.js
@@ -79,17 +79,16 @@ function setupAdvancedButton() {
   // Get the hostname and add it to the panel
   var panel = document.getElementById("badCertAdvancedPanel");
   for (var span of panel.querySelectorAll("span.hostname")) {
     span.textContent = document.location.hostname;
   }
 
   // Register click handler for the weakCryptoAdvancedPanel
   document.getElementById("advancedButton").addEventListener("click", togglePanelVisibility);
-  document.getElementById("moreInformationButton").addEventListener("click", togglePanelVisibility);
 
   function togglePanelVisibility() {
     toggleDisplay(panel);
     if (gIsCertError) {
       // Toggling the advanced panel must ensure that the debugging
       // information panel is hidden as well, since it's opened by the
       // error code link in the advanced panel.
       var div = document.getElementById("certificateErrorDebugInformation");
--- a/browser/base/content/aboutNetError.xhtml
+++ b/browser/base/content/aboutNetError.xhtml
@@ -152,17 +152,16 @@
           <p>&prefReset.longDesc;</p>
           <button id="prefResetButton" class="primary">&prefReset.label;</button>
         </div>
 
         <div id="certErrorAndCaptivePortalButtonContainer" class="button-container">
           <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>
 
       <div id="netErrorButtonContainer" class="button-container">
         <button id="errorTryAgain" class="primary">&retry.label;</button>
       </div>
 
       <div id="advancedPanelContainer">
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3214,17 +3214,16 @@ var BrowserOnClick = {
         goBackFromErrorPage();
         break;
 
       case "advancedPanelReturnButton":
         goBackFromErrorPage();
         break;
 
       case "advancedButton":
-      case "moreInformationButton":
         securityInfo = getSecurityInfo(securityInfoAsString);
         let errorInfo = getDetailedCertErrorInfo(location,
                                                  securityInfo);
         let validityInfo = {
           notAfter: securityInfo.serverCert.validity.notAfter,
           notBefore: securityInfo.serverCert.validity.notBefore,
           notAfterLocalTime: securityInfo.serverCert.validity.notAfterLocalTime,
           notBeforeLocalTime: securityInfo.serverCert.validity.notBeforeLocalTime,
--- a/browser/locales/en-US/chrome/overrides/netError.dtd
+++ b/browser/locales/en-US/chrome/overrides/netError.dtd
@@ -6,17 +6,16 @@
 %brandDTD;
 
 <!ENTITY loadError.label "Problem loading page">
 <!ENTITY retry.label "Try Again">
 <!ENTITY returnToPreviousPage.label "Go Back">
 <!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 -->
 
 <!ENTITY connectionFailure.title "Unable to connect">
 <!ENTITY connectionFailure.longDesc "&sharedLongDesc;">
 
 <!ENTITY deniedPortAccess.title "This address is restricted">
--- a/browser/themes/shared/aboutNetError-new.css
+++ b/browser/themes/shared/aboutNetError-new.css
@@ -98,25 +98,21 @@ body:not(.captiveportal) #openPortalLogi
 body:not(.clockSkewError) #errorTryAgain {
   display: none;
 }
 
 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;
 }
 
 #certificateErrorReporting {
   display: none;
   padding-bottom: 10px;
 }
 
@@ -238,18 +234,17 @@ body:not(:-moz-any(.clockSkewError,.badS
   display: none;
 }
 
 .clockSkewError #advancedButton {
   display: none;
 }
 
 .clockSkewError #advancedPanelErrorTryAgain,
-.clockSkewError #errorTryAgain,
-.clockSkewError #moreInformationButton {
+.clockSkewError #errorTryAgain {
   display: block;
   margin-top: 0.3em;
 }
 
 .clockSkewError #exceptionDialogButton {
   display: none;
 }
 
--- a/browser/themes/shared/aboutNetError.css
+++ b/browser/themes/shared/aboutNetError.css
@@ -54,20 +54,16 @@ body:not(.neterror) #certErrorAndCaptive
 body:not(.neterror) #netErrorButtonContainer {
   display: none;
 }
 
 #advancedPanelErrorTryAgain {
   display: none;
 }
 
-#moreInformationButton {
-  display: none;
-}
-
 #errorTryAgain {
   margin-top: 1.2em;
 }
 
 #advancedButton {
   display: none;
 }