Bug 1273696 - Moving pref reset button for cert errors and hiding retry when pref reset is possible. draft
authorJonathan Kingston <jkingston@mozilla.com>
Wed, 18 May 2016 13:47:38 +0100
changeset 368320 30d00f988144d778f97eb8201ff872f26617de0c
parent 367996 991f249a6ffa07e1ccb87ab657d71c4522429058
child 368362 b3d7940b6c0c384234f18989b49ddfd40971489c
push id18476
push userjkingston@mozilla.com
push dateWed, 18 May 2016 12:48:12 +0000
bugs1273696
milestone49.0a1
Bug 1273696 - Moving pref reset button for cert errors and hiding retry when pref reset is possible. MozReview-Commit-ID: 2znWHkmitnF
browser/base/content/aboutNetError.xhtml
--- a/browser/base/content/aboutNetError.xhtml
+++ b/browser/base/content/aboutNetError.xhtml
@@ -112,16 +112,17 @@
       function showCertificateErrorReporting() {
         // Display error reporting UI
         document.getElementById("certificateErrorReporting").style.display = "block";
       }
 
       function showPrefChangeContainer() {
         const panel = document.getElementById("prefChangeContainer");
         panel.style.display = "block";
+        document.getElementById("netErrorButtonContainer").style.display = "none";
         document.getElementById("prefResetButton").addEventListener("click", function resetPreferences(e) {
           const event = new CustomEvent("AboutNetErrorResetPreferences", {bubbles:true});
           document.dispatchEvent(event);
         });
       }
 
       function showAdvancedButton(allowOverride) {
         // Get the hostname and add it to the panel
@@ -576,23 +577,23 @@
 
         <div id="wrongSystemTimePanel" style="display: none;">
           &certerror.wrongSystemTime;
         </div>
 
         <!-- Long Description (Note: See netError.dtd for used XHTML tags) -->
         <div id="errorLongDesc" />
 
-        <div id="prefChangeContainer">
-          <p>&prefReset.longDesc;</p>
-          <button id="prefResetButton" autocomplete="off">&prefReset.label;</button>
+        <div id="learnMoreContainer">
+          <p><a href="https://support.mozilla.org/kb/what-does-your-connection-is-not-secure-mean" id="learnMoreLink" target="new">&errorReporting.learnMore;</a></p>
         </div>
 
-        <div id="learnMoreContainer">
-          <p><a href="https://support.mozilla.org/kb/what-does-your-connection-is-not-secure-mean" id="learnMoreLink" target="new">&errorReporting.learnMore;</a></p>
+        <div id="prefChangeContainer" class="button-container">
+          <p>&prefReset.longDesc;</p>
+          <button id="prefResetButton" class="primary" autocomplete="off">&prefReset.label;</button>
         </div>
 
         <div id="certErrorButtonContainer" class="button-container">
           <button id="returnButton" class="primary" autocomplete="off" autofocus="true">&returnToPreviousPage.label;</button>
           <div class="button-spacer"></div>
           <button id="advancedButton" autocomplete="off" autofocus="true">&advanced.label;</button>
         </div>
       </div>