diff -r 6cf356c2969d -r ba828373ac1d eskp.py --- a/eskp.py Mon Jan 20 20:05:31 2020 +0100 +++ b/eskp.py Tue Jan 21 12:49:47 2020 +0100 @@ -64,8 +64,9 @@ (('/ozoneloss', _(u'overview')), ('/ozoneloss/clams/2020', _(u'calculations')), ('/ozoneloss/vpsc/2020', _(u'estimations')), + ('/ozoneloss/uvmap/' + newest_date, _(u'uv index map')), ('/ozoneloss/uvi', _(u'uv increase')), - ('/ozoneloss/uvmap/' + newest_date, _(u'uv index map')))), + ('/ozoneloss/decadal', _(u'decadal')))), ('/eskp', _(u'ESKP'), (None, None)), ('/iek-7', _(u'IEK-7'), (None, None)) ] @@ -191,7 +192,7 @@ @app.route('/ozoneloss/vpsc/') -def ozoneloss_vspc_year(year): +def ozoneloss_vpsc_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") @@ -282,7 +283,7 @@ @app.route("/ozoneloss/vpsc") -def ozoneloss_vspc(): +def ozoneloss_vpsc(): 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) @@ -324,6 +325,17 @@ return render_template('graph.html', act="ozoneloss_uvi_graph", content=content, figname=figname, o3offsetstr=o3offsetstr, latstr=latstr) +@app.route("/ozoneloss/decadal") +def ozoneloss_decadal(): + filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_decadal.rst") + content = get_content(filename) + filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_decadal_bottom.rst") + explanation = get_content(filename) + + return render_template("/ozoneloss_decadal.html", act="ozoneloss_decadal", content=content, + content_explanation=explanation) + + @app.route("/iek-7") def institute():