tor-commits September 2019

tor-commits@lists.torproject.org

21 participants
2044 discussions

[tpo/master] Add Trademark tab to About
by hiro＠torproject.org 05 Sep '19

05 Sep '19

commit 375c924c624dbfa2c7354492c2289809ef08b7c9 Author: RotationMatrix <52428419+RotationMatrix(a)users.noreply.github.com> Date: Wed Sep 4 12:06:30 2019 -0400 Add Trademark tab to About --- databags/about+en.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/databags/about+en.ini b/databags/about+en.ini index 43f44fd..8322613 100644 --- a/databags/about+en.ini +++ b/databags/about+en.ini @@ -17,3 +17,7 @@ label = Reports [jobs] path = about/jobs label = Jobs + +[trademark] +path = about/trademark +label = Trademark

1 0

[tpo/master] Fix question permalinks
by hiro＠torproject.org 05 Sep '19

05 Sep '19

commit 5c20a565298dc373408bc055d370258ed8e748f6 Author: RotationMatrix <52428419+RotationMatrix(a)users.noreply.github.com> Date: Wed Sep 4 13:39:39 2019 -0400 Fix question permalinks --- templates/macros/question.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/macros/question.html b/templates/macros/question.html index 8a2501f..1b5fa59 100644 --- a/templates/macros/question.html +++ b/templates/macros/question.html @@ -13,7 +13,7 @@ <li class="list-group-item"> <a href="https://github.com/torproject/tpo/edit/master/content{{ item.path }}/contents.lr">{{ _("Edit this page") }}</a> - <a href="https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugF…">{{ _("Suggest Feedback") }}</a> - - <a href="{{ item|url }}">{{ _("Permalink") }}</a> + <a href="#{{ item._id }}" data-target="#{{ item._id }}">{{ _("Permalink") }}</a> </li> </ul> </div>

1 0

[tpo/master] Add styling to questions
by hiro＠torproject.org 05 Sep '19

05 Sep '19

