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

[community/staging] Fix issues with page key
by hiro＠torproject.org 05 Jul '19

05 Jul '19

commit d71b693ac47658fcf74a67fa162eb4e5dad9a10a Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Jun 13 10:37:45 2019 +0200 Fix issues with page key --- content/training/resources/contents.lr | 3 +++ templates/training.html | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/content/training/resources/contents.lr b/content/training/resources/contents.lr index 58a6907..c453189 100644 --- a/content/training/resources/contents.lr +++ b/content/training/resources/contents.lr @@ -10,10 +10,13 @@ title: Training Resources --- subtitle: Do you teach your community about using Tor? These resources are for you. --- +cta: Check out our resources +--- key: 2 --- html: resources.html --- body: +##Resources Do you teach your community about using Tor? These training resources are for you. \ No newline at end of file diff --git a/templates/training.html b/templates/training.html index 65c7187..e843b1b 100644 --- a/templates/training.html +++ b/templates/training.html @@ -8,8 +8,7 @@ </div> </div> <div class="row py-5"> - {% for child in this.children|sort(attribute='key') %} - {% if child.key != '0' %} + {% for child in this.children %} <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-4"> <div class="card h-100 border-0"> <div class="card-body"> @@ -20,7 +19,6 @@ </div> </div> </div> - {% endif %} {% endfor %} </div> <div class="row py-5 text-center mx-auto">

1 0

[community/staging] Update link to contact
by hiro＠torproject.org 05 Jul '19

05 Jul '19

commit 949f242d5e5a6dc24dbab152784a2b90e556f6ec Author: Pili Guerra <pili(a)piliguerra.com> Date: Wed Jun 12 11:54:52 2019 +0200 Update link to contact --- content/training/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/training/contents.lr b/content/training/contents.lr index 1cb0f37..da8dfc2 100644 --- a/content/training/contents.lr +++ b/content/training/contents.lr @@ -20,4 +20,4 @@ body: ##We want to teach the world about Tor. Will you help? -Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered. For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please contact our community team for more help [link to contact]. +Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered. For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please [contact our community team](https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam… for more help.

1 0

[community/staging] restore lektor file
by hiro＠torproject.org 05 Jul '19

05 Jul '19

commit fb1bbf5820f4b6331ff4e386f9e61a6b6454f50b Author: Pili Guerra <pili(a)piliguerra.com> Date: Wed Jun 12 18:38:42 2019 +0200 restore lektor file --- packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc | Bin 0 -> 15397 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc b/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc new file mode 100644 index 0000000..488bd31 Binary files /dev/null and b/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc differ

1 0

[community/staging] Update two-columns-page to add a link back to the parent page
by hiro＠torproject.org 05 Jul '19

05 Jul '19

commit cc5ad1135a818b6dbe88173f2e19ceab1b4ba207 Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Jun 13 13:56:02 2019 +0200 Update two-columns-page to add a link back to the parent page --- templates/two-columns-page.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html index e1f1839..51437e6 100644 --- a/templates/two-columns-page.html +++ b/templates/two-columns-page.html @@ -2,5 +2,19 @@ {% include 'sidenav.html' %} <div class="col-sm-12 col-xs-12 ml-sm-auto col-md-9 col-lg-9 {{ bag('alternatives', this.alt, 'order') }}"> {{ this.body }} + <div class="row"> + {% for child in this.children|sort(attribute='key') %} + <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3"> + <div class="card h-100"> + <div class="card-body"> + <h4 class="card-title text-primary"><a href="{{ child.path|url }}">{{ child.title }}</a></h4> + <p class="card-text">{{ child.subtitle }}</p> + </div> + </div> + </div> + {% endfor %} + </div> + <a href="{{ this.parent|url }}">Back to {{ this.parent.title }}</a> </div> </div> +

1 0

[community/staging] Outreach section
by hiro＠torproject.org 05 Jul '19

05 Jul '19

