* Aktelle Vorlagen in den src Ordner verschoben, damit sie in der Versionierung enthalten sind.

* INSTALLED_APPS auf PROJECT_APPS + PREREQ_APPS damit Vorlagen aus den kasu/templates Ordner bevorzugt werden. So lassen sich Vorlagen von 3rd Party Apps überschreiben, wie z.b. django-contrib-comments.

* Javascript Code für Google Maps entfernt, dies funktioniert mit Content Security Policy nicht mehr so gut und wird eh nicht gebraucht.

* Javascript für das Hanchan Formular vom header an des Ende des body gesetzt, der Code darf erst ausgeführt werden, wenn das Formular aufgebaut wurde.

src/content/templates/content/article_form.html

@@ -2,9 +2,19 @@
 {% load i18n fieldset_extras %}
 
 {% block extra_head %}
- <script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"
- <script type="text/javascript" src="{{ STATIC_URL }}js/language_tabs.js" ></script>
+        defer></script>
- <script type="text/javascript" src="{{ STATIC_URL }}js/ckeditor/ckeditor.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}js/language_tabs.js"
+        defer></script>
+<script type="text/javascript" src="{{ STATIC_URL }}js/ckeditor/ckeditor.js"
+        defer></script>
+<script type="text/javascript">
+window.onload = function () {
+    CKEDITOR.dtd.$removeEmpty['span'] = false;
+    CKEDITOR.replace('id_content_de');
+    CKEDITOR.replace('id_content_en');
+}
+</script>
 {% endblock %}
 
 {% block maincontent %}
@@ -45,11 +55,4 @@
  </form>
 {% endblock %}
 
-{% block javascript %}
-    CKEDITOR.dtd.$removeEmpty['span'] = false;
-    CKEDITOR.replace( 'id_content_de' );
-    CKEDITOR.replace( 'id_content_en' );
-{% endblock %}
-
-
 {% block buttonbar %}{% endblock %}

src/content/templates/content/page_form.html

@@ -6,10 +6,20 @@
 {% endblock %}
 
 {% block extra_head %}
- <script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"
- <script type="text/javascript" src="{{ STATIC_URL }}js/language_tabs.js" ></script>
+        defer></script>
- <script type="text/javascript" src="{{ STATIC_URL }}js/ckeditor/ckeditor.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}js/language_tabs.js"
- {% endblock %}
+        defer></script>
+<script type="text/javascript" src="{{ STATIC_URL }}js/ckeditor/ckeditor.js"
+        defer></script>
+<script type="text/javascript">
+window.onload = function () {
+    CKEDITOR.dtd.$removeEmpty['span'] = false;
+    CKEDITOR.replace('id_content_de');
+    CKEDITOR.replace('id_content_en');
+}
+</script>
+{% endblock %}
 
 {% block jumbotron_background %}{{STATIC_URL}}img/teaser/edit_page.jpg{% endblock %}
 
@@ -66,8 +76,3 @@
 </form>
 {% endblock %}
 
-{% block javascript %}
-    CKEDITOR.dtd.$removeEmpty['span'] = false;
-    CKEDITOR.replace( 'id_content_de' );
-    CKEDITOR.replace( 'id_content_en' );
-{% endblock %}

src/events/templates/events/event_detail.html

@@ -2,6 +2,8 @@
 {% load i18n comments thumbnail %}
 
 {% block title %}{{ event.name }}{% endblock %}
+{% block description %}Veranstaltung {{ event.name }} am {{ event.start|date }}{% endblock %}
+
 
 {% block opengraph %}
   <meta property="og:type" content="activity" />
@@ -11,11 +13,7 @@
   {% if event.description %}<meta property="og:description" content="{{event.description|striptags}}" />{% endif %}
 {% endblock %}
 
-{% block extra_head %}
+{% block jumbotron_background %}{{ event.get_image|thumbnail_url:'callout' }}{% endblock %}
-  <script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false"></script>
-{% endblock %}
-
-{% block jumbotron_background %} {{ event.get_image|thumbnail_url:'callout' }} {% endblock %}
 
 {% block teaser %}
   <h1>{{event.name}}</h1>
