# HG changeset patch
# User stetrabby <info@trabucchi.de>
# Date 1390040941 -3600
# Node ID c75d501c5601b4596f57d6d08080915b00f02965
# Parent  92d284f1a45766438a501169dfb06afc820d3222
navigation for languages modifed, flags deleted. Content index changed

diff -r 92d284f1a457 -r c75d501c5601 static/css/bootstrap.css
--- a/static/css/bootstrap.css	Sat Jan 18 11:01:11 2014 +0100
+++ b/static/css/bootstrap.css	Sat Jan 18 11:29:01 2014 +0100
@@ -6006,19 +6006,31 @@
   margin-bottom: 0px;
   border-bottom: 3px solid #f0f0f0;
 }
+a.link-yellow {
+  color: #fdc91a !important;
+  text-decoration: underline;
+}
+a.link-yellow:hover {
+  color: #333333 !important;
+  text-decoration: none;
+}
 /* Module
 ------------------------------------ */
 .module-gallery {
   background: url('../images/python_blender.jpg') no-repeat 0px -200px;
   background-size: 2000px 884px;
+  max-width: 100% !important;
 }
 .module-gallery .module-content {
-  height: 440px;
+  height: 300px;
   position: relative;
 }
 .col-yellow {
   background: rgba(253, 201, 26, 0.6);
 }
+li.module-language a:first-child {
+  border-right: 1px solid #125883;
+}
 .module-course {
   background-color: #f5f5f5;
 }
diff -r 92d284f1a457 -r c75d501c5601 static/images/python_blender.jpg
Binary file static/images/python_blender.jpg has changed
diff -r 92d284f1a457 -r c75d501c5601 static/less/pymove3d.less
--- a/static/less/pymove3d.less	Sat Jan 18 11:01:11 2014 +0100
+++ b/static/less/pymove3d.less	Sat Jan 18 11:29:01 2014 +0100
@@ -59,17 +59,21 @@
 margin-bottom: 0px;
 border-bottom:3px solid #f0f0f0;
 }
+a.link-yellow {color:@yellow !important;text-decoration:underline;}
+a.link-yellow:hover {color:@gray-dark !important;text-decoration:none;}
 /* Module
 ------------------------------------ */
 .module-gallery {
     background: url('../images/python_blender.jpg') no-repeat 0px -200px;
     background-size: 2000px 884px;
+    max-width: 100% !important;
 }
 .module-gallery .module-content {
-    height: 440px;
+    height: 300px;
     position: relative;
 }
 .col-yellow {background:@yellow-light;}
+li.module-language a:first-child {border-right:1px solid @blue;}
 .module-course {background-color: #f5f5f5;}
 /* Footer
 ------------------------------------ */ 
diff -r 92d284f1a457 -r c75d501c5601 templates/de/index.html
--- a/templates/de/index.html	Sat Jan 18 11:01:11 2014 +0100
+++ b/templates/de/index.html	Sat Jan 18 11:29:01 2014 +0100
@@ -10,7 +10,7 @@
 		<div class="col-md-6 col-yellow">
 			<div class="module-content">
 						<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 6 bewegen</h4>
+			<h4 class="" style="color:white;">3D Objekte mit Python steuern & bewegen</h4>
 				<button type="button" class="btn btn-default">Wettbewerbinformationen</button>
 			</div>
 		</div>
@@ -22,7 +22,7 @@
 	<div class="container">
 		<div class="col-md-8 col-md-offset-2">
 			<div class="module-cite text-center">
-			<h1>Blender und Python sind einfach genial, endlich fun, funf, fun beim programmieren</h1>
+			<h1>Blender und Python sind einfach genial, endlich fun, fun, fun beim programmieren</h1>
 			<p class="pull-right">__Florian, Berlin</p>
 			</div>
 		</div>
@@ -34,7 +34,6 @@
 				<div class="module-body">
 					<ul>
 						<li>1. Mai 2014</li>
-							<li>Anmelden</li>
 					</ul>
 				</div>
 			</div>
diff -r 92d284f1a457 -r c75d501c5601 templates/theme.html
--- a/templates/theme.html	Sat Jan 18 11:01:11 2014 +0100
+++ b/templates/theme.html	Sat Jan 18 11:29:01 2014 +0100
@@ -39,7 +39,7 @@
               <a class="navbar-brand" href="/"><img class="logo" src="/static/images/PyMove3D.png" title="PyMove3D" alt="logo pymove3d" /></a>
             </div>
             <div class="collapse navbar-collapse">
-              <ul class="nav navbar-nav">
+              <ul class="nav navbar-nav navbar-right">
                {% for href, caption in [('/competition', 'Competition'),
                ('/task', 'Task'),
                ('/submission', 'Submission'),
@@ -49,15 +49,9 @@
                {%- if href[1:] == act -%} 
                <li class="active">{% else %} <li>{% endif %}<a href="{{ href }}" >{{ caption }}</a></li>
                {% endfor %}
+               <li class="module-language"><a class="link-yellow" href="./de">DE</a></li>
+              <li><a class="link-yellow" href="./en">EN</a></li>
              </ul>
-             <ul class="nav navbar-nav navbar-right">
-              <li class="active"><a href="./"> <img class="flags" src="/static/images/flags/de.png" alt="deutsch" />
-              </a></li>
-              <li><a href="../navbar-static-top/"><img class ="flags" src="/static/images/flags/gb.png" alt="english" />
-              </a></li>
-              <li><a href="../navbar-fixed-top/"><img class="flags" src="/static/images/flags/it.png" alt="italiano" />
-              </a></li>
-            </ul>
           </div><!--/.nav-collapse -->
         </div>
       </div>