1.1 --- a/eskp.py	Wed May 07 17:01:53 2014 +0200
     1.2 +++ b/eskp.py	Thu May 08 11:00:08 2014 +0200
     1.3 @@ -44,10 +44,8 @@
     1.4  
     1.5  app.jinja_env.globals.update(get_topmenue=get_topmenue)
     1.6  
     1.7 -def get_ozone_dates():
     1.8 -    menue = [('/ozoneloss/clams/2014', _(u'2014')),
     1.9 -             ('/ozoneloss/clams/2013', _(u'2013')),
    1.10 -             ('/ozoneloss/clams/2012', _(u'2012')),
    1.11 +def get_o3lossclams_dates():
    1.12 +    menue = [('/ozoneloss/clams/2012', _(u'2012')),
    1.13               ('/ozoneloss/clams/2011', _(u'2011')),
    1.14               ('/ozoneloss/clams/2010', _(u'2010')),
    1.15               ]
    1.16 @@ -62,7 +60,7 @@
    1.17               ]
    1.18      return menue
    1.19  
    1.20 -app.jinja_env.globals.update(get_ozone_dates=get_ozone_dates)
    1.21 +app.jinja_env.globals.update(get_o3lossclams_dates=get_o3lossclams_dates)
    1.22  app.jinja_env.globals.update(get_vpsc_dates=get_vpsc_dates)
    1.23  
    1.24  @babel.localeselector
    1.25 @@ -113,31 +111,46 @@
    1.26  def y2014a():
    1.27      filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_vpsc.rst")
    1.28      content = get_content(filename)
    1.29 -    return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2014", content=content, year=2014)
    1.30 +    filename = os.path.join("templates", get_locale(), "rst", "explanation_vpsc.rst")
    1.31 +    explanation = get_content(filename)
    1.32 +
    1.33 +    return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2014", content=content, content_explanation=explanation, year=2014)
    1.34  
    1.35  @app.route('/ozoneloss/vpsc/2013')
    1.36  def y2013a():
    1.37      filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_vpsc.rst")
    1.38      content = get_content(filename)
    1.39 -    return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2013", content=content, year=2013)
    1.40 +    filename = os.path.join("templates", get_locale(), "rst", "explanation_vpsc.rst")
    1.41 +    explanation = get_content(filename)
    1.42 +
    1.43 +    return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2014", content=content, content_explanation=explanation, year=2013)
    1.44  
    1.45  @app.route('/ozoneloss/vpsc/2012')
    1.46  def y2012a():
    1.47      filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_vpsc.rst")
    1.48      content = get_content(filename)
    1.49 -    return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2012", content=content, year=2012)
    1.50 +    filename = os.path.join("templates", get_locale(), "rst", "explanation_vpsc.rst")
    1.51 +    explanation = get_content(filename)
    1.52 +
    1.53 +    return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2014", content=content, content_explanation=explanation, year=2012)
    1.54  
    1.55  @app.route('/ozoneloss/vpsc/2011')
    1.56  def y2011a():
    1.57      filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_vpsc.rst")
    1.58      content = get_content(filename)
    1.59 -    return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2011", content=content, year=2011)
    1.60 +    filename = os.path.join("templates", get_locale(), "rst", "explanation_vpsc.rst")
    1.61 +    explanation = get_content(filename)
    1.62 +
    1.63 +    return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2014", content=content, content_explanation=explanation, year=2011)
    1.64  
    1.65  @app.route('/ozoneloss/vpsc/2010')
    1.66  def y2010a():
    1.67      filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_vpsc.rst")
    1.68      content = get_content(filename)
    1.69 -    return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2010", content=content, year=2010)
    1.70 +    filename = os.path.join("templates", get_locale(), "rst", "explanation_vpsc.rst")
    1.71 +    explanation = get_content(filename)
    1.72 +
    1.73 +    return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2014", content=content, content_explanation=explanation, year=2011)
    1.74  
    1.75  @app.route('/de')
    1.76  def de():