From 47f7497e828d12a8e58a70a33a3a5dc250027200 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 17 Jul 2012 17:36:53 +0200
Subject: [PATCH] Updated some pages.

---
 extras/website/website/templates/base.html    |  7 +++----
 extras/website/website/templates/demo.html    |  1 -
 extras/website/website/templates/home.html    | 16 +++++++++++-----
 extras/website/website/templates/license.html | 10 +++++++---
 extras/website/website/urls.py                |  2 +-
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/extras/website/website/templates/base.html b/extras/website/website/templates/base.html
index 733b83fe3..10945807b 100644
--- a/extras/website/website/templates/base.html
+++ b/extras/website/website/templates/base.html
@@ -38,9 +38,8 @@
           <ul class="nav">
             <li class="{% block mainmenu_about %}{% endblock %}"><a href="{% url about %}">{% trans "Über OpenSlides" %}</a></li>
             <li class="{% block mainmenu_download %}{% endblock %}"><a href="{% url download %}">{% trans "Download" %}</a></li>
-            <li class="{% block mainmenu_support %}{% endblock %}"><a href="{% url support %}">{% trans "Support" %}</a></li>
+            <li class="{% block mainmenu_support %}{% endblock %}"><a href="{% url support %}">{% trans "Support & Dokumentation" %}</a></li>
             <li class="{% block mainmenu_development %}{% endblock %}"><a href="{% url development %}">{% trans "Entwicklung" %}</a></li>
-            <li id="demo" class="{% block mainmenu_demo %}{% endblock %}"><a href="{% url demo %}">{% trans "Demo" %}</a></li>
           </ul>
           <ul class="nav pull-right">
             <li class="{% block mainmenu_contact %}{% endblock %}"><a href="{% url contact %}">{% trans "Kontakt" %}</a></li>
@@ -96,7 +95,6 @@
                  <li><a href="{% url support %}">Professioneller Support</a></li>
                  <li><a href="#">FAQ</a></li>
                  <li><a href="#">Handbuch</a></li>
-                 <li><a href="http://dev.openslides.org/">Wiki</a></li>
              </ul>
            </div>
            <div class="span3">
@@ -109,10 +107,11 @@
              </ul>
            </div>
            <div class="span3">
-             <h4>More</h4>
+             <h4>Mehr</h4>
              <ul class="unstyled">
                <li><a href="#">Spenden</a></li>
                <li><a href="{% url contact %}">Kontakt</a></li>
+               <li><a href="{% url impressum %}">Impressum</a></li>
              </ul>
            </div>
          </div>
diff --git a/extras/website/website/templates/demo.html b/extras/website/website/templates/demo.html
index 9a47de5aa..a66354148 100644
--- a/extras/website/website/templates/demo.html
+++ b/extras/website/website/templates/demo.html
@@ -3,7 +3,6 @@
 {% block title %}{{ block.super }} - Demo{% endblock %}
 {% block headline %}Demo{% endblock %}
 
-{% block mainmenu_demo %}active{% endblock %}
 
 {% block lead %}
 Entdecken Sie die Funktionen von OpenSlides in dieser Online-Demo.
diff --git a/extras/website/website/templates/home.html b/extras/website/website/templates/home.html
index 207700687..b26c2a317 100644
--- a/extras/website/website/templates/home.html
+++ b/extras/website/website/templates/home.html
@@ -25,8 +25,8 @@
     <strong>Die Lösung für Ihre Versammlung!</strong></p>
     <br>
     <br>
-    <a class="btn btn-primary btn-large" href="{% url about %}">
-    Lernen Sie mehr &raquo;
+    <a class="btn btn-primary btn-large" href="{% url download %}">
+    Download &raquo;
     </a>
 
     <a class="btn  btn-large" href="{% url demo %}">
@@ -38,9 +38,15 @@
 
   <div class="row">
     <div class="span4">
-      <h2>Heading</h2>
-       <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-      <p><a class="btn" href="#">View details &raquo;</a></p>
+      <h2>Was ist OpenSlides?</h2>
+       <p>OpenSlides ist ein freies, webbasiertes Präsentationssystem zur 
+       Darstellung und Steuerung von Tagesordnungen, Anträgen und Wahlen 
+       einer Veranstaltung. </p>
+       <p>Neuartig ist vor allem die Funktion, das Plenum mit einzubeziehen: 
+       Jeder Teilnehmer auf einer Veranstaltung hat die Möglichkeit, sich mit
+       dem eigenen Laptop oder Smartphone per WLAN bei OpenSlides anzumelden.</p>
+       
+      <p><a class="btn" href="#">Mehr &raquo;</a></p>
     </div>
     <div class="span4">
       <h2>Support</h2>
diff --git a/extras/website/website/templates/license.html b/extras/website/website/templates/license.html
index b5accce05..a5e3d1ffe 100644
--- a/extras/website/website/templates/license.html
+++ b/extras/website/website/templates/license.html
@@ -13,14 +13,18 @@ OpenSlides ist Freie Open Source Software.
 
 {% block content %}
   <div class="row">
-    <div class="span9">
+    <div class="span6">
 OpenSlides steht unter der <strong>GNU General Public
 License (GNU GPL) Version 2+</strong> und darf ohne Restriktionen
 (unter den Bedingungen der Lizenz) benutzt, verändert und (geändert)
-weitergegeben werden. Eine Kopie der Lizenz liegt jedem
+weitergegeben werden.</p>
+
+<p>Eine Kopie der Lizenz liegt jedem
 OpenSlides-Release bei und ist auch in der 
 <a href="http://dev.openslides.org/browser/LICENSE">LICENSE-Datei</a> im
-Quellcode-Repository nachzulesen.
+Quellcode-Repository nachzulesen.</p>
     </div>
   </div>
+  <p><br></p>
+  <p><br></p>
 {% endblock %}
diff --git a/extras/website/website/urls.py b/extras/website/website/urls.py
index e2d145e26..1911684ca 100644
--- a/extras/website/website/urls.py
+++ b/extras/website/website/urls.py
@@ -9,7 +9,6 @@ from django.views.generic import TemplateView
 
 urlpatterns = patterns('',
     url(r'^$', TemplateView.as_view(template_name="home.html"), name='home',),
-    url(r'^index/$', TemplateView.as_view(template_name="index.html"), name='index',),
     url(r'^about/$', TemplateView.as_view(template_name="about.html"), name='about',),
     url(r'^about/features$', TemplateView.as_view(template_name="features.html"), name='features',),
     url(r'^about/license$', TemplateView.as_view(template_name="license.html"), name='license',),
@@ -20,4 +19,5 @@ urlpatterns = patterns('',
     url(r'^development/$', TemplateView.as_view(template_name="development.html"), name='development',),
     url(r'^contact/$', TemplateView.as_view(template_name="contact.html"), name='contact',),
     url(r'^demo/$', TemplateView.as_view(template_name="demo.html"), name='demo',),
+    url(r'^impressum/$', TemplateView.as_view(template_name="impressum.html"), name='impressum',),
 )