diff -r ec1bb552ce55 -r c97120328e9c eskp.py --- a/eskp.py Mon May 05 10:04:09 2014 +0200 +++ b/eskp.py Mon May 05 11:30:43 2014 +0200 @@ -32,11 +32,9 @@ return content def get_topmenue(): - menue = [('/competition', _(u'Competition')), - ('/task', _(u'Task')), - ('/coursematerial', _(u'Coursematerial')), - ('/submission', _(u'Submission')), - ('/prizes', _(u'Prizes')), + menue = [('/eskp', _(u'ESKP')), + ('/ozoneloss', _(u'Ozoneloss')), + ('/iek-7', _(u'IEK-7')), ] return menue @@ -56,9 +54,8 @@ return render_template("/index.html", saying=saying, author=author, - competition_info=_(u'About Competition'), - dates=_(u'Dates'), - impressions=_(u'Impressions')) + eskp_info=_(u'About ESKP'), + ) @app.route('/de') def de(): @@ -68,9 +65,8 @@ return render_template("/index.html", saying=saying, author=author, - competition_info=_(u'About Competition'), - dates=_(u'Dates'), - impressions=_(u'Impressions')) + eskp_info=_(u'About ESKP'), + ) @app.route('/en') def en(): @@ -80,33 +76,29 @@ return render_template("/index.html", saying=saying, author=author, - competition_info=_(u'About Competition'), - dates=_(u'Dates'), - impressions=_(u'Impressions')) + eskp_info=_(u'About ESKP'), + ) -@app.route("/competition") -def competition(): - filename = os.path.join("templates", get_locale(), "rst", "competition.rst") +@app.route("/eskp") +def eskp(): + filename = os.path.join("templates", get_locale(), "rst", "eskp.rst") content = get_content(filename) - return render_template("/content.html", act="competition", content=content) + return render_template("/content.html", act="eskp", content=content) -@app.route("/task") +@app.route("/ozoneloss") def task(): - filename = os.path.join("templates", get_locale(), "rst", "task.rst") + filename = os.path.join("templates", get_locale(), "rst", "ozoneloss.rst") content = get_content(filename) - return render_template("/content.html", act="task", content=content) + print content + print filename + return render_template("/content.html", act="ozoneloss", content=content) -@app.route("/submission") +@app.route("/iek-7") def submission(): - filename = os.path.join("templates", get_locale(), "rst", "submission.rst") + filename = os.path.join("templates", get_locale(), "rst", "iek-7.rst") content = get_content(filename) return render_template("/content.html", act="submission", content=content) -@app.route("/coursematerial") -def coursematerial(): - filename = os.path.join("templates", get_locale(), "rst", "coursematerial.rst") - content = get_content(filename) - return render_template("/content.html", act="coursematerial", content=content) @app.route("/imprint") def imprint(): @@ -114,58 +106,6 @@ content = get_content(filename) return render_template("/content.html", act="imprint", content=content) -@app.route("/privacy") -def privacy(): - filename = os.path.join("templates", get_locale(), "rst", "privacy.rst") - overrides = { - 'initial_header_level': 2, - } - content = get_content(filename, overrides=overrides) - return render_template("/content.html", act="privacy", content=content) - -@app.route("/dates") -def dates(): - filename = os.path.join("templates", get_locale(), "rst", "dates.rst") - content = get_content(filename) - return render_template("/content.html", - act="dates", content=content) - -@app.route("/prizes") -def prizes(): - filename = os.path.join("templates", get_locale(), "rst", "prizes.rst") - overrides = { - 'initial_header_level': 2, - } - content = get_content(filename, overrides=overrides) - return render_template("/prizes.html",act="prizes", content=content) - - - -@app.route("/competition/2013") -def competition_2013(): - competition = _(u'Competition 2013') - introduction = _(u'The winners of the programming competition, ' - u'showed at the PyCon.DE 2013 in Cologne their results. ' - u'A short presentation inlcuding a movie about their work done.') - article = [_(u'Both students presented to the astonished audience of over 250 Python developers their work.'), - _(u'A long applause showed up.' - u' Valentin had 9 months ago learned Python and Blender discovered earlier. ' - u'His Skatsimulation even includes 3D sound.'), - _(u'The preparatory courses were made by volunteers, such as the ' - u'employees of the magazine "Time Online" performed. ' - u'The following blog entry is a little impression of the success of the courses'), - ] - game_of_life = _(u'Anne a 15 year old girl showed a 3D-Version of the »Game of life«') - skat_simulation = _(u'Valentin (13 years) demomstrates his »Skat-Simulation«') - awards = _(u'The award ceremony') - return render_template("/impressions_2013.html", - act="competition_2013", - competition=competition, - introduction=introduction, - article=article, - game_of_life=game_of_life, - skat_simulation=skat_simulation, - awards=awards) @app.errorhandler(404)