author | Mark Goodwin <mgoodwin@mozilla.com> |
Thu, 30 Apr 2015 09:12:34 +0100 | |
changeset 241765 | 56da9fc21bb5fdb8ecc27b97e84e9fb3f7f7f206 |
parent 241764 | 631f0244af639139001ae4d45ea530a6d51d7dbc |
child 241766 | 5b8444aa59f3862bc5d78f9eb25e377278f32f7c |
push id | 28669 |
push user | ryanvm@gmail.com |
push date | Thu, 30 Apr 2015 17:57:05 +0000 |
treeherder | mozilla-central@7723b15ea695 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | dao |
bugs | 1146832 |
milestone | 40.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
|
--- a/browser/base/content/aboutNetError.xhtml +++ b/browser/base/content/aboutNetError.xhtml @@ -459,28 +459,32 @@ <!-- UI for option to report certificate errors to Mozilla. Removed on init for other error types .--> <div id="certificateErrorReporting"> <a id="showCertificateErrorReportingPanel" href="#">&errorReporting.title;<span class="downArrow"> ▼</span></a> </div> <div id="certificateErrorReportingPanel"> - <p>&errorReporting.longDesc;</p> - <p> - <input type="checkbox" id="automaticallyReportInFuture" /> - <label for="automaticallyReportInFuture" id="automaticallyReportInFuture">&errorReporting.automatic;</label> - </p> - <a href="https://support.mozilla.org/kb/tls-error-reports" id="learnMoreLink" target="new">&errorReporting.learnMore;</a> - <span id="reportingState"> - <button id="reportCertificateError">&errorReporting.report;</button> - <button id="reportCertificateErrorRetry">&errorReporting.tryAgain;</button> - <span id="reportSendingMessage">&errorReporting.sending;</span> - <span id="reportSentMessage">&errorReporting.sent;</span> - </span> + <div id="certificateErrorReportingDescription"> + <p>&errorReporting.longDesc;</p> + <p> + <input type="checkbox" id="automaticallyReportInFuture" /> + <label for="automaticallyReportInFuture" id="automaticallyReportInFuture">&errorReporting.automatic;</label> + </p> + </div> + <div id="errorStatePanel"> + <a href="https://support.mozilla.org/kb/tls-error-reports" id="learnMoreLink" target="new">&errorReporting.learnMore;</a> + <span id="reportingState"> + <button id="reportCertificateError">&errorReporting.report;</button> + <button id="reportCertificateErrorRetry">&errorReporting.tryAgain;</button> + <span id="reportSendingMessage">&errorReporting.sending;</span> + <span id="reportSentMessage">&errorReporting.sent;</span> + </span> + </div> </div> </div> <!-- - Note: It is important to run the script this way, instead of using - an onload handler. This is because error pages are loaded as - LOAD_BACKGROUND, which means that onload handlers will not be executed.
--- a/browser/base/content/content.js +++ b/browser/base/content/content.js @@ -203,16 +203,25 @@ let AboutNetErrorListener = { enabled: Services.prefs.getBoolPref("security.ssl.errorReporting.enabled"), automatic: automatic }) } )); if (automatic) { this.onSendReport(evt); } + // hide parts of the UI we don't need yet + let contentDoc = content.document; + + let reportSendingMsg = contentDoc.getElementById("reportSendingMessage"); + let reportSentMsg = contentDoc.getElementById("reportSentMessage"); + let retryBtn = contentDoc.getElementById("reportCertificateErrorRetry"); + reportSendingMsg.style.display = "none"; + reportSentMsg.style.display = "none"; + retryBtn.style.display = "none"; }, onSetAutomatic: function(evt) { sendAsyncMessage("Browser:SetSSLErrorReportAuto", { automatic: evt.detail }); }, @@ -229,33 +238,32 @@ let AboutNetErrorListener = { // document - we'll compare on document URI if (contentDoc.documentURI === message.data.documentURI) { switch(message.data.reportStatus) { case "activity": // Hide the button that was just clicked reportBtn.style.display = "none"; retryBtn.style.display = "none"; reportSentMsg.style.display = "none"; - reportSendingMsg.style.display = "inline"; + reportSendingMsg.style.removeProperty("display"); break; case "error": // show the retry button - retryBtn.style.display = "inline"; + retryBtn.style.removeProperty("display"); reportSendingMsg.style.display = "none"; break; case "complete": // Show a success indicator - reportSentMsg.style.display = "inline"; + reportSentMsg.style.removeProperty("display"); reportSendingMsg.style.display = "none"; break; } } }); - let failedChannel = docShell.failedChannel; let location = contentDoc.location.href; let serhelper = Cc["@mozilla.org/network/serialization-helper;1"] .getService(Ci.nsISerializationHelper); let serializable = docShell.failedChannel.securityInfo .QueryInterface(Ci.nsITransportSecurityInfo)
--- a/browser/themes/shared/aboutNetError.css +++ b/browser/themes/shared/aboutNetError.css @@ -115,38 +115,34 @@ div#certificateErrorReportingPanel { div#certificateErrorReportingPanel:-moz-dir(ltr) { left: 34%; } div#certificateErrorReportingPanel:-moz-dir(rtl) { right: 0; } +#errorStatePanel { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-between; + align-content: space-between; + align-items: flex-start; +} + span#hostname { font-weight: bold; } #automaticallyReportInFuture { cursor: pointer; } -#reportingState { - padding-left: 150px; -} - #reportSendingMessage { - position: relative; - display: none; + /* adjust the line-height to match the link */ + line-height: 22px; } #reportSentMessage { - position: relative; - display: none; + /* adjust the line-height to match the link */ + line-height: 22px; } - -button#reportCertificateError { - position: relative; -} - -button#reportCertificateErrorRetry { - position: relative; - display: none; -}