summaryrefslogtreecommitdiffstats
path: root/toolkit/content
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/content')
-rw-r--r--toolkit/content/about.js7
-rw-r--r--toolkit/content/aboutRights.xhtml7
-rw-r--r--toolkit/content/aboutSupport.js25
-rw-r--r--toolkit/content/aboutSupport.xhtml6
-rw-r--r--toolkit/content/aboutTelemetry.js4
-rw-r--r--toolkit/content/browser-content.js1
-rw-r--r--toolkit/content/jar.mn14
-rw-r--r--toolkit/content/memoriam.xhtml76
-rw-r--r--toolkit/content/mozilla.css36
-rw-r--r--toolkit/content/mozilla.xhtml57
10 files changed, 97 insertions, 136 deletions
diff --git a/toolkit/content/about.js b/toolkit/content/about.js
index c27916c10..c402ea685 100644
--- a/toolkit/content/about.js
+++ b/toolkit/content/about.js
@@ -33,7 +33,12 @@ var versionNum = Components.classes["@mozilla.org/xre/app-info;1"]
.getService(Components.interfaces.nsIXULAppInfo)
.version;
var version = document.getElementById("version");
-version.textContent += " " + versionNum;
+#ifdef HAVE_64BIT_BUILD
+var versionStr = versionNum + " (64-bit)";
+#else
+var versionStr = versionNum + " (32-bit)";
+#endif
+version.textContent += " " + versionStr;
// insert the buildid of the XUL application
var BuildIDVal = Components.classes["@mozilla.org/xre/app-info;1"]
diff --git a/toolkit/content/aboutRights.xhtml b/toolkit/content/aboutRights.xhtml
index c0c73d761..cdd94e13c 100644
--- a/toolkit/content/aboutRights.xhtml
+++ b/toolkit/content/aboutRights.xhtml
@@ -32,9 +32,9 @@
<!-- Point 2 discusses Mozilla trademarks, and isn't needed when the build is unbranded.
- Point 3 discusses privacy policy, unbranded builds get a placeholder (for the vendor to replace)
- Point 4 discusses web service terms, unbranded builds gets a placeholder (for the vendor to replace) -->
- <li>&rights.intro-point2-a;<a href="http://www.mozilla.org/foundation/trademarks/policy.html">&rights.intro-point2-b;</a>&rights.intro-point2-c;</li>
+ <li>&rights.intro-point2-a;<a href="http://www.palemoon.org/branding.shtml">&rights.intro-point2-b;</a>&rights.intro-point2-c;</li>
<li>&rights.intro-point2.5;</li>
- <li>&rights2.intro-point3a;<a href="https://www.mozilla.org/legal/privacy/firefox.html">&rights2.intro-point3b;</a>&rights.intro-point3c;</li>
+ <li>&rights2.intro-point3a;<a href="http://www.palemoon.org/privacy.shtml">&rights2.intro-point3b;</a>&rights.intro-point3c;</li>
<li>&rights2.intro-point4a;<a href="about:rights#webservices" onclick="showServices();">&rights.intro-point4b;</a>&rights.intro-point4c;</li>
<li>&rights.intro-point5;</li>
</ul>
@@ -47,6 +47,7 @@
<div id="disabling-webservices-container" style="margin-left:40px;">
<a name="disabling-webservices"/>
+#ifdef MOZ_SAFE_BROWSING
<p><strong>&rights.safebrowsing-a;</strong>&rights.safebrowsing-b;</p>
<ul>
<li>&rights.safebrowsing-term1;</li>
@@ -54,7 +55,7 @@
<li>&rights2.safebrowsing-term3;</li>
<li>&rights.safebrowsing-term4;</li>
</ul>
-
+#endif
<p><strong>&rights.locationawarebrowsing-a;</strong>&rights.locationawarebrowsing-b;</p>
<ul>
<li>&rights.locationawarebrowsing-term1a;<code>&rights.locationawarebrowsing-term1b;</code></li>
diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
index 7209b7ad0..4e42a5687 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -42,6 +42,9 @@ var snapshotFormatters = {
$("os-box").textContent = data.osVersion;
$("supportLink").href = data.supportURL;
let version = AppConstants.MOZ_APP_VERSION_DISPLAY;
+ if (data.versionArch) {
+ version += " (" + data.versionArch + ")";
+ }
if (data.vendor)
version += " (" + data.vendor + ")";
$("version-box").textContent = version;
@@ -876,16 +879,25 @@ function populateActionBox() {
}
}
-// Prompt user to restart the browser in safe mode
-function safeModeRestart() {
+// Prompt user to restart the browser
+function restart(safeMode) {
let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"]
.createInstance(Ci.nsISupportsPRBool);
Services.obs.notifyObservers(cancelQuit, "quit-application-requested", "restart");
- if (!cancelQuit.data) {
- Services.startup.restartInSafeMode(Ci.nsIAppStartup.eAttemptQuit);
+ if (cancelQuit.data) {
+ return;
+ }
+
+ let flags = Ci.nsIAppStartup.eAttemptQuit;
+
+ if (safeMode) {
+ Services.startup.restartInSafeMode(flags);
+ } else {
+ Services.startup.quit(flags | Ci.nsIAppStartup.eRestart);
}
}
+
/**
* Set up event listeners for buttons.
*/
@@ -912,9 +924,12 @@ function setupEventListeners() {
if (Services.obs.enumerateObservers("restart-in-safe-mode").hasMoreElements()) {
Services.obs.notifyObservers(null, "restart-in-safe-mode", "");
} else {
- safeModeRestart();
+ restart(true);
}
});
+ $("restart-button").addEventListener("click", function(event) {
+ restart(false);
+ });
$("verify-place-integrity-button").addEventListener("click", function(event) {
PlacesDBUtils.checkAndFixDatabase(function(aLog) {
let msg = aLog.join("\n");
diff --git a/toolkit/content/aboutSupport.xhtml b/toolkit/content/aboutSupport.xhtml
index a92dcfb4a..5eb64d437 100644
--- a/toolkit/content/aboutSupport.xhtml
+++ b/toolkit/content/aboutSupport.xhtml
@@ -44,6 +44,12 @@
&aboutSupport.restartInSafeMode.label;
</button>
</div>
+ <div id="restart-box">
+ <h3>&aboutSupport.restartTitle;</h3>
+ <button id="restart-button">
+ &aboutSupport.restartNormal.label;
+ </button>
+ </div>
</div>
<h1>
diff --git a/toolkit/content/aboutTelemetry.js b/toolkit/content/aboutTelemetry.js
index 2cf5e8909..c73a979c6 100644
--- a/toolkit/content/aboutTelemetry.js
+++ b/toolkit/content/aboutTelemetry.js
@@ -75,6 +75,10 @@ function isFlatArray(obj) {
* This is a helper function for explodeObject.
*/
function flattenObject(obj, map, path, array) {
+ if (!obj) {
+ return;
+ }
+
for (let k of Object.keys(obj)) {
let newPath = [...path, array ? "[" + k + "]" : k];
let v = obj[k];
diff --git a/toolkit/content/browser-content.js b/toolkit/content/browser-content.js
index b392aaf88..2276f8a0d 100644
--- a/toolkit/content/browser-content.js
+++ b/toolkit/content/browser-content.js
@@ -841,6 +841,7 @@ var FindBar = {
fakeEvent[k] = event[k];
}
}
+
// sendSyncMessage returns an array of the responses from all listeners
let rv = sendSyncMessage("Findbar:Keypress", {
fakeEvent: fakeEvent,
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index f0d4a62a4..e1d432cb3 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -8,14 +8,14 @@ toolkit.jar:
content/global/textbox.css
content/global/menulist.css
content/global/autocomplete.css
- content/global/about.js
+* content/global/about.js
content/global/about.xhtml
content/global/aboutAbout.js
content/global/aboutAbout.xhtml
-#ifdef MC_OFFICIAL
- content/global/aboutRights.xhtml
+#ifdef MOZ_OFFICIAL_BRANDING
+* content/global/aboutRights.xhtml
#else
- content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml)
+* content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml)
#endif
content/global/aboutNetworking.js
content/global/aboutNetworking.xhtml
@@ -25,9 +25,11 @@ toolkit.jar:
#endif
content/global/aboutServiceWorkers.js
content/global/aboutServiceWorkers.xhtml
+#ifdef MOZ_WEBRTC
content/global/aboutwebrtc/aboutWebrtc.css (aboutwebrtc/aboutWebrtc.css)
content/global/aboutwebrtc/aboutWebrtc.js (aboutwebrtc/aboutWebrtc.js)
content/global/aboutwebrtc/aboutWebrtc.html (aboutwebrtc/aboutWebrtc.html)
+#endif
* content/global/aboutSupport.js
* content/global/aboutSupport.xhtml
content/global/aboutTelemetry.js
@@ -38,7 +40,7 @@ toolkit.jar:
content/global/plugins.css
content/global/browser-child.js
content/global/browser-content.js
-* content/global/buildconfig.html
+* content/global/buildconfig.html
content/global/contentAreaUtils.js
#ifndef MOZ_FENNEC
content/global/customizeToolbar.css
@@ -55,8 +57,6 @@ toolkit.jar:
#endif
content/global/filepicker.properties
content/global/globalOverlay.js
- content/global/memoriam.xhtml
-* content/global/mozilla.css
content/global/mozilla.xhtml
#ifdef MOZ_PHOENIX
content/global/logopage.xhtml
diff --git a/toolkit/content/memoriam.xhtml b/toolkit/content/memoriam.xhtml
deleted file mode 100644
index f1a1b474d..000000000
--- a/toolkit/content/memoriam.xhtml
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html
-[
- <!ENTITY % directionDTD SYSTEM "chrome://global/locale/global.dtd" >
- %directionDTD;
- <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
- %brandDTD;
-]>
-
-<!-- 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 charset='utf-8' />
- <title>Mozilla: In Memoriam</title>
-
-<style>
-html {
- background: maroon radial-gradient( circle, #a01010 0%, #800000 80%) center center / cover no-repeat;
- color: white;
- font-style: italic;
- text-rendering: optimizeLegibility;
- min-height: 100%;
-}
-
-#moztext {
- margin-top: 15%;
- font-size: 1.1em;
- font-family: serif;
- text-align: center;
- line-height: 1.5;
-}
-
-#from {
- font-size: 1.0em;
- font-family: serif;
- text-align: right;
-}
-
-em {
- font-size: 1.3em;
- line-height: 0;
-}
-
-a {
- text-decoration: none;
- color: white;
-}
-</style>
-</head>
-
-<body dir="&locale.dir;">
-
-<section>
- <p id="moztext">
- <h1>Mozilla: In Memoriam</h1>
- <br/>
- Dedicated to the tireless developers who have come and gone.<br/>
- To those who have put their heart and soul into Mozilla products.<br/>
- To those who have seen their good intentions and hard work squandered.<br/>
- To those who really cared about the user, and cared about usability.<br/>
- To those who truly understood us and desired freedom, but were unheard.<br/>
- To those who knew that change is inevitable, but loss of vision is not.<br/>
- To those who were forced to give up the good fight.<br/>
- <br/>
- <em>Thank you.</em> &brandFullName; would not have been possible without you.<br/>
- <br/>
- </p>
-
- <p id="from">
- </p>
-</section>
-
-</body>
-</html> \ No newline at end of file
diff --git a/toolkit/content/mozilla.css b/toolkit/content/mozilla.css
deleted file mode 100644
index d5eae6415..000000000
--- a/toolkit/content/mozilla.css
+++ /dev/null
@@ -1,36 +0,0 @@
-html {
-%ifdef MC_PALEMOON
- background: #333399 radial-gradient( circle at 75% 25%, #6666b0 0%, #333399 40%, #111177 80%) center center / cover no-repeat;
-%else
- background: maroon radial-gradient( circle, #a01010 0%, #800000 80%) center center / cover no-repeat;
-%endif
-
- color: white;
- font-style: italic;
- text-rendering: optimizeLegibility;
- min-height: 100%;
-}
-
-#moztext {
- margin-top: 15%;
- font-size: 1.1em;
- font-family: serif;
- text-align: center;
- line-height: 1.5;
-}
-
-#from {
- font-size: 1.95em;
- font-family: serif;
- text-align: right;
-}
-
-em {
- font-size: 1.3em;
- line-height: 0;
-}
-
-a {
- text-decoration: none;
- color: white;
-} \ No newline at end of file
diff --git a/toolkit/content/mozilla.xhtml b/toolkit/content/mozilla.xhtml
index 8c79b5ff9..f1a1b474d 100644
--- a/toolkit/content/mozilla.xhtml
+++ b/toolkit/content/mozilla.xhtml
@@ -1,9 +1,9 @@
<!DOCTYPE html
[
- <!ENTITY % mozillaDTD SYSTEM "chrome://global/locale/mozilla.dtd" >
- %mozillaDTD;
<!ENTITY % directionDTD SYSTEM "chrome://global/locale/global.dtd" >
%directionDTD;
+ <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+ %brandDTD;
]>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
@@ -13,23 +13,64 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset='utf-8' />
- <title>&chronicles.title.55.2;</title>
+ <title>Mozilla: In Memoriam</title>
- <link rel="stylesheet" href="chrome://global/content/mozilla.css"
- type="text/css"/>
+<style>
+html {
+ background: maroon radial-gradient( circle, #a01010 0%, #800000 80%) center center / cover no-repeat;
+ color: white;
+ font-style: italic;
+ text-rendering: optimizeLegibility;
+ min-height: 100%;
+}
+
+#moztext {
+ margin-top: 15%;
+ font-size: 1.1em;
+ font-family: serif;
+ text-align: center;
+ line-height: 1.5;
+}
+
+#from {
+ font-size: 1.0em;
+ font-family: serif;
+ text-align: right;
+}
+
+em {
+ font-size: 1.3em;
+ line-height: 0;
+}
+
+a {
+ text-decoration: none;
+ color: white;
+}
+</style>
</head>
<body dir="&locale.dir;">
<section>
<p id="moztext">
- &chronicles.quote.55.2;
+ <h1>Mozilla: In Memoriam</h1>
+ <br/>
+ Dedicated to the tireless developers who have come and gone.<br/>
+ To those who have put their heart and soul into Mozilla products.<br/>
+ To those who have seen their good intentions and hard work squandered.<br/>
+ To those who really cared about the user, and cared about usability.<br/>
+ To those who truly understood us and desired freedom, but were unheard.<br/>
+ To those who knew that change is inevitable, but loss of vision is not.<br/>
+ To those who were forced to give up the good fight.<br/>
+ <br/>
+ <em>Thank you.</em> &brandFullName; would not have been possible without you.<br/>
+ <br/>
</p>
<p id="from">
- &chronicles.from.55.2;
</p>
</section>
</body>
-</html>
+</html> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-16 19:13:59 +0000