From cfa269afbac465a7395e3b33902989516fa8900a Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Thu, 18 Jul 2013 04:40:31 +0000
Subject: [PATCH] Fixed Debian-specific download page

---
 i2p2www/downloads.py              | 6 ++++--
 i2p2www/pages/downloads/list.html | 2 +-
 i2p2www/pages/global/macros       | 1 +
 i2p2www/urls.py                   | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/i2p2www/downloads.py b/i2p2www/downloads.py
index 4313aaa0..2a347745 100644
--- a/i2p2www/downloads.py
+++ b/i2p2www/downloads.py
@@ -45,10 +45,12 @@ def downloads_list():
     # TODO: read mirror list or list of available files
     return render_template('downloads/list.html', def_mirror=DEFAULT_MIRROR)
 
+# Debian-specific page
+def downloads_debian():
+    return render_template('downloads/debian.html')
+
 # Specific file downloader
 def downloads_select(version, file):
-    if (file == 'debian'):
-        return render_template('downloads/debian.html', file=file)
     mirrors=read_mirrors()
     obj=[]
     for protocol in mirrors.keys():
diff --git a/i2p2www/pages/downloads/list.html b/i2p2www/pages/downloads/list.html
index e80b68e3..b0b95814 100644
--- a/i2p2www/pages/downloads/list.html
+++ b/i2p2www/pages/downloads/list.html
@@ -97,7 +97,7 @@ or type <tt>java -version</tt> at your command prompt.
 <div class="package">
   <h1>Debian / Ubuntu</h1>
   <div class="details">
-    <a href="{{ get_url('downloads_select', version=ver(), file='debian') }}">{% trans %}Packages for Debian &amp; Ubuntu are available.{% endtrans %}</a>
+    <a href="{{ get_url('downloads_debian') }}">{% trans %}Packages for Debian &amp; Ubuntu are available.{% endtrans %}</a>
   </div>
 </div>
 
diff --git a/i2p2www/pages/global/macros b/i2p2www/pages/global/macros
index 0f468f7d..89a748f1 100644
--- a/i2p2www/pages/global/macros
+++ b/i2p2www/pages/global/macros
@@ -6,6 +6,7 @@
   {%- endif -%}
 {%- elif request.endpoint == 'blog_post' -%}{{ url_for('blog_post', lang=lang, slug=slug) }}
 {%- elif request.endpoint == 'meetings_show' -%}{{ url_for('meetings_show', lang=lang, id=id) }}
+{%- elif request.endpoint == 'downloads_debian' -%}{{ url_for('downloads_debian', lang=lang) }}
 {%- elif request.endpoint == 'downloads_select' -%}{{ url_for('downloads_select', lang=lang, version=version, file=file) }}
 {%- elif request.endpoint == 'downloads_redirect' -%}{{ url_for('site_show', lang=lang) }}
 {%- elif request.endpoint -%}{{ url_for(request.endpoint, lang=lang) }}
diff --git a/i2p2www/urls.py b/i2p2www/urls.py
index d77425da..a68b9d6b 100644
--- a/i2p2www/urls.py
+++ b/i2p2www/urls.py
@@ -55,6 +55,7 @@ url('/<lang:lang>/meetings/<int:id>.rst', 'meetings.views.meetings_show_rst')
 url('/<lang:lang>/feed/meetings/atom', 'meetings.views.meetings_atom')
 
 url('/<lang:lang>/download', 'downloads.downloads_list')
+url('/<lang:lang>/download/debian', 'downloads.downloads_debian')
 url('/<lang:lang>/download/<string:version>/<path:file>', 'downloads.downloads_select')
 url('/download/<string:version>/<string:protocol>/any/<path:file>', 'downloads.downloads_redirect', defaults={'domain': None})
 url('/download/<string:version>/<string:protocol>/<string:domain>/<path:file>', 'downloads.downloads_redirect')