Bug 1273696 - Moving pref reset button for cert errors and hiding retry when pref reset is possible.
MozReview-Commit-ID: 2znWHkmitnF
--- 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>