Skip to content

Commit

Permalink
Merge pull request #3168 from webcompat/issue/3165/1
Browse files Browse the repository at this point in the history
Fixes #3165 - Create Terms of Service page
  • Loading branch information
Mike Taylor authored Jan 23, 2020
2 parents 6e01168 + 18ae27c commit 59ec79f
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 0 deletions.
1 change: 1 addition & 0 deletions tests/unit/test_rendering.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ def test_titles(self):
('/issues', 'Issues'),
('issues/new', 'New Issue'),
('/privacy', 'Privacy Policy'),
('/terms', 'Terms of Service'),
('/404', default_title)
]
with webcompat.app.app_context():
Expand Down
5 changes: 5 additions & 0 deletions tests/unit/test_urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,11 @@ def test_privacy(self):
rv = self.app.get('/privacy')
self.assertEqual(rv.status_code, 200)

def test_terms(self):
"""Test that /terms exists."""
rv = self.app.get('/terms')
self.assertEqual(rv.status_code, 200)

def test_contributors(self):
"""Test that /contributors exists."""
rv = self.app.get('/contributors')
Expand Down
5 changes: 5 additions & 0 deletions webcompat/templates/shared/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@
Privacy Policy
</a>
</li>
<li class="footer-item{% if request.url_rule.endpoint == 'terms' %} active{% endif %}">
<a class="footer-item-link" href="{{ url_for('terms') }}">
Terms of Service
</a>
</li>
<li class="footer-item">
<a class="footer-item-link" href="https://github.com/webcompat/webcompat.com/blob/master/CODE_OF_CONDUCT.md">
Code of Conduct
Expand Down
62 changes: 62 additions & 0 deletions webcompat/templates/terms.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{% extends "layout.html" %}
{% block title %}Terms of Service{% endblock %}
{% block body %}
{% include "nav/nav.html" %}
<section class="grid">
<article class="grid-row">
<div class="grid-cell x3">
<h1 class="headline-1 heading">
Webcompat.com Terms of Service
</h1>

<small class="small">Effective Date: January 14, 2020</small>
<p>
Webcompat.com is a Service that allows users to report web compatibility issues through a simple web form.
Volunteers and employees of Mozilla view the reports, identify solutions, then share the reports and solutions
with the website stewards, or escalate bugs to browser vendors.
For more details, see our <a href="/about" title="about page">About page</a>.
</p>
<h3 class="headline-2">Acceptable Use</h3>

<p>
Your use of the webcompat.com website and service must not violate any applicable laws, including copyright or trademark laws,
export control or sanctions laws, or other laws. You are responsible for making sure that your use of the Service is in compliance
with laws and any applicable regulations.
</p>

<p>
Webcompat.com is sponsored and hosted by Mozilla, and as such, users are bound by the general
<a href="https://www.mozilla.org/en-US/about/legal/acceptable-use/" title="Mozilla Conditions of Use">Mozilla Conditions of Use </a> as well as the
<a href="https://www.mozilla.org/en-US/about/legal/terms/mozilla/" title="Mozilla Websites & Communications Terms of Use">Mozilla Websites & Communications Terms of Use</a>
</p>
<p>
Some parts of webcompat.com are hosted on GitHub, and as such,
users are bound by <a href="https://help.github.com/en/github/site-policy/github-terms-of-service#c-acceptable-use" title="GitHub Acceptable Use Policies">GitHub Acceptable Use Policies</a>.
</p>

<h3 class="headline-2">User Generated Content</h3>
<p>
You may create or upload User-Generated Content while using the webcompat.com service,
but by doing so, you agree to be bound by the
<a href="https://www.mozilla.org/en-US/about/legal/terms/mozilla/#446-content-submissions" title="Mozilla Websites & Communications Content Submission terms">
Mozilla Websites & Communications Content Submission terms
</a>
and <a href="https://help.github.com/en/github/site-policy/github-terms-of-service#d-user-generated-content" title="GitHub terms for User-Generated Content">
GitHub terms for User-Generated Content</a>.
</p>
<p>
We do not review before publication all User-Generated Content, except for anonymous bug reports, but we have the right (though not the obligation) to refuse
or remove any User-Generated Content that, in our sole discretion, violates any of these terms or policies.
</p>
<h3 class="headline-2">Community Participation Guidelines</h3>
<p>
In addition to our own <a href="https://github.com/webcompat/webcompat.com/blob/master/CODE_OF_CONDUCT.md" title="our code of conduct">Code of Conduct</a>,
it's useful to model interactions with other users of the webcompat.com service on the
<a href="https://www.mozilla.org/en-US/about/governance/policies/participation/" title="Mozilla Community Participation Guidelines">Mozilla Community Participation Guidelines</a>
as well as the <a href="https://help.github.com/en/github/site-policy/github-community-guidelines" title="GitHub Community Participation Guidelines">GitHub Community Participation Guidelines</a>.
Behavior that falls into the areas forbidden by either document is unwelcome and will result in further escalation.
</p>
</div>
</article>
</section>
{% endblock %}
9 changes: 9 additions & 0 deletions webcompat/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,15 @@ def privacy():
return render_template('privacy.html')


@app.route('/terms')
@cache_policy(private=True, uri_max_age=0, must_revalidate=True)
def terms():
"""Route to display terms of service page."""
if g.user:
get_user_info()
return render_template('terms.html')


@app.route('/contact')
@cache_policy(private=True, uri_max_age=0, must_revalidate=True)
def contact():
Expand Down

0 comments on commit 59ec79f

Please sign in to comment.