diff --git a/base/migrations/0028_alter_servicecategory_options_servicecategory_order.py b/base/migrations/0028_alter_servicecategory_options_servicecategory_order.py new file mode 100644 index 00000000..28c5ae71 --- /dev/null +++ b/base/migrations/0028_alter_servicecategory_options_servicecategory_order.py @@ -0,0 +1,22 @@ +# Generated by Django 4.2.3 on 2024-05-14 09:32 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('base', '0027_integrationsettings_google_site_verification_key'), + ] + + operations = [ + migrations.AlterModelOptions( + name='servicecategory', + options={'ordering': ['order'], 'verbose_name': 'Service Category', 'verbose_name_plural': 'Service Categories'}, + ), + migrations.AddField( + model_name='servicecategory', + name='order', + field=models.IntegerField(blank=True, editable=False, null=True), + ), + ] diff --git a/base/models/snippets.py b/base/models/snippets.py index a5adbbc5..4c0620af 100644 --- a/base/models/snippets.py +++ b/base/models/snippets.py @@ -79,14 +79,15 @@ def slug(self): return slugify(self.name) -@register_snippet class ServiceCategory(models.Model): name = models.CharField(max_length=255, verbose_name=_("Name")) icon = models.CharField(max_length=100, verbose_name=_("Icon")) + order = models.IntegerField(null=True, blank=True) panels = [ FieldPanel('name'), FieldPanel('icon', widget=IconChooserWidget), + FieldPanel('order'), ] api_fields = [ @@ -97,6 +98,7 @@ def __str__(self): return self.name class Meta: + ordering = ['order'] verbose_name = _("Service Category") verbose_name_plural = _("Service Categories") diff --git a/base/templates/blocks/main_menu.html b/base/templates/blocks/main_menu.html index e1595830..92201a1b 100644 --- a/base/templates/blocks/main_menu.html +++ b/base/templates/blocks/main_menu.html @@ -1,21 +1,21 @@ {% load wagtailimages_tags wagtailiconchooser_tags %} {% if value.has_sub_items %} -
+
{{ value.label }} {% if value.large_submenu %}
-
+
{% if value.page %} - {% if value.page.specific.is_products_index and value.page.specific.group_menu_items_by_service %} - {% include "blocks/products_by_service_menu.html" %} + {% if value.page.specific.is_services_index %} + {% include "blocks/services_with_products_menu.html" %} {% else %} -
+
{% for sub_page in value.page.get_children %} {% if sub_page.show_in_menus and sub_page.live %} -
+
{% if sub_page.specific.nav_menu_icon %} @@ -37,6 +37,8 @@ {% endfor %}
{% endif %} + + {% if value.sub_items %}
{% for item in value.sub_items %} diff --git a/base/templates/blocks/products_by_service_menu.html b/base/templates/blocks/products_by_service_menu.html deleted file mode 100644 index 222c8098..00000000 --- a/base/templates/blocks/products_by_service_menu.html +++ /dev/null @@ -1,45 +0,0 @@ -{% load wagtailimages_tags wagtailiconchooser_tags %} - -{% for service, products in value.page.specific.products_by_service.items %} - -{% endfor %} - diff --git a/base/templates/blocks/services_with_products_menu.html b/base/templates/blocks/services_with_products_menu.html new file mode 100644 index 00000000..e56a245f --- /dev/null +++ b/base/templates/blocks/services_with_products_menu.html @@ -0,0 +1,66 @@ +{% load wagtailimages_tags wagtailiconchooser_tags %} + +
+ {% with value.page.specific.service_pages.count as services_count %} + {% for service_page_ in value.page.specific.service_pages %} + {% with service_page=service_page_.specific %} + {% if service_page.show_in_menus and service_page.live %} +
+ +
+ {% if service_page.nav_menu_icon %} + {% svg_icon service_page.nav_menu_icon %} + {% elif service_page.banner_image %} + {% image service_page.banner_image original as service_page_image %} + + {% elif service_page.introduction_image %} + {% image service_page.introduction_image original as service_page_image %} + + {% endif %} +
+
+ {{ service_page.title }} +
+
+ + {% if service_page.core_products %} + {% for product_page in service_page.core_products %} + +
+ {% if product_page.introduction_image %} + {% image product_page.introduction_image original as product_image %} + + {% endif %} +
+
+ {{ product_page.title }} +
+ + {% endfor %} + {% endif %} + {% if service_page.flex_pages %} + {% for flex_page in service_page.flex_pages %} + +
+ {% if flex_page.banner_image %} + {% image flex_page.banner_image original as flex_page_image %} + + {% endif %} +
+
+ {{ flex_page.title }} +
+ + {% endfor %} + {% endif %} +
+ {% endif %} + {% endwith %} + {% endfor %} + + {% endwith %} +
+ diff --git a/base/wagtail_hooks.py b/base/wagtail_hooks.py index 1d5576e8..010f849d 100644 --- a/base/wagtail_hooks.py +++ b/base/wagtail_hooks.py @@ -6,13 +6,15 @@ from django.utils.translation import gettext_lazy as _ from wagtail import hooks from wagtail.admin.ui.components import Component +from wagtail.snippets.models import register_snippet +from wagtail.snippets.views.snippets import SnippetViewSet from wagtail_modeladmin.options import ( ModelAdmin, modeladmin_register, ModelAdminGroup, ) from wagtailcache.cache import clear_cache -from base.models import Theme +from base.models import Theme, ServiceCategory from base.utils import get_latest_cms_release from base.views import cms_version_view from nmhs_cms.utils.version import get_main_version, check_version_greater_than_current @@ -41,6 +43,13 @@ def urlconf_base(): ] +class ServiceViewSet(SnippetViewSet): + model = ServiceCategory + + +register_snippet(ServiceViewSet) + + class ThemeSettings(ModelAdmin): model = Theme menu_label = _('Themes') diff --git a/nmhs_cms/static/css/navigation.css b/nmhs_cms/static/css/navigation.css index 2d1a9d68..86d25390 100644 --- a/nmhs_cms/static/css/navigation.css +++ b/nmhs_cms/static/css/navigation.css @@ -6,6 +6,11 @@ header { border-bottom: 1px solid rgba(195, 192, 192, 0.37); } +.navbar-item.is-mega { + position: static; +} + + /* .header-nav { padding: 10px 10px 0; } */ @@ -190,23 +195,32 @@ header { .navbar-burger:hover { background-color: transparent !important; - } +.navbar-dropdown.megamenu { + background-color: unset; + box-shadow: none; + padding-top: 0; +} -.megamenu { - min-width: 600px; - padding: 30px; +.megamenu-container { + background-color: #fff; + box-shadow: 0 8px 8px rgba(10, 10, 10, .1); + border-bottom-left-radius: var(--border-radius); + border-bottom-right-radius: var(--border-radius); + padding-bottom: 40px; } +.megamenu-container .megamenu-columns { + margin: 0; +} -.megamenu .navbar-item { - padding: 5px 0 !important; - white-space: normal; - display: flex; - align-items: center; +.megamenu-container .megamenu-columns .navbar-item { + text-wrap: wrap; + word-break: normal; } + .megamenu .navbar-item .menu-item-label { margin-left: 10px; flex: 1; diff --git a/pages/cap/views.py b/pages/cap/views.py index 3d5ebbff..d3485484 100644 --- a/pages/cap/views.py +++ b/pages/cap/views.py @@ -129,7 +129,8 @@ def item_author_email(self, item): return None def item_categories(self, item): - return [item.info[0].value.get('category')] + categories = item.info[0].value.get('category') + return categories def get_cap_xml(request, identifier): diff --git a/pages/flex_page/models.py b/pages/flex_page/models.py index 897720e2..196a61e2 100644 --- a/pages/flex_page/models.py +++ b/pages/flex_page/models.py @@ -7,11 +7,15 @@ from base.models import AbstractBannerPage -# model for flexible pages class FlexPage(AbstractBannerPage): template = "flex_page.html" - parent_page_types = ['home.HomePage'] + parent_page_types = [ + 'home.HomePage', + 'services.ServicePage', + 'organisation.OrganisationIndexPage', + 'about.AboutPage', + ] content = StreamField( [ diff --git a/pages/organisation_pages/about/models.py b/pages/organisation_pages/about/models.py index 0c355980..6f82c8ef 100644 --- a/pages/organisation_pages/about/models.py +++ b/pages/organisation_pages/about/models.py @@ -15,7 +15,7 @@ class AboutPage(AbstractIntroPage): template = 'about_page.html' parent_page_types = ['organisation.OrganisationIndexPage'] - subpage_types = ['flex_page.FlexPage',] + subpage_types = ['flex_page.FlexPage', ] max_count = 1 show_in_menus_default = True diff --git a/pages/services/models.py b/pages/services/models.py index d3551689..fab16598 100644 --- a/pages/services/models.py +++ b/pages/services/models.py @@ -12,6 +12,7 @@ from base.models import ServiceCategory, AbstractBannerWithIntroPage from nmhs_cms.settings.base import SUMMARY_RICHTEXT_FEATURES from pages.events.models import EventPage +from pages.flex_page.models import FlexPage from pages.news.models import NewsPage from pages.organisation_pages.projects.models import ServiceProject from pages.products.models import ProductPage @@ -27,23 +28,26 @@ class ServiceIndexPage(MetadataPageMixin, Page): listing_heading = models.CharField(max_length=255, default="Explore our Services", verbose_name=_("Services listing Heading")) max_count = 1 + is_services_index = True content_panels = Page.content_panels + [ FieldPanel("listing_heading") ] - def get_children_pages(self): - return self.get_children().live() - class Meta: verbose_name = _('Service List Page') verbose_name_plural = _('Service List Pages') + @cached_property + def service_pages(self): + service_pages = ServicePage.objects.live().descendant_of(self).order_by('service__order') + return service_pages + class ServicePage(AbstractBannerWithIntroPage): template = 'services/service_page.html' parent_page_types = ['services.ServiceIndexPage'] - subpage_types = ['flex_page.FlexPage',] + subpage_types = ['flex_page.FlexPage', ] show_in_menus_default = True service = models.OneToOneField(ServiceCategory, on_delete=models.PROTECT, verbose_name=_("Service")) @@ -102,6 +106,7 @@ class ServicePage(AbstractBannerWithIntroPage): class Meta: verbose_name = _('Service Page') verbose_name_plural = _('Service Pages') + ordering = ['service__order'] @cached_property def products(self): @@ -114,6 +119,26 @@ def products(self): return products + @cached_property + def core_products(self): + """ + Get list of core products related to this service + :return: core products list + """ + # Get all products related to this service + core_products = ProductPage.objects.filter(service=self.service) + + return core_products + + @cached_property + def flex_pages(self): + """ + Get list of flex pages related to this service + """ + flex_pages = FlexPage.objects.live().descendant_of(self) + + return flex_pages + @cached_property def listing_image(self): if self.banner_image: