Fixed Debian-specific download page

This commit is contained in:
str4d
2013-07-18 04:40:31 +00:00
parent d091f452f0
commit cfa269afba
4 changed files with 7 additions and 3 deletions

View File

@@ -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():

View File

@@ -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>

View File

@@ -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) }}

View File

@@ -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')