# HG changeset patch
# User Peter Koppatz <peter@koppatz.com>
# Date 1390122559 -3600
# Node ID f05d0e9abd237a51e63098eba924cafe35ac350e
# Parent  8651d8ab829ac503dad6d50401425227af99bff0
Archive competitions

diff -r 8651d8ab829a -r f05d0e9abd23 templates/de/archive/competitions/2013/index.html
--- a/templates/de/archive/competitions/2013/index.html	Sun Jan 19 09:45:22 2014 +0100
+++ b/templates/de/archive/competitions/2013/index.html	Sun Jan 19 10:09:19 2014 +0100
@@ -1,6 +1,23 @@
 {% extends "theme.html" %}
 {% block body %}
 <div class="container">
+    <div class="col-md-12 col-yellow">
+      <div class="module-content">
+        <p class="text-center">
+	  <img src="/static/images/archive/competitions/2013/contest2013a.jpg" alt="Anne" />
+	  <img src="/static/images/archive/competitions/2013/contest2013b.jpg" alt="Valentin" />
+	</p>
+	<!--h1 class="header" style="color:white;padding-top: 45px;margin-bottom:30px;">Der Python Wettbewerb für Mädchen & Jungen ab 13 Jahren</h1>
+	<h4 class="" style="color:white;">3D Objekte mit Python steuern & bewegen</h4>
+	<a type="button" class="btn btn-default"
+	   href="/competition">Infos zum Wettbewerb</a>
+	<a  type="button" class="btn btn-default"  
+	    href="{{ url_for('dates') }}">Termine</a-->
+      </div>
+    </div>
+  </div>  
+</div>
+<div class="container">
   <div class="col-lg-12">
     <h2>
       Wettbewerb 2013
@@ -16,7 +33,7 @@
     </p>  
     <p>
       <a class="btn btn-lg btn-primary" 
-	 href="/comptetition_2014" 
+	 href="/competition/2014" 
 	 role="button">Competition 2014</a>
     </p>
   </div>
diff -r 8651d8ab829a -r f05d0e9abd23 templates/de/archive/competitions/2014/index.html
--- a/templates/de/archive/competitions/2014/index.html	Sun Jan 19 09:45:22 2014 +0100
+++ b/templates/de/archive/competitions/2014/index.html	Sun Jan 19 10:09:19 2014 +0100
@@ -3,19 +3,14 @@
 <div class="container">
   <div class="col-lg-12">
     <h2>
-      Competition 2014
+      Wettbewerb 2014
     </h2>
-    <p>
-Two winners of a beginners programming competition showed their results in the opening keynote of the German Python conference in Cologne. They have to use Python to program Blender. Both showed slides and also their animation movie.
-
-A 15 year old girl visualized Conway’s “Game of life” and a boy, 13 years showed a card game “skat” having good software design skills.
-
-The conference and also the competition is driven by the german Python Software Verband. This is a national equivalent to the Python Software Foundation. The contest will continue and likely start again in november and been celebrated at the next EuroPython in Berlin 21.7 – 27.7.2014.
+    <p>Infos zum aktuellen Wettbewerb... Preise, Preisverleihung...
     </p>
     <p>
       <a class="btn btn-lg btn-primary" 
-	 href="/comptetition_2014" 
-	 role="button">Competition 2014</a>
+	 href="/competition/2013" 
+	 role="button">Competition 2013</a>
     </p>
   </div>
 </div>
