diff --git a/donate/migrations/0007_auto_20200724_1658.py b/donate/migrations/0007_auto_20200724_1658.py new file mode 100644 index 0000000000000000000000000000000000000000..b0dc04422da3c628142316c0b2d860c8ea7861df --- /dev/null +++ b/donate/migrations/0007_auto_20200724_1658.py @@ -0,0 +1,30 @@ +# Generated by Django 3.0.8 on 2020-07-24 14:58 + +from django.conf import settings +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("wagtailcore", "0045_assign_unlock_grouppagepermission"), + ("wagtailredirects", "0006_redirect_increase_max_length"), + ("wagtailmenus", "0023_remove_use_specific"), + ("wagtailimages", "0022_uploadedimage"), + ("contenttypes", "0002_remove_content_type_name"), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ("wagtailforms", "0004_add_verbose_name_plural"), + ("donate", "0006_auto_20200717_0323"), + ] + + operations = [ + migrations.RenameModel( + old_name="DonateCookiesPage", new_name="DonateTextPage", + ), + migrations.AlterModelOptions( + name="donateinfopage", options={"verbose_name": "Infostránka s formulářem"}, + ), + migrations.AlterModelOptions( + name="donatetextpage", options={"verbose_name": "Stránka s textem"}, + ), + ] diff --git a/donate/models.py b/donate/models.py index d464ace11b8f8f270c6cd53f5b7504625b0acab6..d3bb371c4db03eb0d921a43aafb88a1168a63fee 100644 --- a/donate/models.py +++ b/donate/models.py @@ -60,7 +60,7 @@ class DonateFormMixin(models.Model): def get_url(page, dest_page_type): try: - return page.get_children().type(dest_page_type).live().get().get_url() + return page.get_children().type(dest_page_type).live().first().get_url() except Page.DoesNotExist: return "#" @@ -154,7 +154,7 @@ class DonateHomePage(DonateFormMixin, Page, MetadataPageMixin): "donate.DonateRegionIndexPage", "donate.DonateProjectIndexPage", "donate.DonateInfoPage", - "donate.DonateCookiesPage", + "donate.DonateTextPage", ] ### OTHERS @@ -169,10 +169,6 @@ class DonateHomePage(DonateFormMixin, Page, MetadataPageMixin): def root_page(self): return self - @property - def cookies_page_url(self): - return get_url(self, DonateCookiesPage) - @property def info_page_url(self): return get_url(self, DonateInfoPage) @@ -422,7 +418,7 @@ class DonateProjectPage(DonateFormMixin, Page, SubpageMixin, MetadataPageMixin): return context -class DonateCookiesPage(Page, SubpageMixin, MetadataPageMixin): +class DonateTextPage(Page, SubpageMixin, MetadataPageMixin): ### FIELDS body = RichTextField("obsah", blank=True) @@ -456,7 +452,7 @@ class DonateCookiesPage(Page, SubpageMixin, MetadataPageMixin): ### OTHERS class Meta: - verbose_name = "Cookies" + verbose_name = "Stránka s textem" class DonateInfoPage(DonateFormMixin, Page, SubpageMixin, MetadataPageMixin): @@ -493,7 +489,7 @@ class DonateInfoPage(DonateFormMixin, Page, SubpageMixin, MetadataPageMixin): ### OTHERS class Meta: - verbose_name = "Info" + verbose_name = "Infostránka s formulářem" # use portal_project_id from home page @property diff --git a/donate/templates/donate/base.html b/donate/templates/donate/base.html index 35fd8916169ff0b777fc728a5c1b08187e17dc4b..758385c0774c66b843bf94760c0a6dde1bcb3dc1 100644 --- a/donate/templates/donate/base.html +++ b/donate/templates/donate/base.html @@ -116,9 +116,12 @@ <div class="footer__logo"> <img src="{% static "donate/img/logo_napis_white.svg" %}" alt="Logo podpoř piráty"> </div> + <ul class="footer__menu mt-5"> + <li><a href="/osobni-udaje/">Zásady zpracování osobních údajů</a></li> + <li><a href="/obchodni-podminky/">Obchodní podmínky</a></li> + </ul> </div><!-- /column --> - {# TODO #} <div class="col-12 col-md-6 col-lg-3 mb-4 order-2 order-lg-1"> <h4 class="lead mb-3">Otevřenost</h4> <ul class="footer__menu"> @@ -129,13 +132,12 @@ </ul> </div><!-- /column --> - {# TODO #} <div class="col-12 col-md-6 col-lg-3 order-3 order-lg-2"> <h4 class="lead mb-3">Kontakt</h4> <h6 class="mb-0">Občané</h6> <p class="mb-3"><a href="mailto:info@pirati.cz">info@pirati.cz</a></p> <h6 class="mb-0">Média</h6> - <p class="mb-0"><a href="mailto:karolina.novakova@pirati.cz">karolina.novakova@pirati.cz</a></p> + <p class="mb-0"><a href="mailto:karolina.sadilkova@pirati.cz">karolina.sadilkova@pirati.cz</a></p> </div><!-- /column --> <div class="col-12 col-md-6 col-lg-3 mb-4 mb-md-5 mb-lg-4 order-1 order-lg-3"> @@ -170,7 +172,7 @@ <p class="mb-0">© {% now "Y" %} Piráti. Všechna práva vyhlazena.<br/>Sdílejte a nechte ostatní sdílet za stejných podmínek.</p> </div><!-- /column --> <div class="col-12 col-md-6 text-md-right"> - <p class="mb-0">Tento web využívá soubory cookies - <a href="{{ page.root_page.cookies_page_url }}">více informací</a></p> + <p class="mb-0">Tento web využívá soubory cookies - <a href="/soubory-cookies/">více informací</a></p> </div><!-- /column --> </div><!-- /row --> </div><!-- /container --> diff --git a/donate/templates/donate/donate_cookies_page.html b/donate/templates/donate/donate_text_page.html similarity index 100% rename from donate/templates/donate/donate_cookies_page.html rename to donate/templates/donate/donate_text_page.html