Skip to content
Snippets Groups Projects
Verified Commit d6b79e81 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame :jack_o_lantern:
Browse files

MB 63: Customize some about pages for Mullvad Browser 

Also:
#57: Purge unneeded about: pages
parent 8a7a3cdc
No related branches found
No related tags found
1 merge request!100MB 260: Rebased MB release onto 115.7.0
Show whitespace changes
Inline Side-by-side
Showing
with 92 additions and 7 deletions
browser/components/about/AboutRedirector.cpp
+ 2
− 0
View file @ d6b79e81
......@@ -82,9 +82,11 @@ static const RedirEntry kRedirMap[] = {
{"rights", "chrome://global/content/aboutRights.xhtml",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
#ifndef MULLVAD_BROWSER
{"robots", "chrome://browser/content/aboutRobots.xhtml",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::ALLOW_SCRIPT},
#endif
{"sessionrestore", "chrome://browser/content/aboutSessionRestore.xhtml",
nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT |
nsIAboutModule::IS_SECURE_CHROME_UI},
......
browser/components/about/components.conf
+ 0
− 1
View file @ d6b79e81
......@@ -21,7 +21,6 @@ pages = [
'reader',
'restartrequired',
'rights',
'robots',
'sessionrestore',
'tabcrashed',
'unloads',
......
docshell/base/nsAboutRedirector.cpp
+ 2
− 0
View file @ d6b79e81
......@@ -114,8 +114,10 @@ static const RedirEntry kRedirMap[] = {
nsIAboutModule::URI_MUST_LOAD_IN_CHILD |
nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |
nsIAboutModule::IS_SECURE_CHROME_UI},
#ifndef MULLVAD_BROWSER
{"mozilla", "chrome://global/content/mozilla.html",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT},
#endif
{"neterror", "chrome://global/content/aboutNetError.xhtml",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |
......
docshell/build/components.conf
+ 0
− 1
View file @ d6b79e81
......@@ -20,7 +20,6 @@ about_pages = [
'logging',
'logo',
'memory',
'mozilla',
'neterror',
'networking',
'performance',
......
toolkit/content/aboutRightsMullvad.xhtml 0 → 100644
+ 37
− 0
View file @ d6b79e81
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html [
<!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
%htmlDTD;
]>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- 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/. -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'" />
<meta name="color-scheme" content="light dark" />
<title data-l10n-id="rights-title"></title>
<link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css"/>
<link rel="localization" href="branding/brand.ftl"/>
<link rel="localization" href="toolkit/about/aboutRights.ftl"/>
<link rel="localization" href="toolkit/about/aboutRightsMullvad.ftl"/>
</head>
<body id="your-rights" class="aboutPageWideContainer">
<div class="container">
<h1 data-l10n-id="rights-title"></h1>
<p data-l10n-id="rights-mullvad-intro"></p>
<p data-l10n-id="rights-mullvad-you-should-know"></p>
<ul>
<li data-l10n-id="rights-intro-point-1"><a href="http://www.mozilla.org/MPL/" data-l10n-name="mozilla-public-license-link"></a></li>
<li data-l10n-id="rights-mullvad-trademarks"></li>
</ul>
</div>
</body>
</html>
toolkit/content/aboutTelemetryMullvad.xhtml 0 → 100644
+ 29
− 0
View file @ d6b79e81
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html [
<!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
%htmlDTD;
]>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- 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/. -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'" />
<meta name="color-scheme" content="light dark" />
<title data-l10n-id="telemetry-title"></title>
<link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css"/>
<link rel="localization" href="branding/brand.ftl"/>
<link rel="localization" href="toolkit/about/aboutTelemetryMullvad.ftl"/>
</head>
<body id="your-rights" class="aboutPageWideContainer">
<div class="container">
<h1 data-l10n-id="telemetry-title"></h1>
<p data-l10n-id="telemetry-description"></p>
</div>
</body>
</html>
toolkit/content/jar.mn
+ 5
− 5
View file @ d6b79e81
......@@ -16,11 +16,7 @@ toolkit.jar:
content/global/aboutProfiles.xhtml
#endif
content/global/aboutRights.js
#ifdef MOZILLA_OFFICIAL
content/global/aboutRights.xhtml
#else
content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml)
#endif
content/global/aboutRights.xhtml (aboutRightsMullvad.xhtml)
content/global/aboutServiceWorkers.js
content/global/aboutServiceWorkers.xhtml
content/global/aboutwebrtc/aboutWebrtc.css (aboutwebrtc/aboutWebrtc.css)
......@@ -35,9 +31,13 @@ toolkit.jar:
content/global/aboutGlean.html
content/global/aboutGlean.css
#endif
#ifdef MULLVAD_BROWSER
content/global/aboutTelemetry.xhtml (aboutTelemetryMullvad.xhtml)
#else
content/global/aboutTelemetry.js
content/global/aboutTelemetry.xhtml
content/global/aboutTelemetry.css
#endif
content/global/aboutUrlClassifier.js
content/global/aboutUrlClassifier.xhtml
content/global/aboutUrlClassifier.css
......
toolkit/locales/en-US/toolkit/about/aboutRightsMullvad.ftl 0 → 100644
+ 10
− 0
View file @ d6b79e81
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
rights-mullvad-intro = { -brand-short-name } is free and open source software.
rights-mullvad-you-should-know = There are a few things you should know:
rights-mullvad-trademarks =
You are not granted any trademark rights or licenses to the trademarks of
the { -brand-short-name } or any party, including without limitation the
{ -brand-short-name } name or logo.
toolkit/locales/en-US/toolkit/about/aboutTelemetryMullvad.ftl 0 → 100644
+ 7
− 0
View file @ d6b79e81
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
telemetry-title = Telemetry Information
telemetry-description = Telemetry is disabled in { -brand-short-name }.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment