fix newsletter subscribing

a747afce · Tomáš Valenta · facd2b5d · a747afce · a747afce · a747afce
Commit a747afce authored 1 year ago by Tomáš Valenta
--- a/main/templates/main/base.html
+++ b/main/templates/main/base.html
 {% load static wagtailcore_tags wagtailimages_tags wagtailmetadata_tags %}
+
 <!doctype html>
 <html lang="cs">
  <head>

--- a/main/templates/main/includes/atoms/buttons/round_button.html
+++ b/main/templates/main/includes/atoms/buttons/round_button.html
-<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 %}>
--- a/main/templates/main/includes/atoms/buttons/round_button_form.html
+++ b/main/templates/main/includes/atoms/buttons/round_button_form.html
+{% extends 'main/includes/atoms/buttons/round_button.html' %}
+
+{% block element_opener %}button{% endblock %}
+{% block element_closer %}button{% endblock %}
+
+{% block href %}{% endblock %}
--- a/main/templates/main/includes/molecules/contact/contact_footer_box.html
+++ b/main/templates/main/includes/molecules/contact/contact_footer_box.html
+{% 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>

--- a/main/templates/main/includes/organisms/layout/messages.html
+++ b/main/templates/main/includes/organisms/layout/messages.html
 <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>
--- 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>