Skip to content

Commit

Permalink
Merge pull request #844 from jwhitlock/text-edits-1.5.x-1573951
Browse files Browse the repository at this point in the history
bug 1573951: Terms of service, other text changes
  • Loading branch information
jwhitlock committed Aug 28, 2019
2 parents 953b80b + dd4bc8c commit 13000df
Show file tree
Hide file tree
Showing 10 changed files with 346 additions and 50 deletions.
58 changes: 58 additions & 0 deletions ichnaea/content/static/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,64 @@ img {
top: 8px;
}

/* Developer Terms of Service: Mozilla Location Service Query API */

/* Number <h3> sections with "1. ", "2. " */
section.terms-of-service {
counter-reset: H3
}
section.terms-of-service h3:before {
content: counter(H3) ". ";
counter-increment: H3;
}

/* Show definitions on a single line, underline the term, separate term and definition with dash */
section.terms-of-service dt {
display: inline-block;
text-decoration: underline;
}

section.terms-of-service dd:before {
content: ' - ';
}

section.terms-of-service dd {
display: inline;
margin: 0;
}

section.terms-of-service dd:after{
display: block;
content: '';
margin-bottom: 1em;
}

/* Number list items with (a), (b) */
section.terms-of-service ol {
counter-reset: tos-list;
}
section.terms-of-service ol > li {
list-style: none;
position: relative;
margin-bottom: 1em;
}
section.terms-of-service ol > li:before {
counter-increment: tos-list;
content: "(" counter(tos-list, lower-alpha) ") ";
position: absolute;
left: -1.4em;
}

/* Underline legal terms */
section.terms-of-service span.legal-term {
text-decoration: underline;
}

/* Show disclaimer in all uppercase */
section.terms-of-service .text-uppercase-disclaimer {
text-transform: uppercase;
}

/* Mobile Layout: 320px */

@media only screen and (max-width: 760px) {
Expand Down
60 changes: 59 additions & 1 deletion ichnaea/content/static/css/bundle-base.css

Large diffs are not rendered by default.

23 changes: 8 additions & 15 deletions ichnaea/content/templates/api.pt
Original file line number Diff line number Diff line change
Expand Up @@ -54,31 +54,24 @@

<p class="text-justified">
In order to use the service API you need to obtain an API key.
If you use one of the existing applications, there is a good
chance those applications already come with an API key included.
We require these API keys as one way to prevent abuse of the
service.
</p>

<p class="text-justified">
Mozilla is currently evaluating its MLS service and terms and is
not currently distributing API keys.
To obtain an API key, please
<a href="https://docs.google.com/forms/d/e/1FAIpQLSf2JaJm8V1l8TS_OiyjodkpYsagOhM1LNo_SmPDDAVKdmQg8A/viewform">
fill out this form</a>. When filling out the form,
please make sure to describe your use-case and intended use of
the service. Our
<a href="/terms">
Developer Terms of Service</a> govern the use of MLS API keys.
</p>

<!--
<p class="text-justified">
If you are developing a new application, please
<a href="/contact">contact us</a> to obtain an API key.
Please make sure to describe your use-case and intended use of
the service. If you merely want to test out the service for an
experiment, please use the literal "test" API key.
</p>
<p class="text-justified">
We'll try to get back to you in a manner of days, but depending
We'll try to get back to you within a few days, but depending
on vacation times it might take longer.
</p>
-->
</section>
</tal:slot>

Expand Down
1 change: 1 addition & 0 deletions ichnaea/content/templates/base.pt
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
</ul>

<ul class="footer-nav">
<li><a href="/terms">Terms of Service</a></li>
<li><a href="https://wiki.mozilla.org/CloudServices/Location">
Project overview</a>
</li>
Expand Down
22 changes: 4 additions & 18 deletions ichnaea/content/templates/contact.pt
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,14 @@

<p>
If you have a question about the Mozilla Location Service,
you have a variety of options to contact us. If you want to
engage with the larger geolocation community or are comfortable
discussing your request in the open, please use either:
<ul>
<li>
<a href="https://lists.mozilla.org/listinfo/dev-geolocation">
Our public mailing list</a> or
<a href="http://groups.google.com/group/mozilla.dev.geolocation">
view an online archive of the discussions</a>
</li>
<li>
or join the #geo channel on
<a href="https://wiki.mozilla.org/IRC">
Mozilla's IRC network</a>.
</li>
</ul>
post to
<a href="http://groups.google.com/group/mozilla.dev.geolocation">
our public mailing list</a>.
</p>

<p>
If your inquiry about the Mozilla Location Service should stay
private, you can contact us via email:
<i>mls-contact (at) mozilla (dot) com</i>
<em>mls-contact (at) mozilla (dot) com</em>

<br />

Expand Down
7 changes: 3 additions & 4 deletions ichnaea/content/templates/downloads.pt
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,9 @@
</p>

<p class="text-justified">
While we would like to openly share the data about WiFi networks,
we do not know of any way to do so that would not lead to an
exposure of personal data and made it possible to track the
movements of WiFi networks over time.
We do not share data about WiFi networks. Sharing such data could
expose personal data and make it possible to track the movements
of WiFi networks over time.
</p>

<h3>Observations</h3>
Expand Down
13 changes: 1 addition & 12 deletions ichnaea/content/templates/privacy.pt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
></div>

<p class="italic">
Last updated April 8, 2016
Last updated August 30, 2019
</p>

<p class="text-justified">
Expand Down Expand Up @@ -94,17 +94,6 @@
You can send us data anonymously or using a Firefox Account.
</p>
<ul role="tabpanel">
<li class="text-justified">
If you participate in our crowd-sourced data project, you
can publicly share the quantity of your location
contributions by joining our
<a href="https://location-leaderboard.services.mozilla.com">
leaderboard</a>.
Accounts on the leaderboard are associated with a number
of "points" per day and per region (for example,
on January 1st, 2016: 500 points in India).
</li>

<li class="text-justified">
Our <a href="/map">data map</a> is updated daily with
aggregated location points sent to Mozilla from users
Expand Down
205 changes: 205 additions & 0 deletions ichnaea/content/templates/terms.pt
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
<tal:macro xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:metal="http://xml.zope.org/namespaces/metal"
metal:use-macro="view.base_template">

<tal:slot metal:fill-slot="content">
<section class="terms-of-service" id="main-content">

<h3>Introduction &amp; Definitions</h3>

<p class="text-justified">
Mozilla Location Service (MLS) is a free and open service developed by
Mozilla for the public benefit. This MLS Developer Terms of Service
("<span class="legal-term">Terms</span>") govern your use of the MLS Query
API. Key definitions used in these Terms are defined below.
</p>

<dl>
<dt>Commercial Project</dt>
<dd>
Projects using the MLS Query API to further the primary purpose of
private monetary gain.
</dd>
<dt>End Users</dt>
<dd>
Individuals receiving location through the MLS Query API
</dd>
<dt>Public Interest Project</dt>
<dd>
Projects using the MLS Query API to further the public interest
such as research, open source software, standards development,
education, recreation, social, or non-commercial technology.
</dd>
</dl>

<h3>Eligibility &amp; Registration</h3>

<p class="text-justified">
Unless otherwise stated in these Terms, the MLS Query API is available
as follows:
</p>

<ol>
<li>
<span class="legal-term">Commercial Project licenses</span>
are capped at a daily usage limit of 100,000 requests (this will
not be increased). API keys expire automatically after three
months.
</li>
<li>
<span class="legal-term">Public Interest Project licenses</span>
are capped at a daily usage limit of 100,000 requests, which may be
increased on request if necessary for the project.
</li>
</ol>

<p class="text-justified">
Registration is required to access the MLS Query API. Whether a
project meets the eligibility criteria for a license is at Mozilla’s
sole discretion.
</p>

<h3>Your Obligations</h3>

<p class="text-justified">
You represent and warrant that:
</p>

<ol>
<li>
<span class="legal-term">Relationship with Mozilla</span>.
You will provide accurate information and updates to Mozilla.
Unless you and Mozilla have a written agreement stating otherwise,
your project will not imply in any way that it is produced,
sponsored or endorsed by Mozilla.
</li>
<li>
<span class="legal-term">Relationship with End-Users</span>.
You are solely responsible for your project and obtaining
meaningful consent of your End-Users to locate them. You will
provide your End-Users with notice of your use of the MLS Query
API, as well as any other relevant location data you have or
collect in connection with its use.
</li>
</ol>

<h3>Privacy Notice &amp; Communications</h3>

<p class="text-justified">
As part of using the MLS Query API, you agree to the following:
</p>

<ol>
<li>
<span class="legal-term">Data Collection</span> -
We adhere to the practices outlined in the
<a href="https://www.mozilla.org/privacy/">Mozilla privacy policy</a>
for how we receive, handle and share information we collect
providing MLS. The following data is required for use of our
service: Name, Email, Organization (as part of registration).
Mozilla retains aggregate data of the number of daily requests
associated with each API key.
MLS’s end user privacy notice is available
<a href="/privacy">here</a>.
The project’s source code is
<a href="https://github.com/mozilla/ichnaea">available on GitHub</a>.
</li>
<li>
<span class="legal-term">Email</span> –
We may contact you at your registered email address in connection
with MLS.
</li>
<li>
<span class="legal-term">Public Reports</span> –
We may publicly publish metrics on usage of the MLS Query API and
this aggregate data may include your project use. We will not share
your project name without your prior consent.
</li>
</ol>

<h3>No SLA</h3>

<p class="text-justified">
These Terms are not a service level agreement and Mozilla is not
required to maintain any particular level or service or uptime in
connection with MLS. The service may experience downtime or become
unavailable without notice.
</p>

<h3>Indemnification</h3>

<p class="text-justified">
You agree to defend, indemnify and hold harmless Mozilla, its
contractors, contributors, licensors, and partners, and their
respective directors, officers, employees and agents ("Indemnified
Parties") from and against any and all third party claims and expenses,
including attorneys' fees, arising out of or related to your use of the
Services (including, but not limited to, from any content uploaded by
you).

<h3>Disclaimer; Limitation of Liability</h3>

<p class="text-justified text-uppercase-disclaimer">
MLS is provided "as is" with all faults. To the extent permitted by
law, Mozilla and the indemnified parties hereby disclaim all
warranties, whether express or implied, including without limitation
warranties that the service is free of defects, merchantable, fit for a
particular purpose, and non-infringing.
</p>

<p class="text-justified text-uppercase-disclaimer">
You bear the entire risk as to selecting the service for your purposes
and as to the quality and performance of the service. This limitation
will apply notwithstanding the failure of essential purpose of any
remedy. Some jurisdictions do not allow the exclusion or limitation of
implied warranties, so this disclaimer may not apply to you.
</p>

<p class="text-justified text-uppercase-disclaimer">
Except as required by law, Mozilla and the indemnified parties will not
be liable for any indirect, special, incidental, consequential, or
exemplary damages arising out of or in any way relating to these Terms
or the use of or inability to use the service, including without
limitation direct and indirect damages for loss of goodwill, work
stoppage, lost profits, loss of data, and computer failure or
malfunction, even if advised of the possibility of such damages and
regardless of the theory (contract, tort, or otherwise) upon which such
claim is based. The collective liability of Mozilla and the indemnified
parties under these terms will not exceed $500 (five hundred dollars).
Some jurisdictions do not allow the exclusion or limitation of
incidental, consequential, or special damages, so this exclusion and
limitation may not apply to you.
</p>

<h3>Modifications to these Terms</h3>

<p class="text-justified">
We may update these Terms from time to time. The updated Terms will be
posted online. If the changes are substantive, we will announce the
update through our usual channels for such announcements such as blog
posts, banners, emails, or forums. Your continued use of the service
after the effective date of such changes constitutes your acceptance of
such changes.
</p>

<h3>Miscellaneous</h3>

<p class="text-justified">
These Terms constitute the entire agreement between you and Mozilla
concerning the service and supersede any prior versions of these Terms.
These Terms are governed by the laws of the state of California,
U.S.A., excluding its conflict of law provisions. All claims and
disputes arising out of the Communications or these Terms shall be
brought exclusively in the courts of Santa Clara County, California,
and you consent to personal jurisdiction in those courts. If any
portion of these Terms is held to be invalid or unenforceable, the
remaining portions will remain in full force and effect. In the event
of a conflict between a translated version of these Terms and the
English language version, the English language version shall control.
In the event of a conflict between these Terms and relevant additional
terms, the additional terms shall control.
</p>
</section>
</tal:slot>

</tal:macro>

0 comments on commit 13000df

Please sign in to comment.