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

[tpo/master] Fix avast logo
by gus＠torproject.org 24 Jul '20

24 Jul '20

commit dafbe7a290c9007ab1d641778ececc59a2231add Author: gus <gus(a)torproject.org> Date: Fri Jul 24 14:04:40 2020 -0400 Fix avast logo --- templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/membership.html b/templates/membership.html index d0058337..51755a34 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -81,7 +81,7 @@ <h3 class="col-12 text-primary display-4">Vidalia Onion Members</h3> <div class="col-md-3 col-xl-3 my-2"> <div class="card border-1 h-100"> - <img class="card-img-top p-5" src="{{ '../../static/images/membership/logos/avast.png' }}" alt="Avast"> + <img class="card-img-top p-5" src="{{ '../../static/images/membership/logos/Avast.png' }}" alt="Avast"> </div> </div> <div class="col-md-3 col-xl-3 my-2">

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 24 Jul '20

24 Jul '20

commit b2afdbc168d02dcb050e9a943364d767087014f5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 24 17:45:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contents+es.po b/contents+es.po index 8ba80880bb..8182b16064 100644 --- a/contents+es.po +++ b/contents+es.po @@ -3932,6 +3932,9 @@ msgid "" "Not sure where to start? Here you can find an overview of the current " "localization status for all of the different Tor Project projects." msgstr "" +"¿No estas seguro por donde empezar? Aquí podes encontrar una visión general " +"del estatus de localización actual de los diferentes proyectos de Tor " +"Project." #: https//community.torproject.org/localization/current-status/ #: (content/localization/current-status/contents+en.lrpage.body)

1 0

[tpo/master] Removed l10n tags from the template. It is not needed now.
by gus＠torproject.org 24 Jul '20

24 Jul '20

commit 694f44c5cdb02eb29a32d4dacd550e7d830114cd Author: antonela <antonela(a)torproject.org> Date: Fri Jul 24 12:06:41 2020 -0300 Removed l10n tags from the template. It is not needed now. --- templates/membership.html | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/templates/membership.html b/templates/membership.html index 6fc3cbd0..58a98ed2 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -1,11 +1,11 @@ <div class="container py-3"> - <h3 class="text-primary display-5">{{ _('Show your support for privacy online') }}</h3> - <p>{{ _('When your organization joins the Tor Project’s Membership Program, you are demonstrating your commitment to privacy online and supporting Tor’s agility and development. In return, you become a closer part of our community with three specific benefits: access to our Onion Advisors group to help you integrate Tor into your product, inclusion in conversations and exclusive meetings with the Tor Project team to learn about what we are cooking at Tor, and public promotion of your membership. - If you are interested in becoming a member, please reach out to us at giving(a)torproject.org.') }}</p> + <h3 class="text-primary display-5">Show your support for privacy online</h3> + <p>When your organization joins the Tor Project’s Membership Program, you are demonstrating your commitment to privacy online and supporting Tor’s agility and development. In return, you become a closer part of our community with three specific benefits: access to our Onion Advisors group to help you integrate Tor into your product, inclusion in conversations and exclusive meetings with the Tor Project team to learn about what we are cooking at Tor, and public promotion of your membership. + If you are interested in becoming a member, please reach out to us at giving(a)torproject.org.</p> </div> <div class="container py-3"> - <h3 class="text-primary display-5">{{ _('Membership Tiers') }}</h3> - <p>{{ _('Membership tiers differ in their level of public promotion. No matter the level of your contribution, members receive the same community benefits: access to our Onion Advisors group to help integrate Tor into your project and inclusion in conversations and exclusive meetings with the Tor Project team. At Tor, we love all of the onions, but shallots are the tastiest!') }}</p> + <h3 class="text-primary display-5">Membership Tiers</h3> + <p>Membership tiers differ in their level of public promotion. No matter the level of your contribution, members receive the same community benefits: access to our Onion Advisors group to help integrate Tor into your project and inclusion in conversations and exclusive meetings with the Tor Project team. At Tor, we love all of the onions, but shallots are the tastiest!</p> </div> <div class="container"> <div class="row py-3"> @@ -13,9 +13,9 @@ <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '/static/images/membership/green.png' }}" /> </div> <div class="col-sm-8"> - <h4 class="h2 col-12 text-primary p-0">{{ _('Green Onion Member') }}</h4> - <p class="nick">{{ _('$10,000 - $49,999 per year') }}</p> - <p>{{ _('Your organization’s name, linking back to your website, is featured on our Membership Program page.') }}</p> + <h4 class="h2 col-12 text-primary p-0">Green Onion Member</h4> + <p class="nick">$10,000 - $49,999 per year</p> + <p>Your organization’s name, linking back to your website, is featured on our Membership Program page.</p> </div> </div> <div class="row py-3"> @@ -23,9 +23,9 @@ <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '/static/images/membership/vidalia.png' }}" /> </div> <div class="col-sm-8"> - <h4 class="h2 col-12 text-primary p-0">{{ _('Vidalia Onion Member') }}</h4> - <p class="nick">{{ _('$50,000 - $99,999 per year') }}</p> - <p>{{ _('Your organization’s logo, linking back to your website, is featured on our Membership Program page. We will also engage in social media promotion.') }}</p> + <h4 class="h2 col-12 text-primary p-0">Vidalia Onion Member</h4> + <p class="nick">$50,000 - $99,999 per year</p> + <p>Your organization’s logo, linking back to your website, is featured on our Membership Program page. We will also engage in social media promotion.</p> </div> </div> <div class="row py-3"> @@ -33,15 +33,15 @@ <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '/static/images/membership/shallot.png' }}" /> </div> <div class="col-sm-8"> - <h4 class="h2 col-12 text-primary p-0">{{ _('Shallot Onion Member') }}</h4> - <p class="nick">{{ _('≥ $100,000 per year year') }}</p> - <p>{{ _('Your organization’s logo, linking back to your website, along with a quote from your organization about your motivation for joining the Membership Program, is featured on our Membership Program page. We will also engage in social media, events, and other promotional mechanisms.') }}</p> + <h4 class="h2 col-12 text-primary p-0">Shallot Onion Member</h4> + <p class="nick">≥ $100,000 per year year</p> + <p>Your organization’s logo, linking back to your website, along with a quote from your organization about your motivation for joining the Membership Program, is featured on our Membership Program page. We will also engage in social media, events, and other promotional mechanisms.</p> </div> </div> </div> <div class="container"> <div class="row py-5"> - <h3 class="col-12 text-primary display-4">{{ _('Shallot Onion Members') }}</h3> + <h3 class="col-12 text-primary display-4">Shallot Onion Members</h3> <div class="col-md-4 col-xl-4 my-2"> <div class="card border-1 h-100"> <img class="card-img-top" src="#" alt="Card image cap"> @@ -73,7 +73,7 @@ </div> <div class="container"> <div class="row py-5"> - <h3 class="col-12 text-primary display-4">{{ _('Vidalia Onion Members') }}</h3> + <h3 class="col-12 text-primary display-4">Vidalia Onion Members</h3> <div class="col-md-3 col-xl-3 my-2"> <div class="card border-1 h-100"> <img class="card-img-top" src="#" alt="Card image cap"> @@ -146,7 +146,6 @@ </div> </div> <div class="row col-sm-8 py-5 text-center mx-auto"> - <h2 class="text-primary text-center mx-auto">{{ _('Become a Member') }}</h2> - <p class="text-center"> - {{ _('Join the Tor Project Membership Program and demonstrate your commitment to privacy online and become more deeply involved in the Tor community. Email us at giving(a)torproject.org to get started.') }}</p> + <h2 class="text-primary text-center mx-auto">Become a Member</h2> + <p class="text-center">Join the Tor Project Membership Program and demonstrate your commitment to privacy online and become more deeply involved in the Tor community. Email us at giving(a)torproject.org to get started.</p> </div>

1 0

[tpo/master] Merge branch 'master' into 'master'
by gus＠torproject.org 24 Jul '20

24 Jul '20

