2 Fehler behoben:

1.  Internet Explorer unterstützung für <main> Tag ist fehlerhaft, wurde per CSS Definituon behoben.
2.  Templates für registrierung versehntlich gelöscht, wurden im membership Modul wieder hergestellt.

src/content/templates/content/article_archive.html

@@ -15,11 +15,11 @@
 
 {% block jumbotron_background %}{% if active_category %}{{ active_category.image.url }}{% else %}{{STATIC_URL}}img/teaser/{{current_top_page.slug}}.jpg{% endif %}{% endblock %}
 
-{% block teaser %}<h2>
+{% block teaser %}<h1>
    {% trans 'Article Archive' %}
    {% if active_category %} - {{active_category.name}}{% endif %}
    {% if month %}{{ month|date:'F Y' }}{% elif year %}{{year}}{% endif %}
-   </h2>
+   </h1>
     <div id="teaser_text">
         {% if active_category %}
         <p>{{ active_category.description }}</p>

src/content/templates/content/article_detail.html

@@ -17,7 +17,7 @@
 {% block itemscope %}itemscope itemtype="http://schema.org/Article"{% endblock %}
 
 {% block teaser %}
-<h2 itemprop="name">{{article.headline}}</h2>
+<h1 itemprop="name">{{article.headline}}</h1>
 <div id="teaser_text">
     <ul class="info">
         <li><span class="fa fa-user"></span> <strong>{% trans 'Author' %}:</strong> <a href="{% url 'membership-details' article.author %}" itemprop="author">{{article.author}}</a></li>

src/content/templates/content/page_form.html

@@ -14,7 +14,7 @@
 {% block jumbotron_background %}{{STATIC_URL}}img/teaser/edit_page.jpg{% endblock %}
 
 {% block teaser %}
-    {% if object.pk %}<h1>{{ page.title }}</h1>
+    {% if object.pk %}<h1>{% trans 'Edit' %}{{ page.title }}</h1>
     {% else %}<h1>{% trans "Add Page" %}</h1>
     {% endif %}
 {% endblock %}

src/events/templates/events/event_archive.html

@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block teaser %}
-<h2>{% trans 'Event Archive' %} {% if month %}{{ month|date:'F Y' }}{% elif year %}{{year|date:'Y'}}{% endif %}</h2>
+<h1>{% trans 'Event Archive' %} {% if month %}{{ month|date:'F Y' }}{% elif year %}{{year|date:'Y'}}{% endif %}</h1>
 {% endblock %}
 
 {% block redbox %}

src/events/templates/events/event_site.html

@@ -14,7 +14,7 @@
 {% block jumbotron_background %}{{ event.get_callout.url }}')}{% endblock %}
 
 {% block teaser %}
-  <h2>{{event.name}}</h2>
+  <h1>{{event.name}}</h1>
   <div id="teaser_text">
    {% if event.description %}{{event.description|markdown}}{% else %}{{event.location.description|markdown}}{% endif %}
   </div>

src/kasu/static/less/common.less

@@ -76,10 +76,10 @@ a:visited {
     color: #5c3566;
 }
 
