Strona gÅÃ³wna diff --git a/src/catalogue/templates/catalogue/2022/book_detail.html b/src/catalogue/templates/catalogue/2022/book_detail.html index a3d50057f..9082d0102 100644 --- a/src/catalogue/templates/catalogue/2022/book_detail.html +++ b/src/catalogue/templates/catalogue/2022/book_detail.html @@ -6,7 +6,7 @@ {% load likes_book from social_tags %} -{% block content %} +{% block global-content %}

diff --git a/src/infopages/templates/infopages/2022/infopage.html b/src/infopages/templates/infopages/2022/infopage.html index 78679084f..9c14723e5 100644 --- a/src/infopages/templates/infopages/2022/infopage.html +++ b/src/infopages/templates/infopages/2022/infopage.html @@ -1,7 +1,7 @@ {% extends '2022/base.html' %} -{% block content %} +{% block global-content %}

Strona gÅÃ³wna diff --git a/src/newsletter/forms.py b/src/newsletter/forms.py index 4e42ae605..ff7005a79 100644 --- a/src/newsletter/forms.py +++ b/src/newsletter/forms.py @@ -50,6 +50,7 @@ WiÄcej informacji w polit class SubscribeForm(NewsletterForm): mailing = True agree_newsletter = None + required_css_class = 'required' email = EmailField(label=_('email address')) diff --git a/src/newsletter/templates/newsletter/2022/subscribe_form.html b/src/newsletter/templates/newsletter/2022/subscribe_form.html index d3b573bbe..f667c08d6 100644 --- a/src/newsletter/templates/newsletter/2022/subscribe_form.html +++ b/src/newsletter/templates/newsletter/2022/subscribe_form.html @@ -1,47 +1,25 @@ -{% extends "2022/base.html" %} +{% extends "2022/base_simple.html" %} {% load i18n %} {% load honeypot %} +{% block settings %} + {% load title %} + {% title form.newsletter.page_title %} +{% endblock %} -{% block content %} -

- -

- - -

- -

+ {{ form.data_processing }}

+ + + {% endblock %} diff --git a/src/newsletter/templates/newsletter/2022/subscribed.html b/src/newsletter/templates/newsletter/2022/subscribed.html index b93a4f69e..5396885ea 100644 --- a/src/newsletter/templates/newsletter/2022/subscribed.html +++ b/src/newsletter/templates/newsletter/2022/subscribed.html @@ -1,28 +1,18 @@ -{% extends "2022/base.html" %} +{% extends "2022/base_simple.html" %} {% load i18n %} -{% block content %} -

- -

- +{% block settings %} + {% load title %} + {% trans "Subscribed" as title %} + {% title title %} +{% endblock %} + + +{% block content %} +

- {% trans "You have subscribed to Wolne Lektury newsletter." %} -

+ {% trans "You have subscribed to Wolne Lektury newsletter." %} +