commit 45325bd07147bafbcbbd4dba662f544a53aef25c Merge: 8b6151b5 f4bad6a2 Author: Antonela <antonela(a)torproject.org> Date: Mon Jul 20 13:35:14 2020 +0000 Merge branch 'master' into 'master' Master See merge request antonela/tpo!1 .github/FUNDING.yml | 3 + .htaccess | 17 +- README.md | 63 + assets/javascript | 2 +- assets/scss | 2 +- assets/static/css | 2 +- assets/static/fonts | 2 +- assets/static/images/circle-pattern.png | Bin 556240 -> 106272 bytes assets/static/images/dcs-logo.png | Bin 0 -> 10135 bytes assets/static/images/favicon/favicon.ico | Bin 0 -> 4286 bytes assets/static/images/favicon/favicon.png | Bin 0 -> 1184 bytes assets/static/images/home/png/take-back(a)3x.png | Bin 0 -> 124543 bytes assets/static/images/home/svg/take-back.svg | 7902 ++++++++++++++++++++ assets/static/images/people/acute.png | Bin 0 -> 43888 bytes assets/static/images/people/ailanthus.png | Bin 40198 -> 0 bytes assets/static/images/people/dennisjackson.png | Bin 0 -> 45557 bytes assets/static/images/people/ggus.png | Bin 0 -> 21509 bytes assets/static/images/people/isabela.png | Bin 46938 -> 834334 bytes assets/static/images/people/jnewsome.png | Bin 0 -> 79184 bytes assets/static/images/people/narrira.png | Bin 0 -> 45902 bytes assets/static/images/people/orig/acute.jpg | Bin 0 -> 33472 bytes assets/static/images/people/orig/wshackleton.png | Bin 0 -> 239868 bytes assets/static/images/people/wshackleton.png | Bin 0 -> 29922 bytes assets/static/images/privchat/carmela.png | Bin 0 -> 274355 bytes assets/static/images/privchat/dkg.png | Bin 0 -> 230884 bytes assets/static/images/privchat/matt.png | Bin 0 -> 199735 bytes assets/static/images/privchat/pattern.png | Bin 0 -> 325952 bytes assets/static/images/privchat/privchat.png | Bin 0 -> 19090 bytes assets/static/images/privchat/privchat.svg | 11 + assets/static/images/privchat/roger.png | Bin 0 -> 192986 bytes .../sponsors/Georgetown_logotype_S_blueRGB.png | Bin 0 -> 31850 bytes assets/static/images/sponsors/Mullvad_logo.png | Bin 0 -> 45792 bytes assets/static/images/sponsors/RIPE_NCC_logo.png | Bin 0 -> 49160 bytes .../sponsors/craig-newmark-philanthropies.png | Bin 0 -> 28397 bytes assets/static/images/sponsors/dial.png | Bin 0 -> 26001 bytes assets/static/images/sponsors/gsoc.png | Bin 0 -> 33641 bytes assets/static/images/sponsors/zcash_logo.png | Bin 0 -> 48816 bytes assets/static/images/tb95/onion-auth.png | Bin 0 -> 52389 bytes assets/static/images/tb95/onion-auth2.png | Bin 0 -> 79194 bytes assets/static/images/tb95/onion-auth2(a)2x.png | Bin 0 -> 270354 bytes assets/static/images/tb95/onion-auth(a)2x.png | Bin 0 -> 192867 bytes assets/static/images/tb95/onion-error.png | Bin 0 -> 86735 bytes assets/static/images/tb95/onion-error(a)2x.png | Bin 0 -> 305169 bytes .../images/tb95/onion-location-propublica.png | Bin 0 -> 195783 bytes .../images/tb95/onion-location-propublica2.png | Bin 0 -> 84147 bytes .../images/tb95/onion-location-propublica2(a)2x.png | Bin 0 -> 295176 bytes .../images/tb95/onion-location-propublica(a)2x.png | Bin 0 -> 659848 bytes .../static/images/tb95/onion-location-riseup.png | Bin 0 -> 152691 bytes .../images/tb95/onion-location-riseup(a)2x.png | Bin 0 -> 471532 bytes assets/static/images/tb95/onion-names.png | Bin 0 -> 89241 bytes assets/static/images/tb95/onion-names(a)2x.png | Bin 0 -> 306049 bytes assets/static/images/tb95/onion-url-bar-update.png | Bin 0 -> 39914 bytes .../static/images/tb95/onion-url-bar-update(a)2x.png | Bin 0 -> 108234 bytes .../png/TBAa-onboarding.png | Bin 58890 -> 54696 bytes .../png/TBAa-onboarding(a)2x.png | Bin 159182 -> 145259 bytes assets/static/js | 2 +- assets/static/keys/dawuud.txt | 471 -- assets/static/keys/dennisjackson.txt | 52 + assets/static/keys/jnewsome.txt | 52 + assets/static/keys/juris.txt | 321 - assets/static/keys/nyinz.txt | 57 - assets/static/keys/sstevenson.txt | 79 + assets/static/keys/t0mmy.txt | 51 - configs/i18n.ini | 2 +- content/about/cy-pres/contents.lr | 6 +- content/about/history/contents.lr | 4 +- .../about/jobs/backend-engineer-ooni/contents.lr | 6 +- content/about/jobs/browser-developer/contents.lr | 2 + .../jobs/developer-data-architect/contents.lr | 2 + content/about/jobs/executive-assistant/contents.lr | 105 + .../jobs/senior-system-administrator/contents.lr | 2 + .../jobs/shadow-simulation-developer/contents.lr | 91 + content/about/people/acute/contents.lr | 19 + content/about/people/agrabeli/contents.lr | 2 +- content/about/people/ahf/contents.lr | 2 +- content/about/people/ailanthus/contents.lr | 19 - content/about/people/anarcat/contents.lr | 17 + content/about/people/arma/contents.lr | 4 +- content/about/people/dawuud/contents.lr | 20 - content/about/people/djackson/contents.lr | 21 + content/about/people/geko/contents.lr | 2 +- content/about/people/ggus/contents.lr | 6 +- content/about/people/hellais/contents.lr | 2 +- content/about/people/igt0/contents.lr | 17 - content/about/people/isra/contents.lr | 15 - content/about/people/jnewsome/contents.lr | 23 + content/about/people/juga/contents.lr | 2 +- content/about/people/juris/contents.lr | 15 - content/about/people/leif/contents.lr | 13 - content/about/people/meejah/contents.lr | 2 + content/about/people/narrira/contents.lr | 17 + content/about/people/pepijn/contents.lr | 19 - content/about/people/sajolida/contents.lr | 2 +- content/about/people/schneier-core/contents.lr | 15 + content/about/people/schneier/contents.lr | 13 + content/about/people/sengler/contents.lr | 17 + content/about/people/sstevenson/contents.lr | 4 + content/about/people/wayward/contents.lr | 19 - content/about/people/wshackleton/contents.lr | 20 + .../about/reports/2009-data-collection/contents.lr | 2 +- .../about/reports/2010-irs-form-990/contents.lr | 4 +- content/about/reports/2011-form-pc/contents.lr | 2 +- .../reports/2012-financial-statements/contents.lr | 2 +- content/about/reports/2012-form-pc/contents.lr | 2 +- content/about/reports/2013-form-pc/contents.lr | 2 +- .../2016-12-05-tor-project-bylaws/contents.lr | 6 +- .../about/sponsors/DARPA-georgetown/contents.lr | 19 + content/about/sponsors/DARPA-penn/contents.lr | 6 +- content/about/sponsors/RIPE NCC/.gitkeep | 0 .../about/sponsors/USSD-DHRL-harvard/contents.lr | 4 +- content/about/sponsors/USSD-DHRL/contents.lr | 3 +- content/about/sponsors/Zcash/contents.lr | 20 + .../craig-newmark-philanthropies/contents.lr | 19 + content/about/sponsors/dial/contents.lr | 19 + content/about/sponsors/google-soc/contents.lr | 14 +- content/about/sponsors/google-sod/contents.lr | 4 +- content/about/sponsors/handshake/contents.lr | 2 +- content/about/sponsors/mozilla/contents.lr | 4 +- content/about/sponsors/mullvad-vpn/contents.lr | 19 + content/about/sponsors/nsf-georgetown/contents.lr | 12 +- content/about/sponsors/nsf-minnesota/contents.lr | 2 +- content/about/sponsors/nsf-rochester/contents.lr | 4 +- content/about/sponsors/otf/contents.lr | 3 +- content/about/sponsors/ripe-ncc/contents.lr | 19 + content/about/sponsors/rose/contents.lr | 2 +- content/about/trademark/contents.lr | 21 + content/about/trademark/trademark-faq/contents.lr | 15 + .../trademark-faq/trademark-faq-1/contents.lr | 13 + .../trademark-faq/trademark-faq-2/contents.lr | 12 + .../trademark-faq/trademark-faq-3/contents.lr | 13 + .../trademark-faq/trademark-faq-4/contents.lr | 16 + .../trademark-faq/trademark-faq-5/contents.lr | 21 + .../trademark-faq/trademark-faq-6/contents.lr | 10 + .../trademark-faq/trademark-faq-7/contents.lr | 13 + content/download/alpha/contents.lr | 2 +- content/download/languages/contents.lr | 2 +- content/menu/contents.lr | 2 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../bbc-news-launches-tor-mirror-site/contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../interview-with-the-tor-project/contents.lr | 19 + .../contents.lr | 19 + content/press/new-release-tor-browser/contents.lr | 2 +- .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + content/privchat/contents.lr | 3 + .../torbrowser/RecommendedTBBVersions/contents.lr | 24 +- content/releases/contents.lr | 11 + content/releases/tor-browser-95/contents.lr | 83 + content/thank-you/contents.lr | 1 - databags/about+bn-BD.ini | 1 - databags/about+de.ini | 1 - databags/about+es.ini | 1 - databags/about+fr.ini | 1 - databags/about+id.ini | 1 - databags/about+is.ini | 1 - databags/about+it.ini | 1 - databags/about+ka.ini | 1 - databags/about+ko.ini | 1 - databags/about+pt-BR.ini | 1 - databags/about+ru.ini | 1 - databags/about+tr.ini | 1 - databags/about+zh-CN.ini | 1 - databags/{about+en.ini => about.ini} | 5 + databags/alternatives.ini | 8 +- databags/download-alternatives-alpha.ini | 14 +- databags/download-alternatives.ini | 22 +- databags/links.ini | 1 + databags/menu+bn-BD.ini | 19 - databags/menu+de.ini | 19 - databags/menu+en.ini | 19 - databags/menu+es.ini | 19 - databags/menu+fr.ini | 19 - databags/menu+id.ini | 19 - databags/menu+is.ini | 19 - databags/menu+it.ini | 19 - databags/menu+ka.ini | 19 - databags/menu+ko.ini | 19 - databags/menu+pt-BR.ini | 19 - databags/menu+ru.ini | 19 - databags/menu+tr.ini | 19 - databags/menu+zh-CN.ini | 19 - databags/menu.ini | 1 + databags/menu_footer+bn-BD.ini | 1 - databags/menu_footer+de.ini | 1 - databags/menu_footer+en.ini | 15 - databags/menu_footer+es.ini | 1 - databags/menu_footer+fr.ini | 1 - databags/menu_footer+id.ini | 1 - databags/menu_footer+is.ini | 1 - databags/menu_footer+it.ini | 1 - databags/menu_footer+ka.ini | 1 - databags/menu_footer+ko.ini | 1 - databags/menu_footer+pt-BR.ini | 1 - databags/menu_footer+ru.ini | 1 - databags/menu_footer+tr.ini | 1 - databags/menu_footer+zh-CN.ini | 1 - databags/menu_footer.ini | 1 + databags/platforms.ini | 4 +- databags/versions.ini | 20 +- lego | 2 +- models/job.ini | 4 + models/person.ini | 5 + models/question.ini | 20 + models/topic.ini | 23 + models/trademark.ini | 34 + templates/about.html | 16 +- templates/banner.html | 1 + templates/contact.html | 13 +- templates/download-android.html | 34 +- templates/download-languages.html | 6 +- templates/download-options.html | 44 +- templates/download-tor.html | 14 +- templates/download.html | 6 +- templates/footer-min.html | 92 + templates/hero-download.html | 32 +- templates/home.html | 2 +- templates/homepage.html | 18 +- templates/jobs.html | 2 +- templates/layout.html | 13 +- templates/macros/contact.html | 2 +- templates/macros/downloads.html | 19 +- templates/macros/footer.html | 2 +- templates/macros/people.html | 5 +- templates/macros/question.html | 22 + templates/macros/topic.html | 18 + templates/meta.html | 16 +- templates/navbar-min.html | 49 + templates/people.html | 24 +- templates/privchat.html | 111 + templates/question.html | 6 + templates/release.html | 65 + templates/releases.html | 14 + templates/sidenav.html | 5 +- templates/thank-you.html | 18 +- templates/topic.html | 6 + templates/trademark.html | 6 + tpo.lektorproject | 7 +- 250 files changed, 10086 insertions(+), 1529 deletions(-)