@@ -40,72 +38,82 @@
  </ul>
 {% endblock %}
 
-
 {% block navigation %}
-<code>{{ event. }}</code>
+{% if not event.is_future_event %}
 <ul id="navigation">
-    <li><a href="{{ event.get_absolute_url }}"><span class="fa fa-info-circle"></span> {% trans 'Info' %}</a></li>
+  <li><a href="{{ event.get_absolute_url }}"><span
-    <li><a href="{% url 'event-photo-list' event.pk %}"><span class="fa fa-camera-retro"></span> {{ event.photo_count }} {% trans 'Photos' %}</a></li>
+          class="fa fa-info-circle"></span> {% trans 'Info' %}</a></li>
-    <li><a href="{% url 'event-hanchan-list' event.pk %}" ><span class="fa fa-table"></span> {{ event.hanchan_set.count }} {% trans "Hanchans" %}</a></li>
+  <li><a href="{% url 'event-photo-list' event.pk %}"><span
-    <li><a href="{% url 'maistar-game-list' event.pk %}" ><span class="fa fa-glass"></span> {{ event.maistargame_set.count }} {% trans "Mai-Star Games" %}</a></li>
+          class="fa fa-camera-retro"></span> {{ event.photo_count }}
+    {% trans "Photos" %}</a></li>
+  <li><a href="{% url 'event-hanchan-list' event.pk %}"><span
+          class="fa fa-table"></span> {{ event.hanchan_set.count }}
+    {% trans "Hanchans" %}</a></li>
+  <li><a href="{% url 'maistar-game-list' event.pk %}"><span
+          class="fa fa-glass"></span> {{ event.maistargame_set.count }}
+    {% trans "Mai-Star Games" %}</a></li>
+  {% if event.hanchan_set.count > 0 %}
   <li><a href="{% url 'event-ranking' event.id %}"><span
           class="fa fa-trophy"></span> {% trans "Event Ranking" %}</a></li>
+  {% endif %}
 </ul>
+{% endif %}
 {% endblock %}
 
 {% block maincontent %}
-<div class="grid_6" id="google_maps">
-&nbsp;
-</div>
-
-<div class="grid_6">
-  <h3>{% trans 'Location' %}</h3>
-  <strong>{{ event.location.name }}</strong>
-  <address>
-  {{event.location.street_address}}<br />
-  {{event.location.postal_code}} {{event.location.locality}} <br />
-  {{event.location.get_country_display}}
-  </address>
-  {% if event.location.url %}
-  <p><strong>{% trans "Homepage" %}:</strong> <a href="{{ event.location.url }}">{{ event.location.url }}</a></p>
-  {% endif %}
-    <h3>{% trans "Date" %}</h3>
-    <ul>
-      <li><strong>{% trans "Start" %}:</strong> {{ event.start }}</li>
-      {% if event.end %}<li><strong>{% trans "End" %}:</strong> {{ event.end }}</li>{% endif %}
-      {% if event.url %}<li><strong>{% trans "Homepage" %}:</strong> <a href="{{ event.url }}">{{ event.url }}</a></li>{% endif %}
-    </ul>
-</div>
-
 <div class="grid_12">
   {% if event.description %}
   {{event.description|safe}}
   {% else %}
   {{event.location.description|safe}}
   {% endif %}
-  <p class="more_link">
+</div>
-
+<div class="grid_6">
-      <a class="button" href="http://facebook.com/sharer.php?u=http%3A%2F%2Fwww.kasu.at{{event.get_absolute_url|urlencode}}" target="_blank">
+  <h3>{% trans 'Location' %}</h3>
-        <span class="fa fa-facebook"></span>
+  <strong>{{ event.location.name }}</strong>
-        {% trans 'Share on Facebook'%}
+  <address>
+    {{event.location.street_address}}<br/>
+    {{event.location.postal_code}} {{event.location.locality}} <br/>
+    {{event.location.get_country_display}}
+  </address>
+  {% if event.location.url %}
+  <p><strong>{% trans "Homepage" %}:</strong> <a
+          href="{{ event.location.url }}">{{ event.location.url }}</a></p>
+  {% endif %}
+</div>
+<div class="grid_6">
+  <h3>{% trans "Date" %}</h3>
+  <ul>
+    <li><strong>{% trans "Start" %}:</strong> {{ event.start }}</li>
+    {% if event.end %}
+    <li><strong>{% trans "End" %}:</strong> {{ event.end }}</li>
+    {% endif %}
+    {% if event.url %}
+    <li><strong>{% trans "Homepage" %}:</strong> <a href="{{ event.url }}">{{
+      event.url }}</a></li>
+    {% endif %}
+  </ul>
+</div>
+<p class="grid_12 more_link">
+  <a class="button" rel="nofollow" target="_blank"
+     href="http://facebook.com/sharer.php?u=http%3A%2F%2Fwww.kasu.at{{event.get_absolute_url|urlencode}}">
+    <span class="fa fa-facebook"></span> {% trans 'Share on Facebook'%}
   </a>