diff -r 8651d8ab829a -r f05d0e9abd23 templates/en/archive/competitions/2013/comptetition_2013.html
--- a/templates/en/archive/competitions/2013/comptetition_2013.html	Sun Jan 19 09:45:22 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-{% extends "theme.html" %}
-{% block body %}
-<div class="container">
-  <div class="col-lg-12">
-    <h2>
-      Competition 2013
-    </h2>
-    <p>
-Two winners of a beginners programming competition showed their results in the opening keynote of the German Python conference in Cologne. They have to use Python to program Blender. Both showed slides and also their animation movie.
-
-A 15 year old girl visualized Conway’s “Game of life” and a boy, 13 years showed a card game “skat” having good software design skills.
-
-The conference and also the competition is driven by the german Python Software Verband. This is a national equivalent to the Python Software Foundation. The contest will continue and likely start again in november and been celebrated at the next EuroPython in Berlin 21.7 – 27.7.2014.
-    </p>
-    <p>
-      <a class="btn btn-lg btn-primary" 
-	 href="/comptetition_2014" 
-	 role="button">Competition 2014</a>
-    </p>
-  </div>
-</div>
-
-{% endblock %}
diff -r 8651d8ab829a -r f05d0e9abd23 templates/en/archive/competitions/2013/comptetition_2014.html
--- a/templates/en/archive/competitions/2013/comptetition_2014.html	Sun Jan 19 09:45:22 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-{% extends "theme.html" %} 
-{% block body %}
-<div class="container">
-  <div class="col-lg-12">
-    <h2>
-      Competition 2013
-    </h2>
-    <p>
-Two winners of a beginners programming competition showed their results in the opening keynote of the German Python conference in Cologne. They have to use Python to program Blender. Both showed slides and also their animation movie.
-
-A 15 year old girl visualized Conway’s “Game of life” and a boy, 13 years showed a card game “skat” having good software design skills.
-
-The conference and also the competition is driven by the german Python Software Verband. This is a national equivalent to the Python Software Foundation. The contest will continue and likely start again in november and been celebrated at the next EuroPython in Berlin 21.7 – 27.7.2014.
-    </p>
-    <p>
-      <a class="btn btn-lg btn-primary" 
-	 href="/comptetition_2014" 
-	 role="button">Competition 2014</a>
-    </p>
-  </div>
-</div>
-
-{% endblock %}
diff -r 8651d8ab829a -r f05d0e9abd23 templates/en/archive/competitions/2013/index.html
--- a/templates/en/archive/competitions/2013/index.html	Sun Jan 19 09:45:22 2014 +0100
+++ b/templates/en/archive/competitions/2013/index.html	Sun Jan 19 10:09:19 2014 +0100
@@ -1,20 +1,39 @@
 {% extends "theme.html" %}
 {% block body %}
 <div class="container">
+    <div class="col-md-12 col-yellow">
+      <div class="module-content">
+        <p class="text-center">
+	  <img src="/static/images/archive/competitions/2013/contest2013a.jpg" alt="Anne" />
+	  <img src="/static/images/archive/competitions/2013/contest2013b.jpg" alt="Valentin" />
+	</p>
+	<!--h1 class="header" style="color:white;padding-top: 45px;margin-bottom:30px;">Der Python Wettbewerb für Mädchen & Jungen ab 13 Jahren</h1>
+	<h4 class="" style="color:white;">3D Objekte mit Python steuern & bewegen</h4>
+	<a type="button" class="btn btn-default"
+	   href="/competition">Infos zum Wettbewerb</a>
+	<a  type="button" class="btn btn-default"  
+	    href="{{ url_for('dates') }}">Termine</a-->
+      </div>
+    </div>
+  </div>  
+</div>
+<div class="container">
   <div class="col-lg-12">
     <h2>
-      Competition 2013
+      Wettbewerb 2013
     </h2>
     <p>
-Two winners of a beginners programming competition showed their results in the opening keynote of the German Python conference in Cologne. They have to use Python to program Blender. Both showed slides and also their animation movie.
-
-A 15 year old girl visualized Conway’s “Game of life” and a boy, 13 years showed a card game “skat” having good software design skills.
-
-The conference and also the competition is driven by the german Python Software Verband. This is a national equivalent to the Python Software Foundation. The contest will continue and likely start again in november and been celebrated at the next EuroPython in Berlin 21.7 – 27.7.2014.
-    </p>
+      Die Gewinner des Programmierwettbewerbes, zeigten auf der 
+      PyCon DE 2013 in Köln ihre Ergebnisse. In einem Kurzvortrag 
+      wurde das Projekt vorgestellt und mit einem  Film das Ergebnis
+      visualisiert.
+    </p> 
+    <p>Anne (15 Jahre) zeigte das eine 3D-Version des »Game of life« 
+      und Valentin (13 Jahre) demonstrierte seine »Skat-Simulation«.
+    </p>  
     <p>
       <a class="btn btn-lg btn-primary" 
