1.1 --- a/pymove3d.py	Sun Jan 19 13:37:33 2014 +0100
     1.2 +++ b/pymove3d.py	Sun Jan 19 13:53:18 2014 +0100
     1.3 @@ -88,37 +88,44 @@
     1.4  def competition():
     1.5      filename = os.path.join("templates", get_locale(), "rst", "competition.rst")
     1.6      content = get_content(filename)
     1.7 -    return render_template("/competition.html", act="competition", content=content)
     1.8 +    return render_template("/content.html", act="competition", content=content)
     1.9  
    1.10  @app.route("/task")
    1.11  def task():
    1.12      filename = os.path.join("templates", get_locale(), "rst", "task.rst")
    1.13      content = get_content(filename)
    1.14 -    return render_template("/task.html", act="task", content=content)
    1.15 +    return render_template("/content.html", act="task", content=content)
    1.16  
    1.17  @app.route("/submission")
    1.18  def submission():
    1.19      filename = os.path.join("templates", get_locale(), "rst", "submission.rst")
    1.20      content = get_content(filename)
    1.21 -    return render_template("/submission.html", act="submission", content=content)
    1.22 +    return render_template("/content.html", act="submission", content=content)
    1.23  
    1.24  @app.route("/coursematerial")
    1.25  def coursematerial():
    1.26      filename = os.path.join("templates", get_locale(), "rst", "coursematerial.rst")
    1.27      content = get_content(filename)
    1.28 -    return render_template("/coursematerial.html", act="coursematerial", content=content)
    1.29 +    return render_template("/content.html", act="coursematerial", content=content)
    1.30  
    1.31  @app.route("/imprint")
    1.32  def imprint():
    1.33      filename = os.path.join("templates", get_locale(), "rst", "imprint.rst")
    1.34      content = get_content(filename)
    1.35 -    return render_template("/imprint.html", act="imprint", content=content)
    1.36 +    return render_template("/content.html", act="imprint", content=content)
    1.37  
    1.38  @app.route("/privacy")
    1.39  def privacy():
    1.40      filename = os.path.join("templates", get_locale(), "rst", "privacy.rst")
    1.41      content = get_content(filename)
    1.42 -    return render_template("/privacy.html", act="privacy", content=content)
    1.43 +    return render_template("/content.html", act="privacy", content=content)
    1.44 +
    1.45 +@app.route("/dates")
    1.46 +def dates():
    1.47 +    filename = os.path.join("templates", get_locale(), "rst", "dates.rst")
    1.48 +    content = get_content(filename)
    1.49 +    return render_template("/content.html",
    1.50 +                           act="dates", content=content)
    1.51  
    1.52  @app.route("/competition/2013")
    1.53  def competition_2013():
    1.54 @@ -132,15 +139,6 @@
    1.55      return render_template(get_locale() + "/archive/competitions/2014/index.html", 
    1.56                             act="coursematerial")
    1.57  
    1.58 -
    1.59 -@app.route("/dates")
    1.60 -def dates():
    1.61 -    filename = os.path.join("templates", get_locale(), "rst", "dates.rst")
    1.62 -    content = get_content(filename)
    1.63 -    return render_template("/dates.html",
    1.64 -                           act="dates", content=content)
    1.65 -
    1.66 -
    1.67  @app.errorhandler(404)
    1.68  def page_not_found(e):
    1.69      msg = _(u"Url: %(url)s not found" , url=request.url)