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

[lego/develop] Update template for banner
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit f94fe98fd531c5f003c5f331c9948164c61591f0 Author: hiro <hiro(a)torproject.org> Date: Wed Oct 30 17:15:33 2019 +0100 Update template for banner --- templates/banner.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/banner.html b/templates/banner.html index c07b574..43d0508 100644 --- a/templates/banner.html +++ b/templates/banner.html @@ -9,7 +9,7 @@ <div class="row"> <h4 class="tracking-surveillan">{{ _('Tracking, surveillance, and censorship are widespread online.') }}</h4> </div> - <div class="row col-xs-12 col-sm-10 col-md-8 col-lg-6"> + <div class="row col-xs-12 col-sm-12 col-md-8 col-lg-6"> <h2 class="take-back-the-intern display-3 py-3"> {{ _('TAKE BACK THE INTERNET WITH TOR') }} </h2>

1 0

[lego/develop] Localize all links in the footer
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit dc998ccf3170970f3d232f621f323c3c9e8eabeb Author: hiro <hiro(a)torproject.org> Date: Mon Nov 25 17:58:46 2019 +0100 Localize all links in the footer --- templates/footer.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/templates/footer.html b/templates/footer.html index 246c133..646e073 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -36,7 +36,12 @@ {% if link %} <a class="nav-link text-light" href="{{ item.path|url(alt=this.alt) }}"> {% else %} - <a class="nav-link text-light" href="{{ item.path }}"> + {% set link = bag('links', this.alt, id) %} + {% if link %} + <a class="nav-link text-light" href="{{ link }}"> + {% else %} + <a class="nav-link text-light" href="{{ item.path }}"> + {% endif %} {% endif %} {{ _(item.label) }} {% if this.is_child_of(item.path) %}

1 0

[lego/develop] Update links
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit bbf8108b622ef4c8b1d96b9790fc3e77aa1c030f Author: hiro <hiro(a)torproject.org> Date: Wed Nov 13 16:52:31 2019 +0100 Update links --- databags/links.ini | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/databags/links.ini b/databags/links.ini index b632ab1..7c68131 100644 --- a/databags/links.ini +++ b/databags/links.ini @@ -3,7 +3,87 @@ about = https://www.torproject.org/about/history/ support = https://support.torproject.org donate = https://donate.torproject.org +[bn] +about = https://www.torproject.org/about/history/ +support = https://support.torproject.org/bn +donate = https://donate.torproject.org + [ca] -about = https://www.torproject.org/ca/about/history/ +about = https://www.torproject.org/about/history/ support = https://support.torproject.org/ca donate = https://donate.torproject.org/ + +[de] +about = https://www.torproject.org/de/about/history/ +support = https://support.torproject.org/de +donate = https://donate.torproject.org/de + +[es] +about = https://www.torproject.org/es/about/history/ +support = https://support.torproject.org/es +donate = https://donate.torproject.org/es_ES + +[es-AR] +about = https://www.torproject.org/es/about/history/ +support = https://support.torproject.org/es +donate = https://donate.torproject.org/es_AR + +[fr] +about = https://www.torproject.org/fr/about/history/ +support = https://support.torproject.org/fr +donate = https://donate.torproject.org/fr + +[ga] +about = https://www.torproject.org/about/history/ +support = https://support.torproject.org/ga +donate = https://donate.torproject.org/ + +[id] +about = https://www.torproject.org/about/history/ +support = https://support.torproject.org/id +donate = https://donate.torproject.org/ + +[is] +about = https://www.torproject.org/is/about/history/ +support = https://support.torproject.org/is +donate = https://donate.torproject.org/is + +[it] +about = https://www.torproject.org/it/about/history/ +support = https://support.torproject.org/it +donate = https://donate.torproject.org/it + +[ka] +about = https://www.torproject.org/ka/about/history/ +support = https://support.torproject.org/ +donate = https://donate.torproject.org/ka + +[pt-BR] +about = https://www.torproject.org/pt-BR/about/history/ +support = https://support.torproject.org/pt-BR +donate = https://donate.torproject.org/pt_BR + +[pt-PT] +about = https://www.torproject.org/pt-BR/about/history/ +support = https://support.torproject.org/pt-BR +donate = https://donate.torproject.org/pt_PT + +[ro] +about = https://www.torproject.org/about/history/ +support = https://support.torproject.org/ +donate = https://donate.torproject.org/ro + +[ru] +about = https://www.torproject.org/ru/about/history/ +support = https://support.torproject.org/ +donate = https://donate.torproject.org/ + +[tr] +about = https://www.torproject.org/tr/about/history/ +support = https://support.torproject.org/tr +donate = https://donate.torproject.org/tr + +[zh-CN] +about = https://www.torproject.org/zh-CN/about/history/ +support = https://support.torproject.org/zh-CN +donate = https://donate.torproject.org/zh-CN

1 0

[lego/develop] Remove border in newsletter section
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit b0a49dc23d6086410f367a0a923270ca5eb2ad20 Author: Antonela <hola(a)antonela.me> Date: Tue Nov 26 07:54:09 2019 -0300 Remove border in newsletter section --- templates/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/footer.html b/templates/footer.html index 9fadec2..f068b2f 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -59,7 +59,7 @@ {% endif %} </div> </div> - <div class="col-12 d-flex justify-content-center border"> + <div class="col-12 d-flex justify-content-center"> <div class="col-sm-6 offset-lx-1 offset-md-2 offset-sm-0 mt-5 mt-5 pb-5"> <p class="text-primary-light text-uppercase">{{ _('Subscribe to our Newsletter') }}</p> <p class="text-light">{{ _('Get monthly updates and opportunities from the Tor Project:') }}</p>

1 0

[lego/develop] Localize donate button everywhere
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit ae416478e7bd9df03e7f14fc1ee97000d2261fdb Author: hiro <hiro(a)torproject.org> Date: Mon Nov 25 17:52:27 2019 +0100 Localize donate button everywhere --- templates/banner.html | 7 ++++++- templates/footer.html | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/templates/banner.html b/templates/banner.html index 3d2647c..37d49be 100644 --- a/templates/banner.html +++ b/templates/banner.html @@ -15,7 +15,12 @@ </h2> </div> <div class="row"> - <a class="btn-lg rectangle mb-3 mr-3" href="https://torproject.org/donate/donate-tbi-hp1">{{ _('DONATE NOW') }}</a> + {% set link = bag('links', this.alt, 'donate') %} + {% if link %} + <a class="btn-lg rectangle mb-3 mr-3" href="{{ link }}">{{ _('DONATE NOW') }}</a> + {% else %} + <a class="btn-lg rectangle mb-3 mr-3" href="https://torproject.org/donate/donate-tbi-hp1">{{ _('DONATE NOW') }}</a> + {% endif %} <p class="give-today-and-mozi">{{ _('Give today, and Mozilla will match your donation.') }}</p> </div> </div> diff --git a/templates/footer.html b/templates/footer.html index 897e736..246c133 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -46,7 +46,12 @@ </li> {% endfor %} </ul> - <a href="https://www.torproject.org/donate/{{ this.alt }}" title="{{ _("Donate") }}"><h5><span class="badge badge-warning p-2 mt-2">{{ _("Donate Now") }}</span></h5></a> + {% set link = bag('links', this.alt, 'donate') %} + {% if link %} + <a href="{{ link }}" title="{{ _("Donate") }}"><h5><span class="badge badge-warning p-2 mt-2">{{ _("Donate Now") }}</span></h5></a> + {% else %} + <a href="https://www.torproject.org/donate/{{ this.alt }}" title="{{ _("Donate") }}"><h4><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></h4></a> + {% endif %} </div> </div> <div class="col-12 d-flex justify-content-center border">

1 0

