Changed membership forms, text can now be changed via admin tool.
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
from django.core.cache import cache
|
||||
|
||||
from . import models
|
||||
|
||||
from utils import STATUS_PUBLISHED
|
||||
|
||||
def content_menus(request):
|
||||
""" Generate the menu tree and add these info to the template context.
|
||||
@@ -25,7 +25,9 @@ def content_menus(request):
|
||||
# erzeuge das Top-Level Menü
|
||||
top_level_pages = cache.get('top_level_pages')
|
||||
if top_level_pages is None:
|
||||
top_level_pages = models.Page.objects.filter(parent=None)
|
||||
top_level_pages = models.Page.objects.filter(
|
||||
parent=None, status=STATUS_PUBLISHED
|
||||
)
|
||||
top_level_pages = top_level_pages.exclude(slug='index')
|
||||
top_level_pages = top_level_pages.order_by('position')
|
||||
top_level_pages = top_level_pages.prefetch_related('subpages')
|
||||
|
||||
Binary file not shown.
@@ -7,8 +7,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: kasu.membership\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2018-05-03 09:36+0200\n"
|
||||
"PO-Revision-Date: 2018-05-03 09:39+0105\n"
|
||||
"POT-Creation-Date: 2018-05-04 11:29+0200\n"
|
||||
"PO-Revision-Date: 2018-05-04 11:31+0105\n"
|
||||
"Last-Translator: b'Christian Berg <kasu@xendynastie.at>'\n"
|
||||
"Language-Team: Kasu <verein@kasu.at>\n"
|
||||
"Language: de\n"
|
||||
@@ -88,26 +88,26 @@ msgid ""
|
||||
"yet."
|
||||
msgstr "Diese Angabe wird für eine Mitgliedschaft benötigt, bitte ausfüllen."
|
||||
|
||||
#: forms.py:61
|
||||
#: forms.py:68
|
||||
msgid "password"
|
||||
msgstr "Passwort"
|
||||
|
||||
#: forms.py:63
|
||||
#: forms.py:70
|
||||
msgid "password (again)"
|
||||
msgstr "Passwort (wiederholen)"
|
||||
|
||||
#: forms.py:85
|
||||
#: forms.py:92
|
||||
msgid "This username is already taken. Please choose another."
|
||||
msgstr ""
|
||||
"Diesen Benutzername ist schon vergeben. Bitte einen anderen auswählen."
|
||||
|
||||
#: forms.py:92
|
||||
#: forms.py:99
|
||||
msgid ""
|
||||
"This email address is already in use. Please supply a different "
|
||||
"email address."
|
||||
msgstr "Die E-Mail Adresse wird schon verwendet. Bitte eine andere angeben."
|
||||
|
||||
#: forms.py:102
|
||||
#: forms.py:109
|
||||
msgid "The two password fields didn't match."
|
||||
msgstr "Die beiden Passwörter passen nicht."
|
||||
|
||||
@@ -383,35 +383,22 @@ msgid "Save"
|
||||
msgstr "Speichern"
|
||||
|
||||
#: templates/membership/register_form.html:4
|
||||
#: templates/membership/register_form.html:7
|
||||
msgid "Registration"
|
||||
msgstr "Registrieren"
|
||||
|
||||
#: templates/membership/register_form.html:9
|
||||
msgid ""
|
||||
"After you've provided your account data, you'll receive\n"
|
||||
" an email asking you to verify your email address. You have to click on the\n"
|
||||
" link in this verification email to confirm your email address, otherwise\n"
|
||||
" your can't login."
|
||||
msgstr ""
|
||||
"Nach dem du deine Daten eingegeben hast, wirst du eine E-Mail zur Bestätigung bekommen.\n"
|
||||
"Bitte klicke auf den Link in dieser E-Mail zur Verifizierung, erst dann ist die Anmeldung möglich."
|
||||
#: templates/membership/register_form.html:10
|
||||
msgid "Login crendentials"
|
||||
msgstr "Anmeldedaten"
|
||||
|
||||
#: templates/membership/register_form.html:20
|
||||
#: templates/registration/login.html:41
|
||||
msgid "login"
|
||||
msgstr "Anmelden"
|
||||
|
||||
#: templates/membership/register_form.html:26
|
||||
#: templates/membership/register_form.html:16
|
||||
msgid "Club membership"
|
||||
msgstr "Vereinsmitgliedschaft"
|
||||
|
||||
#: templates/membership/register_form.html:33
|
||||
#: templates/membership/register_form.html:27
|
||||
msgid "reset"
|
||||
msgstr "Zurücksetzen"
|
||||
|
||||
#: templates/membership/register_form.html:35
|
||||
#: templates/registration/login.html:35
|
||||
#: templates/membership/register_form.html:29
|
||||
msgid "register"
|
||||
msgstr "Registrieren"
|
||||
|
||||
@@ -421,76 +408,42 @@ msgstr "Registrieren"
|
||||
msgid "Activation sent"
|
||||
msgstr "Aktivierung wurde zugesendet"
|
||||
|
||||
#: templates/registration/login.html:4 templates/registration/login.html:11
|
||||
#: templates/registration/login.html:53
|
||||
#: templates/registration/logged_out.html:16
|
||||
#: templates/registration/login.html:16
|
||||
#| msgid ""
|
||||
#| "Your username and password didn't match. Please try\n"
|
||||
#| " again."
|
||||
msgid "Your username and password didn't match. Please try again."
|
||||
msgstr "Anmeldung fehlgeschlagen, bitte Benutzername und Passwort überprüfen."
|
||||
|
||||
#: templates/registration/logged_out.html:19
|
||||
#: templates/registration/login.html:19
|
||||
msgid "Forgot your Password?"
|
||||
msgstr "Passwort vergessen?"
|
||||
|
||||
#: templates/registration/logged_out.html:23
|
||||
#: templates/registration/login.html:23
|
||||
#: templates/registration/password_reset_complete.html:13
|
||||
msgid "Login"
|
||||
msgstr "Anmelden"
|
||||
|
||||
#: templates/registration/login.html:17
|
||||
msgid "Have you already registered?"
|
||||
msgstr "Bereits registriert?"
|
||||
#: templates/registration/logged_out.html:29
|
||||
#: templates/registration/login.html:29
|
||||
msgid "or"
|
||||
msgstr "oder"
|
||||
|
||||
#: templates/registration/login.html:18
|
||||
msgid ""
|
||||
"\n"
|
||||
" <p>As a registered member you can:</p>\n"
|
||||
" <ul>\n"
|
||||
" <li>leave comments on this page.</li>\n"
|
||||
" <li>subscribe to our Newsletter</li>\n"
|
||||
" <li>apply to a membership to our club</li>\n"
|
||||
" <li>club-members have access to our ranking-system</li>\n"
|
||||
" </ul>\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"\n"
|
||||
"<p>Als registrierter auf dieser Seite kannst du:</p>\n"
|
||||
"<ul>\n"
|
||||
" <li>Kommentare auf dieser Seite hinterlassen.</li>\n"
|
||||
" <li>Dich für unseren Newsletter anmelden</li>\n"
|
||||
" <li>Mitglied in unserem Verein werden</li>\n"
|
||||
" <li>Vereinsmitglieder haben auch vollen Zugang zu unserem Ranking System</li>\n"
|
||||
"</ul>"
|
||||
|
||||
#: templates/registration/login.html:27
|
||||
msgid ""
|
||||
"\n"
|
||||
" <p>You can register here with your Google, or Facebook account.\n"
|
||||
" If you don't own such an account, or do not want to use it for\n"
|
||||
" authentication,\n"
|
||||
" you can fill out our registration form.</p>\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"\n"
|
||||
"<p>Du kannst dich auch über deinen Facebook, Google, oder Twitter Account anmelden.\n"
|
||||
"Wenn du so etwas nicht besitzt, oder nicht verwenden möchtest, \n"
|
||||
"kannst du auch das Registrierungsformular ausfüllen.</p>"
|
||||
|
||||
#: templates/registration/login.html:45
|
||||
msgid ""
|
||||
"Your username and password didn't match. Please try\n"
|
||||
" again."
|
||||
msgstr ""
|
||||
"Benutzername und Passwort stimmen nicht überein. Bitte noch einmal "
|
||||
"versuchen."
|
||||
|
||||
#: templates/registration/login.html:50
|
||||
msgid "Forgot your Password?"
|
||||
msgstr "Passwort vergessen?"
|
||||
|
||||
#: templates/registration/login.html:60
|
||||
msgid "or login with an existing Account"
|
||||
msgstr "oder über einen existierenden Account anmelden"
|
||||
|
||||
#: templates/registration/login.html:63
|
||||
#: templates/registration/logged_out.html:33
|
||||
#: templates/registration/login.html:33
|
||||
msgid "Login with Facebook"
|
||||
msgstr "Über Facebook anmelden"
|
||||
|
||||
#: templates/registration/login.html:66
|
||||
#: templates/registration/logged_out.html:35
|
||||
#: templates/registration/login.html:35
|
||||
msgid "Login with Twitter"
|
||||
msgstr "Über Twitter anmelden"
|
||||
|
||||
#: templates/registration/login.html:69
|
||||
#: templates/registration/logged_out.html:37
|
||||
#: templates/registration/login.html:37
|
||||
msgid "Login with Google"
|
||||
msgstr "Über Google Anmelden"
|
||||
|
||||
@@ -588,6 +541,57 @@ msgstr "Benutzerprofil erfolgreich geändert."
|
||||
msgid "No Membership found matching the query"
|
||||
msgstr "Kein Mitglied gefunden welche der Anfrage entspricht"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "After you've provided your account data, you'll receive\n"
|
||||
#~ " an email asking you to verify your email address. You have to click on the\n"
|
||||
#~ " link in this verification email to confirm your email address, otherwise\n"
|
||||
#~ " your can't login."
|
||||
#~ msgstr ""
|
||||
#~ "Nach dem du deine Daten eingegeben hast, wirst du eine E-Mail zur Bestätigung bekommen.\n"
|
||||
#~ "Bitte klicke auf den Link in dieser E-Mail zur Verifizierung, erst dann ist die Anmeldung möglich."
|
||||
|
||||
#~ msgid "login"
|
||||
#~ msgstr "Anmelden"
|
||||
|
||||
#~ msgid "Have you already registered?"
|
||||
#~ msgstr "Bereits registriert?"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "\n"
|
||||
#~ " <p>As a registered member you can:</p>\n"
|
||||
#~ " <ul>\n"
|
||||
#~ " <li>leave comments on this page.</li>\n"
|
||||
#~ " <li>subscribe to our Newsletter</li>\n"
|
||||
#~ " <li>apply to a membership to our club</li>\n"
|
||||
#~ " <li>club-members have access to our ranking-system</li>\n"
|
||||
#~ " </ul>\n"
|
||||
#~ " "
|
||||
#~ msgstr ""
|
||||
#~ "\n"
|
||||
#~ "<p>Als registrierter auf dieser Seite kannst du:</p>\n"
|
||||
#~ "<ul>\n"
|
||||
#~ " <li>Kommentare auf dieser Seite hinterlassen.</li>\n"
|
||||
#~ " <li>Dich für unseren Newsletter anmelden</li>\n"
|
||||
#~ " <li>Mitglied in unserem Verein werden</li>\n"
|
||||
#~ " <li>Vereinsmitglieder haben auch vollen Zugang zu unserem Ranking System</li>\n"
|
||||
#~ "</ul>"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "\n"
|
||||
#~ " <p>You can register here with your Google, or Facebook account.\n"
|
||||
#~ " If you don't own such an account, or do not want to use it for\n"
|
||||
#~ " authentication,\n"
|
||||
#~ " you can fill out our registration form.</p>\n"
|
||||
#~ " "
|
||||
#~ msgstr ""
|
||||
#~ "\n"
|
||||
#~ "<p>Du kannst dich auch über deinen Facebook, Google, oder Twitter Account anmelden.\n"
|
||||
#~ "Wenn du so etwas nicht besitzt, oder nicht verwenden möchtest, \n"
|
||||
#~ "kannst du auch das Registrierungsformular ausfüllen.</p>"
|
||||
|
||||
#~ msgid "or login with an existing Account"
|
||||
#~ msgstr "oder über einen existierenden Account anmelden"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "For your membership, we need this. Please fill out this field "
|
||||
#~ "yet."
|
||||
|
||||
@@ -3,21 +3,11 @@
|
||||
|
||||
{% block title %}{% trans "Registration"%}{% endblock %}
|
||||
|
||||
{% block teaser%}
|
||||
<h1>{% trans "Registration"%}</h1>
|
||||
<div id="teaser_text">
|
||||
{% blocktrans %}After you've provided your account data, you'll receive
|
||||
an email asking you to verify your email address. You have to click on the
|
||||
link in this verification email to confirm your email address, otherwise
|
||||
your can't login.{% endblocktrans %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block maincontent %}
|
||||
<form method="post" action="{% url 'membership-register' %}">
|
||||
{% csrf_token %}
|
||||
<fieldset class="grid_7">
|
||||
<legend>{% trans "login"%}</legend>
|
||||
<legend>{% trans "Login crendentials"%}</legend>
|
||||
{% get_fieldset "username, email, password1, password2, recaptcha" from form as form1 %}
|
||||
{% with form1 as form %}{% include "form.html" %}{% endwith %}
|
||||
</fieldset>
|
||||
@@ -28,22 +18,9 @@
|
||||
{% with form2 as form %}{% include "form.html" %}{% endwith %}
|
||||
</fieldset>
|
||||
|
||||
<p class="warning">
|
||||
<strong>Datenschutzhinweis:</strong>
|
||||
<ul>
|
||||
<li>Der angegebene Benutzername wird auf dieser Homepage öffentlich
|
||||
gemacht.</li>
|
||||
<li>Die E-Mail Adresse wird nur für die Verifizierung und dringende
|
||||
persönliche Mitteilungen verwendet.</li>
|
||||
<li>Die Passwörter werden nach modernsten Sicherheitsstandards
|
||||
verschlüsselt
|
||||
abgespeichert und sind nach aktuellen Status nicht knackbar.</li>
|
||||
<li>Alle anderen Angaben sind nur für Vereinsmitglieder von Belang und
|
||||
werden vertraulich behandelt. Nur Vorstandsmitglieder haben Zugriff
|
||||
auf diese Daten und sie werden nicht ohne vorheriger Genemigung mit
|
||||
anderen Personen oder Organisationen geteilt.</li>
|
||||
|
||||
</p>
|
||||
<div class="grid_12">
|
||||
{{ current_page.content }}
|
||||
</div>
|
||||
|
||||
<div class="grid_12">
|
||||
<p class="buttonbar">
|
||||
|
||||
43
src/membership/templates/registration/logged_out.html
Executable file
43
src/membership/templates/registration/logged_out.html
Executable file
@@ -0,0 +1,43 @@
|
||||
{% extends "base.html" %}{% load i18n %}
|
||||
|
||||
{% block description %}Anmelden auf Kasu.at{% endblock %}
|
||||
|
||||
{% block extra_head %}
|
||||
<link rel="canonical" href="{% url 'login' %}"/>{% endblock %}
|
||||
|
||||
|
||||
{% block maincontent %}
|
||||
<form method="post" action="{% url 'login' %}">
|
||||
{% csrf_token %}
|
||||
<div class="grid_5">
|
||||
<fieldset>
|
||||
<legend> </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>
|
||||
<div class="grid_2">
|
||||
<h2>{% trans 'or' %}</h2>
|
||||
</div>
|
||||
<div class="grid_5">
|
||||
<a class="button" rel="nofollow" href="{% url 'social:begin' 'facebook' %}">
|
||||
<span class="fa fa-facebook fa-2x"></span> {% trans 'Login with Facebook' %}</a><br/>
|
||||
<a class="button" rel="nofollow" href="{% url 'social:begin' 'twitter' %}">
|
||||
<span class="fa fa-twitter fa-2x"></span> {% trans 'Login with Twitter' %}</a><br/>
|
||||
<a class="button" rel="nofollow" href="{% url 'social:begin' 'google-oauth2' %}">
|
||||
<span class="fa fa-google-plus fa-2x"></span> {% trans 'Login with Google' %}</a>
|
||||
</div>
|
||||
</form>
|
||||
<div class="grid_12">
|
||||
{{ current_page.content }}
|
||||
</div>{% endblock %}
|
||||
|
||||
@@ -1,73 +1,43 @@
|
||||
{% extends "base.html" %}
|
||||
{% load i18n %}
|
||||
{% extends "base.html" %}{% load i18n %}
|
||||
|
||||
{% block title %}{% trans 'Login' %}{% endblock %}
|
||||
{% block description %}Anmelden auf Kasu.at{% endblock %}
|
||||
|
||||
{% block extra_head %}
|
||||
<link rel="canonical" href="{% url 'login' %}"/>
|
||||
{% endblock %}
|
||||
<link rel="canonical" href="{% url 'login' %}"/>{% endblock %}
|
||||
|
||||
|
||||
{% block teaser %}<h1>{% trans 'Login' %}</h1>{% endblock %}
|
||||
{% block maincontent %}
|
||||
<form method="post" action="{% url '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="grid_5">
|
||||
<fieldset>
|
||||
<legend> </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 type="submit">
|
||||
<span class="fa fa-sign-in"></span> {% trans 'Login' %}
|
||||
</button>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
|
||||
</div>
|
||||
<div class="grid_2">
|
||||
<h2>{% trans 'or' %}</h2>
|
||||
</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>
|
||||
<a class="button" rel="nofollow" href="{% url 'social:begin' 'facebook' %}">
|
||||
<span class="fa fa-facebook fa-2x"></span> {% trans 'Login with Facebook' %}</a><br/>
|
||||
<a class="button" rel="nofollow" href="{% url 'social:begin' 'twitter' %}">
|
||||
<span class="fa fa-twitter fa-2x"></span> {% trans 'Login with Twitter' %}</a><br/>
|
||||
<a class="button" rel="nofollow" href="{% url 'social:begin' 'google-oauth2' %}">
|
||||
<span class="fa fa-google-plus fa-2x"></span> {% trans 'Login with Google' %}</a>
|
||||
</div>
|
||||
</form>
|
||||
{% endblock %}
|
||||
<div class="grid_12">
|
||||
{{ current_page.content }}
|
||||
</div>{% endblock %}
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ from django.conf.urls import url
|
||||
from . import views
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^$',views.MembershipDetail.as_view()),
|
||||
url(r'^activate/(?P<activation_key>[\d\w]+)/$',
|
||||
views.ActivateRegistration.as_view(),
|
||||
name='membership-activate-registration'),
|
||||
|
||||
Reference in New Issue
Block a user