commit ed7d51a1134495f9a30c559df15ba20573e82844 Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Jun 13 11:30:40 2019 +0200 Outreach section --- content/outreach/kit/contents.lr | 7 +++++-- content/outreach/speakers/contents.lr | 5 ++++- content/outreach/talk/contents.lr | 6 +++++- templates/outreach.html | 9 +++------ 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/content/outreach/kit/contents.lr b/content/outreach/kit/contents.lr index deb74b4..5ddec4c 100644 --- a/content/outreach/kit/contents.lr +++ b/content/outreach/kit/contents.lr @@ -6,12 +6,15 @@ color: primary --- _template: layout.html --- -title: Stream team kit +title: Street team kit --- subtitle: This kit includes printable flyers, stickers, and other materials to get people excited about using Tor. --- key: 1 --- -html: outreach.html +html: resources.html --- body: + +## Street Team Kit +This kit includes printable flyers, stickers, and other materials to get people excited about using Tor. \ No newline at end of file diff --git a/content/outreach/speakers/contents.lr b/content/outreach/speakers/contents.lr index 111e26d..0092b41 100644 --- a/content/outreach/speakers/contents.lr +++ b/content/outreach/speakers/contents.lr @@ -12,6 +12,9 @@ subtitle: We have a dedicated group of Tor core contributors who are ready to sp --- key: 3 --- -html: outreach.html +html: two-columns-page.html --- body: + +## Tor Speakers Bureau +We have a dedicated group of Tor core contributors who are ready to speak at your next event. You can request a speaker by contacting speaking(a)torproject.org with your preferred topic, language requirement, date, and other details. \ No newline at end of file diff --git a/content/outreach/talk/contents.lr b/content/outreach/talk/contents.lr index 6f84a6f..a79be5f 100644 --- a/content/outreach/talk/contents.lr +++ b/content/outreach/talk/contents.lr @@ -12,6 +12,10 @@ subtitle: Here you'll find materials on basic Tor explainers and concepts, ideas --- key: 2 --- -html: outreach.html +html: resources.html --- body: + +## Talk about Tor + +Here you'll find materials on basic Tor explainers and concepts, ideas for preparing a Tor talk, suggested social media posts, and more. \ No newline at end of file diff --git a/templates/outreach.html b/templates/outreach.html index 4b7235b..eb45835 100644 --- a/templates/outreach.html +++ b/templates/outreach.html @@ -7,17 +7,14 @@ <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ _(this.section) }}" /> </div> </div> - <h2 class="text-primary">{{ _('Help us translate') }}</h2> <div class="row"> {% for child in this.children|sort(attribute='key') %} <div class="col-sm-4 col-md-4 col-sm-12 col-xl-4 py-4"> <div class="card h-100 border-0"> <div class="card-body"> - <img class="card-img-top" src="{{ 'static/images/gray-image.png'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <h4 class="card-title text-primary">{{ child.title }}</h4> - <p class="card-text">{{ child.subtitle }}</p> - </div> + <h4 class="card-title text-primary">{{ child.title }}</h4> + <p class="card-text">{{ child.subtitle }}</p> + <a href="{{ child.path|url }}">{{ child.cta }} <i class="fas fa-arrow-right"></i></a> </div> </div> </div>

1 0

[community/staging] Update layout for inner pages
by hiro＠torproject.org 05 Jul '19

05 Jul '19

