1.1 --- a/pymove3d.py Sat Jan 18 14:59:44 2014 +0100
1.2 +++ b/pymove3d.py Sat Jan 18 15:04:37 2014 +0100
1.3 @@ -65,15 +65,16 @@
1.4 def privacy():
1.5 return render_template(get_locale() + "/privacy.html", act="privacy")
1.6
1.7 -
1.8 -@app.route(_("/competition-2013"))
1.9 +@app.route("/competition/2013")
1.10 def competition_2013():
1.11 - return render_template(get_locale() + "/archive/competitions/2013/comptetition_2013.html",
1.12 + print get_locale() + "/archive/competitions/2013/index.html"
1.13 + return render_template(get_locale() + "/archive/competitions/2013/index.html",
1.14 act="coursematerial")
1.15
1.16 -@app.route(_("/competition-2014"))
1.17 +@app.route("/competition/2014")
1.18 def competition_2014():
1.19 - return render_template(get_locale() + "archive/competitions/2014/competition_2014.html",
1.20 + print get_locale() + "/archive/competitions/2014/index.html"
1.21 + return render_template(get_locale() + "/archive/competitions/2014/index.html",
1.22 act="coursematerial")
1.23
1.24 @app.route(_("/dates"))
1.25 @@ -88,5 +89,3 @@
1.26
1.27 if __name__ == "__main__":
1.28 app.run(host='localhost', port=5014, debug=True)
1.29 -
1.30 -
2.1 --- a/templates/de/competition.html Sat Jan 18 14:59:44 2014 +0100
2.2 +++ b/templates/de/competition.html Sat Jan 18 15:04:37 2014 +0100
2.3 @@ -1,11 +1,4 @@
2.4 {% extends "theme.html" %}
2.5 -
2.6 -{% block jumbotron %}
2.7 -<!-- default jumbotron -->
2.8 - {% include "jumbotron-competition.html" %}
2.9 -{% endblock %}
2.10 -
2.11 -
2.12 {% block body %}
2.13 <div class="container">
2.14 <div class="col-lg-12">
3.1 --- a/templates/de/coursematerial.html Sat Jan 18 14:59:44 2014 +0100
3.2 +++ b/templates/de/coursematerial.html Sat Jan 18 15:04:37 2014 +0100
3.3 @@ -1,10 +1,4 @@
3.4 {% extends "theme.html" %}
3.5 -
3.6 -{% block jumbotron %}
3.7 -<!-- default jumbotron -->
3.8 - {% include "jumbotron-coursematerial.html" %}
3.9 -{% endblock %}
3.10 -
3.11 {% block body %}
3.12 <div class="container">
3.13 <div class="col-lg-12">
4.1 --- a/templates/de/dates.html Sat Jan 18 14:59:44 2014 +0100
4.2 +++ b/templates/de/dates.html Sat Jan 18 15:04:37 2014 +0100
4.3 @@ -1,11 +1,4 @@
4.4 {% extends "theme.html" %}
4.5 -
4.6 -{% block jumbotron %}
4.7 -<!-- default jumbotron -->
4.8 - {% include "jumbotron-competition.html" %}
4.9 -{% endblock %}
4.10 -
4.11 -
4.12 {% block body %}
4.13 <div class="container">
4.14 <div class="col-lg-12">
5.1 --- a/templates/de/imprint.html Sat Jan 18 14:59:44 2014 +0100
5.2 +++ b/templates/de/imprint.html Sat Jan 18 15:04:37 2014 +0100
5.3 @@ -1,11 +1,4 @@
5.4 {% extends "theme.html" %}
5.5 -
5.6 -{% block jumbotron %}
5.7 -<!-- default jumbotron -->
5.8 - {% include "jumbotron-submission.html" %}
5.9 -{% endblock %}
5.10 -
5.11 -
5.12 {% block body %}
5.13 <div class="container">
5.14 <div class="col-lg-12">
6.1 --- a/templates/de/index.html Sat Jan 18 14:59:44 2014 +0100
6.2 +++ b/templates/de/index.html Sat Jan 18 15:04:37 2014 +0100
6.3 @@ -1,8 +1,4 @@
6.4 {% extends "theme.html" %}
6.5 -{% block jumbotron %}
6.6 -<!-- default jumbotron -->
6.7 - {% include "jumbotron-default.html" %}
6.8 -{% endblock %}
6.9 {% block body %}
6.10 <div class="module module-gallery">
6.11 <!--img src="static/images/python_blender.jpg" /-->
7.1 --- a/templates/de/privacy.html Sat Jan 18 14:59:44 2014 +0100
7.2 +++ b/templates/de/privacy.html Sat Jan 18 15:04:37 2014 +0100
7.3 @@ -1,8 +1,4 @@
7.4 {% extends "theme.html" %}
7.5 -
7.6 -{% block jumbotron %}
7.7 -<!-- default jumbotron -->
7.8 - {% include "jumbotron-submission.html" %}
7.9 {% endblock %}
7.10
7.11
8.1 --- a/templates/de/submission.html Sat Jan 18 14:59:44 2014 +0100
8.2 +++ b/templates/de/submission.html Sat Jan 18 15:04:37 2014 +0100
8.3 @@ -1,11 +1,4 @@
8.4 {% extends "theme.html" %}
8.5 -
8.6 -{% block jumbotron %}
8.7 -<!-- default jumbotron -->
8.8 - {% include "jumbotron-submission.html" %}
8.9 -{% endblock %}
8.10 -
8.11 -
8.12 {% block body %}
8.13 <div class="container">
8.14 <div class="col-lg-12">
9.1 --- a/templates/de/task.html Sat Jan 18 14:59:44 2014 +0100
9.2 +++ b/templates/de/task.html Sat Jan 18 15:04:37 2014 +0100
9.3 @@ -1,12 +1,4 @@
9.4 {% extends "theme.html" %}
9.5 -
9.6 -{% block jumbotron %}
9.7 -
9.8 - <!-- include "jumbotron-task.html" -->
9.9 -
9.10 -{% endblock %}
9.11 -
9.12 -
9.13 {% block body %}
9.14 <div class="container">
9.15 <div class="col-lg-12">
10.1 --- a/templates/en/coursematerial.html Sat Jan 18 14:59:44 2014 +0100
10.2 +++ b/templates/en/coursematerial.html Sat Jan 18 15:04:37 2014 +0100
10.3 @@ -1,28 +1,22 @@
10.4 {% extends "theme.html" %}
10.5 -
10.6 -{% block jumbotron %}
10.7 -<!-- default jumbotron -->
10.8 - {% include "jumbotron-coursematerial.html" %}
10.9 -{% endblock %}
10.10 -
10.11 {% block body %}
10.12 <div class="container">
10.13 <div class="col-lg-12">
10.14 <h2>
10.15 - Das Kursmaterial
10.16 + Coursematerial
10.17 </h2>
10.18 - <p>Es kann Dir auf unterschiedlichste Art & Weise nützlich sein.
10.19 - Wenn Du eine der folgenden Fragen mit "Ja" beantworten kannst:</p>
10.20 + <p>It is in differenent ways useful.
10.21 + Read the following questions and if the one answer of them is »yes«:</p>
10.22 <ul>
10.23 - <li>Du möchtest am Wettbewerb teilnehmen?</li>
10.24 - <li>Du bist Anfänger sowohl mit Python als auch mit Blender?</li>
10.25 - <li>Du bist ein Lehrer und willst das Material im Unterricht einsetzen?</li>
10.26 + <li>You will take part on the competition?</li>
10.27 + <li>You are a beginner programming with Python or/and Blender?</li>
10.28 + <li>You are a teacher/tutor and use Python in your courses?</li>
10.29 </ul>
10.30 - <p>Dann ist der folgende Link für Dich … </p>
10.31 + <p>Than the following link has useful information and material … </p>
10.32 <p>
10.33 <a class="btn btn-lg btn-primary"
10.34 href="http://pymove3d.sudile.com"
10.35 - role="button">Startseite zum Kursmaterial</a>
10.36 + role="button">... startpage of coursematerial</a>
10.37 </p>
10.38 </div>
10.39 </div>
11.1 --- a/templates/en/dates.html Sat Jan 18 14:59:44 2014 +0100
11.2 +++ b/templates/en/dates.html Sat Jan 18 15:04:37 2014 +0100
11.3 @@ -1,11 +1,4 @@
11.4 {% extends "theme.html" %}
11.5 -
11.6 -{% block jumbotron %}
11.7 -<!-- default jumbotron -->
11.8 - {% include "jumbotron-competition.html" %}
11.9 -{% endblock %}
11.10 -
11.11 -
11.12 {% block body %}
11.13 <div class="container">
11.14 <div class="col-lg-12">
12.1 --- a/templates/en/imprint.html Sat Jan 18 14:59:44 2014 +0100
12.2 +++ b/templates/en/imprint.html Sat Jan 18 15:04:37 2014 +0100
12.3 @@ -1,11 +1,4 @@
12.4 {% extends "theme.html" %}
12.5 -
12.6 -{% block jumbotron %}
12.7 -<!-- default jumbotron -->
12.8 - {% include "jumbotron-submission.html" %}
12.9 -{% endblock %}
12.10 -
12.11 -
12.12 {% block body %}
12.13 <div class="container">
12.14 <div class="col-lg-12">
13.1 --- a/templates/en/index.html Sat Jan 18 14:59:44 2014 +0100
13.2 +++ b/templates/en/index.html Sat Jan 18 15:04:37 2014 +0100
13.3 @@ -1,8 +1,4 @@
13.4 {% extends "theme.html" %}
13.5 -{% block jumbotron %}
13.6 -<!-- default jumbotron -->
13.7 - {% include "jumbotron-default.html" %}
13.8 -{% endblock %}
13.9 {% block body %}
13.10 <div class="module module-gallery">
13.11 <!--img src="static/images/python_blender.jpg" /-->
14.1 --- a/templates/en/privacy.html Sat Jan 18 14:59:44 2014 +0100
14.2 +++ b/templates/en/privacy.html Sat Jan 18 15:04:37 2014 +0100
14.3 @@ -1,11 +1,4 @@
14.4 {% extends "theme.html" %}
14.5 -
14.6 -{% block jumbotron %}
14.7 -<!-- default jumbotron -->
14.8 - {% include "jumbotron-submission.html" %}
14.9 -{% endblock %}
14.10 -
14.11 -
14.12 {% block body %}
14.13 <div class="container">
14.14 <div class="col-lg-12">
15.1 --- a/templates/en/submission.html Sat Jan 18 14:59:44 2014 +0100
15.2 +++ b/templates/en/submission.html Sat Jan 18 15:04:37 2014 +0100
15.3 @@ -1,11 +1,4 @@
15.4 {% extends "theme.html" %}
15.5 -
15.6 -{% block jumbotron %}
15.7 -<!-- default jumbotron -->
15.8 - {% include "jumbotron-submission.html" %}
15.9 -{% endblock %}
15.10 -
15.11 -
15.12 {% block body %}
15.13 <div class="container">
15.14 <div class="col-lg-12">
16.1 --- a/templates/en/task.html Sat Jan 18 14:59:44 2014 +0100
16.2 +++ b/templates/en/task.html Sat Jan 18 15:04:37 2014 +0100
16.3 @@ -1,12 +1,4 @@
16.4 -{% extends "theme.html" %}
16.5 -
16.6 -{% block jumbotron %}
16.7 -
16.8 - <!-- include "jumbotron-task.html" -->
16.9 -
16.10 -{% endblock %}
16.11 -
16.12 -
16.13 +{% extends "theme.html" %}
16.14 {% block body %}
16.15 <div class="container">
16.16 <div class="col-lg-12">
17.1 --- a/templates/theme.html Sat Jan 18 14:59:44 2014 +0100
17.2 +++ b/templates/theme.html Sat Jan 18 15:04:37 2014 +0100
17.3 @@ -60,7 +60,6 @@
17.4 </div>
17.5 </header>
17.6 <div id="main">
17.7 -
17.8 {% block body %}{% endblock %}
17.9 </div><!-- /main -->
17.10 </div> <!-- /wrap -->