diff --git a/app/events/templates/events/individual_event_page.html b/app/events/templates/events/individual_event_page.html
index de51588..0598ed3 100644
--- a/app/events/templates/events/individual_event_page.html
+++ b/app/events/templates/events/individual_event_page.html
@@ -36,11 +36,40 @@
{{ page.title }}
{{page.get_parent.specific.event_location_title}}
-
- {{page.event_location}}
-
+ {% if page.event_host_type %}
+
+ {{page.event_host_type}}
+
+ {% endif %}
+ {% if page.event_location %}
+
+ {{page.event_location}}
+
+ {% endif %}
+ {% if page.event_region_hub %}
+
+ {{page.get_parent.specific.event_region_hub_title}}
+
+
+ {{page.event_region_hub.title}}
+
+
+ {% endif %}
+
+ {% if page.event_categories %}
+
+ {{page.get_parent.specific.event_categories_title}}
+
+
+ {% for category in page.event_categories.all %}
+ {{category}} {% if not forloop.last %}, {% endif %}
+ {% endfor %}
+
+
+ {% endif %}
+
{% if page.rsvp_description or page.rsvp_link %}
diff --git a/app/partners/__init__.py b/app/partners/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/app/partners/admin.py b/app/partners/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/app/partners/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/app/partners/apps.py b/app/partners/apps.py
new file mode 100644
index 0000000..6eb8a4b
--- /dev/null
+++ b/app/partners/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class PartnersConfig(AppConfig):
+ default_auto_field = 'django.db.models.BigAutoField'
+ name = 'app.partners'
diff --git a/app/partners/migrations/0001_initial.py b/app/partners/migrations/0001_initial.py
new file mode 100644
index 0000000..b7f4b2c
--- /dev/null
+++ b/app/partners/migrations/0001_initial.py
@@ -0,0 +1,44 @@
+# Generated by Django 4.2.7 on 2024-07-25 18:00
+
+from django.db import migrations, models
+import django.db.models.deletion
+import wagtail.blocks
+import wagtail.fields
+import wagtail.images.blocks
+
+
+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='PartnerWithUsPage',
+ 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_description', wagtail.fields.RichTextField(blank=True)),
+ ('intro', wagtail.fields.RichTextField(blank=True)),
+ ('partnership_types_title', models.CharField(default='Types of Partnerships')),
+ ('partnership_types', wagtail.fields.StreamField([('blocks', wagtail.blocks.StructBlock([('icon', wagtail.images.blocks.ImageChooserBlock()), ('title', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock())]))], blank=True, help_text='Blocks to be shown under the Types of Partnerships section.', null=True, use_json_field=True)),
+ ('meet_our_partners_title', models.CharField(default='Meet Our Partners')),
+ ('view_all_partners_text', models.CharField(default='View All Partners')),
+ ('view_all_partners_link', wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock())], blank=True, use_json_field=True)),
+ ('red_box_title', models.CharField(default='Still have questions?')),
+ ('red_box_link_text', models.CharField(default='Contact our team')),
+ ('red_box_link_url', wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock())], blank=True, use_json_field=True)),
+ ('black_box_title', models.CharField(default='Become a Partner')),
+ ('black_box_link_text', models.CharField(default='Email to partnerships@hotosm.org')),
+ ('black_box_link_url', wagtail.fields.StreamField([('page', wagtail.blocks.PageChooserBlock()), ('url', wagtail.blocks.URLBlock())], 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')),
+ ],
+ options={
+ 'abstract': False,
+ },
+ bases=('wagtailcore.page',),
+ ),
+ ]
diff --git a/app/partners/migrations/0002_alter_partnerwithuspage_black_box_link_url.py b/app/partners/migrations/0002_alter_partnerwithuspage_black_box_link_url.py
new file mode 100644
index 0000000..f1df0d9
--- /dev/null
+++ b/app/partners/migrations/0002_alter_partnerwithuspage_black_box_link_url.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.7 on 2024-07-25 19:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('partners', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='partnerwithuspage',
+ name='black_box_link_url',
+ field=models.EmailField(default='partnerships@hotosm.org', max_length=254),
+ ),
+ ]
diff --git a/app/partners/migrations/0003_rename_black_box_link_url_partnerwithuspage_black_box_link_email.py b/app/partners/migrations/0003_rename_black_box_link_url_partnerwithuspage_black_box_link_email.py
new file mode 100644
index 0000000..9ec3527
--- /dev/null
+++ b/app/partners/migrations/0003_rename_black_box_link_url_partnerwithuspage_black_box_link_email.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.7 on 2024-07-25 19:34
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('partners', '0002_alter_partnerwithuspage_black_box_link_url'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='partnerwithuspage',
+ old_name='black_box_link_url',
+ new_name='black_box_link_email',
+ ),
+ ]
diff --git a/app/partners/migrations/0004_ourpartnerspage.py b/app/partners/migrations/0004_ourpartnerspage.py
new file mode 100644
index 0000000..fb72bed
--- /dev/null
+++ b/app/partners/migrations/0004_ourpartnerspage.py
@@ -0,0 +1,38 @@
+# Generated by Django 4.2.7 on 2024-07-25 21:43
+
+from django.db import migrations, models
+import django.db.models.deletion
+import wagtail.blocks
+import wagtail.fields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('wagtailcore', '0089_log_entry_data_json_null_to_object'),
+ ('wagtailimages', '0025_alter_image_file_alter_rendition_file'),
+ ('partners', '0003_rename_black_box_link_url_partnerwithuspage_black_box_link_email'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='OurPartnersPage',
+ 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')),
+ ('intro', wagtail.fields.RichTextField(blank=True, help_text='This is shown in the header.')),
+ ('filter_by_type_text', models.CharField(default='Filter by Type')),
+ ('load_more_partners_text', models.CharField(default='Load More Partners')),
+ ('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())], 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())], 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')),
+ ],
+ options={
+ 'abstract': False,
+ },
+ bases=('wagtailcore.page',),
+ ),
+ ]
diff --git a/app/partners/migrations/0005_alter_ourpartnerspage_black_box_link_text_and_more.py b/app/partners/migrations/0005_alter_ourpartnerspage_black_box_link_text_and_more.py
new file mode 100644
index 0000000..d301782
--- /dev/null
+++ b/app/partners/migrations/0005_alter_ourpartnerspage_black_box_link_text_and_more.py
@@ -0,0 +1,33 @@
+# Generated by Django 4.2.7 on 2024-07-25 23:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('partners', '0004_ourpartnerspage'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='ourpartnerspage',
+ name='black_box_link_text',
+ field=models.CharField(default='Become a funder'),
+ ),
+ migrations.AlterField(
+ model_name='ourpartnerspage',
+ name='black_box_title',
+ field=models.CharField(default='Become a funding partner'),
+ ),
+ migrations.AlterField(
+ model_name='ourpartnerspage',
+ name='red_box_link_text',
+ field=models.CharField(default='Partner with us'),
+ ),
+ migrations.AlterField(
+ model_name='ourpartnerspage',
+ name='red_box_title',
+ field=models.CharField(default='Learn ways to partner with HOT'),
+ ),
+ ]
diff --git a/app/partners/migrations/0006_ourpartnerspage_filter_button_text.py b/app/partners/migrations/0006_ourpartnerspage_filter_button_text.py
new file mode 100644
index 0000000..47d6b22
--- /dev/null
+++ b/app/partners/migrations/0006_ourpartnerspage_filter_button_text.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.7 on 2024-07-26 16:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('partners', '0005_alter_ourpartnerspage_black_box_link_text_and_more'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='ourpartnerspage',
+ name='filter_button_text',
+ field=models.CharField(default='Submit'),
+ ),
+ ]
diff --git a/app/partners/migrations/__init__.py b/app/partners/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/app/partners/models.py b/app/partners/models.py
new file mode 100644
index 0000000..9377506
--- /dev/null
+++ b/app/partners/models.py
@@ -0,0 +1,151 @@
+from django.db import models
+from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
+from django.db.models import Q
+
+from wagtail.admin.panels import FieldPanel, MultiFieldPanel
+from wagtail.fields import RichTextField, StreamField
+from wagtail.blocks import CharBlock, StreamBlock, StructBlock, URLBlock, RichTextBlock, PageChooserBlock
+from wagtail.images.blocks import ImageChooserBlock
+from wagtail.models import Page
+from app.core.models import LinkOrPageBlock, Partner, PartnerType
+
+
+# The "partners" snippet is in the core app's models.
+
+class PartnerWithUsPage(Page):
+ def get_context(self, request, *args, **kwargs):
+ context = super().get_context(request, *args, **kwargs)
+
+ partners = Partner.objects.all()
+
+ context['partners'] = partners
+ return context
+
+ 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_description = RichTextField(blank=True)
+
+ intro = RichTextField(blank=True)
+
+ partnership_types_title = models.CharField(default="Types of Partnerships")
+ partnership_types = StreamField([
+ ('blocks', StructBlock([
+ ('icon', ImageChooserBlock()),
+ ('title', CharBlock()),
+ ('description', RichTextBlock())
+ ]))
+ ], use_json_field=True, null=True, blank=True, help_text="Blocks to be shown under the Types of Partnerships section.")
+
+ meet_our_partners_title = models.CharField(default="Meet Our Partners")
+ view_all_partners_text = models.CharField(default="View All Partners")
+ view_all_partners_link = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True)
+
+ red_box_title = models.CharField(default="Still have questions?")
+ red_box_link_text = models.CharField(default="Contact our team")
+ red_box_link_url = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True)
+ black_box_title = models.CharField(default="Become a Partner")
+ black_box_link_text = models.CharField(default="Email to partnerships@hotosm.org")
+ black_box_link_email = models.EmailField(default="partnerships@hotosm.org", max_length=254)
+
+ content_panels = Page.content_panels + [
+ MultiFieldPanel([
+ FieldPanel('header_image'),
+ FieldPanel('header_description'),
+ ], heading="Header"),
+ FieldPanel('intro'),
+ MultiFieldPanel([
+ FieldPanel('partnership_types_title'),
+ FieldPanel('partnership_types'),
+ ], heading="Types of Partnerships"),
+ MultiFieldPanel([
+ FieldPanel('meet_our_partners_title'),
+ FieldPanel('view_all_partners_text'),
+ FieldPanel('view_all_partners_link'),
+ ], heading="Meet Our Partners"),
+ MultiFieldPanel([
+ FieldPanel('red_box_title'),
+ FieldPanel('red_box_link_text'),
+ FieldPanel('red_box_link_url'),
+ FieldPanel('black_box_title'),
+ FieldPanel('black_box_link_text'),
+ FieldPanel('black_box_link_email'),
+ ], heading="Dogear Boxes"),
+ ]
+
+
+class OurPartnersPage(Page):
+ def get_context(self, request, *args, **kwargs):
+ context = super().get_context(request, *args, **kwargs)
+
+ partners = Partner.objects.all()
+
+ p_types = PartnerType.objects.all()
+ query = Q()
+ for p_type in p_types:
+ if request.GET.get(str(p_type), ''):
+ query = query | Q(partner_type__type_name=p_type)
+ 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
+ try:
+ partners = paginator.page(page)
+ except PageNotAnInteger:
+ partners = paginator.page(1)
+ except EmptyPage:
+ partners = paginator.page(paginator.num_pages)
+
+ context['partners'] = partners
+ context['partner_types'] = p_types
+ return context
+
+ max_count = 1
+
+ header_image = models.ForeignKey(
+ "wagtailimages.Image",
+ null=True,
+ blank=True,
+ on_delete=models.SET_NULL,
+ related_name="+",
+ help_text="Header image"
+ )
+ intro = RichTextField(blank=True, help_text="This is shown in the header.")
+
+ filter_by_type_text = models.CharField(default="Filter by Type")
+
+ filter_button_text = models.CharField(default="Submit")
+
+ load_more_partners_text = models.CharField(default="Load More Partners")
+
+ red_box_title = models.CharField(default="Learn ways to partner with HOT")
+ red_box_link_text = models.CharField(default="Partner with us")
+ red_box_link_url = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True)
+ black_box_title = models.CharField(default="Become a funding partner")
+ black_box_link_text = models.CharField(default="Become a funder")
+ black_box_link_url = StreamField(LinkOrPageBlock(), use_json_field=True, blank=True)
+
+ content_panels = Page.content_panels + [
+ MultiFieldPanel([
+ FieldPanel('header_image'),
+ FieldPanel('intro'),
+ ], heading="Header"),
+ FieldPanel('filter_by_type_text'),
+ FieldPanel('filter_button_text'),
+ FieldPanel('load_more_partners_text'),
+ MultiFieldPanel([
+ FieldPanel('red_box_title'),
+ FieldPanel('red_box_link_text'),
+ FieldPanel('red_box_link_url'),
+ FieldPanel('black_box_title'),
+ FieldPanel('black_box_link_text'),
+ FieldPanel('black_box_link_url'),
+ ], heading="Dogear Boxes"),
+ ]
diff --git a/app/partners/templates/partners/our_partners_page.html b/app/partners/templates/partners/our_partners_page.html
new file mode 100644
index 0000000..2af7fa2
--- /dev/null
+++ b/app/partners/templates/partners/our_partners_page.html
@@ -0,0 +1,78 @@
+{% extends "base.html" %}
+{% load static %}
+{% load wagtailcore_tags %}
+{% load wagtailimages_tags %}
+{% load compress %}
+{% block body_class %}template-ourpartnerspage{% endblock %}
+{% block extra_css %}
+ {% compress css %}
+ {% endcompress css %}
+{% endblock extra_css %}
+
+{% block content %}
+ {% include "ui/components/PageHeaderWithBlur.html" with title=page.title subtitle=page.intro image=page.header_image full_length=True %}
+
+
+
+
+
+
+ {% for partner in partners %}
+
+ {% image partner.partner_logo original class="max-h-24 max-w-36 h-auto w-auto" %}
+
+ {% endfor %}
+
+
+ {% if partners.has_next %}
+ {% comment %}
+
+ {{page.load_more_partners_text}}
+
+ {% include "ui/components/icon_svgs/LinkCaret.html" with class="rotate-90 text-hot-red" %}
+
+ {% endif %}
+
+
+
+
+ {% 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 %}
+
+
+
+
+
+
+
+ {{page.intro|safe}}
+
+
+
+ {% include "ui/components/SectionHeadingWithUnderline.html" with title=page.partnership_types_title %}
+
+ {% for block in page.partnership_types %}
+
+ {% image block.value.icon original class="h-8 w-8 mt-2" %}
+
+ {{block.value.title}}
+
+
+ {{block.value.description}}
+
+
+ {% endfor %}
+
+
+ {% include "ui/components/FlexTitleWithLink.html" with title=page.meet_our_partners_title linktext=page.view_all_partners_text linkurl=page.view_all_partners_link underline=True %}
+
+ {% include "ui/components/partners/PartnerViewBlock.html" %}
+
+
+
+
+ {% 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="mailto:"|add:page.black_box_link_email %}
+
+
+
+
-
- {{title}}
-
+
+
+ {{title}}
+
+ {% if underline %}
+
{% include "ui/components/BaseLink.html" %}
diff --git a/app/ui/templates/ui/components/PageHeaderWithBlur.html b/app/ui/templates/ui/components/PageHeaderWithBlur.html
index e67f2ed..6d1c3f2 100644
--- a/app/ui/templates/ui/components/PageHeaderWithBlur.html
+++ b/app/ui/templates/ui/components/PageHeaderWithBlur.html
@@ -14,12 +14,14 @@
-
+
{{ title }}
- {% if subtitle %}
- {{ subtitle|safe }}
- {% endif %}
+
+ {% if subtitle %}
+ {{ subtitle|safe }}
+ {% endif %}
+
diff --git a/home/templatetags/homepage_tags.py b/home/templatetags/homepage_tags.py
index 16500eb..cf36d38 100644
--- a/home/templatetags/homepage_tags.py
+++ b/home/templatetags/homepage_tags.py
@@ -16,8 +16,6 @@ def get_home_page(context):
if not home_page:
home_page = HomePage.objects.live().filter(locale=context['page'].locale).first().specific
-
- print(home_page)
return home_page
diff --git a/hot_osm/settings/base.py b/hot_osm/settings/base.py
index dcb9101..1adafa5 100644
--- a/hot_osm/settings/base.py
+++ b/hot_osm/settings/base.py
@@ -51,6 +51,7 @@
"app.volunteer_opportunities",
"app.rfp",
"app.misc",
+ "app.partners",
"search",
"users",
"utils",