* 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/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">
-<h2>{% trans "Have you already registered?" %}</h2>
-{% blocktrans %}
-<p>As a registered member you can:</p>
-<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>
-{% endblocktrans %}
-{% blocktrans %}
-<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,
-you can fill out our registration form.</p>
-{% endblocktrans %}
-<p class="buttonbar">
- <a href="{% url 'membership-register' %}" class="button"><span class="fa fa-user-plus"></span> {%trans "register"%}</a></p>
-</div>
+  <div class="grid_7">
+    <h2>{% trans "Have you already registered?" %}</h2>
+    {% blocktrans %}
+    <p>As a registered member you can:</p>
+    <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>
+    {% endblocktrans %}
+    {% blocktrans %}
+    <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,
+      you can fill out our registration form.</p>
+    {% endblocktrans %}
+    <p class="buttonbar">
+      <a href="{% url 'membership-register' %}" class="button"><span
+              class="fa fa-user-plus"></span> {%trans "register"%}</a></p>
+  </div>
 
 
-{% csrf_token %}
-<fieldset class="grid_5">
-<legend>{% trans 'login' %}</legend>
-{% csrf_token %}
-{% include 'form.html' %}
-{% if form.errors %}
-<p>{% blocktrans %}Your username and password didn't match. Please try again.{% endblocktrans %}</p>
-{% endif %}
-<input type="hidden" name="next" value="{{next}}" />
-<p><a href="{% url 'password_reset' %}">{% trans 'Forgot your Password?'%}</a></p>
-<div class="buttonbar">
-<button type="submit"><span class="fa fa-sign-in"></span> {% trans 'Login' %}</button></div>
-</fieldset>
+  {% csrf_token %}
+  <fieldset class="grid_5">
+    <legend>{% trans 'login' %}</legend>
+    {% csrf_token %}
+    {% include 'form.html' %}
+    {% if form.errors %}
+    <p>{% blocktrans %}Your username and password didn't match. Please try
+      again.{% endblocktrans %}</p>
+    {% endif %}
+    <input type="hidden" name="next" value="{{next}}"/>
+    <p><a href="{% url 'password_reset' %}">
+      {% trans 'Forgot your Password?'%}</a></p>
+    <div class="buttonbar">
+      <button type="submit"><span class="fa fa-sign-in"></span>
+        {% trans 'Login' %}
+      </button>
+    </div>
+  </fieldset>
 
 
-
-<div class="grid_5">
-<h2>{% trans "or login with an existing Account" %}</h2>
-  <a rel="nofollow" href="{% url 'social:begin' 'facebook' %}"><span class="fa fa-facebook fa-5x" title="{% trans 'Login with Facebook' %}"></span></a>
-  <a rel="nofollow" href="{% url 'social:begin' 'twitter' %}"><span 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>
+  <div class="grid_5">
+    <h2>{% trans "or login with an existing Account" %}</h2>
+    <a rel="nofollow" href="{% url 'social:begin' 'facebook' %}"><span
+            class="fa fa-facebook fa-5x"
+            title="{% trans 'Login with Facebook' %}"></span></a>
+    <a rel="nofollow" href="{% url 'social:begin' 'twitter' %}"><span
+            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 %}