-button, a.button {
+button, a.button, #redbox a.button:link, #redbox a.button:visited {
     display: inline-block;
-    padding: 0.2em;
-    margin: 0.2em;
+    padding: 0.25em;
+    margin: 0.25em;
     color: #2e3436;
     background-color: #f9f9f9;
     background: linear-gradient(to bottom, #f9f9f9 5%, #e9e9e9 100%);
@@ -88,10 +88,10 @@ button, a.button {
     box-shadow: inset 0px 1px 0px 0px #ffffff;
     font: bold 12pt Philosopher, sans-serif;
     text-decoration: none;
-    text-shadow: 1px 1px 0px #ffffff;
+    text-shadow: 1px 1px 1px #ffffff;
 }
 
-article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
+article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section {
     display: block;
 }
 
@@ -108,7 +108,7 @@ h1, h2, h3, h4, h5, h6, .player {
     font-weight: 400;
     letter-spacing: -1px;
     margin: 1em 0 0.5em 0;
-    text-shadow: 2px 2px 2px #888;
+    text-shadow: 1px 1px 1px #888;
     vertical-align: baseline;
 }
 
@@ -188,7 +188,7 @@ ul.tabs {
 
         a {
             color: #ffffff;
-            text-shadow: 1px 1px 0px #2e3436;
+            text-shadow: 1px 1px 1px #2e3436;
             display: inline-block;
             padding: 0.5em 1em;
             text-decoration: none;
@@ -201,7 +201,7 @@ ul.tabs {
         a {
             color: #bc0a19;
             text-decoration: none;
-            text-shadow: 1px 1px 0px #888;
+            text-shadow: 1px 1px 1px #888;
         }
     }
 }
@@ -306,16 +306,10 @@ ul.info li {
     background-color: #a90329;
     background: linear-gradient(135deg,  #a90329 0%,#8f0222 44%,#6d0019 100%);
     border-radius: 10px;
-    padding: 10px 5px 5px 5px;
+    padding: 10px;
 
-    h2:first-of-type {margin: -1em 10px 0 0;color: black;}
-    h2, h3, a:link, a:visited {color: white; font-weight: normal;}
-
-    a.button:link, a.button:visited {
-        color: #2e3436;
-        font-weight: bold;
-        text-decoration: none;
-    }
+    h2, h3, a:link, a:visited {color: white; font-weight: normal; text-shadow: 1px 1px 1px #000;}
+    h2:first-of-type {margin: -20px 0 0 10px; color: black; text-shadow: 1px 1px 1px #ffffff;}
 }
 
 .comment {
@@ -325,7 +319,18 @@ ul.info li {
     padding: 0;
 }
 
-fieldset.comment {padding: 0}
-fieldset.comment legend {margin-left: 15px}
-fieldset.comment .buttonbar {margin: 0; width: 100%}
-fieldset.comment .buttonbar {margin: 0; width: 100%}
+fieldset.comment {
+    padding: 0;
+
+    legend {margin-left: 15px}
+    .buttonbar {margin: 0; width: 100%}
+    .buttonbar {margin: 0; width: 100%}
+}
+
+#bottom_buttonbar {
+    position: absolute;
+    border-radius: 0 0 10px 10px;
+    bottom: 0px;
+    margin: 0;
+    width: 100%
+}

src/kasu/static/less/desktop.less

@@ -67,7 +67,7 @@
         height: auto !important;
         width: 960px;
         min-height: 800px;
-        padding: 10px 0 20px 0;
+        padding: 10px 0 2em 0;
         position: relative;
         z-index: 19;
         border-radius: 10px;
@@ -127,66 +127,52 @@
 }
 
 
-  #jumbotron {
+#jumbotron {
     clear: both;
     position: relative;
-    margin: 20px auto 10px auto;
     padding: 0 1px 0 0;
+    width: 940px;
+    margin: 0 10px 1em 10px;
     z-index: 5;
-    width: 940px; /* 620px */
     min-height: 300px;
     border: none;
     border-radius: 10px;
     background-repeat: no-repeat;
     background-color: #333;
     background-position: center left;
-  }
 
-  #jumbotron > h2, #jumbotron > h1 {
-    padding: 10px 5px;
-    font-size: 32pt;
-    color: #eff0ef;
-    position: absolute;
-    margin: 0;
-    left: 10px;
-    top: 33%;
-    max-width: 600px;
-  }
-
-  #teaser_text {
-    display: block;
-    position: absolute;
-    left: 0px;
-    bottom: 0px;
-    width: 620px;
-    color: #FFF;
-    background: rgba(0, 0, 0, 0.5);;
-    padding: 1em 1em 0.25em 1em;
-    border-radius: 0px 0px 0px 10px;
-    vertical-align:bottom;
-
-    a:link, a:visited, a:active {
-        color: #fff;
-        text-decoration: underline;
+    > h2, > h1 {
+        color: #eff0ef;
+        text-shadow: 1px 1px 1px #000;
+        position: absolute;
+        top: 33%;
+        left: 10px;
+        max-width: 600px;
+        margin: 0;
     }
-  }
 
-  #redbox {
+    #teaser_text {
+        display: block;
+        position: absolute;
+        left: 0px;
+        bottom: 0px;
+        width: 620px;
+        color: #FFF;
+        background: rgba(0, 0, 0, 0.5);;
+        padding: 1em;
+        border-radius: 0px 0px 0px 10px;
+    }
+}
+
+#redbox {
     position: absolute;
     top: 0px;
     right: 0px;
     height: 280px;
     width: 280px;
-    padding: 10px;
     border-radius: 0px 10px 10px 0px;
-  }
+}
 