[lego/develop] Update donate button
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit 07eaef9800b90b8de1c490dedc95928d3b789cbf Author: hiro <hiro(a)torproject.org> Date: Mon Nov 11 16:00:19 2019 +0100 Update donate button --- templates/footer.html | 2 +- templates/navbar.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/footer.html b/templates/footer.html index 555faed..d1681b7 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -46,7 +46,7 @@ </li> {% endfor %} </ul> - <a href="https://donate.torproject.org" title="{{ _("Donate") }}"><h5><span class="badge badge-warning p-2 mt-2">{{ _("Donate Now") }}</span></h5></a> + <a href="https://www.torproject.org/donate/{{ this.alt }}" title="{{ _("Donate") }}"><h5><span class="badge badge-warning p-2 mt-2">{{ _("Donate Now") }}</span></h5></a> </div> </div> <div class="col-12 d-flex justify-content-center border"> diff --git a/templates/navbar.html b/templates/navbar.html index a699835..64b5695 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -14,7 +14,7 @@ <span class="sr-only">Tor Logo</span> </a> - <a href="https://donate.torproject.org/" title="{{ _("Donate") }}"><h4><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></h4></a> + <a href="https://www.torproject.org/donate/{{ this.alt }}" title="{{ _("Donate") }}"><h4><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></h4></a> <label for="nav-toggle"> <a class="btn btn-lg btn-primary navbar-toggler text-white p-3" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">

1 0

[lego/develop] First step in localize donate button properly
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit 6d90910337fbc0b383cbf5483aa61be9460e08d2 Author: hiro <hiro(a)torproject.org> Date: Mon Nov 25 17:31:19 2019 +0100 First step in localize donate button properly --- templates/navbar.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/templates/navbar.html b/templates/navbar.html index 0210587..e8800d9 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -14,7 +14,12 @@ <span class="sr-only">Tor Logo</span> </a> - <a href="https://www.torproject.org/donate/{{ this.alt }}" title="{{ _("Donate") }}"><h4><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></h4></a> + {% set link = bag('links', this.alt, 'donate') %} + {% if link %} + <a href="link" title="{{ _("Donate") }}"><h4><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></h4></a> + {% else %} + <a href="https://www.torproject.org/donate/{{ this.alt }}" title="{{ _("Donate") }}"><h4><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></h4></a> + {% endif %} <label for="nav-toggle"> <a class="btn btn-lg btn-primary navbar-toggler text-white p-3" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">

1 0

[lego/develop] Fix template
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit cd3fc729d308b2bce913206b8ed0b95529f3e4c9 Author: hiro <hiro(a)torproject.org> Date: Mon Nov 25 17:48:02 2019 +0100 Fix template --- templates/navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/navbar.html b/templates/navbar.html index e8800d9..24185b4 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -16,7 +16,7 @@ {% set link = bag('links', this.alt, 'donate') %} {% if link %} - <a href="link" title="{{ _("Donate") }}"><h4><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></h4></a> + <a href="{{ link }}" title="{{ _("Donate") }}"><h4><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></h4></a> {% else %} <a href="https://www.torproject.org/donate/{{ this.alt }}" title="{{ _("Donate") }}"><h4><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></h4></a> {% endif %}

1 0

[lego/develop] Add locale direction to footer
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit d7f04b5060ece7de0ad4cf9f3081515dccbf215d Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 13:47:17 2019 +0100 Add locale direction to footer --- templates/footer.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/footer.html b/templates/footer.html index f068b2f..6204c9f 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -1,7 +1,8 @@ {% if this.path == '/download' %} {% include 'download-android.html' %} {% endif %} -<div class="container-fluid bg-dark footer onion-bg"> +{% set locale = bag('alternatives', this.alt) %} +<div class="container-fluid bg-dark footer onion-bg {{ locale.order }} {{ locale.direction }}"> <div class="row"> <div class="col-12 d-flex justify-content-right"> <div class="container pt-5 justify-content-right">

1 0

[lego/develop] Update links databag
by hiro＠torproject.org 07 Apr '20

07 Apr '20

1 0