diff --git a/bedrock/base/templates/includes/site-footer.html b/bedrock/base/templates/includes/site-footer.html index 37276bf3c8..58d3792bb0 100644 --- a/bedrock/base/templates/includes/site-footer.html +++ b/bedrock/base/templates/includes/site-footer.html @@ -20,7 +20,7 @@ diff --git a/bedrock/firefox/templates/firefox/australis/firstrun-tour.html b/bedrock/firefox/templates/firefox/australis/firstrun-tour.html index 78ee8889bc..b0f87d9753 100644 --- a/bedrock/firefox/templates/firefox/australis/firstrun-tour.html +++ b/bedrock/firefox/templates/firefox/australis/firstrun-tour.html @@ -164,7 +164,7 @@
  • {{ _('Firefox Help') }}
  • diff --git a/bedrock/firefox/templates/firefox/firstrun.html b/bedrock/firefox/templates/firefox/firstrun.html index 86260f9907..ac432c7b30 100644 --- a/bedrock/firefox/templates/firefox/firstrun.html +++ b/bedrock/firefox/templates/firefox/firstrun.html @@ -59,7 +59,7 @@ diff --git a/bedrock/firefox/templates/firefox/includes/simple_footer.html b/bedrock/firefox/templates/firefox/includes/simple_footer.html index 492534063b..85c4b340c5 100644 --- a/bedrock/firefox/templates/firefox/includes/simple_footer.html +++ b/bedrock/firefox/templates/firefox/includes/simple_footer.html @@ -13,7 +13,7 @@ diff --git a/bedrock/firefox/templates/firefox/whatsnew.html b/bedrock/firefox/templates/firefox/whatsnew.html index b30a03d1cc..c85056e199 100644 --- a/bedrock/firefox/templates/firefox/whatsnew.html +++ b/bedrock/firefox/templates/firefox/whatsnew.html @@ -120,7 +120,7 @@

    diff --git a/bedrock/foundation/templates/foundation/trademarks/policy.html b/bedrock/foundation/templates/foundation/trademarks/policy.html index 74490ddd11..ea4996b40a 100644 --- a/bedrock/foundation/templates/foundation/trademarks/policy.html +++ b/bedrock/foundation/templates/foundation/trademarks/policy.html @@ -26,7 +26,7 @@

    {% trans %}Underlying our trademark policy is the general law of trademarks. Trademarks exist to help consumers identify, and organizations publicize, the source of products. Some organizations make better products than others; over time, consumers begin to associate those organizations (and their trademarks) with quality. When such organizations permit others to place their trademarks on goods of lesser quality, they find that consumer trust evaporates quickly. That's the precise situation that Mozilla seeks to avoid. People's trust in our name and products is crucial to us—especially, when it comes to intangible products like software, trust is all consumers have to decide on which product to choose. We also are the caretakers of the trust our community members have placed in us. We created this Trademark Policy to protect both the public's and our community's trust in the Mozilla Marks.{% endtrans %}

    -

    {% trans report=php_url('/legal/fraud-report/index.html') %} +

    {% trans report=url('legal.fraud-report') %} In addition, on an all too frequent basis, we receive reports about websites selling the Mozilla Firefox browser, using the Mozilla Marks to promote other products and services, or using modified versions of the Mozilla Marks. The problem with these activities is that they may be deceptive, harm users, cause consumer confusion, and jeopardize the identity and meaning of the Mozilla Marks. Such cases range from good intentions but improper use of the trademarks (e.g., overenthusiastic fans), to people intentionally trading on the brand for their own benefit and/or to distribute modified versions of the product, to a clear intent to deceive, manipulate and steal from users in a highly organized and syndicated fashion. When we receive reports of such activities, or identify problematic activities, we analyze the reports and treat each case individually based on the intent and severity of the matter.{% endtrans %}

    {% trans %}In creating our trademark policy, we seek to clarify the uses of the Mozilla Marks we consider legitimate and the uses we do not. Although Mozilla's Trademark Policy is composed of a number of specific rules, some contained in companion documents, most reflect the overarching requirement that your use of the Mozilla Marks be non-confusing and non-disparaging. By non-confusing, we mean that people should always know whom they are dealing with, and where the software they are downloading comes from. Websites and software that are not created or produced by Mozilla should not imply, either directly or by omission, that they are. By non-disparaging, we mean that, outside the bounds of fair use, you can't use the Mozilla Marks as vehicles for defaming us or sullying our reputation. These basic requirements can serve as a guide as you work your way through the policy.{% endtrans %}

    diff --git a/bedrock/legal/templates/legal/base-resp.html b/bedrock/legal/templates/legal/base-resp.html new file mode 100644 index 0000000000..775bf4f24e --- /dev/null +++ b/bedrock/legal/templates/legal/base-resp.html @@ -0,0 +1,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/. -#} + +{% extends "base-resp.html" %} + +{% block page_css %} + {{ css('legal') }} +{% endblock %} + +{% block body_class %}sand{% endblock %} + +{% block string_data %} + data-tabpanel-open-text="{{ _('Learn More') }}" + data-tabpanel-close-text="{{ _('Show Less') }}" +{% endblock %} + +{% block breadcrumbs %} + +{% endblock %} + +{% block content %} + {% block main_feature %}{% endblock %} + {% block menu_bar %}{% endblock %} +
    +
    + {% block article %}{% endblock %} +
    + {% block sidebar %} + + {% endblock %} +
    +{% endblock %} + +{% block email_form %}{% endblock %} + diff --git a/bedrock/legal/templates/legal/docs-base.html b/bedrock/legal/templates/legal/docs-base.html new file mode 100644 index 0000000000..539bc0d7e3 --- /dev/null +++ b/bedrock/legal/templates/legal/docs-base.html @@ -0,0 +1,19 @@ +{# 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/. -#} + +{% extends "legal/base-resp.html" %} + +{% block body_class %} + {{ super() }} legal-docs +{% endblock%} + +{% block article %} + +
    +
    + {{ doc|safe }} +
    +
    + +{% endblock %} diff --git a/bedrock/legal/templates/legal/index.html b/bedrock/legal/templates/legal/index.html new file mode 100644 index 0000000000..954affeedd --- /dev/null +++ b/bedrock/legal/templates/legal/index.html @@ -0,0 +1,64 @@ +{# 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/. -#} + +{% extends "legal/base-resp.html" %} + +{% block page_title %}{{ _('Legal') }}{% endblock %} + +{% block breadcrumbs %}{% endblock %} + +{% block body_id %}legal-landing{% endblock %} + +{% block main_feature %} +

    {{ self.page_title() }}

    +{% endblock %} + +{% block article %} + +
    +

    {{ _('Terms') }}

    + +
    + +
    +

    {{ _('Privacy & trademarks') }}

    + +
    + +
    +

    {{ _('Downloadable software notices') }}

    + +
    + +{% endblock %} + +{% block side_nav %}{% endblock %} + +{% block side_extra %} +
    +

    {{ _('Get involved') }}

    +

    {{ _('Special thanks to all of you who help report abuses of Mozilla marks, participate in governance forums, give feedback on our localizations & legal terms, and contribute your skills to the success of the Mozilla project.') }}

    + {{ _('Get involved!') }} +
    +
    +

    {{ _('Protect the Fox') }}

    +

    {{ _('Help us protect our users by reporting abuse of Mozilla Trademarks.') }}

    +
    +
    +

    {{ _('Takedown requests') }}

    +

    {{ _('Report abuse of your copyrights and trademarks.') }}

    +
    + +{% endblock %} diff --git a/bedrock/legal/templates/legal/report-abuse.html b/bedrock/legal/templates/legal/report-abuse.html new file mode 100644 index 0000000000..33a1ea9a1d --- /dev/null +++ b/bedrock/legal/templates/legal/report-abuse.html @@ -0,0 +1,7 @@ +{# 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/. -#} + +{% extends "legal/docs-base.html" %} + +{% block page_title %}{{ _('Report Copyright and Trademark Abuse') }}{% endblock %} diff --git a/bedrock/legal/templates/legal/terms/acceptable-use.html b/bedrock/legal/templates/legal/terms/acceptable-use.html new file mode 100644 index 0000000000..9e7c4a1b6b --- /dev/null +++ b/bedrock/legal/templates/legal/terms/acceptable-use.html @@ -0,0 +1,7 @@ +{# 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/. -#} + +{% extends "legal/docs-base.html" %} + +{% block page_title %}{{ _('Acceptable Use Policy') }}{% endblock %} diff --git a/bedrock/legal/templates/legal/terms/firefox.html b/bedrock/legal/templates/legal/terms/firefox.html new file mode 100644 index 0000000000..025576fe58 --- /dev/null +++ b/bedrock/legal/templates/legal/terms/firefox.html @@ -0,0 +1,7 @@ +{# 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/. -#} + +{% extends "legal/docs-base.html" %} + +{% block page_title %}{{ _('Firefox: About Your Rights') }}{% endblock %} diff --git a/bedrock/legal/templates/legal/terms/mozilla.html b/bedrock/legal/templates/legal/terms/mozilla.html new file mode 100644 index 0000000000..539acb2025 --- /dev/null +++ b/bedrock/legal/templates/legal/terms/mozilla.html @@ -0,0 +1,172 @@ +{# 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/. -#} + +{% extends "legal/base-resp.html" %} + +{% block page_title %}{{ _('Legal Disclaimers and Limitations') }}{% endblock %} +{% block body_id %}about-legal{% endblock %} + +{% block article %} + +
    +
    +

    {{ self.page_title() }}

    +
    +
    + +

    + {% trans link_privacy=url('privacy.notices.websites'), link_licensing=url('foundation.licensing') %} + Any use of the Mozilla Foundation or Mozilla Corporation’s (collectively “Mozilla”) websites is subject to the following legal disclaimers and limitations, as well as to Mozilla’s Privacy Policy and other proprietary rights and related policies. + {% endtrans %} +

    + +
      +
    1. +

      {{ _('Responsibility of Contributors. Those who post material to, provide links to material from, or otherwise make material available by means of Mozilla’s websites (“Contributors”) are entirely responsible for the content of, and any harm resulting from, that material. By acting as a Contributor, you represent and warrant that:') }}

      +
        +
      • {{ _('the downloading, copying and use of the materials you make available will not infringe the proprietary rights, including but not limited to intellectual property rights, of any third party;') }}
      • +
      • {{ _('you have fully complied with any third-party licenses relating to such materials, and have done all things necessary to successfully pass through to end users any required terms;') }}
      • +
      • {{ _('the materials you make available do not contain any viruses, worms, Trojan horses or other harmful or destructive content;') }}
      • +
      • {{ _('the materials you make available are not obscene or libelous, and do not violate the right of privacy or publicity of any third party; and') }}
      • +
      • {{ _('you have, in the case of computer code, accurately categorized and described the type and nature of the materials if and when requested by Mozilla to do so.') }}
      • +
      +

      {{ _('Without limiting any of those representations or warranties, Mozilla has the right (though not the obligation) to, in Mozilla’s sole discretion: (a) remove any content that, in Mozilla’s reasonable opinion, violates any Mozilla policy or is in any way harmful or objectionable; or (b) require changes in any license agreement relating to any materials made available by any Contributor.') }}

      +
    2. +
    3. +

      {{ _('Responsibility of Website Users. Mozilla has not reviewed, and cannot review, all of the material, including computer software, available on or by means of Mozilla’s websites, and cannot therefore be responsible for that material’s content, use or effects. By operating its websites, Mozilla does not represent or imply that it endorses the material there available, or that it believes such material to be accurate, useful or nonharmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses and other harmful or destructive content. Mozilla’s websites may contain content that is offensive, indecent or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes and other errors. Mozilla’s websites may also contain material that violates the privacy or publicity rights, or infringes the proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. Mozilla disclaims any responsibility for any harm resulting from the use by Mozilla’s visitors of Mozilla’s websites, or from any downloading by those visitors of content available on or by means of Mozilla’s websites.') }}

      +
    4. +
    5. +

      {{ _('Changes. Content contained on Mozilla’s websites, including these Legal Disclaimers and Limitations, may be changed at the sole discretion of Mozilla and without notice. You are bound by any such updates or changes, and so should periodically review these Legal Disclaimers and Limitations.') }}

      +
    6. +
    7. +

      {{ _('Content Posted on Other Websites. Mozilla has not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which Mozilla’s websites links, and that link to Mozilla’s websites. Mozilla does not have any control over those non-Mozilla websites and webpages, and is not responsible for their contents or their use. By linking to a non-Mozilla website or webpage, Mozilla does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses and other harmful or destructive content. Mozilla disclaims any responsibility for any harm resulting from your use of non-Mozilla websites and webpages.') }}

      +
    8. +
    9. +

      {{ _('LIMITATION OF WARRANTIES OF MOZILLA. EXCEPT AS OTHERWISE EXPRESSLY STATED, INCLUDING BUT NOT LIMITED TO IN A LICENSE OR OTHER AGREEMENT GOVERNING THE USE OF SPECIFIC CONTENT, ALL CONTENT LOCATED AT OR AVAILABLE FROM Mozilla’s WEBSITES IS PROVIDED "AS IS," AND MOZILLA, ITS CONTRACTORS AND ITS LICENSORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT OF PROPRIETARY RIGHTS. WITHOUT LIMITING THE FOREGOING, MOZILLA, ITS CONTRACTORS AND ITS LICENSORS MAKE NO REPRESENTATION OR WARRANTY THAT CONTENT LOCATED AT Mozilla’s WEBSITES IS FREE FROM ERROR OR SUITABLE FOR ANY PURPOSE; NOR THAT THE USE OF SUCH CONTENT WILL NOT INFRINGE ANY THIRD PARTY COPYRIGHTS, TRADEMARKS OR OTHER INTELLECTUAL PROPERTY RIGHTS. YOU UNDERSTAND AND AGREE THAT YOU DOWNLOAD OR OTHERWISE OBTAIN CONTENT THROUGH Mozilla’s WEBSITES AT YOUR OWN DISCRETION AND RISK, AND THAT MOZILLA, ITS CONTRACTORS AND ITS LICENSORS WILL HAVE NO LIABILITY OR RESPONSIBILITY FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR DATA THAT RESULTS FROM THE DOWNLOAD OR USE OF SUCH CONTENT. SOME JURISDICTIONS MAY NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SOME OF THE ABOVE LIMITATIONS MAY NOT APPLY TO YOU.') }}

      +
    10. +
    11. +

      {{ _('LIMITATION OF LIABILITY OF MOZILLA. EXCEPT AS OTHERWISE EXPRESSLY STATED, INCLUDING BUT NOT LIMITED TO IN A LICENSE OR OTHER AGREEMENT GOVERNING THE USE OF SPECIFIC CONTENT, IN NO EVENT WILL MOZILLA, ITS CONTRACTORS OR ITS LICENSORS BE LIABLE TO YOU OR ANY OTHER PARTY FOR ANY DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES, REGARDLESS OF THE BASIS OR NATURE OF THE CLAIM, RESULTING FROM ANY USE OF Mozilla’s WEBSITES, OR THE CONTENTS THEREOF OR OF ANY HYPERLINKED WEB SITE, INCLUDING WITHOUT LIMITATION ANY LOST PROFITS, BUSINESS INTERRUPTION, LOSS OF DATA OR OTHERWISE, EVEN IF MOZILLA, ITS CONTRACTORS OR ITS LICENSORS WERE EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS MAY NOT ALLOW THE EXCLUSION OR LIMITATION OF LIABILITY FOR CERTAIN INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO SOME OF THE ABOVE LIMITATIONS MAY NOT APPLY TO YOU.') }}

      +
    12. +
    13. +

      + {% trans link=url('foundation.licensing') %} + General Representation and Warranty. You represent and warrant that your use of Mozilla’s websites will be in accordance with Mozilla’s Privacy Policy, with these Legal Disclaimers and Limitations, with any applicable laws and regulations, and with any other applicable policy or terms and conditions, including without limitation our Licensing Policies. + {% endtrans %} +

      +
    14. +
    15. +

      {{ _('Indemnification. You agree to defend, indemnify and hold harmless Mozilla, its contractors and its licensors, and their respective directors, officers, employees and agents from and against any and all third party claims and expenses, including attorneys’ fees, arising out of your use of Mozilla’s websites, including but not limited to out of your violation of any representation or warranty contained in these Legal Disclaimers and Limitations.') }}

      +
    16. +
    + +
    +

    {{ _('Digital Millennium Copyright Act Notice') }}

    + +

    {{ _('If you are a copyright owner or an agent of a copyright owner and believe that content available by means of one of Mozilla’s websites infringes one or more of your copyrights, please immediately notify Mozilla’s Copyright Agent by means of emailed, mailed, or faxed notice ("DMCA Notice") and include the information described below. You can review 17 U.S.C. § 512(c)(3) of the Digital Millennium Copyright Act for authoritative detail, or consult your own attorney if you need assistance. If Mozilla takes action in response to a DMCA Notice, it will make a good faith attempt to contact the party that made such content available by means of the most recent email address, if any, provided by such party to Mozilla. You may be held liable for damages based on certain material misrepresentations contained in a DMCA Notice. Thus, if you are not sure content located on or linked to by the website infringes your copyright, you should consider first contacting an attorney.') }}

    + +

    {{ _('All DMCA Notices should include the following:') }}

    +
      +
    • {{ _('A signature, electronic or physical, of the owner, or a person authorized to act on behalf of the owner, of an exclusive copyright right that is being infringed;') }}
    • +
    • {{ _('An identification of the copyrighted work or works that you claim have been infringed;') }}
    • +
    • {{ _('A description of the nature and location of the material that you claim to infringe your copyright, in sufficient detail to permit Mozilla to find and positively identify that content, including the URL where it is located;') }}
    • +
    • {{ _('Your name, address, telephone number, and email address where we can contact you; and') }}
    • +
    • {{ _('A statement by you: (i) that you believe in good faith that the use of the material that you claim infringes your copyright is not authorized by law, or by the copyright owner or such owner’s agent; and, (ii) that all of the information contained in your DMCA Notice is accurate, and under penalty of perjury, that you are either the owner of, or a person authorized to act on behalf an owner of, the exclusive copyright right that is being infringed.') }}
    • +
    + +

    {{ _('Mozilla’s designated Copyright Agent to receive notifications of claimed infringement is as follows:') }}

    + +
    +

    + {% trans %} + Denelle Dixon-Thayer
    + Mozilla Corporation
    + 331 E. Evelyn Avenue
    + Mountain View, CA 94041
    + USA
    + Email: dmcanotice at mozilla dot com
    + Phone Number: 650-903-0800
    + Fax: 650-903-0875 + {% endtrans %} +

    +
    + +

    {{ _('If you fail to comply with all of the requirements of a DMCA notice, Mozilla may not act upon your notice.') }}

    + +

    {{ _('Mozilla will terminate a user’s account if, under appropriate circumstances, they are determined to be a repeat infringer.') }}

    + +

    {{ _('The contact information provided above also applies to notices that are based on non-U.S. copyrights or trademarks.') }}

    + +

    + {% trans link='https://support.mozilla.org' %} + Only DMCA Notices, Trademark Notices (which are defined below), and international copyright or trademark notices should go to the copyright agent. Any other feedback, comments, requests for technical support, and other communications should be directed to personas at mozilla dot com (if related to Personas) or {{ link }} (for support). + {% endtrans %} +

    + +

    + {% trans link='http://www.chillingeffects.org/'|safe %} + Please be advised that any DMCA Notices sent to Mozilla may be sent to third parties (including the accused) and posted on the Internet (including at {{ link }}). + {% endtrans %} +

    + +
    + +
    + +

    {{ _('Trademark Notices') }}

    + +

    {{ _('If you are a trademark owner or an agent of a trademark owner and believe that content available by means of one of Mozilla’s websites infringes one or more of your trademarks, please immediately notify Mozilla’s Copyright Agent by means of emailed, mailed, or faxed notice ("Trademark Notice") and include the information described above for DMCA notices. Mozilla handles notices it receives of trademark violations via a process very similar to the DMCA Notice process that is described above for copyrights. In addition to the DMCA Notice requirements, Mozilla requires that the entire Trademark Notice be made by the trademark owner (or her agent) under penalty of perjury.') }}

    + +
    + +
    + +

    {{ _('Site Licensing Policy') }}

    + +

    + {% trans link_summary='http://creativecommons.org/licenses/by-sa/3.0/', link_details='http://creativecommons.org/licenses/by-sa/3.0/legalcode' %} + 'The Mozilla web sites and wikis have been prepared with the contributions of many authors, both within and outside Mozilla. Unless otherwise indicated, the content is available under the terms of the Creative Commons: Attribution Share Alike License v3.0 or any later version. A summary of the terms of this license is available, as well as its detailed terms. + {% endtrans %} +

    + +

    + {% trans link='http://www.opensource.org/licenses/mit-license.php' %} + If you wish to contribute content to this web site, you will be asked to make your content available under the Creative Commons: Attribution Share Alike License, and to make your code samples available under the MIT License. Adding to the Mozilla web sites or Mozilla wikis without specifying the terms under which you have made your addition means you agree that your contributions will be available under these licenses. The copyright for contributed materials remains with the author unless the author assigns it to someone else. + {% endtrans %} +

    + +

    {{ _('While our intention is to make most of the content available under the Creative Commons license above, the following material and content is not licensed under the Creative Commons license:') }}

    + +
      +
    • {{ _('Portions of the web site are © 1998–2009 by individual mozilla.org contributors.') }}
    • +
    • {{ _('The trademarks and logos of the Mozilla Foundation and any third party and the look and feel of this web site (to the extent the look and feel elements are works of authorship, such as the graphic design, artwork, and artistic illustrations) are not included in the work that is licensed under the Creative Commons terms.') }}
    • +
    • {{ _('Software provided by Mozilla, contributors, or third-parties.') }}
    • +
    • {{ _('Code samples are available under the terms of the MIT License.') }}
    • +
    • {{ _('Any contribution or content that expressly indicates that the author intends for another license to apply, for example, add-ons, documents, code contributions, or graphic designs.') }}
    • +
    + +

    + {% trans link=url('foundation.licensing') %} + For more information about these and other licensing policies, please see our Licensing Policies page. If you have any other questions about complying with our licensing terms for this collection, you should email: + {% endtrans %} +

    + +
      +
    • + {% trans link='licensing@mozilla.org'|safe %} + {{ link }} for copyright questions; + {% endtrans %} +
    • +
    • + {% trans link='trademarks@mozilla.org'|safe %} + {{ link }} for trademark or logo questions. + {% endtrans %} +
    • +
    + +
    + +
    +
    + +{% endblock %} diff --git a/bedrock/legal/templates/legal/terms/services.html b/bedrock/legal/templates/legal/terms/services.html new file mode 100644 index 0000000000..cd8870d1de --- /dev/null +++ b/bedrock/legal/templates/legal/terms/services.html @@ -0,0 +1,20 @@ +{# 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/. -#} + +{% extends "legal/docs-base.html" %} + +{% block page_title %}{{ _('Firefox Cloud Services: Terms of Service') }}{% endblock %} + +{% block article %} + +
    +
    +

    {{ self.page_title() }}

    +
    +
    + {{ doc|safe }} +
    +
    + +{% endblock %} diff --git a/bedrock/legal/templates/legal/terms/thunderbird.html b/bedrock/legal/templates/legal/terms/thunderbird.html new file mode 100644 index 0000000000..dcbeeedd19 --- /dev/null +++ b/bedrock/legal/templates/legal/terms/thunderbird.html @@ -0,0 +1,7 @@ +{# 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/. -#} + +{% extends "legal/docs-base.html" %} + +{% block page_title %}{{ _('Thunderbird: About Your Rights') }}{% endblock %} diff --git a/bedrock/legal/tests.py b/bedrock/legal/tests.py index f310bbb963..b21249d90a 100644 --- a/bedrock/legal/tests.py +++ b/bedrock/legal/tests.py @@ -48,7 +48,7 @@ class TestFraudReport(TestCase): response = legal_views.fraud_report(request) eq_(response.status_code, 302) - eq_(response['Location'], '/en-US/legal/fraud-report/?submitted=True') + eq_(response['Location'], '/en-US/about/legal/fraud-report/?submitted=True') def test_view_post_missing_data(self): """ diff --git a/bedrock/legal/urls.py b/bedrock/legal/urls.py index 9df742290b..923c9f7332 100644 --- a/bedrock/legal/urls.py +++ b/bedrock/legal/urls.py @@ -7,10 +7,33 @@ from django.conf.urls import patterns, url from bedrock.mozorg.util import page from bedrock.legal import views +from bedrock.legal_docs.views import LegalDocView + urlpatterns = patterns('', + page('', 'legal/index.html'), + page('eula', 'legal/eula.html'), page('eula/firefox-2', 'legal/eula/firefox-2-eula.html'), page('eula/firefox-3', 'legal/eula/firefox-3-eula.html'), + page('firefox', 'legal/firefox.html'), + + page('terms/mozilla', 'legal/terms/mozilla.html'), + + url(r'^terms/firefox/$', LegalDocView.as_view(template_name='legal/terms/firefox.html', legal_doc_name='firefox_about_rights'), + name='legal.terms.firefox'), + + url(r'^terms/thunderbird/$', LegalDocView.as_view(template_name='legal/terms/thunderbird.html', legal_doc_name='thunderbird_about_rights'), + name='legal.terms.thunderbird'), + + url(r'^terms/services/$', LegalDocView.as_view(template_name='legal/terms/services.html', legal_doc_name='firefox_cloud_services_ToS'), + name='legal.terms.services'), + + url(r'^acceptable-use/$', LegalDocView.as_view(template_name='legal/terms/acceptable-use.html', legal_doc_name='acceptable_use_policy'), + name='legal.terms.acceptable-use'), + + url(r'^report-abuse/$', LegalDocView.as_view(template_name='legal/report-abuse.html', legal_doc_name='report_abuse'), + name='legal.report-abuse'), + url('^fraud-report/$', views.fraud_report, name='legal.fraud-report'), ) diff --git a/bedrock/mozorg/templates/mozorg/about/legal.html b/bedrock/mozorg/templates/mozorg/about/legal.html deleted file mode 100644 index 8bd5be7c81..0000000000 --- a/bedrock/mozorg/templates/mozorg/about/legal.html +++ /dev/null @@ -1,164 +0,0 @@ -{# 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/. -#} - -{% extends "mozorg/about-base.html" %} - -{% block page_title %}{{ _('Legal Disclaimers and Limitations') }}{% endblock %} -{% block body_id %}about-legal{% endblock %} - -{% block article %} -

    {{ self.page_title() }}

    - -

    -{% trans link_privacy=url('privacy.notices.websites'), link_licensing=url('foundation.licensing') %} -Any use of the Mozilla Foundation or Mozilla Corporation’s (collectively “Mozilla”) websites is subject to the following legal disclaimers and limitations, as well as to Mozilla’s Privacy Policy and other proprietary rights and related policies. -{% endtrans %} -

    - -
      -
    1. -

      {{ _('Responsibility of Contributors. Those who post material to, provide links to material from, or otherwise make material available by means of Mozilla’s websites (“Contributors”) are entirely responsible for the content of, and any harm resulting from, that material. By acting as a Contributor, you represent and warrant that:') }}

      -
        -
      • {{ _('the downloading, copying and use of the materials you make available will not infringe the proprietary rights, including but not limited to intellectual property rights, of any third party;') }}
      • -
      • {{ _('you have fully complied with any third-party licenses relating to such materials, and have done all things necessary to successfully pass through to end users any required terms;') }}
      • -
      • {{ _('the materials you make available do not contain any viruses, worms, Trojan horses or other harmful or destructive content;') }}
      • -
      • {{ _('the materials you make available are not obscene or libelous, and do not violate the right of privacy or publicity of any third party; and') }}
      • -
      • {{ _('you have, in the case of computer code, accurately categorized and described the type and nature of the materials if and when requested by Mozilla to do so.') }}
      • -
      -

      {{ _('Without limiting any of those representations or warranties, Mozilla has the right (though not the obligation) to, in Mozilla’s sole discretion: (a) remove any content that, in Mozilla’s reasonable opinion, violates any Mozilla policy or is in any way harmful or objectionable; or (b) require changes in any license agreement relating to any materials made available by any Contributor.') }}

      -
    2. -
    3. -

      {{ _('Responsibility of Website Users. Mozilla has not reviewed, and cannot review, all of the material, including computer software, available on or by means of Mozilla’s websites, and cannot therefore be responsible for that material’s content, use or effects. By operating its websites, Mozilla does not represent or imply that it endorses the material there available, or that it believes such material to be accurate, useful or nonharmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses and other harmful or destructive content. Mozilla’s websites may contain content that is offensive, indecent or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes and other errors. Mozilla’s websites may also contain material that violates the privacy or publicity rights, or infringes the proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. Mozilla disclaims any responsibility for any harm resulting from the use by Mozilla’s visitors of Mozilla’s websites, or from any downloading by those visitors of content available on or by means of Mozilla’s websites.') }}

      -
    4. -
    5. -

      {{ _('Changes. Content contained on Mozilla’s websites, including these Legal Disclaimers and Limitations, may be changed at the sole discretion of Mozilla and without notice. You are bound by any such updates or changes, and so should periodically review these Legal Disclaimers and Limitations.') }}

      -
    6. -
    7. -

      {{ _('Content Posted on Other Websites. Mozilla has not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which Mozilla’s websites links, and that link to Mozilla’s websites. Mozilla does not have any control over those non-Mozilla websites and webpages, and is not responsible for their contents or their use. By linking to a non-Mozilla website or webpage, Mozilla does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses and other harmful or destructive content. Mozilla disclaims any responsibility for any harm resulting from your use of non-Mozilla websites and webpages.') }}

      -
    8. -
    9. -

      {{ _('LIMITATION OF WARRANTIES OF MOZILLA. EXCEPT AS OTHERWISE EXPRESSLY STATED, INCLUDING BUT NOT LIMITED TO IN A LICENSE OR OTHER AGREEMENT GOVERNING THE USE OF SPECIFIC CONTENT, ALL CONTENT LOCATED AT OR AVAILABLE FROM Mozilla’s WEBSITES IS PROVIDED "AS IS," AND MOZILLA, ITS CONTRACTORS AND ITS LICENSORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT OF PROPRIETARY RIGHTS. WITHOUT LIMITING THE FOREGOING, MOZILLA, ITS CONTRACTORS AND ITS LICENSORS MAKE NO REPRESENTATION OR WARRANTY THAT CONTENT LOCATED AT Mozilla’s WEBSITES IS FREE FROM ERROR OR SUITABLE FOR ANY PURPOSE; NOR THAT THE USE OF SUCH CONTENT WILL NOT INFRINGE ANY THIRD PARTY COPYRIGHTS, TRADEMARKS OR OTHER INTELLECTUAL PROPERTY RIGHTS. YOU UNDERSTAND AND AGREE THAT YOU DOWNLOAD OR OTHERWISE OBTAIN CONTENT THROUGH Mozilla’s WEBSITES AT YOUR OWN DISCRETION AND RISK, AND THAT MOZILLA, ITS CONTRACTORS AND ITS LICENSORS WILL HAVE NO LIABILITY OR RESPONSIBILITY FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR DATA THAT RESULTS FROM THE DOWNLOAD OR USE OF SUCH CONTENT. SOME JURISDICTIONS MAY NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SOME OF THE ABOVE LIMITATIONS MAY NOT APPLY TO YOU.') }}

      -
    10. -
    11. -

      {{ _('LIMITATION OF LIABILITY OF MOZILLA. EXCEPT AS OTHERWISE EXPRESSLY STATED, INCLUDING BUT NOT LIMITED TO IN A LICENSE OR OTHER AGREEMENT GOVERNING THE USE OF SPECIFIC CONTENT, IN NO EVENT WILL MOZILLA, ITS CONTRACTORS OR ITS LICENSORS BE LIABLE TO YOU OR ANY OTHER PARTY FOR ANY DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES, REGARDLESS OF THE BASIS OR NATURE OF THE CLAIM, RESULTING FROM ANY USE OF Mozilla’s WEBSITES, OR THE CONTENTS THEREOF OR OF ANY HYPERLINKED WEB SITE, INCLUDING WITHOUT LIMITATION ANY LOST PROFITS, BUSINESS INTERRUPTION, LOSS OF DATA OR OTHERWISE, EVEN IF MOZILLA, ITS CONTRACTORS OR ITS LICENSORS WERE EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS MAY NOT ALLOW THE EXCLUSION OR LIMITATION OF LIABILITY FOR CERTAIN INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO SOME OF THE ABOVE LIMITATIONS MAY NOT APPLY TO YOU.') }}

      -
    12. -
    13. -

      - {% trans link=url('foundation.licensing') %} - General Representation and Warranty. You represent and warrant that your use of Mozilla’s websites will be in accordance with Mozilla’s Privacy Policy, with these Legal Disclaimers and Limitations, with any applicable laws and regulations, and with any other applicable policy or terms and conditions, including without limitation our Licensing Policies. - {% endtrans %} -

      -
    14. -
    15. -

      {{ _('Indemnification. You agree to defend, indemnify and hold harmless Mozilla, its contractors and its licensors, and their respective directors, officers, employees and agents from and against any and all third party claims and expenses, including attorneys’ fees, arising out of your use of Mozilla’s websites, including but not limited to out of your violation of any representation or warranty contained in these Legal Disclaimers and Limitations.') }}

      -
    16. -
    - -
    -

    {{ _('Digital Millennium Copyright Act Notice') }}

    - -

    {{ _('If you are a copyright owner or an agent of a copyright owner and believe that content available by means of one of Mozilla’s websites infringes one or more of your copyrights, please immediately notify Mozilla’s Copyright Agent by means of emailed, mailed, or faxed notice ("DMCA Notice") and include the information described below. You can review 17 U.S.C. § 512(c)(3) of the Digital Millennium Copyright Act for authoritative detail, or consult your own attorney if you need assistance. If Mozilla takes action in response to a DMCA Notice, it will make a good faith attempt to contact the party that made such content available by means of the most recent email address, if any, provided by such party to Mozilla. You may be held liable for damages based on certain material misrepresentations contained in a DMCA Notice. Thus, if you are not sure content located on or linked to by the website infringes your copyright, you should consider first contacting an attorney.') }}

    - -

    {{ _('All DMCA Notices should include the following:') }}

    - - -

    {{ _('Mozilla’s designated Copyright Agent to receive notifications of claimed infringement is as follows:') }}

    - -
    -

    - {% trans %} - Denelle Dixon-Thayer
    - Mozilla Corporation
    - 331 E. Evelyn Avenue
    - Mountain View, CA 94041
    - USA
    - Email: dmcanotice at mozilla dot com
    - Phone Number: 650-903-0800
    - Fax: 650-903-0875 - {% endtrans %} -

    -
    - -

    {{ _('If you fail to comply with all of the requirements of a DMCA notice, Mozilla may not act upon your notice.') }}

    - -

    {{ _('Mozilla will terminate a user’s account if, under appropriate circumstances, they are determined to be a repeat infringer.') }}

    - -

    {{ _('The contact information provided above also applies to notices that are based on non-U.S. copyrights or trademarks.') }}

    - -

    - {% trans link='https://support.mozilla.org' %} - Only DMCA Notices, Trademark Notices (which are defined below), and international copyright or trademark notices should go to the copyright agent. Any other feedback, comments, requests for technical support, and other communications should be directed to personas at mozilla dot com (if related to Personas) or {{ link }} (for support). - {% endtrans %} -

    - -

    - {% trans link='http://www.chillingeffects.org/'|safe %} - Please be advised that any DMCA Notices sent to Mozilla may be sent to third parties (including the accused) and posted on the Internet (including at {{ link }}). - {% endtrans %} -

    - -
    - -
    - -

    {{ _('Trademark Notices') }}

    - -

    {{ _('If you are a trademark owner or an agent of a trademark owner and believe that content available by means of one of Mozilla’s websites infringes one or more of your trademarks, please immediately notify Mozilla’s Copyright Agent by means of emailed, mailed, or faxed notice ("Trademark Notice") and include the information described above for DMCA notices. Mozilla handles notices it receives of trademark violations via a process very similar to the DMCA Notice process that is described above for copyrights. In addition to the DMCA Notice requirements, Mozilla requires that the entire Trademark Notice be made by the trademark owner (or her agent) under penalty of perjury.') }}

    - -
    - -
    - -

    {{ _('Site Licensing Policy') }}

    - -

    - {% trans link_summary='http://creativecommons.org/licenses/by-sa/3.0/', link_details='http://creativecommons.org/licenses/by-sa/3.0/legalcode' %} - 'The Mozilla web sites and wikis have been prepared with the contributions of many authors, both within and outside Mozilla. Unless otherwise indicated, the content is available under the terms of the Creative Commons: Attribution Share Alike License v3.0 or any later version. A summary of the terms of this license is available, as well as its detailed terms. - {% endtrans %} -

    - -

    - {% trans link='http://www.opensource.org/licenses/mit-license.php' %} - If you wish to contribute content to this web site, you will be asked to make your content available under the Creative Commons: Attribution Share Alike License, and to make your code samples available under the MIT License. Adding to the Mozilla web sites or Mozilla wikis without specifying the terms under which you have made your addition means you agree that your contributions will be available under these licenses. The copyright for contributed materials remains with the author unless the author assigns it to someone else. - {% endtrans %} -

    - -

    {{ _('While our intention is to make most of the content available under the Creative Commons license above, the following material and content is not licensed under the Creative Commons license:') }}

    - - - -

    - {% trans link=url('foundation.licensing') %} - For more information about these and other licensing policies, please see our Licensing Policies page. If you have any other questions about complying with our licensing terms for this collection, you should email: - {% endtrans %} -

    - - - -
    - -{% endblock %} diff --git a/bedrock/mozorg/urls.py b/bedrock/mozorg/urls.py index 4ed7f3187b..e0664f12e2 100644 --- a/bedrock/mozorg/urls.py +++ b/bedrock/mozorg/urls.py @@ -47,7 +47,6 @@ urlpatterns = patterns('', page('about/governance/policies/security/plugin-whitelist-policy', 'mozorg/about/governance/policies/security/plugin-whitelist-policy.html'), page('about/governance/organizations', 'mozorg/about/governance/organizations.html'), page('about/governance/policies/participation', 'mozorg/about/governance/policies/participation.html'), - page('about/legal', 'mozorg/about/legal.html'), page('contact/spaces', 'mozorg/contact/spaces/spaces-landing.html'), page('contact/spaces/mountain-view', 'mozorg/contact/spaces/mountain-view.html'), diff --git a/bedrock/persona/templates/persona/about.html b/bedrock/persona/templates/persona/about.html index 05990bb9a8..1cc2913d31 100644 --- a/bedrock/persona/templates/persona/about.html +++ b/bedrock/persona/templates/persona/about.html @@ -13,13 +13,13 @@ {% block body_class %}sand{% endblock %} {% block site_header_logo %} -

    {{ _('Mozilla Persona') }}

    +

    {{ _('Mozilla Persona') }}

    {% endblock %} {% block site_header_nav %}