wagtail-cjkcms 25.1.3__py2.py3-none-any.whl → 25.1.5__py2.py3-none-any.whl

cjkcms/templates/cjkcms/snippets/navbar.html

@@ -24,7 +24,14 @@
       {% endif %}
     </a>
 
-    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-mdb-target="#navbar" data-mdb-toggle="collapse" data-bs-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
+    <button 
+        class="navbar-toggler" 
+        type="button" 
+        data-mdb-collapse-init
+        data-bs-toggle="collapse" 
+        data-mdb-target="#navbar" 
+        data-bs-target="#navbar" 
+        aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
           <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"><path d="M0 0h24v24H0z" fill="none"/><path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"/></svg>
     </button>
 

cjkcms/templatetags/cjkcms_tags.py

@@ -159,6 +159,11 @@ def get_navbar_css(context):
 
 @register.simple_tag(takes_context=True)
 def get_navbars(context) -> "QuerySet[Navbar]":
+    """Returns all Navbar objects that are associated with the current site layout
+
+    Returns:
+        QuerySet[Navbar]: _description_
+    """
     layout = LayoutSettings.for_request(context["request"])
     navbarorderables = layout.site_navbar.all()
     return Navbar.objects.filter(navbarorderable__in=navbarorderables).order_by(
@@ -166,6 +171,19 @@ def get_navbars(context) -> "QuerySet[Navbar]":
     )
 
 
+@register.simple_tag(takes_context=True)
+def get_navbar(context, navbar_id) -> "Navbar":
+    """Returns the Navbar object with the given custom_id
+
+    Args:
+        custom_id: Custom_id of the Navbar defined in its settings
+
+    Returns:
+        Navbar: The Navbar object with the given id
+    """
+    return Navbar.objects.get(custom_id=navbar_id)
+
+
 @register.simple_tag(takes_context=True)
 def get_footers(context) -> "QuerySet[Footer]":
     layout = LayoutSettings.for_request(context["request"])
@@ -252,13 +270,16 @@ def link_display(context, text: str) -> str:
     }:
         return text
     u = context["request"].user
-    if text == "{{ user.username }}":
-        return u.username
-    if text == "{{ user.first_name }}":
-        return u.first_name
-    if text == "{{ user.last_name }}":
-        return u.last_name
-    return f"{u.first_name} {u.last_name}"
+    if u.is_authenticated:
+        if text == "{{ user.username }}":
+            return u.username
+        if text == "{{ user.first_name }}":
+            return u.first_name
+        if text == "{{ user.last_name }}":
+            return u.last_name
+        return f"{u.first_name} {u.last_name}"
+    else:
+        return "Guest"
 
 
 @register.filter

cjkcms/wagtail_hooks.py

@@ -7,7 +7,7 @@ from cjkcms.draftail import (
     register_inline_styling,
 )
 
-from cjkcms.models.admin_sidebar import NavbarSnippet, EventCalendarSnippet
+# from cjkcms.models.admin_sidebar import NavbarSnippet, EventCalendarSnippet
 from django.http.response import HttpResponse
 from django.templatetags.static import static
 from django.utils.html import format_html
@@ -16,6 +16,42 @@ from wagtail.admin.menu import MenuItem
 from wagtail.snippets.models import register_snippet
 from wagtailcache.cache import clear_cache
 
+from cjkcms.models.snippet_models import Navbar, NavbarForm, EventCalendar
+from wagtail.snippets.views.snippets import SnippetViewSet
+
+
+class NavbarSnippet(SnippetViewSet):
+    model = Navbar
+    menu_label = "Navigation"
+    menu_icon = "link"  # change as required
+    add_to_admin_menu = True
+    list_display = (
+        "name",
+        "custom_css_class",
+        "custom_id",
+    )
+    search_fields = [
+        "name",
+    ]
+
+    def get_form_class(self, for_update=False):
+        return NavbarForm
+
+
+class EventCalendarSnippet(SnippetViewSet):
+    model = EventCalendar
+    menu_label = "Public Events"
+    menu_icon = "calendar"  # change as required
+    # add_to_admin_menu = True
+    list_display = ("name",)
+    search_fields = [
+        "name",
+    ]
+
+
+register_snippet(NavbarSnippet)
+register_snippet(EventCalendarSnippet)
+
 
 @hooks.register("insert_global_admin_css")  # type: ignore
 def global_admin_css():
@@ -196,7 +232,3 @@ def register_align_right_feature(features):
 @hooks.register("register_rich_text_features")  # type: ignore
 def register_external_link(features):
     features.register_link_type(NewWindowExternalLinkHandler)