commit ebdb465856ab1911e1006c054844a0f66e6e9bf8 Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Jun 13 13:55:01 2019 +0200 Update layout for inner pages --- content/relay-operations/community-resources/contents.lr | 2 +- content/relay-operations/relays-requirements/contents.lr | 2 +- content/relay-operations/technical-setup/centosrhel/contents.lr | 2 +- content/relay-operations/technical-setup/contents.lr | 2 +- content/relay-operations/technical-setup/debianubuntu/contents.lr | 2 +- content/relay-operations/technical-setup/exit-relay/contents.lr | 2 +- content/relay-operations/technical-setup/fedora/contents.lr | 2 +- content/relay-operations/technical-setup/freebsd/contents.lr | 2 +- content/relay-operations/types-of-relays/contents.lr | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/content/relay-operations/community-resources/contents.lr b/content/relay-operations/community-resources/contents.lr index 7149b51..b725337 100644 --- a/content/relay-operations/community-resources/contents.lr +++ b/content/relay-operations/community-resources/contents.lr @@ -12,6 +12,6 @@ subtitle: How to get involved with the Tor relay operator community, advice on r --- key: 4 --- -html: relay-operations.html +html: two-columns-page.html --- body: diff --git a/content/relay-operations/relays-requirements/contents.lr b/content/relay-operations/relays-requirements/contents.lr index d089c7e..1d85623 100644 --- a/content/relay-operations/relays-requirements/contents.lr +++ b/content/relay-operations/relays-requirements/contents.lr @@ -12,7 +12,7 @@ subtitle: Requirements for Tor relays depend on the type of relay and the bandwi --- key: 2 --- -html: relay-operations.html +html: two-columns-page.html --- body: diff --git a/content/relay-operations/technical-setup/centosrhel/contents.lr b/content/relay-operations/technical-setup/centosrhel/contents.lr index 6bf5811..af9f706 100644 --- a/content/relay-operations/technical-setup/centosrhel/contents.lr +++ b/content/relay-operations/technical-setup/centosrhel/contents.lr @@ -2,7 +2,7 @@ _model: page --- title: CentOS/RHEL --- -html: relay-operations.html +html: two-columns-page.html --- section: relay operations --- diff --git a/content/relay-operations/technical-setup/contents.lr b/content/relay-operations/technical-setup/contents.lr index fc255aa..65d44fc 100644 --- a/content/relay-operations/technical-setup/contents.lr +++ b/content/relay-operations/technical-setup/contents.lr @@ -12,7 +12,7 @@ title: Technical setup --- subtitle: Installing and configuring your Tor relay. --- -html: relay-operations.html +html: two-columns-page.html --- body: diff --git a/content/relay-operations/technical-setup/debianubuntu/contents.lr b/content/relay-operations/technical-setup/debianubuntu/contents.lr index 30a4c6c..79c652e 100644 --- a/content/relay-operations/technical-setup/debianubuntu/contents.lr +++ b/content/relay-operations/technical-setup/debianubuntu/contents.lr @@ -2,7 +2,7 @@ _model: page --- title: Debian/Ubuntu --- -html: relay-operations.html +html: two-columns-page.html --- section: relay operations --- diff --git a/content/relay-operations/technical-setup/exit-relay/contents.lr b/content/relay-operations/technical-setup/exit-relay/contents.lr index f16c92f..708c12d 100644 --- a/content/relay-operations/technical-setup/exit-relay/contents.lr +++ b/content/relay-operations/technical-setup/exit-relay/contents.lr @@ -2,7 +2,7 @@ _model: page --- title: Exit Relay Configuration --- -html: relay-operations.html +html: two-columns-page.html --- section: relay operations --- diff --git a/content/relay-operations/technical-setup/fedora/contents.lr b/content/relay-operations/technical-setup/fedora/contents.lr index d8018a9..ba5cfdb 100644 --- a/content/relay-operations/technical-setup/fedora/contents.lr +++ b/content/relay-operations/technical-setup/fedora/contents.lr @@ -2,7 +2,7 @@ _model: page --- title: Fedora --- -html: relay-operations.html +html: two-columns-page.html --- key: 3 --- diff --git a/content/relay-operations/technical-setup/freebsd/contents.lr b/content/relay-operations/technical-setup/freebsd/contents.lr index 9073d5d..d1afab0 100644 --- a/content/relay-operations/technical-setup/freebsd/contents.lr +++ b/content/relay-operations/technical-setup/freebsd/contents.lr @@ -2,7 +2,7 @@ _model: page --- title: FreeBSD --- -html: relay-operations.html +html: two-columns-page.html --- section: relay operations --- diff --git a/content/relay-operations/types-of-relays/contents.lr b/content/relay-operations/types-of-relays/contents.lr index f78a338..791427e 100644 --- a/content/relay-operations/types-of-relays/contents.lr +++ b/content/relay-operations/types-of-relays/contents.lr @@ -12,7 +12,7 @@ subtitle: Bridges, guards, middle relays, and exits all serve important function --- key: 1 --- -html: relay-operations.html +html: two-columns-page.html --- body:

1 0

[community/staging] Merge branch 'master' of git-rw.torproject.org:project/web/community into HEAD
by hiro＠torproject.org 05 Jul '19

05 Jul '19

commit 2fc599c6edeac0cbe0826da35216fe35aab5e01d Merge: d71b693 72520ae Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Jun 13 10:38:40 2019 +0200 Merge branch 'master' of git-rw.torproject.org:project/web/community into HEAD packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc | Bin 15379 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-)

1 0

[community/staging] Template fixes
by hiro＠torproject.org 05 Jul '19

05 Jul '19

