diff --git a/i2p2www/__init__.py b/i2p2www/__init__.py index 9f10d055..0c5dd361 100644 --- a/i2p2www/__init__.py +++ b/i2p2www/__init__.py @@ -252,6 +252,8 @@ def downloads_list(): @app.route('//download/') def downloads_select(file): # TODO: implement + if (file == 'debian'): + return render_template('downloads/debian.html') pass @app.route('/download//any/') diff --git a/www.i2p2/pages/debian.html b/i2p2www/pages/downloads/debian.html similarity index 84% rename from www.i2p2/pages/debian.html rename to i2p2www/pages/downloads/debian.html index 71a19ba6..e4c3d56c 100644 --- a/www.i2p2/pages/debian.html +++ b/i2p2www/pages/downloads/debian.html @@ -1,4 +1,4 @@ -{% extends "_layout.html" %} +{% extends "global/layout.html" %} {% block title %}Debian/Ubuntu{% endblock %} {% block content %}

Debian I2P Packages

@@ -6,19 +6,20 @@ The packages hosted on the I2P Launchpad site have been tested and should work on x86/x86_64 platforms running The I2P packages may work on systems not listed above. Please report any issues with these packages on Trac at http://trac.i2p2.de.
    -
  • Option 1: Recent versions of Ubuntu and its derivatives (Try this if you're not using Debian)
    • -
  • Option 2: Debian (including systems based on Debian and older versions of Ubuntu)
    • -
  • Option 3: Non-Linux (and possibly Non-x86 architectures)
    • +
  • Option 1: Recent versions of Ubuntu and its derivatives (Try this if you're not using Debian)
    • +
  • Option 2: Debian (including systems based on Debian and older versions of Ubuntu)
    • +
  • Option 3: Non-Linux (and possibly Non-x86 architectures)

Instructions for Ubuntu Lucid Lynx (and newer) and derivatives like Linux Mint & Trisquel

Adding the PPA via the command line and installing I2P
@@ -45,7 +46,7 @@ was added with the earlier command. After the installation process completes you can move on to the next -part of starting I2P and configuring it for your system. +part of starting I2P and configuring it for your system.

Instructions for Debian Lenny and newer

The steps below should be performed with root access (i.e., switching @@ -81,7 +82,7 @@ You are now ready to install I2P!
    dpkg -i i2p-router_*.deb
  • It is recommended to compile jbigi for your system to achieve better performance. Instructions are available here.
    • -After the installation process completes you can move on to the next part of starting I2P and configuring it for your system. +After the installation process completes you can move on to the next part of starting I2P and configuring it for your system.

    Post-install work

    Using these I2P packages the I2P router can be started in the following three ways: diff --git a/i2p2www/pages/downloads/list.html b/i2p2www/pages/downloads/list.html index 292ad54b..26723788 100644 --- a/i2p2www/pages/downloads/list.html +++ b/i2p2www/pages/downloads/list.html @@ -37,7 +37,7 @@ or type java -version at your command prompt. run java -jar i2pinstall_0.9.3.jar -console from the command line. -
  • Packages for Debian & Ubuntu
    • +
  • Packages for Debian & Ubuntu
  • Source install:
    i2psource_0.9.3.tar.bz2 diff --git a/i2p2www/pages/global/macros b/i2p2www/pages/global/macros index 92fabf41..0a7e6042 100644 --- a/i2p2www/pages/global/macros +++ b/i2p2www/pages/global/macros @@ -7,6 +7,7 @@ {%- 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 == '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) }} {%- else -%}{{ url_for('site_show', lang=lang) }} {%- endif -%} diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html index 23d4b573..9427d1d9 100644 --- a/i2p2www/pages/global/nav.html +++ b/i2p2www/pages/global/nav.html @@ -5,7 +5,7 @@
  • {{ _('Download I2P') }}
  • {{ _('Windows installer') }}
  • {{ _('Linux / OS X / BSD / Solaris installer') }}
    • -
  • {{ _('Debian / Ubuntu packages') }}
    • +
  • {{ _('Debian / Ubuntu packages') }}
  • {{ _('Source package') }}