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.
This commit is contained in:
Christian Berg
2015-08-23 21:04:20 +02:00
parent 836eee983d
commit b9ec418e5e
25 changed files with 281 additions and 79 deletions

View File

@@ -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 %}