-  #bottom_buttonbar {
-    position: absolute;
-    bottom: 0px;
-    margin: 0;
-    width: 100%
-  }
 
   #usernav {
     position: absolute;

src/kasu/templates/404.html

@@ -4,7 +4,7 @@
 {% block title %}404 - Seite nicht gefunden{% endblock %}
 
 {% block teaser %}
-<h1 class="grid_12">404 - Nōten!</h1>
+<h1">404 - Nōten!</h1>
 <div id="teaser_text"><p>{%  trans 'The page your requested does not exist on this server.' %}</p></div>
 {%  endblock %}
 

src/kasu/templates/base.html

@@ -55,7 +55,8 @@
     <main id="maincontent">
     <header id="jumbotron"
          style="background-image: url('{% block jumbotron_background %}{{STATIC_URL}}img/teaser/{{current_top_page.slug|default:'jumbotron'}}.jpg{% endblock %}')">
-    {% block teaser %}<h1>{% if title %}{{title}}{% elif current_page %}{{ current_page.title }}{% elif current_top_page %}{{current_top_page.title }}{% endif %}</h1>
+    {% block teaser %}
+        <h1>{% if title %}{{title}}{% elif current_page %}{{ current_page.title }}{% elif current_top_page %}{{current_top_page.title }}{% endif %}</h1>
     {% endblock %}
     <aside id="redbox">
         {% block redbox %}

src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block title %}{% trans 'Player List' %}{% endblock %}
-{% block teaser %}<h2>{% trans 'Player List' %}</h2>{% endblock %}
+{% block teaser %}<h1>{% trans 'Player List' %}</h1>{% endblock %}
 
 {% block content %}
 <table>

src/mahjong_ranking/templates/mahjong_ranking/player_dan_score.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block title %} {% trans 'Dan Score for' %} {{membership.username}} {% endblock %}
-{% block teaser %}<h2>{% trans 'Dan Score for' %} {{membership.username}}</h2>{% endblock %}
+{% block teaser %}<h1>{% trans 'Dan Score for' %} {{membership.username}}</h1>{% endblock %}
 
 {% block score_list %}
 <div class="grid_12">

src/mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html

@@ -3,7 +3,7 @@
 
 {% block title %} {% trans 'Unconfirmed Hanchans from' %} {{player.username}} {% endblock %}
 
-{% block teaser %}<h2>{% trans 'Unconfirmed Hanchans from' %} {{membership.username}}</h2>{% endblock %}
+{% block teaser %}<h1>{% trans 'Unconfirmed Hanchans from' %} {{membership.username}}</h1>{% endblock %}
 
 {% block score_list %}
 <h2>{% trans 'Invalid hanchans with' %} {{membership.username}}</h2>

src/mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html

@@ -3,7 +3,7 @@
 
 {% block title %} {% trans 'Kyu Score for' %} {{membership.username}} {% endblock %}
 
-{% block teaser %}<h2>{% trans 'Kyu Score for' %} {{membership.username}}</h2>{% endblock %}
+{% block teaser %}<h1>{% trans 'Kyu Score for' %} {{membership.username}}</h1>{% endblock %}
 
 {% block score_list %}
 <h2>{% trans 'Hanchans that apply to the Kyu Score' %}</h2>

