From 5a4f128a24b2d65977f8bab508d7c873253d7fb5 Mon Sep 17 00:00:00 2001
From: "jindra12.underdark" <jindra12.underdark@gmail.com>
Date: Mon, 24 Apr 2023 21:01:30 +0200
Subject: [PATCH] Add footer links to senate
---
.../0011_senatcampaignhomepage_footer_links.py | 6 +++---
senat_campaign/models.py | 4 +++-
.../static/senat_campaign/assets/css/style.css | 13 +++++++++++--
.../templates/senat_campaign/base.html | 18 +++++++++++++++++-
senate/models.py | 10 ++--------
senate/templates/senate/base.html | 3 ---
6 files changed, 36 insertions(+), 18 deletions(-)
rename senate/migrations/0006_senatehomepage_footer_links.py => senat_campaign/migrations/0011_senatcampaignhomepage_footer_links.py (92%)
diff --git a/senate/migrations/0006_senatehomepage_footer_links.py b/senat_campaign/migrations/0011_senatcampaignhomepage_footer_links.py
similarity index 92%
rename from senate/migrations/0006_senatehomepage_footer_links.py
rename to senat_campaign/migrations/0011_senatcampaignhomepage_footer_links.py
index c09a5f8c..5372ad0f 100644
--- a/senate/migrations/0006_senatehomepage_footer_links.py
+++ b/senat_campaign/migrations/0011_senatcampaignhomepage_footer_links.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.1.8 on 2023-04-20 21:55
+# Generated by Django 4.1.8 on 2023-04-24 17:46
import wagtail.blocks
import wagtail.fields
@@ -7,12 +7,12 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
- ("senate", "0005_alter_senatehomepage_candidates_and_more"),
+ ("senat_campaign", "0010_alter_senatcampaignhomepage_about_gallery_and_more"),
]
operations = [
migrations.AddField(
- model_name="senatehomepage",
+ model_name="senatcampaignhomepage",
name="footer_links",
field=wagtail.fields.StreamField(
[
diff --git a/senat_campaign/models.py b/senat_campaign/models.py
index 98556d4e..01dc34c5 100644
--- a/senat_campaign/models.py
+++ b/senat_campaign/models.py
@@ -19,6 +19,7 @@ from calendar_utils.models import CalendarMixin
from shared.models import (
ExtendedMetadataHomePageMixin,
ExtendedMetadataPageMixin,
+ FooterMixin,
SubpageMixin,
)
from tuning import admin_help
@@ -42,7 +43,7 @@ class ContactBlock(blocks.StructBlock):
class SenatCampaignHomePage(
- Page, ExtendedMetadataHomePageMixin, MetadataPageMixin, CalendarMixin
+ Page, ExtendedMetadataHomePageMixin, MetadataPageMixin, FooterMixin, CalendarMixin
):
### FIELDS
@@ -192,6 +193,7 @@ class SenatCampaignHomePage(
FieldPanel("title_suffix"),
FieldPanel("contacts"),
FieldPanel("footer_extra_content"),
+ FieldPanel("footer_links"),
CommentPanel(),
]
diff --git a/senat_campaign/static/senat_campaign/assets/css/style.css b/senat_campaign/static/senat_campaign/assets/css/style.css
index 48a720d2..0af4ea83 100644
--- a/senat_campaign/static/senat_campaign/assets/css/style.css
+++ b/senat_campaign/static/senat_campaign/assets/css/style.css
@@ -912,7 +912,7 @@ footer h1, footer h2, footer h3, footer h4, footer h5, footer h6 {
word-break: break-all;
}
-.socials {
+.socials, .other {
display: flex;
justify-content: flex-end;
}
@@ -937,7 +937,7 @@ footer h1, footer h2, footer h3, footer h4, footer h5, footer h6 {
}
@media screen and (max-width: 767.99px) {
- .socials {
+ .socials, .other {
justify-content: flex-start;
}
.socials a i {
@@ -945,7 +945,16 @@ footer h1, footer h2, footer h3, footer h4, footer h5, footer h6 {
}
}
+.other {
+ flex-direction: column;
+ align-items: flex-end;
+}
+@media screen and (max-width: 767.99px) {
+ .other {
+ align-items: flex-start;
+ }
+}
/* PAGINATION */
.page-link {
diff --git a/senat_campaign/templates/senat_campaign/base.html b/senat_campaign/templates/senat_campaign/base.html
index 8408af06..8e82f299 100644
--- a/senat_campaign/templates/senat_campaign/base.html
+++ b/senat_campaign/templates/senat_campaign/base.html
@@ -165,6 +165,23 @@
</div>
</div><!-- /column -->
</div> <!-- /row -->
+ {% if page.root_page.footer_links %}
+ <div class="row">
+ {% for block in page.root_page.footer_links %}
+ <div class="col-12 col-md-6">
+ <h2 class="lead page-subheading mb-5">{{ block.value.label }}</h2>
+ </div><!-- /column -->
+ <div class="col-12 col-md-6">
+ <div class="other mb-5">
+ {% for link in block.value.items %}
+ <a href="{{ link.url }}">{{ link.text }}</a>
+ {% endfor %}
+ </div>
+ </div><!-- /column -->
+
+ {% endfor %}
+ </div>
+ {% endif %}
<div class="row">
@@ -194,7 +211,6 @@
{% endfor %}
</div> <!-- /row -->
-
</div><!-- /container -->
</div><!-- /footer_top -->
diff --git a/senate/models.py b/senate/models.py
index cc62e29b..8b3facef 100644
--- a/senate/models.py
+++ b/senate/models.py
@@ -8,8 +8,6 @@ from wagtail.images.edit_handlers import FieldPanel
from wagtail.models import Page
from wagtailmetadata.models import MetadataPageMixin
-from shared.blocks import FooterLinksBlock
-from shared.models import FooterMixin
from tuning import admin_help
@@ -27,7 +25,7 @@ class PersonBlock(blocks.StructBlock):
label = "osoba"
-class SenateHomePage(MetadataPageMixin, FooterMixin, Page):
+class SenateHomePage(MetadataPageMixin, Page):
### FIELDS
senators = StreamField(
@@ -72,11 +70,7 @@ class SenateHomePage(MetadataPageMixin, FooterMixin, Page):
),
]
- settings_panels = [
- FieldPanel("matomo_id"),
- FieldPanel("footer_links"),
- CommentPanel(),
- ]
+ settings_panels = [FieldPanel("matomo_id"), CommentPanel()]
### RELATIONS
diff --git a/senate/templates/senate/base.html b/senate/templates/senate/base.html
index 14906311..bcbab584 100644
--- a/senate/templates/senate/base.html
+++ b/senate/templates/senate/base.html
@@ -69,9 +69,6 @@
</div>
</a>
</div>
- {% if page.footer_links %}
- {% include_block page.footer_links with container="col-sm-5 col-12" %}
- {% endif %}
</div>
</div>
</div>
--
GitLab