diff --git a/donate/blocks.py b/donate/blocks.py index 1ac2a05518627e1b36da99fca4e2039d7380fb7c..421df84b493c7803c116d1cb5041e0a834711647 100644 --- a/donate/blocks.py +++ b/donate/blocks.py @@ -3,10 +3,10 @@ from wagtail.blocks import ( DateBlock, IntegerBlock, ListBlock, + PageChooserBlock, RichTextBlock, StructBlock, URLBlock, - PageChooserBlock, ) from wagtail.images.blocks import ImageChooserBlock @@ -14,7 +14,10 @@ from donate.constants import RICH_TEXT_FEATURES class ProjectIndexBlock(StructBlock): - page = PageChooserBlock(page_type="donate.DonateProjectIndexPage") + page = PageChooserBlock( + label="Stránka se seznamem", + page_type="donate.DonateProjectIndexPage", + ) class Meta: template = "donate/blocks/project_index_block.html" @@ -27,16 +30,17 @@ class DistrictDonationBlock(StructBlock): class Meta: template = "donate/blocks/district_donation_block.html" - label = "Seznam projektů" + label = "Podpora krajů" class PartySupportFormBlock(StructBlock): heading = CharBlock(label="Nadpis") description = RichTextBlock(label="Obsah", features=RICH_TEXT_FEATURES) + image = ImageChooserBlock(label="Obrázek") class Meta: template = "donate/blocks/party_support_form_block.html" - label = "Seznam projektů" + label = "Podpoř stranu" class CrowdfundingRewardBlock(StructBlock): diff --git a/donate/migrations/0035_remove_donatehomepage_project_body_and_more.py b/donate/migrations/0035_remove_donatehomepage_project_body_and_more.py index d8a9895f35aa30ab75a1313b37d5ef88e5f4cee6..85f8a057bf491216eb6b8d6665201fde92eb4a68 100644 --- a/donate/migrations/0035_remove_donatehomepage_project_body_and_more.py +++ b/donate/migrations/0035_remove_donatehomepage_project_body_and_more.py @@ -1,28 +1,46 @@ # Generated by Django 4.1.10 on 2023-10-18 17:48 -from django.db import migrations import wagtail.blocks import wagtail.fields +from django.db import migrations class Migration(migrations.Migration): - dependencies = [ - ('donate', '0034_donatehomepage_menu'), + ("donate", "0034_donatehomepage_menu"), ] operations = [ migrations.RemoveField( - model_name='donatehomepage', - name='project_body', + model_name="donatehomepage", + name="project_body", ), migrations.RemoveField( - model_name='donatehomepage', - name='project_title', + model_name="donatehomepage", + name="project_title", ), migrations.AddField( - model_name='donatehomepage', - name='content_blocks', - field=wagtail.fields.StreamField([('project_index', wagtail.blocks.StructBlock([('page', wagtail.blocks.PageChooserBlock(page_type=['donate.DonateProjectIndexPage']))]))], blank=True, use_json_field=True, verbose_name='Obsah'), + model_name="donatehomepage", + name="content_blocks", + field=wagtail.fields.StreamField( + [ + ( + "project_index", + wagtail.blocks.StructBlock( + [ + ( + "page", + wagtail.blocks.PageChooserBlock( + page_type=["donate.DonateProjectIndexPage"] + ), + ) + ] + ), + ) + ], + blank=True, + use_json_field=True, + verbose_name="Obsah", + ), ), ] diff --git a/donate/migrations/0036_remove_donateprojectindexpage_support_position_and_more.py b/donate/migrations/0036_remove_donateprojectindexpage_support_position_and_more.py index 6863f5833f9b4b4e28df5cce0f6a3d12ae8dc003..354821a73ebaf8059830370d80f825b454dae363 100644 --- a/donate/migrations/0036_remove_donateprojectindexpage_support_position_and_more.py +++ b/donate/migrations/0036_remove_donateprojectindexpage_support_position_and_more.py @@ -1,24 +1,43 @@ # Generated by Django 4.1.10 on 2023-10-18 19:40 -from django.db import migrations import wagtail.blocks import wagtail.fields +from django.db import migrations class Migration(migrations.Migration): - dependencies = [ - ('donate', '0035_remove_donatehomepage_project_body_and_more'), + ("donate", "0035_remove_donatehomepage_project_body_and_more"), ] operations = [ migrations.RemoveField( - model_name='donateprojectindexpage', - name='support_position', + model_name="donateprojectindexpage", + name="support_position", ), migrations.AlterField( - model_name='donatehomepage', - name='content_blocks', - field=wagtail.fields.StreamField([('project_index', wagtail.blocks.StructBlock([('page', wagtail.blocks.PageChooserBlock(page_type=['donate.DonateProjectIndexPage']))])), ('district_donation', wagtail.blocks.StructBlock([]))], blank=True, use_json_field=True, verbose_name='Obsah'), + model_name="donatehomepage", + name="content_blocks", + field=wagtail.fields.StreamField( + [ + ( + "project_index", + wagtail.blocks.StructBlock( + [ + ( + "page", + wagtail.blocks.PageChooserBlock( + page_type=["donate.DonateProjectIndexPage"] + ), + ) + ] + ), + ), + ("district_donation", wagtail.blocks.StructBlock([])), + ], + blank=True, + use_json_field=True, + verbose_name="Obsah", + ), ), ] diff --git a/donate/migrations/0037_remove_donatehomepage_region_body_and_more.py b/donate/migrations/0037_remove_donatehomepage_region_body_and_more.py new file mode 100644 index 0000000000000000000000000000000000000000..fcfde8749aebb486b171a49a28bbd4251c1b0607 --- /dev/null +++ b/donate/migrations/0037_remove_donatehomepage_region_body_and_more.py @@ -0,0 +1,141 @@ +# Generated by Django 4.1.10 on 2023-10-19 14:16 + +from django.db import migrations +import wagtail.blocks +import wagtail.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + dependencies = [ + ("donate", "0036_remove_donateprojectindexpage_support_position_and_more"), + ] + + operations = [ + migrations.RemoveField( + model_name="donatehomepage", + name="region_body", + ), + migrations.RemoveField( + model_name="donatehomepage", + name="region_title", + ), + migrations.RemoveField( + model_name="donatehomepage", + name="support_body", + ), + migrations.RemoveField( + model_name="donatehomepage", + name="support_title", + ), + migrations.AlterField( + model_name="donatehomepage", + name="content_blocks", + field=wagtail.fields.StreamField( + [ + ( + "project_index", + wagtail.blocks.StructBlock( + [ + ( + "page", + wagtail.blocks.PageChooserBlock( + page_type=["donate.DonateProjectIndexPage"] + ), + ) + ] + ), + ), + ( + "district_donation", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(label="Nadpis")), + ( + "description", + wagtail.blocks.RichTextBlock( + features=[ + "h2", + "h3", + "h4", + "h5", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "superscript", + "subscript", + "strikethrough", + "blockquote", + "embed", + "font_color_#4ca971", + "font_color_#fde119", + "font_color_#027da8", + "font_color_#004958", + "font_color_#670047", + "font_color_#d60d53", + "font_color_#262626", + ], + label="Obsah", + ), + ), + ] + ), + ), + ( + "party_support_form", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(label="Nadpis")), + ( + "description", + wagtail.blocks.RichTextBlock( + features=[ + "h2", + "h3", + "h4", + "h5", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "superscript", + "subscript", + "strikethrough", + "blockquote", + "embed", + "font_color_#4ca971", + "font_color_#fde119", + "font_color_#027da8", + "font_color_#004958", + "font_color_#670047", + "font_color_#d60d53", + "font_color_#262626", + ], + label="Obsah", + ), + ), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + label="Obrázek" + ), + ), + ] + ), + ), + ], + blank=True, + use_json_field=True, + verbose_name="Obsah", + ), + ), + ] diff --git a/donate/migrations/0038_alter_donatehomepage_content_blocks.py b/donate/migrations/0038_alter_donatehomepage_content_blocks.py new file mode 100644 index 0000000000000000000000000000000000000000..eaaf9e57ae2677c31130b85a665b1984f66865cb --- /dev/null +++ b/donate/migrations/0038_alter_donatehomepage_content_blocks.py @@ -0,0 +1,126 @@ +# Generated by Django 4.1.10 on 2023-10-19 14:18 + +from django.db import migrations +import wagtail.blocks +import wagtail.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + dependencies = [ + ("donate", "0037_remove_donatehomepage_region_body_and_more"), + ] + + operations = [ + migrations.AlterField( + model_name="donatehomepage", + name="content_blocks", + field=wagtail.fields.StreamField( + [ + ( + "project_index", + wagtail.blocks.StructBlock( + [ + ( + "page", + wagtail.blocks.PageChooserBlock( + label="Stránka se seznamem", + page_type=["donate.DonateProjectIndexPage"], + ), + ) + ] + ), + ), + ( + "district_donation", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(label="Nadpis")), + ( + "description", + wagtail.blocks.RichTextBlock( + features=[ + "h2", + "h3", + "h4", + "h5", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "superscript", + "subscript", + "strikethrough", + "blockquote", + "embed", + "font_color_#4ca971", + "font_color_#fde119", + "font_color_#027da8", + "font_color_#004958", + "font_color_#670047", + "font_color_#d60d53", + "font_color_#262626", + ], + label="Obsah", + ), + ), + ] + ), + ), + ( + "party_support_form", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(label="Nadpis")), + ( + "description", + wagtail.blocks.RichTextBlock( + features=[ + "h2", + "h3", + "h4", + "h5", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "superscript", + "subscript", + "strikethrough", + "blockquote", + "embed", + "font_color_#4ca971", + "font_color_#fde119", + "font_color_#027da8", + "font_color_#004958", + "font_color_#670047", + "font_color_#d60d53", + "font_color_#262626", + ], + label="Obsah", + ), + ), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + label="Obrázek" + ), + ), + ] + ), + ), + ], + blank=True, + use_json_field=True, + verbose_name="Obsah", + ), + ), + ] diff --git a/donate/migrations/0039_remove_donatehomepage_custom_blocks_and_more.py b/donate/migrations/0039_remove_donatehomepage_custom_blocks_and_more.py new file mode 100644 index 0000000000000000000000000000000000000000..08fcdcf9da56b4aa2901ed124eca56418f805c78 --- /dev/null +++ b/donate/migrations/0039_remove_donatehomepage_custom_blocks_and_more.py @@ -0,0 +1,175 @@ +# Generated by Django 4.1.10 on 2023-10-19 14:31 + +from django.db import migrations +import wagtail.blocks +import wagtail.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + dependencies = [ + ("donate", "0038_alter_donatehomepage_content_blocks"), + ] + + operations = [ + migrations.RemoveField( + model_name="donatehomepage", + name="custom_blocks", + ), + migrations.RemoveField( + model_name="donatehomepage", + name="support_image", + ), + migrations.AlterField( + model_name="donatehomepage", + name="content_blocks", + field=wagtail.fields.StreamField( + [ + ( + "project_index", + wagtail.blocks.StructBlock( + [ + ( + "page", + wagtail.blocks.PageChooserBlock( + label="Stránka se seznamem", + page_type=["donate.DonateProjectIndexPage"], + ), + ) + ] + ), + ), + ( + "district_donation", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(label="Nadpis")), + ( + "description", + wagtail.blocks.RichTextBlock( + features=[ + "h2", + "h3", + "h4", + "h5", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "superscript", + "subscript", + "strikethrough", + "blockquote", + "embed", + "font_color_#4ca971", + "font_color_#fde119", + "font_color_#027da8", + "font_color_#004958", + "font_color_#670047", + "font_color_#d60d53", + "font_color_#262626", + ], + label="Obsah", + ), + ), + ] + ), + ), + ( + "party_support_form", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(label="Nadpis")), + ( + "description", + wagtail.blocks.RichTextBlock( + features=[ + "h2", + "h3", + "h4", + "h5", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "superscript", + "subscript", + "strikethrough", + "blockquote", + "embed", + "font_color_#4ca971", + "font_color_#fde119", + "font_color_#027da8", + "font_color_#004958", + "font_color_#670047", + "font_color_#d60d53", + "font_color_#262626", + ], + label="Obsah", + ), + ), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + label="Obrázek" + ), + ), + ] + ), + ), + ( + "custom", + wagtail.blocks.StructBlock( + [ + ("title", wagtail.blocks.CharBlock(label="Nadpis")), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "h2", + "h3", + "h4", + "h5", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "superscript", + "subscript", + "strikethrough", + "blockquote", + "embed", + "font_color_#4ca971", + "font_color_#fde119", + "font_color_#027da8", + "font_color_#004958", + "font_color_#670047", + "font_color_#d60d53", + "font_color_#262626", + ], + label="Obsah", + ), + ), + ("link", wagtail.blocks.URLBlock(label="Odkaz")), + ] + ), + ), + ], + blank=True, + use_json_field=True, + verbose_name="Obsah", + ), + ), + ] diff --git a/donate/models.py b/donate/models.py index a042e8b1569c302f1ebbd2249b238bf3a287e5a4..2003c90a301d430be371024008a32d16a18fe541 100644 --- a/donate/models.py +++ b/donate/models.py @@ -29,7 +29,13 @@ from shared.models import ( from shared.utils import get_subpage_url, make_promote_panels from tuning import admin_help -from .blocks import CrowdfundingRewardBlock, CustomContentBlock, ProjectIndexBlock, DistrictDonationBlock, PartySupportFormBlock +from .blocks import ( + CrowdfundingRewardBlock, + CustomContentBlock, + DistrictDonationBlock, + PartySupportFormBlock, + ProjectIndexBlock, +) from .forms import DonateForm from .menu import MenuMixin from .utils import get_donated_amount_from_api @@ -113,33 +119,18 @@ class DonateHomePage( null=True, verbose_name="náhled videa", ) - # support section - support_image = models.ForeignKey( - "wagtailimages.Image", - on_delete=models.PROTECT, - blank=True, - null=True, - related_name="+", - verbose_name="Obrázek k darovacímu widgetu", - ) - # projects section + # main section content_blocks = StreamField( [ ("project_index", ProjectIndexBlock()), ("district_donation", DistrictDonationBlock()), - ("party_support_form", PartySupportFormBlock()) + ("party_support_form", PartySupportFormBlock()), + ("custom", CustomContentBlock()), ], blank=True, use_json_field=True, verbose_name="Obsah", ) - # custom section - custom_blocks = StreamField( - [("content", CustomContentBlock())], - blank=True, - use_json_field=True, - verbose_name="Obecné bloky", - ) # settings faq_page = models.ForeignKey( "donate.DonateTextPage", @@ -177,16 +168,7 @@ class DonateHomePage( ], "hlavní sekce", ), - MultiFieldPanel( - [ - FieldPanel("support_title"), - FieldPanel("support_body"), - FieldPanel("support_image"), - ], - "podpoř stranu", - ), FieldPanel("content_blocks"), - FieldPanel("custom_blocks"), ] promote_panels = make_promote_panels(admin_help.build(admin_help.IMPORTANT_TITLE)) @@ -428,13 +410,7 @@ class DonateProjectIndexPage( @property def projects(self): - return ( - DonateProjectPage. - objects. - child_of(self). - distinct(). - all() - ) + return DonateProjectPage.objects.child_of(self).distinct().all() class Meta: verbose_name = "Přehled projektů" @@ -654,7 +630,11 @@ class DonateTextPage(Page, ExtendedMetadataPageMixin, SubpageMixin, MetadataPage ### RELATIONS - parent_page_types = ["donate.DonateHomePage", "donate.DonateTextPage", "donate.DonateInfoPage"] + parent_page_types = [ + "donate.DonateHomePage", + "donate.DonateTextPage", + "donate.DonateInfoPage", + ] subpage_types = ["donate.DonateTextPage", "donate.DonateInfoPage"] ### OTHERS @@ -705,7 +685,11 @@ class DonateInfoPage( ### RELATIONS - parent_page_types = ["donate.DonateHomePage", "donate.DonateTextPage", "donate.DonateInfoPage"] + parent_page_types = [ + "donate.DonateHomePage", + "donate.DonateTextPage", + "donate.DonateInfoPage", + ] subpage_types = ["donate.DonateTextPage", "donate.DonateInfoPage"] ### OTHERS diff --git a/donate/templates/donate/blocks/custom_content_block.html b/donate/templates/donate/blocks/custom_content_block.html index 774224f5afda824d963891dc5c8cc1667fd2d374..47ce379b14ec37b228b999904b291575eebf70d7 100644 --- a/donate/templates/donate/blocks/custom_content_block.html +++ b/donate/templates/donate/blocks/custom_content_block.html @@ -1,9 +1,11 @@ -{% load wagtailcore_tags wagtailimages_tags %} +{% load static wagtailimages_tags wagtailcore_tags donate_tags %} -<div class="container"> - <h2 class="lead page-subheading mb-4">{{ self.title }}</h2> - <div class="mb-4 clearfix"> - {{ self.content|richtext }} +<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> - <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 902ae6d54415495050c03c3f5f3c62a622633a11..ba433035208d2ca756f42d9ed1e0e24f36201c85 100644 --- a/donate/templates/donate/blocks/district_donation_block.html +++ b/donate/templates/donate/blocks/district_donation_block.html @@ -1,3 +1,5 @@ +{% 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> diff --git a/donate/templates/donate/blocks/party_support_form_block.html b/donate/templates/donate/blocks/party_support_form_block.html index 720764dd45ad557475ccb3ff30e6c84a111c7406..c617a282173abb9ae770a24210cdb23e054067c2 100644 --- a/donate/templates/donate/blocks/party_support_form_block.html +++ b/donate/templates/donate/blocks/party_support_form_block.html @@ -1,60 +1,64 @@ -<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="{{ self.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="{{ self.form_monthly_preselected }}"> - {% include "donate/form_monthly_amounts_snippet.html" %} - </div> - <div id="oneTimeAmounts" style="display: None" data-default-selected="{{ self.form_preselected }}"> - {% include "donate/form_amounts_snippet.html" %} - </div> +{% 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> - <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 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="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 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> </div> - </div> - </form> + </form> - </div><!-- /donate-form__right --> - </div><!-- /donate-form --> - </div> <!-- /container --> -</section> + </div><!-- /donate-form__right --> + </div><!-- /donate-form --> + </div> <!-- /container --> + </section> +{% endif %} diff --git a/donate/templates/donate/blocks/project_index_block.html b/donate/templates/donate/blocks/project_index_block.html index 69a128559386dd041741b031ec58a53405a4970d..f52b1bcffec7d9156fe9c59415fd497f1a3a3b00 100644 --- a/donate/templates/donate/blocks/project_index_block.html +++ b/donate/templates/donate/blocks/project_index_block.html @@ -1,16 +1,18 @@ {% load static wagtailimages_tags wagtailcore_tags donate_tags %} -<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> +{% 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="row projects mb-4"> - {% for project in self.page.projects %} - {% include "donate/project_snippet.html" %} - {% endfor %} - </div> <!-- /row --> + <div class="row projects mb-4"> + {% for project in self.page.projects %} + {% include "donate/project_snippet.html" %} + {% endfor %} + </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> + <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 %} diff --git a/donate/templates/donate/donate_home_page.html b/donate/templates/donate/donate_home_page.html index 62b7ace352c51b022d76405635f658e7b335c837..5d8882b4c89fd58d4cd8d49d393280bce9f039d7 100644 --- a/donate/templates/donate/donate_home_page.html +++ b/donate/templates/donate/donate_home_page.html @@ -40,12 +40,6 @@ {% for block in page.content_blocks %} {% include_block block %} {% endfor %} - - {% for content in page.custom_blocks %} - <section class="section--{% get_section_kind %} section--custom" id="custom"> - {% include_block content %} - </section> - {% endfor %} </main> <!-- /CONTENT -->