commit 5cd97c37da2f87e9e8192b17b54354bfef80d14f Author: RotationMatrix <52428419+RotationMatrix(a)users.noreply.github.com> Date: Wed Sep 4 13:24:22 2019 -0400 Add styling to questions Reuses topic and question models from web/support. --- content/about/trademark/contents.lr | 43 ---------------------- content/about/trademark/trademark-faq/contents.lr | 5 +++ .../trademark-faq/trademark-faq-1/contents.lr | 8 ++++ .../trademark-faq/trademark-faq-2/contents.lr | 8 ++++ .../trademark-faq/trademark-faq-3/contents.lr | 8 ++++ .../trademark-faq/trademark-faq-4/contents.lr | 12 ++++++ .../trademark-faq/trademark-faq-5/contents.lr | 13 +++++++ .../trademark-faq/trademark-faq-6/contents.lr | 8 ++++ .../trademark-faq/trademark-faq-7/contents.lr | 11 ++++++ models/question.ini | 19 ++++++++++ models/topic.ini | 23 ++++++++++++ templates/macros/question.html | 22 +++++++++++ templates/macros/topic.html | 18 +++++++++ templates/question.html | 6 +++ templates/topic.html | 6 +++ templates/trademark.html | 7 +++- 16 files changed, 173 insertions(+), 44 deletions(-) diff --git a/content/about/trademark/contents.lr b/content/about/trademark/contents.lr index 1f2d76f..bc35d46 100644 --- a/content/about/trademark/contents.lr +++ b/content/about/trademark/contents.lr @@ -6,8 +6,6 @@ section_id: about --- html: trademark.html --- -color: primary ---- title: Trademark --- body: @@ -16,44 +14,3 @@ body: Content on this site is Copyright The Tor Project, Inc.. Reproduction of content is permitted under a [Creative Commons Attribution 3.0 United States License](https://creativecommons.org/licenses/by/3.0/us/). All use under such license must be accompanied by a clear and prominent attribution that identifies The Tor Project, Inc. as the owner and originator of such content. The Tor Project Inc. reserves the right to change licenses and permissions at any time in its sole discretion. The Tor® software is licensed in various ways. Learn more about the [various licenses](https://2019.www.torproject.org/docs/faq.html.en#DistributingTor). - -# Tor Trademark Frequently Asked Questions -## How can I use the name "Tor"? - -The Tor Project encourages developers to use the name Tor in ways that do not confuse the public about the source of anonymity software and services. If you are building open-source non-commercial software or services that incorporate or work with The Tor Project's code, you may use the name “Tor” in an accurate description of your work. We ask you to include a link to the official Tor website https://www.torproject.org/ so users can verify the original source of Tor for themselves, and a note indicating that your project is not sponsored by The Tor Project. For example, “This product is produced independently from the Tor® anonymity software and carries no guarantee from The Tor Project about quality, suitability or anything else.” - -## Can I use the Tor onion logo? - -If you're making non-commercial use of Tor software, you may also use the Tor onion logo (as an illustration, not as a brand for your products). Please don't modify the design or colors of the logo. You can use items that look like the Tor onion logo to illustrate a point (e.g. an exploded onion with layers, for instance), so long as they're not used as logos in ways that would confuse people. - -## Can I use the word "Tor" as part of the name of my product or my domain name? - -Please don't use Tor in your product name or domain name. Instead, find a name that will accurately identify your products or services. Remember that our goal is to make sure that people aren't confused about whether your product or project is made or endorsed by The Tor Project. Creating a new brand that incorporates the Tor brand is likely to lead to confusion, and commercial confusion is a sign of trademark infringement. - -## What about cute Tor-derived names in research paper titles? - -Tor enjoys a vibrant [research community](https://research.torproject.org/) that examines anonymity attacks and defenses, design improvements, impact on society, and so on. We think it's great that professors and other researchers continue to contribute to our community, and we've even gotten funding from the National Science Foundation to help keep the Tor design and code researcher-friendly. The [anonymity bibliography](http://freehaven.net/anonbib/) lists many research papers that use Tor-derived names in their titles: Torsk, DefenestraTor, Tortoise, LASTor, Torchestra, StegoTorus, and more. - -Since the authors of these research papers aren't trying to make a profit from them, and (because they're just papers, not products) the papers aren't confusing Tor users into running potentially unsafe software, we believe that the use of the Tor mark in these research paper titles is acceptable non-trademark or fair use. - -That said, if the research paper comes with software, and that software could potentially confuse people (users or other researchers) about whether it's written or endorsed by The Tor Project, then we're back to the [above scenario](https://2019.www.torproject.org/docs/trademark-faq.html.en#combin…. - -## Does this mean you're enforcing trademark rights? - -The Tor Project is a non-profit corporation organized to research and develop the Tor anonymity software and network. We don't want to be trademark bullies, but we will use trademark to protect the public's ability to recognize Tor Project software. Trademark law helps us to assure that the name is used only in connection with genuine Tor anonymity software and for accurate description of software and services. After all, to protect their anonymity securely, computer users must be able to identify the software they are using, so they can account properly for its strengths and weaknesses. Tor has become well-known as a software package and associated network of onion-routing anonymizing proxies, with online documentation, instructions for strengthening anonymity protection, and warnings that even at this stage it remains experimental software. We work with developers to improve the software and network and actively encourage researchers to document attacks to help us strengthen its a nonymity protection further. We distribute the software itself freely, but require correct attribution. - -We hold two trademarks in the United States: - -- Tor Onion Logo, U.S. Trademark Registration No. 3,465,433 -- Tor, U.S. Registration No. 3,465,432. - -## What if I produce non-open source, commercial products based on Tor? - -Contact us, and let's talk. - -## Are there official licensees of the Tor trademarks? - -Yes. A few open source, non-commercial projects are Tor trademark licensees: - -- [The Amnesic Incognito Live System](https://tails.boum.org/) -- Vidalia diff --git a/content/about/trademark/trademark-faq/contents.lr b/content/about/trademark/trademark-faq/contents.lr new file mode 100644 index 0000000..35a1f52 --- /dev/null +++ b/content/about/trademark/trademark-faq/contents.lr @@ -0,0 +1,5 @@ +_model: topic +--- +title: Tor Trademark Frequently Asked Questions +--- +seo_slug: Tor Trademark FAQs diff --git a/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr new file mode 100644 index 0000000..9c53669 --- /dev/null +++ b/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr @@ -0,0 +1,8 @@ +_model: question +--- +title: How can I use the name "Tor"? +--- +seo_slug: how-to-use-tor-trademark +--- +description: +The Tor Project encourages developers to use the name Tor in ways that do not confuse the public about the source of anonymity software and services. If you are building open-source non-commercial software or services that incorporate or work with The Tor Project's code, you may use the name “Tor” in an accurate description of your work. We ask you to include a link to the official Tor website https://www.torproject.org/ so users can verify the original source of Tor for themselves, and a note indicating that your project is not sponsored by The Tor Project. For example, “This product is produced independently from the Tor® anonymity software and carries no guarantee from The Tor Project about quality, suitability or anything else.” diff --git a/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr new file mode 100644 index 0000000..a8ac499 --- /dev/null +++ b/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr @@ -0,0 +1,8 @@ +_model: question +--- +title: Can I use the Tor onion logo? +--- +seo_slug: can-I-use-tor-onion-logo +--- +description: +If you're making non-commercial use of Tor software, you may also use the Tor onion logo (as an illustration, not as a brand for your products). Please don't modify the design or colors of the logo. You can use items that look like the Tor onion logo to illustrate a point (e.g. an exploded onion with layers, for instance), so long as they're not used as logos in ways that would confuse people. diff --git a/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr new file mode 100644 index 0000000..a7fe8bb --- /dev/null +++ b/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr @@ -0,0 +1,8 @@ +_model: question +--- +title: Can I use the word "Tor" as part of the name of my product or my domain name? +--- +seo_slug: tor-product-domain-name +--- +description: +Please don't use Tor in your product name or domain name. Instead, find a name that will accurately identify your products or services. Remember that our goal is to make sure that people aren't confused about whether your product or project is made or endorsed by The Tor Project. Creating a new brand that incorporates the Tor brand is likely to lead to confusion, and commercial confusion is a sign of trademark infringement. diff --git a/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr new file mode 100644 index 0000000..b366a4d --- /dev/null +++ b/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr @@ -0,0 +1,12 @@ +_model: question +--- +title: What about cute Tor-derived names in research paper titles? +--- +seo_slug: tor-derived-names +--- +description: +Tor enjoys a vibrant [research community](https://research.torproject.org/) that examines anonymity attacks and defenses, design improvements, impact on society, and so on. We think it's great that professors and other researchers continue to contribute to our community, and we've even gotten funding from the National Science Foundation to help keep the Tor design and code researcher-friendly. The [anonymity bibliography](http://freehaven.net/anonbib/) lists many research papers that use Tor-derived names in their titles: Torsk, DefenestraTor, Tortoise, LASTor, Torchestra, StegoTorus, and more. + +Since the authors of these research papers aren't trying to make a profit from them, and (because they're just papers, not products) the papers aren't confusing Tor users into running potentially unsafe software, we believe that the use of the Tor mark in these research paper titles is acceptable non-trademark or fair use. + +That said, if the research paper comes with software, and that software could potentially confuse people (users or other researchers) about whether it's written or endorsed by The Tor Project, then we're back to the [above scenario](https://2019.www.torproject.org/docs/trademark-faq.html.en#combin…. diff --git a/content/about/trademark/trademark-faq/trademark-faq-5/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-5/contents.lr new file mode 100644 index 0000000..8f74633 --- /dev/null +++ b/content/about/trademark/trademark-faq/trademark-faq-5/contents.lr @@ -0,0 +1,13 @@ +_model: question +--- +title: Does this mean you're enforcing trademark rights? +--- +seo_slug: enforcing-trademark-rights +--- +description: +The Tor Project is a non-profit corporation organized to research and develop the Tor anonymity software and network. We don't want to be trademark bullies, but we will use trademark to protect the public's ability to recognize Tor Project software. Trademark law helps us to assure that the name is used only in connection with genuine Tor anonymity software and for accurate description of software and services. After all, to protect their anonymity securely, computer users must be able to identify the software they are using, so they can account properly for its strengths and weaknesses. Tor has become well-known as a software package and associated network of onion-routing anonymizing proxies, with online documentation, instructions for strengthening anonymity protection, and warnings that even at this stage it remains experimental software. We work with developers to improve the software and network and actively encourage researchers to document attacks to help us strengthen its a nonymity protection further. We distribute the software itself freely, but require correct attribution. + +We hold two trademarks in the United States: + +- Tor Onion Logo, U.S. Trademark Registration No. 3,465,433 +- Tor, U.S. Registration No. 3,465,432. diff --git a/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr new file mode 100644 index 0000000..2335d60 --- /dev/null +++ b/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr @@ -0,0 +1,8 @@ +_model: question +--- +title: What if I produce non-open source, commercial products based on Tor? +--- +seo_slug: commercial-tor-derivatives +--- +description: +Contact us, and let's talk. diff --git a/content/about/trademark/trademark-faq/trademark-faq-7/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-7/contents.lr new file mode 100644 index 0000000..7f5b9c5 --- /dev/null +++ b/content/about/trademark/trademark-faq/trademark-faq-7/contents.lr @@ -0,0 +1,11 @@ +_model: question +--- +title: Are there official licensees of the Tor trademarks? +--- +seo_slug: tor-licensees +--- +description: +Yes. A few open source, non-commercial projects are Tor trademark licensees: + +- [The Amnesic Incognito Live System](https://tails.boum.org/) +- Vidalia diff --git a/models/question.ini b/models/question.ini new file mode 100644 index 0000000..5e01769 --- /dev/null +++ b/models/question.ini @@ -0,0 +1,19 @@ +[model] +name = Question +label = {{ this.title }} +translate = True + +[fields.title] +label = Title +type = string +translate = True + +[fields.description] +label = Description +type = markdown +translate = True + +[fields.seo_slug] +label = Seo Slug +type = string +translate = False diff --git a/models/topic.ini b/models/topic.ini new file mode 100644 index 0000000..64611fd --- /dev/null +++ b/models/topic.ini @@ -0,0 +1,23 @@ +[model] +name = Topic +label = {{ this.title }} +translate = True + +[children] +model = question +order_by = _id + +[fields.title] +label = Title +type = string +size = large +translate = True + +[fields.key] +label = Key +type = sort_key + +[fields.seo_slug] +label = Seo Slug +type = string +translate = False diff --git a/templates/macros/question.html b/templates/macros/question.html new file mode 100644 index 0000000..53c0065 --- /dev/null +++ b/templates/macros/question.html @@ -0,0 +1,22 @@ +{% macro render_question(item, t_id, alternative) %} +<div class="question {{ bag('alternatives', alternative, 'direction') }}"> + <h4 class="text-primary"> + <a data-toggle="collapse" href="#{{ item._id }}" data-target="#{{ item._id }}" role="button" aria-expanded="false" aria-controls="{{ item._id }}"> + {{ item.title }} + </a> + </h4> + <div id="{{ item._id }}" class="collapse show anchor-spacer" role="tabpanel" data-parent="#{{ t_id }}Accordion"> + {{ item.description|safe }} + <div class="card mt-5"> + <ul class="list-group list-group-flush"> +  + <li class="list-group-item"> + <a href="https://github.com/torproject/support/edit/master/content{{ item.path }}/contents.lr">{{ _("Edit this page") }}</a> - + <a href="https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugF…">{{ _("Suggest Feedback") }}</a> - + <a href="{{ item|url }}">{{ _("Permalink") }}</a> + </li> + </ul> + </div> + </div> +</div> +{% endmacro %} diff --git a/templates/macros/topic.html b/templates/macros/topic.html new file mode 100644 index 0000000..2558e79 --- /dev/null +++ b/templates/macros/topic.html @@ -0,0 +1,18 @@ +{% from "macros/question.html" import render_question %} +{% macro render_topic(item, alternative) %} +{% set b_alt = 'topics+'+alternative %} +{% set t = bag(b_alt, item._id) %} +<div class="item"> + <h3 class="text-primary"> + <a href="{{ t.path }}" role="button"></a> + </h3> + <div id="{{ t.control }}" role="tabpanel" data-parent="#topics" class="anchor-spacer"> + <div id="{{ t.control }}Accordion" data-children=".question"> + <h5 class="text-muted mb-3 p-0 {{ bag('alternatives', alternative, 'direction') }}">{{ item.title }}</h5> + {% for q in item.children %} + {{ render_question(q, item._id, alternative) }} + {% endfor %} + </div> + </div> +</div> +{% endmacro %} diff --git a/templates/question.html b/templates/question.html new file mode 100644 index 0000000..30a2d89 --- /dev/null +++ b/templates/question.html @@ -0,0 +1,6 @@ +{% from "macros/question.html" import render_question %} +{% extends "layout.html" %} +{% block title %}{{ this.title }}{% endblock %} +{% block body %} + {{ render_question(this, "topic", this.alt) }} +{% endblock %} diff --git a/templates/topic.html b/templates/topic.html new file mode 100644 index 0000000..5cd8b62 --- /dev/null +++ b/templates/topic.html @@ -0,0 +1,6 @@ +{% from "macros/topic.html" import render_topic %} +{% extends "layout.html" %} +{% block title %}{{ this.title }}{% endblock %} +{% block body %} + {{ render_topic(this, this.alt) }} +{% endblock %} diff --git a/templates/trademark.html b/templates/trademark.html index 8b13789..5794309 100644 --- a/templates/trademark.html +++ b/templates/trademark.html @@ -1 +1,6 @@ - +{% from "macros/topic.html" import render_topic %} +<div class="container py3"> + {% for item in this.children %} + {{ render_topic(item, this.alt) }} + {% endfor %} +</div>

1 0

[tpo/master] Fix "Edit this page" so it links to torproject/tpo
by hiro＠torproject.org 05 Sep '19

05 Sep '19

commit c85db58f7b17e9bb663393e390676e64c02586e4 Author: RotationMatrix <52428419+RotationMatrix(a)users.noreply.github.com> Date: Wed Sep 4 13:32:40 2019 -0400 Fix "Edit this page" so it links to torproject/tpo --- templates/macros/question.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/macros/question.html b/templates/macros/question.html index 53c0065..8a2501f 100644 --- a/templates/macros/question.html +++ b/templates/macros/question.html @@ -11,7 +11,7 @@ <ul class="list-group list-group-flush">  <li class="list-group-item"> - <a href="https://github.com/torproject/support/edit/master/content{{ item.path }}/contents.lr">{{ _("Edit this page") }}</a> - + <a href="https://github.com/torproject/tpo/edit/master/content{{ item.path }}/contents.lr">{{ _("Edit this page") }}</a> - <a href="https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugF…">{{ _("Suggest Feedback") }}</a> - <a href="{{ item|url }}">{{ _("Permalink") }}</a> </li>

1 0

[tpo/master] Modify link in `trademark-faq-4`
by hiro＠torproject.org 05 Sep '19

05 Sep '19

commit 4d7d44939c1281e9feaa46c4b85a6b6ab88ad2ba Author: RotationMatrix <52428419+RotationMatrix(a)users.noreply.github.com> Date: Wed Sep 4 14:57:20 2019 -0400 Modify link in `trademark-faq-4` Now it links to the "Can I use the word "Tor"" question on the new page. --- content/about/trademark/trademark-faq/trademark-faq-4/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr index b366a4d..534a68b 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr @@ -9,4 +9,4 @@ Tor enjoys a vibrant [research community](https://research.torproject.org/) that Since the authors of these research papers aren't trying to make a profit from them, and (because they're just papers, not products) the papers aren't confusing Tor users into running potentially unsafe software, we believe that the use of the Tor mark in these research paper titles is acceptable non-trademark or fair use. -That said, if the research paper comes with software, and that software could potentially confuse people (users or other researchers) about whether it's written or endorsed by The Tor Project, then we're back to the [above scenario](https://2019.www.torproject.org/docs/trademark-faq.html.en#combin…. +That said, if the research paper comes with software, and that software could potentially confuse people (users or other researchers) about whether it's written or endorsed by The Tor Project, then we're back to the [above scenario](../../#trademark-faq-3).

1 0

[tpo/master] Fix trademark models and templates
by hiro＠torproject.org 05 Sep '19

05 Sep '19

commit 593f085a54a3eae28732e4f8bb705c5cc8e1a8d8 Author: hiro <hiro(a)torproject.org> Date: Thu Sep 5 15:22:04 2019 +0200 Fix trademark models and templates --- content/about/trademark/contents.lr | 5 ++++ content/about/trademark/trademark-faq/contents.lr | 12 +++++++- .../trademark-faq/trademark-faq-1/contents.lr | 2 ++ .../trademark-faq/trademark-faq-2/contents.lr | 2 ++ .../trademark-faq/trademark-faq-3/contents.lr | 2 ++ .../trademark-faq/trademark-faq-4/contents.lr | 2 ++ .../trademark-faq/trademark-faq-5/contents.lr | 2 ++ .../trademark-faq/trademark-faq-6/contents.lr | 2 ++ .../trademark-faq/trademark-faq-7/contents.lr | 2 ++ models/question.ini | 1 + models/trademark.ini | 34 ++++++++++++++++++++++ templates/about.html | 9 +++++- templates/macros/topic.html | 2 +- templates/trademark.html | 2 +- 14 files changed, 75 insertions(+), 4 deletions(-) diff --git a/content/about/trademark/contents.lr b/content/about/trademark/contents.lr index bc35d46..1dc524d 100644 --- a/content/about/trademark/contents.lr +++ b/content/about/trademark/contents.lr @@ -1,14 +1,19 @@ +_model: trademark +--- _template: about.html --- section: About --- section_id: about --- +color: primary +--- html: trademark.html --- title: Trademark --- body: + # General Statement of Trademark and Copyright Content on this site is Copyright The Tor Project, Inc.. Reproduction of content is permitted under a [Creative Commons Attribution 3.0 United States License](https://creativecommons.org/licenses/by/3.0/us/). All use under such license must be accompanied by a clear and prominent attribution that identifies The Tor Project, Inc. as the owner and originator of such content. The Tor Project Inc. reserves the right to change licenses and permissions at any time in its sole discretion. diff --git a/content/about/trademark/trademark-faq/contents.lr b/content/about/trademark/trademark-faq/contents.lr index 35a1f52..464fb37 100644 --- a/content/about/trademark/trademark-faq/contents.lr +++ b/content/about/trademark/trademark-faq/contents.lr @@ -1,5 +1,15 @@ _model: topic --- +_template: about.html +--- +section: About +--- +section_id: about +--- +html: trademark.html +--- +color: primary +--- title: Tor Trademark Frequently Asked Questions --- -seo_slug: Tor Trademark FAQs +seo_slug: tor-trademark-faqs diff --git a/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr index 9c53669..0d60105 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr @@ -2,6 +2,8 @@ _model: question --- title: How can I use the name "Tor"? --- +_hidden: yes +--- seo_slug: how-to-use-tor-trademark --- description: diff --git a/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr index a8ac499..7e6fc04 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr @@ -2,6 +2,8 @@ _model: question --- title: Can I use the Tor onion logo? --- +_hidden: yes +--- seo_slug: can-I-use-tor-onion-logo --- description: diff --git a/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr index a7fe8bb..06c3770 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr @@ -2,6 +2,8 @@ _model: question --- title: Can I use the word "Tor" as part of the name of my product or my domain name? --- +_hidden: yes +--- seo_slug: tor-product-domain-name --- description: diff --git a/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr index 534a68b..80a8b9e 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr @@ -2,6 +2,8 @@ _model: question --- title: What about cute Tor-derived names in research paper titles? --- +_hidden: yes +--- seo_slug: tor-derived-names --- description: diff --git a/content/about/trademark/trademark-faq/trademark-faq-5/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-5/contents.lr index 8f74633..e621368 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-5/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-5/contents.lr @@ -2,6 +2,8 @@ _model: question --- title: Does this mean you're enforcing trademark rights? --- +_hidden: yes +--- seo_slug: enforcing-trademark-rights --- description: diff --git a/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr index 32dd43e..ab1a3e8 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr @@ -2,6 +2,8 @@ _model: question --- title: What if I produce non-open source, commercial products based on Tor? --- +_hidden: yes +--- seo_slug: commercial-tor-derivatives --- description: diff --git a/content/about/trademark/trademark-faq/trademark-faq-7/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-7/contents.lr index 7f5b9c5..85d599b 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-7/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-7/contents.lr @@ -2,6 +2,8 @@ _model: question --- title: Are there official licensees of the Tor trademarks? --- +_hidden: yes +--- seo_slug: tor-licensees --- description: diff --git a/models/question.ini b/models/question.ini index 5e01769..fecf955 100644 --- a/models/question.ini +++ b/models/question.ini @@ -2,6 +2,7 @@ name = Question label = {{ this.title }} translate = True +hidden = yes [fields.title] label = Title diff --git a/models/trademark.ini b/models/trademark.ini new file mode 100644 index 0000000..892b5f1 --- /dev/null +++ b/models/trademark.ini @@ -0,0 +1,34 @@ +[model] +name = Trademark +label = {{ this.title }} +hidden = yes + +[fields.title] +label = Title +type = string + +[fields.section] +label = Section +type = string +translate = True + +[fields.section_id] +label = Section_id +type = string +translate = False + +[fields.body] +label = Body +type = markdown + +[fields.color] +label = Color +type = string + +[fields.html] +label = Html +type = string + +[children] +model = topic +order_by = title diff --git a/templates/about.html b/templates/about.html index 706617d..d1ab9de 100644 --- a/templates/about.html +++ b/templates/about.html @@ -8,7 +8,14 @@ <div class="container-fluid"> <div class="row flex-xl-nowrap"> <main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}"> - {% if this.path == "/about/history" %} + {% if this.path == "/about" %} + {% set p1 = this.children.get('history') %} + <div class="container py-3 mt-5 content"> + <div class="col-sm-9"> + {{ p1.body }} + </div> + </div> + {% elif this.path == "/about/history" %} <div class="container py-3 mt-5 preamble"> {{ this.parent.body }} </div> diff --git a/templates/macros/topic.html b/templates/macros/topic.html index 2558e79..0439c82 100644 --- a/templates/macros/topic.html +++ b/templates/macros/topic.html @@ -9,7 +9,7 @@ <div id="{{ t.control }}" role="tabpanel" data-parent="#topics" class="anchor-spacer"> <div id="{{ t.control }}Accordion" data-children=".question"> <h5 class="text-muted mb-3 p-0 {{ bag('alternatives', alternative, 'direction') }}">{{ item.title }}</h5> - {% for q in item.children %} + {% for q in site.query(item.path).include_undiscoverable(true) %} {{ render_question(q, item._id, alternative) }} {% endfor %} </div> diff --git a/templates/trademark.html b/templates/trademark.html index 5794309..f37aa27 100644 --- a/templates/trademark.html +++ b/templates/trademark.html @@ -1,6 +1,6 @@ {% from "macros/topic.html" import render_topic %} <div class="container py3"> - {% for item in this.children %} + {% for item in site.query('/about/trademark').include_hidden(true) %} {{ render_topic(item, this.alt) }} {% endfor %} </div>

1 0

[tpo/master] Add link to Contact page in `trademark-faq-6`
by hiro＠torproject.org 05 Sep '19

05 Sep '19

commit 573b4026f0bc4f669029af5f0b35c7bf0f51e11c Author: RotationMatrix <52428419+RotationMatrix(a)users.noreply.github.com> Date: Wed Sep 4 15:01:13 2019 -0400 Add link to Contact page in `trademark-faq-6` --- content/about/trademark/trademark-faq/trademark-faq-6/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr index 2335d60..32dd43e 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr @@ -5,4 +5,4 @@ title: What if I produce non-open source, commercial products based on Tor? seo_slug: commercial-tor-derivatives --- description: -Contact us, and let's talk. +[Contact us](/contact), and let's talk.

1 0

[lego/master] add sticky submenu
by antonela＠torproject.org 05 Sep '19

05 Sep '19

commit 5d6dfa45cb04f99d557ce79eef6b82dc6e2df721 Author: Antonela <hola(a)antonela.me> Date: Thu Sep 5 09:23:19 2019 -0400 add sticky submenu close https://dip.torproject.org/web/tpo/issues/13 --- templates/pagenav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/pagenav.html b/templates/pagenav.html index 1993909..c242baf 100644 --- a/templates/pagenav.html +++ b/templates/pagenav.html @@ -1,4 +1,4 @@ -<div class="container-fluid border-bottom border-light"> +<div class="container-fluid border-bottom border-light sticky"> <div class="row flex-xl-nowrap {{ bag('alternatives', this.alt, 'order') }}"> <div class="row col-12 justify-content-center"> <ul class="nav">

1 0

[metrics-web/master] Adds GitLab CI for tests and checks
by karsten＠torproject.org 05 Sep '19

05 Sep '19

commit d4086dde65cb51ca1a39340b1b7a4e9d54981914 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Sep 5 13:44:34 2019 +0100 Adds GitLab CI for tests and checks Configuration is held in the .gitlab-ci.yml file. Fixes: #31402 --- .gitlab-ci.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..d10fcb8 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,28 @@ +variables: + GIT_STRATEGY: clone + METRICS_LIB_VERSION: "2.6.2" + EXONERATOR_VERSION: "4.1.0" + JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8" + +stages: + - test + +test: + stage: test + image: debian:buster + script: + - apt update + - apt -y install default-jdk ant ivy git curl + - git submodule init + - git submodule update + - mkdir lib + - mkdir tmp + - pushd tmp + - curl https://dist.torproject.org/metrics-lib/$METRICS_LIB_VERSION/metrics-lib-$M… | tar xzf - + - curl https://dist.torproject.org/exonerator/$EXONERATOR_VERSION/exonerator-$EXON… | tar xzf - + - popd + - mv tmp/metrics-lib-$METRICS_LIB_VERSION/generated/dist/metrics-lib-$METRICS_LIB_VERSION-thin.jar lib + - mv tmp/exonerator-$EXONERATOR_VERSION/generated/dist/exonerator-$EXONERATOR_VERSION-thin.jar lib + - ant -lib /usr/share/java resolve + - ant test + - ant checks

1 0

[lego/master] add sticky class for nav menus
by antonela＠torproject.org 05 Sep '19

05 Sep '19

commit efafbf5574417583f97edd0b0be3143a2cd1577b Author: Antonela <hola(a)antonela.me> Date: Thu Sep 5 09:18:14 2019 -0400 add sticky class for nav menus --- assests/scss/_tor.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/assests/scss/_tor.scss b/assests/scss/_tor.scss index ff6f69a..c73909d 100644 --- a/assests/scss/_tor.scss +++ b/assests/scss/_tor.scss @@ -645,6 +645,13 @@ table { display: none !important; } +// Sticky menu +.sticky { + position: sticky; + top: 105px; + z-index: 999; +} + // Small devices (landscape phones, less than 768px) @include media-breakpoint-down(sm) { .mobile {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2019