# HG changeset patch
# User Reimar Bauer <rb.proj AT googlemail DOT com>
# Date 1399893342 -7200
# Node ID e953d3dc48b7374e8babf699f8c0bf3eabf5598b
# Parent  c9d4aa9ec58fe27836253395c9ef9eb290c1cdde
eskp: simplified API

diff -r c9d4aa9ec58f -r e953d3dc48b7 eskp.py
--- a/eskp.py	Fri May 09 15:11:43 2014 +0200
+++ b/eskp.py	Mon May 12 13:15:42 2014 +0200
@@ -35,7 +35,6 @@
 
 def get_topmenue():
     menue = [
-#            ('/', _(u'Startseite')),
              ('/ozoneloss', _(u'Ozoneloss')),
              ('/eskp', _(u'ESKP')),
              ('/iek-7', _(u'IEK-7')),
@@ -77,80 +76,22 @@
                            )
 
 
-@app.route('/ozoneloss/clams/2014')
-def y2014():
+@app.route('/ozoneloss/clams/<year>')
+def ozoneloss_clams_year(year):
     filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_clams.rst")
     content = get_content(filename)
-    return render_template("/ozoneloss_clams.html", act="ozoneloss/clams/2014", content=content, year=2014)
+    return render_template("/ozoneloss_clams.html", act="ozoneloss/clams/%s" % year, content=content, year=year)
 
-@app.route('/ozoneloss/clams/2013')
-def y2013():
-    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_clams.rst")
-    content = get_content(filename)
-    return render_template("/ozoneloss_clams.html", act="ozoneloss/clams/2013", content=content, year=2013)
 
-@app.route('/ozoneloss/clams/2012')
-def y2012():
-    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_clams.rst")
-    content = get_content(filename)
-    return render_template("/ozoneloss_clams.html", act="ozoneloss/clams/2012", content=content, year=2012)
-
-@app.route('/ozoneloss/clams/2011')
-def y2011():
-    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_clams.rst")
-    content = get_content(filename)
-    return render_template("/ozoneloss_clams.html", act="ozoneloss/clams/2011", content=content, year=2011)
-
-@app.route('/ozoneloss/clams/2010')
-def y2010():
-    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_clams.rst")
-    content = get_content(filename)
-    return render_template("/ozoneloss_clams.html", act="ozoneloss/clams/2010", content=content, year=2010)
-
-@app.route('/ozoneloss/vpsc/2014')
-def y2014a():
+@app.route('/ozoneloss/vpsc/<year>')
+def ozoneloss_vspc_year(year):
     filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_vpsc.rst")
     content = get_content(filename)
     filename = os.path.join("templates", get_locale(), "rst", "explanation_vpsc.rst")
     explanation = get_content(filename)
 
-    return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2014", content=content, content_explanation=explanation, year=2014)
-
-@app.route('/ozoneloss/vpsc/2013')
-def y2013a():
-    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_vpsc.rst")
-    content = get_content(filename)
-    filename = os.path.join("templates", get_locale(), "rst", "explanation_vpsc.rst")
-    explanation = get_content(filename)
-
-    return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2014", content=content, content_explanation=explanation, year=2013)
-
-@app.route('/ozoneloss/vpsc/2012')
-def y2012a():
-    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_vpsc.rst")
-    content = get_content(filename)
-    filename = os.path.join("templates", get_locale(), "rst", "explanation_vpsc.rst")
-    explanation = get_content(filename)
-
-    return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2014", content=content, content_explanation=explanation, year=2012)
-
-@app.route('/ozoneloss/vpsc/2011')
-def y2011a():
-    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_vpsc.rst")
-    content = get_content(filename)
-    filename = os.path.join("templates", get_locale(), "rst", "explanation_vpsc.rst")
-    explanation = get_content(filename)
-
-    return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2014", content=content, content_explanation=explanation, year=2011)
-
-@app.route('/ozoneloss/vpsc/2010')
-def y2010a():
-    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_vpsc.rst")
-    content = get_content(filename)
-    filename = os.path.join("templates", get_locale(), "rst", "explanation_vpsc.rst")
-    explanation = get_content(filename)
-
-    return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2014", content=content, content_explanation=explanation, year=2010)
+    return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/%s" % year, content=content,
+                           content_explanation=explanation, year=year)
 
 @app.route('/de')
 def de():
@@ -182,28 +123,28 @@
 
 
 @app.route("/ozoneloss")
-def task():
+def ozoneloss():
     filename = os.path.join("templates", get_locale(), "rst", "ozoneloss.rst")
     content = get_content(filename)
     return render_template("/ozoneloss.html", act="ozoneloss", content=content)
 
 @app.route("/ozoneloss/clams")
-def task1():
+def ozoneloss_clams():
     filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_clams.rst")
     content = get_content(filename)
     return render_template("/ozoneloss_clams.html", act="ozoneloss/clams", content=content)
 
 @app.route("/ozoneloss/vpsc")
-def task2():
+def ozoneloss_vspc():
     filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_vpsc.rst")
     content = get_content(filename)
     return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc", content=content)
 
 @app.route("/iek-7")
-def submission():
+def institute():
     filename = os.path.join("templates", get_locale(), "rst", "iek-7.rst")
     content = get_content(filename)
-    return render_template("/iek-7.html", act="submission", content=content)
+    return render_template("/iek-7.html", act="iek-7", content=content)
 
 
 @app.route("/imprint")