pattern library general fixes

torchbox · Jan 2, 2024 · 351ec91 · 351ec91
1 parent 6efb1fe
commit 351ec91
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 11 deletions.
diff --git a/tbx/project_styleguide/templates/base_page.yaml b/tbx/project_styleguide/templates/base_page.yaml
@@ -0,0 +1,7 @@
+tags:
+  primary_nav:
+    '':
+      template_name: 'patterns/components/navigation/primary_nav.html'
+  footerlinks:
+    '':
+      template_name: 'patterns/components/navigation/footerlinks.html'
diff --git a/tbx/project_styleguide/templatetags/navigation_tags.py b/tbx/project_styleguide/templatetags/navigation_tags.py
@@ -1,6 +1,6 @@
 from pattern_library.monkey_utils import override_tag
 from tbx.navigation.templatetags.navigation_tags import register
 
-override_tag(register, name="primarynav")
-override_tag(register, name="sidebar")
-override_tag(register, name="footerlinks")
+override_tag(register, name="primarynav", default_html="")
+override_tag(register, name="sidebar", default_html="")
+override_tag(register, name="footerlinks", default_html="")
diff --git a/tbx/project_styleguide/templatetags/readingtimetags.py b/tbx/project_styleguide/templatetags/readingtimetags.py
@@ -1,4 +1,4 @@
 from pattern_library.monkey_utils import override_tag
 from tbx.core.templatetags.reading_time_tags import register
 
-override_tag(register, name="get_reading_time_minutes")
+override_tag(register, name="get_reading_time_minutes", default_html="")
diff --git a/tbx/project_styleguide/templatetags/wagtailcore_tags.py b/tbx/project_styleguide/templatetags/wagtailcore_tags.py
@@ -1,6 +1,6 @@
 from pattern_library.monkey_utils import override_tag
 from wagtail.templatetags.wagtailcore_tags import register
 
-override_tag(register, name="include_block")
-override_tag(register, name="pageurl")
-override_tag(register, name="slugurl")
+override_tag(register, name="include_block", default_html="")
+override_tag(register, name="pageurl", default_html="/")
+override_tag(register, name="slugurl", default_html="")
diff --git a/tbx/project_styleguide/templatetags/wagtailimages_tags.py b/tbx/project_styleguide/templatetags/wagtailimages_tags.py
@@ -1,4 +1,4 @@
 from pattern_library.monkey_utils import override_tag
 from wagtail.images.templatetags.wagtailimages_tags import register
 
-override_tag(register, name="image")
+override_tag(register, name="image", default_html="")
diff --git a/tbx/settings/base.py b/tbx/settings/base.py
@@ -546,9 +546,18 @@
 PASSWORD_REQUIRED_TEMPLATE = "patterns/pages/wagtail/password_required.html"
 # Styleguide
 PATTERN_LIBRARY_ENABLED = env.get("PATTERN_LIBRARY_ENABLED", "false").lower() == "true"
-PATTERN_LIBRARY_TEMPLATE_DIR = os.path.join(
-    PROJECT_DIR, "project_styleguide", "templates"
-)
+PATTERN_LIBRARY = {
+    "SECTIONS": (
+        ("atoms", ["patterns/atoms"]),
+        ("molecules", ["patterns/molecules"]),
+        ("organisms", ["patterns/organisms"]),
+        ("pages", ["patterns/pages"]),
+    ),
+    "TEMPLATE_SUFFIX": ".html",
+    "PATTERN_BASE_TEMPLATE_NAME": "patterns/base.html",
+    "BASE_TEMPLATE_NAMES": ["patterns/base_page.html"],
+}
+
 
 # Google Tag Manager ID from env
 GOOGLE_TAG_MANAGER_ID = env.get("GOOGLE_TAG_MANAGER_ID")