-
+  <a class="button" rel="nofollow" target="_blank"
-      <a class="button" href="https://plus.google.com/share?url=http%3A%2F%2Fwww.kasu.at{{event.get_absolute_url|urlencode}}" onclick="javascript:window.open(this.href,
+     href="https://plus.google.com/share?url=http%3A%2F%2Fwww.kasu.at{{event.get_absolute_url|urlencode}}">
-  '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=600');return false;">
+    <span class="fa fa-google-plus"></span> {% trans 'Share on Google+'%}
-          <span class="fa fa-google-plus"></span>
-          {% trans 'Share on Google+'%}
   </a>
-  <a class="button" href="https://twitter.com/share?url=http%3A%2F%2Fwww.kasu.at{{event.get_absolute_url|urlencode}}" target='_blank'>
+  <a class="button" rel="nofollow" target="_blank"
+     href="https://twitter.com/share?url=http%3A%2F%2Fwww.kasu.at{{event.get_absolute_url|urlencode}}">
     <span class="fa fa-twitter"></span>
     {% trans 'Share on Twitter' %}
   </a>
-  <a class="button" href="http://maps.google.com/maps?q={{event.location.address|urlencode}}&amp;z=16" target="gmaps">
+  <a class="button" rel="nofollow" target="_blank"
-      <span class="fa fa-map"></span>
+     href="http://maps.google.com/maps?q={{event.location.address|urlencode}}&amp;z=16">
-      {% trans 'Show on Google Maps' %}
+    <span class="fa fa-map"></span> {% trans 'Show on Google Maps' %}
   </a>
-  </p>
+</p>
-</div>
+<br class="clear"/>
-<br class="clear" />
 {% endblock %}
 
 {% block comments %}

src/events/templates/events/event_list.html

@@ -2,7 +2,7 @@
 {% load i18n comments thumbnail %}
 
 {% block title %}{% trans "Upcoming Events" %}{% endblock %}
-{% block teaser%}<h2>{% trans "Upcoming Events" %}</h2>{% endblock %}
+{% block teaser%}<h1>{% trans "Upcoming Events" %}</h1>{% endblock %}
 {% block maincontent %}
 
 {% regroup event_list by start|date:'F Y' as month_list %}

src/events/templates/events/eventseries_form.html

@@ -1,10 +1,12 @@
 {% extends "events/event_detail.html" %}
 {% load i18n comments %}
 
-{% block title %}{{ event.name }}{% endblock %}
+{% block title %}Weitere Termine für {{ event.name }}{% endblock %}
+
+{% block maincontent %}
+
+{{ event.description|safe }}
 
-{% block main_content %}
-<h3>Hier kommt eine Tabelle rein!</h3>
 <form class="grid_12" method="post">
   {% csrf_token %}
   {{ formset.management_form }}

src/events/templates/events/page.html

@@ -5,8 +5,8 @@
 
 {% block additional_buttonbar %}
 {% if perms.events.add_event %}
-  <a href="{% url 'event-form' %}" class="button">
+  <a href="{% url 'event-form' %}" class="button"><span
-      <span class="fa fa-calendar-plus-o"></span> {% trans 'Add Event' %}</a>
+     class="fa fa-calendar-plus-o"></span> {% trans 'Add Event' %}</a>
 {% endif %}
 {% endblock %}
 

