GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit 593f085a authored by Hiro's avatar Hiro 🏄

Fix trademark models and templates

parent 573b4026
_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.
......
_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
......@@ -2,6 +2,8 @@ _model: question
---
title: How can I use the name "Tor"?
---
_hidden: yes
---
seo_slug: how-to-use-tor-trademark
---
description:
......
......@@ -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:
......
......@@ -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:
......
......@@ -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:
......
......@@ -2,6 +2,8 @@ _model: question
---
title: Does this mean you're enforcing trademark rights?
---
_hidden: yes
---
seo_slug: enforcing-trademark-rights
---
description:
......
......@@ -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:
......
......@@ -2,6 +2,8 @@ _model: question
---
title: Are there official licensees of the Tor trademarks?
---
_hidden: yes
---
seo_slug: tor-licensees
---
description:
......
......@@ -2,6 +2,7 @@
name = Question
label = {{ this.title }}
translate = True
hidden = yes
[fields.title]
label = Title
......
[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
......@@ -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>
......
......@@ -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>
......
{% 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>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment