[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tpo/staging] Update staging



commit dbb16beffeb925ae4de4637f3affaa9d2259fb3c
Merge: 4d29cfb2 f4bad6a2
Author: gus <gus@xxxxxxxxxxxxxx>
Date:   Mon Jul 20 13:03:41 2020 -0400

    Update staging

 .htaccess                                          |   4 +-
 assets/static/images/circle-pattern.png            | Bin 556240 -> 106272 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/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
 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@xxxxxx       | Bin 0 -> 270354 bytes
 assets/static/images/tb95/onion-auth@xxxxxx        | Bin 0 -> 192867 bytes
 assets/static/images/tb95/onion-error.png          | Bin 0 -> 86735 bytes
 assets/static/images/tb95/onion-error@xxxxxx       | 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@xxxxxx  | Bin 0 -> 295176 bytes
 .../images/tb95/onion-location-propublica@xxxxxx   | Bin 0 -> 659848 bytes
 .../static/images/tb95/onion-location-riseup.png   | Bin 0 -> 152691 bytes
 .../images/tb95/onion-location-riseup@xxxxxx       | Bin 0 -> 471532 bytes
 assets/static/images/tb95/onion-names.png          | Bin 0 -> 89241 bytes
 assets/static/images/tb95/onion-names@xxxxxx       | Bin 0 -> 306049 bytes
 assets/static/images/tb95/onion-url-bar-update.png | Bin 0 -> 39914 bytes
 .../static/images/tb95/onion-url-bar-update@xxxxxx | Bin 0 -> 108234 bytes
 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/t0mmy.txt                       |  51 ---
 .../about/jobs/backend-engineer-ooni/contents.lr   |   4 +-
 content/about/jobs/executive-assistant/contents.lr | 105 +++++
 .../jobs/shadow-simulation-developer/contents.lr   |   2 +-
 content/about/people/agrabeli/contents.lr          |   2 +-
 content/about/people/ailanthus/contents.lr         |  19 -
 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              |   4 +-
 content/about/people/hellais/contents.lr           |   2 +-
 content/about/people/isra/contents.lr              |  15 -
 content/about/people/jnewsome/contents.lr          |  23 +
 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/sengler/contents.lr           |  17 +
 content/about/people/wayward/contents.lr           |  19 -
 .../about/sponsors/DARPA-georgetown/contents.lr    |   2 +-
 content/about/sponsors/DARPA-penn/contents.lr      |   6 +-
 content/about/sponsors/RIPE NCC/.gitkeep           |   0
 content/about/sponsors/Zcash/contents.lr           |  20 +
 content/about/sponsors/dial/contents.lr            |   2 +-
 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  |  13 +-
 content/about/sponsors/otf/contents.lr             |   2 +-
 content/about/sponsors/ripe-ncc/contents.lr        |  19 +
 content/about/trademark/contents.lr                |   2 +-
 .../contents.lr                                    |  19 +
 .../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/privchat/contents.lr                       |   3 +
 .../torbrowser/RecommendedTBBVersions/contents.lr  |  32 +-
 content/releases/contents.lr                       |  11 +
 content/releases/tor-browser-95/contents.lr        |  83 ++++
 content/thank-you/contents.lr                      |   1 -
 databags/download-alternatives-alpha.ini           |  12 +
 databags/download-alternatives.ini                 |  12 +
 databags/platforms.ini                             |   4 +-
 databags/versions.ini                              |  17 +-
 lego                                               |   2 +-
 models/person.ini                                  |   4 +-
 templates/download-android.html                    |  22 +-
 templates/download-options.html                    |   1 +
 templates/download-tor.html                        |   4 +
 templates/download.html                            |   2 +-
 templates/footer-min.html                          |  92 ++++
 templates/hero-download.html                       |   5 +-
 templates/layout.html                              |   6 +-
 templates/macros/downloads.html                    |   4 +
 templates/macros/people.html                       |   4 +-
 templates/macros/topic.html                        |   2 +-
 templates/meta.html                                |   6 +-
 templates/navbar-min.html                          |  30 ++
 templates/people.html                              |  24 +-
 templates/privchat.html                            | 111 +++++
 templates/release.html                             |  65 +++
 templates/releases.html                            |  14 +
 templates/sidenav.html                             |   5 +-
 templates/thank-you.html                           |  18 +-
 112 files changed, 1078 insertions(+), 1119 deletions(-)

diff --cc templates/download-android.html
index 968a5794,c95bab0b..dbc84a6c
--- a/templates/download-android.html
+++ b/templates/download-android.html
@@@ -14,27 -14,20 +14,27 @@@
        <div class="row">
          <h3 class="mx-auto text-center text-white">{{ _('Protect yourself against tracking, surveillance, and censorship.') }}</h3>
        </div>
 +    </div>
 +    <div class="d-none d-lg-block col-lg-4">
 +      <img class="img-fluid p-5" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding@xxxxxx'|asseturl }}">
 +    </div>
 +  </div>
 +  <div class="row col-lg-10 mx-auto">
 +    <div class="col-lg-12 py-5 mt-5">
        <div class="row my-5">
-         <div class="col-xl-6 mx-auto text-center">
-           {% set t = bag('versions', 'torbrowser-stable') %}
-           <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk">{{ _('Download .apk') }}  <small class="badge-pill badge-dark mx-1 nick">aarch64</small></a>
-           <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk.asc"><small>sig</small></a>
+         <div class="col-xl-6 mx-auto">
+           {% set t = bag('versions', 'torbrowser-android-stable') %}
+           <a class="btn btn-lg btn-light text-primary py-1 px-2 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk">{{ _('Download .apk') }}  <small class="badge-pill badge-dark mx-1 nick">aarch64</small></a>
+           <a class="btn btn-primary btn-sm nick" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk.asc"><small>{{ _('Sig') }}</small></a>
  
