refactor: [#2081] refactor template structure and names

CMS templates are moved to their app template folders, and template
names are updated to be uniform and recognizable (e.g.
'status_inner.html' -> 'aanvragen_detail.html') for the mijn_aanvragen
detail template.

The tempate which overrides Django's default flatpage template
(flatpages/default.html) is deleted because it is no longer used
(flatpages have been migrated to CMS).

Author: pi-sigma

src/open_inwoner/accounts/cms/mijn_profiel/cms_plugins.py

@@ -16,7 +16,7 @@ class UserAppointmentsPlugin(CMSPluginBase):
     model = UserAppointments
     module = _("Profile")
     name = _("My appointments")
-    render_template = "cms/plugins/appointments/appointments.html"
+    render_template = "mijn_profiel/appointments.html"
 
     def render(self, context, instance, placeholder):
         request = context["request"]

…s/plugins/appointments/appointments.html …templates/mijn_profiel/appointments.htmlsrc/open_inwoner/templates/cms/plugins/appointments/appointments.html renamed to src/open_inwoner/accounts/cms/mijn_profiel/templates/mijn_profiel/appointments.html src/open_inwoner/templates/cms/plugins/appointments/appointments.html renamed to src/open_inwoner/accounts/cms/mijn_profiel/templates/mijn_profiel/appointments.html

@@ -6,7 +6,7 @@
 
 from filer.models.filemodels import File
 
-from open_inwoner.mijn_aanvragen.views.zaken_detail import SimpleFile
+from open_inwoner.mijn_aanvragen.views.aanvragen_detail import SimpleFile
 from open_inwoner.utils.time import instance_is_new
 
 register = template.Library()

src/open_inwoner/components/templatetags/file_tags.py

@@ -36,7 +36,7 @@ def setUp(self):
         # Create home page with correct reverse_id
         self.home_page = api.create_page(
             "Home",
-            "cms/fullwidth.html",
+            "core/cms/pages/fullwidth.html",
             "nl",
             reverse_id="home",
             in_navigation=True,
@@ -63,7 +63,7 @@ def _get_menu_data(self, user, path="/"):
     def test_draft_page_visibility_differs_for_staff_and_regular_users(self):
         published_page = api.create_page(
             "Published Page",
-            "cms/fullwidth.html",
+            "core/cms/pages/fullwidth.html",
             "nl",
             parent=self.home_page,
             in_navigation=True,
@@ -72,7 +72,7 @@ def test_draft_page_visibility_differs_for_staff_and_regular_users(self):
 
         draft_page = api.create_page(
             "Draft Page",
-            "cms/fullwidth.html",
+            "core/cms/pages/fullwidth.html",
             "nl",
             parent=self.home_page,
             in_navigation=True,
@@ -115,7 +115,7 @@ def test_draft_page_visibility_differs_for_staff_and_regular_users(self):
     def test_menu_icons_from_draft_page_common_extension(self):
         page_with_icon = api.create_page(
             "Page With Icon",
-            "cms/fullwidth.html",
+            "core/cms/pages/fullwidth.html",
             "nl",
             parent=self.home_page,
             in_navigation=True,
@@ -165,7 +165,7 @@ def test_menu_icons_from_draft_page_common_extension(self):
     def test_menu_icons_on_draft_only_pages_for_staff(self):
         draft_page = api.create_page(
             "Draft Page With Icon",
-            "cms/fullwidth.html",
+            "core/cms/pages/fullwidth.html",
             "nl",
             parent=self.home_page,
             in_navigation=True,
@@ -201,7 +201,7 @@ def test_menu_icons_on_draft_only_pages_for_staff(self):
     def test_menu_pages_without_common_extension_show_no_icon(self):
         page_without_icon = api.create_page(
             "Page Without Icon",
-            "cms/fullwidth.html",
+            "core/cms/pages/fullwidth.html",
             "nl",
             parent=self.home_page,
             in_navigation=True,
@@ -247,7 +247,7 @@ def test_menu_icon_fallback_between_draft_and_public_versions(self):
         # Create page with icon on draft (most common)
         page_draft_icon = api.create_page(
             "Page Draft Icon",
-            "cms/fullwidth.html",
+            "core/cms/pages/fullwidth.html",
             "nl",
             parent=self.home_page,
             in_navigation=True,
@@ -297,7 +297,7 @@ def test_menu_counters_are_calculated_from_user_specific_data(self):
         # Create page with inbox message indicator
         inbox_page = api.create_page(
             "My Messages",
-            "cms/fullwidth.html",
+            "core/cms/pages/fullwidth.html",
             "nl",
             parent=self.home_page,
             in_navigation=True,
@@ -335,7 +335,7 @@ def test_current_page_is_highlighted_when_user_visits_that_page(self):
         # Create two pages to test current detection
         visited_page = api.create_page(
             "Visited Page",
-            "cms/fullwidth.html",
+            "core/cms/pages/fullwidth.html",
             "nl",
             parent=self.home_page,
             in_navigation=True,
@@ -345,7 +345,7 @@ def test_current_page_is_highlighted_when_user_visits_that_page(self):
 
         other_page = api.create_page(
             "Other Page",
-            "cms/fullwidth.html",
+            "core/cms/pages/fullwidth.html",
             "nl",
             parent=self.home_page,
             in_navigation=True,
@@ -384,7 +384,7 @@ def test_current_page_is_highlighted_when_user_visits_that_page(self):
     def test_pages_only_published_in_other_languages_are_hidden_from_menu(self):
         dutch_page = api.create_page(
             "Dutch Page",
-            "cms/fullwidth.html",
+            "core/cms/pages/fullwidth.html",
             "nl",
             parent=self.home_page,
             in_navigation=True,
@@ -393,7 +393,7 @@ def test_pages_only_published_in_other_languages_are_hidden_from_menu(self):
 
         en_page = api.create_page(
             "English Only Page",
-            "cms/fullwidth.html",
+            "core/cms/pages/fullwidth.html",
             "en",
             parent=self.home_page,
             in_navigation=True,
@@ -420,7 +420,7 @@ def test_pages_only_published_in_other_languages_are_hidden_from_menu(self):
     def test_invalid_counter_values_are_handled_gracefully(self):
         page_with_broken_counter = api.create_page(
             "Broken Counter Page",
-            "cms/fullwidth.html",
+            "core/cms/pages/fullwidth.html",
             "nl",
             parent=self.home_page,
             in_navigation=True,

src/open_inwoner/components/tests/test_menu_tags.py

@@ -214,9 +214,12 @@
     "custom_migrations",
     "objectsapiclient",
     *default_health_check_apps,
-    # Project applications.
-    "open_inwoner.core",
+    # Project applications - sorted alphabetically
+    "open_inwoner._legacy.cms.plugins",  # Legacy - migrations only
+    "open_inwoner.accounts.cms.mijn_profiel",
     "open_inwoner.components",
+    "open_inwoner.configurations",
+    "open_inwoner.core",
     "open_inwoner.core.cms.cms_plugins.banner",
     "open_inwoner.core.cms.cms_plugins.extensions",
     "open_inwoner.core.cms.cms_plugins.footer",
@@ -229,27 +232,24 @@
     "open_inwoner.haalcentraal",
     "open_inwoner.kvk",
     "open_inwoner.laposta",
-    "open_inwoner.qmatic",
-    "open_inwoner.search",
-    "open_inwoner.utils",
-    "open_inwoner.configurations",
-    "open_inwoner.openklant",
-    "open_inwoner.soap",
-    "open_inwoner.questionnaire",
     "open_inwoner.mail",
     "open_inwoner.media",
-    "open_inwoner.userfeed",
+    "open_inwoner.mijn_aanvragen.cms.apps.MijnAanvragenCmsConfig",
     "open_inwoner.mijn_afval",
     "open_inwoner.mijn_afval.cms",
-    "open_inwoner.mijn_uitkeringen",
     "open_inwoner.mijn_samenwerkingen",
+    "open_inwoner.mijn_uitkeringen",
     "open_inwoner.onderwerpen",
-    "open_inwoner.accounts.cms.mijn_profiel",
-    "open_inwoner.mijn_aanvragen.cms.apps.MijnAanvragenCmsConfig",
-    "open_inwoner._legacy.cms.plugins",  # Legacy - migrations only
-    "djchoices",
+    "open_inwoner.openklant",
+    "open_inwoner.qmatic",
+    "open_inwoner.questionnaire",
+    "open_inwoner.search",
+    "open_inwoner.soap",
+    "open_inwoner.userfeed",
+    "open_inwoner.utils",
     "django_celery_beat",
     "django_celery_monitor",
+    "djchoices",
     # Temporary fix: the notifications lib interferes with
     # celery's task loading meachanism, which prevents certain
     # tasks from showing up in the admin when OIP is run with
@@ -648,9 +648,9 @@
 CMS_PLUGIN_CACHE = False
 
 CMS_TEMPLATES = [
-    ("cms/fullwidth.html", "Home page template"),
-    ("cms/cms_flatpage_template.html", "CMS Flatpage Template"),
-    ("cms/contactform/form_outer.html", "CMS Contactformulier Template"),
+    ("core/cms/pages/fullwidth.html", "Home page template"),
+    ("core/cms/footer/cms_flatpage_template.html", "CMS Flatpage Template"),
+    ("openklant/contactform/form_outer.html", "CMS Contactformulier Template"),
 ]
 CMS_PLACEHOLDER_CONF = {
     # TODO properly configure this based on actual available plugins

src/open_inwoner/conf/base.py

@@ -20,7 +20,7 @@ def setUp(self):
 
         self.page = api.create_page(
             title="Test Page",
-            template="cms/fullwidth.html",
+            template="core/cms/pages/fullwidth.html",
             language="nl",
             in_navigation=True,
         )

src/open_inwoner/configurations/tests/test_custom_javascript.py

@@ -12,7 +12,7 @@ class BannerImagePlugin(CMSPluginBase):
     model = BannerImage
     form = BannerImageForm
     name = _("Banner Image Plugin")
-    render_template = "cms/banner/banner_image_plugin.html"
+    render_template = "core/cms/banner/banner_image_plugin.html"
     cache = False
 
 
@@ -21,5 +21,5 @@ class BannerTextPlugin(CMSPluginBase):
     model = BannerText
     form = BannerTextForm
     name = _("Banner Text Plugin")
-    render_template = "cms/banner/banner_text_plugin.html"
+    render_template = "core/cms/banner/banner_text_plugin.html"
     cache = False

src/open_inwoner/core/cms/cms_plugins/banner/cms_plugins.py

@@ -17,7 +17,7 @@
 @plugin_pool.register_plugin
 class FooterPagesPlugin(CMSPluginBase):
     name = _("Pages List")
-    render_template = "cms/footer/footer_pages_plugin.html"
+    render_template = "core/cms/footer/footer_pages_plugin.html"
     cache = False
 
     def render(self, context, instance, placeholder):
@@ -35,7 +35,7 @@ def render(self, context, instance, placeholder):
                     cms_pages.remove(page)
 
         contact_form_pages = Page.objects.filter(
-            template="cms/contactform/form_outer.html", publisher_is_draft=False
+            template="openklant/contactform/form_outer.html", publisher_is_draft=False
         )
 
         # Use the first page if it exists
@@ -50,7 +50,7 @@ def render(self, context, instance, placeholder):
 class CMSFlatPagePlugin(CMSPluginBase):
     name = _("CMS Flatpage Plugin")
     model = CMSFlatPageModel
-    render_template = "cms/cms_flatpage.html"
+    render_template = "core/cms/footer/cms_flatpage.html"
 
     def render(self, context, instance, placeholder):
         cms_plugin_placeholder = instance.placeholder

src/open_inwoner/core/cms/cms_plugins/footer/cms_plugins.py

@@ -21,7 +21,7 @@ def create_cms_pages(apps, schema_editor):
 
         page = create_page(
             title=title,
-            template="cms/cms_flatpage_template.html",
+            template="core/cms/footer/cms_flatpage_template.html",
             language=language,
             slug=slug,
             published=True,

src/open_inwoner/core/cms/cms_plugins/footer/migrations/0002_migrate_flatpages_content_to_cms.py

@@ -14,7 +14,7 @@
 @plugin_pool.register_plugin
 class CMSLinkPlugin(CMSPluginBase):
     model = LinkPluginConfig
-    render_template = "cms/plugins/links/external-links.html"
+    render_template = "core/cms/link/external-links.html"
     module = _("General")
     name = _("External Link Plugin")
     allow_children = True