diff --git a/Dockerfile b/Dockerfile index 33a734a..3bbac6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ LABEL org.hotosm.fmtm.app-name="backend" \ RUN set -ex \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install \ - -y --no-install-recommends "locales" "ca-certificates" "gettext" \ + -y --no-install-recommends "locales" "ca-certificates" "gettext" "libmagickwand-dev" \ && DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates @@ -61,6 +61,7 @@ RUN set -ex \ "libwebp-dev" \ "nodejs" \ "npm" \ + "libmagickwand-dev" \ && rm -rf /var/lib/apt/lists/* COPY --from=extract-deps \ /opt/python/requirements.txt /opt/python/ @@ -94,6 +95,7 @@ RUN set -ex \ "libwebp-dev" \ "nodejs" \ "npm" \ + "libmagickwand-dev" \ && rm -rf /var/lib/apt/lists/* # Copy the entrypoint script into the Docker image COPY --chown=wagtail:wagtail container-entrypoint.sh / diff --git a/app/core/models.py b/app/core/models.py index 638183c..3064bb4 100644 --- a/app/core/models.py +++ b/app/core/models.py @@ -44,6 +44,7 @@ class LinkOrPageBlock(StreamBlock): page = PageChooserBlock() url = URLBlock() document = DocumentChooserBlock() + other = CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live.") class Meta: max_num = 1 diff --git a/app/events/migrations/0010_remove_eventownerpage_view_all_events_url_and_more.py b/app/events/migrations/0010_remove_eventownerpage_view_all_events_url_and_more.py new file mode 100644 index 0000000..fc9bd83 --- /dev/null +++ b/app/events/migrations/0010_remove_eventownerpage_view_all_events_url_and_more.py @@ -0,0 +1,35 @@ +# Generated by Django 4.2.7 on 2024-09-18 19:59 + +from django.db import migrations, models +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('events', '0009_alter_eventownerpage_category_select_and_more'), + ] + + operations = [ + migrations.RemoveField( + model_name='eventownerpage', + name='view_all_events_url', + ), + migrations.AddField( + model_name='eventownerpage', + name='view_all_events_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='individualeventpage', + name='end_date_time', + field=models.DateTimeField(help_text='This datetime is in UTC.'), + ), + migrations.AlterField( + model_name='individualeventpage', + name='start_date_time', + field=models.DateTimeField(help_text='This datetime is in UTC.'), + ), + ] diff --git a/app/events/migrations/0011_eventownerpage_remove_filters_text.py b/app/events/migrations/0011_eventownerpage_remove_filters_text.py new file mode 100644 index 0000000..520326e --- /dev/null +++ b/app/events/migrations/0011_eventownerpage_remove_filters_text.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.7 on 2024-10-03 22:49 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('events', '0010_remove_eventownerpage_view_all_events_url_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='eventownerpage', + name='remove_filters_text', + field=models.CharField(default='Remove All Filters'), + ), + ] diff --git a/app/events/migrations/0012_alter_eventownerpage_view_all_events_link.py b/app/events/migrations/0012_alter_eventownerpage_view_all_events_link.py new file mode 100644 index 0000000..6d32813 --- /dev/null +++ b/app/events/migrations/0012_alter_eventownerpage_view_all_events_link.py @@ -0,0 +1,21 @@ +# Generated by Django 4.2.7 on 2024-10-10 17:41 + +from django.db import migrations +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('events', '0011_eventownerpage_remove_filters_text'), + ] + + operations = [ + migrations.AlterField( + model_name='eventownerpage', + name='view_all_events_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + ] diff --git a/app/events/migrations/0013_alter_individualeventpage_extended_description.py b/app/events/migrations/0013_alter_individualeventpage_extended_description.py new file mode 100644 index 0000000..b61c1eb --- /dev/null +++ b/app/events/migrations/0013_alter_individualeventpage_extended_description.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.7 on 2024-10-21 21:37 + +from django.db import migrations +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('events', '0012_alter_eventownerpage_view_all_events_link'), + ] + + operations = [ + migrations.AlterField( + model_name='individualeventpage', + name='extended_description', + field=wagtail.fields.StreamField([('text_block', 0)], block_lookup={0: ('wagtail.blocks.RichTextBlock', (), {'features': ['h2', 'h3', 'h4', 'bold', 'italic', 'link', 'ol', 'ul', 'hr', 'document-link', 'image', 'embed', 'code', 'blockquote']})}, null=True), + ), + ] diff --git a/app/events/migrations/0014_eventownerpage_applied_text.py b/app/events/migrations/0014_eventownerpage_applied_text.py new file mode 100644 index 0000000..2ec165d --- /dev/null +++ b/app/events/migrations/0014_eventownerpage_applied_text.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.7 on 2024-10-24 18:38 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('events', '0013_alter_individualeventpage_extended_description'), + ] + + operations = [ + migrations.AddField( + model_name='eventownerpage', + name='applied_text', + field=models.CharField(default='applied', help_text='This will be a suffix to a number, used to indicate how many filters are applied currently in some field.'), + ), + ] diff --git a/app/events/migrations/0015_eventownerpage_date_date_text_and_more.py b/app/events/migrations/0015_eventownerpage_date_date_text_and_more.py new file mode 100644 index 0000000..b2c474d --- /dev/null +++ b/app/events/migrations/0015_eventownerpage_date_date_text_and_more.py @@ -0,0 +1,28 @@ +# Generated by Django 4.2.7 on 2024-11-06 23:54 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('events', '0014_eventownerpage_applied_text'), + ] + + operations = [ + migrations.AddField( + model_name='eventownerpage', + name='date_date_text', + field=models.CharField(default='date'), + ), + migrations.AddField( + model_name='eventownerpage', + name='date_from_text', + field=models.CharField(default='From'), + ), + migrations.AddField( + model_name='eventownerpage', + name='date_to_text', + field=models.CharField(default='To'), + ), + ] diff --git a/app/events/migrations/0016_alter_eventownerpage_date_date_text.py b/app/events/migrations/0016_alter_eventownerpage_date_date_text.py new file mode 100644 index 0000000..68ee471 --- /dev/null +++ b/app/events/migrations/0016_alter_eventownerpage_date_date_text.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.7 on 2024-11-07 17:06 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('events', '0015_eventownerpage_date_date_text_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='eventownerpage', + name='date_date_text', + field=models.CharField(default='Filter by Date'), + ), + ] diff --git a/app/events/models.py b/app/events/models.py index 1d48f22..72d0344 100644 --- a/app/events/models.py +++ b/app/events/models.py @@ -12,6 +12,9 @@ from wagtail.snippets.models import register_snippet from app.members.models import IndividualMappingHubPage +from app.core.models import LinkOrPageBlock + +from datetime import datetime class EventOwnerPage(Page): @@ -27,7 +30,7 @@ def get_context(self, request, *args, **kwargs): categories = EventCategory.objects.all() query = Q() for category in categories: - if request.GET.get(str(category), ''): + if request.GET.get("cat" + str(category), ''): query = query | Q(event_categories=category) events_list = events_list.filter(query) @@ -35,16 +38,22 @@ def get_context(self, request, *args, **kwargs): event_host_types = EventHostType.objects.all() query = Q() for host_type in event_host_types: - if request.GET.get(str(host_type), ''): + if request.GET.get("htype" + str(host_type.id), ''): query = query | Q(event_host_type=host_type) events_list = events_list.filter(query) hubs = IndividualMappingHubPage.objects.live().filter(locale=context['page'].locale) query = Q() for hub in hubs: - if request.GET.get(str(hub), ''): + if request.GET.get("hub" + str(hub.id), ''): query = query | Q(event_region_hub=hub) events_list = events_list.filter(query).distinct() + + from_date = request.GET.get("fromdate") + from_date = datetime.strptime(from_date, "%Y-%m-%d") if from_date else datetime.min + to_date = request.GET.get("todate") + to_date = datetime.strptime(to_date, "%Y-%m-%d") if to_date else datetime.max + events_list = events_list.filter(Q(start_date_time__range=[from_date,to_date]) | Q(end_date_time__range=[from_date,to_date])) match request.GET.get('sort', ''): case 'sort.new': @@ -88,9 +97,10 @@ def get_context(self, request, *args, **kwargs): rsvp_button_text = models.CharField(default="RSVP") more_events_title = models.CharField(default="More Events") view_all_events_text = models.CharField(default="View all Events") - view_all_events_url = models.URLField(blank=True) + view_all_events_link = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) event_read_more_text = models.CharField(default="Read more") + applied_text = models.CharField(default="applied", help_text="This will be a suffix to a number, used to indicate how many filters are applied currently in some field.") keyword_search_hint = models.CharField(default="Search by keyword") filter_by_country = models.CharField(default="Filter by Country") host_type_select = models.CharField(default="Filter by Host Type") @@ -99,11 +109,16 @@ def get_context(self, request, *args, **kwargs): sort_by_old = models.CharField(default="Sort by Old") sort_by_titlea = models.CharField(default="Sort by Title Alphabetical") sort_by_titlez = models.CharField(default="Sort by Title Reverse Alphabetical") + date_date_text = models.CharField(default="Filter by Date") + date_from_text = models.CharField(default="From") + date_to_text = models.CharField(default="To") search_button_text = models.CharField(default="Search") + remove_filters_text = models.CharField(default="Remove All Filters") results_text = models.CharField(default="Results") content_panels = Page.content_panels + [ MultiFieldPanel([ + FieldPanel('applied_text'), FieldPanel('keyword_search_hint'), FieldPanel('filter_by_country'), FieldPanel('host_type_select'), @@ -112,7 +127,11 @@ def get_context(self, request, *args, **kwargs): FieldPanel('sort_by_old'), FieldPanel('sort_by_titlea'), FieldPanel('sort_by_titlez'), + FieldPanel('date_from_text'), + FieldPanel('date_to_text'), + FieldPanel('date_date_text'), FieldPanel('search_button_text'), + FieldPanel('remove_filters_text'), FieldPanel('results_text'), ], heading="Event Search Page"), MultiFieldPanel([ @@ -123,7 +142,7 @@ def get_context(self, request, *args, **kwargs): FieldPanel('rsvp_button_text'), FieldPanel('more_events_title'), FieldPanel('view_all_events_text'), - FieldPanel('view_all_events_url'), + FieldPanel('view_all_events_link'), FieldPanel('event_read_more_text'), ], heading="Individual Event Page"), ] @@ -159,13 +178,13 @@ class Meta: verbose_name_plural = "Event Categories" -class IndividualEventPage(Page): +class IndividualEventPage(Page): parent_page_types = [ 'events.EventOwnerPage' ] - start_date_time = models.DateTimeField() - end_date_time = models.DateTimeField() + start_date_time = models.DateTimeField(help_text="This datetime is in UTC.") + end_date_time = models.DateTimeField(help_text="This datetime is in UTC.") image = models.ForeignKey( "wagtailimages.Image", @@ -178,7 +197,7 @@ class IndividualEventPage(Page): intro = RichTextField(blank=True) extended_description = StreamField([ ('text_block', RichTextBlock(features=[ - 'h1', 'h2', 'h3', 'h4', 'bold', 'italic', 'link', 'ol', 'ul', 'hr', 'document-link', 'image', 'embed', 'code', 'blockquote' + 'h2', 'h3', 'h4', 'bold', 'italic', 'link', 'ol', 'ul', 'hr', 'document-link', 'image', 'embed', 'code', 'blockquote' ])) ], use_json_field=True, null=True) diff --git a/app/events/templates/events/event_owner_page.html b/app/events/templates/events/event_owner_page.html index 3ffad23..07ec418 100644 --- a/app/events/templates/events/event_owner_page.html +++ b/app/events/templates/events/event_owner_page.html @@ -10,10 +10,18 @@ {% endblock extra_css %} {% block content %} -
+

{{page.title}}

-
+
{% comment %} KEYWORD SEARCH {% endcomment %}
@@ -25,7 +33,7 @@

{{page.title}}

- {{page.host_type_select}} + {{page.host_type_select}} {% include "ui/components/utilities/FormAppliedSuffix.html" with key="htype" applied_text=page.applied_text %}

{% include "ui/components/icon_svgs/LinkCaret.html" with class="rotate-90 text-hot-red" %}
@@ -34,7 +42,7 @@

{{page.title}}

{% for event_host_type in event_host_types %}
- +
{% endfor %}
@@ -44,7 +52,7 @@

{{page.title}}

- {{page.category_select}} + {{page.category_select}} {% include "ui/components/utilities/FormAppliedSuffix.html" with key="cat" applied_text=page.applied_text %}

{% include "ui/components/icon_svgs/LinkCaret.html" with class="rotate-90 text-hot-red" %}
@@ -53,7 +61,7 @@

{{page.title}}

{% for category in categories %}
- +
{% endfor %}
@@ -63,7 +71,7 @@

{{page.title}}

- {{page.filter_by_country}} + {{page.filter_by_country}} {% include "ui/components/utilities/FormAppliedSuffix.html" with key="hub" applied_text=page.applied_text %}

{% include "ui/components/icon_svgs/LinkCaret.html" with class="rotate-90 text-hot-red" %}
@@ -72,7 +80,7 @@

{{page.title}}

{% for hub in hubs %}
- +
{% endfor %}
@@ -95,22 +103,51 @@

{{page.title}}

+
+
+

+ {{page.date_date_text}} +

+ {% include "ui/components/icon_svgs/LinkCaret.html" with class="rotate-90 text-hot-red" %} +
+
+
+

{{page.date_from_text}}

+
+ +
+

{{page.date_to_text}}

+
+ +
+
+
+
+ +

+ {{page.remove_filters_text}} + {% include "ui/components/icon_svgs/RefreshIcon.html" with class="ml-4" %} +

+ + {% comment %} EVENT ITEMS {% endcomment %} -

{{events_paginator.count}} {{page.results_text}}

-
- {% for event in events %} - {% include "ui/components/events/EventPreviewBlockEvent.html" with event=event showimage=True %} - {% endfor %} +
+

{{events_paginator.count}} {{page.results_text}}

+
+ {% for event in events %} + {% include "ui/components/events/EventPreviewBlockEvent.html" with event=event showimage=True %} + {% endfor %} +
{% comment %} PAGE NAVIGATION {% endcomment %} - {% include "ui/components/utilities/PaginatorNavigation.html" with paginator=events_paginator current_page=current_page %} + {% include "ui/components/utilities/PaginatorNavigationHTMX.html" with paginator=events_paginator current_page=current_page %}
{% endblock %} diff --git a/app/events/templates/events/individual_event_page.html b/app/events/templates/events/individual_event_page.html index 0598ed3..3ff34b6 100644 --- a/app/events/templates/events/individual_event_page.html +++ b/app/events/templates/events/individual_event_page.html @@ -3,36 +3,36 @@ {% load wagtailcore_tags %} {% load wagtailimages_tags %} {% load compress %} -{% block body_class %}template-individualmappinghubpage{% endblock %} +{% block body_class %}template-individualeventpage{% endblock %} {% block extra_css %} {% compress css %} {% endcompress css %} {% endblock extra_css %} {% block content %} -
+
{% comment %} HEADER {% endcomment %} -
+

{{ page.title }}

- {{ page.start_date_time }} – {% if page.start_date_time.date == page.end_date_time.date %}{{ page.end_date_time.time }} {% else %} {{page.end_date_time}} {% endif %} + {{ page.start_date_time }} {{page.start_date_time.tzinfo}} – {% if page.start_date_time.date == page.end_date_time.date %}{{ page.end_date_time.time }} {% else %} {{page.end_date_time}} {% endif %} {{page.start_date_time.tzinfo}}

-
+
{% comment %} BODY {% endcomment %}
- {% image page.image original class="pb-8" %} + {% image page.image original class="mb-8 aspect-[8/5] object-cover" %}
- {{ page.intro|safe }} + {{ page.intro|richtext }}
{{ page.extended_description }} - {% include "ui/components/sharers/ShareSection.html" with class="mt-10" %} + {% include "ui/components/sharers/ShareSection.html" with class="mt-20" %}
{% comment %} SIDEBAR {% endcomment %} -
+

{{page.get_parent.specific.event_location_title}}

@@ -53,7 +53,9 @@

{{page.get_parent.specific.event_region_hub_title}}

- {{page.event_region_hub.title}} + + {{page.event_region_hub.title}} +

{% endif %} @@ -64,7 +66,7 @@

{% for category in page.event_categories.all %} - {{category}}{% if not forloop.last %}, {% endif %} + {{category}}{% if not forloop.last %}, {% endif %} {% endfor %}

@@ -75,7 +77,7 @@

{{page.get_parent.specific.join_event_title}}

- {{page.rsvp_description|safe}} + {{page.rsvp_description|richtext}} {% if page.rsvp_link %} @@ -90,7 +92,7 @@

{{page.get_parent.specific.more_events_title}}

- {% include "ui/components/BaseLink.html" with linktext=page.get_parent.specific.view_all_events_text linkurl=page.get_parent.specific.view_all_events_url %} + {% include "ui/components/BaseLink.html" with linktext=page.get_parent.specific.view_all_events_text linkurl=page.get_parent.specific.view_all_events_link %}
{% for event in page.more_events %} diff --git a/app/get_involved/migrations/0004_remove_getinvolvedpage_black_box_link_url_and_more.py b/app/get_involved/migrations/0004_remove_getinvolvedpage_black_box_link_url_and_more.py new file mode 100644 index 0000000..b9641c2 --- /dev/null +++ b/app/get_involved/migrations/0004_remove_getinvolvedpage_black_box_link_url_and_more.py @@ -0,0 +1,67 @@ +# Generated by Django 4.2.7 on 2024-09-16 18:02 + +from django.db import migrations +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('get_involved', '0003_getinvolvedpage_join_us_panel_read_more_and_more'), + ] + + operations = [ + migrations.RemoveField( + model_name='getinvolvedpage', + name='black_box_link_url', + ), + migrations.RemoveField( + model_name='getinvolvedpage', + name='dogear_box_link_url', + ), + migrations.RemoveField( + model_name='getinvolvedpage', + name='partner_with_us_button_link', + ), + migrations.RemoveField( + model_name='getinvolvedpage', + name='red_box_link_url', + ), + migrations.RemoveField( + model_name='getinvolvedpage', + name='view_all_events_link', + ), + migrations.AddField( + model_name='getinvolvedpage', + name='black_box_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], blank=True, use_json_field=True), + ), + migrations.AddField( + model_name='getinvolvedpage', + name='dogear_box_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], blank=True, use_json_field=True), + ), + migrations.AddField( + model_name='getinvolvedpage', + name='partner_with_us_button_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], blank=True, use_json_field=True), + ), + migrations.AddField( + model_name='getinvolvedpage', + name='red_box_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], blank=True, use_json_field=True), + ), + migrations.AddField( + model_name='getinvolvedpage', + name='view_all_events_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='getinvolvedpage', + name='get_involved_large_panels', + field=wagtail.fields.StreamField([('panel', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('title', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link', wagtail.blocks.StreamBlock([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], required=False))]))], blank=True, null=True, use_json_field=True), + ), + ] diff --git a/app/get_involved/migrations/0005_alter_getinvolvedpage_black_box_link_and_more.py b/app/get_involved/migrations/0005_alter_getinvolvedpage_black_box_link_and_more.py new file mode 100644 index 0000000..799cae9 --- /dev/null +++ b/app/get_involved/migrations/0005_alter_getinvolvedpage_black_box_link_and_more.py @@ -0,0 +1,47 @@ +# Generated by Django 4.2.7 on 2024-10-10 17:41 + +from django.db import migrations +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('get_involved', '0004_remove_getinvolvedpage_black_box_link_url_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='getinvolvedpage', + name='black_box_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='getinvolvedpage', + name='dogear_box_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='getinvolvedpage', + name='get_involved_large_panels', + field=wagtail.fields.StreamField([('panel', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('title', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link', wagtail.blocks.StreamBlock([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], required=False))]))], blank=True, null=True, use_json_field=True), + ), + migrations.AlterField( + model_name='getinvolvedpage', + name='partner_with_us_button_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='getinvolvedpage', + name='red_box_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='getinvolvedpage', + name='view_all_events_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + ] diff --git a/app/get_involved/models.py b/app/get_involved/models.py index 2cb2356..763ba42 100644 --- a/app/get_involved/models.py +++ b/app/get_involved/models.py @@ -7,13 +7,15 @@ from wagtail.images.blocks import ImageChooserBlock from modelcluster.fields import ParentalKey, ParentalManyToManyField +from app.core.models import LinkOrPageBlock + class GetInvolvedLargePanel(StructBlock): image = ImageChooserBlock() title = CharBlock() description = RichTextBlock() link_text = CharBlock() - link_url = URLBlock(required=False) + link = LinkOrPageBlock(required=False) class JoinUsPanel(StructBlock): @@ -45,16 +47,16 @@ class GetInvolvedPage(Page): partner_with_us_title = models.CharField(default="Partner With Us!") partner_with_us_description = RichTextField(blank=True) partner_with_us_button_text = models.CharField(default="Partner With Us") - partner_with_us_button_link = models.URLField(blank=True) + partner_with_us_button_url = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) get_involved_community_title = models.CharField(default="Get Involved in Our Community") get_involved_large_panels = StreamField([('panel', GetInvolvedLargePanel())], use_json_field=True, blank=True, null=True) dogear_box_title = models.CharField(default="Connect with our OSM community!") dogear_box_link_text = models.CharField(default="Contact by Country") - dogear_box_link_url = models.URLField(blank=True) + dogear_box_link = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) events_title = models.CharField(default="Events") view_all_events_text = models.CharField(default="View all Events") - view_all_events_link = models.URLField(blank=True) + view_all_events_url = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) events = StreamField([('event', PageChooserBlock(page_type="events.IndividualEventPage"))], use_json_field=True, null=True, blank=True, max_num=3) join_us_title = models.CharField(default="Join Us") @@ -62,10 +64,10 @@ class GetInvolvedPage(Page): join_us_panel_read_more = models.CharField(default="Read More") red_box_title = models.CharField(default="Support HOT's work!") red_box_link_text = models.CharField(default="Donate Today") - red_box_link_url = models.URLField(null=True, blank=True) + red_box_link = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) black_box_title = models.CharField(default="Stay in Touch") black_box_link_text = models.CharField(default="Contact Us") - black_box_link_url = models.URLField(null=True, blank=True) + black_box_link = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) content_panels = Page.content_panels + [ FieldPanel('header_image'), @@ -74,17 +76,17 @@ class GetInvolvedPage(Page): FieldPanel('partner_with_us_title'), FieldPanel('partner_with_us_description'), FieldPanel('partner_with_us_button_text'), - FieldPanel('partner_with_us_button_link'), + FieldPanel('partner_with_us_button_url'), ], heading="Partner With Us"), MultiFieldPanel([ FieldPanel('get_involved_community_title'), FieldPanel('get_involved_large_panels'), FieldPanel('dogear_box_title'), FieldPanel('dogear_box_link_text'), - FieldPanel('dogear_box_link_url'), + FieldPanel('dogear_box_link'), FieldPanel('events_title'), FieldPanel('view_all_events_text'), - FieldPanel('view_all_events_link'), + FieldPanel('view_all_events_url'), FieldPanel('events'), ], heading="Get Involved in Our Community"), MultiFieldPanel([ @@ -93,9 +95,9 @@ class GetInvolvedPage(Page): FieldPanel('join_us_panel_read_more'), FieldPanel('red_box_title'), FieldPanel('red_box_link_text'), - FieldPanel('red_box_link_url'), + FieldPanel('red_box_link'), FieldPanel('black_box_title'), FieldPanel('black_box_link_text'), - FieldPanel('black_box_link_url'), + FieldPanel('black_box_link'), ], heading="Bottom Area"), ] diff --git a/app/get_involved/templates/get_involved/get_involved_page.html b/app/get_involved/templates/get_involved/get_involved_page.html index 7343149..ede609b 100644 --- a/app/get_involved/templates/get_involved/get_involved_page.html +++ b/app/get_involved/templates/get_involved/get_involved_page.html @@ -12,7 +12,7 @@ {% block content %} {% include "ui/components/BasePageHeader.html" with title=page.title image=page.header_image %}
- {% include "ui/components/sections/BaseSectionWithImage.html" with title=page.partner_with_us_title image=page.partner_with_us_image imageright=True title_underline=True red_button=True button_text=page.partner_with_us_button_text button_link=page.partner_with_us_button_link description=page.partner_with_us_description imagenotwide=True imagebottom=True%} + {% include "ui/components/sections/BaseSectionWithImage.html" with title=page.partner_with_us_title image=page.partner_with_us_image imageright=True title_underline=True red_button=True button_text=page.partner_with_us_button_text button_link=page.partner_with_us_button_url description=page.partner_with_us_description imagenotwide=True imagebottom=True%}
@@ -21,15 +21,15 @@ {% include "ui/components/TitleWithUnderline.html" with title=page.get_involved_community_title %}
{% for panel in page.get_involved_large_panels %} - {% include "ui/components/misc_panels/LinkBlockWithImage.html" with title=panel.value.title image=panel.value.image description=panel.value.description linktext=panel.value.link_text linkurl=panel.value.link_url %} + {% include "ui/components/misc_panels/LinkBlockWithImage.html" with title=panel.value.title image=panel.value.image description=panel.value.description linktext=panel.value.link_text linkurl=panel.value.link %} {% endfor %}
- {% include "ui/components/dogear_boxes/DogearAnyColourLong.html" with title=page.dogear_box_title linktext=page.dogear_box_link_text linkurl=page.dogear_box_link_url textcolour="black" colour="var(--hot-light-grey)" arrowcolour="black" %} + {% include "ui/components/dogear_boxes/DogearAnyColourLong.html" with title=page.dogear_box_title linktext=page.dogear_box_link_text linkurl=page.dogear_box_link textcolour="black" colour="var(--hot-light-grey)" arrowcolour="black" %}
- {% include "ui/components/FlexTitleWithLink.html" with title=page.events_title linktext=page.view_all_events_text linkurl=page.view_all_events_link class="my-4" %} + {% include "ui/components/FlexTitleWithLink.html" with title=page.events_title linktext=page.view_all_events_text linkurl=page.view_all_events_url class="my-4" %}
{% for event in page.events %} {% include "ui/components/events/EventPreviewBlockEvent.html" with event=event.value showimage=True %} @@ -39,22 +39,22 @@
-
+
{% include "ui/components/TitleWithUnderline.html" with title=page.join_us_title %} -
+
{% for panel in page.join_us_panels %} - {% include "ui/components/misc_panels/PagePreviewWithTabletDescription.html" with image=panel.value.image page=panel.value.page tablet_description=panel.value.tablet_description read_more_text=page.join_us_panel_read_more %} + {% include "ui/components/misc_panels/PagePreviewWithTabletDescription.html" with image=panel.value.image page=panel.value.page tablet_description=panel.value.page.specific.intro read_more_text=page.join_us_panel_read_more hoverless=True %} {% endfor %}
- {% include "ui/components/dogear_boxes/DogearRed.html" with title=page.red_box_title linktext=page.red_box_link_text linkurl=page.red_box_link_url %} + {% include "ui/components/dogear_boxes/DogearRed.html" with title=page.red_box_title linktext=page.red_box_link_text linkurl=page.red_box_link %}
- {% include "ui/components/dogear_boxes/DogearBlack.html" with title=page.black_box_title linktext=page.black_box_link_text linkurl=page.black_box_link_url %} + {% include "ui/components/dogear_boxes/DogearBlack.html" with title=page.black_box_title linktext=page.black_box_link_text linkurl=page.black_box_link %}
diff --git a/app/impact_areas/migrations/0021_remove_impactareaspage_black_dogear_box_link_url_and_more.py b/app/impact_areas/migrations/0021_remove_impactareaspage_black_dogear_box_link_url_and_more.py new file mode 100644 index 0000000..cc23f63 --- /dev/null +++ b/app/impact_areas/migrations/0021_remove_impactareaspage_black_dogear_box_link_url_and_more.py @@ -0,0 +1,48 @@ +# Generated by Django 4.2.7 on 2024-09-16 21:16 + +from django.db import migrations, models +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('impact_areas', '0020_alter_individualimpactareapage_use_cases'), + ] + + operations = [ + migrations.RemoveField( + model_name='impactareaspage', + name='black_dogear_box_link_url', + ), + migrations.RemoveField( + model_name='impactareaspage', + name='red_dogear_box_link_url', + ), + migrations.RemoveField( + model_name='impactareaspage', + name='view_all_projects_link', + ), + migrations.AddField( + model_name='impactareaspage', + name='black_dogear_box_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], blank=True, use_json_field=True), + ), + migrations.AddField( + model_name='impactareaspage', + name='learn_more_text', + field=models.CharField(default='Learn more'), + ), + migrations.AddField( + model_name='impactareaspage', + name='red_dogear_box_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], blank=True, use_json_field=True), + ), + migrations.AddField( + model_name='impactareaspage', + name='view_all_projects_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], blank=True, use_json_field=True), + ), + ] diff --git a/app/impact_areas/migrations/0022_alter_impactareaspage_black_dogear_box_link_and_more.py b/app/impact_areas/migrations/0022_alter_impactareaspage_black_dogear_box_link_and_more.py new file mode 100644 index 0000000..bfacce5 --- /dev/null +++ b/app/impact_areas/migrations/0022_alter_impactareaspage_black_dogear_box_link_and_more.py @@ -0,0 +1,36 @@ +# Generated by Django 4.2.7 on 2024-10-10 17:41 + +from django.db import migrations +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('impact_areas', '0021_remove_impactareaspage_black_dogear_box_link_url_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='impactareaspage', + name='black_dogear_box_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='impactareaspage', + name='red_dogear_box_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='impactareaspage', + name='view_all_projects_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='individualimpactareapage', + name='use_cases', + field=wagtail.fields.StreamField([('blocks', wagtail.blocks.StructBlock([('description', wagtail.blocks.RichTextBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link', wagtail.blocks.StreamBlock([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, null=True))]))], blank=True, null=True, use_json_field=True), + ), + ] diff --git a/app/impact_areas/migrations/0023_individualimpactareapage_description_extended_and_more.py b/app/impact_areas/migrations/0023_individualimpactareapage_description_extended_and_more.py new file mode 100644 index 0000000..6baec69 --- /dev/null +++ b/app/impact_areas/migrations/0023_individualimpactareapage_description_extended_and_more.py @@ -0,0 +1,31 @@ +# Generated by Django 4.2.7 on 2024-11-05 20:27 + +from django.db import migrations, models +import django.db.models.deletion +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtailimages', '0026_delete_uploadedimage'), + ('impact_areas', '0022_alter_impactareaspage_black_dogear_box_link_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='individualimpactareapage', + name='description_extended', + field=wagtail.fields.RichTextField(blank=True), + ), + migrations.AlterField( + model_name='individualimpactareapage', + name='external_icon', + field=models.ForeignKey(blank=True, help_text="The icon representing this page which is shown for previews of this page on other pages. This should be a purely black image which is ideally as wide as it is tall. It also appears in the first block of this impact area's page.", null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image'), + ), + migrations.AlterField( + model_name='individualimpactareapage', + name='intro_image', + field=models.ForeignKey(blank=True, help_text="This image will show on the home page's previews for impact areas.", null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image'), + ), + ] diff --git a/app/impact_areas/migrations/0024_alter_individualimpactareapage_use_cases.py b/app/impact_areas/migrations/0024_alter_individualimpactareapage_use_cases.py new file mode 100644 index 0000000..844315a --- /dev/null +++ b/app/impact_areas/migrations/0024_alter_individualimpactareapage_use_cases.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.7 on 2024-11-05 22:47 + +from django.db import migrations +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('impact_areas', '0023_individualimpactareapage_description_extended_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='individualimpactareapage', + name='use_cases', + field=wagtail.fields.StreamField([('blocks', 7)], blank=True, block_lookup={0: ('wagtail.blocks.CharBlock', (), {}), 1: ('wagtail.blocks.RichTextBlock', (), {}), 2: ('wagtail.blocks.PageChooserBlock', (), {}), 3: ('wagtail.blocks.URLBlock', (), {}), 4: ('wagtail.documents.blocks.DocumentChooserBlock', (), {}), 5: ('wagtail.blocks.CharBlock', (), {'help_text': "Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."}), 6: ('wagtail.blocks.StreamBlock', [[('page', 2), ('url', 3), ('document', 4), ('other', 5)]], {'blank': True, 'null': True}), 7: ('wagtail.blocks.StructBlock', [[('title', 0), ('description', 1), ('link_text', 0), ('link', 6)]], {})}, null=True), + ), + ] diff --git a/app/impact_areas/models.py b/app/impact_areas/models.py index 620b938..ed60ef1 100644 --- a/app/impact_areas/models.py +++ b/app/impact_areas/models.py @@ -13,6 +13,7 @@ class UseCaseStructBlock(StructBlock): + title = CharBlock() description = RichTextBlock() link_text = CharBlock() link = LinkOrPageBlock(blank=True, null=True) @@ -26,8 +27,10 @@ class IndividualImpactAreaPage(Page): def get_context(self, request, *args, **kwargs): context = super().get_context(request, *args, **kwargs) + context['baseid'] = str(context['page'].get_translation(1).id) + projects_list = IndividualProjectPage.objects.live().filter( - Q(impact_area_list__contains=[{'type': 'impact_area', 'value': context['page'].id}]) + Q(impact_area_list__contains=[{'type': 'impact_area', 'value': context['page'].get_translation(1).id}]) ).filter(locale=context['page'].locale) page = request.GET.get('page', 1) paginator = Paginator(projects_list, 8) # if you want more/less items per page (i.e., per load), change the number here to something else @@ -63,19 +66,20 @@ def get_context(self, request, *args, **kwargs): blank=True, on_delete=models.SET_NULL, related_name="+", - help_text="The icon representing this page which is shown for previews of this page on other pages. This should be a purely black image which is ideally as wide as it is tall." + help_text="The icon representing this page which is shown for previews of this page on other pages. This should be a purely black image which is ideally as wide as it is tall. It also appears in the first block of this impact area's page." ) - intro = RichTextField(blank=True, help_text="This text will not be shown on the page itself, and will instead be shown as the short description for the page for instances such as the Search page or the Impact Areas page.") - intro_image = models.ForeignKey( "wagtailimages.Image", null=True, blank=True, on_delete=models.SET_NULL, related_name="+", - help_text="Intro image" + help_text="This image will show on the home page's previews for impact areas." ) + intro = RichTextField(blank=True, help_text="This text will not be shown on the page itself, and will instead be shown as the short description for the page for instances such as the Search page or the Impact Areas page.") + description = RichTextField(blank=True) + description_extended = RichTextField(blank=True) use_cases = StreamField(UseCaseBlock(), use_json_field=True, blank=True, null=True) @@ -87,10 +91,11 @@ def get_context(self, request, *args, **kwargs): MultiFieldPanel([ FieldPanel('external_icon'), FieldPanel('intro'), + FieldPanel('intro_image'), ], heading="External"), MultiFieldPanel([ - FieldPanel('intro_image'), FieldPanel('description'), + FieldPanel('description_extended'), ], heading="Body"), MultiFieldPanel([ FieldPanel('use_cases'), @@ -118,23 +123,25 @@ class ImpactAreasPage(Page): intro = RichTextField(blank=True) description = RichTextField(blank=True) + learn_more_text = models.CharField(default="Learn more") + # > IMPACT AREA SHARED FIELDS use_cases_title = models.CharField(default="Use Cases") projects_title = models.CharField(default="Projects") view_all_projects_text = models.CharField(default="View all projects") - view_all_projects_link = models.URLField(blank=True) + view_all_projects_url = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) load_more_projects_text = models.CharField(default="Load More Projects") explore_impact_areas_text = models.CharField(default="Explore Other Impact Areas") red_dogear_box_title = models.CharField(default="Learn more about Tools & Resources and Data Access") red_dogear_box_link_text = models.CharField(default="View Tools & Resources") - red_dogear_box_link_url = models.URLField(blank=True) + red_dogear_box_link = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) black_dogear_box_title = models.CharField(default="Check many opportunities to get involved with HOT!") black_dogear_box_link_text = models.CharField(default="Get Involved with HOT") - black_dogear_box_link_url = models.URLField(blank=True) + black_dogear_box_link = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) content_panels = Page.content_panels + [ MultiFieldPanel([ @@ -143,6 +150,7 @@ class ImpactAreasPage(Page): ], heading="Header section"), FieldPanel('intro'), FieldPanel('description'), + FieldPanel('learn_more_text'), MultiFieldPanel([ MultiFieldPanel([ FieldPanel('use_cases_title'), @@ -150,17 +158,17 @@ class ImpactAreasPage(Page): MultiFieldPanel([ FieldPanel('projects_title'), FieldPanel('view_all_projects_text'), - FieldPanel('view_all_projects_link'), + FieldPanel('view_all_projects_url'), FieldPanel('load_more_projects_text'), ], heading="Projects"), FieldPanel('explore_impact_areas_text'), MultiFieldPanel([ FieldPanel('red_dogear_box_title'), FieldPanel('red_dogear_box_link_text'), - FieldPanel('red_dogear_box_link_url'), + FieldPanel('red_dogear_box_link'), FieldPanel('black_dogear_box_title'), FieldPanel('black_dogear_box_link_text'), - FieldPanel('black_dogear_box_link_url'), + FieldPanel('black_dogear_box_link'), ], heading="Dogear Boxes"), ], heading="Impact Area Shared Fields"), ] diff --git a/app/impact_areas/templates/impact_areas/components/UseCaseBox.html b/app/impact_areas/templates/impact_areas/components/UseCaseBox.html index 51c452a..2ae261c 100644 --- a/app/impact_areas/templates/impact_areas/components/UseCaseBox.html +++ b/app/impact_areas/templates/impact_areas/components/UseCaseBox.html @@ -2,13 +2,10 @@

{{ number }}.

-
+
{{ body }}
- -

- {{ linktext }} - {% include "ui/components/icon_svgs/LinkCaret.html" %} -

- +
+ {% include "ui/components/BaseLinkNoUnderline.html" %} +
\ No newline at end of file diff --git a/app/impact_areas/templates/impact_areas/impact_areas_page.html b/app/impact_areas/templates/impact_areas/impact_areas_page.html index f31ba28..30b36a3 100644 --- a/app/impact_areas/templates/impact_areas/impact_areas_page.html +++ b/app/impact_areas/templates/impact_areas/impact_areas_page.html @@ -12,8 +12,8 @@ {% block content %} {% include "ui/components/BasePageHeader.html" with title=page.title intro=page.header_text image=page.image %} -
-
+
+
{{page.intro|richtext}}
@@ -23,9 +23,9 @@
-
+
{% for child in page.get_children %} - {% include "ui/components/impact_areas/ImpactAreaPreviewBlock.html" with ia=child.specific %} + {% include "ui/components/impact_areas/ImpactAreaPreviewBlock.html" with ia=child.specific learn_more_text=page.learn_more_text %} {% endfor %}
{% endblock %} \ No newline at end of file diff --git a/app/impact_areas/templates/impact_areas/individual_impact_area_page.html b/app/impact_areas/templates/impact_areas/individual_impact_area_page.html index 8c05f76..17d88d3 100644 --- a/app/impact_areas/templates/impact_areas/individual_impact_area_page.html +++ b/app/impact_areas/templates/impact_areas/individual_impact_area_page.html @@ -3,7 +3,7 @@ {% load wagtailcore_tags %} {% load wagtailimages_tags %} {% load compress %} -{% block body_class %}template-individualmappinghubpage{% endblock %} +{% block body_class %}template-individualimpactareapage{% endblock %} {% block extra_css %} {% compress css %} {% endcompress css %} @@ -12,29 +12,36 @@ {% block content %} {% include "ui/components/PageHeaderWithBlur.html" with title=page.title subtitle=page.header_text image=page.header_image full_length=True endinlarge=True %} -
-
- {% comment %} MAIN BODY {% endcomment %} -
-
-
+
+
+
+ {% image page.external_icon original class="h-28 w-auto black-image-redifier hidden lg:block" %} +
+ {% image page.external_icon original class="h-28 w-auto black-image-redifier" %} +
+
+
{{ page.description|richtext }}
+
+ {{ page.description_extended|richtext }} +
- {% image page.intro_image original class="pb-8 lg:order-1 w-full h-auto" %}
+
+
+
+
{% comment %} USE CASES {% endcomment %} {% include "ui/components/SectionHeadingWithUnderline.html" with title=page.get_parent.specific.use_cases_title %} -
- {% for case in page.use_cases %} - {% include "./components/UseCaseBox.html" with number=forloop.counter body=case.value.description linktext=case.value.link_text linkurl=case.value.link %} - {% endfor %} +
+ {% include "ui/components/carousel/CarouselImpactAreaUseCases.html" with items=page.use_cases %}
{% comment %} PROJECTS {% endcomment %}
- {% include "ui/components/FlexTitleWithLink.html" with title=page.get_parent.specific.projects_title linktext=page.get_parent.specific.view_all_projects_text linkurl=page.view_all_projects_link titleclass="text-h2" %} + {% include "ui/components/FlexTitleWithLink.html" with title=page.get_parent.specific.projects_title linktext=page.get_parent.specific.view_all_projects_text linkurl=page.get_parent.specific.view_all_projects_url titleclass="text-h2" linkappendage="?ia"|add:baseid|add:"=on" %}
{% for project in projects %} {% include "ui/components/projects/ProjectPreviewBlockNews.html" with project=project showimage=True %} @@ -49,7 +56,7 @@ hx-swap="beforeend" hx-select-oob="#projects-list:beforeend, #next-project:outerHTML" > - + {{page.get_parent.specific.load_more_projects_text}} {% include "ui/components/icon_svgs/LinkCaret.html" with class="rotate-90 text-hot-red" %} @@ -76,10 +83,10 @@

{% comment %} DOGEAR BOXES {% endcomment %}
- {% include "ui/components/dogear_boxes/DogearRed.html" with title=page.get_parent.specific.red_dogear_box_title linktext=page.get_parent.specific.red_dogear_box_link_text linkurl=page.get_parent.specific.red_dogear_box_link_url %} + {% include "ui/components/dogear_boxes/DogearRed.html" with title=page.get_parent.specific.red_dogear_box_title linktext=page.get_parent.specific.red_dogear_box_link_text linkurl=page.get_parent.specific.red_dogear_box_link %}
- {% include "ui/components/dogear_boxes/DogearBlack.html" with title=page.get_parent.specific.black_dogear_box_title linktext=page.get_parent.specific.black_dogear_box_link_text linkurl=page.get_parent.specific.black_dogear_box_link_url %} + {% include "ui/components/dogear_boxes/DogearBlack.html" with title=page.get_parent.specific.black_dogear_box_title linktext=page.get_parent.specific.black_dogear_box_link_text linkurl=page.get_parent.specific.black_dogear_box_link %}

diff --git a/app/job_opportunities/__init__.py b/app/job_opportunities/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/job_opportunities/admin.py b/app/job_opportunities/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/app/job_opportunities/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/app/job_opportunities/apps.py b/app/job_opportunities/apps.py new file mode 100644 index 0000000..95f6fef --- /dev/null +++ b/app/job_opportunities/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class JobOpportunitiesConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'app.job_opportunities' diff --git a/app/job_opportunities/migrations/0001_initial.py b/app/job_opportunities/migrations/0001_initial.py new file mode 100644 index 0000000..4bc2842 --- /dev/null +++ b/app/job_opportunities/migrations/0001_initial.py @@ -0,0 +1,47 @@ +# Generated by Django 4.2.7 on 2024-09-24 21:19 + +from django.db import migrations, models +import django.db.models.deletion +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('wagtailimages', '0025_alter_image_file_alter_rendition_file'), + ('wagtailcore', '0089_log_entry_data_json_null_to_object'), + ] + + operations = [ + migrations.CreateModel( + name='JobOpportunitiesPage', + fields=[ + ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')), + ('header_text', wagtail.fields.RichTextField(blank=True)), + ('intro', wagtail.fields.RichTextField(blank=True)), + ('description', wagtail.fields.RichTextField(blank=True)), + ('positions_title', models.CharField(default='Open Positions')), + ('sidebar_block_text', wagtail.fields.RichTextField(blank=True)), + ('rfp_banner_title', models.CharField(default='Request for Proposals')), + ('rfp_banner_description', wagtail.fields.RichTextField(blank=True)), + ('rfp_banner_button_text', models.CharField(default='View all request for proposals')), + ('rfp_banner_button_link', wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], blank=True, use_json_field=True)), + ('red_box_title', models.CharField(default='Join a working group')), + ('red_box_link_text', models.CharField(default='Working Groups')), + ('red_box_link_url', wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], blank=True, use_json_field=True)), + ('black_box_title', models.CharField(default='Contact a mapping community')), + ('black_box_link_text', models.CharField(default='Community Contact')), + ('black_box_link_url', wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], blank=True, use_json_field=True)), + ('header_image', models.ForeignKey(blank=True, help_text='Header image', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image')), + ('rfp_banner_image', models.ForeignKey(blank=True, help_text='RFP banner image', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image')), + ], + options={ + 'abstract': False, + }, + bases=('wagtailcore.page',), + ), + ] diff --git a/app/job_opportunities/migrations/0002_jobopportunitiespage_black_box_description_and_more.py b/app/job_opportunities/migrations/0002_jobopportunitiespage_black_box_description_and_more.py new file mode 100644 index 0000000..bb8de99 --- /dev/null +++ b/app/job_opportunities/migrations/0002_jobopportunitiespage_black_box_description_and_more.py @@ -0,0 +1,44 @@ +# Generated by Django 4.2.7 on 2024-09-24 21:29 + +from django.db import migrations, models +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('job_opportunities', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='jobopportunitiespage', + name='black_box_description', + field=wagtail.fields.RichTextField(blank=True), + ), + migrations.AddField( + model_name='jobopportunitiespage', + name='red_box_description', + field=wagtail.fields.RichTextField(blank=True), + ), + migrations.AlterField( + model_name='jobopportunitiespage', + name='black_box_link_text', + field=models.CharField(default='Learn the benefits of working for HOT'), + ), + migrations.AlterField( + model_name='jobopportunitiespage', + name='black_box_title', + field=models.CharField(default='Work Culture & Benefits'), + ), + migrations.AlterField( + model_name='jobopportunitiespage', + name='red_box_link_text', + field=models.CharField(default='Salary Framework'), + ), + migrations.AlterField( + model_name='jobopportunitiespage', + name='red_box_title', + field=models.CharField(default='HOT Salary Framework'), + ), + ] diff --git a/app/job_opportunities/migrations/0003_alter_jobopportunitiespage_black_box_link_url_and_more.py b/app/job_opportunities/migrations/0003_alter_jobopportunitiespage_black_box_link_url_and_more.py new file mode 100644 index 0000000..06f8b29 --- /dev/null +++ b/app/job_opportunities/migrations/0003_alter_jobopportunitiespage_black_box_link_url_and_more.py @@ -0,0 +1,31 @@ +# Generated by Django 4.2.7 on 2024-10-10 17:41 + +from django.db import migrations +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('job_opportunities', '0002_jobopportunitiespage_black_box_description_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='jobopportunitiespage', + name='black_box_link_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='jobopportunitiespage', + name='red_box_link_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='jobopportunitiespage', + name='rfp_banner_button_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + ] diff --git a/app/job_opportunities/migrations/__init__.py b/app/job_opportunities/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/job_opportunities/models.py b/app/job_opportunities/models.py new file mode 100644 index 0000000..2a0f55b --- /dev/null +++ b/app/job_opportunities/models.py @@ -0,0 +1,83 @@ +from django.db import models +from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger + +from wagtail.admin.panels import FieldPanel, MultiFieldPanel +from wagtail.fields import RichTextField, StreamField +from wagtail.blocks import CharBlock, StreamBlock, StructBlock, URLBlock, RichTextBlock, PageChooserBlock, EmailBlock +from wagtail.images.blocks import ImageChooserBlock +from wagtail.models import Page +from wagtail.documents.blocks import DocumentChooserBlock +from wagtail.contrib.table_block.blocks import TableBlock + +from app.core.models import LinkOrPageBlock + + +class JobOpportunitiesPage(Page): + max_count = 1 + + header_image = models.ForeignKey( + "wagtailimages.Image", + null=True, + blank=True, + on_delete=models.SET_NULL, + related_name="+", + help_text="Header image" + ) + header_text = RichTextField(blank=True) + + intro = RichTextField(blank=True) + description = RichTextField(blank=True) + positions_title = models.CharField(default="Open Positions") + sidebar_block_text = RichTextField(blank=True) + + rfp_banner_image = models.ForeignKey( + "wagtailimages.Image", + null=True, + blank=True, + on_delete=models.SET_NULL, + related_name="+", + help_text="RFP banner image" + ) + rfp_banner_title = models.CharField(default="Request for Proposals") + rfp_banner_description = RichTextField(blank=True) + rfp_banner_button_text = models.CharField(default="View all request for proposals") + rfp_banner_button_link = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) + + red_box_title = models.CharField(default="HOT Salary Framework") + red_box_description = RichTextField(blank=True) + red_box_link_text = models.CharField(default="Salary Framework") + red_box_link_url = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) + black_box_title = models.CharField(default="Work Culture & Benefits") + black_box_description = RichTextField(blank=True) + black_box_link_text = models.CharField(default="Learn the benefits of working for HOT") + black_box_link_url = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) + + content_panels = Page.content_panels + [ + MultiFieldPanel([ + FieldPanel('header_image'), + FieldPanel('header_text'), + ], heading="Header"), + MultiFieldPanel([ + FieldPanel('intro'), + FieldPanel('description'), + FieldPanel('positions_title'), + FieldPanel('sidebar_block_text'), + ], heading="Main Body"), + MultiFieldPanel([ + FieldPanel('rfp_banner_image'), + FieldPanel('rfp_banner_title'), + FieldPanel('rfp_banner_description'), + FieldPanel('rfp_banner_button_text'), + FieldPanel('rfp_banner_button_link'), + ], heading="RFP Banner"), + MultiFieldPanel([ + FieldPanel('red_box_title'), + FieldPanel('red_box_description'), + FieldPanel('red_box_link_text'), + FieldPanel('red_box_link_url'), + FieldPanel('black_box_title'), + FieldPanel('black_box_description'), + FieldPanel('black_box_link_text'), + FieldPanel('black_box_link_url'), + ], heading="Dogear Box"), + ] diff --git a/app/job_opportunities/templates/job_opportunities/components/AsideBlock.html b/app/job_opportunities/templates/job_opportunities/components/AsideBlock.html new file mode 100644 index 0000000..0035e67 --- /dev/null +++ b/app/job_opportunities/templates/job_opportunities/components/AsideBlock.html @@ -0,0 +1,4 @@ +{% load wagtailcore_tags %} +
+ {{page.sidebar_block_text|richtext}} +
\ No newline at end of file diff --git a/app/job_opportunities/templates/job_opportunities/components/BambooHRScript.html b/app/job_opportunities/templates/job_opportunities/components/BambooHRScript.html new file mode 100644 index 0000000..6979f20 --- /dev/null +++ b/app/job_opportunities/templates/job_opportunities/components/BambooHRScript.html @@ -0,0 +1,75 @@ + \ No newline at end of file diff --git a/app/job_opportunities/templates/job_opportunities/job_opportunities_page.html b/app/job_opportunities/templates/job_opportunities/job_opportunities_page.html new file mode 100644 index 0000000..adc9d82 --- /dev/null +++ b/app/job_opportunities/templates/job_opportunities/job_opportunities_page.html @@ -0,0 +1,60 @@ +{% extends "base.html" %} +{% load static %} +{% load wagtailcore_tags %} +{% load wagtailimages_tags %} +{% load compress %} +{% block body_class %}template-jobopportunitiespage{% endblock %} +{% block extra_css %} + {% compress css %} + {% endcompress css %} +{% endblock extra_css %} + +{% block content %} + {% include "ui/components/PageHeaderWithBlur.html" with title=page.title subtitle=page.header_text image=page.header_image full_length=True smaller=True %} + +
+
+
+
+
+ {{page.intro|richtext}} +
+
+ {{page.description|richtext}} +
+ + {% include "ui/components/TitleWithUnderline.html" with title=page.positions_title %} +
+
+ +
+
+
+ +
+ {% include "ui/components/sections/NavyBackgroundWithImage.html" with image=page.rfp_banner_image title=page.rfp_banner_title description=page.rfp_banner_description button_text=page.rfp_banner_button_text button_link=page.rfp_banner_button_link imageright=True %} +
+ +
+
+
+
+ {% include "ui/components/dogear_boxes/DogearRed.html" with title=page.red_box_title description=page.red_box_description linktext=page.red_box_link_text linkurl=page.red_box_link_url %} +
+
+ {% include "ui/components/dogear_boxes/DogearBlack.html" with title=page.black_box_title description=page.black_box_description linktext=page.black_box_link_text linkurl=page.black_box_link_url %} +
+
+
+
+ +
+
+ {% include "./components/AsideBlock.html" %} +
+
+ + {% include "./components/BambooHRScript.html" %} +{% endblock %} \ No newline at end of file diff --git a/app/job_opportunities/tests.py b/app/job_opportunities/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/app/job_opportunities/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/app/job_opportunities/views.py b/app/job_opportunities/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/app/job_opportunities/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/app/mapping_hubs/migrations/0019_remove_individualmappinghubpage_partners_and_more.py b/app/mapping_hubs/migrations/0019_remove_individualmappinghubpage_partners_and_more.py new file mode 100644 index 0000000..364405e --- /dev/null +++ b/app/mapping_hubs/migrations/0019_remove_individualmappinghubpage_partners_and_more.py @@ -0,0 +1,25 @@ +# Generated by Django 4.2.7 on 2024-09-17 19:56 + +import app.core.models +from django.db import migrations +import wagtail.fields +import wagtail.snippets.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('mapping_hubs', '0018_alter_individualmappinghubpage_contact_section_links_and_more'), + ] + + operations = [ + migrations.RemoveField( + model_name='individualmappinghubpage', + name='partners', + ), + migrations.AddField( + model_name='individualmappinghubpage', + name='partner_list', + field=wagtail.fields.StreamField([('partner', wagtail.snippets.blocks.SnippetChooserBlock(app.core.models.Partner))], blank=True, null=True, use_json_field=True), + ), + ] diff --git a/app/mapping_hubs/migrations/0020_alter_openmappinghubspage_learn_more_text.py b/app/mapping_hubs/migrations/0020_alter_openmappinghubspage_learn_more_text.py new file mode 100644 index 0000000..d6a0819 --- /dev/null +++ b/app/mapping_hubs/migrations/0020_alter_openmappinghubspage_learn_more_text.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.7 on 2024-09-25 21:50 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mapping_hubs', '0019_remove_individualmappinghubpage_partners_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='openmappinghubspage', + name='learn_more_text', + field=models.CharField(default='Learn More'), + ), + ] diff --git a/app/mapping_hubs/migrations/0021_alter_individualmappinghubpage_contact_section_links_and_more.py b/app/mapping_hubs/migrations/0021_alter_individualmappinghubpage_contact_section_links_and_more.py new file mode 100644 index 0000000..3d95c74 --- /dev/null +++ b/app/mapping_hubs/migrations/0021_alter_individualmappinghubpage_contact_section_links_and_more.py @@ -0,0 +1,76 @@ +# Generated by Django 4.2.7 on 2024-10-10 17:41 + +from django.db import migrations +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('mapping_hubs', '0020_alter_openmappinghubspage_learn_more_text'), + ] + + operations = [ + migrations.AlterField( + model_name='individualmappinghubpage', + name='contact_section_links', + field=wagtail.fields.StreamField([('blocks', wagtail.blocks.StructBlock([('link_text', wagtail.blocks.CharBlock(required=True)), ('link_url', wagtail.blocks.StreamBlock([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, required=False))]))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='individualmappinghubpage', + name='dogear_boxes', + field=wagtail.fields.StreamField([('blocks', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(required=True)), ('description', wagtail.blocks.RichTextBlock(required=False)), ('link_text', wagtail.blocks.CharBlock(required=True)), ('link_url', wagtail.blocks.StreamBlock([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, required=False))]))], blank=True, help_text="These are, for example, the 'Grants' and 'Map and Chat Hour' boxes in the Asia-Pacific page. Please only add these in pairs of 2!", use_json_field=True), + ), + migrations.AlterField( + model_name='individualmappinghubpage', + name='events_section_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='individualmappinghubpage', + name='header_project_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='individualmappinghubpage', + name='news_section_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='individualmappinghubpage', + name='project_section_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='individualmappinghubpage', + name='subscribe_box_signup_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='mappinghubprojectspage', + name='black_box_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='mappinghubprojectspage', + name='red_box_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='openmappinghubspage', + name='header_events_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='openmappinghubspage', + name='header_news_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='openmappinghubspage', + name='partners_section_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + ] diff --git a/app/mapping_hubs/migrations/0022_individualmappinghubpage_hub_portrait_image.py b/app/mapping_hubs/migrations/0022_individualmappinghubpage_hub_portrait_image.py new file mode 100644 index 0000000..65777b3 --- /dev/null +++ b/app/mapping_hubs/migrations/0022_individualmappinghubpage_hub_portrait_image.py @@ -0,0 +1,20 @@ +# Generated by Django 4.2.7 on 2024-10-21 18:54 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtailimages', '0026_delete_uploadedimage'), + ('mapping_hubs', '0021_alter_individualmappinghubpage_contact_section_links_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='individualmappinghubpage', + name='hub_portrait_image', + field=models.ForeignKey(blank=True, help_text="The image which shows for this hub on the home page in the 'Open Mapping Hubs' section in large screen sizes. This image should be more of a portrait, centered on what you want to be shown.", null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image'), + ), + ] diff --git a/app/mapping_hubs/migrations/0023_openmappinghubspage_header_project_link.py b/app/mapping_hubs/migrations/0023_openmappinghubspage_header_project_link.py new file mode 100644 index 0000000..7f885c8 --- /dev/null +++ b/app/mapping_hubs/migrations/0023_openmappinghubspage_header_project_link.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.7 on 2024-11-06 22:50 + +from django.db import migrations +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('mapping_hubs', '0022_individualmappinghubpage_hub_portrait_image'), + ] + + operations = [ + migrations.AddField( + model_name='openmappinghubspage', + name='header_project_link', + field=wagtail.fields.StreamField([('page', 0), ('url', 1), ('document', 2), ('other', 3)], blank=True, block_lookup={0: ('wagtail.blocks.PageChooserBlock', (), {}), 1: ('wagtail.blocks.URLBlock', (), {}), 2: ('wagtail.documents.blocks.DocumentChooserBlock', (), {}), 3: ('wagtail.blocks.CharBlock', (), {'help_text': "Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."})}), + ), + ] diff --git a/app/mapping_hubs/migrations/0024_delete_mappinghubprojectspage.py b/app/mapping_hubs/migrations/0024_delete_mappinghubprojectspage.py new file mode 100644 index 0000000..28270ff --- /dev/null +++ b/app/mapping_hubs/migrations/0024_delete_mappinghubprojectspage.py @@ -0,0 +1,16 @@ +# Generated by Django 4.2.7 on 2024-11-06 22:52 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('mapping_hubs', '0023_openmappinghubspage_header_project_link'), + ] + + operations = [ + migrations.DeleteModel( + name='MappingHubProjectsPage', + ), + ] diff --git a/app/mapping_hubs/migrations/0025_remove_individualmappinghubpage_header_project_link.py b/app/mapping_hubs/migrations/0025_remove_individualmappinghubpage_header_project_link.py new file mode 100644 index 0000000..4d89f60 --- /dev/null +++ b/app/mapping_hubs/migrations/0025_remove_individualmappinghubpage_header_project_link.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.7 on 2024-11-06 22:55 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('mapping_hubs', '0024_delete_mappinghubprojectspage'), + ] + + operations = [ + migrations.RemoveField( + model_name='individualmappinghubpage', + name='header_project_link', + ), + ] diff --git a/app/mapping_hubs/models.py b/app/mapping_hubs/models.py index 5b96bde..d1b8dd1 100644 --- a/app/mapping_hubs/models.py +++ b/app/mapping_hubs/models.py @@ -5,12 +5,13 @@ from wagtail.models import Page from wagtail.fields import RichTextField, StreamField from wagtail.admin.panels import FieldPanel, MultiFieldPanel, PageChooserPanel +from wagtail.snippets.blocks import SnippetChooserBlock from wagtail.blocks import CharBlock, StreamBlock, StructBlock, URLBlock, RichTextBlock, PageChooserBlock from modelcluster.fields import ParentalKey, ParentalManyToManyField from app.projects.models import IndividualProjectPage from app.ui.models import CarouselBlock -from app.core.models import LinkOrPageBlock +from app.core.models import LinkOrPageBlock, Partner class ContactLinkStructBlock(StructBlock): @@ -33,49 +34,6 @@ class DogearBoxBlock(StreamBlock): blocks = DogearBoxStructBlock() -class MappingHubProjectsPage(Page): - def get_context(self, request): - context = super().get_context(request) - - parent_hub = context['page'].get_parent() - - projects = IndividualProjectPage.objects.live().filter( - Q(region_hub_list__contains=[{'type': 'region_hub', 'value': parent_hub.id}]) - ).filter(locale=context['page'].locale) - - other_hubs_projects = MappingHubProjectsPage.objects.live().filter(locale=context['page'].locale) - - context['projects'] = projects - context['other_hubs'] = other_hubs_projects - return context - - parent_page_types = [ - 'mapping_hubs.IndividualMappingHubPage' - ] - - load_more_projects_text = models.CharField(default="Load More Projects") - - projects_by_hub_title = models.CharField(default="See Projects by Open Mapping Hub") - - red_box_title = models.CharField(default="See all of HOT's projects") - red_box_link_text = models.CharField(default="Explore projects") - red_box_link = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) - black_box_title = models.CharField(default="See the many ways to get involved with HOT and open mapping") - black_box_link_text = models.CharField(default="Get involved") - black_box_link = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) - - content_panels = Page.content_panels + [ - FieldPanel('load_more_projects_text'), - FieldPanel('projects_by_hub_title'), - FieldPanel('red_box_title'), - FieldPanel('red_box_link_text'), - FieldPanel('red_box_link'), - FieldPanel('black_box_title'), - FieldPanel('black_box_link_text'), - FieldPanel('black_box_link'), - ] - - class OpenMappingHubsPage(Page): max_count = 1 @@ -93,11 +51,12 @@ class OpenMappingHubsPage(Page): ) header_description = RichTextField(blank=True) hub_text = models.CharField(default="Hub", help_text="The text following a hub's name; i.e., if this field is 'Hub', the title for 'Asia-Pacific' would become 'Asia-Pacific Hub'.") - learn_more_text = models.CharField(default="Learn More about", help_text="The text preceeding the hub's name in the link text; i.e., if this field is 'Learn More about', the link text for 'Asia-Pacific Hub' would become 'Learn More about Asia-Pacific Hub'.") + learn_more_text = models.CharField(default="Learn More") header_hub_text_white = models.CharField(default="Open Mapping") header_hub_text_red = models.CharField(default="Hub") header_project_link_text = models.CharField(default="Projects") + header_project_link = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) header_news_link_text = models.CharField(default="News") header_news_link = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) header_events_link_text = models.CharField(default="Events") @@ -123,6 +82,7 @@ class OpenMappingHubsPage(Page): FieldPanel('header_hub_text_white'), FieldPanel('header_hub_text_red'), FieldPanel('header_project_link_text'), + FieldPanel('header_project_link'), FieldPanel('header_news_link_text'), FieldPanel('header_news_link'), FieldPanel('header_events_link_text'), @@ -141,12 +101,16 @@ class OpenMappingHubsPage(Page): class IndividualMappingHubPage(Page): def get_context(self, request): context = super().get_context(request) + original_id = context['page'].get_translation(1).id + context['original_id'] = str(original_id) + projects = IndividualProjectPage.objects.live().filter( - Q(region_hub_list__contains=[{'type': 'region_hub', 'value': context['page'].id}]) + Q(region_hub_list__contains=[{'type': 'region_hub', 'value': original_id}]) ).filter(locale=context['page'].locale) context['projects'] = projects other_hubs = IndividualMappingHubPage.objects.live().filter(locale=context['page'].locale) context['other_hubs'] = other_hubs + return context main_colour = models.CharField(default="#FFFFFF", help_text="The main colour for this mapping hub. This should be a hex code (though any type of CSS colour format will work).") @@ -166,6 +130,14 @@ def get_context(self, request): related_name="+", help_text="A larger image that represents this hub which may be shown on other pages. This should be in a 2:1 aspect ratio; ideally, at least 400x200 pixels.", ) + hub_portrait_image = models.ForeignKey( + "wagtailimages.Image", + null=True, + blank=True, + on_delete=models.SET_NULL, + related_name="+", + help_text="The image which shows for this hub on the home page in the 'Open Mapping Hubs' section in large screen sizes. This image should be more of a portrait, centered on what you want to be shown.", + ) external_description_long = RichTextField(blank=True, help_text="A long description of the page to be used in external pages, such as the Open Mapping Hubs page.") intro = RichTextField(blank=True) main_body_text = RichTextField(blank=True) @@ -178,7 +150,6 @@ def get_context(self, request): related_name="+", help_text="Header image", ) - header_project_link = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) header_carousel = StreamField(CarouselBlock(max_num=3, min_num=3), blank=True, use_json_field=True, null=True) project_section_title = models.CharField() @@ -197,7 +168,7 @@ def get_context(self, request): dogear_boxes = StreamField(DogearBoxBlock(), blank=True, use_json_field=True, help_text="These are, for example, the 'Grants' and 'Map and Chat Hour' boxes in the Asia-Pacific page. Please only add these in pairs of 2!") - partners = ParentalManyToManyField('core.Partner', blank=True) + partner_list = StreamField([('partner', SnippetChooserBlock(Partner))], use_json_field=True, null=True, blank=True) contact_section_description = RichTextField(blank=True) contact_section_links = StreamField(ContactLinkBlock(), blank=True, use_json_field=True) @@ -210,13 +181,13 @@ def get_context(self, request): FieldPanel('main_colour'), FieldPanel('main_icon'), FieldPanel('main_external_hub_image'), + FieldPanel('hub_portrait_image'), FieldPanel('external_description_long'), FieldPanel('intro'), FieldPanel('main_body_text'), ], heading="Main"), MultiFieldPanel([ FieldPanel('header_image'), - FieldPanel('header_project_link'), FieldPanel('header_carousel'), ], heading="Header"), MultiFieldPanel([ @@ -238,7 +209,7 @@ def get_context(self, request): ], heading="Events"), FieldPanel('dogear_boxes'), MultiFieldPanel([ - FieldPanel("partners", widget=forms.CheckboxSelectMultiple), + FieldPanel("partner_list"), ], heading="Partners"), MultiFieldPanel([ FieldPanel('contact_section_description'), diff --git a/app/mapping_hubs/templates/mapping_hubs/components/header.html b/app/mapping_hubs/templates/mapping_hubs/components/header.html index c869311..c4497d0 100644 --- a/app/mapping_hubs/templates/mapping_hubs/components/header.html +++ b/app/mapping_hubs/templates/mapping_hubs/components/header.html @@ -7,35 +7,30 @@ {% load wagtailimages_tags %} {% image page.header_image original as image_p %} -
+
-
+

{{ page.get_parent.specific.header_hub_text_white }} {{ page.get_parent.specific.header_hub_text_red }}

{{ page.title }}

- +

- {{ page.get_parent.specific.header_project_link_text }} - {% include "ui/components/icon_svgs/LinkCaret.html" %} + {% include "ui/components/BaseLinkNoUnderlineWhite.html" with linkurl=page.get_parent.specific.header_project_link linktext=page.get_parent.specific.header_project_link_text linkappendage="?hub"|add:original_id|add:"=on" %}

- - -

- {{ page.get_parent.specific.header_news_link_text }} - {% include "ui/components/icon_svgs/LinkCaret.html" %} -

- - -

- {{ page.get_parent.specific.header_events_link_text }} - {% include "ui/components/icon_svgs/LinkCaret.html" %} -

- + {% with page.id|stringformat:"s" as id %} +

+ {% include "ui/components/BaseLinkNoUnderlineWhite.html" with linkurl=page.get_parent.specific.header_news_link linktext=page.get_parent.specific.header_news_link_text linkappendage="?hub"|add:original_id|add:"=on" %} +

+

+ {% include "ui/components/BaseLinkNoUnderlineWhite.html" with linkurl=page.get_parent.specific.header_events_link linktext=page.get_parent.specific.header_events_link_text linkappendage="?hub"|add:original_id|add:"=on" %} +

+ {% endwith %} +
{% include "ui/components/ThreeElementCarousel.html" with carousel=page.header_carousel %} diff --git a/app/mapping_hubs/templates/mapping_hubs/individual_mapping_hub_page.html b/app/mapping_hubs/templates/mapping_hubs/individual_mapping_hub_page.html index 283e05f..a541ded 100644 --- a/app/mapping_hubs/templates/mapping_hubs/individual_mapping_hub_page.html +++ b/app/mapping_hubs/templates/mapping_hubs/individual_mapping_hub_page.html @@ -30,7 +30,7 @@ {% include "ui/components/SectionHeadingWithUnderline.html" with title=page.project_section_title %}
- {% include "ui/components/BaseLink.html" with linktext=page.project_section_link_text linkurl=page.project_section_link %} + {% include "ui/components/BaseLink.html" with linktext=page.project_section_link_text linkurl=page.get_parent.specific.header_project_link linkappendage="?hub"|add:original_id|add:"=on" %}
@@ -41,8 +41,10 @@ {% comment %} NEWS AND EVENTS SECTIONS {% endcomment %}
- {% include "ui/components/dogear_boxes/SpecialDogearLinkBox.html" with colour=page.main_colour title=page.news_section_title description=page.news_section_description linktext=page.news_section_link_text linkurl=page.news_section_link_url %} - {% include "ui/components/dogear_boxes/SpecialDogearLinkBox.html" with colour=page.main_colour title=page.events_section_title description=page.events_section_description linktext=page.events_section_link_text linkurl=page.events_section_link_url %} + {% with page.id|stringformat:"s" as id %} + {% include "ui/components/dogear_boxes/SpecialDogearLinkBox.html" with colour=page.main_colour title=page.news_section_title description=page.news_section_description linktext=page.news_section_link_text linkurl=page.news_section_link linkappendage="?hub"|add:original_id|add:"=on" %} + {% include "ui/components/dogear_boxes/SpecialDogearLinkBox.html" with colour=page.main_colour title=page.events_section_title description=page.events_section_description linktext=page.events_section_link_text linkurl=page.events_section_link linkappendage="?hub"|add:original_id|add:"=on" %} + {% endwith %}
{% comment %} PARTNERS SECTION {% endcomment %} @@ -51,10 +53,12 @@ {% include "ui/components/SectionHeadingWithUnderline.html" with title=page.get_parent.specific.partners_section_title %}
- {% include "ui/components/BaseLink.html" with linktext=page.get_parent.specific.partners_section_link_text linkurl=page.get_parent.specific.partners_section_link %} + {% with page.id|stringformat:"s" as id %} + {% include "ui/components/BaseLink.html" with linktext=page.get_parent.specific.partners_section_link_text linkurl=page.get_parent.specific.partners_section_link linkappendage="?hub"|add:original_id|add:"=on" %} + {% endwith %}
- {% include "ui/components/partners/PartnerViewBlock.html" with partners=page.partners.all %} + {% include "ui/components/partners/PartnerViewBlock.html" with partners=page.partner_list %} {% comment %} DOGEAR BOXES SECTION (OPTIONAL) {% endcomment %} {% if page.dogear_boxes %} @@ -77,7 +81,7 @@

{% for link in page.contact_section_links %}

- {% include "ui/components/BaseLink.html" with linktext=link.value.link_text %} + {% include "ui/components/BaseLink.html" with linktext=link.value.link_text linkurl=link.value.link_url %}

{% endfor %}
@@ -85,7 +89,9 @@

{% comment %} SUBSCRIBE DOGEAR BOX SECTION {% endcomment %} - {% include "ui/components/dogear_boxes/DogearAnyColourLong.html" with colour=page.main_colour title=page.subscribe_box_text linktext=page.get_parent.specific.subscribe_box_signup_text linkurl=page.subscribe_box_signup_url %} + {% if page.subscribe_box_text %} + {% include "ui/components/dogear_boxes/DogearAnyColourLong.html" with colour=page.main_colour textcolor="[&_span]:text-white" title=page.subscribe_box_text linktext=page.get_parent.specific.subscribe_box_signup_text linkurl=page.subscribe_box_signup_url %} + {% endif %} {% comment %} EXPLORE OTHER HUBS SECTION {% endcomment %}

diff --git a/app/mapping_hubs/templates/mapping_hubs/open_mapping_hubs_page.html b/app/mapping_hubs/templates/mapping_hubs/open_mapping_hubs_page.html index 42a07e1..ca8d56f 100644 --- a/app/mapping_hubs/templates/mapping_hubs/open_mapping_hubs_page.html +++ b/app/mapping_hubs/templates/mapping_hubs/open_mapping_hubs_page.html @@ -10,7 +10,7 @@ {% endblock extra_css %} {% block content %} - {% include "ui/components/BasePageHeader.html" with title=page.title image=page.header_image intro=page.header_description %} + {% include "ui/components/BasePageHeader.html" with title=page.title image=page.header_image intro=page.header_description smaller=True %}
diff --git a/app/members/migrations/0014_remove_membergroupownerpage_footer_box_button_link_and_more.py b/app/members/migrations/0014_remove_membergroupownerpage_footer_box_button_link_and_more.py new file mode 100644 index 0000000..f24e4f5 --- /dev/null +++ b/app/members/migrations/0014_remove_membergroupownerpage_footer_box_button_link_and_more.py @@ -0,0 +1,25 @@ +# Generated by Django 4.2.7 on 2024-09-25 21:52 + +from django.db import migrations +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('members', '0013_alter_membergroupownerpage_sort_by_titlea_and_more'), + ] + + operations = [ + migrations.RemoveField( + model_name='membergroupownerpage', + name='footer_box_button_link', + ), + migrations.AddField( + model_name='membergroupownerpage', + name='footer_box_button_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], blank=True, use_json_field=True), + ), + ] diff --git a/app/members/migrations/0015_membergroupownerpage_remove_filters_text.py b/app/members/migrations/0015_membergroupownerpage_remove_filters_text.py new file mode 100644 index 0000000..1244e22 --- /dev/null +++ b/app/members/migrations/0015_membergroupownerpage_remove_filters_text.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.7 on 2024-10-04 19:15 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('members', '0014_remove_membergroupownerpage_footer_box_button_link_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='membergroupownerpage', + name='remove_filters_text', + field=models.CharField(default='Remove All Filters'), + ), + ] diff --git a/app/members/migrations/0016_alter_membergroupownerpage_footer_box_button_url.py b/app/members/migrations/0016_alter_membergroupownerpage_footer_box_button_url.py new file mode 100644 index 0000000..a4fec92 --- /dev/null +++ b/app/members/migrations/0016_alter_membergroupownerpage_footer_box_button_url.py @@ -0,0 +1,21 @@ +# Generated by Django 4.2.7 on 2024-10-10 17:41 + +from django.db import migrations +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('members', '0015_membergroupownerpage_remove_filters_text'), + ] + + operations = [ + migrations.AlterField( + model_name='membergroupownerpage', + name='footer_box_button_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + ] diff --git a/app/members/migrations/0017_membergroupownerpage_applied_text.py b/app/members/migrations/0017_membergroupownerpage_applied_text.py new file mode 100644 index 0000000..9794ff7 --- /dev/null +++ b/app/members/migrations/0017_membergroupownerpage_applied_text.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.7 on 2024-10-24 18:50 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('members', '0016_alter_membergroupownerpage_footer_box_button_url'), + ] + + operations = [ + migrations.AddField( + model_name='membergroupownerpage', + name='applied_text', + field=models.CharField(default='applied', help_text='This will be a suffix to a number, used to indicate how many filters are applied currently in some field.'), + ), + ] diff --git a/app/members/models.py b/app/members/models.py index 7121960..5b299bf 100644 --- a/app/members/models.py +++ b/app/members/models.py @@ -11,6 +11,8 @@ from app.mapping_hubs.models import IndividualMappingHubPage from wagtail.search import index +from app.core.models import LinkOrPageBlock + class WebLinkStructBlock(StructBlock): link_text = CharBlock(required=True) link_url = URLBlock(required=False, blank=True) @@ -27,11 +29,13 @@ class MemberGroupOwnerPage(Page): 'members.MemberGroupPage' ] + applied_text = models.CharField(default="applied", help_text="This will be a suffix to a number, used to indicate how many filters are applied currently in some field.") search_placeholder = models.CharField(default="Search by name") filter_by_country = models.CharField(default="Filter by Country") sort_by_titlea = models.CharField(default="Sort by Name Alphabetical") sort_by_titlez = models.CharField(default="Sort by Name Reverse Alphabetical") search_button_text = models.CharField(default="Search") + remove_filters_text = models.CharField(default="Remove All Filters") load_more_text = models.CharField(default="Load more", help_text="This will be a prefix to the title of the page; i.e., if the page title is 'Voting members', and this field is 'Load more', this will end up appearing as 'Load more Voting members'.") @@ -40,15 +44,17 @@ class MemberGroupOwnerPage(Page): footer_box_title = models.CharField(default="Work for HOT") footer_box_description = RichTextField(blank=True) footer_box_button_text = models.CharField(default="Check our Job Opportunities") - footer_box_button_link = models.URLField(blank=True) + footer_box_button_url = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) content_panels = Page.content_panels + [ MultiFieldPanel([ + FieldPanel('applied_text'), FieldPanel('search_placeholder'), FieldPanel('filter_by_country'), FieldPanel('sort_by_titlea'), FieldPanel('sort_by_titlez'), FieldPanel('search_button_text'), + FieldPanel('remove_filters_text'), ], heading="Search options"), FieldPanel('load_more_text'), FieldPanel('view_all_text'), @@ -56,7 +62,7 @@ class MemberGroupOwnerPage(Page): FieldPanel('footer_box_title'), FieldPanel('footer_box_description'), FieldPanel('footer_box_button_text'), - FieldPanel('footer_box_button_link'), + FieldPanel('footer_box_button_url'), ], heading="Footer box"), ] @@ -66,18 +72,18 @@ def get_context(self, request, *args, **kwargs): context = super().get_context(request, *args, **kwargs) members = IndividualMemberPage.objects.live().filter( - Q(member_groups__contains=[{'type': 'member_group', 'value': { 'group': context['page'].id }}]) + Q(member_groups__contains=[{'type': 'member_group', 'value': { 'group': context['page'].get_translation(1).id }}]) ).filter(locale=context['page'].locale) keyword = request.GET.get('keyword', '') if keyword: - members = members.search(keyword).get_queryset() + members = members.search(keyword, fields=["title"]).get_queryset() - hubs = IndividualMappingHubPage.objects.live().filter(locale=context['page'].locale) + hubs = IndividualMappingHubPage.objects.live().filter(locale=context['page'].get_translation(1).locale) query = Q() for hub in hubs: - if request.GET.get(str(hub), ''): + if request.GET.get("hub" + str(hub.id), ''): query = query | Q(location_hub=hub) members = members.filter(query).distinct() @@ -209,6 +215,7 @@ def get_context(self, request, *args, **kwargs): index.SearchField('title'), index.SearchField('search_description'), index.SearchField('intro'), + index.FilterField('member_groups'), ] content_panels = Page.content_panels + [ diff --git a/app/members/templates/members/individual_member_page.html b/app/members/templates/members/individual_member_page.html index c090bfe..27e1d36 100644 --- a/app/members/templates/members/individual_member_page.html +++ b/app/members/templates/members/individual_member_page.html @@ -10,9 +10,9 @@ {% endblock extra_css %} {% block content %} -
+
{% comment %} BODY SECTION {% endcomment %} -
+
{% if page.image %} {% image page.image original class="md:w-full h-auto w-auto max-h-[24rem] object-contain" %} @@ -34,7 +34,7 @@

{{page.title}}

{{page.location_hub.title}}

- {{page.intro|safe}} + {{page.intro|richtext}}
diff --git a/app/members/templates/members/member_group_page.html b/app/members/templates/members/member_group_page.html index 3910f80..3d27353 100644 --- a/app/members/templates/members/member_group_page.html +++ b/app/members/templates/members/member_group_page.html @@ -10,20 +10,28 @@ {% endblock extra_css %} {% block content %} - {% include "ui/components/PageHeaderWithBlur.html" with title=page.title subtitle=page.intro image=page.header_image %} + {% include "ui/components/PageHeaderWithBlur.html" with title=page.title subtitle=page.intro image=page.header_image smaller=True full_length=True %} -
+
-
- {{page.body_intro|safe}} +
+ {{page.body_intro|richtext}}
- {{page.body_description|safe}} + {{page.body_description|richtext}}
{% if page.show_search_options %} -
+
{% comment %} KEYWORD SEARCH {% endcomment %}
@@ -35,7 +43,7 @@

- {{page.get_parent.specific.filter_by_country}} + {{page.get_parent.specific.filter_by_country}} {% include "ui/components/utilities/FormAppliedSuffix.html" with key="hub" applied_text=page.get_parent.specific.applied_text %}

{% include "ui/components/icon_svgs/LinkCaret.html" with class="rotate-90 text-hot-red" %}
@@ -43,8 +51,8 @@
{% for hub in hubs %}
- - + +
{% endfor %}
@@ -70,10 +78,17 @@
+ + +

+ {{page.get_parent.specific.remove_filters_text}} + {% include "ui/components/icon_svgs/RefreshIcon.html" with class="ml-4" %} +

+ {% endif %} {% comment %} MEMBERS LIST {% endcomment %} -
+
{% for member in members %} {% include "ui/components/members/MemberPreviewBlock.html" with member=member position_shown=page.position_shown hub_shown=page.hub_shown %} {% endfor %} @@ -81,7 +96,7 @@

{% if members.has_next %} {% comment %} {% endcomment %} -

@@ -95,15 +130,17 @@

{{page.title}}

{% comment %} NEWS ITEMS {% endcomment %} -

{{news_paginator.count}} {{page.results_text}}

-
- {% for article in news %} - {% include "ui/components/news/NewsPreviewBlockProjects.html" with news=article showimage=True class="[&_.image-hide-small]:hidden md:[&_.image-hide-small]:block" %} - {% endfor %} +
+

{{news_paginator.count}} {{page.results_text}}

+
+ {% for article in news %} + {% include "ui/components/news/NewsPreviewBlockProjects.html" with news=article showimage=True class="[&_.image-hide-small]:hidden md:[&_.image-hide-small]:block" %} + {% endfor %} +
{% comment %} PAGE NAVIGATION {% endcomment %} - {% include "ui/components/utilities/PaginatorNavigation.html" with paginator=news_paginator current_page=current_page %} + {% include "ui/components/utilities/PaginatorNavigationHTMX.html" with paginator=news_paginator current_page=current_page %}
{% endblock %} diff --git a/app/our_work/migrations/0005_alter_ourworkpage_black_box_link_and_more.py b/app/our_work/migrations/0005_alter_ourworkpage_black_box_link_and_more.py new file mode 100644 index 0000000..e835227 --- /dev/null +++ b/app/our_work/migrations/0005_alter_ourworkpage_black_box_link_and_more.py @@ -0,0 +1,31 @@ +# Generated by Django 4.2.7 on 2024-10-10 17:41 + +from django.db import migrations +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('our_work', '0004_alter_ourworkpage_black_box_link_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='ourworkpage', + name='black_box_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='ourworkpage', + name='red_box_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='ourworkpage', + name='view_all_programs_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + ] diff --git a/app/our_work/migrations/0006_ourworkpage_projects_link.py b/app/our_work/migrations/0006_ourworkpage_projects_link.py new file mode 100644 index 0000000..439a4c8 --- /dev/null +++ b/app/our_work/migrations/0006_ourworkpage_projects_link.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.7 on 2024-11-06 23:12 + +from django.db import migrations +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('our_work', '0005_alter_ourworkpage_black_box_link_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='ourworkpage', + name='projects_link', + field=wagtail.fields.StreamField([('page', 0), ('url', 1), ('document', 2), ('other', 3)], blank=True, block_lookup={0: ('wagtail.blocks.PageChooserBlock', (), {}), 1: ('wagtail.blocks.URLBlock', (), {}), 2: ('wagtail.documents.blocks.DocumentChooserBlock', (), {}), 3: ('wagtail.blocks.CharBlock', (), {'help_text': "Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."})}), + ), + ] diff --git a/app/our_work/models.py b/app/our_work/models.py index e283b6f..0788340 100644 --- a/app/our_work/models.py +++ b/app/our_work/models.py @@ -14,7 +14,7 @@ from app.projects.models import IndividualProjectPage, ProjectType, ProjectStatus from app.impact_areas.models import IndividualImpactAreaPage -from app.mapping_hubs.models import MappingHubProjectsPage, IndividualMappingHubPage +from app.mapping_hubs.models import IndividualMappingHubPage from app.programs.models import IndividualProgramPage from app.core.models import LinkOrPageBlock @@ -44,21 +44,24 @@ def get_project_paginator(self, request, context): break projects_list = projects_list.filter(query).distinct() - hubs = IndividualMappingHubPage.objects.live().filter(locale=context['page'].locale) + base_locale = context['page'].get_translation(1).locale + print(base_locale) + + hubs = IndividualMappingHubPage.objects.live().filter(locale=base_locale) query = Q() for hub in hubs: if request.GET.get(f"hub{hub.id}", ''): query = query | Q(region_hub_list__contains=[{'type': 'region_hub', 'value': hub.id }]) projects_list = projects_list.filter(query).distinct() - impact_areas = IndividualImpactAreaPage.objects.live().filter(locale=context['page'].locale) + impact_areas = IndividualImpactAreaPage.objects.live().filter(locale=base_locale) query = Q() for area in impact_areas: if request.GET.get(f"ia{area.id}", ''): query = query | Q(impact_area_list__contains=[{'type': 'impact_area', 'value': area.id }]) projects_list = projects_list.filter(query).distinct() - programs = IndividualProgramPage.objects.live().filter(locale=context['page'].locale) + programs = IndividualProgramPage.objects.live().filter(locale=base_locale) query = Q() for program in programs: if request.GET.get(f"pg{program.id}", ''): @@ -88,13 +91,13 @@ def get_context(self, request, *args, **kwargs): context = super().get_context(request, *args, **kwargs) paginator, projects = self.get_project_paginator(request, context) + base_locale = context['page'].get_translation(1).locale context['projects'] = projects context['paginator'] = paginator - context['impact_areas'] = IndividualImpactAreaPage.objects.live().filter(locale=context['page'].locale) - context['hubs'] = IndividualMappingHubPage.objects.live().filter(locale=context['page'].locale) - context['hubs_projects'] = MappingHubProjectsPage.objects.live().filter(locale=context['page'].locale) - context['programs'] = IndividualProgramPage.objects.live().filter(locale=context['page'].locale) + context['impact_areas'] = IndividualImpactAreaPage.objects.live().filter(locale=base_locale) + context['hubs'] = IndividualMappingHubPage.objects.live().filter(locale=base_locale) + context['programs'] = IndividualProgramPage.objects.live().filter(locale=base_locale) context['types'] = ProjectType.objects.all() context['statuses'] = ProjectStatus.objects.all() return context @@ -172,6 +175,7 @@ def serve(self, request, *args, **kwargs): no_projects_found = models.CharField(default="No projects found with the applied filters.") impact_area_title = models.CharField(default="See Projects by Impact Area") open_mapping_hub_title = models.CharField(default="See Projects by Open Mapping Hub") + projects_link = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) red_box_title = models.CharField(default="Check our upcoming events!") red_box_link_text = models.CharField(default="View all events") @@ -214,6 +218,7 @@ def serve(self, request, *args, **kwargs): MultiFieldPanel([ FieldPanel('impact_area_title'), FieldPanel('open_mapping_hub_title'), + FieldPanel('projects_link'), FieldPanel('red_box_title'), FieldPanel('red_box_link_text'), FieldPanel('red_box_link'), diff --git a/app/our_work/templates/our_work/components/FilterCategoryPage.html b/app/our_work/templates/our_work/components/FilterCategoryPage.html index d8cadc7..7a548d9 100644 --- a/app/our_work/templates/our_work/components/FilterCategoryPage.html +++ b/app/our_work/templates/our_work/components/FilterCategoryPage.html @@ -6,7 +6,7 @@
{% for p in pages %}
- +
{% endfor %} diff --git a/app/our_work/templates/our_work/components/MapboxScript.html b/app/our_work/templates/our_work/components/MapboxScript.html index 3b707c2..5db04df 100644 --- a/app/our_work/templates/our_work/components/MapboxScript.html +++ b/app/our_work/templates/our_work/components/MapboxScript.html @@ -8,8 +8,46 @@ const map = new mapboxgl.Map({ container: 'map', - style: 'mapbox://styles/mapbox/streets-v12', + style: 'mapbox://styles/hot/cm2dpp8lb000j01pb8chz3y15', center: [0, 0], zoom: 2 }); + + const currentMarkers = []; + + const callMapUpdate = async () => { + let params = new URLSearchParams(Alpine.store('formdata')); + if (!params) { + params = new URLSearchParams(); + } + params.set('page', Alpine.store('pageNum')); + params.set('projects', true); + const apiUrl = '?' + params.toString(); + fetch(apiUrl).then(response => { + if (response.ok) + return response.json(); + throw new Error("Failed to fetch projects."); + }).then(data => { + geojson = data; + + for (const feature of geojson.features) { + const element = ` +
+ {% include './MapboxMarker.html' %} +
+ `; + const el = document.createElement('div'); + el.innerHTML = element; + var marker = new mapboxgl.Marker(el); + marker.setLngLat(feature.geometry.coordinates).addTo(map); + currentMarkers.push(marker); + } + }) + } + + const refreshWithSearch = () => { + for (const marker of currentMarkers) { + marker.remove(); + } + } \ No newline at end of file diff --git a/app/our_work/templates/our_work/our_work_page.html b/app/our_work/templates/our_work/our_work_page.html index fe93bcb..33647a4 100644 --- a/app/our_work/templates/our_work/our_work_page.html +++ b/app/our_work/templates/our_work/our_work_page.html @@ -30,7 +30,7 @@

- {% include "ui/components/BaseLink.html" with linktext=page.view_all_programs_text linkurl=page.view_all_programs_url %} + {% include "ui/components/BaseLink.html" with linktext=page.view_all_programs_text linkurl=page.view_all_programs_link %}
@@ -38,20 +38,28 @@

{% comment %} FILTERS {% endcomment %} -
+

{{ page.projects_title }}

-
-
+ +
{% comment %} KEYWORD SEARCH {% endcomment %} -
+
{% include "ui/components/icon_svgs/SearchIcon.html" with class="text-hot-red mx-3" %}
{% comment %} SORT {% endcomment %} -
+

{{page.sort_titlea_text}} @@ -65,36 +73,39 @@

- - -
-
-

- {{page.filters_text}} - {% include "ui/components/icon_svgs/FilterIcon.html" %} +

+ +
+ +
+
+

+ {% include "ui/components/icon_svgs/ViewGridIcon.html" %} + {{page.view_grid_text}}

- -
-
-

- {% include "ui/components/icon_svgs/ViewGridIcon.html" %} - {{page.view_grid_text}} -

-
-
-

- {% include "ui/components/icon_svgs/MapIcon.html" %} - {{page.view_map_text}} -

-
+
+

+ {% include "ui/components/icon_svgs/MapIcon.html" %} + {{page.view_map_text}} +

+ + + + +
+

+ {{page.filters_text}} + {% include "ui/components/icon_svgs/FilterIcon.html" %} +

+
{% comment %} MAP AND FILTER CONTAINER {% endcomment %}
-
+
{% comment %} MAP {% endcomment %}
{% comment %} PROJECTS {% endcomment %} @@ -114,12 +125,12 @@

{% endif %}

-

+

{% if projects.has_next %} {% comment %} {% endcomment %} - + {% endif %}

@@ -137,7 +148,7 @@

{% comment %} FILTERS {% endcomment %} -
+
{% include "./components/FilterCategoryPage.html" with pages=impact_areas denoter="ia" title=page.f_impact_areas_text %} {% include "./components/FilterCategoryPage.html" with pages=hubs denoter="hub" title=page.f_open_mapping_hubs_text %} @@ -189,11 +200,11 @@

{% endif %}

-

+

{% if projects.has_next %}

- {% for hub_project in hubs_projects %} - {% include "ui/components/mapping_hub/MappingHubPreviewProjectsBlock.html" %} + {% for hub in hubs %} + {% include "ui/components/mapping_hub/MappingHubPreviewProjectsBlock.html" with baselink=page.projects_link %} {% endfor %}
@@ -236,39 +247,11 @@

{% include "ui/components/dogear_boxes/DogearRed.html" with title=page.red_box_title linktext=page.red_box_link_text linkurl=page.red_box_link %}

- {% include "ui/components/dogear_boxes/DogearBlack.html" with title=page.black_box_title linktext=page.black_box_link_text linkurl=black_box_link %} + {% include "ui/components/dogear_boxes/DogearBlack.html" with title=page.black_box_title linktext=page.black_box_link_text linkurl=page.black_box_link %}
{% include "./components/MapboxScript.html" %} - {% endblock %} diff --git a/app/partners/migrations/0012_ourpartnerspage_filter_by_hub_and_more.py b/app/partners/migrations/0012_ourpartnerspage_filter_by_hub_and_more.py new file mode 100644 index 0000000..10118e4 --- /dev/null +++ b/app/partners/migrations/0012_ourpartnerspage_filter_by_hub_and_more.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2.7 on 2024-09-17 23:39 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('partners', '0011_alter_ourpartnerspage_black_box_link_url_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='ourpartnerspage', + name='filter_by_hub', + field=models.CharField(default='Filter by Hub'), + ), + migrations.AddField( + model_name='ourpartnerspage', + name='filter_by_program', + field=models.CharField(default='Filter by Program'), + ), + ] diff --git a/app/partners/migrations/0013_alter_ourpartnerspage_black_box_link_url_and_more.py b/app/partners/migrations/0013_alter_ourpartnerspage_black_box_link_url_and_more.py new file mode 100644 index 0000000..b0fb6dd --- /dev/null +++ b/app/partners/migrations/0013_alter_ourpartnerspage_black_box_link_url_and_more.py @@ -0,0 +1,46 @@ +# Generated by Django 4.2.7 on 2024-10-10 17:41 + +from django.db import migrations +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('partners', '0012_ourpartnerspage_filter_by_hub_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='ourpartnerspage', + name='black_box_link_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='ourpartnerspage', + name='red_box_link_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='partnerwithuspage', + name='call_to_action_link_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='partnerwithuspage', + name='red_box_link_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='partnerwithuspage', + name='view_all_partners_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='partnerwithuspage', + name='view_partners_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + ] diff --git a/app/partners/migrations/0014_ourpartnerspage_applied_text.py b/app/partners/migrations/0014_ourpartnerspage_applied_text.py new file mode 100644 index 0000000..cbee04a --- /dev/null +++ b/app/partners/migrations/0014_ourpartnerspage_applied_text.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.7 on 2024-10-24 19:24 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('partners', '0013_alter_ourpartnerspage_black_box_link_url_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='ourpartnerspage', + name='applied_text', + field=models.CharField(default='applied', help_text='This will be a suffix to a number, used to indicate how many filters are applied currently in some field.'), + ), + ] diff --git a/app/partners/models.py b/app/partners/models.py index b01feb8..07eed80 100644 --- a/app/partners/models.py +++ b/app/partners/models.py @@ -12,6 +12,8 @@ from modelcluster.fields import ParentalKey, ParentalManyToManyField from app.core.models import LinkOrPageBlock, Partner +from app.mapping_hubs.models import IndividualMappingHubPage +from app.programs.models import IndividualProgramPage # The "partners" snippet is in the core app's models. @@ -42,7 +44,7 @@ class PartnershipTemplatePage(Page): intro = RichTextField(blank=True) body = RichTextField(blank=True, features=[ - 'h1', 'h2', 'h3', 'h4', 'bold', 'italic', 'link', 'ol', 'ul', 'hr', 'document-link', 'image', 'embed', 'code', 'blockquote' + 'h2', 'h3', 'h4', 'bold', 'italic', 'link', 'ol', 'ul', 'hr', 'document-link', 'image', 'embed', 'code', 'blockquote' ]) related_projects = StreamField([ @@ -162,7 +164,7 @@ class OurPartnersPage(Page): def get_context(self, request, *args, **kwargs): context = super().get_context(request, *args, **kwargs) - partners = Partner.objects.all() + partners = Partner.objects.all().order_by('id') p_types = PartnershipTemplatePage.objects.live().filter(locale=context['page'].locale) query = Q() @@ -170,6 +172,20 @@ def get_context(self, request, *args, **kwargs): if request.GET.get("pt" + str(p_type.id), ''): query = query | Q(partner_type__contains=[{'type': 'type', 'value': p_type.id }]) partners = partners.filter(query).distinct() + + hubs = IndividualMappingHubPage.objects.live().filter(locale=context['page'].locale) + query = Q() + for hub in hubs: + if request.GET.get("hub" + str(hub.id), ''): + query = query | Q(id__in=[x.value.id for x in hub.specific.partner_list]) + partners = partners.filter(query).distinct() + + programs = IndividualProgramPage.objects.live().filter(locale=context['page'].locale) + query = Q() + for program in programs: + if request.GET.get("prg" + str(program.id), ''): + query = query | Q(id__in=[x.value.id for x in program.specific.partner_list]) + partners = partners.filter(query).distinct() page = request.GET.get('page', 1) paginator = Paginator(partners, 12) # if you want more/less items per page (i.e., per load), change the number here to something else @@ -182,6 +198,8 @@ def get_context(self, request, *args, **kwargs): context['partners'] = partners context['partner_types'] = p_types + context['hubs'] = hubs + context['programs'] = programs return context max_count = 1 @@ -196,8 +214,10 @@ def get_context(self, request, *args, **kwargs): ) intro = RichTextField(blank=True, help_text="This is shown in the header.") + applied_text = models.CharField(default="applied", help_text="This will be a suffix to a number, used to indicate how many filters are applied currently in some field.") filter_by_type_text = models.CharField(default="Filter by Type") - + filter_by_program = models.CharField(default="Filter by Program") + filter_by_hub = models.CharField(default="Filter by Hub") filter_button_text = models.CharField(default="Submit") load_more_partners_text = models.CharField(default="Load More Partners") @@ -214,7 +234,10 @@ def get_context(self, request, *args, **kwargs): FieldPanel('header_image'), FieldPanel('intro'), ], heading="Header"), + FieldPanel('applied_text'), FieldPanel('filter_by_type_text'), + FieldPanel('filter_by_program'), + FieldPanel('filter_by_hub'), FieldPanel('filter_button_text'), FieldPanel('load_more_partners_text'), MultiFieldPanel([ diff --git a/app/partners/templates/partners/our_partners_page.html b/app/partners/templates/partners/our_partners_page.html index 1706030..6130399 100644 --- a/app/partners/templates/partners/our_partners_page.html +++ b/app/partners/templates/partners/our_partners_page.html @@ -10,17 +10,28 @@ {% endblock extra_css %} {% block content %} - {% include "ui/components/PageHeaderWithBlur.html" with title=page.title subtitle=page.intro image=page.header_image full_length=True %} + {% include "ui/components/PageHeaderWithBlur.html" with title=page.title image=page.header_image full_length=True smaller=True endinlarge=True %} -
+
- +
+ {{ page.intro|richtext }} +
+ +
{% comment %} TYPES {% endcomment %}

- {{page.filter_by_type_text}} + {{page.filter_by_type_text}} {% include "ui/components/utilities/FormAppliedSuffix.html" with key="pt" applied_text=page.applied_text %}

{% include "ui/components/icon_svgs/LinkCaret.html" with class="rotate-90 text-hot-red" %}
@@ -35,6 +46,44 @@
+ {% comment %} HUB {% endcomment %} +
+
+

+ {{page.filter_by_hub}} {% include "ui/components/utilities/FormAppliedSuffix.html" with key="hub" applied_text=page.applied_text %} +

+ {% include "ui/components/icon_svgs/LinkCaret.html" with class="rotate-90 text-hot-red" %} +
+
+
+ {% for hub in hubs %} +
+ + +
+ {% endfor %} +
+
+ + {% comment %} PROGRAM {% endcomment %} +
+
+

+ {{page.filter_by_program}} {% include "ui/components/utilities/FormAppliedSuffix.html" with key="prg" applied_text=page.applied_text %} +

+ {% include "ui/components/icon_svgs/LinkCaret.html" with class="rotate-90 text-hot-red" %} +
+
+
+ {% for program in programs %} +
+ + +
+ {% endfor %} +
+
+
@@ -43,15 +92,17 @@
{% for partner in partners %} -
- {% image partner.partner_logo original class="max-h-24 max-w-36 h-auto w-auto" %} -
+ +
+ {% image partner.partner_logo original class="max-h-24 max-w-full h-full w-auto" %} +
+ {% endfor %}

{% if partners.has_next %} {% comment %} {% endcomment %} - - {% endif %} -

+
+
+ +

+ {{page.reset_filters_text}} + {% include "ui/components/icon_svgs/RefreshIcon.html" with class="ml-4" %} +

+ + +
+

{{paginator.count}} {{page.results_text}}

+
+ {% for project in projects %} + {% include "ui/components/projects/ProjectPreviewBlockNews.html" with project=project.specific showimage=True %} + {% endfor %} +
+
+ {% include "ui/components/utilities/PaginatorNavigationHTMX.html" with paginator=paginator current_page=current_page %} +
+ {% include "ui/components/dogear_boxes/DogearAnyColourLong.html" with colour="var(--hot-off-white)" title=page.bottom_dogear_title linktext=page.bottom_dogear_link_text linkurl=page.bottom_dogear_link linkappendage="#projects-section" %} +
{% endblock %} diff --git a/app/rfp/migrations/0006_remove_requestforproposalownerpage_job_opportunities_button_link_and_more.py b/app/rfp/migrations/0006_remove_requestforproposalownerpage_job_opportunities_button_link_and_more.py new file mode 100644 index 0000000..3793cf5 --- /dev/null +++ b/app/rfp/migrations/0006_remove_requestforproposalownerpage_job_opportunities_button_link_and_more.py @@ -0,0 +1,25 @@ +# Generated by Django 4.2.7 on 2024-09-17 17:47 + +from django.db import migrations +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('rfp', '0005_individualrequestforproposalpage_is_active'), + ] + + operations = [ + migrations.RemoveField( + model_name='requestforproposalownerpage', + name='job_opportunities_button_link', + ), + migrations.AddField( + model_name='requestforproposalownerpage', + name='job_opportunities_button_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], blank=True, use_json_field=True), + ), + ] diff --git a/app/rfp/migrations/0007_rename_header_description_requestforproposalownerpage_intro.py b/app/rfp/migrations/0007_rename_header_description_requestforproposalownerpage_intro.py new file mode 100644 index 0000000..01c3b34 --- /dev/null +++ b/app/rfp/migrations/0007_rename_header_description_requestforproposalownerpage_intro.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.7 on 2024-09-27 19:15 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('rfp', '0006_remove_requestforproposalownerpage_job_opportunities_button_link_and_more'), + ] + + operations = [ + migrations.RenameField( + model_name='requestforproposalownerpage', + old_name='header_description', + new_name='intro', + ), + ] diff --git a/app/rfp/migrations/0008_alter_requestforproposalownerpage_job_opportunities_button_url.py b/app/rfp/migrations/0008_alter_requestforproposalownerpage_job_opportunities_button_url.py new file mode 100644 index 0000000..e8db88d --- /dev/null +++ b/app/rfp/migrations/0008_alter_requestforproposalownerpage_job_opportunities_button_url.py @@ -0,0 +1,21 @@ +# Generated by Django 4.2.7 on 2024-10-10 17:41 + +from django.db import migrations +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('rfp', '0007_rename_header_description_requestforproposalownerpage_intro'), + ] + + operations = [ + migrations.AlterField( + model_name='requestforproposalownerpage', + name='job_opportunities_button_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + ] diff --git a/app/rfp/migrations/0009_alter_individualrequestforproposalpage_article_body.py b/app/rfp/migrations/0009_alter_individualrequestforproposalpage_article_body.py new file mode 100644 index 0000000..876bced --- /dev/null +++ b/app/rfp/migrations/0009_alter_individualrequestforproposalpage_article_body.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.7 on 2024-10-21 21:37 + +from django.db import migrations +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('rfp', '0008_alter_requestforproposalownerpage_job_opportunities_button_url'), + ] + + operations = [ + migrations.AlterField( + model_name='individualrequestforproposalpage', + name='article_body', + field=wagtail.fields.StreamField([('text_block', 0)], blank=True, block_lookup={0: ('wagtail.blocks.RichTextBlock', (), {'features': ['h2', 'h3', 'h4', 'bold', 'italic', 'link', 'ol', 'ul', 'hr', 'document-link', 'image', 'embed', 'code', 'blockquote']})}, null=True), + ), + ] diff --git a/app/rfp/models.py b/app/rfp/models.py index 36fdfd6..e7cc201 100644 --- a/app/rfp/models.py +++ b/app/rfp/models.py @@ -6,6 +6,8 @@ from wagtail.blocks import CharBlock, StreamBlock, StructBlock, URLBlock, RichTextBlock, PageChooserBlock from wagtail.models import Page +from app.core.models import LinkOrPageBlock + class RequestForProposalOwnerPage(Page): def get_context(self, request, *args, **kwargs): @@ -31,7 +33,7 @@ def get_context(self, request, *args, **kwargs): related_name="+", help_text="Header image" ) - header_description = RichTextField(blank=True) + intro = RichTextField(blank=True) current_rfps_title = models.CharField(default="Current RFPs") rfp_location_text = models.CharField(default="Location") @@ -53,7 +55,7 @@ def get_context(self, request, *args, **kwargs): job_opportunities_title = models.CharField(default="See Our Job Opportunities") job_opportunities_description = RichTextField(blank=True) job_opportunities_button_text = models.CharField(default="See All Job Opportunities") - job_opportunities_button_link = models.URLField(blank=True) + job_opportunities_button_url = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) posted_by_prefix_text = models.CharField(default="Posted by") @@ -72,7 +74,7 @@ def get_context(self, request, *args, **kwargs): content_panels = Page.content_panels + [ MultiFieldPanel([ FieldPanel('header_image'), - FieldPanel('header_description'), + FieldPanel('intro'), ], heading="Header"), MultiFieldPanel([ FieldPanel('current_rfps_title'), @@ -90,7 +92,7 @@ def get_context(self, request, *args, **kwargs): FieldPanel('job_opportunities_title'), FieldPanel('job_opportunities_description'), FieldPanel('job_opportunities_button_text'), - FieldPanel('job_opportunities_button_link'), + FieldPanel('job_opportunities_button_url'), ], heading="Footer banner"), MultiFieldPanel([ FieldPanel('posted_by_prefix_text'), @@ -123,7 +125,7 @@ class IndividualRequestForProposalPage(Page): intro = RichTextField(blank=True) article_body = StreamField([ ('text_block', RichTextBlock(features=[ - 'h1', 'h2', 'h3', 'h4', 'bold', 'italic', 'link', 'ol', 'ul', 'hr', 'document-link', 'image', 'embed', 'code', 'blockquote' + 'h2', 'h3', 'h4', 'bold', 'italic', 'link', 'ol', 'ul', 'hr', 'document-link', 'image', 'embed', 'code', 'blockquote' ])) ], use_json_field=True, null=True, blank=True) diff --git a/app/rfp/templates/rfp/components/AsideBlockContents.html b/app/rfp/templates/rfp/components/AsideBlockContents.html index e0b0ef4..d8ccb8b 100644 --- a/app/rfp/templates/rfp/components/AsideBlockContents.html +++ b/app/rfp/templates/rfp/components/AsideBlockContents.html @@ -1,8 +1,9 @@ +{% load wagtailcore_tags %}

{{page.aside_block_title}}

- {{page.aside_block_description|safe}} + {{page.aside_block_description|richtext}}
\ No newline at end of file diff --git a/app/rfp/templates/rfp/individual_request_for_proposal_page.html b/app/rfp/templates/rfp/individual_request_for_proposal_page.html index 980ad1f..899ccdb 100644 --- a/app/rfp/templates/rfp/individual_request_for_proposal_page.html +++ b/app/rfp/templates/rfp/individual_request_for_proposal_page.html @@ -10,14 +10,14 @@ {% endblock extra_css %} {% block content %} -
+
{% comment %} HEADER {% endcomment %} -
-

{{ page.title }}

-

+

+

{{ page.title }}

+

{{page.get_parent.specific.posted_by_prefix_text}} {% for poster in page.posters %} - {{poster.value.title}}{% if not forloop.last %}, {% endif %} + {{poster.value.title}}{% if not forloop.last %}, {% endif %} {% endfor %} • {{ page.post_date }}

@@ -25,20 +25,18 @@

{{ page.title }}

{% comment %} BODY {% endcomment %} -
+
- {{ page.intro|safe }} + {{ page.intro|richtext }}
{{ page.article_body }}
{% comment %} SIDEBAR {% endcomment %} -
-
-

- {{ page.get_parent.specific.terms_of_reference_title }} -

-
+
+

+ {{ page.get_parent.specific.terms_of_reference_title }} +

{% include "./components/SidebarSection.html" with title=page.get_parent.specific.role_title text=page.role no_divider=True %} {% include "./components/SidebarSection.html" with title=page.get_parent.specific.application_close_title text=page.application_close_date %} @@ -58,7 +56,7 @@

-
+

{% include "ui/components/BaseLink.html" with linktext=page.get_parent.specific.go_back_text linkurl=page.get_parent.url %}

diff --git a/app/rfp/templates/rfp/request_for_proposal_owner_page.html b/app/rfp/templates/rfp/request_for_proposal_owner_page.html index 7367231..90246f5 100644 --- a/app/rfp/templates/rfp/request_for_proposal_owner_page.html +++ b/app/rfp/templates/rfp/request_for_proposal_owner_page.html @@ -10,7 +10,7 @@ {% endblock extra_css %} {% block content %} - {% include "ui/components/PageHeaderWithBlur.html" with title=page.title subtitle=page.header_description image=page.header_image %} + {% include "ui/components/PageHeaderWithBlur.html" with title=page.title subtitle=page.intro image=page.header_image full_length=True smaller=True %}
@@ -43,7 +43,7 @@

{{page.no_rfps_title}}

- {{page.no_rfps_description|safe}} + {{page.no_rfps_description|richtext}}
{% endif %} @@ -57,7 +57,7 @@

- {% include "ui/components/sections/NavyBackgroundWithImage.html" with image=page.job_opportunities_image title=page.job_opportunities_title description=page.job_opportunities_description button_text=page.job_opportunities_button_text button_link=page.job_opportunities_button_link imageright=True %} + {% include "ui/components/sections/NavyBackgroundWithImage.html" with image=page.job_opportunities_image title=page.job_opportunities_title description=page.job_opportunities_description button_text=page.job_opportunities_button_text button_link=page.job_opportunities_button_url imageright=True %}
diff --git a/app/search_page/models.py b/app/search_page/models.py index e9ecbbb..b0c952d 100644 --- a/app/search_page/models.py +++ b/app/search_page/models.py @@ -1,6 +1,9 @@ +import re + from django.db import models from django.db.models import Q from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger +from django.http import JsonResponse from wagtail.models import Page from wagtail.fields import RichTextField, StreamField @@ -36,6 +39,27 @@ def get_context(self, request, *args, **kwargs): context['keyword'] = keyword return context + def serve(self, request, *args, **kwargs): + if request.GET.get('livesearch', False) and request.GET.get('keyword', False): + context = super().get_context(request, *args, **kwargs) + pages = Page.objects.live().filter(locale=context['page'].locale).autocomplete(request.GET.get('keyword')).get_queryset() + + count = 0 + results = [] + for page in pages: + count += 1 + result = { + "title": page.title, + "url": page.url, + } + results.append(result) + if count == 10: + break + + return JsonResponse({"results": results}) + + return super().serve(request, *args, **kwargs) + page_description = "Search results will, by default, attempt to pull from an 'intro' field for the page description; otherwise, it will grab the page's meta search description." max_count = 1 diff --git a/app/search_page/templates/search_page/search_page.html b/app/search_page/templates/search_page/search_page.html index 508ed0e..888d2c1 100644 --- a/app/search_page/templates/search_page/search_page.html +++ b/app/search_page/templates/search_page/search_page.html @@ -34,7 +34,7 @@

{{result.title}}

{% if result.specific.intro %}
- {{result.specific.intro|safe}} + {{result.specific.intro|richtext}}
{% else %} {% if result.search_description %} diff --git a/app/tech/migrations/0005_techproductsuitepage_category_filter_selector.py b/app/tech/migrations/0005_techproductsuitepage_category_filter_selector.py new file mode 100644 index 0000000..6fecf25 --- /dev/null +++ b/app/tech/migrations/0005_techproductsuitepage_category_filter_selector.py @@ -0,0 +1,20 @@ +# Generated by Django 4.2.7 on 2024-09-27 21:54 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('news', '0021_remove_newsownerpage_view_all_news_url_and_more'), + ('tech', '0004_alter_individualtechstackpage_link_blocks_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='techproductsuitepage', + name='category_filter_selector', + field=models.ForeignKey(blank=True, help_text="The 'Tech News' link will be appended with a filter for this category. The selected category should be the Tech category.", null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='news.newscategory'), + ), + ] diff --git a/app/tech/migrations/0006_alter_techproductsuitepage_product_suite_learn_more_text.py b/app/tech/migrations/0006_alter_techproductsuitepage_product_suite_learn_more_text.py new file mode 100644 index 0000000..adaec95 --- /dev/null +++ b/app/tech/migrations/0006_alter_techproductsuitepage_product_suite_learn_more_text.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.7 on 2024-10-09 16:08 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('tech', '0005_techproductsuitepage_category_filter_selector'), + ] + + operations = [ + migrations.AlterField( + model_name='techproductsuitepage', + name='product_suite_learn_more_text', + field=models.CharField(default='Learn more'), + ), + ] diff --git a/app/tech/migrations/0007_alter_individualtechstackpage_link_blocks_and_more.py b/app/tech/migrations/0007_alter_individualtechstackpage_link_blocks_and_more.py new file mode 100644 index 0000000..ed6fd27 --- /dev/null +++ b/app/tech/migrations/0007_alter_individualtechstackpage_link_blocks_and_more.py @@ -0,0 +1,41 @@ +# Generated by Django 4.2.7 on 2024-10-10 17:41 + +from django.db import migrations +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('tech', '0006_alter_techproductsuitepage_product_suite_learn_more_text'), + ] + + operations = [ + migrations.AlterField( + model_name='individualtechstackpage', + name='link_blocks', + field=wagtail.fields.StreamField([('blocks', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock()), ('linktext', wagtail.blocks.CharBlock()), ('linkurl', wagtail.blocks.StreamBlock([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))]))]))], blank=True, null=True, use_json_field=True), + ), + migrations.AlterField( + model_name='techproductsuitepage', + name='black_box_link_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='techproductsuitepage', + name='go_back_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='techproductsuitepage', + name='red_box_link_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='techproductsuitepage', + name='tech_stack_cta_button_link_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + ] diff --git a/app/tech/models.py b/app/tech/models.py index 245cbbc..b8c6135 100644 --- a/app/tech/models.py +++ b/app/tech/models.py @@ -1,3 +1,4 @@ +from django import forms from django.db import models from wagtail.admin.panels import FieldPanel, MultiFieldPanel @@ -93,7 +94,7 @@ class TechProductSuitePage(Page): ], use_json_field=True, null=True, blank=True, help_text="Blocks to be shown under the Tech Principles section.") product_suite_title = models.CharField(default="Product Suite") - product_suite_learn_more_text = models.CharField(default="Learn more about", help_text="Prefix text to be shown in page previews for the product suite section; if the page being previewed is named 'Tasking Manager', and this field is 'Learn more about', they would combine to be 'Learn more about Tasking Manager'.") + product_suite_learn_more_text = models.CharField(default="Learn more") red_box_title = models.CharField(default="HOT GitHub") red_box_link_text = models.CharField(default="View HOT's GitHub") @@ -101,6 +102,14 @@ class TechProductSuitePage(Page): black_box_title = models.CharField(default="Tech News") black_box_link_text = models.CharField(default="View tech news") black_box_link_url = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) + category_filter_selector = models.ForeignKey( + "news.NewsCategory", + null=True, + blank=True, + on_delete=models.SET_NULL, + related_name="+", + help_text="The 'Tech News' link will be appended with a filter for this category. The selected category should be the Tech category." + ) go_back_text = models.CharField(default="Go Back to Tools & Resources") go_back_link = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) @@ -126,6 +135,7 @@ class TechProductSuitePage(Page): FieldPanel('black_box_title'), FieldPanel('black_box_link_text'), FieldPanel('black_box_link_url'), + FieldPanel('category_filter_selector', widget=forms.RadioSelect), ], heading="Dogear Boxes"), MultiFieldPanel([ FieldPanel('go_back_text'), diff --git a/app/tech/templates/tech/individual_tech_stack_page.html b/app/tech/templates/tech/individual_tech_stack_page.html index 099f25b..4492b8a 100644 --- a/app/tech/templates/tech/individual_tech_stack_page.html +++ b/app/tech/templates/tech/individual_tech_stack_page.html @@ -10,18 +10,16 @@ {% endblock extra_css %} {% block content %} - {% include "ui/components/PageHeaderWithBlur.html" with title=page.title image=page.header_image endinlarge=True full_length=True %} + {% include "ui/components/PageHeaderWithBlur.html" with title=page.title image=page.header_image endinlarge=True full_length=True smaller=True %}
-
-
-
- {{page.intro|safe}} -
-
- {{page.body_text|safe}} -
+
+
+ {{page.intro|richtext}} +
+
+ {{page.body_text|richtext}}
@@ -32,7 +30,7 @@

{{block.value.title}}

- {{block.value.description|safe}} + {{block.value.description|richtext}}
{% endfor %} @@ -40,17 +38,17 @@

- {% image page.section_image original %} + {% image page.section_image original class="aspect-[3/2] object-cover object-center w-full" %}

{{page.section_title}}

- {{page.section_intro|safe}} + {{page.section_intro|richtext}}
- {{page.section_description|safe}} + {{page.section_description|richtext}}
@@ -65,12 +63,7 @@

{{block.value.title}}

- - {{block.value.linktext|safe}} - - {% include "ui/components/icon_svgs/LinkCaret.html" %} - - + {% include "ui/components/BaseLinkNoUnderline.html" with linkurl=block.value.linkurl linktext=block.value.linktext variableicon=True %}

{% endfor %} @@ -78,7 +71,7 @@

{% include "ui/components/FooterBannerWithTextAndLink.html" with text=page.get_parent.specific.tech_stack_cta_title description=page.get_parent.specific.tech_stack_cta_description buttontext=page.get_parent.specific.tech_stack_cta_button_link_text url=page.get_parent.specific.tech_stack_cta_button_link_url %} -

+

{% include "ui/components/BaseLink.html" with linktext=page.get_parent.specific.tech_stack_go_back_text|add:' '|add:page.get_parent.title linkurl=page.get_parent.url %}

diff --git a/app/tech/templates/tech/tech_product_suite_page.html b/app/tech/templates/tech/tech_product_suite_page.html index 9ffcba6..46a3cb3 100644 --- a/app/tech/templates/tech/tech_product_suite_page.html +++ b/app/tech/templates/tech/tech_product_suite_page.html @@ -10,25 +10,25 @@ {% endblock extra_css %} {% block content %} - {% include "ui/components/PageHeaderWithBlur.html" with title=page.title image=page.header_image endinlarge=True full_length=True %} + {% include "ui/components/PageHeaderWithBlur.html" with title=page.title image=page.header_image endinlarge=True full_length=True smaller=True %}
-
+
- {{page.intro|safe}} + {{page.intro|richtext}}
{% include "ui/components/TitleWithUnderline.html" with title=page.tech_principles_title %} -
+
{% for principle in page.tech_principle_blocks %}

{{principle.value.title}}

- {{principle.value.description|safe}} + {{principle.value.description|richtext}}
{% endfor %} @@ -37,16 +37,18 @@

{% include "ui/components/TitleWithUnderline.html" with title=page.product_suite_title %}
{% for child in page.get_children %} - {% include "ui/components/misc_panels/LinkBlockWithImage.html" with title=child.title description=child.specific.intro image=child.specific.header_image linktext=page.product_suite_learn_more_text|add:" "|add:child.title linkurl=child.url %} + {% include "ui/components/misc_panels/LinkBlockWithImage.html" with title=child.title description=child.specific.intro image=child.specific.header_image linktext=page.product_suite_learn_more_text linkurl=child.url %} {% endfor %}
-
+
{% include "ui/components/dogear_boxes/DogearRed.html" with title=page.red_box_title linktext=page.red_box_link_text linkurl=page.red_box_link_url %}
- {% include "ui/components/dogear_boxes/DogearBlack.html" with title=page.black_box_title linktext=page.black_box_link_text linkurl=page.black_box_link_url %} + {% with page.category_filter_selector.id|stringformat:"s" as id %} + {% include "ui/components/dogear_boxes/DogearBlack.html" with title=page.black_box_title linktext=page.black_box_link_text linkurl=page.black_box_link_url linkappendage="?cat"|add:id|add:"=on" %} + {% endwith %}
diff --git a/app/tools_and_resources/migrations/0007_remove_toolsandresourcespage_black_box_link_url_and_more.py b/app/tools_and_resources/migrations/0007_remove_toolsandresourcespage_black_box_link_url_and_more.py new file mode 100644 index 0000000..b9d6191 --- /dev/null +++ b/app/tools_and_resources/migrations/0007_remove_toolsandresourcespage_black_box_link_url_and_more.py @@ -0,0 +1,61 @@ +# Generated by Django 4.2.7 on 2024-09-23 20:51 + +from django.db import migrations +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('tools_and_resources', '0006_alter_openmappingsolutionspage_cta_button_link_and_more'), + ] + + operations = [ + migrations.RemoveField( + model_name='toolsandresourcespage', + name='black_box_link_url', + ), + migrations.RemoveField( + model_name='toolsandresourcespage', + name='dogear_tech_news_link_url', + ), + migrations.RemoveField( + model_name='toolsandresourcespage', + name='get_connected_button_link', + ), + migrations.RemoveField( + model_name='toolsandresourcespage', + name='learn_more_data_principles_link', + ), + migrations.RemoveField( + model_name='toolsandresourcespage', + name='red_box_link_url', + ), + migrations.AddField( + model_name='toolsandresourcespage', + name='black_box_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], blank=True, use_json_field=True), + ), + migrations.AddField( + model_name='toolsandresourcespage', + name='dogear_tech_news_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], blank=True, use_json_field=True), + ), + migrations.AddField( + model_name='toolsandresourcespage', + name='get_connected_button_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], blank=True, use_json_field=True), + ), + migrations.AddField( + model_name='toolsandresourcespage', + name='learn_more_data_principles_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], blank=True, use_json_field=True), + ), + migrations.AddField( + model_name='toolsandresourcespage', + name='red_box_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock())], blank=True, use_json_field=True), + ), + ] diff --git a/app/tools_and_resources/migrations/0008_toolsandresourcespage_category_filter_selector.py b/app/tools_and_resources/migrations/0008_toolsandresourcespage_category_filter_selector.py new file mode 100644 index 0000000..0265f76 --- /dev/null +++ b/app/tools_and_resources/migrations/0008_toolsandresourcespage_category_filter_selector.py @@ -0,0 +1,20 @@ +# Generated by Django 4.2.7 on 2024-09-27 23:25 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('news', '0021_remove_newsownerpage_view_all_news_url_and_more'), + ('tools_and_resources', '0007_remove_toolsandresourcespage_black_box_link_url_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='toolsandresourcespage', + name='category_filter_selector', + field=models.ForeignKey(blank=True, help_text="The 'Tech News' link will be appended with a filter for this category. The selected category should be the Tech category.", null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='news.newscategory'), + ), + ] diff --git a/app/tools_and_resources/migrations/0009_alter_openmappingsolutionspage_cta_button_link_and_more.py b/app/tools_and_resources/migrations/0009_alter_openmappingsolutionspage_cta_button_link_and_more.py new file mode 100644 index 0000000..bf0a8fb --- /dev/null +++ b/app/tools_and_resources/migrations/0009_alter_openmappingsolutionspage_cta_button_link_and_more.py @@ -0,0 +1,62 @@ +# Generated by Django 4.2.7 on 2024-10-10 17:41 + +from django.db import migrations +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('tools_and_resources', '0008_toolsandresourcespage_category_filter_selector'), + ] + + operations = [ + migrations.AlterField( + model_name='openmappingsolutionspage', + name='cta_button_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='openmappingsolutionspage', + name='solutions', + field=wagtail.fields.StreamField([('solution', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock()), ('banner', wagtail.images.blocks.ImageChooserBlock()), ('description', wagtail.blocks.RichTextBlock()), ('items', wagtail.blocks.StreamBlock([('item', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('links', wagtail.blocks.StreamBlock([('link', wagtail.blocks.StructBlock([('linktext', wagtail.blocks.CharBlock()), ('linkurl', wagtail.blocks.StreamBlock([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], required=False))]))], required=False))]))]))]))], blank=True, null=True, use_json_field=True), + ), + migrations.AlterField( + model_name='resourceandlearningpage', + name='large_panels', + field=wagtail.fields.StreamField([('panel', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('title', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link', wagtail.blocks.StreamBlock([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], required=False))]))], blank=True, null=True, use_json_field=True), + ), + migrations.AlterField( + model_name='toolsandresourcespage', + name='black_box_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='toolsandresourcespage', + name='dogear_tech_news_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='toolsandresourcespage', + name='get_connected_button_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='toolsandresourcespage', + name='large_panels', + field=wagtail.fields.StreamField([('panel', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('title', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link', wagtail.blocks.StreamBlock([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], required=False))]))], blank=True, null=True, use_json_field=True), + ), + migrations.AlterField( + model_name='toolsandresourcespage', + name='learn_more_data_principles_url', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='toolsandresourcespage', + name='red_box_link', + field=wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock()), ('other', wagtail.blocks.CharBlock(help_text="Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."))], blank=True, use_json_field=True), + ), + ] diff --git a/app/tools_and_resources/migrations/0010_alter_openmappingsolutionspage_solutions.py b/app/tools_and_resources/migrations/0010_alter_openmappingsolutionspage_solutions.py new file mode 100644 index 0000000..4b0f67a --- /dev/null +++ b/app/tools_and_resources/migrations/0010_alter_openmappingsolutionspage_solutions.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.7 on 2024-10-25 19:12 + +from django.db import migrations +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('tools_and_resources', '0009_alter_openmappingsolutionspage_cta_button_link_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='openmappingsolutionspage', + name='solutions', + field=wagtail.fields.StreamField([('solution', 13)], blank=True, block_lookup={0: ('wagtail.blocks.CharBlock', (), {}), 1: ('wagtail.images.blocks.ImageChooserBlock', (), {}), 2: ('wagtail.blocks.RichTextBlock', (), {}), 3: ('wagtail.images.blocks.ImageChooserBlock', (), {'required': False}), 4: ('wagtail.blocks.PageChooserBlock', (), {}), 5: ('wagtail.blocks.URLBlock', (), {}), 6: ('wagtail.documents.blocks.DocumentChooserBlock', (), {}), 7: ('wagtail.blocks.CharBlock', (), {'help_text': "Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."}), 8: ('wagtail.blocks.StreamBlock', [[('page', 4), ('url', 5), ('document', 6), ('other', 7)]], {'required': False}), 9: ('wagtail.blocks.StructBlock', [[('linktext', 0), ('linkurl', 8)]], {}), 10: ('wagtail.blocks.StreamBlock', [[('link', 9)]], {'required': False}), 11: ('wagtail.blocks.StructBlock', [[('icon', 3), ('title', 0), ('description', 2), ('links', 10)]], {}), 12: ('wagtail.blocks.StreamBlock', [[('item', 11)]], {}), 13: ('wagtail.blocks.StructBlock', [[('title', 0), ('banner', 1), ('description', 2), ('items', 12)]], {})}, null=True), + ), + ] diff --git a/app/tools_and_resources/migrations/0011_remove_toolsandresourcespage_get_connected_button_text_and_more.py b/app/tools_and_resources/migrations/0011_remove_toolsandresourcespage_get_connected_button_text_and_more.py new file mode 100644 index 0000000..6795ae9 --- /dev/null +++ b/app/tools_and_resources/migrations/0011_remove_toolsandresourcespage_get_connected_button_text_and_more.py @@ -0,0 +1,40 @@ +# Generated by Django 4.2.7 on 2024-10-25 22:46 + +from django.db import migrations +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('tools_and_resources', '0010_alter_openmappingsolutionspage_solutions'), + ] + + operations = [ + migrations.RemoveField( + model_name='toolsandresourcespage', + name='get_connected_button_text', + ), + migrations.RemoveField( + model_name='toolsandresourcespage', + name='get_connected_button_url', + ), + migrations.RemoveField( + model_name='toolsandresourcespage', + name='learn_more_data_principles_text', + ), + migrations.RemoveField( + model_name='toolsandresourcespage', + name='learn_more_data_principles_url', + ), + migrations.AddField( + model_name='toolsandresourcespage', + name='description_links', + field=wagtail.fields.StreamField([('link', 6)], blank=True, block_lookup={0: ('wagtail.blocks.CharBlock', (), {}), 1: ('wagtail.blocks.PageChooserBlock', (), {}), 2: ('wagtail.blocks.URLBlock', (), {}), 3: ('wagtail.documents.blocks.DocumentChooserBlock', (), {}), 4: ('wagtail.blocks.CharBlock', (), {'help_text': "Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."}), 5: ('wagtail.blocks.StreamBlock', [[('page', 1), ('url', 2), ('document', 3), ('other', 4)]], {'required': False}), 6: ('wagtail.blocks.StructBlock', [[('linktext', 0), ('linkurl', 5)]], {})}), + ), + migrations.AddField( + model_name='toolsandresourcespage', + name='resource_learning_links', + field=wagtail.fields.StreamField([('link', 6)], blank=True, block_lookup={0: ('wagtail.blocks.CharBlock', (), {}), 1: ('wagtail.blocks.PageChooserBlock', (), {}), 2: ('wagtail.blocks.URLBlock', (), {}), 3: ('wagtail.documents.blocks.DocumentChooserBlock', (), {}), 4: ('wagtail.blocks.CharBlock', (), {'help_text': "Only use this option as a last resort. The other fields are preferred. In cases like email 'mailto' links, however, this field can be used. Ensure that your provided link will function as intended prior to publishing live."}), 5: ('wagtail.blocks.StreamBlock', [[('page', 1), ('url', 2), ('document', 3), ('other', 4)]], {'required': False}), 6: ('wagtail.blocks.StructBlock', [[('linktext', 0), ('linkurl', 5)]], {})}), + ), + ] diff --git a/app/tools_and_resources/models.py b/app/tools_and_resources/models.py index 5526039..d20ce7c 100644 --- a/app/tools_and_resources/models.py +++ b/app/tools_and_resources/models.py @@ -1,3 +1,4 @@ +from django import forms from django.db import models from wagtail.models import Page @@ -41,8 +42,12 @@ class ToolsAndResourcesPage(Page): intro_header = models.CharField(blank=True) intro = RichTextField(blank=True) description = RichTextField(blank=True) - learn_more_data_principles_text = models.CharField(default="Learn about our Data & Principles") - learn_more_data_principles_link = models.URLField(blank=True) + description_links = StreamField([ + ('link', StructBlock([ + ('linktext', CharBlock()), + ('linkurl', LinkOrPageBlock(required=False)), + ])) + ], use_json_field=True, blank=True) large_panels = StreamField([('panel', LargePanel())], use_json_field=True, null=True, blank=True) @@ -56,19 +61,31 @@ class ToolsAndResourcesPage(Page): ) resource_learning_title = models.CharField(default="Resource and Learning Centre") resource_learning_description = RichTextField(blank=True) - get_connected_button_text = models.CharField(default="Get connected now") - get_connected_button_link = models.URLField(blank=True) + resource_learning_links = StreamField([ + ('link', StructBlock([ + ('linktext', CharBlock()), + ('linkurl', LinkOrPageBlock(required=False)), + ])) + ], use_json_field=True, blank=True) dogear_tech_news_title = models.CharField(blank=True) dogear_tech_news_link_text = models.CharField(default="View our Tech News") - dogear_tech_news_link_url = models.URLField(blank=True) + dogear_tech_news_link = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) + category_filter_selector = models.ForeignKey( + "news.NewsCategory", + null=True, + blank=True, + on_delete=models.SET_NULL, + related_name="+", + help_text="The 'Tech News' link will be appended with a filter for this category. The selected category should be the Tech category." + ) red_box_title = models.CharField(default="Start Mapping") red_box_link_text = models.CharField(default="Start Mapping") - red_box_link_url = models.URLField(null=True, blank=True) + red_box_link = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) black_box_title = models.CharField(default="Check many opportunities to get involved with HOT!") black_box_link_text = models.CharField(default="Get Involved with HOT") - black_box_link_url = models.URLField(null=True, blank=True) + black_box_link = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True) content_panels = Page.content_panels + [ FieldPanel('header_image'), @@ -77,27 +94,26 @@ class ToolsAndResourcesPage(Page): FieldPanel('intro_header'), FieldPanel('intro'), FieldPanel('description'), - FieldPanel('learn_more_data_principles_text'), - FieldPanel('learn_more_data_principles_link'), + FieldPanel('description_links'), ], heading="Intro"), FieldPanel('large_panels'), MultiFieldPanel([ FieldPanel('resource_learning_image'), FieldPanel('resource_learning_title'), FieldPanel('resource_learning_description'), - FieldPanel('get_connected_button_text'), - FieldPanel('get_connected_button_link'), + FieldPanel('resource_learning_links'), ], heading="Resource and Learning Centre"), MultiFieldPanel([ FieldPanel('dogear_tech_news_title'), FieldPanel('dogear_tech_news_link_text'), - FieldPanel('dogear_tech_news_link_url'), + FieldPanel('dogear_tech_news_link'), + FieldPanel('category_filter_selector', widget=forms.RadioSelect), FieldPanel('red_box_title'), FieldPanel('red_box_link_text'), - FieldPanel('red_box_link_url'), + FieldPanel('red_box_link'), FieldPanel('black_box_title'), FieldPanel('black_box_link_text'), - FieldPanel('black_box_link_url'), + FieldPanel('black_box_link'), ], heading="Dogear Boxes"), ] @@ -129,6 +145,7 @@ class ResourceAndLearningPage(Page): class OpenMappingSolutionIndividualItemBlock(StructBlock): + icon = ImageChooserBlock(required=False) title = CharBlock() description = RichTextBlock() links = StreamBlock([ diff --git a/app/tools_and_resources/templates/tools_and_resources/open_mapping_solutions_page.html b/app/tools_and_resources/templates/tools_and_resources/open_mapping_solutions_page.html index eff227e..5796b2c 100644 --- a/app/tools_and_resources/templates/tools_and_resources/open_mapping_solutions_page.html +++ b/app/tools_and_resources/templates/tools_and_resources/open_mapping_solutions_page.html @@ -10,25 +10,23 @@ {% endblock extra_css %} {% block content %} - {% include "ui/components/PageHeaderWithBlur.html" with title=page.title image=page.header_image endinlarge=True full_length=True %} + {% include "ui/components/PageHeaderWithBlur.html" with title=page.title image=page.header_image endinlarge=True full_length=True smaller=True %}
- {{page.intro|safe}} + {{page.intro|richtext}}
{% for solution in page.solutions %}
-
+

{{solution.value.title}}

-
-
- {% include "ui/components/icon_svgs/LinkCaret.html" %} -
+
+ {% include "ui/components/icon_svgs/LinkCaretCircle.html" with styledhover=True %}
@@ -40,7 +38,7 @@

{% for item in solution.value.items %} -
+
{{item.value.title}}
{% endfor %} @@ -48,19 +46,23 @@

{% for item in solution.value.items %} -
-

- {{item.value.title}} -

+
+
+ {% image item.value.icon original class="h-6 w-auto" %} +

+ {{item.value.title}} +

+
+
{{item.value.description}}
{% for link in item.value.links %} -
+

{{link.value.linktext}}

- + {% include "ui/components/icon_svgs/ExternalLinkIcon.html" %}
@@ -78,7 +80,7 @@

- {% include "ui/components/FooterBannerWithTextAndLink.html" with text=page.cta_title description=page.cta_description buttontext=page.cta_button_text buttonurl=page.cta_button_link %} + {% include "ui/components/FooterBannerWithTextAndLink.html" with text=page.cta_title description=page.cta_description buttontext=page.cta_button_text url=page.cta_button_link %}

diff --git a/app/tools_and_resources/templates/tools_and_resources/resource_and_learning_page.html b/app/tools_and_resources/templates/tools_and_resources/resource_and_learning_page.html index eed6304..ab4703d 100644 --- a/app/tools_and_resources/templates/tools_and_resources/resource_and_learning_page.html +++ b/app/tools_and_resources/templates/tools_and_resources/resource_and_learning_page.html @@ -10,17 +10,15 @@ {% endblock extra_css %} {% block content %} - {% include "ui/components/PageHeaderWithBlur.html" with title=page.title image=page.header_image endinlarge=True full_length=True %} + {% include "ui/components/PageHeaderWithBlur.html" with title=page.title image=page.header_image endinlarge=True full_length=True smaller=True %}

-
-
- {{page.intro|safe}} -
+
+ {{page.intro|richtext}}
-
+
{% for panel in page.large_panels %} {% include "ui/components/misc_panels/LinkBlockWithImage.html" with title=panel.value.title image=panel.value.image description=panel.value.description linktext=panel.value.link_text linkurl=panel.value.link %} {% endfor %} diff --git a/app/tools_and_resources/templates/tools_and_resources/tools_and_resources_page.html b/app/tools_and_resources/templates/tools_and_resources/tools_and_resources_page.html index e666a9f..5497808 100644 --- a/app/tools_and_resources/templates/tools_and_resources/tools_and_resources_page.html +++ b/app/tools_and_resources/templates/tools_and_resources/tools_and_resources_page.html @@ -18,22 +18,19 @@

{{page.intro_header}}

-
- {{page.intro|safe}} -
-
- {{page.description|safe}} + {{page.description|richtext}}
- -

- {{page.learn_more_data_principles_text}} - {% include "ui/components/icon_svgs/LinkCaret.html" with class="ml-4" %} -

- +
+ {% for link in page.description_links %} +

+ {% include "ui/components/BaseLink.html" with linkurl=link.value.linkurl linktext=link.value.linktext %} +

+ {% endfor %} +
- {% image page.intro_image original %} + {% image page.intro_image original class="hidden lg:block" %}
@@ -45,21 +42,23 @@

{{page.intro_header}}

- {% include "ui/components/sections/BaseSectionWithImage.html" with title=page.resource_learning_title image=page.resource_learning_image imageright=True red_button=True button_text=page.get_connected_button_text button_link=page.get_connected_button_link description=page.resource_learning_description imagenotwide=True %} + {% include "ui/components/sections/BaseSectionWithImage.html" with title=page.resource_learning_title image=page.resource_learning_image imageright=True linklist=page.resource_learning_links description=page.resource_learning_description imagenotwide=True %}
- {% include "ui/components/dogear_boxes/DogearAnyColourLong.html" with title=page.dogear_tech_news_title linktext=page.dogear_tech_news_link_text linkurl=page.dogear_tech_news_link_url textcolour="black" colour="var(--hot-off-white)" arrowcolour="black" %} + {% with page.category_filter_selector.id|stringformat:"s" as id %} + {% include "ui/components/dogear_boxes/DogearAnyColourLong.html" with title=page.dogear_tech_news_title linktext=page.dogear_tech_news_link_text linkurl=page.dogear_tech_news_link linkappendage="?cat"|add:id|add:"=on" textcolour="black" colour="var(--hot-off-white)" arrowcolour="black" %} + {% endwith %}
- {% include "ui/components/dogear_boxes/DogearRed.html" with title=page.red_box_title linktext=page.red_box_link_text linkurl=page.red_box_link_url %} + {% include "ui/components/dogear_boxes/DogearRed.html" with title=page.red_box_title linktext=page.red_box_link_text linkurl=page.red_box_link %}
- {% include "ui/components/dogear_boxes/DogearBlack.html" with title=page.black_box_title linktext=page.black_box_link_text linkurl=page.black_box_link_url %} + {% include "ui/components/dogear_boxes/DogearBlack.html" with title=page.black_box_title linktext=page.black_box_link_text linkurl=page.black_box_link %}
diff --git a/app/ui/templates/ui/components/BaseLink.html b/app/ui/templates/ui/components/BaseLink.html index 2321ff3..6f65aee 100644 --- a/app/ui/templates/ui/components/BaseLink.html +++ b/app/ui/templates/ui/components/BaseLink.html @@ -7,7 +7,7 @@ {% endcomment %} - {{ linktext }} + {{ linktext }} diff --git a/app/ui/templates/ui/components/BaseLinkNoUnderline.html b/app/ui/templates/ui/components/BaseLinkNoUnderline.html index a956ca3..243ae99 100644 --- a/app/ui/templates/ui/components/BaseLinkNoUnderline.html +++ b/app/ui/templates/ui/components/BaseLinkNoUnderline.html @@ -1,4 +1,8 @@ - - {{linktext}} - {% include "ui/components/icon_svgs/LinkCaret.html" with class="ml-2" %} + + {{linktext}} + {% if not variableicon %} + {% include "ui/components/icon_svgs/LinkCaret.html" with class="ml-2" %} + {% else %} + {% include "ui/components/icon_svgs/VariableLinkIcon.html" with class="ml-2" %} + {% endif %} \ No newline at end of file diff --git a/app/ui/templates/ui/components/BaseLinkNoUnderlineWhite.html b/app/ui/templates/ui/components/BaseLinkNoUnderlineWhite.html new file mode 100644 index 0000000..b549726 --- /dev/null +++ b/app/ui/templates/ui/components/BaseLinkNoUnderlineWhite.html @@ -0,0 +1,12 @@ +{% if not anchorless %} + +{% endif %} + {{linktext}} + {% if whitearrow %} + {% include "ui/components/icon_svgs/LinkCaret.html" with class="ml-2 text-white" %} + {% else %} + {% include "ui/components/icon_svgs/LinkCaret.html" with class="ml-2 text-hot-red" %} + {% endif %} +{% if not anchorless %} + +{% endif %} \ No newline at end of file diff --git a/app/ui/templates/ui/components/BasePageHeader.html b/app/ui/templates/ui/components/BasePageHeader.html index f646afd..f5de7ce 100644 --- a/app/ui/templates/ui/components/BasePageHeader.html +++ b/app/ui/templates/ui/components/BasePageHeader.html @@ -11,7 +11,7 @@ {% load wagtailimages_tags %} {% image image original as image_p %} -
+
diff --git a/app/ui/templates/ui/components/FooterBannerWithTextAndLink.html b/app/ui/templates/ui/components/FooterBannerWithTextAndLink.html index 06b1ba3..f74d48f 100644 --- a/app/ui/templates/ui/components/FooterBannerWithTextAndLink.html +++ b/app/ui/templates/ui/components/FooterBannerWithTextAndLink.html @@ -12,12 +12,16 @@

{{ text }}

{% if description %} -
+
{{description|richtext}}
{% endif %} - - {% include "components/branded_elements/button.html" with text=buttontext %} - + {% if buttontext %} +
+ + {% include "components/branded_elements/button.html" with text=buttontext %} + +
+ {% endif %}
\ No newline at end of file diff --git a/app/ui/templates/ui/components/PageHeaderWithBlur.html b/app/ui/templates/ui/components/PageHeaderWithBlur.html index 80e0c51..d24cff8 100644 --- a/app/ui/templates/ui/components/PageHeaderWithBlur.html +++ b/app/ui/templates/ui/components/PageHeaderWithBlur.html @@ -10,10 +10,10 @@ {% load wagtailimages_tags %} {% image image original as image_p %} -
-
+
+
-
+

{{ title }} diff --git a/app/ui/templates/ui/components/PageOrLinkHrefText.html b/app/ui/templates/ui/components/PageOrLinkHrefText.html index 57a1547..143443c 100644 --- a/app/ui/templates/ui/components/PageOrLinkHrefText.html +++ b/app/ui/templates/ui/components/PageOrLinkHrefText.html @@ -1,13 +1,27 @@ +{% load wagtailcore_tags %} + {% if linkurl.0 and linkurl.0.value %} {% if linkurl.0.value.page %} - {{linkurl.0.value.page.url}} + {{linkurl.0.value.page.url}}{{linkappendage}} {% elif linkurl.0.value.url %} - {{linkurl.0.value.url}} + {% if linkurl.0.value.localized %} + {{linkurl.0.value.localized.url}}{{linkappendage}} + {% else %} + {{linkurl.0.value.url}}{{linkappendage}} + {% endif %} {% else %} - {{linkurl.0.value}} + {{linkurl.0.value}}{{linkappendage}} {% endif %} {% else %} {% if linkurl %} - {{ linkurl }} + {% if linkurl.url %} + {% if linkurl.localized %} + {{linkurl.localized.url}}{{linkappendage}} + {% else %} + {{linkurl.url}}{{linkappendage}} + {% endif %} + {% else %} + {{linkurl}}{{linkappendage}} + {% endif %} {% endif %} {% endif %} \ No newline at end of file diff --git a/app/ui/templates/ui/components/ThreeElementCarousel.html b/app/ui/templates/ui/components/ThreeElementCarousel.html index a945c47..d615e85 100644 --- a/app/ui/templates/ui/components/ThreeElementCarousel.html +++ b/app/ui/templates/ui/components/ThreeElementCarousel.html @@ -16,19 +16,9 @@ class="mt-20 lg:w-96 lg:mt-0 backdrop-blur-md p-8 shadow-md h-80 flex flex-col bg-hot-red md:bg-transparent">
{{ block.value.header }}
{{ block.value.body }}
- -
- {{ block.value.action_button.text }} - - - - -
- +

+ {% include "ui/components/BaseLinkNoUnderlineWhite.html" with linktext=block.value.action_button.text linkurl=block.value.action_button.link %} +

{% endfor %}
diff --git a/app/ui/templates/ui/components/carousel/CarouselImpactAreaUseCases.html b/app/ui/templates/ui/components/carousel/CarouselImpactAreaUseCases.html new file mode 100644 index 0000000..888f8ee --- /dev/null +++ b/app/ui/templates/ui/components/carousel/CarouselImpactAreaUseCases.html @@ -0,0 +1,5 @@ +{% extends "./CarouselShellGeneric.html" %} + +{% block individual_item %} + {% include "ui/components/dogear_boxes/SpecialDogearLinkBoxNoEar.html" with description=item.value.description colour="var(--hot-red)" linktext=page.get_parent.specific.learn_more_text link=item.value.link title=item.value.title %} +{% endblock %} \ No newline at end of file diff --git a/app/ui/templates/ui/components/carousel/CarouselShellGeneric.html b/app/ui/templates/ui/components/carousel/CarouselShellGeneric.html index ca1f692..4045728 100644 --- a/app/ui/templates/ui/components/carousel/CarouselShellGeneric.html +++ b/app/ui/templates/ui/components/carousel/CarouselShellGeneric.html @@ -1,7 +1,7 @@ {% load wagtailimages_tags %}
-
+
{% if title %}
{% include "ui/components/SectionHeadingWithUnderline.html" %} @@ -13,13 +13,13 @@ }" >
-
- {% include "ui/components/icon_svgs/LinkCaret.html" with class="rotate-180" %} +
+ {% include "ui/components/icon_svgs/LinkCaretCircle.html" with class="" styledhover=True %}
-
- {% include "ui/components/icon_svgs/LinkCaret.html" %} +
+ {% include "ui/components/icon_svgs/LinkCaretCircle.html" with class="" styledhover=True %}
@@ -42,13 +42,13 @@ :class="{ 'hidden': {{items|length}} == 1 }" >
-
- {% include "ui/components/icon_svgs/LinkCaret.html" with class="rotate-180" %} +
+ {% include "ui/components/icon_svgs/LinkCaretCircle.html" with class="" styledhover=True %}
-
- {% include "ui/components/icon_svgs/LinkCaret.html" %} +
+ {% include "ui/components/icon_svgs/LinkCaretCircle.html" with class="" styledhover=True %}
diff --git a/app/ui/templates/ui/components/dogear_boxes/DogearAnyColour.html b/app/ui/templates/ui/components/dogear_boxes/DogearAnyColour.html index 570cc20..4a821b3 100644 --- a/app/ui/templates/ui/components/dogear_boxes/DogearAnyColour.html +++ b/app/ui/templates/ui/components/dogear_boxes/DogearAnyColour.html @@ -6,16 +6,6 @@ - colour: a string; the colour that the box should be (can be hex code or any other CSS compatible colour thing) {% endcomment %} -
-

- {{ title }} -

- -

- {{ linktext }} - - {% include "ui/components/icon_svgs/LinkCaret.html" %} - -

- +
+ {% include "./DogearContent.html" with color="var(--hot-red)" %}
\ No newline at end of file diff --git a/app/ui/templates/ui/components/dogear_boxes/DogearAnyColourLong.html b/app/ui/templates/ui/components/dogear_boxes/DogearAnyColourLong.html index 2271609..2284b51 100644 --- a/app/ui/templates/ui/components/dogear_boxes/DogearAnyColourLong.html +++ b/app/ui/templates/ui/components/dogear_boxes/DogearAnyColourLong.html @@ -7,14 +7,11 @@ - arrowcolour: a string; the colour the arrow should be {% endcomment %} -
+

{{ title }}

- - {{ linktext }} - - {% include "ui/components/icon_svgs/LinkCaret.html" %} - - +

+ {% include "ui/components/BaseLinkNoUnderline.html" %} +

\ No newline at end of file diff --git a/app/ui/templates/ui/components/dogear_boxes/DogearBlack.html b/app/ui/templates/ui/components/dogear_boxes/DogearBlack.html index 6a3d2fe..bd789dd 100644 --- a/app/ui/templates/ui/components/dogear_boxes/DogearBlack.html +++ b/app/ui/templates/ui/components/dogear_boxes/DogearBlack.html @@ -5,6 +5,6 @@ - linktext: a string; the text that shows for the link {% endcomment %} -
+
{% include "./DogearContent.html" with color="var(--hot-red)" %}
\ No newline at end of file diff --git a/app/ui/templates/ui/components/dogear_boxes/DogearContent.html b/app/ui/templates/ui/components/dogear_boxes/DogearContent.html index 9ae98e0..a741d4e 100644 --- a/app/ui/templates/ui/components/dogear_boxes/DogearContent.html +++ b/app/ui/templates/ui/components/dogear_boxes/DogearContent.html @@ -10,21 +10,25 @@ {% endcomment %} {% load wagtailcore_tags %} -

- {{ title }} -

-{% if description %} -

{{description|richtext}}

-{% endif %} - -

- {{ linktext }} - - {% include "ui/components/icon_svgs/LinkCaret.html" %} - -

- +
+

+ {{ title }} +

+ {% if description %} +

{{description|richtext}}

+ {% endif %} +
+ +

+ {{ linktext }} + + {% include "ui/components/icon_svgs/LinkCaret.html" %} + +

+ +
+
\ No newline at end of file diff --git a/app/ui/templates/ui/components/dogear_boxes/DogearRed.html b/app/ui/templates/ui/components/dogear_boxes/DogearRed.html index 384f924..41c4125 100644 --- a/app/ui/templates/ui/components/dogear_boxes/DogearRed.html +++ b/app/ui/templates/ui/components/dogear_boxes/DogearRed.html @@ -5,6 +5,6 @@ - linktext: a string; the text that shows for the link {% endcomment %} -
+
{% include "./DogearContent.html" %}
\ No newline at end of file diff --git a/app/ui/templates/ui/components/dogear_boxes/SpecialDogearLinkBox.html b/app/ui/templates/ui/components/dogear_boxes/SpecialDogearLinkBox.html index 46eb0f2..a5079e3 100644 --- a/app/ui/templates/ui/components/dogear_boxes/SpecialDogearLinkBox.html +++ b/app/ui/templates/ui/components/dogear_boxes/SpecialDogearLinkBox.html @@ -12,10 +12,10 @@

{{ title }}

-
+
{{ description|richtext }}
-
+
{% include "ui/components/BaseLink.html" %}
\ No newline at end of file diff --git a/app/ui/templates/ui/components/dogear_boxes/SpecialDogearLinkBoxNoEar.html b/app/ui/templates/ui/components/dogear_boxes/SpecialDogearLinkBoxNoEar.html new file mode 100644 index 0000000..b3be6f2 --- /dev/null +++ b/app/ui/templates/ui/components/dogear_boxes/SpecialDogearLinkBoxNoEar.html @@ -0,0 +1,21 @@ +{% comment %} +==> PARAMETERS +- title: a string; the title of the box +- description: an HTML element (should really just be one

element) +- colour: a string; the colour that the box's accents should be + (can be hex code or any other CSS compatible colour thing) +{% endcomment %} +{% load wagtailcore_tags %} + +

+

+ {{ title }} +

+
+ {{ description|richtext }} +
+
+ {% include "ui/components/BaseLink.html" %} +
+
\ No newline at end of file diff --git a/app/ui/templates/ui/components/events/EventPreviewBlockEvent.html b/app/ui/templates/ui/components/events/EventPreviewBlockEvent.html index 0335714..3ecc6b6 100644 --- a/app/ui/templates/ui/components/events/EventPreviewBlockEvent.html +++ b/app/ui/templates/ui/components/events/EventPreviewBlockEvent.html @@ -8,34 +8,33 @@ {% image event.image original as image_p %}
{% if showimage %} -
-
-
+
+ {% image event.image original class="aspect-[8/5] object-cover object-center" %}
{% endif %} -
+
{% if event.start_date_time.date == event.end_date_time.date %}

{{ event.start_date_time.date }}

- {{event.start_date_time.time}} – {{ event.end_date_time.time }} + {{event.start_date_time.time}} {{event.start_date_time.tzinfo}} – {{ event.end_date_time.time }} {{event.end_date_time.tzinfo}}

{% else %}

- {{event.start_date_time}} + {{event.start_date_time}} {{event.start_date_time.tzinfo}}

–

- {{event.end_date_time}} + {{event.end_date_time}} {{event.end_date_time.tzinfo}}

{% endif %}
-

{{event.title}}

+

{{event.title}}
{{event.intro|richtext}}
@@ -45,10 +44,7 @@ {% if event.rsvp_link %}

- - {{event.get_parent.specific.rsvp_button_text}} - {% include "ui/components/icon_svgs/LinkCaret.html" with class="ml-2" %} - + {% include "ui/components/BaseLinkNoUnderline.html" with linkurl=event.rsvp_link linktext=event.get_parent.specific.rsvp_button_text %}

{% endif %}
diff --git a/app/ui/templates/ui/components/icon_svgs/DoubleDownChevron.html b/app/ui/templates/ui/components/icon_svgs/DoubleDownChevron.html new file mode 100644 index 0000000..81cf9c6 --- /dev/null +++ b/app/ui/templates/ui/components/icon_svgs/DoubleDownChevron.html @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/ui/templates/ui/components/icon_svgs/ExternalLinkIcon.html b/app/ui/templates/ui/components/icon_svgs/ExternalLinkIcon.html index 4cca73a..ea6f108 100644 --- a/app/ui/templates/ui/components/icon_svgs/ExternalLinkIcon.html +++ b/app/ui/templates/ui/components/icon_svgs/ExternalLinkIcon.html @@ -1,4 +1,4 @@ - + diff --git a/app/ui/templates/ui/components/icon_svgs/LinkCaretCircle.html b/app/ui/templates/ui/components/icon_svgs/LinkCaretCircle.html new file mode 100644 index 0000000..c1225d6 --- /dev/null +++ b/app/ui/templates/ui/components/icon_svgs/LinkCaretCircle.html @@ -0,0 +1,3 @@ +
+ {% include "./LinkCaret.html" with class="mt-0.5" %} +
\ No newline at end of file diff --git a/app/ui/templates/ui/components/icon_svgs/VariableLinkIcon.html b/app/ui/templates/ui/components/icon_svgs/VariableLinkIcon.html new file mode 100644 index 0000000..5c52864 --- /dev/null +++ b/app/ui/templates/ui/components/icon_svgs/VariableLinkIcon.html @@ -0,0 +1,17 @@ +{% load wagtailcore_tags %} + +{% if linkurl.0 and linkurl.0.value %} + {% if linkurl.0.value.page or linkurl.0.value.url %} + {% include "ui/components/icon_svgs/LinkCaret.html" %} + {% else %} + {% include "ui/components/icon_svgs/ExternalLinkIcon.html" %} + {% endif %} +{% else %} + {% if linkurl %} + {% if linkurl.url %} + {% include "ui/components/icon_svgs/LinkCaret.html" %} + {% else %} + {% include "ui/components/icon_svgs/ExternalLinkIcon.html" %} + {% endif %} + {% endif %} +{% endif %} \ No newline at end of file diff --git a/app/ui/templates/ui/components/impact_areas/ImpactAreaPreviewBlock.html b/app/ui/templates/ui/components/impact_areas/ImpactAreaPreviewBlock.html index c8aefb6..37ac4da 100644 --- a/app/ui/templates/ui/components/impact_areas/ImpactAreaPreviewBlock.html +++ b/app/ui/templates/ui/components/impact_areas/ImpactAreaPreviewBlock.html @@ -5,28 +5,24 @@ {% load wagtailcore_tags %} {% load wagtailimages_tags %} -{% image ia.header_image original as image_p %} -
-
- -
- -

- {% image ia.external_icon original class="black-image-redifier h-16 w-auto inline" %} - {{ ia.title }} -

+{% with ia.localized as ia %} + {% image ia.header_image original as image_p %} +
+
+ +
+ +

+ {% image ia.external_icon original class="black-image-redifier h-16 w-auto inline" %} + {{ ia.title }} +

-
- {{ ia.intro|richtext }} -
+
+ {{ ia.intro|richtext }} +
-

- - Learn More about {{ ia.title }} - - - - - -

-
\ No newline at end of file +

+ {% include "ui/components/BaseLink.html" with linktext=learn_more_text linkurl=ia.url %} +

+
+{% endwith %} \ No newline at end of file diff --git a/app/ui/templates/ui/components/impact_areas/ImpactAreaPreviewBlockMini.html b/app/ui/templates/ui/components/impact_areas/ImpactAreaPreviewBlockMini.html index f28dad3..f6e847b 100644 --- a/app/ui/templates/ui/components/impact_areas/ImpactAreaPreviewBlockMini.html +++ b/app/ui/templates/ui/components/impact_areas/ImpactAreaPreviewBlockMini.html @@ -1,10 +1,12 @@ {% load wagtailimages_tags %} - -
- {% image area.external_icon fill-200x200 class="px-10" %} -

- {{ area.title }} -

-
- \ No newline at end of file +{% with area.localized as area %} + +
+ {% image area.external_icon original class="w-32 h-32" %} +

+ {{ area.title }} +

+
+ +{% endwith %} \ No newline at end of file diff --git a/app/ui/templates/ui/components/mapping_hub/MappingHubPreviewBlock.html b/app/ui/templates/ui/components/mapping_hub/MappingHubPreviewBlock.html index affd498..859d056 100644 --- a/app/ui/templates/ui/components/mapping_hub/MappingHubPreviewBlock.html +++ b/app/ui/templates/ui/components/mapping_hub/MappingHubPreviewBlock.html @@ -4,6 +4,6 @@ {% endcomment %} {% load wagtailimages_tags %} - + {% include "./MappingHubPreviewBlockBase.html" %} diff --git a/app/ui/templates/ui/components/mapping_hub/MappingHubPreviewBlockBase.html b/app/ui/templates/ui/components/mapping_hub/MappingHubPreviewBlockBase.html index a6c44fd..bbbce53 100644 --- a/app/ui/templates/ui/components/mapping_hub/MappingHubPreviewBlockBase.html +++ b/app/ui/templates/ui/components/mapping_hub/MappingHubPreviewBlockBase.html @@ -4,10 +4,12 @@ {% endcomment %} {% load wagtailimages_tags %} -
- {% image hub.main_external_hub_image fill-600x300 %} - -

- {{ hub.title }} -

-
+{% with hub.localized as hub %} +
+ {% image hub.main_external_hub_image fill-600x300 %} + +

+ {{ hub.title }} +

+
+{% endwith %} \ No newline at end of file diff --git a/app/ui/templates/ui/components/mapping_hub/MappingHubPreviewExtendedBlock.html b/app/ui/templates/ui/components/mapping_hub/MappingHubPreviewExtendedBlock.html index c246f0a..9b25618 100644 --- a/app/ui/templates/ui/components/mapping_hub/MappingHubPreviewExtendedBlock.html +++ b/app/ui/templates/ui/components/mapping_hub/MappingHubPreviewExtendedBlock.html @@ -5,22 +5,24 @@ {% load wagtailcore_tags %} {% load wagtailimages_tags %} -
-
- {% image hub.header_image original class="col-start-1 row-start-1 aspect-[2/1] object-cover" %} -
+{% with hub.localized as hub %} +
+
+ {% image hub.header_image original class="col-start-1 row-start-1 aspect-[2/1] object-cover" %} +
+
+
+ {% image hub.main_icon original class="w-14 h-auto" %} +

+ {{hub.title}} {{hub_text}} +

+
+
+ {{hub.external_description_long|richtext}} +
+

+ {% include "ui/components/BaseLink.html" with linktext=learn_more_text linkurl=hub.url %} +

-
- {% image hub.main_icon original class="w-14 h-auto" %} -

- {{hub.title}} {{hub_text}} -

-
-
- {{hub.external_description_long|richtext}} -
-

- {% include "ui/components/BaseLink.html" with linktext=learn_more_text|add:" "|add:hub.title|add:" "|add:hub_text linkurl=hub.url %} -

-
+{% endwith %} \ No newline at end of file diff --git a/app/ui/templates/ui/components/mapping_hub/MappingHubPreviewProjectsBlock.html b/app/ui/templates/ui/components/mapping_hub/MappingHubPreviewProjectsBlock.html index dc8b399..09eaccb 100644 --- a/app/ui/templates/ui/components/mapping_hub/MappingHubPreviewProjectsBlock.html +++ b/app/ui/templates/ui/components/mapping_hub/MappingHubPreviewProjectsBlock.html @@ -4,6 +4,8 @@ {% endcomment %} {% load wagtailimages_tags %} - - {% include "./MappingHubPreviewBlockBase.html" with hub=hub_project.get_parent.specific %} - +{% with hub.id|stringformat:"s" as id %} + + {% include "./MappingHubPreviewBlockBase.html" with hub=hub %} + +{% endwith %} \ No newline at end of file diff --git a/app/ui/templates/ui/components/misc_panels/LinkBlockWithImage.html b/app/ui/templates/ui/components/misc_panels/LinkBlockWithImage.html index a4c1df7..858bfe1 100644 --- a/app/ui/templates/ui/components/misc_panels/LinkBlockWithImage.html +++ b/app/ui/templates/ui/components/misc_panels/LinkBlockWithImage.html @@ -9,7 +9,7 @@ {% load wagtailimages_tags %}
- {% image image original class="aspect-[2/1] object-cover" %} + {% image image original class="aspect-[3/2] object-cover" %}

{{title}}

{{description|richtext}} diff --git a/app/ui/templates/ui/components/misc_panels/PagePreviewBasic.html b/app/ui/templates/ui/components/misc_panels/PagePreviewBasic.html index 3c6429a..6a281db 100644 --- a/app/ui/templates/ui/components/misc_panels/PagePreviewBasic.html +++ b/app/ui/templates/ui/components/misc_panels/PagePreviewBasic.html @@ -6,14 +6,16 @@ {% load wagtailimages_tags %} {% image image original as previmg %} - -
-
+{% with page.localized as page %} + +
+
+
+
+

+ {{page.title}} +

+
-
-

- {{page.title}} -

-
-
- \ No newline at end of file + +{% endwith %} \ No newline at end of file diff --git a/app/ui/templates/ui/components/misc_panels/PagePreviewWithTabletDescription.html b/app/ui/templates/ui/components/misc_panels/PagePreviewWithTabletDescription.html index eb1db9d..a3410b1 100644 --- a/app/ui/templates/ui/components/misc_panels/PagePreviewWithTabletDescription.html +++ b/app/ui/templates/ui/components/misc_panels/PagePreviewWithTabletDescription.html @@ -5,27 +5,39 @@ - tablet_description: html element; the description of the block, which only shows on tablet sizes and smaller - read_more_text: string; the text to show for "read more" {% endcomment %} +{% load wagtailcore_tags %} {% load wagtailimages_tags %} {% image image original as previmg %} - -
-
+{% with page.localized as page %} + +
+
+
+ + {% if not hoverless %} +
+

{{page.title}}

+
{{tablet_description|richtext}}
+

+ {% include "ui/components/BaseLinkNoUnderlineWhite.html" with anchorless=True linktext=read_more_text whitearrow=True %} +

+
+ {% endif %}
- -
-

{{page.title}}

-
- {{tablet_description}} -
-

- {{read_more_text}} - {% include "ui/components/icon_svgs/LinkCaret.html" with class="ml-2" %} -

-
- \ No newline at end of file + +{% endwith %} \ No newline at end of file diff --git a/app/ui/templates/ui/components/navigation/FooterNavigation.html b/app/ui/templates/ui/components/navigation/FooterNavigation.html index e90fc6e..f506214 100644 --- a/app/ui/templates/ui/components/navigation/FooterNavigation.html +++ b/app/ui/templates/ui/components/navigation/FooterNavigation.html @@ -18,15 +18,17 @@ {% comment %} NAVIGATION ITEMS {% endcomment %}
{% for item in navigation %} - {% if item.value.show_in_footer%} + {% if item.value.show_in_footer %}

- {{item.value.title}} + {{item.value.title}}

{% for child in item.value.children %} -

- {{child.value.title}} -

+ {% if child.value.link %} +

+ {{child.value.title}} +

+ {% endif %} {% endfor %}
{% endif %} @@ -34,7 +36,18 @@
- {% image home_page.footer_candid_seal original %} +
+ {% for certification in home_page.footer_certifications %} + {% if certification.value.link %} + + {% endif %} + {% image certification.value.icon original class="h-24 w-auto" %} + {% if certification.value.link %} + + {% endif %} + {% endfor %} +
+
{% comment %} COPYRIGHT + ASSORTED LINKS {% endcomment %} diff --git a/app/ui/templates/ui/components/navigation/HeaderNavbar.html b/app/ui/templates/ui/components/navigation/HeaderNavbar.html index 161812b..4056ac5 100644 --- a/app/ui/templates/ui/components/navigation/HeaderNavbar.html +++ b/app/ui/templates/ui/components/navigation/HeaderNavbar.html @@ -1,6 +1,7 @@ {% comment %} No parameters; it grabs directly from the home page (for the correct locale). {% endcomment %} +{% load wagtailimages_tags %} {% load homepage_tags %} {% get_navigation as navigation %} {% get_home_page as home_page %} @@ -9,7 +10,7 @@
{% include "components/branded_elements/logo.html" with class="h-10 my-2" %}