1 0

[tpo/master] Add membership program page
by gus＠torproject.org 24 Jul '20

24 Jul '20

commit 0c73fa4b871f89e95b82f8438e64043a27b707ba Author: antonela <antonela(a)torproject.org> Date: Mon Jul 20 11:34:18 2020 -0300 Add membership program page --- assets/static/images/membership/green.png | Bin 0 -> 239288 bytes assets/static/images/membership/shallot.png | Bin 0 -> 208458 bytes assets/static/images/membership/vidalia.png | Bin 0 -> 169283 bytes content/about/membership/contents.lr | 13 +++ templates/membership.html | 152 ++++++++++++++++++++++++++++ 5 files changed, 165 insertions(+) diff --git a/assets/static/images/membership/green.png b/assets/static/images/membership/green.png new file mode 100644 index 00000000..c98a2222 Binary files /dev/null and b/assets/static/images/membership/green.png differ diff --git a/assets/static/images/membership/shallot.png b/assets/static/images/membership/shallot.png new file mode 100644 index 00000000..985a38d3 Binary files /dev/null and b/assets/static/images/membership/shallot.png differ diff --git a/assets/static/images/membership/vidalia.png b/assets/static/images/membership/vidalia.png new file mode 100644 index 00000000..4c70c63a Binary files /dev/null and b/assets/static/images/membership/vidalia.png differ diff --git a/content/about/membership/contents.lr b/content/about/membership/contents.lr new file mode 100644 index 00000000..fd7aa00f --- /dev/null +++ b/content/about/membership/contents.lr @@ -0,0 +1,13 @@ +section: About +--- +section_id: membership +--- +html: membership.html +--- +color: primary +--- +title: Membership +--- +body: + +Community has always been at the heart of Tor's strength. In this spirit, we created the Tor Project's Membership Program. Our goal is to build a supportive relationship between our nonprofit and private sector companies and organizations that use our technology or want to support our mission. diff --git a/templates/membership.html b/templates/membership.html new file mode 100644 index 00000000..6fc3cbd0 --- /dev/null +++ b/templates/membership.html @@ -0,0 +1,152 @@ +<div class="container py-3"> + <h3 class="text-primary display-5">{{ _('Show your support for privacy online') }}</h3> + <p>{{ _('When your organization joins the Tor Project’s Membership Program, you are demonstrating your commitment to privacy online and supporting Tor’s agility and development. In return, you become a closer part of our community with three specific benefits: access to our Onion Advisors group to help you integrate Tor into your product, inclusion in conversations and exclusive meetings with the Tor Project team to learn about what we are cooking at Tor, and public promotion of your membership. + If you are interested in becoming a member, please reach out to us at giving(a)torproject.org.') }}</p> +</div> +<div class="container py-3"> + <h3 class="text-primary display-5">{{ _('Membership Tiers') }}</h3> + <p>{{ _('Membership tiers differ in their level of public promotion. No matter the level of your contribution, members receive the same community benefits: access to our Onion Advisors group to help integrate Tor into your project and inclusion in conversations and exclusive meetings with the Tor Project team. At Tor, we love all of the onions, but shallots are the tastiest!') }}</p> +</div> +<div class="container"> + <div class="row py-3"> + <div class="col"> + <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '/static/images/membership/green.png' }}" /> + </div> + <div class="col-sm-8"> + <h4 class="h2 col-12 text-primary p-0">{{ _('Green Onion Member') }}</h4> + <p class="nick">{{ _('$10,000 - $49,999 per year') }}</p> + <p>{{ _('Your organization’s name, linking back to your website, is featured on our Membership Program page.') }}</p> + </div> + </div> + <div class="row py-3"> + <div class="col"> + <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '/static/images/membership/vidalia.png' }}" /> + </div> + <div class="col-sm-8"> + <h4 class="h2 col-12 text-primary p-0">{{ _('Vidalia Onion Member') }}</h4> + <p class="nick">{{ _('$50,000 - $99,999 per year') }}</p> + <p>{{ _('Your organization’s logo, linking back to your website, is featured on our Membership Program page. We will also engage in social media promotion.') }}</p> + </div> + </div> + <div class="row py-3"> + <div class="col"> + <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '/static/images/membership/shallot.png' }}" /> + </div> + <div class="col-sm-8"> + <h4 class="h2 col-12 text-primary p-0">{{ _('Shallot Onion Member') }}</h4> + <p class="nick">{{ _('≥ $100,000 per year year') }}</p> + <p>{{ _('Your organization’s logo, linking back to your website, along with a quote from your organization about your motivation for joining the Membership Program, is featured on our Membership Program page. We will also engage in social media, events, and other promotional mechanisms.') }}</p> + </div> + </div> +</div> +<div class="container"> + <div class="row py-5"> + <h3 class="col-12 text-primary display-4">{{ _('Shallot Onion Members') }}</h3> + <div class="col-md-4 col-xl-4 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + <div class="card-body"> + <h4><a href="#">Shallot Onion Member</a></h4> + Some description + </div> + </div> + </div> + <div class="col-md-4 col-xl-4 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + <div class="card-body"> + <h4><a href="#">Shallot Onion Member</a></h4> + Some description + </div> + </div> + </div> + <div class="col-md-4 col-xl-4 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + <div class="card-body"> + <h4><a href="#">Shallot Onion Member</a></h4> + Some description + </div> + </div> + </div> + </div> +</div> +<div class="container"> + <div class="row py-5"> + <h3 class="col-12 text-primary display-4">{{ _('Vidalia Onion Members') }}</h3> + <div class="col-md-3 col-xl-3 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + </div> + </div> + <div class="col-md-3 col-xl-3 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + </div> + </div> + <div class="col-md-3 col-xl-3 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + </div> + </div> + <div class="col-md-3 col-xl-3 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + </div> + </div> + <div class="col-md-3 col-xl-3 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + </div> + </div> + <div class="col-md-3 col-xl-3 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + </div> + </div> + <div class="col-md-3 col-xl-3 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + </div> + </div> + <div class="col-md-3 col-xl-3 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + </div> + </div> + </div> +</div> +<div class="container"> + <div class="row py-5"> + <h3 class="col-12 text-primary display-4">{{ _('Green Onion Members') }}</h3> + <div class="col-md-6"> + <ul class="jobs-ul"> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + </ul> + </div> + <div class="col-md-6"> + <ul class="jobs-ul"> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + </ul> + </div> + </div> +</div> +<div class="row col-sm-8 py-5 text-center mx-auto"> + <h2 class="text-primary text-center mx-auto">{{ _('Become a Member') }}</h2> + <p class="text-center"> + {{ _('Join the Tor Project Membership Program and demonstrate your commitment to privacy online and become more deeply involved in the Tor community. Email us at giving(a)torproject.org to get started.') }}</p> +</div>

