October 2019 - tor-commits - lists.torproject.org

[tpo/staging] Rename download link to alpha builds
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 5899127a786dfee507de927892b6a6efaf4fd4f7 Author: kjpark <kjedidiahpark(a)gmail.com> Date: Wed Sep 4 01:25:42 2019 -0400 Rename download link to alpha builds --- templates/hero-download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/hero-download.html b/templates/hero-download.html index 7c3744a..9cfb65a 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -43,7 +43,7 @@ </div> <div class="row p-5"> <a class="mx-auto text-white py-3 text-center" href="{{ 'languages'|url(alt=this.alt) }}"><u>{{ _('Download in another language or platform') }}</u></a> - <a class="mx-auto text-white py-3 text-center" href="{{ 'alpha'|url(alt=this.alt) }}"><u>{{ _('Advanced Install Options') }}</u></a> + <a class="mx-auto text-white py-3 text-center" href="{{ 'alpha'|url(alt=this.alt) }}"><u>{{ _('Download the latest alpha build') }}</u></a> <a class="mx-auto text-white py-3 text-center" href="{{ 'tor'|url(alt=this.alt) }}"><u>{{ _('Download Tor Source Code') }}</u></a> </div> <div class="hidden-sm row p-md-5 justify-content-center window-bg">

1 0

[tpo/staging] Add new Tor Browser version: 8.5.5
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit f27725368ed6543ca138e805bf7ab086a3daa28b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 3 23:47:52 2019 +0200 Add new Tor Browser version: 8.5.5 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 ++++ databags/versions.ini | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index f825072..b839c40 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -9,6 +9,10 @@ body: "8.5.4-MacOS", "8.5.4-Linux", "8.5.4-Windows", +"8.5.5", +"8.5.5-MacOS", +"8.5.5-Linux", +"8.5.5-Windows", "9.0a4", "9.0a4-MacOS", "9.0a4-Linux", diff --git a/databags/versions.ini b/databags/versions.ini index 85793da..f0e5f77 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,6 +1,6 @@ [torbrowser-stable] -version = 8.5.4 -win32 = 0.4.0.5 +version = 8.5.5 +win32 = 0.4.1.5 [torbrowser-alpha] version = 9.0a4

1 0

[tpo/staging] Add #tor-www and #tor-l10n to list of irc channels in contact page
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 5a35918d514ecd41d2153903d449006b7bba1ec5 Author: kjpark <kjedidiahpark(a)gmail.com> Date: Wed Sep 4 02:20:31 2019 -0400 Add #tor-www and #tor-l10n to list of irc channels in contact page --- templates/contact.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/contact.html b/templates/contact.html index 6646743..b519fc1 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -8,10 +8,12 @@ <h3 class="text-secondary display-5 mb-4"><i class="text-primary pr-2 fas fa-table-tennis-png"></i> {{ _('Chat with us on') }} {{ render_oftc() }}</h3> <p class="text-tpo"><span class="text-primary nick">#tor</span> - {{ _("Ask questions about using Tor.") }}</p> <p class="text-tpo"><span class="text-primary nick">#tor-dev</span> - {{ _("Discuss Tor-related coding and protocols. Ideas are welcome.") }}</p> - <p class="text-tpo"><span class="text-primary nick">#tor-project</span> - {{ _("Discuss organization and community related topics: meetups, outreach, translation, or website improvements.") }}</p> + <p class="text-tpo"><span class="text-primary nick">#tor-l10n</span> - {{ _("Get in touch with other translators") }}</p> <p class="text-tpo"><span class="text-primary nick">#tor-meeting</span> - {{ _("Watch or join publicly logged team meetings.") }}</p> + <p class="text-tpo"><span class="text-primary nick">#tor-project</span> - {{ _("Discuss organization and community related topics: meetups, outreach, translation, or website improvements.") }}</p> <p class="text-tpo"><span class="text-primary nick">#tor-relays</span> - {{ _("Discuss running a Tor relay.") }}</p> <p class="text-tpo"><span class="text-primary nick">#tor-south</span> - {{ _("Talk with Tor's global south community.") }}</p> + <p class="text-tpo"><span class="text-primary nick">#tor-www</span> - {{ _("Talk with us about our portals.") }}</p> </div> <div class="d-block d-sm-none container py-3"> <div class="row border-bottom border-light"><p></p></div>

1 0

[tpo/staging] Add files via upload
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit e40ebe9c354e3c7e76b859935fc41d212178ba6e Author: Ravi Teja C.M.S <13203149+RaviTejaCMS(a)users.noreply.github.com> Date: Tue Sep 3 22:17:14 2019 +0530 Add files via upload Updated TOR Android Images --- .../png/TBAa-onboarding.png | Bin 58890 -> 54696 bytes .../png/TBAa-onboarding(a)2x.png | Bin 159182 -> 145259 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/images/tor-browser-mobile-window/png/TBAa-onboarding.png b/assets/static/images/tor-browser-mobile-window/png/TBAa-onboarding.png index 8280e5b..1befd36 100644 Binary files a/assets/static/images/tor-browser-mobile-window/png/TBAa-onboarding.png and b/assets/static/images/tor-browser-mobile-window/png/TBAa-onboarding.png differ diff --git a/assets/static/images/tor-browser-mobile-window/png/TBAa-onboarding(a)2x.png b/assets/static/images/tor-browser-mobile-window/png/TBAa-onboarding(a)2x.png index ea32116..2fe2ecb 100644 Binary files a/assets/static/images/tor-browser-mobile-window/png/TBAa-onboarding(a)2x.png and b/assets/static/images/tor-browser-mobile-window/png/TBAa-onboarding(a)2x.png differ

1 0

[tpo/staging] Add new Tor Browser version: 9.0a6
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 9fb6fe2a1fb05f4c1f16d998146e0228f9502745 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 5 12:28:46 2019 +0200 Add new Tor Browser version: 9.0a6 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 ++++ databags/versions.ini | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 1510ef1..d8103db 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -13,4 +13,8 @@ body: "9.0a4-MacOS", "9.0a4-Linux", "9.0a4-Windows" +"9.0a6", +"9.0a6-MacOS", +"9.0a6-Linux", +"9.0a6-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index f0e5f77..3a9ee37 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -3,7 +3,7 @@ version = 8.5.5 win32 = 0.4.1.5 [torbrowser-alpha] -version = 9.0a4 +version = 9.0a6 [tor-stable] version = 0.4.1.5

1 0

[tpo/staging] Remove 8.5.4 from RecommendedTBBVersions
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit ca464183ecda2276533f350a4d7c2e4e49f36060 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 5 12:27:45 2019 +0200 Remove 8.5.4 from RecommendedTBBVersions --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 ---- 1 file changed, 4 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index b839c40..1510ef1 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -5,10 +5,6 @@ _template: empty.html body: [ -"8.5.4", -"8.5.4-MacOS", -"8.5.4-Linux", -"8.5.4-Windows", "8.5.5", "8.5.5-MacOS", "8.5.5-Linux",

1 0

[tpo/staging] Merge remote-tracking branch 'kjpark/rename-linkto-alpha-builds'
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 929b9bf0b0dc48746085b5fa540189ae3bdd90aa Merge: 9fb6fe2 5899127 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Sep 5 14:45:31 2019 +0200 Merge remote-tracking branch 'kjpark/rename-linkto-alpha-builds' close: https://github.com/torproject/tpo/pull/49 fix: https://dip.torproject.org/web/tpo/issues/2 docshackathon ftw! templates/hero-download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tpo/staging] Fix up RecommendedTBBVersions
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit eeffd9f6baade154c898e5bb82a3e215ee3eb5d3 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 5 13:10:44 2019 +0000 Fix up RecommendedTBBVersions --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index d8103db..b07f01a 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -12,7 +12,7 @@ body: "9.0a4", "9.0a4-MacOS", "9.0a4-Linux", -"9.0a4-Windows" +"9.0a4-Windows", "9.0a6", "9.0a6-MacOS", "9.0a6-Linux",

1 0

[tpo/staging] Fix "Edit this page" so it links to torproject/tpo
by emmapeel＠torproject.org 15 Oct '19

15 Oct '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/staging] Add styling to questions
by emmapeel＠torproject.org 15 Oct '19

15 Oct '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