Bug 1372005 - Update about:rights to new in-content style and add page title
--- a/toolkit/content/aboutRights-unbranded.xhtml
+++ b/toolkit/content/aboutRights-unbranded.xhtml
@@ -10,45 +10,46 @@
<!-- 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>
- <title>&rights.pagetitle;</title>
- <link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css"/>
+ <title>&rights.title;</title>
+ <link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css"/>
</head>
<body id="your-rights" dir="&rights.locale-direction;" class="aboutPageWideContainer">
+<div class="container">
+ <h1>&rights.title;</h1>
-<h1>&rights.intro-header;</h1>
-
-<p>&rights.intro;</p>
+ <p>&rights.intro;</p>
-<ul>
- <li>&rights.intro-point1a;<a href="http://www.mozilla.org/MPL/">&rights.intro-point1b;</a>&rights.intro-point1c;</li>
-<!-- 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-point3-unbranded;</li>
- <li>&rights.intro-point4a-unbranded;<a href="about:rights#webservices" onclick="showServices();">&rights.intro-point4b-unbranded;</a>&rights.intro-point4c-unbranded;</li>
-</ul>
+ <ul>
+ <li>&rights.intro-point1a;<a href="http://www.mozilla.org/MPL/">&rights.intro-point1b;</a>&rights.intro-point1c;</li>
+ <!-- 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-point3-unbranded;</li>
+ <li>&rights.intro-point4a-unbranded;<a href="about:rights#webservices" onclick="showServices();">&rights.intro-point4b-unbranded;</a>&rights.intro-point4c-unbranded;</li>
+ </ul>
-<div id="webservices-container">
- <a name="webservices"/>
- <h3>&rights2.webservices-header;</h3>
+ <div id="webservices-container">
+ <a name="webservices"/>
+ <h3>&rights2.webservices-header;</h3>
+
+ <p>&rights.webservices-unbranded;</p>
- <p>&rights.webservices-unbranded;</p>
-
- <ol>
-<!-- Terms only apply to official builds, unbranded builds get a placeholder. -->
- <li>&rights.webservices-term1-unbranded;</li>
- </ol>
+ <ol>
+ <!-- Terms only apply to official builds, unbranded builds get a placeholder. -->
+ <li>&rights.webservices-term1-unbranded;</li>
+ </ol>
+ </div>
</div>
<script type="application/javascript"><![CDATA[
var servicesDiv = document.getElementById("webservices-container");
servicesDiv.style.display = "none";
function showServices() {
servicesDiv.style.display = "";
--- a/toolkit/content/aboutRights.xhtml
+++ b/toolkit/content/aboutRights.xhtml
@@ -12,85 +12,86 @@
<!-- 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>
- <title>&rights.pagetitle;</title>
- <link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css"/>
+ <title>&rights.title;</title>
+ <link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css"/>
</head>
-<body id="your-rights" dir="&rights.locale-direction;" class="aboutPageWideContainer">
+<body id="your-rights" dir="&rights.locale-direction;">
+<div class="container">
+ <h1>&rights.title;</h1>
-<h1>&rights.intro-header;</h1>
-
-<p>&rights.intro;</p>
+ <p>&rights.intro;</p>
-<ul>
- <li>&rights.intro-point1a;<a href="http://www.mozilla.org/MPL/">&rights.intro-point1b;</a>&rights.intro-point1c;</li>
-<!-- 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.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-point4a;<a href="about:rights#webservices" onclick="showServices();">&rights.intro-point4b;</a>&rights.intro-point4c;</li>
- <li>&rights.intro-point5;</li>
-</ul>
+ <ul>
+ <li>&rights.intro-point1a;<a href="http://www.mozilla.org/MPL/">&rights.intro-point1b;</a>&rights.intro-point1c;</li>
+ <!-- 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.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-point4a;<a href="about:rights#webservices" onclick="showServices();">&rights.intro-point4b;</a>&rights.intro-point4c;</li>
+ <li>&rights.intro-point5;</li>
+ </ul>
-<div id="webservices-container">
- <a name="webservices"/>
- <h3>&rights2.webservices-header;</h3>
+ <div id="webservices-container">
+ <a name="webservices"/>
+ <h3>&rights2.webservices-header;</h3>
- <p>&rights2.webservices-a;<a href="about:rights#disabling-webservices" onclick="showDisablingServices();">&rights2.webservices-b;</a>&rights3.webservices-c;</p>
+ <p>&rights2.webservices-a;<a href="about:rights#disabling-webservices" onclick="showDisablingServices();">&rights2.webservices-b;</a>&rights3.webservices-c;</p>
- <div id="disabling-webservices-container" style="margin-left:40px;">
- <a name="disabling-webservices"/>
- <p><strong>&rights.safebrowsing-a;</strong>&rights.safebrowsing-b;</p>
- <ul>
- <li>&rights.safebrowsing-term1;</li>
- <li>&rights.safebrowsing-term2;</li>
- <li>&rights2.safebrowsing-term3;</li>
- <li>&rights.safebrowsing-term4;</li>
- </ul>
+ <div id="disabling-webservices-container" style="margin-left:40px;">
+ <a name="disabling-webservices"/>
+ <p><strong>&rights.safebrowsing-a;</strong>&rights.safebrowsing-b;</p>
+ <ul>
+ <li>&rights.safebrowsing-term1;</li>
+ <li>&rights.safebrowsing-term2;</li>
+ <li>&rights2.safebrowsing-term3;</li>
+ <li>&rights.safebrowsing-term4;</li>
+ </ul>
- <p><strong>&rights.locationawarebrowsing-a;</strong>&rights.locationawarebrowsing-b;</p>
- <ul>
- <li>&rights.locationawarebrowsing-term1a;<code>&rights.locationawarebrowsing-term1b;</code></li>
- <li>&rights.locationawarebrowsing-term2;</li>
- <li>&rights.locationawarebrowsing-term3;</li>
- <li>&rights.locationawarebrowsing-term4;</li>
- </ul>
- </div>
+ <p><strong>&rights.locationawarebrowsing-a;</strong>&rights.locationawarebrowsing-b;</p>
+ <ul>
+ <li>&rights.locationawarebrowsing-term1a;<code>&rights.locationawarebrowsing-term1b;</code></li>
+ <li>&rights.locationawarebrowsing-term2;</li>
+ <li>&rights.locationawarebrowsing-term3;</li>
+ <li>&rights.locationawarebrowsing-term4;</li>
+ </ul>
+ </div>
- <ol>
-<!-- Terms only apply to official builds, unbranded builds get a placeholder. -->
- <li>&rights2.webservices-term1;</li>
- <li>&rights.webservices-term2;</li>
- <li>&rights2.webservices-term3;</li>
- <li><strong>&rights.webservices-term4;</strong></li>
- <li><strong>&rights.webservices-term5;</strong></li>
- <li>&rights.webservices-term6;</li>
- <li>&rights.webservices-term7;</li>
- </ol>
+ <ol>
+ <!-- Terms only apply to official builds, unbranded builds get a placeholder. -->
+ <li>&rights2.webservices-term1;</li>
+ <li>&rights.webservices-term2;</li>
+ <li>&rights2.webservices-term3;</li>
+ <li><strong>&rights.webservices-term4;</strong></li>
+ <li><strong>&rights.webservices-term5;</strong></li>
+ <li>&rights.webservices-term6;</li>
+ <li>&rights.webservices-term7;</li>
+ </ol>
+ </div>
</div>
<script type="application/javascript"><![CDATA[
var servicesDiv = document.getElementById("webservices-container");
servicesDiv.style.display = "none";
function showServices() {
servicesDiv.style.display = "";
}
-
+
var disablingServicesDiv = document.getElementById("disabling-webservices-container");
disablingServicesDiv.style.display = "none";
-
+
function showDisablingServices() {
disablingServicesDiv.style.display = "";
}
]]></script>
</body>
</html>
--- a/toolkit/locales/en-US/chrome/global/aboutRights.dtd
+++ b/toolkit/locales/en-US/chrome/global/aboutRights.dtd
@@ -1,15 +1,14 @@
<!-- 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.locale-direction instead of the usual local.dir entity, so RTL can skip translating page. -->
<!ENTITY rights.locale-direction "ltr">
-<!ENTITY rights.pagetitle "about:rights">
-<!ENTITY rights.intro-header "About Your Rights">
+<!ENTITY rights.title "About Your Rights">
<!ENTITY rights.intro "&brandFullName; is free and open source software, built by a community of thousands from all over the world. There are a few things you should know:">
<!-- Note on pointa / pointb / pointc form:
These points each have an embedded link in the HTML, so each point is
split into chunks for text before the link, the link text, and the text
after the link. If a localized grammar doesn't need the before or after
chunk, it can be left blank.
