From 7baf77ad1c381ca07c33218ccba123d5d8617b9d Mon Sep 17 00:00:00 2001
From: dev <dev@welterde.de>
Date: Fri, 1 Jun 2012 23:36:38 +0000
Subject: [PATCH] first kinda working setup

well.. kinda... /en/meetings/208 works and that's about it
---
 app.py                                        |  35 ++++++++-
 .../pages/meeting208.html => meetings/208.log |  71 ------------------
 .../_layout.html => pages/global/layout.html  |  14 ++--
 .../_menu.html => pages/global/menu.html      |  22 +++---
 www.i2p2/pages/_urlify => pages/global/urlify |   2 +-
 .../meetings/index.html                       |   2 +-
 {www.i2p2/static => static}/favicon.ico       | Bin
 .../images/I2PTunnel-streamr.png              | Bin
 .../images/add-key-terminal.png               | Bin
 .../images/bandwidth2009.png                  | Bin
 {www.i2p2/static => static}/images/cz.png     | Bin
 {www.i2p2/static => static}/images/dark.png   | Bin
 .../static => static}/images/darkbluebg.png   | Bin
 .../static => static}/images/darkbluetile.png | Bin
 .../images/darkerbluetile.png                 | Bin
 {www.i2p2/static => static}/images/de.png     | Bin
 .../static => static}/images/download.png     | Bin
 .../images/download_dark.png                  | Bin
 .../images/endToEndEncryption.png             | Bin
 .../images/endToEndEncryption_fr.png          | Bin
 .../images/endToEndEncryption_zh.png          | Bin
 {www.i2p2/static => static}/images/es.png     | Bin
 {www.i2p2/static => static}/images/eu.png     | Bin
 .../images/firefox.options.jpg                | Bin
 .../images/firefox.options_fr.png             | Bin
 .../images/firefox.proxyports.jpg             | Bin
 .../images/firefox.proxyports_fr.png          | Bin
 {www.i2p2/static => static}/images/fr.png     | Bin
 .../static => static}/images/garliccloves.png | Bin
 {www.i2p2/static => static}/images/help.png   | Bin
 .../static => static}/images/help_dark.png    | Bin
 .../static => static}/images/i2plogo.png      | Bin
 .../images/i2ptunnel_peertopeer.png           | Bin
 .../images/i2ptunnel_serverclient.png         | Bin
 .../static => static}/images/i2pvstor_zh.png  | Bin
 .../static => static}/images/ie.options.jpg   | Bin
 .../images/ie.options_fr.png                  | Bin
 .../images/ie.proxyports.jpg                  | Bin
 .../images/ie.proxyports_fr.png               | Bin
 {www.i2p2/static => static}/images/info.png   | Bin
 .../static => static}/images/info_dark.png    | Bin
 {www.i2p2/static => static}/images/it.png     | Bin
 .../static => static}/images/itoopie.png      | Bin
 .../images/konqueror.options.jpg              | Bin
 .../images/konqueror.options_fr.jpg           | Bin
 .../images/konqueror.proxyports.jpg           | Bin
 .../images/konqueror.proxyports_fr.jpg        | Bin
 .../static => static}/images/lang_ar.png      | Bin
 {www.i2p2/static => static}/images/light.png  | Bin
 .../images/lightbluetile.png                  | Bin
 {www.i2p2/static => static}/images/link.png   | Bin
 .../static => static}/images/link_dark.png    | Bin
 .../static => static}/images/logo07c.jpg      | Bin
 {www.i2p2/static => static}/images/net.png    | Bin
 {www.i2p2/static => static}/images/net_fr.png | Bin
 .../images/netdb_get_leaseset.png             | Bin
 .../images/netdb_get_leaseset_fr.png          | Bin
 .../images/netdb_get_routerinfo_1.png         | Bin
 .../images/netdb_get_routerinfo_1_fr.png      | Bin
 .../images/netdb_get_routerinfo_2.png         | Bin
 .../images/netdb_get_routerinfo_2_fr.png      | Bin
 {www.i2p2/static => static}/images/nl.png     | Bin
 {www.i2p2/static => static}/images/plan.png   | Bin
 .../images/protocol_stack.png                 | Bin
 .../images/protocol_stack_fr.png              | Bin
 {www.i2p2/static => static}/images/ru.png     | Bin
 .../static => static}/images/sqbullet.png     | Bin
 .../images/stackoverflow_ad.png               | Bin
 .../static => static}/images/tabletile.png    | Bin
 .../images/tabletile_alt.png                  | Bin
 .../images/tabletitledark.png                 | Bin
 .../images/tabletitlelight-tall.png           | Bin
 .../images/tabletitlelight.png                | Bin
 {www.i2p2/static => static}/images/target.png | Bin
 .../images/tunnelSending.png                  | Bin
 .../static => static}/images/tunnels.png      | Bin
 .../static => static}/images/tunnels_fr.png   | Bin
 {www.i2p2/static => static}/images/udp.png    | Bin
 {www.i2p2/static => static}/images/us.png     | Bin
 {www.i2p2/static => static}/images/zh.png     | Bin
 {www.i2p2/static => static}/news/news.xml     |   0
 {www.i2p2/static => static}/pdf/I2CP_spec.pdf | Bin
 {www.i2p2/static => static}/pdf/I2NP_spec.pdf | Bin
 .../pdf/I2P-PET-CON-2009.1.pdf                | Bin
 .../static => static}/pdf/datastructures.pdf  | Bin
 .../static => static}/pdf/i2p_philosophy.pdf  | Bin
 .../pdf/polling_http_transport.pdf            | Bin
 {www.i2p2/static => static}/styles/dark.css   |   0
 {www.i2p2/static => static}/styles/light.css  |   0
 .../static => static}/styles/light_ar.css     |   0
 .../static => static}/styles/light_zh.css     |   0
 91 files changed, 51 insertions(+), 95 deletions(-)
 rename www.i2p2/pages/meeting208.html => meetings/208.log (83%)
 rename www.i2p2/pages/_layout.html => pages/global/layout.html (59%)
 rename www.i2p2/pages/_menu.html => pages/global/menu.html (95%)
 rename www.i2p2/pages/_urlify => pages/global/urlify (79%)
 rename www.i2p2/pages/meetings.html => pages/meetings/index.html (99%)
 rename {www.i2p2/static => static}/favicon.ico (100%)
 rename {www.i2p2/static => static}/images/I2PTunnel-streamr.png (100%)
 rename {www.i2p2/static => static}/images/add-key-terminal.png (100%)
 rename {www.i2p2/static => static}/images/bandwidth2009.png (100%)
 rename {www.i2p2/static => static}/images/cz.png (100%)
 rename {www.i2p2/static => static}/images/dark.png (100%)
 rename {www.i2p2/static => static}/images/darkbluebg.png (100%)
 rename {www.i2p2/static => static}/images/darkbluetile.png (100%)
 rename {www.i2p2/static => static}/images/darkerbluetile.png (100%)
 rename {www.i2p2/static => static}/images/de.png (100%)
 rename {www.i2p2/static => static}/images/download.png (100%)
 rename {www.i2p2/static => static}/images/download_dark.png (100%)
 rename {www.i2p2/static => static}/images/endToEndEncryption.png (100%)
 rename {www.i2p2/static => static}/images/endToEndEncryption_fr.png (100%)
 rename {www.i2p2/static => static}/images/endToEndEncryption_zh.png (100%)
 rename {www.i2p2/static => static}/images/es.png (100%)
 rename {www.i2p2/static => static}/images/eu.png (100%)
 rename {www.i2p2/static => static}/images/firefox.options.jpg (100%)
 rename {www.i2p2/static => static}/images/firefox.options_fr.png (100%)
 rename {www.i2p2/static => static}/images/firefox.proxyports.jpg (100%)
 rename {www.i2p2/static => static}/images/firefox.proxyports_fr.png (100%)
 rename {www.i2p2/static => static}/images/fr.png (100%)
 rename {www.i2p2/static => static}/images/garliccloves.png (100%)
 rename {www.i2p2/static => static}/images/help.png (100%)
 rename {www.i2p2/static => static}/images/help_dark.png (100%)
 rename {www.i2p2/static => static}/images/i2plogo.png (100%)
 rename {www.i2p2/static => static}/images/i2ptunnel_peertopeer.png (100%)
 rename {www.i2p2/static => static}/images/i2ptunnel_serverclient.png (100%)
 rename {www.i2p2/static => static}/images/i2pvstor_zh.png (100%)
 rename {www.i2p2/static => static}/images/ie.options.jpg (100%)
 rename {www.i2p2/static => static}/images/ie.options_fr.png (100%)
 rename {www.i2p2/static => static}/images/ie.proxyports.jpg (100%)
 rename {www.i2p2/static => static}/images/ie.proxyports_fr.png (100%)
 rename {www.i2p2/static => static}/images/info.png (100%)
 rename {www.i2p2/static => static}/images/info_dark.png (100%)
 rename {www.i2p2/static => static}/images/it.png (100%)
 rename {www.i2p2/static => static}/images/itoopie.png (100%)
 rename {www.i2p2/static => static}/images/konqueror.options.jpg (100%)
 rename {www.i2p2/static => static}/images/konqueror.options_fr.jpg (100%)
 rename {www.i2p2/static => static}/images/konqueror.proxyports.jpg (100%)
 rename {www.i2p2/static => static}/images/konqueror.proxyports_fr.jpg (100%)
 rename {www.i2p2/static => static}/images/lang_ar.png (100%)
 rename {www.i2p2/static => static}/images/light.png (100%)
 rename {www.i2p2/static => static}/images/lightbluetile.png (100%)
 rename {www.i2p2/static => static}/images/link.png (100%)
 rename {www.i2p2/static => static}/images/link_dark.png (100%)
 rename {www.i2p2/static => static}/images/logo07c.jpg (100%)
 rename {www.i2p2/static => static}/images/net.png (100%)
 rename {www.i2p2/static => static}/images/net_fr.png (100%)
 rename {www.i2p2/static => static}/images/netdb_get_leaseset.png (100%)
 rename {www.i2p2/static => static}/images/netdb_get_leaseset_fr.png (100%)
 rename {www.i2p2/static => static}/images/netdb_get_routerinfo_1.png (100%)
 rename {www.i2p2/static => static}/images/netdb_get_routerinfo_1_fr.png (100%)
 rename {www.i2p2/static => static}/images/netdb_get_routerinfo_2.png (100%)
 rename {www.i2p2/static => static}/images/netdb_get_routerinfo_2_fr.png (100%)
 rename {www.i2p2/static => static}/images/nl.png (100%)
 rename {www.i2p2/static => static}/images/plan.png (100%)
 rename {www.i2p2/static => static}/images/protocol_stack.png (100%)
 rename {www.i2p2/static => static}/images/protocol_stack_fr.png (100%)
 rename {www.i2p2/static => static}/images/ru.png (100%)
 rename {www.i2p2/static => static}/images/sqbullet.png (100%)
 rename {www.i2p2/static => static}/images/stackoverflow_ad.png (100%)
 rename {www.i2p2/static => static}/images/tabletile.png (100%)
 rename {www.i2p2/static => static}/images/tabletile_alt.png (100%)
 rename {www.i2p2/static => static}/images/tabletitledark.png (100%)
 rename {www.i2p2/static => static}/images/tabletitlelight-tall.png (100%)
 rename {www.i2p2/static => static}/images/tabletitlelight.png (100%)
 rename {www.i2p2/static => static}/images/target.png (100%)
 rename {www.i2p2/static => static}/images/tunnelSending.png (100%)
 rename {www.i2p2/static => static}/images/tunnels.png (100%)
 rename {www.i2p2/static => static}/images/tunnels_fr.png (100%)
 rename {www.i2p2/static => static}/images/udp.png (100%)
 rename {www.i2p2/static => static}/images/us.png (100%)
 rename {www.i2p2/static => static}/images/zh.png (100%)
 rename {www.i2p2/static => static}/news/news.xml (100%)
 rename {www.i2p2/static => static}/pdf/I2CP_spec.pdf (100%)
 rename {www.i2p2/static => static}/pdf/I2NP_spec.pdf (100%)
 rename {www.i2p2/static => static}/pdf/I2P-PET-CON-2009.1.pdf (100%)
 rename {www.i2p2/static => static}/pdf/datastructures.pdf (100%)
 rename {www.i2p2/static => static}/pdf/i2p_philosophy.pdf (100%)
 rename {www.i2p2/static => static}/pdf/polling_http_transport.pdf (100%)
 rename {www.i2p2/static => static}/styles/dark.css (100%)
 rename {www.i2p2/static => static}/styles/light.css (100%)
 rename {www.i2p2/static => static}/styles/light_ar.css (100%)
 rename {www.i2p2/static => static}/styles/light_zh.css (100%)

