commit 6e64a7660f0b98536be337d8c5338a3566452c01 Author: antonela <antonela@torproject.org> Date: Tue Nov 24 10:53:27 2020 -0300 Update content structure based on discussion https://gitlab.torproject.org/tpo/web/dev/-/issues/6 --- content/hacking-on-tor/hacking-tor/contents.lr | 2 +- content/hacking-on-tor/research/contents.lr | 2 +- .../writing-documentation/contents.lr | 2 +- content/{advanced-tor => manage-tor}/contents.lr | 8 +-- .../{advanced-tor => manage-tor}/nyx/contents.lr | 0 content/manage-tor/onion-balance/contents.lr | 19 +++++ content/tor-ecosystem/onionshare/contents.lr | 2 +- content/tor-ecosystem/tor-browser/contents.lr | 14 ++-- .../tor-browser-android/contents.lr | 0 .../tor-browser/tor-browser}/contents.lr | 8 +-- content/tor-network/dev-tools/contents.lr | 10 ++- content/tor-network/tor-design/contents.lr | 2 +- content/tor-network/tor-protocol/contents.lr | 4 +- content/tor-network/tor/contents.lr | 19 +++++ templates/home.html | 20 +++--- templates/project.html | 84 +++++++++++++--------- 16 files changed, 127 insertions(+), 69 deletions(-) diff --git a/content/hacking-on-tor/hacking-tor/contents.lr b/content/hacking-on-tor/hacking-tor/contents.lr index f045089..c1452d7 100644 --- a/content/hacking-on-tor/hacking-tor/contents.lr +++ b/content/hacking-on-tor/hacking-tor/contents.lr @@ -10,7 +10,7 @@ key: 1 --- html: two-columns-page.html --- -title: Hacking Tor +title: Hacking on Tor Software --- subtitle: a two lines subtitle --- diff --git a/content/hacking-on-tor/research/contents.lr b/content/hacking-on-tor/research/contents.lr index e3b0075..b27885b 100644 --- a/content/hacking-on-tor/research/contents.lr +++ b/content/hacking-on-tor/research/contents.lr @@ -10,7 +10,7 @@ key: 3 --- html: two-columns-page.html --- -title: Research +title: research.torproject.org --- subtitle: a two lines subtitle --- diff --git a/content/hacking-on-tor/writing-documentation/contents.lr b/content/hacking-on-tor/writing-documentation/contents.lr index 3e48103..066bc53 100644 --- a/content/hacking-on-tor/writing-documentation/contents.lr +++ b/content/hacking-on-tor/writing-documentation/contents.lr @@ -10,7 +10,7 @@ key: 2 --- html: two-columns-page.html --- -title: Writing documentation +title: Writing dev documentation --- subtitle: a two lines subtitle --- diff --git a/content/advanced-tor/contents.lr b/content/manage-tor/contents.lr similarity index 74% rename from content/advanced-tor/contents.lr rename to content/manage-tor/contents.lr index 6660dd6..502ce59 100644 --- a/content/advanced-tor/contents.lr +++ b/content/manage-tor/contents.lr @@ -1,16 +1,16 @@ -section: advanced tor +section: manage tor --- -section_id: advanced-tor +section_id: manage-tor --- color: primary --- -key: 5 +key: 4 --- html: section.html --- cta: Call to Action --- -title: Advanced Tor +title: Manage Tor --- subtitle: Managing your tor installation. helpful tools for the advanced relay or onion service operator --- diff --git a/content/advanced-tor/nyx/contents.lr b/content/manage-tor/nyx/contents.lr similarity index 100% rename from content/advanced-tor/nyx/contents.lr rename to content/manage-tor/nyx/contents.lr diff --git a/content/manage-tor/onion-balance/contents.lr b/content/manage-tor/onion-balance/contents.lr new file mode 100644 index 0000000..73f7243 --- /dev/null +++ b/content/manage-tor/onion-balance/contents.lr @@ -0,0 +1,19 @@ +section: advanced tor +--- +section_id: advanced-tor +--- +color: primary +--- +image: eye +--- +key: 2 +--- +html: project.html +--- +title: OnionBalance +--- +subtitle: OnionBalance is the best way to load balance onion services across multiple backend Tor instances. +--- +body: + +OnionBalance is the best way to load balance onion services across multiple backend Tor instances. This way the load of introduction and rendezvous requests get distributed across multiple hosts. OnionBalance provides load-balancing while also making onion services more resilient and reliable by eliminating single points-of-failure. diff --git a/content/tor-ecosystem/onionshare/contents.lr b/content/tor-ecosystem/onionshare/contents.lr index dca3c83..0213ee3 100644 --- a/content/tor-ecosystem/onionshare/contents.lr +++ b/content/tor-ecosystem/onionshare/contents.lr @@ -6,7 +6,7 @@ color: primary --- image: eye --- -key: 3 +key: 2 --- html: two-columns-page.html --- diff --git a/content/tor-ecosystem/tor-browser/contents.lr b/content/tor-ecosystem/tor-browser/contents.lr index f3cd9fb..8048721 100644 --- a/content/tor-ecosystem/tor-browser/contents.lr +++ b/content/tor-ecosystem/tor-browser/contents.lr @@ -1,19 +1,19 @@ -section: tor ecosystem +section: tor browser --- -section_id: tor-ecosystem +section_id: tor-browser --- color: primary --- -image: eye ---- key: 1 --- -html: two-columns-page.html +html: section.html +--- +cta: Call To Action --- title: Tor Browser --- -subtitle: a two lines subtitle +subtitle: Tor Browser subtitle --- body: -the content +the overview diff --git a/content/tor-ecosystem/tor-browser-android/contents.lr b/content/tor-ecosystem/tor-browser/tor-browser-android/contents.lr similarity index 100% rename from content/tor-ecosystem/tor-browser-android/contents.lr rename to content/tor-ecosystem/tor-browser/tor-browser-android/contents.lr diff --git a/content/advanced-tor/onion-balance/contents.lr b/content/tor-ecosystem/tor-browser/tor-browser/contents.lr similarity index 64% rename from content/advanced-tor/onion-balance/contents.lr rename to content/tor-ecosystem/tor-browser/tor-browser/contents.lr index 9f39d5a..f3cd9fb 100644 --- a/content/advanced-tor/onion-balance/contents.lr +++ b/content/tor-ecosystem/tor-browser/tor-browser/contents.lr @@ -1,16 +1,16 @@ -section: advanced tor +section: tor ecosystem --- -section_id: advanced-tor +section_id: tor-ecosystem --- color: primary --- image: eye --- -key: 2 +key: 1 --- html: two-columns-page.html --- -title: Onion Balance +title: Tor Browser --- subtitle: a two lines subtitle --- diff --git a/content/tor-network/dev-tools/contents.lr b/content/tor-network/dev-tools/contents.lr index e1cfefe..01bade0 100644 --- a/content/tor-network/dev-tools/contents.lr +++ b/content/tor-network/dev-tools/contents.lr @@ -6,14 +6,18 @@ color: primary --- image: eye --- -key: 1 +key: 4 --- html: two-columns-page.html --- -title: The Tor design +title: Developer Tools --- -subtitle: a two lines subtitle +subtitle: Development tools used to help make tor --- body: the content +Trunnel +Chutney +Other Tor implementations (?) +How to write a tor client (?) diff --git a/content/tor-network/tor-design/contents.lr b/content/tor-network/tor-design/contents.lr index 2d6e028..e1cfefe 100644 --- a/content/tor-network/tor-design/contents.lr +++ b/content/tor-network/tor-design/contents.lr @@ -6,7 +6,7 @@ color: primary --- image: eye --- -key: 2 +key: 1 --- html: two-columns-page.html --- diff --git a/content/tor-network/tor-protocol/contents.lr b/content/tor-network/tor-protocol/contents.lr index adacb92..6f0a597 100644 --- a/content/tor-network/tor-protocol/contents.lr +++ b/content/tor-network/tor-protocol/contents.lr @@ -6,11 +6,11 @@ color: primary --- image: eye --- -key: 3 +key: 2 --- html: two-columns-page.html --- -title: Development tools used to help make tor +title: The Tor Protocol --- subtitle: a two lines subtitle --- diff --git a/content/tor-network/tor/contents.lr b/content/tor-network/tor/contents.lr new file mode 100644 index 0000000..755f0fd --- /dev/null +++ b/content/tor-network/tor/contents.lr @@ -0,0 +1,19 @@ +section: the tor network +--- +section_id: the-tor-network +--- +color: primary +--- +image: eye +--- +key: 3 +--- +html: two-columns-page.html +--- +title: tor, The tor program +--- +subtitle: a two lines subtitle +--- +body: + +the content diff --git a/templates/home.html b/templates/home.html index a4d02ba..082fe5c 100644 --- a/templates/home.html +++ b/templates/home.html @@ -24,14 +24,14 @@ </div> </div> </section> -<section> - <div class="row py-5 text-center mx-auto"> - <h2 class="display-4 text-primary text-center mx-auto">{{ _('Become a Tor Developer') }}</h2> - <p class="text-center"> - {{ _('Some guidelines here about how to join gitlab and a link to good first issue') }}</p> - <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="#"> - {{ _('Go to the link') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> - </a> - </div> -</section> + <section> + <div class="row py-5 text-center mx-auto"> + <h2 class="display-4 text-primary text-center mx-auto">{{ _('Become a Tor Developer') }}</h2> + <p class="text-center"> + {{ _('Some guidelines here about how to join gitlab and a link to good first issue') }}</p> + <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="#"> + {{ _('Go to the link') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> + </a> + </div> + </section> </div> diff --git a/templates/project.html b/templates/project.html index 4f69661..fb5ac39 100644 --- a/templates/project.html +++ b/templates/project.html @@ -1,41 +1,57 @@ -}}div class="container py-5"> - <div class="row py-5"> - <div class="col-lg-7"> - {{ this.body }} + +{% include 'breadcrumb.html' %} + +<div class="row"> + <div class="col-8 mx-auto {{ bag('alternatives', this.alt, 'order') }}"> + <h3 class="display-3 text-primary mt-5">Onion Balance</h3> + <div class="preamble"> + <p class="">{{ this.body }}</p> </div> - <div class="col-lg-5"> - <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ _(this.section) }}" /> - </div> - </div> - <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"> - <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> + + <h3 class="my-5"> + <span class="badge badge-primary p-2">Python</span> + <span class="badge badge-primary p-2">C</span> + <span class="badge badge-primary p-2">Rust</span> + </h3> + + <div class="row"> + <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="">How to get started</a></h4> + <p class="card-text">Some description here that says what you can find in a repository and something like if you are a developer, doing a fork is a best way to start hacking around.</p> + <a class="btn btn-lg btn-outline-primary mx-auto mt-3" href="#">Read Documentation<i class="ml-3 fas fa-arrow-right"></i></a> + </div> + </div> + </div> + <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="">Open an Issue</a></h4> + <p class="card-text">Are you a user? do you want to report a bug? do you have an amazing feature idea? We love OSS. Open an issue and someone will reply you.</p> + <a class="btn btn-lg btn-outline-primary mx-auto mt-3" href="#">Visit Repository<i class="ml-3 fas fa-arrow-right"></i></a> + </div> </div> - </div> </div> + </div> + + <section> + <div class="row py-5 text-center mx-auto"> + <h2 class="display-4 text-primary text-center">{{ _('Join the conversation') }}</h2> + <p class="text-center"> + {{ _('Some guidelines here about how to join gitlab and a link to good first issue.') }} + <a class="" href="#">{{ _('Go to the link') }}</a> + </p> </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@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 class="col-12"> - {{ render_stream("https://blog.torproject.org/events.xml")|safe }} + </section> + + <div class="card mt-5"> + <ul class="list-group list-group-flush"> + <!--li class="list-group-item"><a><span class="card-text text-muted">{{ _("Contributors to this page:") }} <a href="#" title="#">cypherpunk</a></span></li--> + <li class="list-group-item"> + <a href="{{ this.parent|url }}">{{ _("Back to previous page: ") }}{{ this.parent.title }}</a> - <a href="https://github.com/torproject/community/edit/master/content{{ this.path }}/contents.lr">{{ _("Edit this page") }}</a> + </li> + </ul> </div> </div> </div>