{% endblock %} diff --git a/src/newsletter/views.py b/src/newsletter/views.py index 11256ca8a..3c6355308 100644 --- a/src/newsletter/views.py +++ b/src/newsletter/views.py @@ -22,7 +22,6 @@ def subscribe_form(request, slug=''): if new_layout: template_name = 'newsletter/2022/subscribe_form.html' - form.template_name = '2022/form.html' else: template_name = 'newsletter/subscribe_form.html' return render(request, template_name, { diff --git a/src/wolnelektury/forms.py b/src/wolnelektury/forms.py index f04501f99..0fedd4a20 100644 --- a/src/wolnelektury/forms.py +++ b/src/wolnelektury/forms.py @@ -9,11 +9,12 @@ from newsletter.forms import NewsletterForm class WLAuthenticationForm(AuthenticationForm): - template_name = '2022/form.html' + required_css_class = 'required' # has to be this order, because otherwise the form is lacking fields class RegistrationForm(UserCreationForm, NewsletterForm): + required_css_class = 'required' data_processing_part2 = '''\ Dane sÄ przetwarzane w zakresie niezbÄdnym do prowadzenia serwisu, a takÅ¼e w celach prowadzenia statystyk, \ ewaluacji i sprawozdawczoÅci. W przypadku wyraÅ¼enia dodatkowej zgody adres e-mail zostanie wykorzystany \ diff --git a/src/wolnelektury/static/2022/more.scss b/src/wolnelektury/static/2022/more.scss index 06a462734..2743038d0 100644 --- a/src/wolnelektury/static/2022/more.scss +++ b/src/wolnelektury/static/2022/more.scss @@ -261,11 +261,9 @@ body.is-open { form { - .required { - label:before { - content: "* "; - color: #FF4C54; - } + label.required:before { + content: "* "; + color: #FF4C54; } .helptext { color: #808080; @@ -286,3 +284,89 @@ form { } } + + +.page-simple { + margin-bottom: 70px; + padding-bottom: 30px; + border-radius: 10px; + background: #E1F1F2; + display: flex; + flex-direction: column; + align-items: center; + + .white-box { + // for legacy templates + width: 100%; + display: flex; + flex-direction: column; + align-items: center; + } + + h1 { + width: 100%; + margin: 0 0 50px 0; + padding: 32px 45px; + border-radius: 10px 10px 0 0; + + font-style: italic; + font-weight: 300; + font-size: 48px; + line-height: 55px; + letter-spacing: -0.02em; + background: #083F4D; + color: #92BD39; + } + + > p, form { + min-width: 300px; + margin-left: 50px; + margin-right: 50px; + } + + button, input[type=submit] { + margin: 24px 0; + height: 56px; + background: #083F4D; + border-radius: 3px; + font-weight: 600; + font-size: 20px; + line-height: 25px; + display: flex; + align-items: center; + justify-content: center; + text-align: center; + color: #FFFFFF; + width: 340px; + } + + label { + font-style: normal; + font-weight: 600; + font-size: 15px; + line-height: 160%; + color: #083F4D; + margin-top: 24px; + } + + input { + display: block; + width: 100%; + height: 56px; + background: #FFFFFF; + color: black; + border: 1px solid #D5ECED; + border-radius: 3px; + transition: all cubic-bezier(0, 0, 0.2, 1) 250ms; + padding: 10px; + outline: 0; + } + input[type=checkbox], input[type=radio] { + display: inline; + float: left; + width: 1.2em; + height: 1.2em; + vertical-align: middle; + margin-right: 1em; + } +} diff --git a/src/wolnelektury/templates/2022/base_real.html b/src/wolnelektury/templates/2022/base_real.html index 5993bec59..aa8588156 100644 --- a/src/wolnelektury/templates/2022/base_real.html +++ b/src/wolnelektury/templates/2022/base_real.html @@ -2,13 +2,17 @@ {% load pipeline %} {% load static %} {% load piwik_tags %} +{% load title %} + +{% block settings %} +{% endblock %} - WolneLektury.pl + {% if title %}{{ title }} | {% endif %}WolneLektury.pl {% stylesheet '2022' %} @@ -22,7 +26,18 @@ {% include '2022/header.html' %} - {% block content %}{% endblock %} + {% block global-content %} +

+ +

+ {% block main %}{% endblock %} +

+ {% endblock %} {% include '2022/footer.html' %} diff --git a/src/wolnelektury/templates/2022/base_simple.html b/src/wolnelektury/templates/2022/base_simple.html new file mode 100644 index 000000000..481d81436 --- /dev/null +++ b/src/wolnelektury/templates/2022/base_simple.html @@ -0,0 +1,13 @@ +{% extends "2022/base.html" %} + + +{% block main %} +

+ {% block body %} + {% block content %} +

+ {% block simple-content %}{% endblock %} + {% endblock %} + {% endblock %} +

+{% endblock main %} diff --git a/src/wolnelektury/templates/2022/form.html b/src/wolnelektury/templates/2022/form.html deleted file mode 100644 index 156985b08..000000000 --- a/src/wolnelektury/templates/2022/form.html +++ /dev/null @@ -1,19 +0,0 @@ -{% if errors %} - {{ errors }} - {% if not fields %} - {% endif %} -{% endif %} -{% for field in hidden_fields %}{{ field }}{% endfor %} -{% for field, errors in fields %} -

- {{ errors }} - {% if field.label %}{{ field.label_tag }}{% endif %} - {# * #} - {{ field }} - {# field.help_text|safe #} -

-{% endfor %} diff --git a/src/wolnelektury/templates/account/base.html b/src/wolnelektury/templates/account/base.html index a2ddbe685..e9980c9cf 100644 --- a/src/wolnelektury/templates/account/base.html +++ b/src/wolnelektury/templates/account/base.html @@ -1,4 +1,4 @@ -{% extends "site_base.html" %} +{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,site_base.html" %} {% block body %}

diff --git a/src/wolnelektury/templates/openid/login.html b/src/wolnelektury/templates/openid/login.html index c98d7c7f0..10294d909 100644 --- a/src/wolnelektury/templates/openid/login.html +++ b/src/wolnelektury/templates/openid/login.html @@ -1,19 +1,32 @@ -{% extends "site_base.html" %} +{% extends "openid/base.html" %} + {% load i18n %} +{% block settings %} + {% load title %} + {% trans "OpenID Sign In" as title %} + {% title title %} +{% endblock %} + + +{% block breadcrumbs %} + {% trans "Sign In" %} + {{ block.super }} +{% endblock %} + -{% block head_title %}{% trans "OpenID Sign In" %}{% endblock %} +{% block head_title %}{% endblock %} {% block body %}

{% trans 'OpenID Sign In' %}

{% endblock %} diff --git a/src/wolnelektury/templates/registration/login.html b/src/wolnelektury/templates/registration/login.html index 691d3db3b..a962aec26 100644 --- a/src/wolnelektury/templates/registration/login.html +++ b/src/wolnelektury/templates/registration/login.html @@ -1,50 +1,37 @@ -{% extends "2022/base.html" %} +{% extends "2022/base_simple.html" %} {% load i18n %} +{% block settings %} + {% load title %} + {% trans 'Sign In' as title %} + {% title title %} +{% endblock %} + + +{% block sbreadcrumbs %} + Zaloguj siÄ +{% endblock %} + +{% block stitle %}Zaloguj siÄ{% endblock %} + {% block content %} -

- -

- - - {% if USE_OPENID %} -

{% trans "Sign in using:" %}

- -

- {% include "socialaccount/snippets/provider_list.html" %} - - - {% include "socialaccount/snippets/login_extra.html" %} - {% endif %} - -

+ + {% endblock %} diff --git a/src/wolnelektury/templates/registration/register.html b/src/wolnelektury/templates/registration/register.html new file mode 100644 index 000000000..33ad8751f --- /dev/null +++ b/src/wolnelektury/templates/registration/register.html @@ -0,0 +1,30 @@ +{% extends "2022/base_simple.html" %} +{% load i18n %} + + +{% block settings %} + {% load title %} + {% trans "Register" as title %} + {% title title %} +{% endblock %} + + +{% block simple-content %} + +{% endblock %} diff --git a/src/wolnelektury/templates/socialaccount/base.html b/src/wolnelektury/templates/socialaccount/base.html new file mode 100644 index 000000000..934f4a621 --- /dev/null +++ b/src/wolnelektury/templates/socialaccount/base.html @@ -0,0 +1,7 @@ +{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,account/base.html" %} + + +{% block breadcrumbs %} + {% block head_title %}{% endblock %} + {{ block.super }} +{% endblock %} diff --git a/src/wolnelektury/templatetags/title.py b/src/wolnelektury/templatetags/title.py new file mode 100644 index 000000000..47a587653 --- /dev/null +++ b/src/wolnelektury/templatetags/title.py @@ -0,0 +1,9 @@ +from django.template import Library + + +register = Library() + +@register.simple_tag(takes_context=True) +def title(context, t=None): + context.dicts[0]['title'] = t + return '' diff --git a/src/wolnelektury/views.py b/src/wolnelektury/views.py index 593a7ba22..872921602 100644 --- a/src/wolnelektury/views.py +++ b/src/wolnelektury/views.py @@ -12,6 +12,7 @@ from django.contrib.auth.decorators import login_required from django.contrib.auth.forms import AuthenticationForm from django.contrib.auth.views import LoginView from django.core.cache import cache +from django.views.generic import FormView from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render from django.utils.translation import gettext_lazy as _ @@ -102,6 +103,13 @@ class LoginFormView(AjaxableFormView): auth.login(request, form.get_user()) +class WLRegisterView(FormView): + form_class = RegistrationForm + template_name = 'registration/register.html' + +wl_register_view = WLRegisterView.as_view() + + class RegisterFormView(AjaxableFormView): form_class = RegistrationForm template = "auth/register.html" @@ -113,6 +121,9 @@ class RegisterFormView(AjaxableFormView): honeypot = True def __call__(self, request): + if request.EXPERIMENTS['layout'].value: + return wl_register_view(request) + if request.user.is_authenticated: return self.redirect_or_refresh( request, '/',

{{ page_title }}

{{ title }}

{{ page_title }}

{{ title }}

{{ title }}

{% trans 'OpenID Sign In' %}

Zaloguj siÄ

{% trans "Sign in using:" %}

{{ title }}

{% trans "Sign in using:" %}

{% trans "Sign in using:" %}

Zaloguj siÄ