diff --git a/app.py b/app.py
index 263c26fb..5108529b 100644
--- a/app.py
+++ b/app.py
@@ -14,9 +14,21 @@ MEETINGS_DIR = os.path.join(os.path.dirname(__file__), 'meetings')
 app = application = Flask(__name__, template_folder=TEMPLATE_DIR, static_url_path='/_static', static_folder=STATIC_DIR)
 app.debug =  bool(os.environ.get('APP_DEBUG', 'False'))
 
+@app.after_request
+def call_after_request_callbacks(response):
+    for callback in getattr(g, 'after_request_callbacks', ()):
+        response = callback(response)
+    return response
+
+def after_this_request(f):
+    if not hasattr(g, 'after_request_callbacks'):
+        g.after_request_callbacks = []
+    g.after_request_callbacks.append(f)
+    return f
+
 
 @app.template_filter('restructuredtext')
-def restructuredtext(env, value):
+def restructuredtext(value):
     try:
         from docutils.core import publish_parts
     except ImportError:
@@ -32,9 +44,24 @@ def pull_lang(endpoint, values):
         return
     g.lang=values.pop('lang', None)
 
-#@app.url_value_preprocessor
-#def fix_theme(endpoint, values):
-#   pass
+@app.before_request
+def detect_theme():
+    theme = 'light'
+    if 'style' in request.cookies:
+        theme = request.cookies['style']
+    if 'theme' in request.args.keys():
+        theme = request.args['theme']
+    if not os.path.isfile(safe_join('static/styles', '%s.css' % theme)):
+        theme = 'light'
+    g.theme = theme
+    @after_this_request
+    def remember_theme(resp):
+        if g.theme == 'light' and 'style' in request.cookies:
+            resp.delete_cookie('style')
+        elif g.theme != 'light':
+            resp.set_cookie('style', g.theme)
+        return resp
+
 
 @app.route('/')
 def main_index():
