Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Bug 818114 - Gaia’s “Legal Information” needs ironing #6823

Merged
merged 1 commit into from

2 participants

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
52 apps/settings/index.html
@@ -1672,41 +1672,45 @@ <h1 data-l10n-id="about-your-privacy"> About Your Privacy </h1>
-->
</section>
- <!-- Device :: Information :: Legal Information -->
- <section role="region" hidden id="about-legal-information">
+ <!-- Device :: Information :: Legal :: Open Source Notices -->
+ <section role="region" hidden id="about-licensing">
<!--
<header>
- <button type="reset">
- <span data-l10n-id="back" class="icon icon-back">Back</span>
- </button>
+ <a href="#about-legal">
+ <span class="icon icon-back">back</span>
+ </a>
+ <h1 data-l10n-id="open-source-notices">
+ Open Source Notices
+ </h1>
+ </header>
+ <iframe src="resources/open_source_license.html" id="os-license"></iframe>
+ -->
+ </section>
+
+ <!-- Device :: Information :: Legal -->
+ <section role="region" hidden id="about-legal">
+ <!--
+ <header>
+ <a href="#about">
+ <span class="icon icon-back">back</span>
+ </a>
<h1 data-l10n-id="about-licensing"> Legal Information </h1>
</header>
<header>
- <h2 data-l10n-id="mozilla"> Mozilla </h2>
+ <h2 data-l10n-id="about-mozilla"> Mozilla </h2>
</header>
<ul>
- <li class="description">
- <a href="#about-licensing" data-l10n-id="about-os-license">
- Browser Os Open Source Notices
- </a>
+ <li>
+ <a href="#about-licensing" data-l10n-id="open-source-notices">
+ Open Source Notices
+ </a>
</li>
</ul>
- -->
- </section>
- <!-- Device :: Information :: Licensing -->
- <section role="region" hidden id="about-licensing">
- <!--
- <header>
- <a href="#about-legal-information">
- <span class="icon icon-back">back</span>
- </a>
- <h1 data-l10n-id="about-os-license">
- Browser Os Open Source Notices
- </h1>
+ <header hidden>
+ <h2 data-l10n-id="about-other"> Other </h2>
</header>
- <iframe src="open-source-license.html" id="os-license"></iframe>
-->
</section>
@@ -1786,7 +1790,7 @@ <h2 data-l10n-id="aboutBrowserOS"> About Browser OS </h2>
</li>
<li>
<label>
- <button data-href="#about-legal-information"
+ <button data-href="#about-legal"
data-l10n-id="about-licensing"> Licensing </button>
</label>
</li>
View
9 apps/settings/locales/settings.en-US.properties
@@ -13,6 +13,7 @@ back=Back
pair=Pair
done=Done
+
#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
# Connectivity
#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
@@ -414,9 +415,11 @@ about-your-rights-0 = {{brandShortName}} is built on free and open source softwa
about-your-rights-1 = {{brandShortName}} is made available to you under the terms of several open source licenses including the Mozilla Public License. A device running {{brandShortName}} may also contain proprietary software from third parties. Any code provided under open licenses give you the right to modify the source code and distribute your modified versions as long as you comply with their terms.
about-your-rights-2 = You are not granted any trademark rights or licenses to the trademarks of the Mozilla Foundation or any party, including without limitation the {{brandShortName}} name or logo.
about-your-rights-3 = Some features in {{brandShortName}}, such as the Crash Reporter, give you the option to provide feedback to Mozilla. By choosing to submit feedback, you give Mozilla permission to use the feedback to improve its products, to publish the feedback on its websites, and to distribute the feedback.
-about-your-privacy = About your privacy
-about-licensing = Legal Information
-about-os-license = {{brandShortName}} Open Source Notices
+about-your-privacy = About your privacy
+about-licensing = Legal Information
+open-source-notices = Open Source Notices
+about-mozilla = Mozilla
+about-other = Other
licensing-1 = Binaries of this product have been made available to you by the Mozilla Project, under the Mozilla Public License 2.0 (MPL). Know your rights.
licensing-2 = All of the source code to this product is available under licenses that are both free and open source. Most of it is available under the Mozilla Public License 2.0 (MPL).
licensing-3 = The remainder of the software that is not under the Mozilla Public License 2.0 MPL is available under one of a variety of other licenses. Those that require reproduction of the license text in the distribution are given below. (Note: Your copy of this product may not contain code covered by one or more of the licenses listed here, depending on the exact product and version you choose.)
View
0  apps/settings/open-source-license.html → apps/settings/resources/open_source_license.html
File renamed without changes
View
21 apps/settings/style/settings.css
@@ -255,6 +255,17 @@ ul li > label .range-icons.brightness {
white-space: nowrap;
}
+
+/******************************************************************************
+ * OS License
+ */
+
+#os-license {
+ width: 100%;
+ height: calc(100% - 5rem);
+}
+
+
/******************************************************************************
* Help
*/
@@ -269,6 +280,7 @@ html[dir="rtl"] #call-support-numbers {
left: 2rem;
}
+
/******************************************************************************
* Right-To-Left layout
*/
@@ -291,12 +303,3 @@ html[dir="rtl"] label[for^="pwd"] {
padding-right: 3rem;
}
-
-/******************************************************************************
-* OS License
-*/
-
-iframe#os-license {
- width: 100%;
- height: calc(100% - 5rem);
-}
Something went wrong with that request. Please try again.