From 5a32dbf0afcacb068bdbf525b489e1023cfe7139 Mon Sep 17 00:00:00 2001 From: Xeniac Date: Fri, 4 May 2018 11:32:33 +0200 Subject: [PATCH] Changed membership forms, text can now be changed via admin tool. --- src/content/context_processors.py | 6 +- .../locale/de/LC_MESSAGES/django.po | 174 +++++++++--------- .../templates/membership/register_form.html | 31 +--- .../templates/registration/logged_out.html | 43 +++++ .../templates/registration/login.html | 92 ++++----- src/membership/urls.py | 1 + 6 files changed, 172 insertions(+), 175 deletions(-) create mode 100755 src/membership/templates/registration/logged_out.html diff --git a/src/content/context_processors.py b/src/content/context_processors.py index 1cd1456..93260ac 100644 --- a/src/content/context_processors.py +++ b/src/content/context_processors.py @@ -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') diff --git a/src/membership/locale/de/LC_MESSAGES/django.po b/src/membership/locale/de/LC_MESSAGES/django.po index a922f6c..e15a9d4 100644 --- a/src/membership/locale/de/LC_MESSAGES/django.po +++ b/src/membership/locale/de/LC_MESSAGES/django.po @@ -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 '\n" "Language-Team: Kasu \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" -"

As a registered member you can:

\n" -"
    \n" -"
  • leave comments on this page.
    • \n" -"
  • subscribe to our Newsletter
    • \n" -"
  • apply to a membership to our club
    • \n" -"
  • club-members have access to our ranking-system
    • \n" -"
\n" -" " -msgstr "" -"\n" -"

Als registrierter auf dieser Seite kannst du:

\n" -"
    \n" -"
  • Kommentare auf dieser Seite hinterlassen.
    • \n" -"
  • Dich für unseren Newsletter anmelden
    • \n" -"
  • Mitglied in unserem Verein werden
    • \n" -"
  • Vereinsmitglieder haben auch vollen Zugang zu unserem Ranking System
    • \n" -"
" - -#: templates/registration/login.html:27 -msgid "" -"\n" -"

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.

\n" -" " -msgstr "" -"\n" -"

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.

" - -#: 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" +#~ "

As a registered member you can:

\n" +#~ "
    \n" +#~ "
  • leave comments on this page.
    • \n" +#~ "
  • subscribe to our Newsletter
    • \n" +#~ "
  • apply to a membership to our club
    • \n" +#~ "
  • club-members have access to our ranking-system
    • \n" +#~ "
\n" +#~ " " +#~ msgstr "" +#~ "\n" +#~ "

Als registrierter auf dieser Seite kannst du:

\n" +#~ "
    \n" +#~ "
  • Kommentare auf dieser Seite hinterlassen.
    • \n" +#~ "
  • Dich für unseren Newsletter anmelden
    • \n" +#~ "
  • Mitglied in unserem Verein werden
    • \n" +#~ "
  • Vereinsmitglieder haben auch vollen Zugang zu unserem Ranking System
    • \n" +#~ "
" + +#~ msgid "" +#~ "\n" +#~ "

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.

\n" +#~ " " +#~ msgstr "" +#~ "\n" +#~ "

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.

" + +#~ 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." diff --git a/src/membership/templates/membership/register_form.html b/src/membership/templates/membership/register_form.html index 43e8842..f28cbd2 100644 --- a/src/membership/templates/membership/register_form.html +++ b/src/membership/templates/membership/register_form.html @@ -3,21 +3,11 @@ {% block title %}{% trans "Registration"%}{% endblock %} -{% block teaser%} -

{% trans "Registration"%}

-
-{% 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 %} -
-{% endblock %} - {% block maincontent %}
{% csrf_token %}
- {% trans "login"%} + {% trans "Login crendentials"%} {% get_fieldset "username, email, password1, password2, recaptcha" from form as form1 %} {% with form1 as form %}{% include "form.html" %}{% endwith %}
@@ -28,22 +18,9 @@ {% with form2 as form %}{% include "form.html" %}{% endwith %} -

- Datenschutzhinweis: -

    -
  • Der angegebene Benutzername wird auf dieser Homepage öffentlich - gemacht.
    • -
  • Die E-Mail Adresse wird nur für die Verifizierung und dringende - persönliche Mitteilungen verwendet.
    • -
  • Die Passwörter werden nach modernsten Sicherheitsstandards - verschlüsselt - abgespeichert und sind nach aktuellen Status nicht knackbar.
    • -
  • 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.
    • - -

    +
    + {{ current_page.content }} +

    diff --git a/src/membership/templates/registration/logged_out.html b/src/membership/templates/registration/logged_out.html new file mode 100755 index 0000000..a542834 --- /dev/null +++ b/src/membership/templates/registration/logged_out.html @@ -0,0 +1,43 @@ +{% extends "base.html" %}{% load i18n %} + +{% block description %}Anmelden auf Kasu.at{% endblock %} + +{% block extra_head %} +{% endblock %} + + +{% block maincontent %} + + {% csrf_token %} +

    +
    +   + {% csrf_token %} {% include 'form.html' %} {% if form.errors %} +

    {% blocktrans %}Your username and password didn't match. Please try again.{% endblocktrans %}

    + {% endif %} +

    + {% trans 'Forgot your Password?'%} +

    +
    + +
    +
    +
    +
    +

    {% trans 'or' %}

    +
    +
    + + {% trans 'Login with Facebook' %}
    + + {% trans 'Login with Twitter' %}
    + + {% trans 'Login with Google' %} +
    + +
    + {{ current_page.content }} +
    {% endblock %} + diff --git a/src/membership/templates/registration/login.html b/src/membership/templates/registration/login.html index 47f3904..a542834 100755 --- a/src/membership/templates/registration/login.html +++ b/src/membership/templates/registration/login.html @@ -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 %} - -{% endblock %} +{% endblock %} + -{% block teaser %}

    {% trans 'Login' %}

    {% endblock %} {% block maincontent %}
    -

    Auf der Seite Anmelden

    - -
    -

    {% trans "Have you already registered?" %}

    - {% blocktrans %} -

    As a registered member you can:

    -
      -
    • leave comments on this page.
      • -
    • subscribe to our Newsletter
      • -
    • apply to a membership to our club
      • -
    • club-members have access to our ranking-system
      • -
    - {% endblocktrans %} - {% blocktrans %} -

    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.

    - {% endblocktrans %} -

    - {%trans "register"%}

    -
    - - {% csrf_token %} -
    - {% trans 'login' %} - {% csrf_token %} - {% include 'form.html' %} - {% if form.errors %} -

    {% blocktrans %}Your username and password didn't match. Please try - again.{% endblocktrans %}

    - {% endif %} - -

    - {% trans 'Forgot your Password?'%}

    -
    - -
    -
    - -
    -

    {% trans "or login with an existing Account" %}

    - - - +
    +   + {% csrf_token %} {% include 'form.html' %} {% if form.errors %} +

    {% blocktrans %}Your username and password didn't match. Please try again.{% endblocktrans %}

    + {% endif %} +

    + {% trans 'Forgot your Password?'%} +

    +
    + +
    +
    +
    +
    +

    {% trans 'or' %}

    +
    +
    + + {% trans 'Login with Facebook' %}
    + + {% trans 'Login with Twitter' %}
    + + {% trans 'Login with Google' %}
    -{% endblock %} +
    + {{ current_page.content }} +
    {% endblock %} diff --git a/src/membership/urls.py b/src/membership/urls.py index 7cf1a3b..4547ae8 100644 --- a/src/membership/urls.py +++ b/src/membership/urls.py @@ -9,6 +9,7 @@ from django.conf.urls import url from . import views urlpatterns = [ + url(r'^$',views.MembershipDetail.as_view()), url(r'^activate/(?P[\d\w]+)/$', views.ActivateRegistration.as_view(), name='membership-activate-registration'),