diff --git a/www.i2p2/pages/meeting208.html b/meetings/208.log
similarity index 83%
rename from www.i2p2/pages/meeting208.html
rename to meetings/208.log
index 18448cd8..0d0f5157 100644
--- a/www.i2p2/pages/meeting208.html
+++ b/meetings/208.log
@@ -1,69 +1,3 @@
-{% extends "_layout.html" %}
-{% block title %}I2P Development Meeting 208{% endblock %}
-{% block content %}<h3>I2P dev meeting, September 8, 2010</h3>
-<div>
-<h4>Quick recap</h4>
-<ul>
-    <li><b>Present:</b> duck, eche|on, Mathiasdm, Moru (later on), superuser, whitenoise, zzz</li>
-    <li>
-        <b>Website content progress:</b>
-        <p>
-            The website overhaul has taken 7 weeks so far. Progress is not fast enough. We need more people to join in!
-        </p>
-    </li>
-    <li>
-        <b>Website backend progress:</b>
-        <p>
-            No report yet, welterde could not attend the meeting.
-        </p>
-    </li>
-    <li>
-        <b>Location for development discussion:</b>
-        <p>
-            Most people agree that IRC is not an ideal location to post long-winded development discussions, it's too volatile, not backed up and not everyone can read it. <b>All developers are advised to post their discussions (or a writeup) to another medium, like zzz.i2p, mailing lists or forum.i2p</b>.
-            Opinions on the alternatives are a bit more divided. zzz.i2p is currently the location for most discussions, but a number of people also like the idea of a mailing list. No decision has been made on which alternative would be best suited.
-        </p>
-    </li>
-    <li>
-        <b>Task appointing and disagreements:</b>
-        <p>
-            Currently, people appoint themselves to a task by editing the team.html page (this requires monotone access, so there is at least a level of trust implied before being allowed to appoint yourself).
-            However, what happens if people disagree?
-        </p>
-        <p>
-            The discussion pointed out that when disagreeing, a discussion should be held (for example on zzz.i2p). If that doesn't resolve the issue, a vote is a possibility, or the Project Manager (zzz) or repository maintainers (welterde, eche|on) can make a decision.
-        </p>
-    </li>
-    <li>
-        <b>Status updates:</b>
-        <p>
-            Status updates will be started next weekend. They will mostly consist of a 'what work did you do last week?' and 'what work will you do next week?'.
-        </p>
-    </li>
-    <li>
-        <b>Development conferences:</b>
-        <p>
-            Nothing big was mentioned.
-        </p>
-    </li>
-    <li>
-        <b>Promoting the usage of the bittorrent protocol inside I2P: pros and cons:</b>
-        <p>
-            Filesharing in general and bittorrent more specifically can be either good or bad for I2P.
-            On one hand, they could give I2P a bad reputation. On the other hand, they could boost I2P popularity.
-            What to do?
-        </p>
-        <p>
-            Filesharing on I2P will not be promoted specifically. Instead, general usability should be looked at and improved.
-            If people decide to use filesharing on I2P (or any other service, like e-mail or browsing), it should become easier as a result of improving the usability.
-        </p>
-    </li>
-</ul>
-</div>
-<div class="irclog">
-<h4>Full IRC Log</h4>
-<pre>
-{% filter escape %}
 22:02 <@Mathiasdm> okay
 22:02 <@Mathiasdm> meeting time
 22:03 <@Mathiasdm> 0) Hello