-	 href="/comptetition_2014" 
+	 href="/competition/2014" 
 	 role="button">Competition 2014</a>
     </p>
   </div>
diff -r 8651d8ab829a -r f05d0e9abd23 templates/en/archive/competitions/2014/comptetition_2013.html
--- a/templates/en/archive/competitions/2014/comptetition_2013.html	Sun Jan 19 09:45:22 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-{% extends _("en/theme.html") %}
-{% block jumbotron %}
-<!-- default jumbotron -->
- {% include "jumbotron2013.html" %}
-{% endblock %}
-
-{% block body %}
-<div class="container">
-  <div class="col-lg-12">
-    <h2>
-      Competition 2013
-    </h2>
-    <p>
-Two winners of a beginners programming competition showed their results in the opening keynote of the German Python conference in Cologne. They have to use Python to program Blender. Both showed slides and also their animation movie.
-
-A 15 year old girl visualized Conway’s “Game of life” and a boy, 13 years showed a card game “skat” having good software design skills.
-
-The conference and also the competition is driven by the german Python Software Verband. This is a national equivalent to the Python Software Foundation. The contest will continue and likely start again in november and been celebrated at the next EuroPython in Berlin 21.7 – 27.7.2014.
-    </p>
-    <p>
-      <a class="btn btn-lg btn-primary" 
-	 href="/comptetition_2014" 
-	 role="button">Competition 2014</a>
-    </p>
-  </div>
-</div>
-
-{% endblock %}
diff -r 8651d8ab829a -r f05d0e9abd23 templates/en/archive/competitions/2014/index.html
--- a/templates/en/archive/competitions/2014/index.html	Sun Jan 19 09:45:22 2014 +0100
+++ b/templates/en/archive/competitions/2014/index.html	Sun Jan 19 10:09:19 2014 +0100
@@ -1,27 +1,16 @@
 {% extends "theme.html" %} 
-
-{% block jumbotron %}
-<!-- default jumbotron -->
- {% include "jumbotron2013.html" %}
-{% endblock %}
-
 {% block body %}
 <div class="container">
   <div class="col-lg-12">
     <h2>
-      Competition 2014
+      Wettbewerb 2014
     </h2>
-    <p>
-Two winners of a beginners programming competition showed their results in the opening keynote of the German Python conference in Cologne. They have to use Python to program Blender. Both showed slides and also their animation movie.
-
-A 15 year old girl visualized Conway’s “Game of life” and a boy, 13 years showed a card game “skat” having good software design skills.
-
-The conference and also the competition is driven by the german Python Software Verband. This is a national equivalent to the Python Software Foundation. The contest will continue and likely start again in november and been celebrated at the next EuroPython in Berlin 21.7 – 27.7.2014.
+    <p>Infos zum aktuellen Wettbewerb... Preise, Preisverleihung...
     </p>
     <p>
       <a class="btn btn-lg btn-primary" 
-	 href="/comptetition_2014" 
-	 role="button">Competition 2014</a>
+	 href="/competition/2013" 
+	 role="button">Competition 2013</a>
     </p>
   </div>
 </div>
diff -r 8651d8ab829a -r f05d0e9abd23 templates/en/archive/competitions/2014/jumbotron-competition-2014.html
--- a/templates/en/archive/competitions/2014/jumbotron-competition-2014.html	Sun Jan 19 09:45:22 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<img src="/static/images/archive/competition/2013/contest2013a.jpg" alt="Anne" />
-<img src="/static/images/archive/competition/2013/contest2013b.jpg" alt="Valentin" />
-<h1>The Winners in 2013</h1>
-
diff -r 8651d8ab829a -r f05d0e9abd23 templates/footer.html
--- a/templates/footer.html	Sun Jan 19 09:45:22 2014 +0100
+++ b/templates/footer.html	Sun Jan 19 10:09:19 2014 +0100
@@ -1,6 +1,6 @@
 <div id="footer">
     <div class="container">
-        <div class="text-center"><a href="http://python.org/" alt="Python Programming Language website" title="Python Programming Language"><img src="./static/images/python-logo.png" alt="python-logo" /></a>
+        <div class="text-center"><a href="http://python.org/" alt="Python Programming Language website" title="Python Programming Language"><img src="/static/images/python-logo.png" alt="python-logo" /></a>
          <h3>Sponsors</h3>
         </div>
 
