[tor-commits] [tpo/staging] Fix templates

[emmapeel at torproject.org]

commit b2e8c07a3d9825f69b47ea4b738bc4c43794fe30
Author: hiro <hiro at torproject.org>
Date:   Tue Apr 16 17:50:18 2019 +0200

    Fix templates
---
 databags/versions.ini           | 6 +++---
 templates/download-android.html | 9 +++++----
 templates/hero-download.html    | 5 ++++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/databags/versions.ini b/databags/versions.ini
index cbba14e..e8dbb3e 100644
--- a/databags/versions.ini
+++ b/databags/versions.ini
@@ -4,8 +4,8 @@ release_date = 2019-03-23
 win32 = 0.3.5.8
 
 [torbrowser-alpha]
-version = 8.5a10
-release_date = 2019-03-25
+version = 8.5a11
+release_date = 2019-04-15
 
 [torbrowser-develop-branch]
 version = maint-8.0
@@ -14,4 +14,4 @@ version = maint-8.0
 version = 0.3.5.8
 
 [tor-alpha]
-version = 0.4.0.1-alpha
+version = 0.4.0.3-alpha
diff --git a/templates/download-android.html b/templates/download-android.html
index b6ac863..fc33533 100644
--- a/templates/download-android.html
+++ b/templates/download-android.html
@@ -15,10 +15,11 @@
         <h3 class="mx-auto defend text-white">{{ _('Protect yourself against tracking, surveillance, and censorship.') }}</h3>
       </div>
       <div class="row my-5">
-          <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://dist.torproject.org/torbrowser/8.5a10/tor-browser-8.5a10-android-armv7-multi.apk">{{ _('Download .apk') }}</a>
-          <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alpha">{{ _('Go to Google Play') }}</a>
-          {% from "macros/downloads.html" import render_fdroid %}
-          <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a>
+        {% set t = bag('versions', 'torbrowser-alpha') %}
+        <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }}</a>
+        <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alpha">{{ _('Go to Google Play') }}</a>
+        {% from "macros/downloads.html" import render_fdroid %}
+        <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a>
       </div>
       <div class="row">
         <a class="text-light mx-auto nick" href="https://itunes.apple.com/us/app/onion-browser/id519296448?mt=8">{{ _('Are you a iOS user? We encourage you to try Onion Browser.') }} </a>
diff --git a/templates/hero-download.html b/templates/hero-download.html
index 212c837..dfe9704 100644
--- a/templates/hero-download.html
+++ b/templates/hero-download.html
@@ -15,15 +15,18 @@
         {% endif %}
         {% if id == 'windows' %}
           {% set download_link = download_prefix + 'torbrowser-install-win64-' + t.version + '_' + alt + '.exe' %}
+          {% set sig_link = download_link + '.asc' %}
         {% elif id == 'apple' %}
           {% set download_link = download_prefix + 'TorBrowser-' + t.version + '-osx64' + '_' + alt + '.dmg' %}
+          {% set sig_link = download_link + '.asc' %}
         {% else %}
           {% set download_link = download_prefix + 'tor-browser-linux64-' + t.version + '_' + alt + '.tar.xz' %}
+          {% set sig_link = download_link + '.asc' %}
         {% endif %}
         <a class="downloadLink" href="{{ download_link }}">
           <i class="text-light fab fa-{{ id }}-png"></i>
         </a>
-        <p><small><a class="btn btn-primary btn-sm nick mx-5 my-4" href="#">sig</a></small></p>
+        <p><small><a class="btn btn-primary btn-sm nick mx-5 my-4" href="{{ sig_link }}">sig</a></small></p>
       </div>
     </div>
   {% endfor %}