src/events/templates/events/photo_detail.html

@@ -2,19 +2,24 @@
 {% load i18n comments thumbnail %}
 
 {% block title %} {{ photo.name }} - {{ photo.event.name }} {% endblock %}
+{% block description %}{% spaceless %}
+{% if photo.description %}{{photo.description}}
+{% else %}
+Foto {{ photo.name }} vom {{ photo.date_created|default:photo.created_date }} geschossen bei {{event.name}}
+{% endif %}
+{% endspaceless %}{% endblock %}
 
 {% block extra_head %}
-    <script type="text/javascript" src="{{ STATIC_URL }}/js/jquery.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}/js/jquery.min.js"></script>
-    <script type="text/javascript" src="{{ STATIC_URL }}/js/mousetrap.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}/js/mousetrap.js"></script>
-{% endblock %}
+<script type="text/javascript">
-
-{% block javascript %}
 if ($('a.previous').attr('href')) {
     Mousetrap.bind('left', function() { window.location = $('a.previous').attr('href'); });
 }
 if ($('a.next').attr('href')) {
     Mousetrap.bind('right', function() { window.location = $('a.next').attr('href'); });
 }
+</script>
 {% endblock %}
 
 {% block teaser %}

src/kasu/settings.py

@@ -53,7 +53,7 @@ PROJECT_APPS = [
     'maistar_ranking',
     'mahjong_ranking',
 ]