src/mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block title %} {% trans 'Ladder Score for' %} {{membership.username}} / {{ season }}{% endblock %}
-{% block teaser %}<h2>{% trans 'Ladder Score for' %} {{membership.username}} / {{ season }}</h2>{% endblock %}
+{% block teaser %}<h1>{% trans 'Ladder Score for' %} {{membership.username}} / {{ season }}</h1>{% endblock %}
 
 {% block score_list %}
 <h2>{% trans 'Hanchans that apply to the Ladder Score' %} - {{ season }}</h2>

src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html

@@ -3,7 +3,7 @@
 
 
 {% block teaser %}
-<h2>Mahjong Ladder - {{ season }}</h2>
+<h1>Mahjong Ladder - {{ season }}</h1>
 <div id="teaser_text">
 <ul class="info">    
 <li><span class="fa fa-calendar-o"></span> {% trans 'Start' %}: {{ season_start|date:'SHORT_DATE_FORMAT' }}</li>

src/maistar_ranking/templates/maistar_ranking/player_game_list.html

@@ -3,7 +3,7 @@
 
 {% block title %} {% trans 'Ladder Score for' %} {{membership.username}} {% endblock %}
 
-{% block teaser %} <h2>{% trans 'Mai-Star Games' %}: {{membership.username}} <br/> {% trans 'Season' %} {{season}}</h2> {% endblock %}
+{% block teaser %} <h1>{% trans 'Mai-Star Games' %}: {{membership.username}} <br/> {% trans 'Season' %} {{season}}</h1> {% endblock %}
 
 {% block score_list %}
 <div class="grid_12">

src/maistar_ranking/templates/maistar_ranking/ranking_list.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n comments humanize %}
 
-{% block teaser %} <h2>{% trans 'Mai-Star Ranking' %} - {% trans 'Season' %} {{season}}</h2> {% endblock %}
+{% block teaser %} <h1>{% trans 'Mai-Star Ranking' %} - {% trans 'Season' %} {{season}}</h1> {% endblock %}
 
 {% block maincontent %}
 <main class="grid_12">

src/membership/templates/registration/login.html

@@ -0,0 +1,59 @@
+{% extends "base.html" %}
+
+{% load url from future %}
+{% load i18n %}
+
+{% block title %}{% trans '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>
+
+<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>
+
+
+
+<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 %}
+

src/membership/templates/registration/password_change_done.html

@@ -0,0 +1,9 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %}{% trans 'Password change successful' %}{% endblock %}
+
+{% block content %}
+<h2>{% trans 'Password change successful' %}</h2>
+<p class="info">{% trans 'Your password was changed.' %}</p>
+{% endblock %}

src/membership/templates/registration/password_change_form.html

@@ -0,0 +1,30 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %}{% trans 'Password change' %}{% endblock %}
+
+
+{% block callout %}
+<div id="callout">
+<h1>{% trans 'Password change' %}</h1>
+<p>{% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}</p>
+</div>
+{% endblock %}
+
+{% block content %}
+ <fieldset>
+  <legend>{% trans 'Password change' %}</legend>
+  <form method="post" action="" class="cmxform">
+   {%csrf_token%}
+   {% if form.errors %}<p class="error"> Es sind Fehler beim ändern des Passwortes aufgetreten</p>{% endif %}
+   {% include 'form.html' %}
+   <div class="buttonbar">
+    <button type="submit">
+     <span class="fa fa-key"></span> {% trans "Change Password" %}
+    </button>
+   </div>
+  </form>
+ </fieldset>
+</div>
+{% endblock %}
+

src/membership/templates/registration/password_reset_complete.html

@@ -0,0 +1,17 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %}{% trans 'Password reset complete' %}{% endblock %}
+
+{% block teaser %}<h1>{% trans 'Password reset complete' %}</h1>{% endblock %}
+
+{% block content %}
+<h2>{% trans 'Password reset complete' %}</h2>
+<p>{% trans "Your password has been set.  You may go ahead and log in now." %}</p>
+<p class="more_link">
+   
+<a href="{{ login_url }}" class="button"><span class="fa fa-sign-in"></span> {% trans 'Login' %}</a>
+    
+</p> 
+{% endblock %}
+

