diff --git a/browser/base/content/aboutNetError.xhtml b/browser/base/content/aboutNetError.xhtml
index dfe2754ad523..4cda44ee5c40 100644
--- a/browser/base/content/aboutNetError.xhtml
+++ b/browser/base/content/aboutNetError.xhtml
@@ -169,6 +169,9 @@
if (illustratedErrors.includes(err)) {
document.body.classList.add("illustrated", err);
}
+ if (err == "blockedByPolicy") {
+ document.body.classList.add("blocked");
+ }
gIsCertError = (err == "nssBadCert");
// Only worry about captive portals if this is a cert error.
@@ -308,7 +311,7 @@
var event = new CustomEvent("AboutNetErrorLoad", {bubbles: true});
document.dispatchEvent(event);
- if (err == "inadequateSecurityError" || err == "blockedByPolicyTemp") {
+ if (err == "inadequateSecurityError" || err == "blockedByPolicy") {
// Remove the "Try again" button from pages that don't need it.
// For HTTP/2 inadequate security or pages blocked by policy, trying
// again won't help.
@@ -529,6 +532,7 @@
&captivePortal.title;&dnsNotFound.pageTitle;&malformedURI.pageTitle;
+ &blockedByPolicy.title;
&generic.title;
@@ -558,7 +562,7 @@
&corruptedContentErrorv2.title;
&sslv3Used.title;
&inadequateSecurityError.title;
-
&blockedByPolicyTemp.title;
+
&blockedByPolicy.title;
&generic.longDesc;
@@ -588,7 +592,7 @@
&corruptedContentErrorv2.longDesc;
&sslv3Used.longDesc2;
&inadequateSecurityError.longDesc;
-
&blockedByPolicyTemp.longDesc;
+
diff --git a/browser/locales/en-US/chrome/overrides/appstrings.properties b/browser/locales/en-US/chrome/overrides/appstrings.properties
index 4e11876a14ed..671c06d1a62a 100644
--- a/browser/locales/en-US/chrome/overrides/appstrings.properties
+++ b/browser/locales/en-US/chrome/overrides/appstrings.properties
@@ -40,4 +40,4 @@ remoteXUL=This page uses an unsupported technology that is no longer available b
## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S".
sslv3Used=Firefox cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
inadequateSecurityError=The website tried to negotiate an inadequate level of security.
-blockedByPolicyTemp=This page has been blocked by the enterprise policy manager.
+blockedByPolicy=Your organization has blocked access to this page or website.
diff --git a/browser/locales/en-US/chrome/overrides/netError.dtd b/browser/locales/en-US/chrome/overrides/netError.dtd
index 56e56c4df2de..6fa5c9c38e61 100644
--- a/browser/locales/en-US/chrome/overrides/netError.dtd
+++ b/browser/locales/en-US/chrome/overrides/netError.dtd
@@ -200,8 +200,7 @@ certificate.">
"NS_ERROR_NET_INADEQUATE_SECURITY". -->
uses security technology that is outdated and vulnerable to attack. An attacker could easily reveal information which you thought to be safe. The website administrator will need to fix the server first before you can visit the site.
Error code: NS_ERROR_NET_INADEQUATE_SECURITY
">
-
-Access has been disabled by your administrator.">
+
diff --git a/browser/themes/shared/aboutNetError.css b/browser/themes/shared/aboutNetError.css
index dcf522d423fe..013065b991c8 100644
--- a/browser/themes/shared/aboutNetError.css
+++ b/browser/themes/shared/aboutNetError.css
@@ -16,6 +16,10 @@ body.certerror .title {
background-image: url("cert-error.svg");
}
+body.blocked .title {
+ background-image: url("chrome://global/skin/icons/blocked.svg");
+}
+
#errorContainer {
display: none;
}
diff --git a/browser/themes/shared/blockedSite.css b/browser/themes/shared/blockedSite.css
index 242f7367b731..20648561da03 100644
--- a/browser/themes/shared/blockedSite.css
+++ b/browser/themes/shared/blockedSite.css
@@ -14,6 +14,8 @@ body {
.title {
background-image: url("chrome://global/skin/icons/blocked.svg");
+ fill: currentColor;
+ -moz-context-properties: fill;
}
.title-text {
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 6b72be6dc1a8..2515853f9a2e 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -4840,7 +4840,7 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI,
break;
case NS_ERROR_BLOCKED_BY_POLICY:
// Page blocked by policy
- error = "blockedByPolicyTemp";
+ error = "blockedByPolicy";
break;
default:
break;
diff --git a/docshell/resources/content/netError.xhtml b/docshell/resources/content/netError.xhtml
index 6c9f1d6d1683..4d8c254fab5d 100644
--- a/docshell/resources/content/netError.xhtml
+++ b/docshell/resources/content/netError.xhtml
@@ -178,7 +178,7 @@
secOverride.remove();
}
- if (err == "inadequateSecurityError" || err == "blockedByPolicyTemp") {
+ if (err == "inadequateSecurityError" || err == "blockedByPolicy") {
// Remove the "Try again" button from pages that don't need it.
// For HTTP/2 inadequate security or pages blocked by policy, trying
// again won't help.
@@ -310,7 +310,7 @@
&remoteXUL.title;
&corruptedContentErrorv2.title;
&inadequateSecurityError.title;
-
&blockedByPolicyTemp.title;
+
&blockedByPolicy.title;
&generic.longDesc;
@@ -338,7 +338,7 @@
&remoteXUL.longDesc;
&corruptedContentErrorv2.longDesc;
&inadequateSecurityError.longDesc;
-
&blockedByPolicyTemp.longDesc;
+
diff --git a/dom/browser-element/BrowserElementChildPreload.js b/dom/browser-element/BrowserElementChildPreload.js
index ed3a54991b07..789487dd8026 100644
--- a/dom/browser-element/BrowserElementChildPreload.js
+++ b/dom/browser-element/BrowserElementChildPreload.js
@@ -1514,7 +1514,7 @@ BrowserElementChild.prototype = {
sendAsyncMsg('error', { type: 'corruptedContentErrorv2' });
return;
case Cr.NS_ERROR_BLOCKED_BY_POLICY :
- sendAsyncMsg('error', { type: 'blockedByPolicyTemp' });
+ sendAsyncMsg('error', { type: 'blockedByPolicy' });
return;
default:
diff --git a/dom/locales/en-US/chrome/appstrings.properties b/dom/locales/en-US/chrome/appstrings.properties
index cca36335f9b0..3a6953f9bd3f 100644
--- a/dom/locales/en-US/chrome/appstrings.properties
+++ b/dom/locales/en-US/chrome/appstrings.properties
@@ -38,4 +38,4 @@ remoteXUL=This page uses an unsupported technology that is no longer available b
sslv3Used=The safety of your data on %S could not be guaranteed because it uses SSLv3, a broken security protocol.
weakCryptoUsed=The owner of %S has configured their website improperly. To protect your information from being stolen, the connection to this website has not been established.
inadequateSecurityError=The website tried to negotiate an inadequate level of security.
-blockedByPolicyTemp=This page has been blocked by the enterprise policy manager.
+blockedByPolicy=Your organization has blocked access to this page or website.
diff --git a/dom/locales/en-US/chrome/netError.dtd b/dom/locales/en-US/chrome/netError.dtd
index 08b3657f116d..34f79b1da075 100644
--- a/dom/locales/en-US/chrome/netError.dtd
+++ b/dom/locales/en-US/chrome/netError.dtd
@@ -98,5 +98,4 @@
"NS_ERROR_NET_INADEQUATE_SECURITY". -->
uses security technology that is outdated and vulnerable to attack. An attacker could easily reveal information which you thought to be safe. The website administrator will need to fix the server first before you can visit the site.
Error code: NS_ERROR_NET_INADEQUATE_SECURITY
">
-
-Access has been disabled by your administrator.">
+
diff --git a/toolkit/themes/shared/incontent-icons/blocked.svg b/toolkit/themes/shared/incontent-icons/blocked.svg
index 2f1c6413c9a5..0be260a7f41a 100644
--- a/toolkit/themes/shared/incontent-icons/blocked.svg
+++ b/toolkit/themes/shared/incontent-icons/blocked.svg
@@ -1,13 +1,6 @@
-
\ No newline at end of file
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+