-INSTALLED_APPS = PREREQ_APPS + PROJECT_APPS
+INSTALLED_APPS = PROJECT_APPS + PREREQ_APPS
 
 # Caches
 CACHES = {
@@ -112,7 +112,7 @@ TEMPLATES = [
 #Settings for Security Middleware
 CSP_DEFAULT_SRC = ("'self'",)
 CSP_IMG_SRC = CSP_DEFAULT_SRC
-CSP_SCRIPT_SRC = CSP_DEFAULT_SRC
+CSP_SCRIPT_SRC = ("'self'", "'unsafe-inline'")
 CSP_STYLE_SRC = ("'self'", "'unsafe-inline'")
 SECURE_BROWSER_XSS_FILTER = True
 SECURE_CONTENT_TYPE_NOSNIFF = True

src/kasu/templates/base.html

@@ -6,7 +6,6 @@
     <meta name="description" content="{% block description %}{% endblock %}"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <meta charset="UTF-8">
-    <script src="https://kasu.at/piwik/piwik.js" async defer></script>
     <!--[if lt IE 9]>
     <script type="text/javascript">
         document.createElement('header');
@@ -18,7 +17,6 @@
         document.createElement('hgroup');
     </script>
     <![endif]-->
-
     <link rel="stylesheet" href="{{STATIC_URL}}css/kasu.css" />
     <link rel="manifest" href="/manifest.json" />
     <link rel="alternate" type="application/rss+xml" title="{% trans 'Current News' %}"
@@ -28,7 +26,6 @@
     <link rel="shortcut icon" href="{{STATIC_URL}}img/favicon.ico" />
     <link rel="apple-touch-icon" sizes="180x180" href="{{STATIC_URL}}img/apple-touch-icon-180x180.png" />
     <link rel="icon" type="image/png" href="{{STATIC_URL}}img/favicon-96x96.png" sizes="96x96" />
-    <link rel="mask-icon" href="{{STATIC_URL}}img/safari-pinned-tab.svg" color="#5bbad5" />
 
 
     {% block opengraph %}
@@ -38,6 +35,21 @@
     <meta property="og:image" content="http://www.kasu.at/static/img/logo.png"/>
     {% endblock %}
     {% block extra_head %}{% endblock %}
+    <!-- Piwik -->
+    <script type="text/javascript">
+  var _paq = _paq || [];
+  // tracker methods like "setCustomDimension" should be called before "trackPageView"
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="/piwik/";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', '1']);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+  })();
+    </script>
+    <!-- End Piwik Code -->
 </head>
 <body id="body" {% block itemscope %}{% endblock %}>
     <header id="siteheader">
@@ -188,7 +200,5 @@
        title="{% trans 'Login with Google' %}" aria-label="{% trans 'Login with Google' %}"></a>
     {% endif %}
 </nav>
-<script src="{{STATIC_URL}}/js/piwik.js" async defer></script>
-<noscript><img src="//kasu.at/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></noscript>
 </body>
 </html>

src/kasu/urls.py

@@ -63,5 +63,9 @@ if settings.DEBUG:
 
     if 'debug_toolbar' in settings.INSTALLED_APPS:
         import debug_toolbar
-        urlpatterns += patterns('', url(r'^__debug__/', include(debug_toolbar.urls)),)
+        urlpatterns += [
+            url(r'^__debug__/', include(debug_toolbar.urls)),
+        ]
+
+
 

src/mahjong_ranking/templates/mahjong_ranking/hanchan_form.html

@@ -4,31 +4,7 @@
 {% block title %}{% if hanchan.id %}{% trans "Edit Hanchan" %}{% else %}{% trans "Add Hanchan" %}{% endif %}{% endblock %}
 
 {% block extra_head %}
- <script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"></script>
- {% endblock %}
-
-
-<script class="javascript">
-{% block javascript %}
-function recalculate_values(element) {
-    var total = 0
-    $('input[name$="_input_score"]').each(function() {total += Number($(this).val());});
-    $('#total').val(total)
-
-    var difference = 100000 - total
-    if (difference > 0) {
-        differnence_text = difference + ' offen'
-    } else if (difference < 0) {
-        differnence_text = (0 - difference) + ' zu viel'
-    } else {
-        differnence_text = 'Ok'
-    }
-    $('#difference').text(differnence_text)
-}
-$("#id_start_1").focus();
-$('input[name$="_input_score"]').keyup(function() {recalculate_values(this);});
-$('input[name$="_input_score"]').change(function() {recalculate_values(this);});
-</script>
 {% endblock %}
 
 {% block maincontent %}
@@ -95,6 +71,26 @@ $('input[name$="_input_score"]').change(function() {recalculate_values(this);});
         <button type="submit"><span class="fa fa-hdd-o"></span> {% trans 'save' %}</button>
     </p>
 </fieldset></form>
+<script type="text/javascript">
+function recalculate_values(element) {
+    var total = 0
+    $('input[name$="_input_score"]').each(function() {total += Number($(this).val());});
+    $('#total').val(total)
+
+    var difference = 100000 - total
+    if (difference > 0) {
+        differnence_text = difference + ' offen'
+    } else if (difference < 0) {
+        differnence_text = (0 - difference) + ' zu viel'
+    } else {
+        differnence_text = 'Ok'
+    }
+    $('#difference').text(differnence_text)
+}
+$("#id_start_1").focus();
+$('input[name$="_input_score"]').keyup(function() {recalculate_values(this);});
+$('input[name$="_input_score"]').change(function() {recalculate_values(this);});
+</script>
 {% endblock %}
 
 {% block comments %}{% endblock %}

src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html

@@ -2,6 +2,10 @@
 {% load i18n thumbnail %}
 
 {% block title %}{% trans 'Player List' %}{% endblock %}
+{% block extra_head %}
+<link rel="canonical" href="{% url 'kyudanranking-list' %}?page={{page_obj.number}}" />
+{% endblock %}
+
 {% block teaser %}<h1>{% trans 'Player List' %}</h1>{% endblock %}
 
 {% block redbox %}{% include 'mahjong_ranking/ladder_redbox.html' %}{% endblock %}
@@ -12,29 +16,29 @@
   <tr>
    <th>{% trans 'Avatar' %}</th>
    <th>
-   <a href="{% url 'kyudanranking-list' order_by='+username' %}?page={{page_obj.number}}" class="fa fa-sort-asc"></a>
+   <a href="{% url 'kyudanranking-list' order_by='+username' %}?page={{page_obj.number}}" class="fa fa-sort-asc" rel="nofollow"></a>
    {% trans 'Nickname' %}
-   <a href="{% url 'kyudanranking-list' order_by='-username' %}?page={{page_obj.number}}" class="fa fa-sort-desc"></a>
+   <a href="{% url 'kyudanranking-list' order_by='-username' %}?page={{page_obj.number}}" class="fa fa-sort-desc" rel="nofollow"></a>
    </th>
    <th>
-    <a href="{% url 'kyudanranking-list' order_by='+full_name'%}?page={{page_obj.number}}" class="fa fa-sort-asc"></a>
+    <a href="{% url 'kyudanranking-list' order_by='+full_name'%}?page={{page_obj.number}}" class="fa fa-sort-asc" rel="nofollow"></a>
     {% trans 'Full Name' %}
-    <a href="{% url 'kyudanranking-list' order_by='-full_name' %}?page={{page_obj.number}}" class="fa fa-sort-desc"></a>
+    <a href="{% url 'kyudanranking-list' order_by='-full_name' %}?page={{page_obj.number}}" class="fa fa-sort-desc" rel="nofollow"></a>
    </th>
    <th>
-    <a href="{% url 'kyudanranking-list' order_by='+rank' %}?page={{page_obj.number}}" class="fa fa-sort-asc"></a>
+    <a href="{% url 'kyudanranking-list' order_by='+rank' %}?page={{page_obj.number}}" class="fa fa-sort-asc" rel="nofollow"></a>
     {% trans 'Rank' %}
-    <a href="{% url 'kyudanranking-list' order_by='-rank' %}?page={{page_obj.number}}"  class="fa fa-sort-desc"></a>
+    <a href="{% url 'kyudanranking-list' order_by='-rank' %}?page={{page_obj.number}}"  class="fa fa-sort-desc" rel="nofollow"></a>
    </th>
    <th>
-    <a href="{% url 'kyudanranking-list' order_by='+score' %}?page={{page_obj.number}}" class="fa fa-sort-asc"></a>
+    <a href="{% url 'kyudanranking-list' order_by='+score' %}?page={{page_obj.number}}" class="fa fa-sort-asc" rel="nofollow"></a>
     {% trans 'Score' %}
-    <a href="{% url 'kyudanranking-list' order_by='-score' %}?page={{page_obj.number}}" class="fa fa-sort-desc"></a>
+    <a href="{% url 'kyudanranking-list' order_by='-score' %}?page={{page_obj.number}}" class="fa fa-sort-desc" rel="nofollow"></a>
    </th>
    <th>
-    <a href="{% url 'kyudanranking-list' order_by='+hanchan_count'%}?page={{page_obj.number}}" class="fa fa-sort-asc"></a>
+    <a href="{% url 'kyudanranking-list' order_by='+hanchan_count'%}?page={{page_obj.number}}" class="fa fa-sort-asc" rel="nofollow"></a>
     {% trans 'Games Total' %}
-    <a href="{% url 'kyudanranking-list' order_by='-hanchan_count'%}?page={{page_obj.number}}" class="fa fa-sort-desc"></a>
+    <a href="{% url 'kyudanranking-list' order_by='-hanchan_count'%}?page={{page_obj.number}}" class="fa fa-sort-desc" rel="nofollow"></a>
    </th>
   </tr>
  </thead>

src/membership/templates/registration/login.html

@@ -1,59 +1,74 @@
 {% extends "base.html" %}
-
-{% load url from future %}
 {% load i18n %}
+{% load url from future %}
 
-{% block title %}{% trans 'login' %}{% endblock %}
+{% block title %}{% trans 'Login' %}{% endblock %}
+{% block description %}Anmelden auf Kasu.at{% endblock %}
 
-{% block teaser %}<h1>{% trans 'login' %}</h1>{% endblock %}
+{% block extra_head %}
+<link rel="canonical" href="{% url 'django.contrib.auth.views.login' %}"/>
+{% endblock %}
 
+{% block teaser %}<h1>{% trans 'Login' %}</h1>{% endblock %}
 {% block maincontent %}
 <form method="post" action="{% url 'django.contrib.auth.views.login' %}">
-<h2 class="grid_12">Auf der Seite Anmelden</h2>
+  <h2 class="grid_12">Auf der Seite Anmelden</h2>
 
-<div class="grid_7">
+  <div class="grid_7">
-<h2>{% trans "Have you already registered?" %}</h2>
+    <h2>{% trans "Have you already registered?" %}</h2>
-{% blocktrans %}
+    {% blocktrans %}
-<p>As a registered member you can:</p>
+    <p>As a registered member you can:</p>
-<ul>
+    <ul>
       <li>leave comments on this page.</li>
       <li>subscribe to our Newsletter</li>
       <li>apply to a membership to our club</li>
       <li>club-members have access to our ranking-system</li>
-</ul>
+    </ul>
-{% endblocktrans %}
+    {% endblocktrans %}
-{% blocktrans %}
+    {% blocktrans %}
-<p>You can register here with your Google, or Facebook account.
+    <p>You can register here with your Google, or Facebook account.
-If you don't own such an account, or do not want to use it for authentication,
+      If you don't own such an account, or do not want to use it for
-you can fill out our registration form.</p>
+      authentication,
-{% endblocktrans %}
+      you can fill out our registration form.</p>
-<p class="buttonbar">
+    {% endblocktrans %}
- <a href="{% url 'membership-register' %}" class="button"><span class="fa fa-user-plus"></span> {%trans "register"%}</a></p>
+    <p class="buttonbar">
-</div>
+      <a href="{% url 'membership-register' %}" class="button"><span
+              class="fa fa-user-plus"></span> {%trans "register"%}</a></p>
+  </div>
 
 
-{% csrf_token %}
+  {% csrf_token %}
-<fieldset class="grid_5">
+  <fieldset class="grid_5">
-<legend>{% trans 'login' %}</legend>
+    <legend>{% trans 'login' %}</legend>
-{% csrf_token %}
+    {% csrf_token %}
-{% include 'form.html' %}
+    {% include 'form.html' %}
-{% if form.errors %}
+    {% if form.errors %}
-<p>{% blocktrans %}Your username and password didn't match. Please try again.{% endblocktrans %}</p>
+    <p>{% blocktrans %}Your username and password didn't match. Please try
-{% endif %}
+      again.{% endblocktrans %}</p>
-<input type="hidden" name="next" value="{{next}}" />
+    {% endif %}
-<p><a href="{% url 'password_reset' %}">{% trans 'Forgot your Password?'%}</a></p>
+    <input type="hidden" name="next" value="{{next}}"/>
-<div class="buttonbar">
+    <p><a href="{% url 'password_reset' %}">
-<button type="submit"><span class="fa fa-sign-in"></span> {% trans 'Login' %}</button></div>
+      {% trans 'Forgot your Password?'%}</a></p>
-</fieldset>
+    <div class="buttonbar">
+      <button type="submit"><span class="fa fa-sign-in"></span>
+        {% trans 'Login' %}
+      </button>
+    </div>
+  </fieldset>
 
 
-
+  <div class="grid_5">
-<div class="grid_5">
+    <h2>{% trans "or login with an existing Account" %}</h2>
-<h2>{% trans "or login with an existing Account" %}</h2>
+    <a rel="nofollow" href="{% url 'social:begin' 'facebook' %}"><span
-  <a rel="nofollow" href="{% url 'social:begin' 'facebook' %}"><span class="fa fa-facebook fa-5x" title="{% trans 'Login with Facebook' %}"></span></a>
+            class="fa fa-facebook fa-5x"
-  <a rel="nofollow" href="{% url 'social:begin' 'twitter' %}"><span class="fa fa-twitter fa-5x" title="{% trans 'Login with Twitter' %}"></span></a>
+            title="{% trans 'Login with Facebook' %}"></span></a>
-  <a rel="nofollow" href="{% url 'social:begin' 'google-oauth2' %}"><span class="fa fa-google-plus fa-5x" title="{% trans 'Login with Google' %}"></span></a>
+    <a rel="nofollow" href="{% url 'social:begin' 'twitter' %}"><span
-</div>
+            class="fa fa-twitter fa-5x"
+            title="{% trans 'Login with Twitter' %}"></span></a>
+    <a rel="nofollow" href="{% url 'social:begin' 'google-oauth2' %}"><span
+            class="fa fa-google-plus fa-5x"
+            title="{% trans 'Login with Google' %}"></span></a>
+  </div>
 </form>
 {% endblock %}