src/membership/templates/registration/password_reset_confirm.html

@@ -0,0 +1,31 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %}{% trans 'Enter new password' %}{% endblock %}
+
+{% block teaser %}<h1>{% trans 'Enter new password' %}</h1>{% endblock %}
+
+{% block maincontent %}
+{% if validlink %}
+<form action="" method="post">
+{% csrf_token %}
+  <p class="grid_6">{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
+
+  <fieldset class="grid_6">
+  <legend>{% trans 'Enter new password' %}</legend>
+  {% include 'form.html' %}
+  <p class="buttonbar">    
+     <button type="submit"><span class="fa fa-key"></span> {% trans 'Change my password' %}</button>
+  </p>
+</fieldset>
+</form>
+
+
+
+{% else %}
+<h2>{% trans 'Password reset unsuccessful' %}</h2>
+<p class="error">{% trans "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset." %}</p>
+{% endif %}
+
+{% endblock %}
+

src/membership/templates/registration/password_reset_done.html

@@ -0,0 +1,34 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %}{% trans 'Password reset successful' %}{% endblock %}
+
+{% block teaser %}<h1>{% trans 'Password reset successful' %}</h1>{% endblock %}
+
+
+{% block maincontent %}
+
+<div class="grid_12">
+<h2>{% trans 'Password reset successful' %}</h2>
+<p>Wir haben dir eine E-Mail mit Anweisungen zum Zurücksetzen deines Passwort an die angegebene E-Mail-Adresse geschickt.<br />
+Du solltest diese in Kürze erhalten.</p>
+</div>
+
+<h3 class="grid_12">E-Mail nicht angekommen?</h3>
+<div class="grid_4">
+<h4>Etwas Warten...</h4>
+<p>Einige Anti-Spam Techniken <strong>verzögern</strong> den <strong>Empfang</strong> von E-Mails. 
+  Bei solchen Postfächern kann der Empfang einzelner Mails <strong>bis zu 30 Minuten</strong> dauern.</p>
+</div>
+
+<div class="grid_4">
+<h4>Junk Mails prüfen</h4>
+<p>Bitte überprüfe den <em>"Junk"</em> bzw. <em>"SPAM"</em> Ordner deines Postfaches.
+  Automatisch generierte E-Mails werden leider sehr oft <strong>falsch</strong> von <strong>SPAM-Filtern</strong> geschluckt</p>
+</div>
+<div class="grid_4">
+<h4>Vorbei schauen</h4>
+<p>Bitte Überprüfe die Richigkeit deiner angegebenen <strong>E-Mail Adresse</strong>. Wenn deine angegebne <strong>E-Mail</strong> Adresse <strong>nicht</strong> mehr <strong>aktuell</strong> ist, trete mit uns bitte in <strong>persönlichen Kontakt</strong></p>
+</div>
+{% endblock %}
+

src/membership/templates/registration/password_reset_form.html

@@ -0,0 +1,30 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %}{% trans "Password reset" %}{% endblock %}
+
+{% block teaser %}<h1>{% trans "Password reset" %}</h1>{% endblock %}
+
+{% block maincontent %}
+
+<div class="grid_12">
+ <h2>Du hast dein Passwort vergessen?</h2>
+<p>Macht nichts!<br/>
+Solange die E-Mail Adresse von dir noch gültig ist, kannst du dein Passwort jederzeit wieder ändern.</p>
+</div>
+<div class="grid_6">
+<form action="{% url 'password_reset' %}" method="post">
+{% csrf_token %}
+  <fieldset>
+   <legend>E-Mail zusenden</legend>
+   {% include 'form.html' %}
+   <p class="buttonbar"><button type="submit"><span class="fa fa-envelope-o"></span> {% trans 'Transmit' %}</button></p>
+   </fieldset>
+</form>
+</div>
+<div class="grid_12">
+ <p>&nbsp;</p>
+ <p>Einfach deine E-Mail-Adresse eingeben und wir senden dir die Anweisungen zum Zurücksetzen deines Passworts.</p>
+</div>
+{% endblock %}
+