diff --git a/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd b/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd index abbcca2616d..2d2c2300685 100644 --- a/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd +++ b/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd @@ -134,3 +134,9 @@ that &brandShortName; is permitted to access the Web. "> + + + +Attack sites try to install programs that steal private information, use your computer to attack others, or damage your system.

+

You should not visit this site.

+"> diff --git a/mozilla/docshell/resources/content/netError.xhtml b/mozilla/docshell/resources/content/netError.xhtml index 684ecd364f3..fa8b75cd03d 100644 --- a/mozilla/docshell/resources/content/netError.xhtml +++ b/mozilla/docshell/resources/content/netError.xhtml @@ -38,6 +38,7 @@ - William R. Price - Henrik Skupin - Jeff Walden + - Johnathan Nightingale - - Alternatively, the contents of this file may be used under the terms of - either the GNU General Public License Version 2 or later (the "GPL"), or @@ -57,12 +58,16 @@ &loadError.label; - - + @@ -168,6 +202,7 @@

&proxyConnectFailure.title;

&contentEncodingError.title;

&nssFailure2.title;

+

&malwareBlocked.title;

&generic.longDesc;
@@ -187,6 +222,7 @@
&proxyConnectFailure.longDesc;
&contentEncodingError.longDesc;
&nssFailure2.longDesc;
+
&malwareBlocked.longDesc;
diff --git a/mozilla/dom/locales/en-US/chrome/netError.dtd b/mozilla/dom/locales/en-US/chrome/netError.dtd index a5dca5eb656..5f3e27612b0 100644 --- a/mozilla/dom/locales/en-US/chrome/netError.dtd +++ b/mozilla/dom/locales/en-US/chrome/netError.dtd @@ -53,3 +53,9 @@ The page you are trying to view can not be shown because the authenticity of the received data could not be verified.

  • Please contact the web site owners to inform them of this problem.
"> + + + +Attack sites try to install programs that steal private information, use your computer to attack others, or damage your system.

+

You should not visit this site.

+"> diff --git a/mozilla/toolkit/themes/pinstripe/global/icons/blacklist_favicon.png b/mozilla/toolkit/themes/pinstripe/global/icons/blacklist_favicon.png new file mode 100644 index 00000000000..2558067d9d4 Binary files /dev/null and b/mozilla/toolkit/themes/pinstripe/global/icons/blacklist_favicon.png differ diff --git a/mozilla/toolkit/themes/pinstripe/global/icons/blacklist_large.png b/mozilla/toolkit/themes/pinstripe/global/icons/blacklist_large.png new file mode 100644 index 00000000000..51b2e06263c Binary files /dev/null and b/mozilla/toolkit/themes/pinstripe/global/icons/blacklist_large.png differ diff --git a/mozilla/toolkit/themes/pinstripe/global/jar.mn b/mozilla/toolkit/themes/pinstripe/global/jar.mn index d74c5768378..0c854ec00ec 100644 --- a/mozilla/toolkit/themes/pinstripe/global/jar.mn +++ b/mozilla/toolkit/themes/pinstripe/global/jar.mn @@ -113,6 +113,8 @@ classic.jar: + skin/classic/global/icons/alert-question.gif (icons/alert-question.gif) + skin/classic/global/icons/autocomplete-dropmarker.png (icons/autocomplete-dropmarker.png) + skin/classic/global/icons/autoscroll.png (icons/autoscroll.png) ++ skin/classic/global/icons/blacklist_favicon.png (icons/blacklist_favicon.png) ++ skin/classic/global/icons/blacklist_large.png (icons/blacklist_large.png) + skin/classic/global/icons/chevron.png (icons/chevron.png) + skin/classic/global/icons/close.gif (icons/close.gif) + skin/classic/global/icons/closetab-active.png (icons/closetab-active.png) diff --git a/mozilla/toolkit/themes/pinstripe/global/netError.css b/mozilla/toolkit/themes/pinstripe/global/netError.css index 2e74b83bd38..9b48be72afc 100644 --- a/mozilla/toolkit/themes/pinstripe/global/netError.css +++ b/mozilla/toolkit/themes/pinstripe/global/netError.css @@ -103,3 +103,24 @@ body[dir="rtl"] #brand { #errorContainer { display: none; } + +/* Custom styling for 'blacklist' error class */ +:root.blacklist #errorTitle, :root.blacklist #errorLongContent, +:root.blacklist #errorShortDesc, :root.blacklist #errorLongDesc { + background-color: #722; /* Dark red */ + color: white; +} + +:root.blacklist #errorPageContainer { + background-image: url("chrome://global/skin/icons/blacklist_large.png"); + background-color: #722; +} + +:root.blacklist { + background: #333; +} + +:root.blacklist #errorTryAgain { + display: none; +} + diff --git a/mozilla/toolkit/themes/winstripe/global/icons/blacklist_favicon.png b/mozilla/toolkit/themes/winstripe/global/icons/blacklist_favicon.png new file mode 100644 index 00000000000..2558067d9d4 Binary files /dev/null and b/mozilla/toolkit/themes/winstripe/global/icons/blacklist_favicon.png differ diff --git a/mozilla/toolkit/themes/winstripe/global/icons/blacklist_large.png b/mozilla/toolkit/themes/winstripe/global/icons/blacklist_large.png new file mode 100644 index 00000000000..51b2e06263c Binary files /dev/null and b/mozilla/toolkit/themes/winstripe/global/icons/blacklist_large.png differ diff --git a/mozilla/toolkit/themes/winstripe/global/jar.mn b/mozilla/toolkit/themes/winstripe/global/jar.mn index 066f2c77000..5fb5f980a3f 100644 --- a/mozilla/toolkit/themes/winstripe/global/jar.mn +++ b/mozilla/toolkit/themes/winstripe/global/jar.mn @@ -75,6 +75,8 @@ classic.jar: skin/classic/global/icons/autocomplete-dropmark-bkgnd-mid-top.png (icons/autocomplete-dropmark-bkgnd-mid-top.png) skin/classic/global/icons/autocomplete-dropmark-bkgnd-mid-bottom.png (icons/autocomplete-dropmark-bkgnd-mid-bottom.png) skin/classic/global/icons/autoscroll.png (icons/autoscroll.png) + skin/classic/global/icons/blacklist_favicon.png (icons/blacklist_favicon.png) + skin/classic/global/icons/blacklist_large.png (icons/blacklist_large.png) skin/classic/global/icons/Close.gif (icons/Close.gif) skin/classic/global/icons/close.png (icons/close.png) skin/classic/global/icons/alltabs.png (icons/alltabs.png) diff --git a/mozilla/toolkit/themes/winstripe/global/netError.css b/mozilla/toolkit/themes/winstripe/global/netError.css index 2e74b83bd38..413993f48ce 100644 --- a/mozilla/toolkit/themes/winstripe/global/netError.css +++ b/mozilla/toolkit/themes/winstripe/global/netError.css @@ -103,3 +103,23 @@ body[dir="rtl"] #brand { #errorContainer { display: none; } + +/* Custom styling for 'blacklist' error class */ +:root.blacklist #errorTitle, :root.blacklist #errorLongContent, +:root.blacklist #errorShortDesc, :root.blacklist #errorLongDesc { + background-color: #722; /* Dark red */ + color: white; +} + +:root.blacklist #errorPageContainer { + background-image: url("chrome://global/skin/icons/blacklist_large.png"); + background-color: #722; +} + +:root.blacklist { + background: #333; +} + +:root.blacklist #errorTryAgain { + display: none; +}