diff --git a/donate/static/donate/assets/css/style.css b/donate/static/donate/assets/css/style.css
index c85a1b81880f888f8ec8bdcefa211c6adfb89b5d..8fbd7a61a39a2390f5cfc57a3dcec6b4b308bbfe 100644
--- a/donate/static/donate/assets/css/style.css
+++ b/donate/static/donate/assets/css/style.css
@@ -1215,6 +1215,10 @@ img.full-width {
margin-left: 1.5rem;
}
+.text-grey-200 {
+ color: #adadad;
+}
+
/* BEGIN TailwindCSS-based image formatting */
.mx-auto {
diff --git a/donate/templates/donate/blocks/custom_content_block.html b/donate/templates/donate/blocks/custom_content_block.html
index 47ce379b14ec37b228b999904b291575eebf70d7..0d724d8264e2ea0a08fc077c276b12f45becba3a 100644
--- a/donate/templates/donate/blocks/custom_content_block.html
+++ b/donate/templates/donate/blocks/custom_content_block.html
@@ -1,11 +1,9 @@
{% load static wagtailimages_tags wagtailcore_tags donate_tags %}
-<section class="section--{% get_section_kind %} section--custom" id="custom">
- <div class="container">
- <h2 class="lead page-subheading mb-4">{{ self.title }}</h2>
- <div class="mb-4 clearfix">
- {{ self.content|richtext }}
- </div>
- <a href="{{ self.link }}" class="btn btn-dark btn-lg my-2">Chci vědět více <i class="icon-chevron-right ml-2"></i></a>
+<div class="container">
+ <h2 class="lead page-subheading mb-4">{{ self.title }}</h2>
+ <div class="mb-4 clearfix">
+ {{ self.content|richtext }}
</div>
+ <a href="{{ self.link }}" class="btn btn-dark btn-lg my-2">Chci vědět více <i class="icon-chevron-right ml-2"></i></a>
</div>
diff --git a/donate/templates/donate/blocks/district_donation_block.html b/donate/templates/donate/blocks/district_donation_block.html
index ba433035208d2ca756f42d9ed1e0e24f36201c85..e95456be5f11af8f66daf4238ab49dc640aa56e6 100644
--- a/donate/templates/donate/blocks/district_donation_block.html
+++ b/donate/templates/donate/blocks/district_donation_block.html
@@ -1,14 +1,12 @@
{% load static wagtailimages_tags wagtailcore_tags donate_tags %}
-<section class="section--{% get_section_kind %}" id="kraje">
- <div class="container">
- <h2 class="lead page-subheading mb-4">{{ self.heading }}</h2>
- <p class="mb-4">{{ self.description|richtext }}</p>
- <div class="row mb-4">
+<div class="container" id="kraje">
+ <h2 class="lead page-subheading mb-4">{{ self.heading }}</h2>
+ <p class="mb-4">{{ self.description|richtext }}</p>
+ <div class="row mb-4">
- <!-- TODO -->
- {% include "donate/region_map_snippet.html" with index_url=page.regions_page_url %}
+ <!-- TODO -->
+ {% include "donate/region_map_snippet.html" with index_url=page.regions_page_url %}
- </div> <!-- /row -->
- </div> <!-- /container -->
-</section>
+ </div> <!-- /row -->
+</div> <!-- /container -->
diff --git a/donate/templates/donate/blocks/party_support_form_block.html b/donate/templates/donate/blocks/party_support_form_block.html
index c617a282173abb9ae770a24210cdb23e054067c2..b5203d4de4c1c1e7a2fd66b990b98552847e3bd4 100644
--- a/donate/templates/donate/blocks/party_support_form_block.html
+++ b/donate/templates/donate/blocks/party_support_form_block.html
@@ -1,64 +1,62 @@
{% load static wagtailimages_tags wagtailcore_tags donate_tags %}
{% if page.show_donate_form %}
- <section class="section--{% get_section_kind %}" id="strana">
- <div class="container">
- <h2 class="lead page-subheading mb-4">{{ self.heading }}</h2>
- <p class="mb-4">{{ self.description|richtext }}</p>
- <div class="donate-form">
- {% if self.image %}
- <div class="donate-form__left">
- <div class="donate-form__icon">
- {% image self.image fill-256x256 as img %}
- <img data-src="{{ img.url }}" class="lazyload img-fluid" alt="{{ img.alt }}">
- </div><!-- /donate-form__icon -->
- </div><!-- /donate-form__left -->
- {% endif %}
- <div class="donate-form__right">
- <form id="js-donate-form" method="post">
- {% csrf_token %}
- <input type="hidden" name="portal_project_id" value="{{ page.portal_project_id }}">
- <div class="form-group row mb-4 align-items-center">
- <legend class="col-form-label col-md-4 col-form-label-lg">Typ příspěvku</legend>
- <div class="col-md-8">
- <div class="custom-control custom-radio custom-control-inline">
- <input type="radio" id="periodicity1" name="periodicity" value="730" class="custom-control-input" checked required>
- <label class="custom-control-label col-form-label-lg" for="periodicity1">Měsíční</label>
- </div>
- <div class="custom-control custom-radio custom-control-inline">
- <input type="radio" id="periodicity2" name="periodicity" value="99999" class="custom-control-input">
- <label class="custom-control-label col-form-label-lg" for="periodicity2">Jednorázový</label>
- </div>
- </div>
- </div>
- <div class="form-group row mb-4 align-items-center">
- <legend class="col-form-label col-md-4 col-form-label-lg">Částka</legend>
- <div class="col-md-8">
- <div id="monthlyAmounts" data-default-selected="{{ page.form_monthly_preselected }}">
- {% include "donate/form_monthly_amounts_snippet.html" %}
- </div>
- <div id="oneTimeAmounts" style="display: None" data-default-selected="{{ page.form_preselected }}">
- {% include "donate/form_amounts_snippet.html" %}
- </div>
- </div>
+ <div class="container" id="strana">
+ <h2 class="lead page-subheading mb-4">{{ self.heading }}</h2>
+ <p class="mb-4">{{ self.description|richtext }}</p>
+ <div class="donate-form">
+ {% if self.image %}
+ <div class="donate-form__left">
+ <div class="donate-form__icon">
+ {% image self.image fill-256x256 as img %}
+ <img data-src="{{ img.url }}" class="lazyload img-fluid" alt="{{ img.alt }}">
+ </div><!-- /donate-form__icon -->
+ </div><!-- /donate-form__left -->
+ {% endif %}
+ <div class="donate-form__right">
+ <form id="js-donate-form" method="post">
+ {% csrf_token %}
+ <input type="hidden" name="portal_project_id" value="{{ page.portal_project_id }}">
+ <div class="form-group row mb-4 align-items-center">
+ <legend class="col-form-label col-md-4 col-form-label-lg">Typ příspěvku</legend>
+ <div class="col-md-8">
+ <div class="custom-control custom-radio custom-control-inline">
+ <input type="radio" id="periodicity1" name="periodicity" value="730" class="custom-control-input" checked required>
+ <label class="custom-control-label col-form-label-lg" for="periodicity1">Měsíční</label>
+ </div>
+ <div class="custom-control custom-radio custom-control-inline">
+ <input type="radio" id="periodicity2" name="periodicity" value="99999" class="custom-control-input">
+ <label class="custom-control-label col-form-label-lg" for="periodicity2">Jednorázový</label>
+ </div>
</div>
- <div class="form-group row mb-0 align-items-center" id="js-custom-amount-input">
- <div class="col-md-4 order-md-0 order-1">
- <button type="submit" class="btn btn-danger btn-lg">Darovat</button>
+ </div>
+ <div class="form-group row mb-4 align-items-center">
+ <legend class="col-form-label col-md-4 col-form-label-lg">Částka</legend>
+ <div class="col-md-8">
+ <div id="monthlyAmounts" data-default-selected="{{ page.form_monthly_preselected }}">
+ {% include "donate/form_monthly_amounts_snippet.html" %}
+ </div>
+ <div id="oneTimeAmounts" style="display: None" data-default-selected="{{ page.form_preselected }}">
+ {% include "donate/form_amounts_snippet.html" %}
</div>
- <div class="col-md-8 mb-4 mb-md-0">
- <div class="input-group input-group-lg mb-0 custom-amount">
- <input type="number" class="form-control" id="customamount" placeholder="Jiná částka" name="custom_amount" aria-describedby="customamount-currency">
- <div class="input-group-append">
- <span class="input-group-text" id="customamount-currency">Kč</span>
- </div>
+ </div>
+ </div>
+ <div class="form-group row mb-0 align-items-center" id="js-custom-amount-input">
+ <div class="col-md-4 order-md-0 order-1">
+ <button type="submit" class="btn btn-danger btn-lg">Darovat</button>
+ </div>
+ <div class="col-md-8 mb-4 mb-md-0">
+ <div class="input-group input-group-lg mb-0 custom-amount">
+ <input type="number" class="form-control" id="customamount" placeholder="Jiná částka" name="custom_amount" aria-describedby="customamount-currency">
+ <div class="input-group-append">
+ <span class="input-group-text" id="customamount-currency">Kč</span>
</div>
</div>
</div>
- </form>
+ </div>
+ </form>
- </div><!-- /donate-form__right -->
- </div><!-- /donate-form -->
- </div> <!-- /container -->
- </section>
+ </div><!-- /donate-form__right -->
+ </div><!-- /donate-form -->
+ </div> <!-- /container -->
{% endif %}
diff --git a/donate/templates/donate/blocks/project_index_block.html b/donate/templates/donate/blocks/project_index_block.html
index f52b1bcffec7d9156fe9c59415fd497f1a3a3b00..d1d9eab1c871b640cb82336e1e5220f4d0782ffc 100644
--- a/donate/templates/donate/blocks/project_index_block.html
+++ b/donate/templates/donate/blocks/project_index_block.html
@@ -1,18 +1,20 @@
{% load static wagtailimages_tags wagtailcore_tags donate_tags %}
-{% if self.page.projects|length != 0 %}
- <section class="section--{% get_section_kind %}" id="projekty-{{ self.page.id }}">
- <div class="container">
- <h2 class="lead page-subheading mb-4">{{ self.page.support_heading }}</h2>
- <p class="mb-4">{{ self.page.support_description|richtext }}</p>
+<div class="container" id="projekty-{{ self.page.id }}">
+ <h2 class="lead page-subheading mb-4">{{ self.page.support_heading }}</h2>
+ <p class="mb-4">{{ self.page.support_description|richtext }}</p>
- <div class="row projects mb-4">
- {% for project in self.page.projects %}
- {% include "donate/project_snippet.html" %}
- {% endfor %}
- </div> <!-- /row -->
+ <div class="row projects mb-4">
+ {% if self.page.projects|length != 0 %}
+ {% for project in self.page.projects %}
+ {% include "donate/project_snippet.html" %}
+ {% endfor %}
+ {% else %}
+ <span class="text-grey-200 ml-3">Žádné aktuální projekty.</span>
+ {% endif %}
+ </div> <!-- /row -->
- <a href="{{ self.page.url }}" class="btn btn-dark btn-lg my-2">Všechny projekty a kampaně <i class="icon-chevron-right ml-2"></i></a>
- </div> <!-- /container -->
- </section>
-{% endif %}
+ {% if self.page.projects|length != 0 %}
+ <a href="{{ self.page.url }}" class="btn btn-dark btn-lg my-2">Všechny projekty a kampaně <i class="icon-chevron-right ml-2"></i></a>
+ {% endif %}
+</div> <!-- /container -->
diff --git a/donate/templates/donate/donate_home_page.html b/donate/templates/donate/donate_home_page.html
index 5d8882b4c89fd58d4cd8d49d393280bce9f039d7..67e06411d1591783432319f6e73843668c8ba7b1 100644
--- a/donate/templates/donate/donate_home_page.html
+++ b/donate/templates/donate/donate_home_page.html
@@ -38,7 +38,9 @@
</section>
{% for block in page.content_blocks %}
- {% include_block block %}
+ <section class="section--{% get_section_kind %}">
+ {% include_block block %}
+ </section>
{% endfor %}
</main>
<!-- /CONTENT -->
diff --git a/donate/templatetags/donate_tags.py b/donate/templatetags/donate_tags.py
index f0a5ab68256e0ff9c4e5978bb752dd10d705b0ba..acb828c689e056f14aba2e29cf0373004825c015 100644
--- a/donate/templatetags/donate_tags.py
+++ b/donate/templatetags/donate_tags.py
@@ -9,4 +9,5 @@ def get_section_kind(context):
context["current_section"] = "alternate"
else:
context["current_section"] = "primary"
+
return context["current_section"]