diff -r 32918c5a2ea3 -r 3b60bc570d8a eskp.py --- a/eskp.py Wed May 07 09:56:22 2014 +0200 +++ b/eskp.py Wed May 07 17:01:53 2014 +0200 @@ -45,15 +45,25 @@ app.jinja_env.globals.update(get_topmenue=get_topmenue) def get_ozone_dates(): - menue = [('/ozoneloss/years/2014', _(u'2014')), - ('/ozoneloss/years/2013', _(u'2013')), - ('/ozoneloss/years/2012', _(u'2012')), - ('/ozoneloss/years/2011', _(u'2011')), - ('/ozoneloss/years/2010', _(u'2010')), + menue = [('/ozoneloss/clams/2014', _(u'2014')), + ('/ozoneloss/clams/2013', _(u'2013')), + ('/ozoneloss/clams/2012', _(u'2012')), + ('/ozoneloss/clams/2011', _(u'2011')), + ('/ozoneloss/clams/2010', _(u'2010')), + ] + return menue + +def get_vpsc_dates(): + menue = [('/ozoneloss/vpsc/2014', _(u'2014')), + ('/ozoneloss/vpsc/2013', _(u'2013')), + ('/ozoneloss/vpsc/2012', _(u'2012')), + ('/ozoneloss/vpsc/2011', _(u'2011')), + ('/ozoneloss/vpsc/2010', _(u'2010')), ] return menue app.jinja_env.globals.update(get_ozone_dates=get_ozone_dates) +app.jinja_env.globals.update(get_vpsc_dates=get_vpsc_dates) @babel.localeselector def get_locale(): @@ -69,35 +79,65 @@ ) -@app.route('/ozoneloss/years/2014') +@app.route('/ozoneloss/clams/2014') def y2014(): - filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_years.rst") + filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_clams.rst") content = get_content(filename) - return render_template("/ozoneloss_years.html", act="ozoneloss/years/2014", content=content, year=2014) + return render_template("/ozoneloss_clams.html", act="ozoneloss/clams/2014", content=content, year=2014) -@app.route('/ozoneloss/years/2013') +@app.route('/ozoneloss/clams/2013') def y2013(): - filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_years.rst") + filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_clams.rst") content = get_content(filename) - return render_template("/ozoneloss_years.html", act="ozoneloss/years/2013", content=content, year=2013) + return render_template("/ozoneloss_clams.html", act="ozoneloss/clams/2013", content=content, year=2013) -@app.route('/ozoneloss/years/2012') +@app.route('/ozoneloss/clams/2012') def y2012(): - filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_years.rst") + filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_clams.rst") content = get_content(filename) - return render_template("/ozoneloss_years.html", act="ozoneloss/years/2012", content=content, year=2012) + return render_template("/ozoneloss_clams.html", act="ozoneloss/clams/2012", content=content, year=2012) -@app.route('/ozoneloss/years/2011') +@app.route('/ozoneloss/clams/2011') def y2011(): - filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_years.rst") + filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_clams.rst") content = get_content(filename) - return render_template("/ozoneloss_years.html", act="ozoneloss/years/2011", content=content, year=2011) + return render_template("/ozoneloss_clams.html", act="ozoneloss/clams/2011", content=content, year=2011) -@app.route('/ozoneloss/years/2010') +@app.route('/ozoneloss/clams/2010') def y2010(): - filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_years.rst") + filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_clams.rst") content = get_content(filename) - return render_template("/ozoneloss_years.html", act="ozoneloss/years/2010", content=content, year=2010) + return render_template("/ozoneloss_clams.html", act="ozoneloss/clams/2010", content=content, year=2010) + +@app.route('/ozoneloss/vpsc/2014') +def y2014a(): + filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_vpsc.rst") + content = get_content(filename) + return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2014", content=content, year=2014) + +@app.route('/ozoneloss/vpsc/2013') +def y2013a(): + filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_vpsc.rst") + content = get_content(filename) + return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2013", content=content, year=2013) + +@app.route('/ozoneloss/vpsc/2012') +def y2012a(): + filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_vpsc.rst") + content = get_content(filename) + return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2012", content=content, year=2012) + +@app.route('/ozoneloss/vpsc/2011') +def y2011a(): + filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_vpsc.rst") + content = get_content(filename) + return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2011", content=content, year=2011) + +@app.route('/ozoneloss/vpsc/2010') +def y2010a(): + filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_vpsc.rst") + content = get_content(filename) + return render_template("/ozoneloss_vpsc.html", act="ozoneloss/vpsc/2010", content=content, year=2010) @app.route('/de') def de(): @@ -133,11 +173,17 @@ content = get_content(filename) return render_template("/ozoneloss.html", act="ozoneloss", content=content) -@app.route("/ozoneloss/years") +@app.route("/ozoneloss/clams") def task1(): - filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_years.rst") + filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_clams.rst") content = get_content(filename) - return render_template("/ozoneloss_years.html", act="ozoneloss/years", content=content) + return render_template("/ozoneloss_clams.html", act="ozoneloss/clams", content=content) + +@app.route("/ozoneloss/vpsc") +def task2(): + 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():