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:
59
src/membership/templates/registration/login.html
Normal file
59
src/membership/templates/registration/login.html
Normal 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 %}
|
||||
|
||||
@@ -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 %}
|
||||
@@ -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 %}
|
||||
|
||||
@@ -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 %}
|
||||
|
||||
@@ -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 %}
|
||||
|
||||
@@ -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 %}
|
||||
|
||||
@@ -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> </p>
|
||||
<p>Einfach deine E-Mail-Adresse eingeben und wir senden dir die Anweisungen zum Zurücksetzen deines Passworts.</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
Reference in New Issue
Block a user