1 0

[tpo/master] Fix images url
by gus＠torproject.org 24 Jul '20

24 Jul '20

commit 78300c166856da114ccfbd994e549fc9df70c6af Author: antonela <antonela(a)torproject.org> Date: Fri Jul 24 12:26:45 2020 -0300 Fix images url --- templates/membership.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/membership.html b/templates/membership.html index 58a98ed2..c1d0982c 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -10,7 +10,7 @@ <div class="container"> <div class="row py-3"> <div class="col"> - <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '/static/images/membership/green.png' }}" /> + <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '../../static/images/membership/green.png' }}" /> </div> <div class="col-sm-8"> <h4 class="h2 col-12 text-primary p-0">Green Onion Member</h4> @@ -20,7 +20,7 @@ </div> <div class="row py-3"> <div class="col"> - <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '/static/images/membership/vidalia.png' }}" /> + <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '../../static/images/membership/vidalia.png' }}" /> </div> <div class="col-sm-8"> <h4 class="h2 col-12 text-primary p-0">Vidalia Onion Member</h4> @@ -30,7 +30,7 @@ </div> <div class="row py-3"> <div class="col"> - <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '/static/images/membership/shallot.png' }}" /> + <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '../../static/images/membership/shallot.png' }}" /> </div> <div class="col-sm-8"> <h4 class="h2 col-12 text-primary p-0">Shallot Onion Member</h4> @@ -145,7 +145,7 @@ </div> </div> </div> -<div class="row col-sm-8 py-5 text-center mx-auto"> +<div class="row col-sm-8 py-5 text-center mx-auto bg-membership" style="background-image:url('static/images/membership/shallot.png')"/> <h2 class="text-primary text-center mx-auto">Become a Member</h2> <p class="text-center">Join the Tor Project Membership Program and demonstrate your commitment to privacy online and become more deeply involved in the Tor community. Email us at giving(a)torproject.org to get started.</p> </div>

1 0

[tpo/master] Update contents.lr
by gus＠torproject.org 24 Jul '20

24 Jul '20

commit 9cf593db0f42ea1c78baf9c5a47e48394378306f Author: antonela <antonela(a)torproject.org> Date: Fri Jul 24 12:12:33 2020 -0300 Update contents.lr --- content/about/membership/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/membership/contents.lr b/content/about/membership/contents.lr index fd7aa00f..3c3465c6 100644 --- a/content/about/membership/contents.lr +++ b/content/about/membership/contents.lr @@ -10,4 +10,4 @@ title: Membership --- body: -Community has always been at the heart of Tor's strength. In this spirit, we created the Tor Project's Membership Program. Our goal is to build a supportive relationship between our nonprofit and private sector companies and organizations that use our technology or want to support our mission. +Community has always been at the heart of Tor's strength. In this spirit, we created the Tor Project's Membership Program. Our goal is to build a supportive relationship between our nonprofit and private sector organizations that use our technology or want to support our mission.

1 0

[tpo/master] Make text visible with background
by gus＠torproject.org 24 Jul '20

24 Jul '20

commit fdcce1809b17c184eac2fd58b58bda841f8699bf Author: antonela <antonela(a)torproject.org> Date: Fri Jul 24 13:37:22 2020 -0300 Make text visible with background --- templates/membership.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/membership.html b/templates/membership.html index f703df29..8c3efaec 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -127,7 +127,7 @@ </div> <div class="col-12 bg-membership" style="background-image: url('../../static/images/membership/header.png'); background-size:cover;"> <div class="row col-sm-8 py-5 text-center mx-auto"/> - <h2 class="text-primary text-center mx-auto">Become a Member</h2> - <p class="text-center">Join the Tor Project Membership Program and demonstrate your commitment to privacy online and become more deeply involved in the Tor community. Email us at <mark>giving(a)torproject.org.</mark> to get started.</p> + <h2 class="bg-white text-primary text-center p-4 mx-auto my-0">Become a Member</h2> + <p class="bg-white text-center p-4">Join the Tor Project Membership Program and demonstrate your commitment to privacy online and become more deeply involved in the Tor community. Email us at <mark>giving(a)torproject.org.</mark> to get started.</p> </div> </div>