@@ -12,13 +12,13 @@
                     <div class="carousel-inner">
                         <div class="item active">
                             <div class="row">
-                                <div class="col-sm-3"><a href="http://www.linux-systemhaus.de/"><img src="./static/images/sponsors/linux_systemhaus_schulz.png" alt="" title="" class="img-responsive" /></a>
+                                <div class="col-sm-3"><a href="http://www.linux-systemhaus.de/"><img src="/static/images/sponsors/linux_systemhaus_schulz.png" alt="" title="" class="img-responsive" /></a>
                                 </div>
-                                <div class="col-sm-3"><a href="http://www.blender.org/"><img src="./static/images/sponsors/blender.png" alt="Image" class="img-responsive"></a>
+                                <div class="col-sm-3"><a href="http://www.blender.org/"><img src="/static/images/sponsors/blender.png" alt="Image" class="img-responsive"></a>
                                 </div>
-                                <div class="col-sm-3"><a href="http://python-verband.org/"><img src="./static/images/sponsors/pysv.png" alt="Image" class="img-responsive"></a>
+                                <div class="col-sm-3"><a href="http://python-verband.org/"><img src="/static/images/sponsors/pysv.png" alt="Image" class="img-responsive"></a>
                                 </div>
-                                <div class="col-sm-3"><a href="http://www.galileo-press.de/"><img src="./static/images/sponsors/sponsor-galileo_press-anim.gif" alt="Image" class="img-responsive"></a>
+                                <div class="col-sm-3"><a href="http://www.galileo-press.de/"><img src="/static/images/sponsors/sponsor-galileo_press-anim.gif" alt="Image" class="img-responsive"></a>
                                 </div>
                             </div>
                             <!--/row-->
@@ -26,13 +26,13 @@
                         <!--/item-->
                         <div class="item">
                             <div class="row">
-                                <div class="col-sm-3"><a href="http://www.medialinx-gruppe.de/"><img src="./static/images/sponsors/sponsor-medialinx_ag.png" alt="Image" class="img-responsive"></a>
+                                <div class="col-sm-3"><a href="http://www.medialinx-gruppe.de/"><img src="/static/images/sponsors/sponsor-medialinx_ag.png" alt="Image" class="img-responsive"></a>
                                 </div>
-                                <div class="col-sm-3"><a href="http://www.oreilly.de/"><img src="./static/images/sponsors/sponsor-oreilly.png" alt="Image" class="img-responsive"></a>
+                                <div class="col-sm-3"><a href="http://www.oreilly.de/"><img src="/static/images/sponsors/sponsor-oreilly.png" alt="Image" class="img-responsive"></a>
                                 </div>
-                                <div class="col-sm-3"><a href="http://sudile.de/"><img src="./static/images/sponsors/sudile.jpg" alt="Image" class="img-responsive"></a>
+                                <div class="col-sm-3"><a href="http://sudile.de/"><img src="/static/images/sponsors/sudile.jpg" alt="Image" class="img-responsive"></a>
                                 </div>
-                                <div class="col-sm-3"><a href="http://trabucchi.de/"><img src="./static/images/sponsors/trabucchi.png" alt="Image" class="img-responsive"></a>
+                                <div class="col-sm-3"><a href="http://trabucchi.de/"><img src="/static/images/sponsors/trabucchi.png" alt="Image" class="img-responsive"></a>
                                 </div>
                             </div>
                             <!--/row-->
@@ -41,7 +41,7 @@
                         <!--/item-->
                         <div class="item">
                             <div class="row">
-                                <div class="col-sm-3"><a href="http://www.evenios.com/"><img src="./static/images/sponsors/evenios.png" alt="Image" class="img-responsive"></a>
+                                <div class="col-sm-3"><a href="http://www.evenios.com/"><img src="/static/images/sponsors/evenios.png" alt="Image" class="img-responsive"></a>
                                 </div>
                                 <div class="col-sm-3">
                                 </div>
@@ -68,4 +68,4 @@
             </ul>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>