1.1 --- a/eskp.py	Tue May 06 16:32:30 2014 +0200
     1.2 +++ b/eskp.py	Wed May 07 09:52:18 2014 +0200
     1.3 @@ -35,6 +35,7 @@
     1.4  
     1.5  def get_topmenue():
     1.6      menue = [
     1.7 +             ('/', _(u'Home')),
     1.8               ('/ozoneloss', _(u'Ozoneloss')),
     1.9               ('/eskp', _(u'ESKP')),
    1.10               ('/iek-7', _(u'IEK-7')),
    1.11 @@ -44,11 +45,11 @@
    1.12  app.jinja_env.globals.update(get_topmenue=get_topmenue)
    1.13  
    1.14  def get_ozone_dates():
    1.15 -    menue = [('/ozoneloss/2014', _(u'2014')),
    1.16 -             ('/ozoneloss/2013', _(u'2013')),
    1.17 -             ('/ozoneloss/2012', _(u'2012')),
    1.18 -             ('/ozoneloss/2011', _(u'2011')),
    1.19 -             ('/ozoneloss/2010', _(u'2010')),
    1.20 +    menue = [('/ozoneloss/years/2014', _(u'2014')),
    1.21 +             ('/ozoneloss/years/2013', _(u'2013')),
    1.22 +             ('/ozoneloss/years/2012', _(u'2012')),
    1.23 +             ('/ozoneloss/years/2011', _(u'2011')),
    1.24 +             ('/ozoneloss/years/2010', _(u'2010')),
    1.25               ]
    1.26      return menue
    1.27  
    1.28 @@ -68,35 +69,35 @@
    1.29                             )
    1.30  
    1.31  
    1.32 -@app.route('/ozoneloss/2014')
    1.33 +@app.route('/ozoneloss/years/2014')
    1.34  def y2014():
    1.35 -    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss.rst")
    1.36 +    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_years.rst")
    1.37      content = get_content(filename)
    1.38 -    return render_template("/ozoneloss.html", act="ozoneloss/2014", content=content, year=2014)
    1.39 +    return render_template("/ozoneloss_years.html", act="ozoneloss/years/2014", content=content, year=2014)
    1.40  
    1.41 -@app.route('/ozoneloss/2013')
    1.42 +@app.route('/ozoneloss/years/2013')
    1.43  def y2013():
    1.44 -    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss.rst")
    1.45 +    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_years.rst")
    1.46      content = get_content(filename)
    1.47 -    return render_template("/ozoneloss.html", act="ozoneloss/2013", content=content, year=2013)
    1.48 +    return render_template("/ozoneloss_years.html", act="ozoneloss/years/2013", content=content, year=2013)
    1.49  
    1.50 -@app.route('/ozoneloss/2012')
    1.51 +@app.route('/ozoneloss/years/2012')
    1.52  def y2012():
    1.53 -    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss.rst")
    1.54 +    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_years.rst")
    1.55      content = get_content(filename)
    1.56 -    return render_template("/ozoneloss.html", act="ozoneloss/2012", content=content, year=2012)
    1.57 +    return render_template("/ozoneloss_years.html", act="ozoneloss/years/2012", content=content, year=2012)
    1.58  
    1.59 -@app.route('/ozoneloss/2011')
    1.60 +@app.route('/ozoneloss/years/2011')
    1.61  def y2011():
    1.62 -    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss.rst")
    1.63 +    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_years.rst")
    1.64      content = get_content(filename)
    1.65 -    return render_template("/ozoneloss.html", act="ozoneloss/2011", content=content, year=2011)
    1.66 +    return render_template("/ozoneloss_years.html", act="ozoneloss/years/2011", content=content, year=2011)
    1.67  
    1.68 -@app.route('/ozoneloss/2010')
    1.69 +@app.route('/ozoneloss/years/2010')
    1.70  def y2010():
    1.71 -    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss.rst")
    1.72 +    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_years.rst")
    1.73      content = get_content(filename)
    1.74 -    return render_template("/ozoneloss.html", act="ozoneloss/2010", content=content, year=2010)
    1.75 +    return render_template("/ozoneloss_years.html", act="ozoneloss/years/2010", content=content, year=2010)
    1.76  
    1.77  @app.route('/de')
    1.78  def de():
    1.79 @@ -130,7 +131,13 @@
    1.80  def task():
    1.81      filename = os.path.join("templates", get_locale(), "rst", "ozoneloss.rst")
    1.82      content = get_content(filename)
    1.83 -    return render_template("/ozoneloss.html", act="ozoneloss", content=content, year=2014)
    1.84 +    return render_template("/ozoneloss.html", act="ozoneloss", content=content)
    1.85 +
    1.86 +@app.route("/ozoneloss/years")
    1.87 +def task1():
    1.88 +    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_years.rst")
    1.89 +    content = get_content(filename)
    1.90 +    return render_template("/ozoneloss_years.html", act="ozoneloss/years", content=content)
    1.91  
    1.92  @app.route("/iek-7")
    1.93  def submission():