From 6e4da38d2d63cbecbb3bca29450ab84a759dff24 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 5 Apr 2019 15:12:51 +0200 Subject: Zap the robots. Resolves #1036 --- .../palemoon/base/content/aboutRobots-icon.png | Bin 9817 -> 0 bytes .../base/content/aboutRobots-widget-left.png | Bin 2224 -> 0 bytes .../palemoon/base/content/aboutRobots.xhtml | 108 --------------------- application/palemoon/base/jar.mn | 3 - .../palemoon/components/BrowserComponents.manifest | 1 - .../palemoon/components/nsAboutRedirector.js | 4 - .../locales/en-US/chrome/browser/aboutRobots.dtd | 29 ------ application/palemoon/locales/jar.mn | 1 - 8 files changed, 146 deletions(-) delete mode 100644 application/palemoon/base/content/aboutRobots-icon.png delete mode 100644 application/palemoon/base/content/aboutRobots-widget-left.png delete mode 100644 application/palemoon/base/content/aboutRobots.xhtml delete mode 100644 application/palemoon/locales/en-US/chrome/browser/aboutRobots.dtd (limited to 'application/palemoon') diff --git a/application/palemoon/base/content/aboutRobots-icon.png b/application/palemoon/base/content/aboutRobots-icon.png deleted file mode 100644 index 1c4899aaf..000000000 Binary files a/application/palemoon/base/content/aboutRobots-icon.png and /dev/null differ diff --git a/application/palemoon/base/content/aboutRobots-widget-left.png b/application/palemoon/base/content/aboutRobots-widget-left.png deleted file mode 100644 index 3a1e48d5f..000000000 Binary files a/application/palemoon/base/content/aboutRobots-widget-left.png and /dev/null differ diff --git a/application/palemoon/base/content/aboutRobots.xhtml b/application/palemoon/base/content/aboutRobots.xhtml deleted file mode 100644 index 23fe3ba17..000000000 --- a/application/palemoon/base/content/aboutRobots.xhtml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - %htmlDTD; - - %netErrorDTD; - - %globalDTD; - - %aboutrobotsDTD; -]> - - - - &robots.pagetitle; - - - - - - - - - - - -
- - -
-

&robots.errorTitleText;

-
- - -
- - -
-

&robots.errorShortDescText;

-
- - -
-
    -
  • &robots.errorLongDesc1;
    • -
  • &robots.errorLongDesc2;
    • -
  • &robots.errorLongDesc3;
    • -
  • &robots.errorLongDesc4;
    • -
-
- - -
-

&robots.errorTrailerDescText;

-
- -
- - - - - - -
- - - diff --git a/application/palemoon/base/jar.mn b/application/palemoon/base/jar.mn index 8931c0260..735b6d0cf 100644 --- a/application/palemoon/base/jar.mn +++ b/application/palemoon/base/jar.mn @@ -18,9 +18,6 @@ browser.jar: * content/browser/aboutDialog.xul (content/aboutDialog.xul) * content/browser/aboutDialog.js (content/aboutDialog.js) content/browser/aboutDialog.css (content/aboutDialog.css) - content/browser/aboutRobots.xhtml (content/aboutRobots.xhtml) - content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) - content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) content/browser/autorecovery.js (content/autorecovery.js) content/browser/autorecovery.xul (content/autorecovery.xul) * content/browser/browser.css (content/browser.css) diff --git a/application/palemoon/components/BrowserComponents.manifest b/application/palemoon/components/BrowserComponents.manifest index b7f054eab..0ff14d066 100644 --- a/application/palemoon/components/BrowserComponents.manifest +++ b/application/palemoon/components/BrowserComponents.manifest @@ -10,7 +10,6 @@ contract @mozilla.org/network/protocol/about;1?what=palemoon {8cc51368-6aa0-43e8 contract @mozilla.org/network/protocol/about;1?what=permissions {8cc51368-6aa0-43e8-b762-bde9b9fd828c} contract @mozilla.org/network/protocol/about;1?what=privatebrowsing {8cc51368-6aa0-43e8-b762-bde9b9fd828c} contract @mozilla.org/network/protocol/about;1?what=rights {8cc51368-6aa0-43e8-b762-bde9b9fd828c} -contract @mozilla.org/network/protocol/about;1?what=robots {8cc51368-6aa0-43e8-b762-bde9b9fd828c} contract @mozilla.org/network/protocol/about;1?what=sessionrestore {8cc51368-6aa0-43e8-b762-bde9b9fd828c} #ifdef MOZ_SERVICES_SYNC contract @mozilla.org/network/protocol/about;1?what=sync-progress {8cc51368-6aa0-43e8-b762-bde9b9fd828c} diff --git a/application/palemoon/components/nsAboutRedirector.js b/application/palemoon/components/nsAboutRedirector.js index 9c7d7953f..4d99a78f5 100644 --- a/application/palemoon/components/nsAboutRedirector.js +++ b/application/palemoon/components/nsAboutRedirector.js @@ -61,10 +61,6 @@ AboutRedirector.prototype = { url: "chrome://global/content/aboutRights.xhtml", flags: (URI_SAFE_FOR_UNTRUSTED_CONTENT | MAKE_LINKABLE | ALLOW_SCRIPT) }, - "robots": { - url: "chrome://browser/content/aboutRobots.xhtml", - flags: (URI_SAFE_FOR_UNTRUSTED_CONTENT | ALLOW_SCRIPT | HIDE_FROM_ABOUTABOUT) - }, "sessionrestore": { url: "chrome://browser/content/aboutSessionRestore.xhtml", flags: ALLOW_SCRIPT diff --git a/application/palemoon/locales/en-US/chrome/browser/aboutRobots.dtd b/application/palemoon/locales/en-US/chrome/browser/aboutRobots.dtd deleted file mode 100644 index 139603d8d..000000000 --- a/application/palemoon/locales/en-US/chrome/browser/aboutRobots.dtd +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/application/palemoon/locales/jar.mn b/application/palemoon/locales/jar.mn index 0fc7f2c9b..5fcee246e 100644 --- a/application/palemoon/locales/jar.mn +++ b/application/palemoon/locales/jar.mn @@ -9,7 +9,6 @@ locale/browser/aboutCertError.dtd (%chrome/browser/aboutCertError.dtd) locale/browser/aboutDialog.dtd (%chrome/browser/aboutDialog.dtd) locale/browser/aboutPrivateBrowsing.dtd (%chrome/browser/aboutPrivateBrowsing.dtd) - locale/browser/aboutRobots.dtd (%chrome/browser/aboutRobots.dtd) * locale/browser/aboutHome.dtd (%chrome/browser/aboutHome.dtd) locale/browser/aboutSessionRestore.dtd (%chrome/browser/aboutSessionRestore.dtd) #ifdef MOZ_SERVICES_SYNC -- cgit v1.2.3 From cc07da9cb4d6e7a53f8d953427ffc2bca2e0c2df Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 5 Apr 2019 15:13:28 +0200 Subject: CotPM update --- application/palemoon/base/content/palemoon.xhtml | 6 +++--- .../palemoon/locales/en-US/chrome/browser/palemoon.dtd | 17 +++++++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'application/palemoon') diff --git a/application/palemoon/base/content/palemoon.xhtml b/application/palemoon/base/content/palemoon.xhtml index 96757052c..f145550a9 100644 --- a/application/palemoon/base/content/palemoon.xhtml +++ b/application/palemoon/base/content/palemoon.xhtml @@ -13,7 +13,7 @@ - &chronicles.title.55.2; + &chronicles.title.66.1;