commit 48d4c4ca85de9765a13a940e89d0e380359d5a52 Author: hiro <hiro@torproject.org> Date: Tue Apr 23 13:48:49 2019 +0200 Fix source download page Revert "Fix footer" This reverts commit 650dd7b1740585d45ae32a0abe9ce15f4b435b67. --- databags/versions.ini | 6 ------ templates/download-android.html | 10 +++------- templates/download-options.html | 1 + templates/download-tor.html | 37 ++++++++++++++----------------------- templates/macros/downloads.html | 8 ++++++++ 5 files changed, 26 insertions(+), 36 deletions(-) diff --git a/databags/versions.ini b/databags/versions.ini index beb9132..72bd8cd 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -15,9 +15,3 @@ version = 0.3.5.8 [tor-alpha] version = 0.4.0.3-alpha - -[tor-win32-stable] -version = 0.2.4.22 - -[tor-win32-alpha] -version = 0.2.4.23 diff --git a/templates/download-android.html b/templates/download-android.html index 0466ae4..6dfea22 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -11,17 +11,13 @@ <div class="row"> <h4 class="mx-auto display-4 text-center text-white">{{ _('Get Tor Browser for Android.') }}</h4> </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@2x.png'|asseturl }}"> - </div> - </div> - <div class="row col-lg-10 mx-auto"> - <div class="col-lg-12 py-5 mt-5"> <div class="row"> <h3 class="mx-auto defend 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@2x.png'|asseturl }}"> + </div> </div> <div class="row col-lg-10 mx-auto"> <div class="col-lg-12 py-5 mt-5"> diff --git a/templates/download-options.html b/templates/download-options.html index 8698e73..0bebe37 100644 --- a/templates/download-options.html +++ b/templates/download-options.html @@ -33,6 +33,7 @@ </td> </tr> {% endfor %} + {% set t = bag('versions', 'torbrowser-stable') %} </tbody> </table> </div> diff --git a/templates/download-tor.html b/templates/download-tor.html index fda525b..7d759ea 100644 --- a/templates/download-tor.html +++ b/templates/download-tor.html @@ -8,34 +8,25 @@ <table class="table"> <thead> <tr> - <th scope="col">OS</th> - <th scope="col">Stable</th> - <th scope="col">Unstable</th> + <th scope="col">Version</th> + <th></th> </tr> </thead> <tbody> {% set t = bag('versions', 'tor-stable') %} {% set a = bag('versions', 'tor-alpha') %} - {% set tw = bag('versions', 'tor-win32-stable') %} - {% set aw = bag('versions', 'tor-win32-alpha') %} - {% for id, item in bag('platforms').items() %} - {% if id == 'windows' %} - {% set download_link = 'https://dist.torproject.org/win32/tor-' + tw.version + '-win32.exe' %} - {% set sig_link = download_link + '.asc' %} - {% set alpha_download_link = 'https://dist.torproject.org/win32/tor-' + aw.version + '-win32.exe' %} - {% set alpha_sig_link = alpha_download_link + '.asc' %} - {% else %} - {% set download_link = 'https://dist.torproject.org/tor-' + t.version + '.tar.gz' %} - {% set sig_link = download_link + '.asc' %} - {% set alpha_download_link = 'https://dist.torproject.org/tor-' + a.version + '.tar.gz' %} - {% set alpha_sig_link = alpha_download_link + '.asc' %} - {% endif %} - <tr> - <td>{{ item.label }}</td> - <td><a href="{{ download_link }}">stable</a> (<a href="{{ sig_link }}">sig</a>)</td> - <td><a href="{{ alpha_download_link }}">alpha</a> (<a href="{{ alpha_sig_link }}">sig</a>)</td> - </tr> - {% endfor %} + {% set download_link = 'https://dist.torproject.org/tor-' + t.version + '.tar.gz' %} + {% set sig_link = download_link + '.asc' %} + {% set alpha_download_link = 'https://dist.torproject.org/tor-' + a.version + '.tar.gz' %} + {% set alpha_sig_link = alpha_download_link + '.asc' %} + <tr> + <td>{{ t.version }}</td> + <td class="text-right"><a href="{{ download_link }}">Download</a> (<a href="{{ sig_link }}">sig</a>)</td> + </tr> + <tr> + <td>{{ a.version }}</td> + <td class="text-right"><a href="{{ alpha_download_link }}">Download</a> (<a href="{{ alpha_sig_link }}">sig</a>)</td> + </tr> </tbody> </table> </div> diff --git a/templates/macros/downloads.html b/templates/macros/downloads.html index 742e115..71056cf 100644 --- a/templates/macros/downloads.html +++ b/templates/macros/downloads.html @@ -13,6 +13,14 @@ <a class="downloadLink" href="{{ download_link_32 }}">32-bit</a> (<a href="{{ sig_link_32 }}">sig</a>) / <a href="{{ download_link_64 }}">64-bit</a> (<a href="{{ sig_link_64 }}">sig<a/>) {% endmacro %} +{% macro render_windows_expert(version, win32) %} + {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} + {% set download_link_32 = download_prefix + 'tor-win32-' + win32 + '.zip' %} + {% set sig_link_32 = download_link_32 + '.asc' %} + + <a class="downloadLink" href="{{ download_link_32 }}">Download</a> (<a href="{{ sig_link_32 }}">sig</a>) +{% endmacro %} + {% macro render_mac(version, alt) %} {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} {% if alt == 'en' %}