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

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 14 Jun '19

14 Jun '19

commit 69be604457f967a5b5878d289aeaba49e9fc56cf Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 14 13:50:53 2019 +0000 Update translations for support-portal --- contents+zh-CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 0fd534aa1..460936049 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -297,7 +297,7 @@ msgid "" "Below we explain why it is important and how to verify that the Tor program " "you download is the one we have created and has not been modified by some " "attacker." -msgstr "下面我们解释为什么它很重要以及如何验证您下载的Tor程序是我们创建的并且未被某些攻击者修改过的程序。" +msgstr "下面我们解释为什么它很重要，以及如何验证您下载的 Tor 程序是我们创建的，并且未被某些攻击者修改过的程序。" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)

1 0

[tor/master] Merge branch 'bug30806'
by asn＠torproject.org 14 Jun '19

14 Jun '19

commit 319ce225815897d8626e85037ee203c4de634405 Merge: 438b7eec8 990b434c4 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jun 14 13:28:32 2019 +0300 Merge branch 'bug30806' changes/ticket30806 | 3 +++ src/app/main/main.c | 4 ---- src/app/main/shutdown.c | 2 -- src/app/main/subsystem_list.c | 3 +++ src/lib/evloop/.may_include | 1 + src/lib/evloop/evloop_sys.c | 49 +++++++++++++++++++++++++++++++++++++++++ src/lib/evloop/evloop_sys.h | 17 ++++++++++++++ src/lib/evloop/include.am | 2 ++ src/test/test_channelpadding.c | 7 ------ src/test/test_compat_libevent.c | 2 -- 10 files changed, 75 insertions(+), 15 deletions(-)

1 0

[tor/master] Make evloop into a subsystem.
by asn＠torproject.org 14 Jun '19

14 Jun '19

commit 990b434c4f4aa5e9c410bb083c1b98cead92bb59 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 7 20:03:26 2019 -0400 Make evloop into a subsystem. Note that the event base object is _not_ created from the initialize function, since it is configuration-dependent. This will wait until configuration is integrated into subsystems. Closes ticket 30806. --- changes/ticket30806 | 3 +++ src/app/main/main.c | 4 ---- src/app/main/shutdown.c | 2 -- src/app/main/subsystem_list.c | 3 +++ src/lib/evloop/.may_include | 1 + src/lib/evloop/evloop_sys.c | 49 +++++++++++++++++++++++++++++++++++++++++ src/lib/evloop/evloop_sys.h | 17 ++++++++++++++ src/lib/evloop/include.am | 2 ++ src/test/test_channelpadding.c | 7 ------ src/test/test_compat_libevent.c | 2 -- 10 files changed, 75 insertions(+), 15 deletions(-) diff --git a/changes/ticket30806 b/changes/ticket30806 new file mode 100644 index 000000000..4f09ea2af --- /dev/null +++ b/changes/ticket30806 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Use the subsystems mechanism to manage the main event loop code. + Closes ticket 30806. diff --git a/src/app/main/main.c b/src/app/main/main.c index 6e325f0b1..17b0000d9 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -653,10 +653,6 @@ tor_init(int argc, char *argv[]) return -1; } - if (tor_init_libevent_rng() < 0) { - log_warn(LD_NET, "Problem initializing libevent RNG."); - } - /* Scan/clean unparseable descriptors; after reading config */ routerparse_init(); diff --git a/src/app/main/shutdown.c b/src/app/main/shutdown.c index cc0091a9a..93d6351d1 100644 --- a/src/app/main/shutdown.c +++ b/src/app/main/shutdown.c @@ -160,8 +160,6 @@ tor_free_all(int postfork) subsystems_shutdown(); - tor_libevent_free_all(); - /* Stuff in util.c and address.c*/ if (!postfork) { esc_router_info(NULL); diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index f59579623..95d96f78d 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -25,6 +25,7 @@ #include "lib/time/time_sys.h" #include "lib/tls/tortls_sys.h" #include "lib/wallclock/wallclock_sys.h" +#include "lib/evloop/evloop_sys.h" #include "feature/dirauth/dirauth_sys.h" @@ -50,6 +51,8 @@ const subsys_fns_t *tor_subsystems[] = { &sys_ocirc_event, /* -32 */ &sys_btrack, /* -30 */ + &sys_evloop, /* -20 */ + &sys_mainloop, /* 5 */ &sys_or, /* 20 */ diff --git a/src/lib/evloop/.may_include b/src/lib/evloop/.may_include index 273de7bb9..54aa75fbf 100644 --- a/src/lib/evloop/.may_include +++ b/src/lib/evloop/.may_include @@ -8,6 +8,7 @@ lib/log/*.h lib/malloc/*.h lib/net/*.h lib/string/*.h +lib/subsys/*.h lib/testsupport/*.h lib/thread/*.h lib/time/*.h diff --git a/src/lib/evloop/evloop_sys.c b/src/lib/evloop/evloop_sys.c new file mode 100644 index 000000000..56641a317 --- /dev/null +++ b/src/lib/evloop/evloop_sys.c @@ -0,0 +1,49 @@ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2019, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file evloop_sys.c + * @brief Subsystem definition for the event loop module + **/ + +#include "orconfig.h" +#include "lib/subsys/subsys.h" +#include "lib/evloop/compat_libevent.h" +#include "lib/evloop/evloop_sys.h" +#include "lib/log/log.h" + +static int +subsys_evloop_initialize(void) +{ + if (tor_init_libevent_rng() < 0) { + log_warn(LD_NET, "Problem initializing libevent RNG."); + return -1; + } + return 0; +} + +static void +subsys_evloop_postfork(void) +{ +#ifdef TOR_UNIT_TESTS + tor_libevent_postfork(); +#endif +} + +static void +subsys_evloop_shutdown(void) +{ + tor_libevent_free_all(); +} + +const struct subsys_fns_t sys_evloop = { + .name = "evloop", + .supported = true, + .level = -20, + .initialize = subsys_evloop_initialize, + .shutdown = subsys_evloop_shutdown, + .postfork = subsys_evloop_postfork, +}; diff --git a/src/lib/evloop/evloop_sys.h b/src/lib/evloop/evloop_sys.h new file mode 100644 index 000000000..e6155c25b --- /dev/null +++ b/src/lib/evloop/evloop_sys.h @@ -0,0 +1,17 @@ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2019, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file evloop_sys.h + * @brief Declare subsystem object for the event loop module. + **/ + +#ifndef TOR_LIB_EVLOOP_EVLOOP_SYS_H +#define TOR_LIB_EVLOOP_EVLOOP_SYS_H + +extern const struct subsys_fns_t sys_evloop; + +#endif /* !defined(TOR_LIB_EVLOOP_EVLOOP_SYS_H) */ diff --git a/src/lib/evloop/include.am b/src/lib/evloop/include.am index 6595b3a34..41cd2f45c 100644 --- a/src/lib/evloop/include.am +++ b/src/lib/evloop/include.am @@ -8,6 +8,7 @@ endif # ADD_C_FILE: INSERT SOURCES HERE. src_lib_libtor_evloop_a_SOURCES = \ src/lib/evloop/compat_libevent.c \ + src/lib/evloop/evloop_sys.c \ src/lib/evloop/procmon.c \ src/lib/evloop/timers.c \ src/lib/evloop/token_bucket.c \ @@ -21,6 +22,7 @@ src_lib_libtor_evloop_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) # ADD_C_FILE: INSERT HEADERS HERE. noinst_HEADERS += \ src/lib/evloop/compat_libevent.h \ + src/lib/evloop/evloop_sys.h \ src/lib/evloop/procmon.h \ src/lib/evloop/timers.h \ src/lib/evloop/token_bucket.h \ diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index 5d012e462..885246628 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -289,8 +289,6 @@ test_channelpadding_timers(void *arg) channel_t *chans[CHANNELS_TO_TEST]; (void)arg; - tor_libevent_postfork(); - if (!connection_array) connection_array = smartlist_new(); @@ -393,7 +391,6 @@ test_channelpadding_killonehop(void *arg) channelpadding_decision_t decision; int64_t new_time; (void)arg; - tor_libevent_postfork(); routerstatus_t *relay = tor_malloc_zero(sizeof(routerstatus_t)); monotime_init(); @@ -502,8 +499,6 @@ test_channelpadding_consensus(void *arg) int64_t new_time; (void)arg; - tor_libevent_postfork(); - /* * Params tested: * nf_pad_before_usage @@ -898,8 +893,6 @@ test_channelpadding_decide_to_pad_channel(void *arg) connection_array = smartlist_new(); (void)arg; - tor_libevent_postfork(); - monotime_init(); monotime_enable_test_mocking(); monotime_set_mock_time_nsec(1); diff --git a/src/test/test_compat_libevent.c b/src/test/test_compat_libevent.c index 5d625483d..ecd97e347 100644 --- a/src/test/test_compat_libevent.c +++ b/src/test/test_compat_libevent.c @@ -151,8 +151,6 @@ test_compat_libevent_postloop_events(void *arg) mainloop_event_t *a = NULL, *b = NULL; periodic_timer_t *timed = NULL; - tor_libevent_postfork(); - /* If postloop events don't work, then these events will activate one * another ad infinitum and, and the periodic event will never occur. */ b = mainloop_event_postloop_new(activate_event_cb, &a);

1 0

[community/master] better strings for l10n
by emmapeel＠torproject.org 14 Jun '19

14 Jun '19

commit 17968159ffdc39db72da04482b44cf78f8747ac4 Author: emma peel <emma.peel(a)riseup.net> Date: Fri Jun 14 09:03:40 2019 +0200 better strings for l10n --- content/training/best-practices/contents.lr | 39 ++++++++++++++++++----------- content/training/contents.lr | 6 +++-- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/content/training/best-practices/contents.lr b/content/training/best-practices/contents.lr index 09e08aa..1f9fced 100644 --- a/content/training/best-practices/contents.lr +++ b/content/training/best-practices/contents.lr @@ -20,13 +20,16 @@ html: two-columns-page.html --- body: -Running security trainings is a fun and rewarding way to help your community conduct human rights work safely. Good preparation is essential to an effective and safe training, so we've curated some resources to help you make the most of your training event. +Running security trainings is a fun and rewarding way to help your community conduct human rights work safely. +Good preparation is essential to an effective and safe training, so we've curated some resources to help you make the most of your training event. ## Before the training _Am I the right person to give this training?_ -Security trainings can help people communicate and use the internet safely, but there are additional considerations to be made before training some at-risk groups. That's why we recommend this resource from EFF's Security Education Companion, ["Am I the right person to give this training?"](https://sec.eff.org/articles/right-person-to-train). This resource can help you be sure that you're doing the best by the community of people you wish to train. +Security trainings can help people communicate and use the internet safely, but there are additional considerations to be made before training some at-risk groups. +That's why we recommend this resource from EFF's Security Education Companion, ["Am I the right person to give this training?"](https://sec.eff.org/articles/right-person-to-train). +This resource can help you be sure that you're doing the best by the community of people you wish to train. Other questions to ask yourself before deciding to do a training: @@ -35,26 +38,32 @@ Other questions to ask yourself before deciding to do a training: Once you've answered those questions, you're ready to plan your training! -1. Find a location that is accessible, affordable, has an internet connection and other materials like a white board, projector, and screen. Make sure that the location is safe for your attendees to visit. -2. Promote your event in your community's spaces, taking safety into consideration. Under many circumstances, social media is great for promotion, but for higher risk groups, you may want to use a smaller word-of-mouth network or require community members to share information individually to other trusted people. +1. Find a location that is accessible, affordable, has an internet connection and other materials like a white board, projector, and screen. + Make sure that the location is safe for your attendees to visit. +2. Promote your event in your community's spaces, taking safety into consideration. + Under many circumstances, social media is great for promotion, but for higher risk groups, you may want to use a smaller word-of-mouth network or require community members to share information individually to other trusted people. 3. Create localized handouts for some of the more difficult concepts that you'll be teaching. 4. Make sure you have plenty of stickers to hand out to participants! -5. Create a link list of all the resources you'll be talking about. This includes downloads and PDFs of handouts. You'll share this link list on a whiteboard or project it at the training. -6. Determine how you'll do hands-on assistance at your training. Will you be able to handle this alone? Or will you require partners? If you need more help, make sure the partners you're bringing in are aware of the safety needs of the community, and communicate with your contacts in the community to make sure they're okay with you bringing in additional trainers. -7. Make sure your presentation is up-to-date (both information and screenshots) and save your presentation in two file formats -- for example, odp and pdf -- and on at least one additional device -- for example, on your computer and on a USB stick. -8. Decide how you will facilitate a safer space. We recommend using the Tor Code of Conduct. You can also start the training by asking participants to come up with their own community agreements for the space. +5. Create a link list of all the resources you'll be talking about. + This includes downloads and PDFs of handouts. + You'll share this link list on a whiteboard or project it at the training. +6. Determine how you'll do hands-on assistance at your training. + Will you be able to handle this alone? Or will you require partners? If you need more help, make sure the partners you're bringing in are aware of the safety needs of the community, and communicate with your contacts in the community to make sure they're okay with you bringing in additional trainers. +7. Make sure your presentation is up-to-date (both information and screenshots) and save your presentation in two file formats -- for example, odp and pdf -- and on at least one additional device -- for example, on your computer and on a USB stick. +8. Decide how you will facilitate a safer space. We recommend using the Tor Code of Conduct. + You can also start the training by asking participants to come up with their own community agreements for the space. ## At the training -1. Create an agenda and share it on a projection or on a whiteboard so that your participants can be prepared for the day. +1. Create an agenda and share it on a projection or on a whiteboard so that your participants can be prepared for the day. 2. Communicate about how much time the training will take, and when breaks will happen. Make sure you take breaks! -3. Communicate about when you'll take questions, either during the training, at the end, or both. +3. Communicate about when you'll take questions, either during the training, at the end, or both. 4. Communicate about how you'll offer hands-on help (if at all). -5. Communicate about how participants can contact you securely after the training. -6. Show the participants the resources at community.torproject.org and support.torproject.org. -7. Show the participants other resources like sec.eff.org. +5. Communicate about how participants can contact you securely after the training. +6. Show the participants the resources at community.torproject.org and support.torproject.org. +7. Show the participants other resources like sec.eff.org. ## After the training -1. Think about how you will evaluate your success at the training. You may want to create a follow up survey, or at least contact participants and ask them to share their feedback with you. - +1. Think about how you will evaluate your success at the training. + You may want to create a follow up survey, or at least contact participants and ask them to share their feedback with you. diff --git a/content/training/contents.lr b/content/training/contents.lr index da8dfc2..3553914 100644 --- a/content/training/contents.lr +++ b/content/training/contents.lr @@ -18,6 +18,8 @@ html: training.html --- body: -##We want to teach the world about Tor. Will you help? +## 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](https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam… for more 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](https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam… for more help.

1 0

[stem/master] Travis: stable is now 0.4.0
by atagar＠torproject.org 13 Jun '19

13 Jun '19

commit d5f8aa10ddaaffbe4c51fbe3ae6fc4fbd9b5c8e0 Author: teor <teor(a)torproject.org> Date: Thu Jun 13 18:01:32 2019 +1000 Travis: stable is now 0.4.0 Move stable job and update comments. Add a TODO for 0.4.0 and 0.4.1 nightlies Closes 30877. --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index c7882b01..a7d72821 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,24 +41,25 @@ matrix: packages: - tor env: TOR="0.2.9-nightly" TARGET="" - ## The current stable release is 0.3.5, so we don't have a separate - ## 0.3.5-stable job - addons: apt: sources: - - sourceline: 'deb https://deb.torproject.org/torproject.org xenial main' + - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.3.5.x-xenial main' key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - tor - env: TOR="stable-release" TARGET="" + env: TOR="0.3.5-nightly" TARGET="" + ## The current stable release is 0.4.0 - addons: apt: sources: - - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.3.5.x-xenial main' + - sourceline: 'deb https://deb.torproject.org/torproject.org xenial main' key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - tor - env: TOR="0.3.5-nightly" TARGET="" + env: TOR="stable-release" TARGET="" + ## TODO: add 0.4.0-nightly and experimental-0.4.1 when available + ## See #30827. ## Test all supported python releases ## Pre-installed in Travis xenial:

1 0

[stem/master] Travis: Remove obsolete tor 0.3.4 and experimental-0.4.0 jobs
by atagar＠torproject.org 13 Jun '19

13 Jun '19

commit 5a62f7684d900f398e541bd1c0ea0e2e00a9f7fc Author: teor <teor(a)torproject.org> Date: Thu Jun 13 17:59:56 2019 +1000 Travis: Remove obsolete tor 0.3.4 and experimental-0.4.0 jobs Part of 30877. --- .travis.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 91029687..c7882b01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,14 +41,6 @@ matrix: packages: - tor env: TOR="0.2.9-nightly" TARGET="" - - addons: - apt: - sources: - - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.3.4.x-xenial main' - key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' - packages: - - tor - env: TOR="0.3.4-nightly" TARGET="" ## The current stable release is 0.3.5, so we don't have a separate ## 0.3.5-stable job - addons: @@ -67,15 +59,6 @@ matrix: packages: - tor env: TOR="0.3.5-nightly" TARGET="" - ## The experimental deb line needs to be updated when 0.4.0 becomes stable - - addons: - apt: - sources: - - sourceline: 'deb https://deb.torproject.org/torproject.org tor-experimental-0.4.0.x-xenial main' - key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' - packages: - - tor - env: TOR="0.4.0-nightly" TARGET="" ## Test all supported python releases ## Pre-installed in Travis xenial:

1 0

[community/master] Add Call to Action for Relay Operators Community
by pili＠torproject.org 13 Jun '19

13 Jun '19

commit 50a39c1075be9b98be9d3bb66bb9e317ca703830 Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Jun 13 19:53:25 2019 +0200 Add Call to Action for Relay Operators Community --- templates/relay-operations.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/relay-operations.html b/templates/relay-operations.html index f53046a..5be1d16 100644 --- a/templates/relay-operations.html +++ b/templates/relay-operations.html @@ -21,7 +21,7 @@ </div> <div class="row py-5 text-center mx-auto"> <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Connect with other Relay Operators') }}</h2> - <p class="text-center">{{ _('Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.') }}</p> + <p class="text-center">{{ _('Running a relay requires technical skill and commitment, which is why we\'ve created a wealth of resources to help our relay operators. The best resource of all is the active community of relay operators on tor-relays(a)lists.torproject.org and on IRC in #tor-relays. ') }}</p> <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays"> {{ _('Relay Operators mailing list') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> </a>

1 0

[community/master] Match other sections' layout by adding call to action and link to relay operators mailing list
by pili＠torproject.org 13 Jun '19

13 Jun '19

commit 2b4284bced4a82279c3fcf5e7bb143db756253f0 Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Jun 13 19:25:34 2019 +0200 Match other sections' layout by adding call to action and link to relay operators mailing list --- templates/relay-operations.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/templates/relay-operations.html b/templates/relay-operations.html index 5482017..f53046a 100644 --- a/templates/relay-operations.html +++ b/templates/relay-operations.html @@ -19,4 +19,11 @@ </div> {% endfor %} </div> + <div class="row py-5 text-center mx-auto"> + <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Connect with other Relay Operators') }}</h2> + <p class="text-center">{{ _('Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.') }}</p> + <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays"> + {{ _('Relay Operators mailing list') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> + </a> + </div> </div>

1 0

[community/master] Update outreach section: remove tor speakers bureau card and move to call to action
by pili＠torproject.org 13 Jun '19

13 Jun '19

commit 29751b638defbc453357da12abcefb58d3898908 Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Jun 13 19:01:12 2019 +0200 Update outreach section: remove tor speakers bureau card and move to call to action --- content/outreach/speakers/contents.lr | 20 -------------------- templates/outreach.html | 22 +++++++++++++++++----- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/content/outreach/speakers/contents.lr b/content/outreach/speakers/contents.lr deleted file mode 100644 index 0092b41..0000000 --- a/content/outreach/speakers/contents.lr +++ /dev/null @@ -1,20 +0,0 @@ -section: outreach ---- -section_id: outreach ---- -color: primary ---- -_template: layout.html ---- -title: Tor Speakers Bureau ---- -subtitle: 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. ---- -key: 3 ---- -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/templates/outreach.html b/templates/outreach.html index eb45835..18c697a 100644 --- a/templates/outreach.html +++ b/templates/outreach.html @@ -9,18 +9,30 @@ </div> <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="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">{{ 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 class="card-body"> + <h4 class="card-title text-primary"> + <a href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a> + </h4> + <p class="card-text">{{ _(child.subtitle) }}</p> + </div> </div> </div> </div> {% endfor %} </div> <div class="row py-5 text-center mx-auto"> + <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Tor Speakers Bureau') }}</h2> + <p class="text-center"> + {{ _('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.') }} + </p> + <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="mailto:speaking@torproject.org"> + {{ _('Request a Speaker') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> + </a> + </div> + <div class="row py-5 text-center mx-auto"> <h2 class="display-4 text-primary text-center mx-auto">{{ _('Upcoming Tor Events') }}</h2> </div> </div>

1 0

[community/master] Match other subsection layout
by pili＠torproject.org 13 Jun '19

13 Jun '19

commit bd4ff01386116a2de4db90c7bc5a9de4386b6f40 Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Jun 13 18:16:33 2019 +0200 Match other subsection layout --- templates/training.html | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/templates/training.html b/templates/training.html index e843b1b..39d6df0 100644 --- a/templates/training.html +++ b/templates/training.html @@ -7,22 +7,24 @@ <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ _(this.section) }}" /> </div> </div> - <div class="row py-5"> - {% 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="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"> - <h2 class="text-primary display-2"><i class="fas fa-{{ child.image }}"></i></h2> - <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 class="card-body"> + <h4 class="card-title text-primary"> + <a href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a> + </h4> + <p class="card-text">{{ _(child.subtitle) }}</p> + </div> </div> </div> </div> {% endfor %} </div> <div class="row py-5 text-center mx-auto"> - <h2 class="display-4 text-primary text-center mx-auto">{{ _('Join the Community') }}</h2> + <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Join the Community') }}</h2> <p class="text-center"> {{ _('Are you interested in inviting someone from Tor to train your group? While we receive a high volume of training requests and may not be able to offer an in-person training, we may still be able to help. Contact the community team and let\'s talk.')}} </p>

1 0