@@ -327,8 +261,3 @@
 23:24 < eche|on> COOKIES!
 23:25 <@Mathiasdm> don't eat all of them
 23:25  * Mathiasdm pokes eche|on 
-{% endfilter %}
-{# TODO: pygments #}
-</pre>
-</div>
-{% endblock %}
diff --git a/www.i2p2/pages/_layout.html b/pages/global/layout.html
similarity index 59%
rename from www.i2p2/pages/_layout.html
rename to pages/global/layout.html
index 26fa7599..4889c68a 100644
--- a/www.i2p2/pages/_layout.html
+++ b/pages/global/layout.html
@@ -1,24 +1,24 @@
-{% include "_urlify" -%}
+{% include "global/urlify" -%}
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
   <head>
-    <title>{% filter capture('title') %}{% block title %}{% endblock %}{% endfilter %} - I2P</title>
+    <title>{% block title %}{% endblock %} - I2P</title>
     <link rel="canonical" href="{{ domain }}/{{ path }}" />
-    <link rel="stylesheet" href="_static/styles/{{ theme }}.css" type="text/css" title="{{ theme }}" />
-    <link rel="shortcut icon" href="_static/favicon.ico" />
+    <link rel="stylesheet" href="/_static/styles/{{ g.theme }}.css" type="text/css" title="{{ g.theme }}" />
+    <link rel="shortcut icon" href="/_static/favicon.ico" />
     <link type="application/atom+xml" rel="alternate" href="http://code.google.com/feeds/p/i2p/downloads/basic" />
     <meta name="robots" content="NOODP" />
   </head>
   <body>
     <div class="hide"><a href="#main" title="Skip navigation" accesskey="2">Skip navigation</a></div>
     <div class="logo">
-      <a href="index.html" class="fade"><img src="_static/images/i2plogo.png" alt="I2P Logo" title="Invisible Internet Project (I2P)" /></a>
+      <a href="index.html" class="fade"><img src="/_static/images/i2plogo.png" alt="I2P Logo" title="Invisible Internet Project (I2P)" /></a>
     </div>
-    <h1>{{ title }}</h1>
+    <h1>{{ self.title() }}</h1>
     <div class="menu">
-      {% include "_menu.html" %}
+      {% include "global/menu.html" %}
     </div>
     <div class="main" id="main">
       {% block content %}{% endblock %}
diff --git a/www.i2p2/pages/_menu.html b/pages/global/menu.html
similarity index 95%
rename from www.i2p2/pages/_menu.html
rename to pages/global/menu.html
index 046e00a2..86adfcae 100644
--- a/www.i2p2/pages/_menu.html
+++ b/pages/global/menu.html
@@ -1,20 +1,20 @@
 <div class="langbox"><div style="text-align: left; width: 118px; margin-left: auto; margin-right: auto;">
-<a href="index.html" class="fade"><img src="_static/images/us.png" alt="English" title="English" class="lang" /></a>
-<a href="index_de.html" class="fade"><img src="_static/images/de.png" alt="Deutsch" title="Deutsch" class="lang" /></a>
-<a href="index_es.html" class="fade"><img src="_static/images/es.png" alt="Castellano" title="Castellano" class="lang" /></a>
-<a href="index_zh.html" class="fade"><img src="_static/images/zh.png" alt="中文" title="中文" class="lang" /></a>
+<a href="index.html" class="fade"><img src="/_static/images/us.png" alt="English" title="English" class="lang" /></a>
+<a href="index_de.html" class="fade"><img src="/_static/images/de.png" alt="Deutsch" title="Deutsch" class="lang" /></a>
+<a href="index_es.html" class="fade"><img src="/_static/images/es.png" alt="Castellano" title="Castellano" class="lang" /></a>
+<a href="index_zh.html" class="fade"><img src="/_static/images/zh.png" alt="中文" title="中文" class="lang" /></a>
 <br /><div style="padding: 2px 0px;"></div>
-<a href="index_fr.html" class="fade"><img src="_static/images/fr.png" alt="Français" title="Français" class="lang" /></a>
-<a href="index_it.html" class="fade"><img src="_static/images/it.png" alt="Italiano" title="Italiano" class="lang" /></a>
-<a href="index_nl.html" class="fade"><img src="_static/images/nl.png" alt="Nederlands" title="Nederlands" class="lang" /></a>
-<a href="index_ru.html" class="fade"><img src="_static/images/ru.png" alt="Русский" title="Русский" class="lang" /></a>
+<a href="index_fr.html" class="fade"><img src="/_static/images/fr.png" alt="Français" title="Français" class="lang" /></a>
+<a href="index_it.html" class="fade"><img src="/_static/images/it.png" alt="Italiano" title="Italiano" class="lang" /></a>
+<a href="index_nl.html" class="fade"><img src="/_static/images/nl.png" alt="Nederlands" title="Nederlands" class="lang" /></a>
+<a href="index_ru.html" class="fade"><img src="/_static/images/ru.png" alt="Русский" title="Русский" class="lang" /></a>
 <br /><div style="padding: 2px 0px;"></div>
-<a href="index_cs.html" class="fade"><img src="_static/images/cz.png" alt="Čeština" title="Čeština" class="lang" /></a>
-<a href="index_ar.html" class="fade"><img src="_static/images/lang_ar.png" alt="العربية" title="العربية" class="lang" /></a>
+<a href="index_cs.html" class="fade"><img src="/_static/images/cz.png" alt="Čeština" title="Čeština" class="lang" /></a>
+<a href="index_ar.html" class="fade"><img src="/_static/images/lang_ar.png" alt="العربية" title="العربية" class="lang" /></a>
 </div></div>
 
 <div class="themebox" style="text-align:center"><a href="?theme=dark" class="fade"><img src="/_static/images/dark.png" alt="Dark" title="Dark theme" class="lang" /></a>&nbsp;
-<a href="?theme=light"  class="fade"><img src="_static/images/light.png" alt="Light" title="Light theme" class="lang" /></a>
+<a href="?theme=light"  class="fade"><img src="/_static/images/light.png" alt="Light" title="Light theme" class="lang" /></a>
 </div>
 
 {% if lang == "de" %}
diff --git a/www.i2p2/pages/_urlify b/pages/global/urlify
similarity index 79%
rename from www.i2p2/pages/_urlify
rename to pages/global/urlify
index a9bdbf3d..59ffe02c 100644
--- a/www.i2p2/pages/_urlify
+++ b/pages/global/urlify
@@ -1,4 +1,4 @@
-{% macro urlify url, title, suffix %}
+{% macro urlify(url, title, suffix) %}
     {% if static %}
     <a href="{{url}}.{{suffix}}">{{title}}</a>
     {% else %}
diff --git a/www.i2p2/pages/meetings.html b/pages/meetings/index.html
similarity index 99%
rename from www.i2p2/pages/meetings.html
rename to pages/meetings/index.html
index 9e65b231..b8effc6b 100644
--- a/www.i2p2/pages/meetings.html
+++ b/pages/meetings/index.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Meetings{% endblock %}
 {% block content %}
 <h1>Logs of past I2P meetings</h1>
diff --git a/www.i2p2/static/favicon.ico b/static/favicon.ico
similarity index 100%
rename from www.i2p2/static/favicon.ico
rename to static/favicon.ico
diff --git a/www.i2p2/static/images/I2PTunnel-streamr.png b/static/images/I2PTunnel-streamr.png
similarity index 100%
rename from www.i2p2/static/images/I2PTunnel-streamr.png
rename to static/images/I2PTunnel-streamr.png
diff --git a/www.i2p2/static/images/add-key-terminal.png b/static/images/add-key-terminal.png
similarity index 100%
rename from www.i2p2/static/images/add-key-terminal.png
rename to static/images/add-key-terminal.png
diff --git a/www.i2p2/static/images/bandwidth2009.png b/static/images/bandwidth2009.png
similarity index 100%
rename from www.i2p2/static/images/bandwidth2009.png
rename to static/images/bandwidth2009.png
diff --git a/www.i2p2/static/images/cz.png b/static/images/cz.png
similarity index 100%
rename from www.i2p2/static/images/cz.png
rename to static/images/cz.png
diff --git a/www.i2p2/static/images/dark.png b/static/images/dark.png
similarity index 100%
rename from www.i2p2/static/images/dark.png
rename to static/images/dark.png
diff --git a/www.i2p2/static/images/darkbluebg.png b/static/images/darkbluebg.png
similarity index 100%
rename from www.i2p2/static/images/darkbluebg.png
rename to static/images/darkbluebg.png
diff --git a/www.i2p2/static/images/darkbluetile.png b/static/images/darkbluetile.png
similarity index 100%
rename from www.i2p2/static/images/darkbluetile.png
rename to static/images/darkbluetile.png
diff --git a/www.i2p2/static/images/darkerbluetile.png b/static/images/darkerbluetile.png
similarity index 100%
rename from www.i2p2/static/images/darkerbluetile.png
rename to static/images/darkerbluetile.png
diff --git a/www.i2p2/static/images/de.png b/static/images/de.png
similarity index 100%
rename from www.i2p2/static/images/de.png
rename to static/images/de.png
diff --git a/www.i2p2/static/images/download.png b/static/images/download.png
similarity index 100%
rename from www.i2p2/static/images/download.png
rename to static/images/download.png
diff --git a/www.i2p2/static/images/download_dark.png b/static/images/download_dark.png
similarity index 100%
rename from www.i2p2/static/images/download_dark.png
rename to static/images/download_dark.png
diff --git a/www.i2p2/static/images/endToEndEncryption.png b/static/images/endToEndEncryption.png
similarity index 100%
rename from www.i2p2/static/images/endToEndEncryption.png
rename to static/images/endToEndEncryption.png
diff --git a/www.i2p2/static/images/endToEndEncryption_fr.png b/static/images/endToEndEncryption_fr.png
similarity index 100%
rename from www.i2p2/static/images/endToEndEncryption_fr.png
rename to static/images/endToEndEncryption_fr.png
diff --git a/www.i2p2/static/images/endToEndEncryption_zh.png b/static/images/endToEndEncryption_zh.png
similarity index 100%
rename from www.i2p2/static/images/endToEndEncryption_zh.png
rename to static/images/endToEndEncryption_zh.png
diff --git a/www.i2p2/static/images/es.png b/static/images/es.png
similarity index 100%
rename from www.i2p2/static/images/es.png
rename to static/images/es.png
diff --git a/www.i2p2/static/images/eu.png b/static/images/eu.png
similarity index 100%
rename from www.i2p2/static/images/eu.png
rename to static/images/eu.png
diff --git a/www.i2p2/static/images/firefox.options.jpg b/static/images/firefox.options.jpg
similarity index 100%
rename from www.i2p2/static/images/firefox.options.jpg
rename to static/images/firefox.options.jpg
diff --git a/www.i2p2/static/images/firefox.options_fr.png b/static/images/firefox.options_fr.png
similarity index 100%
rename from www.i2p2/static/images/firefox.options_fr.png
rename to static/images/firefox.options_fr.png
diff --git a/www.i2p2/static/images/firefox.proxyports.jpg b/static/images/firefox.proxyports.jpg
similarity index 100%
rename from www.i2p2/static/images/firefox.proxyports.jpg
rename to static/images/firefox.proxyports.jpg
diff --git a/www.i2p2/static/images/firefox.proxyports_fr.png b/static/images/firefox.proxyports_fr.png
similarity index 100%
rename from www.i2p2/static/images/firefox.proxyports_fr.png
rename to static/images/firefox.proxyports_fr.png
diff --git a/www.i2p2/static/images/fr.png b/static/images/fr.png
similarity index 100%
rename from www.i2p2/static/images/fr.png
rename to static/images/fr.png
diff --git a/www.i2p2/static/images/garliccloves.png b/static/images/garliccloves.png
similarity index 100%
rename from www.i2p2/static/images/garliccloves.png
rename to static/images/garliccloves.png
diff --git a/www.i2p2/static/images/help.png b/static/images/help.png
similarity index 100%
rename from www.i2p2/static/images/help.png
rename to static/images/help.png
diff --git a/www.i2p2/static/images/help_dark.png b/static/images/help_dark.png
similarity index 100%
rename from www.i2p2/static/images/help_dark.png
rename to static/images/help_dark.png
diff --git a/www.i2p2/static/images/i2plogo.png b/static/images/i2plogo.png
similarity index 100%
rename from www.i2p2/static/images/i2plogo.png
rename to static/images/i2plogo.png
diff --git a/www.i2p2/static/images/i2ptunnel_peertopeer.png b/static/images/i2ptunnel_peertopeer.png
similarity index 100%
rename from www.i2p2/static/images/i2ptunnel_peertopeer.png
rename to static/images/i2ptunnel_peertopeer.png
diff --git a/www.i2p2/static/images/i2ptunnel_serverclient.png b/static/images/i2ptunnel_serverclient.png
similarity index 100%
rename from www.i2p2/static/images/i2ptunnel_serverclient.png
rename to static/images/i2ptunnel_serverclient.png
diff --git a/www.i2p2/static/images/i2pvstor_zh.png b/static/images/i2pvstor_zh.png
similarity index 100%
rename from www.i2p2/static/images/i2pvstor_zh.png
rename to static/images/i2pvstor_zh.png
diff --git a/www.i2p2/static/images/ie.options.jpg b/static/images/ie.options.jpg
similarity index 100%
rename from www.i2p2/static/images/ie.options.jpg
rename to static/images/ie.options.jpg
diff --git a/www.i2p2/static/images/ie.options_fr.png b/static/images/ie.options_fr.png
similarity index 100%
rename from www.i2p2/static/images/ie.options_fr.png
rename to static/images/ie.options_fr.png
diff --git a/www.i2p2/static/images/ie.proxyports.jpg b/static/images/ie.proxyports.jpg
similarity index 100%
rename from www.i2p2/static/images/ie.proxyports.jpg
rename to static/images/ie.proxyports.jpg
diff --git a/www.i2p2/static/images/ie.proxyports_fr.png b/static/images/ie.proxyports_fr.png
similarity index 100%
rename from www.i2p2/static/images/ie.proxyports_fr.png
rename to static/images/ie.proxyports_fr.png
diff --git a/www.i2p2/static/images/info.png b/static/images/info.png
similarity index 100%
rename from www.i2p2/static/images/info.png
rename to static/images/info.png
diff --git a/www.i2p2/static/images/info_dark.png b/static/images/info_dark.png
similarity index 100%
rename from www.i2p2/static/images/info_dark.png
rename to static/images/info_dark.png
diff --git a/www.i2p2/static/images/it.png b/static/images/it.png
similarity index 100%
rename from www.i2p2/static/images/it.png
rename to static/images/it.png
diff --git a/www.i2p2/static/images/itoopie.png b/static/images/itoopie.png
similarity index 100%
rename from www.i2p2/static/images/itoopie.png
rename to static/images/itoopie.png
diff --git a/www.i2p2/static/images/konqueror.options.jpg b/static/images/konqueror.options.jpg
similarity index 100%
rename from www.i2p2/static/images/konqueror.options.jpg
rename to static/images/konqueror.options.jpg
diff --git a/www.i2p2/static/images/konqueror.options_fr.jpg b/static/images/konqueror.options_fr.jpg
similarity index 100%
rename from www.i2p2/static/images/konqueror.options_fr.jpg
rename to static/images/konqueror.options_fr.jpg
diff --git a/www.i2p2/static/images/konqueror.proxyports.jpg b/static/images/konqueror.proxyports.jpg
similarity index 100%
rename from www.i2p2/static/images/konqueror.proxyports.jpg
rename to static/images/konqueror.proxyports.jpg
diff --git a/www.i2p2/static/images/konqueror.proxyports_fr.jpg b/static/images/konqueror.proxyports_fr.jpg
similarity index 100%
rename from www.i2p2/static/images/konqueror.proxyports_fr.jpg
rename to static/images/konqueror.proxyports_fr.jpg
diff --git a/www.i2p2/static/images/lang_ar.png b/static/images/lang_ar.png
similarity index 100%
rename from www.i2p2/static/images/lang_ar.png
rename to static/images/lang_ar.png
diff --git a/www.i2p2/static/images/light.png b/static/images/light.png
similarity index 100%
rename from www.i2p2/static/images/light.png
rename to static/images/light.png
diff --git a/www.i2p2/static/images/lightbluetile.png b/static/images/lightbluetile.png
similarity index 100%
rename from www.i2p2/static/images/lightbluetile.png
rename to static/images/lightbluetile.png
diff --git a/www.i2p2/static/images/link.png b/static/images/link.png
similarity index 100%
rename from www.i2p2/static/images/link.png
rename to static/images/link.png
diff --git a/www.i2p2/static/images/link_dark.png b/static/images/link_dark.png
similarity index 100%
rename from www.i2p2/static/images/link_dark.png
rename to static/images/link_dark.png
diff --git a/www.i2p2/static/images/logo07c.jpg b/static/images/logo07c.jpg
similarity index 100%
rename from www.i2p2/static/images/logo07c.jpg
rename to static/images/logo07c.jpg
diff --git a/www.i2p2/static/images/net.png b/static/images/net.png
similarity index 100%
rename from www.i2p2/static/images/net.png
rename to static/images/net.png
diff --git a/www.i2p2/static/images/net_fr.png b/static/images/net_fr.png
similarity index 100%
rename from www.i2p2/static/images/net_fr.png
rename to static/images/net_fr.png
diff --git a/www.i2p2/static/images/netdb_get_leaseset.png b/static/images/netdb_get_leaseset.png
similarity index 100%
rename from www.i2p2/static/images/netdb_get_leaseset.png
rename to static/images/netdb_get_leaseset.png
diff --git a/www.i2p2/static/images/netdb_get_leaseset_fr.png b/static/images/netdb_get_leaseset_fr.png
similarity index 100%
rename from www.i2p2/static/images/netdb_get_leaseset_fr.png
rename to static/images/netdb_get_leaseset_fr.png
diff --git a/www.i2p2/static/images/netdb_get_routerinfo_1.png b/static/images/netdb_get_routerinfo_1.png
similarity index 100%
rename from www.i2p2/static/images/netdb_get_routerinfo_1.png
rename to static/images/netdb_get_routerinfo_1.png
diff --git a/www.i2p2/static/images/netdb_get_routerinfo_1_fr.png b/static/images/netdb_get_routerinfo_1_fr.png
similarity index 100%
rename from www.i2p2/static/images/netdb_get_routerinfo_1_fr.png
rename to static/images/netdb_get_routerinfo_1_fr.png
diff --git a/www.i2p2/static/images/netdb_get_routerinfo_2.png b/static/images/netdb_get_routerinfo_2.png
similarity index 100%
rename from www.i2p2/static/images/netdb_get_routerinfo_2.png
rename to static/images/netdb_get_routerinfo_2.png
diff --git a/www.i2p2/static/images/netdb_get_routerinfo_2_fr.png b/static/images/netdb_get_routerinfo_2_fr.png
similarity index 100%
rename from www.i2p2/static/images/netdb_get_routerinfo_2_fr.png
rename to static/images/netdb_get_routerinfo_2_fr.png
diff --git a/www.i2p2/static/images/nl.png b/static/images/nl.png
similarity index 100%
rename from www.i2p2/static/images/nl.png
rename to static/images/nl.png
diff --git a/www.i2p2/static/images/plan.png b/static/images/plan.png
similarity index 100%
rename from www.i2p2/static/images/plan.png
rename to static/images/plan.png
diff --git a/www.i2p2/static/images/protocol_stack.png b/static/images/protocol_stack.png
similarity index 100%
rename from www.i2p2/static/images/protocol_stack.png
rename to static/images/protocol_stack.png
diff --git a/www.i2p2/static/images/protocol_stack_fr.png b/static/images/protocol_stack_fr.png
similarity index 100%
rename from www.i2p2/static/images/protocol_stack_fr.png
rename to static/images/protocol_stack_fr.png
diff --git a/www.i2p2/static/images/ru.png b/static/images/ru.png
similarity index 100%
rename from www.i2p2/static/images/ru.png
rename to static/images/ru.png
diff --git a/www.i2p2/static/images/sqbullet.png b/static/images/sqbullet.png
similarity index 100%
rename from www.i2p2/static/images/sqbullet.png
rename to static/images/sqbullet.png
diff --git a/www.i2p2/static/images/stackoverflow_ad.png b/static/images/stackoverflow_ad.png
similarity index 100%
rename from www.i2p2/static/images/stackoverflow_ad.png
rename to static/images/stackoverflow_ad.png
diff --git a/www.i2p2/static/images/tabletile.png b/static/images/tabletile.png
similarity index 100%
rename from www.i2p2/static/images/tabletile.png
rename to static/images/tabletile.png
diff --git a/www.i2p2/static/images/tabletile_alt.png b/static/images/tabletile_alt.png
similarity index 100%
rename from www.i2p2/static/images/tabletile_alt.png
rename to static/images/tabletile_alt.png
diff --git a/www.i2p2/static/images/tabletitledark.png b/static/images/tabletitledark.png
similarity index 100%
rename from www.i2p2/static/images/tabletitledark.png
rename to static/images/tabletitledark.png
diff --git a/www.i2p2/static/images/tabletitlelight-tall.png b/static/images/tabletitlelight-tall.png
similarity index 100%
rename from www.i2p2/static/images/tabletitlelight-tall.png
rename to static/images/tabletitlelight-tall.png
diff --git a/www.i2p2/static/images/tabletitlelight.png b/static/images/tabletitlelight.png
similarity index 100%
rename from www.i2p2/static/images/tabletitlelight.png
rename to static/images/tabletitlelight.png
diff --git a/www.i2p2/static/images/target.png b/static/images/target.png
similarity index 100%
rename from www.i2p2/static/images/target.png
rename to static/images/target.png
diff --git a/www.i2p2/static/images/tunnelSending.png b/static/images/tunnelSending.png
similarity index 100%
rename from www.i2p2/static/images/tunnelSending.png
rename to static/images/tunnelSending.png
diff --git a/www.i2p2/static/images/tunnels.png b/static/images/tunnels.png
similarity index 100%
rename from www.i2p2/static/images/tunnels.png
rename to static/images/tunnels.png
diff --git a/www.i2p2/static/images/tunnels_fr.png b/static/images/tunnels_fr.png
similarity index 100%
rename from www.i2p2/static/images/tunnels_fr.png
rename to static/images/tunnels_fr.png
diff --git a/www.i2p2/static/images/udp.png b/static/images/udp.png
similarity index 100%
rename from www.i2p2/static/images/udp.png
rename to static/images/udp.png
diff --git a/www.i2p2/static/images/us.png b/static/images/us.png
similarity index 100%
rename from www.i2p2/static/images/us.png
rename to static/images/us.png
diff --git a/www.i2p2/static/images/zh.png b/static/images/zh.png
similarity index 100%
rename from www.i2p2/static/images/zh.png
rename to static/images/zh.png
diff --git a/www.i2p2/static/news/news.xml b/static/news/news.xml
similarity index 100%
rename from www.i2p2/static/news/news.xml
rename to static/news/news.xml
diff --git a/www.i2p2/static/pdf/I2CP_spec.pdf b/static/pdf/I2CP_spec.pdf
similarity index 100%
rename from www.i2p2/static/pdf/I2CP_spec.pdf
rename to static/pdf/I2CP_spec.pdf
diff --git a/www.i2p2/static/pdf/I2NP_spec.pdf b/static/pdf/I2NP_spec.pdf
similarity index 100%
rename from www.i2p2/static/pdf/I2NP_spec.pdf
rename to static/pdf/I2NP_spec.pdf
diff --git a/www.i2p2/static/pdf/I2P-PET-CON-2009.1.pdf b/static/pdf/I2P-PET-CON-2009.1.pdf
similarity index 100%
rename from www.i2p2/static/pdf/I2P-PET-CON-2009.1.pdf
rename to static/pdf/I2P-PET-CON-2009.1.pdf
diff --git a/www.i2p2/static/pdf/datastructures.pdf b/static/pdf/datastructures.pdf
similarity index 100%
rename from www.i2p2/static/pdf/datastructures.pdf
rename to static/pdf/datastructures.pdf
diff --git a/www.i2p2/static/pdf/i2p_philosophy.pdf b/static/pdf/i2p_philosophy.pdf
similarity index 100%
rename from www.i2p2/static/pdf/i2p_philosophy.pdf
rename to static/pdf/i2p_philosophy.pdf
diff --git a/www.i2p2/static/pdf/polling_http_transport.pdf b/static/pdf/polling_http_transport.pdf
similarity index 100%
rename from www.i2p2/static/pdf/polling_http_transport.pdf
rename to static/pdf/polling_http_transport.pdf
diff --git a/www.i2p2/static/styles/dark.css b/static/styles/dark.css
similarity index 100%
rename from www.i2p2/static/styles/dark.css
rename to static/styles/dark.css
diff --git a/www.i2p2/static/styles/light.css b/static/styles/light.css
similarity index 100%
rename from www.i2p2/static/styles/light.css
rename to static/styles/light.css
diff --git a/www.i2p2/static/styles/light_ar.css b/static/styles/light_ar.css
similarity index 100%
rename from www.i2p2/static/styles/light_ar.css
rename to static/styles/light_ar.css
diff --git a/www.i2p2/static/styles/light_zh.css b/static/styles/light_zh.css
similarity index 100%
rename from www.i2p2/static/styles/light_zh.css
rename to static/styles/light_zh.css