commit 4c928684805ff3e4a39aad0052cf13c938bc9017 Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Jun 13 15:24:54 2019 +0200 Template fixes --- content/training/best-practices/contents.lr | 2 ++ content/training/resources/contents.lr | 2 ++ templates/sidenav.html | 2 +- templates/two-columns-page.html | 3 +-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/content/training/best-practices/contents.lr b/content/training/best-practices/contents.lr index 741685b..09e08aa 100644 --- a/content/training/best-practices/contents.lr +++ b/content/training/best-practices/contents.lr @@ -1,3 +1,5 @@ +_model: page +--- section: training --- section_id: training diff --git a/content/training/resources/contents.lr b/content/training/resources/contents.lr index c453189..942724c 100644 --- a/content/training/resources/contents.lr +++ b/content/training/resources/contents.lr @@ -1,3 +1,5 @@ +_model: page +--- section: training --- section_id: training diff --git a/templates/sidenav.html b/templates/sidenav.html index 489faeb..3732254 100644 --- a/templates/sidenav.html +++ b/templates/sidenav.html @@ -27,7 +27,7 @@ <nav class="d-none d-sm-block section-nav bg-white sidetopics sticky" id="sidenav-topics"> <h4 class="text-primary pl-4">{{ _("Topics") }}</h4> <ul class="nav nav-pills flex-column"> - {% for child in this.parent.children %} + {% for child in this.parent.children|sort(attribute='key') %} <li{% if this.is_child_of(child.path) %} class="toc-entry toc-h2 active nav-item" {% else %} class="toc-entry toc-h2 nav-item" {% endif %}> <a role="button" {% if this.is_child_of(child.path) %} class="nav-link active" {% else %} class="nav-link" {% endif %} href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a> diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html index 51437e6..1823730 100644 --- a/templates/two-columns-page.html +++ b/templates/two-columns-page.html @@ -16,5 +16,4 @@ </div> <a href="{{ this.parent|url }}">Back to {{ this.parent.title }}</a> </div> -</div> - +</div> \ No newline at end of file

1 0

[community/staging] Minor wording fixes
by hiro＠torproject.org 05 Jul '19

05 Jul '19

commit 879f22953047c48bc5c473ae0c4bcc78bd74cccf Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Jun 13 17:44:33 2019 +0200 Minor wording fixes --- content/localization/contents.lr | 2 +- content/onion-services/contents.lr | 2 +- content/outreach/contents.lr | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/localization/contents.lr b/content/localization/contents.lr index 38a84d4..ccdc74d 100644 --- a/content/localization/contents.lr +++ b/content/localization/contents.lr @@ -10,7 +10,7 @@ title: Localization --- subtitle: We want Tor to work for everyone in the world, which means a lot of languages. --- -cta: Will you help us to translate? +cta: Help us to translate --- key: 2 --- diff --git a/content/onion-services/contents.lr b/content/onion-services/contents.lr index 0077c71..9e51c1c 100644 --- a/content/onion-services/contents.lr +++ b/content/onion-services/contents.lr @@ -6,7 +6,7 @@ color: primary --- _template: layout.html --- -title: .onion Services +title: Onion Services --- subtitle: Onion services help you and your users defeat surveillance and censorship. Learn how you can deploy onion services. --- diff --git a/content/outreach/contents.lr b/content/outreach/contents.lr index f11f905..f18da38 100644 --- a/content/outreach/contents.lr +++ b/content/outreach/contents.lr @@ -8,9 +8,9 @@ _template: layout.html --- title: Outreach --- -subtitle: Bring Tor swag to our next community event. +subtitle: Bring Tor materials to your next community event. --- -cta: Join the Tor community +cta: Tell the world about Tor --- key: 3 ---

1 0

[community/staging] hidding user research section
by hiro＠torproject.org 05 Jul '19

05 Jul '19

commit fcb57635fafffdcf23d03a528d06e3aa8a6a12cc Author: Antonela <hola(a)antonela.me> Date: Thu Jun 13 10:27:24 2019 -0300 hidding user research section we will release it after the dev meeting --- content/user-research/contents.lr | 4 +++- databags/pagenav+en.ini | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/content/user-research/contents.lr b/content/user-research/contents.lr index dfeb5e0..164efb8 100644 --- a/content/user-research/contents.lr +++ b/content/user-research/contents.lr @@ -4,13 +4,15 @@ section_id: user-research --- color: primary --- +_hidden: yes +--- _template: layout.html --- title: User Research --- subtitle: We conduct user research while also respecting user privacy. --- -cta: Learn how you can help +cta: In progress --- key: 4 --- diff --git a/databags/pagenav+en.ini b/databags/pagenav+en.ini index 2dd844a..cb5b415 100644 --- a/databags/pagenav+en.ini +++ b/databags/pagenav+en.ini @@ -10,10 +10,6 @@ label = Localization path = outreach label = Outreach -[user-research] -path = user-research -label = User Research - [relay-operations] path = relay-operations label = Relay Operations

1 0