-           <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }}  <small class="badge-pill badge-dark mx-1 nick">arm</small></a>
-           <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk.asc"><small>sig</small></a>
+           <a class="btn btn-lg btn-light text-primary py-1 px-2 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }}  <small class="badge-pill badge-dark mx-1 nick">arm</small></a>
+           <a class="btn btn-primary btn-sm nick" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk.asc"><small>{{ _('Sig') }}</small></a>
  
-           <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86_64-multi.apk">{{ _('Download .apk') }}  <small class="badge-pill badge-dark mx-1 nick">x86_64</small></a>
-           <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86_64-multi.apk.asc"><small>sig</small></a>
+           <a class="btn btn-lg btn-light text-primary py-1 px-2 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86_64-multi.apk">{{ _('Download .apk') }}  <small class="badge-pill badge-dark mx-1 nick">x86_64</small></a>
+           <a class="btn btn-primary btn-sm nick" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86_64-multi.apk.asc"><small>{{ _('Sig') }}</small></a>
  
-           <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk">{{ _('Download .apk') }}  <small class="badge-pill badge-dark mx-1 nick">x86</small></a>
-           <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk.asc"><small>sig</small></a>
+           <a class="btn btn-lg btn-light text-primary py-1 px-2 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk">{{ _('Download .apk') }}  <small class="badge-pill badge-dark mx-1 nick">x86</small></a>
+           <a class="btn btn-primary btn-sm nick" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk.asc"><small>{{ _('Sig') }}</small></a>
  
            <a class="btn btn-block btn-lg btn-light text-primary my-2" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser";>{{ _('Go to Google Play') }}</a>
            {% from "macros/downloads.html" import render_fdroid %}
diff --cc templates/hero-download.html
index e142ecb0,eabd2e40..acc7d869
--- a/templates/hero-download.html
+++ b/templates/hero-download.html
@@@ -50,6 -51,11 +50,7 @@@
    <a class="mx-auto text-white py-3 text-center" href="{{ 'tor'|url(alt=this.alt) }}"><u>{{ _('Download Tor Source Code') }}</u></a>
  </div>
  
- <div class="hidden-sm row p-md-5 justify-content-center window-bg">
-   <a class="mx-auto text-white text-center py-md-5" href="https://blog.torproject.org/category/tags/tor-browser";><u>{{ _('Read the latest release announcements') }}</u></a>
+ <div class="row bg-darker my-5 p-3 rounded">
+   {% from "macros/downloads.html" import render_tor_browser_blog_post %}
+   <h5 class="mx-auto text-white text-center my-0"><i class="text-light fas fa-exclamation-circle text-warning px-2"></i>{{ _('Disabling Javascript: Please read the latest %s for more information.') |format(render_tor_browser_blog_post())| safe }}</h5>
  </div>
 -
 -<div class="hidden-sm row p-md-5 justify-content-center window-bg">
 -  <a class="mx-auto text-white text-center py-md-5" href="https://blog.torproject.org/category/tags/tor-browser";><u>{{ _('Read the latest release announcements') }}</u></a>
 -</div>
diff --cc templates/navbar-min.html
index f9d2bc77,51e0bc3b..bcda5cc2
--- a/templates/navbar-min.html
+++ b/templates/navbar-min.html
@@@ -6,14 -6,44 +6,44 @@@
    <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-2">
  {% else %}
  <div class="container-fluid bg-dark">
 -  <nav class="navbar no-background navbar-expand-lg navbar-dark bg-dark p-2 d-flex justify-content-between">
 +  <nav class="navbar no-background navbar-expand-lg navbar-dark bg-dark p-2">
  {% endif %}
 -  <div>
 -    <div class="row">
 -      <a class="navbar-brand" href="{{ '/'|url(alt=this.alt) }}">
 -        <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo@xxxxxx'|asseturl }}" >
 -        <span class="sr-only">Tor Logo</span>
 -      </a>
  
 +    <a class="navbar-brand" href="{{ '/'|url(alt=this.alt) }}">
 +      <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo@xxxxxx'|asseturl }}" >
 +      <span class="sr-only">Tor Logo</span>
 +    </a>
 +
 +    </div>
+       {% set link = bag('links', this.alt, 'donate') %}
+       {% if link %}
+         <h4 class="pl-2 pr-2 pt-3"><a href="{{ link }}" title="{{ _("Donate") }}"><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></a></h4>
+       {% else %}
+         <h4 class="pl-2 pr-2 pt-3"><a href="https://www.torproject.org/donate/{{ this.alt }}" title="{{ _("Donate") }}"><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></a></h4>
+       {% endif %}
+     </div>
+   </div>
+     {% set alts = bag('alternatives').items() %}
+     {% if alts|length > 1 %}
+       <div class="btn-group dropdown float-right">
+         {% if not this.color %}
+           <button type="button" class="btn btn-primary bg-primary dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+         {% elif this.color == 'primary' %}
+           <button type="button" class="btn btn-primary bg-primary dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+         {% else %}
+           <button type="button" class="btn btn-dark bg-dark dropdown-toggle btn-block my-3 my-sm-0" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+         {% endif %}
+         {{ bag('alternatives', this.alt, 'language') }}
+         </button>
+         <div class="dropdown-menu">
+           {% for id, item in bag('alternatives').items() %}
+             {% if this.alt != id %}
+               <a class="dropdown-item" href="{{ this.path|url(alt=id) }}">{{ item.language }}</a>
+             {% endif %}
+           {% endfor %}
+         </div>
+       </div>
+     {% endif %}
+ 
    </nav>
  </div>



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits