diff --git a/main/templates/main/base.html b/main/templates/main/base.html index 077b6903745d929b10a785a52fd9bd71823b8067..64c7cdc4ad6ba52ae847b7c1ce30df3363798f8f 100644 --- a/main/templates/main/base.html +++ b/main/templates/main/base.html @@ -1,4 +1,5 @@ {% load static wagtailcore_tags wagtailimages_tags wagtailmetadata_tags %} + <!doctype html> <html lang="cs"> <head> diff --git a/main/templates/main/includes/atoms/buttons/round_button.html b/main/templates/main/includes/atoms/buttons/round_button.html index 1803fb2822298aa59f59bb9dfc2db9822b745095..3e978f06fedfc5c80aca069b7b70e2378d46f9f3 100644 --- a/main/templates/main/includes/atoms/buttons/round_button.html +++ b/main/templates/main/includes/atoms/buttons/round_button.html @@ -1,5 +1,5 @@ -<a - href="{% if url %}{{ url }}{% else %}{% endif %}" +<{% block element_opener %}a{% endblock %} + {% block href %}href="{% if url %}{{ url }}{% else %}{% endif %}"{% endblock %} class=" flex items-center group rounded-full font-condensed uppercase font-semibold tracking-normal hover:no-underline @@ -19,4 +19,4 @@ > <span class="group-hover:-translate-x-2 duration-200">{{ button_text }}</span> <span class="opacity-0 group-hover:opacity-100 duration-200">{% include 'main/includes/atoms/icons/arrow.html' %}</span> -</a> +</{% block element_closer %}a{% endblock %}> diff --git a/main/templates/main/includes/atoms/buttons/round_button_form.html b/main/templates/main/includes/atoms/buttons/round_button_form.html new file mode 100644 index 0000000000000000000000000000000000000000..b53507bcd8af3e9388fc3620db8d4ed6a9568edf --- /dev/null +++ b/main/templates/main/includes/atoms/buttons/round_button_form.html @@ -0,0 +1,6 @@ +{% extends 'main/includes/atoms/buttons/round_button.html' %} + +{% block element_opener %}button{% endblock %} +{% block element_closer %}button{% endblock %} + +{% block href %}{% endblock %} diff --git a/main/templates/main/includes/molecules/contact/contact_footer_box.html b/main/templates/main/includes/molecules/contact/contact_footer_box.html index b19a0b56d64f273538a2f86265b0613eefb550b7..55a0679529aed0d0e7bd8d28f9f4aeb5e126a325 100644 --- a/main/templates/main/includes/molecules/contact/contact_footer_box.html +++ b/main/templates/main/includes/molecules/contact/contact_footer_box.html @@ -1,9 +1,11 @@ +{% load static %} + <div class="flex grow flex-col gap-0 md:flex-row md:gap-8"> <div class="md:shrink-0"> <a href="{{ url }}"> <img class="h-36 w-36 object-cover rounded-full" - src="{{ image.url }}" + src="{% if image %}{{ image.url }}{% else %}{% static 'shared/img/unknown_pirate_160x160.jpg' %}{% endif %}" alt="{{ name }}" > </a> diff --git a/main/templates/main/includes/organisms/layout/messages.html b/main/templates/main/includes/organisms/layout/messages.html index 35653d9f1dd85453f335a877bd44de8ccf12a668..496ac48d7390c7fffe25d630fcbd096ea0a19672 100644 --- a/main/templates/main/includes/organisms/layout/messages.html +++ b/main/templates/main/includes/organisms/layout/messages.html @@ -1,7 +1,11 @@ <ul class="flex flex-col w-full"> {% for message in messages %} - <li> - {% include "main/includes/molecules/blocks/message_block.html" with type=message.type content=message.content is_last_child=forloop.last %} - </li> + <script>alert("{{ message }}");</script> + + {% comment %} + <li> + {% include "main/includes/molecules/blocks/message_block.html" with type=message.type content=message.content is_last_child=forloop.last %} + </li> + {% endcomment %} {% endfor %} </ul> diff --git a/main/templates/main/includes/organisms/main_section/newsletter_section.html b/main/templates/main/includes/organisms/main_section/newsletter_section.html index 334f648200d9ff79cc9d58d37246060ad4239269..d128d90b6d16c66cafbf5bced9a4c525b2e7f246 100644 --- a/main/templates/main/includes/organisms/main_section/newsletter_section.html +++ b/main/templates/main/includes/organisms/main_section/newsletter_section.html @@ -24,14 +24,14 @@ {% include 'main/includes/atoms/form_fields/form_input.html' with name="email" placeholder='Tvůj email' classes='mb-3 w-full md:w-96' %} - <div class="checkbox form-field__control flex items-center mb-3"> + <div class="checkbox flex items-center mb-3"> <input type="checkbox" id="confirmed" name="confirmed" required> <label for="confirmed"> Souhlasím se <a href="{{ page.root_page.gdpr_and_cookies_url }}" target="_blank">zpracováním osobních údajů</a> </label> </div> - {% include 'main/includes/atoms/buttons/round_button.html' with button_text='Odebírat' %} + {% include 'main/includes/atoms/buttons/round_button_form.html' with button_text='Odebírat' %} </form> </div> </div>