1 0

[tpo/master] Include CC links
by gus＠torproject.org 24 Jul '20

24 Jul '20

commit 56d4e85ecd80a5caabf7fc7885368de48d1cc0de Author: antonela <antonela(a)torproject.org> Date: Fri Jul 24 13:52:34 2020 -0300 Include CC links --- templates/membership.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/templates/membership.html b/templates/membership.html index b70fb7e1..d0058337 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -39,6 +39,13 @@ </div> </div> </div> +<div class="container"> + <div class="row p-5 my-5 border text-center"> + <p> + Your commitment to the community is at the heart of the Tor Project Membership Program, and our members agree to join our community. As such, Members agree to adhere to <a href="https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.t…" title="Code of Conduct" target="_blank">Tor's Code of Conduct</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/social_contract.t…" title="Social Contract" target="_blank">Social Contract</a>, and our <a href="https://gitweb.torproject.org/community/policies.git/tree/statement_of_valu…" title="Statement of Values" target="_blank">Statement of Values</a>. + </p> + </div> + </div> <div class="container" id="shallot"> <div class="row py-5"> <h3 class="col-12 text-primary display-4">Shallot Onion Members</h3>

1 0

[tpo/master] Add background and highlights
by gus＠torproject.org 24 Jul '20

24 Jul '20

commit 6e6112d6deb03f1cf0cb3b152002a7b0b725bd58 Author: antonela <antonela(a)torproject.org> Date: Fri Jul 24 13:21:33 2020 -0300 Add background and highlights --- assets/static/images/membership/header.png | Bin 0 -> 334841 bytes templates/membership.html | 8 +++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/assets/static/images/membership/header.png b/assets/static/images/membership/header.png new file mode 100644 index 00000000..08917a7e Binary files /dev/null and b/assets/static/images/membership/header.png differ diff --git a/templates/membership.html b/templates/membership.html index c1d0982c..9aa1b949 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -1,7 +1,7 @@ <div class="container py-3"> <h3 class="text-primary display-5">Show your support for privacy online</h3> <p>When your organization joins the Tor Project’s Membership Program, you are demonstrating your commitment to privacy online and supporting Tor’s agility and development. In return, you become a closer part of our community with three specific benefits: access to our Onion Advisors group to help you integrate Tor into your product, inclusion in conversations and exclusive meetings with the Tor Project team to learn about what we are cooking at Tor, and public promotion of your membership. - If you are interested in becoming a member, please reach out to us at giving(a)torproject.org.</p> + If you are interested in becoming a member, please reach out to us at <mark>giving(a)torproject.org.</mark></p> </div> <div class="container py-3"> <h3 class="text-primary display-5">Membership Tiers</h3> @@ -145,7 +145,9 @@ </div> </div> </div> -<div class="row col-sm-8 py-5 text-center mx-auto bg-membership" style="background-image:url('static/images/membership/shallot.png')"/> +<div class="col-12 bg-membership" style="background-image: url('../../static/images/membership/header.png'); background-size:cover;"> +<div class="row col-sm-8 py-5 text-center mx-auto"/> <h2 class="text-primary text-center mx-auto">Become a Member</h2> - <p class="text-center">Join the Tor Project Membership Program and demonstrate your commitment to privacy online and become more deeply involved in the Tor community. Email us at giving(a)torproject.org to get started.</p> + <p class="text-center">Join the Tor Project Membership Program and demonstrate your commitment to privacy online and become more deeply involved in the Tor community. Email us at <mark>giving(a)torproject.org.</mark> to get started.</p> +</div> </div>

1 0