Moved debian page into downloads, hard-coded it into downloads_select()

This commit is contained in:
str4d
2012-11-10 05:53:24 +00:00
parent 37fcb6c206
commit d9bec35b61
5 changed files with 19 additions and 15 deletions

View File

@@ -252,6 +252,8 @@ def downloads_list():
@app.route('/<string:lang>/download/<path:file>') @app.route('/<string:lang>/download/<path:file>')
def downloads_select(file): def downloads_select(file):
# TODO: implement # TODO: implement
if (file == 'debian'):
return render_template('downloads/debian.html')
pass pass
@app.route('/download/<string:protocol>/any/<path:file>') @app.route('/download/<string:protocol>/any/<path:file>')

View File

@@ -1,4 +1,4 @@
{% extends "_layout.html" %} {% extends "global/layout.html" %}
{% block title %}Debian/Ubuntu{% endblock %} {% block title %}Debian/Ubuntu{% endblock %}
{% block content %} {% block content %}
<h1>Debian I2P Packages</h1> <h1>Debian I2P Packages</h1>
@@ -6,19 +6,20 @@
The packages hosted on <a href="https://launchpad.net/%7Ei2p-maintainers/+archive/i2p">the I2P Launchpad site</a> The packages hosted on <a href="https://launchpad.net/%7Ei2p-maintainers/+archive/i2p">the I2P Launchpad site</a>
have been tested and <span style="font-style: italic;">should </span>work on x86/x86_64 platforms running have been tested and <span style="font-style: italic;">should </span>work on x86/x86_64 platforms running
<ul> <ul>
<li><a href="debian#ubuntu">Ubuntu</a> (Hardy <span style="font-style: italic;">8.04</span> and newer)</li><li><a href="debian.html#ubuntu">Mint</a> <span style="font-style: italic;">11</span></li> <li><a href="#ubuntu">Ubuntu</a> (Hardy <span style="font-style: italic;">8.04</span> and newer)</li>
<li><a href="debian#debian">Debian Linux</a> (Lenny and newer) &amp; <a href="#nonlinux">kFreeBSD</a> (Wheezy)</li> <li><a href="#ubuntu">Mint</a> <span style="font-style: italic;">11</span></li>
<li><a href="debian#debian">Knoppix</a></li> <li><a href="#debian">Debian Linux</a> (Lenny and newer) &amp; <a href="#nonlinux">kFreeBSD</a> (Wheezy)</li>
<li><a href="debian#debian">Simply MEPIS</a> <span style="font-style: italic;">8.5.03-rel1</span></li> <li><a href="#debian">Knoppix</a></li>
<li><a href="debian#ubuntu">Trisque</a>l <span style="font-style: italic;">4.5.1</span></li> <li><a href="#debian">Simply MEPIS</a> <span style="font-style: italic;">8.5.03-rel1</span></li>
<li><a href="debian#debian">gNewSense</a> <span style="font-style: italic;">2.3</span></li> <li><a href="#ubuntu">Trisque</a>l <span style="font-style: italic;">4.5.1</span></li>
<li><a href="debian#nonlinux">Nexenta</a> <span style="font-style: italic;">3.0.1</span></li> <li><a href="#debian">gNewSense</a> <span style="font-style: italic;">2.3</span></li>
<li><a href="#nonlinux">Nexenta</a> <span style="font-style: italic;">3.0.1</span></li>
</ul> </ul>
The I2P packages <span style="font-style: italic;">may</span> work on systems not listed above. Please report any issues with these packages on <a href="http://trac.i2p2.de/">Trac</a> at <a href="http://trac.i2p2.de">http://trac.i2p2.de</a>. The I2P packages <span style="font-style: italic;">may</span> work on systems not listed above. Please report any issues with these packages on <a href="http://trac.i2p2.de/">Trac</a> at <a href="http://trac.i2p2.de">http://trac.i2p2.de</a>.
<ul> <ul>
<li>Option 1: <a href="debian#ubuntu">Recent versions</a> of Ubuntu and its derivatives (<span style="font-style: italic;">Try this if you're not using Debian)</span></li> <li>Option 1: <a href="#ubuntu">Recent versions</a> of Ubuntu and its derivatives (<span style="font-style: italic;">Try this if you're not using Debian)</span></li>
<li>Option 2: <a href="debian#debian">Debian</a> (including systems based on Debian and older versions of Ubuntu)</li> <li>Option 2: <a href="#debian">Debian</a> (including systems based on Debian and older versions of Ubuntu)</li>
<li>Option 3: <a href="debian#nonlinux">Non-Linux</a> (and possibly Non-x86 architectures)</li> <li>Option 3: <a href="#nonlinux">Non-Linux</a> (and possibly Non-x86 architectures)</li>
</ul> </ul>
<h2 id="ubuntu">Instructions for Ubuntu Lucid Lynx (and newer) and derivatives like Linux Mint &amp; Trisquel</h2> <h2 id="ubuntu">Instructions for Ubuntu Lucid Lynx (and newer) and derivatives like Linux Mint &amp; Trisquel</h2>
<h5>Adding the PPA via the command line and installing I2P</h5> <h5>Adding the PPA via the command line and installing I2P</h5>
@@ -45,7 +46,7 @@ was added with the earlier command.</li>
</ol> </ol>
After the installation process completes you can move on to the next After the installation process completes you can move on to the next
part of <a href="debian#Post-install_work">starting I2P</a> and configuring it for your system. part of <a href="#Post-install_work">starting I2P</a> and configuring it for your system.
<h2 id="debian">Instructions for Debian Lenny and newer</h2> <h2 id="debian">Instructions for Debian Lenny and newer</h2>
The steps below should be performed with root access (i.e., switching The steps below should be performed with root access (i.e., switching
@@ -81,7 +82,7 @@ You are now ready to install I2P! <br />
<code>&nbsp;&nbsp;&nbsp; dpkg -i i2p-router_*.deb</code></li> <code>&nbsp;&nbsp;&nbsp; dpkg -i i2p-router_*.deb</code></li>
<li>It is recommended to compile <a href="/jbigi">jbigi</a> for your system to achieve better performance. Instructions are available <a href="/jbigi">here</a>.</li> <li>It is recommended to compile <a href="/jbigi">jbigi</a> for your system to achieve better performance. Instructions are available <a href="/jbigi">here</a>.</li>
</ol> </ol>
After the installation process completes you can move on to the next part of <a href="debian#Post-install_work">starting I2P</a> and configuring it for your system. After the installation process completes you can move on to the next part of <a href="#Post-install_work">starting I2P</a> and configuring it for your system.
<h2 id="Post-install_work">Post-install work</h2> <h2 id="Post-install_work">Post-install work</h2>
Using these I2P packages the I2P router can be started in the following Using these I2P packages the I2P router can be started in the following
three ways: three ways:

View File

@@ -37,7 +37,7 @@ or type <tt>java -version</tt> at your command prompt.
run <code>java -jar i2pinstall_0.9.3.jar -console</code> from the command line. run <code>java -jar i2pinstall_0.9.3.jar -console</code> from the command line.
</li> </li>
<li><a href="/debian.html">Packages for Debian &amp; Ubuntu</a></li> <li><a href="{{ url_for('downloads_select', lang=g.lang, file='debian') }}">Packages for Debian &amp; Ubuntu</a></li>
<li><b>Source install:</b><br /> <li><b>Source install:</b><br />
<a href="http://mirror.i2p2.de/i2psource_0.9.3.tar.bz2">i2psource_0.9.3.tar.bz2</a> <a href="http://mirror.i2p2.de/i2psource_0.9.3.tar.bz2">i2psource_0.9.3.tar.bz2</a>

View File

@@ -7,6 +7,7 @@
{%- if request.endpoint == 'site_show' -%}{{ url_for('site_show', lang=lang, page=page) }} {%- if request.endpoint == 'site_show' -%}{{ url_for('site_show', lang=lang, page=page) }}
{%- elif request.endpoint == 'blog_entry' -%}{{ url_for('blog_entry', lang=lang, slug=slug) }} {%- elif request.endpoint == 'blog_entry' -%}{{ url_for('blog_entry', lang=lang, slug=slug) }}
{%- elif request.endpoint == 'meetings_show' -%}{{ url_for('meetings_show', lang=lang, id=id) }} {%- elif request.endpoint == 'meetings_show' -%}{{ url_for('meetings_show', lang=lang, id=id) }}
{%- elif request.endpoint == 'downloads_select' -%}{{ url_for('downloads_select', lang=lang, file=file) }}
{%- elif request.endpoint -%}{{ url_for(request.endpoint, lang=lang) }} {%- elif request.endpoint -%}{{ url_for(request.endpoint, lang=lang) }}
{%- else -%}{{ url_for('site_show', lang=lang) }} {%- else -%}{{ url_for('site_show', lang=lang) }}
{%- endif -%} {%- endif -%}

View File

@@ -5,7 +5,7 @@
<li><a href="{{ url_for('downloads_list', lang=g.lang) }}"><span>{{ _('Download I2P') }}</span></a></li> <li><a href="{{ url_for('downloads_list', lang=g.lang) }}"><span>{{ _('Download I2P') }}</span></a></li>
<li><a href="#"><span>{{ _('Windows installer') }}</span></a></li> <li><a href="#"><span>{{ _('Windows installer') }}</span></a></li>
<li><a href="#"><span>{{ _('Linux / OS X / BSD / Solaris installer') }}</span></a></li> <li><a href="#"><span>{{ _('Linux / OS X / BSD / Solaris installer') }}</span></a></li>
<li><a href="#"><span>{{ _('Debian / Ubuntu packages') }}</span></a></li> <li><a href="{{ url_for('downloads_select', lang=g.lang, file='debian') }}"><span>{{ _('Debian / Ubuntu packages') }}</span></a></li>
<li><a href="#"><span>{{ _('Source package') }}</span></a></li> <li><a href="#"><span>{{ _('Source package') }}</span></a></li>
</ul> </ul>
</li> </li>