-
-
-register_snippet(NavbarSnippet)
-register_snippet(EventCalendarSnippet)

{wagtail_cjkcms-25.1.3.dist-info → wagtail_cjkcms-25.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: wagtail-cjkcms
-Version: 25.1.3
+Version: 25.1.5
 Summary: Wagtail Content Management System, installable as a Django app into any Wagtail 4.1.x/5.x/6.x site.
 Author-email: Grzegorz Krol <gk@cjk.pl>
 License: BSD-3-Clause

{wagtail_cjkcms-25.1.3.dist-info → wagtail_cjkcms-25.1.5.dist-info}/RECORD

@@ -1,14 +1,14 @@
-cjkcms/__init__.py,sha256=q3cRcInGhLDtcv5FnZg8GSHEvfl3E3BLSvGT3BcdNYg,272
+cjkcms/__init__.py,sha256=OYSMMDfXv2lnX0PKb9z2ijZfOhIA0JzFyIxcO0tuJvk,272
 cjkcms/apps.py,sha256=VA5Z1YerImetvN8KsjPTMSn1fSo6O1JkBJdK5y5ubJY,173
 cjkcms/fields.py,sha256=dE0DuNIjX7jhA-5GjSmR2l66EDH2kq3vuxL9WyRALCY,3191
 cjkcms/forms.py,sha256=_uu_FR8odz40lD-Rmw0tlK7-xxxa8THHfV2-1ZJYsIM,361
 cjkcms/image_formats.py,sha256=d4zRshuybwxSRL8UpBH31dFBr32o4HNexa0ks5PX3TI,1833
 cjkcms/search_urls.py,sha256=92XkGTJRrQQyA061wWl1l5C0vq6INVJPXOrpcgp3aoU,125
-cjkcms/settings.py,sha256=ODBpl3Fn3yCX0CYogt0OIGD-2IGaijefwpdZngx3Bnc,20324
+cjkcms/settings.py,sha256=zw8V6cMP57w-U0M5hU4a1ouRLn-q02Waip7KnTZfbpc,20109
 cjkcms/urls.py,sha256=k5tEHWI4Umi2PWvGdNJ-FZ9OCy6AS3Y2S7k5jNOpgt0,644
 cjkcms/utils.py,sha256=u4pkPxAwqH3SgyIcmvk7I5L3w-eIcz0Rphmv0Y1DRpA,2006
 cjkcms/views.py,sha256=NWy3pBBcLUOH6WjEJh03N2sND4oToiyiy6_spgXdUcY,4389
-cjkcms/wagtail_hooks.py,sha256=utrTXxJzjumhbzHmB_p5xZsIOZHkDQUJKGQ5geKD-mY,6543
+cjkcms/wagtail_hooks.py,sha256=emfgvVN4pkUuBjvHl1mMZz8zXq3CCqAw3BlufrK4S9k,7311
 cjkcms/widgets.py,sha256=2B92WkaktZC1ge4GrAMTB7VVYKnKR8qoZLAtWS2z_00,1745
 cjkcms/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cjkcms/api/mailchimp.py,sha256=pufnnu8n-c6kkWNKy-EsRLW5LLBn8_TmYrnRSQCPFdY,2832
@@ -58,7 +58,7 @@ cjkcms/migrations/0022_cjkcmspage_breadcrumb_label_and_more.py,sha256=UqXcsDPMsJ
 cjkcms/migrations/0023_alter_navbar_language.py,sha256=TnMs5fzf-PmirNn6CgYh5pUwwHhaYKPDCjqnZqrj8Ok,547
 cjkcms/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cjkcms/models/__init__.py,sha256=f99GmxfFxGtQl8JvZFz8rAtklCIesLoSccyhhi2xgPU,232
-cjkcms/models/admin_sidebar.py,sha256=Q8jdlIY1fBxUq8fygYdmOLjDwIRs3rFO0Mze9e2STpM,752
+cjkcms/models/admin_sidebar.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cjkcms/models/cms_models.py,sha256=9U46xwPidQfUlXnuVUW5IbtphXX_8djJD4CohoP3NbU,2356
 cjkcms/models/integration_models.py,sha256=L29OBwLH8DfHtDplu218UGbbvL94Erk3J_R7n365zQM,6302
 cjkcms/models/page_models.py,sha256=-9SLMKA5KI2gMMOTaAtpr4pE2RhidilaRRzF7nnE0WI,25454
@@ -167,12 +167,10 @@ cjkcms/static/cjkcms/js/cjkcms-editor.js,sha256=ZIdSmXSBx0h3narH6ge0ZJlllOdV8M1J
 cjkcms/static/cjkcms/js/cjkcms-front.js,sha256=rutoF9X9-HdxtH2ehOP3LZK3JcDYDN3iUqsO6f1n68A,5579
 cjkcms/static/cookieconsent/cookieconsent.css,sha256=PPTG3VhEwHh8jgoiOgifordwvLTG5M7hEhrueOUy4Kc,18803
 cjkcms/static/cookieconsent/cookieconsent.js,sha256=r372zsTupu5VyD3zkc-VWL5tGUNhz5FNcPK9WkP9Mz0,18743
-cjkcms/static/vendor/mdb/css/mdb.dark.min.css,sha256=17IsYKguIYznPbr6XEmae91AiHH0I6W2a-02RD8vAMI,393612
-cjkcms/static/vendor/mdb/css/mdb.dark.min.css.map,sha256=pfflEJhXkU7NBMjDunZg7wG75T7BQOI4ZCApEoKYxWM,583626
-cjkcms/static/vendor/mdb/css/mdb.min.css,sha256=NwSiVkXzh8wtWxshP59CXHGRsNaM03bmKyqI8CyIqXk,378147
-cjkcms/static/vendor/mdb/css/mdb.min.css.map,sha256=HCd-vGDs-t7EinsTSmawI-CdC92HmydrH0TqlB4Oh4s,546228
-cjkcms/static/vendor/mdb/js/mdb.umd.min.js,sha256=6ExxHAv6V4GggQXwu1gkXc4MHtdiqKgVwBQ2m1HGr2M,124534
-cjkcms/static/vendor/mdb/js/mdb.umd.min.js.map,sha256=1k9rRQNB3hrVj47Anhg19MtXioMnuffFMh34NEyrBcY,502496
+cjkcms/static/vendor/mdb/css/mdb.min.css,sha256=1iGJEwUZEQyasXLHrSSe-DR9gE_s8Nq7vkndlhlKr28,379902
+cjkcms/static/vendor/mdb/css/mdb.min.css.map,sha256=NKAF5z9x63H4yfAMe5uQCK5bqpqDokyA-OZ8Js5VRpM,548537
+cjkcms/static/vendor/mdb/js/mdb.umd.min.js,sha256=3KDxvzTmoG1orgwfGejdsnHqPtLkzmGKFaVIonmWhV8,125175
+cjkcms/static/vendor/mdb/js/mdb.umd.min.js.map,sha256=DVxK_TI0xijPyBf5LrUX8xx6LkB-SfgAgf04jQY0vxQ,505660
 cjkcms/static/vendor/simplycountdown/css/circle.css,sha256=p8XghcW_i3DReRzmivluCPvvTeufVcyzpQRlHtYPxwI,1632
 cjkcms/static/vendor/simplycountdown/css/cyber.css,sha256=OECAvPFLHuUkgv9ENP27SzVaCimFS0T7g_5jT0l5TTg,3813
 cjkcms/static/vendor/simplycountdown/css/dark.css,sha256=VEMMr_JIZ303FlNVc5j-_BstLolM2Ru-gZ0MEHUiNW0,1899
@@ -296,7 +294,7 @@ cjkcms/templates/cjkcms/snippets/breadcrumbs.html,sha256=3flWNTJ568V4l9HTuYK5vZ7
 cjkcms/templates/cjkcms/snippets/footer.html,sha256=_QUtV_LHgGjh-XLzw5Fd_Lxdrx9on5G0luFaa6oirB0,430
 cjkcms/templates/cjkcms/snippets/frontend_assets.html,sha256=2q24FFzOiM2USJiI1tuNTdJZGvRQnMPjAwTA0AlGNiU,1656
 cjkcms/templates/cjkcms/snippets/frontend_scripts.html,sha256=kO3lpKZylriXj27ff6ubtDXkpqOwqSZM256iM6cCuHM,510
-cjkcms/templates/cjkcms/snippets/navbar.html,sha256=wf64B6LzNW7QrGIqHbXlVHneJ6jfYkPcYcO_u6DP6wY,2821
+cjkcms/templates/cjkcms/snippets/navbar.html,sha256=3J9N2g1MVMyvAaQFbkNBYSwbXp8wpOQiHQabFY6PyTc,2879
 cjkcms/templates/cjkcms/snippets/navbar_lang_selector.html,sha256=sn7KLDentGOsMZ9CNAxdAGLYO3a_mYfSUhJ6iZzteOE,836
 cjkcms/templates/cjkcms/snippets/navbar_search.html,sha256=yV6xIWQ3_BdrTEPVp3j0WKqChPui7oC0Zl3C2fUrpes,1075
 cjkcms/templates/cjkcms/snippets/navbar_search_modal.html,sha256=_9jUjJsk2Q1Ya05b5OguZENZl7XGgqjoMe-YDo3cOD4,1449
@@ -314,7 +312,7 @@ cjkcms/templates/wagtailadmin/shared/cr_main_nav_2fix.html,sha256=BAhkDE8_8KbhUO
 cjkcms/templates/wagtailadmin/tables/thumbnail_cell.html,sha256=RzMT-tBnnDOgL-zexKanZTTpCEX1bMybFL2p_zvOEV4,578
 cjkcms/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cjkcms/templatetags/auth_extras.py,sha256=IIxQ5n9FaQVZmhW-yW1XM5p2OjIemtqVoX-O-UcCns8,327
-cjkcms/templatetags/cjkcms_tags.py,sha256=hijLNrcc-ORLe88cyQzjtQW2PjbCvH5CEsYr9p5UT7U,9754
+cjkcms/templatetags/cjkcms_tags.py,sha256=JlZ78iPiKdfmb1zQnnQtYj6L13_GTcWryhDH7W92qoU,10339
 cjkcms/templatetags/friendly_loader.py,sha256=Zwopb9NNNN6IuDJCMFlwKuhmJC0hi4uTPEZSAxeakYY,4962
 cjkcms/templatetags/gravatar.py,sha256=JG5MB6HUFso15J8gZ_te5FTMYAuo4km8rzMKKvLLh-E,1127
 cjkcms/templatetags/txtutils_tags.py,sha256=UMojdiLt6Jpijc-2QLusPc-qXX9bqFZf0JbqqPsfnWQ,1223
@@ -342,9 +340,9 @@ cjkcms/tests/testapp/models.py,sha256=Rkn9KHrGbLzrKjP4y_gwtXma1_fJOZNU7ekb689fJE
 cjkcms/tests/testapp/migrations/0001_initial.py,sha256=hxr-r-42IQEGr_OsZkxXXCW7wbxAHuI_OLOkn-seJUU,4942
 cjkcms/tests/testapp/migrations/0002_create_homepage.py,sha256=EfsxHh1oyqwahW9RVpTvaRDx_CHtFSJQahKEr7XC5Gg,1999
 cjkcms/tests/testapp/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wagtail_cjkcms-25.1.3.dist-info/LICENSE,sha256=KHsCh1fKOZzvcKe1a9h3FlDjTjK_UurO3wHK55TnHHo,1538
-wagtail_cjkcms-25.1.3.dist-info/METADATA,sha256=-Kip2GVsshP0uiAEKUepH9WE-JSDbAboM7ioOpNTvwI,3120
-wagtail_cjkcms-25.1.3.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
-wagtail_cjkcms-25.1.3.dist-info/entry_points.txt,sha256=FzoiFENdZ1uebNztyz6GlswkumQspd5VjWbR9MUIH_8,50
-wagtail_cjkcms-25.1.3.dist-info/top_level.txt,sha256=8wJGOGo1pG5nO5akfcMzA7i3ndj5868I8w35vTT0JJM,7
-wagtail_cjkcms-25.1.3.dist-info/RECORD,,
+wagtail_cjkcms-25.1.5.dist-info/LICENSE,sha256=KHsCh1fKOZzvcKe1a9h3FlDjTjK_UurO3wHK55TnHHo,1538
+wagtail_cjkcms-25.1.5.dist-info/METADATA,sha256=jhcINU9cA_1EBRqll_tUVnMkiQ6JI_xKK7SSPiED0XA,3120
+wagtail_cjkcms-25.1.5.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
+wagtail_cjkcms-25.1.5.dist-info/entry_points.txt,sha256=FzoiFENdZ1uebNztyz6GlswkumQspd5VjWbR9MUIH_8,50
+wagtail_cjkcms-25.1.5.dist-info/top_level.txt,sha256=8wJGOGo1pG5nO5akfcMzA7i3ndj5868I8w35vTT0JJM,7
+wagtail_cjkcms-25.1.5.dist-info/RECORD,,

{wagtail_cjkcms-25.1.3.dist-info → wagtail_cjkcms-25.1.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any