chore: handle kwargs

Author: smotornyuk

ckanext/theming/themes/bare/macros/ui/component.html

@@ -1,8 +1,10 @@
 {%- macro organization_item(group) -%}
+    {%- do kwargs -%}
     {{ ui.group_item(group, **kwargs) }}
 {%- endmacro %}
 
 {%- macro group_item(group) -%}
+    {%- do kwargs -%}
     {% set img = group.image_display_url or h.url_for_static('/base/images/placeholder-' ~ ('organization' if group.is_organization else 'group') ~ '.png') %}
     {% set title = group.title or group.name  %}
     {% set body = h.markdown_extract(group.description, 120)|urlize %}
@@ -12,13 +14,15 @@
 
 
 {%- macro package_item(pkg) -%}
+    {%- do kwargs -%}
     {% set title = pkg.title or pkg.name  %}
     {% set body = h.markdown_extract(pkg.notes, 120)|urlize %}
 
     {{ ui.card(title=title, body=body, href=h.url_for(pkg.type ~ ".read", id=pkg.name)) }}
 {%- endmacro %}
 
 {%- macro resource_item(res) -%}
+    {%- do kwargs -%}
     {% set title = res.name  %}
     {% set body = h.markdown_extract(res.description, 120)|urlize %}
 

ckanext/theming/themes/bare/macros/ui/form.html

@@ -8,6 +8,7 @@
 {%- endmacro %}
 
 {%- macro form_actions_wrapper(content) -%}
+    {%- do kwargs -%}
     {{ content }}
 {%- endmacro %}
 

ckanext/theming/themes/bare/macros/ui/misc.html

@@ -1,4 +1,5 @@
 {%- macro datetime(dt) -%}
+    {%- do kwargs -%}
     <span data-datetime="{{ h.render_datetime(dt, date_format='%Y-%m-%dT%H:%M:%S%z') }}">
         {{ h.render_datetime(dt, with_hours=True) }}
     </span>

ckanext/theming/themes/bootstrap5/macros/ui/nav.html

@@ -7,6 +7,7 @@
 {%- endmacro %}
 
 {%- macro breadcrumb_item(content, href) -%}
+    {%- do kwargs -%}
     <li class="breadcrumb-item">
         <a href="{{ href }}">{{ content }}</a>
     </li>
@@ -19,6 +20,7 @@
 {%- endmacro %}
 
 {%- macro nav_item(content, href, active=False) -%}
+    {%- do kwargs -%}
     <a class="nav-link {{ 'active' if active }}" href="{{ href }}">{{ content }}</a>
 {%- endmacro %}
 
@@ -29,6 +31,7 @@
 {%- endmacro %}
 
 {%- macro tab_item(content, href, active=False) -%}
+    {%- do kwargs -%}
     <li class="nav-item" role="presentation">
         <button class="nav-link {{ 'active' if active }}" id="{{ href|replace('#', '') }}-tab" data-bs-toggle="tab" data-bs-target="{{ href }}" type="button" role="tab">
             {{ content }}
@@ -43,6 +46,7 @@
 {%- endmacro %}
 
 {%- macro menu_item(content, href, active=False) -%}
+    {%- do kwargs -%}
     <a class="list-group-item list-group-item-action {{ 'active' if active }}" href="{{ href }}">{{ content }}</a>
 {%- endmacro %}
 
@@ -110,6 +114,7 @@
 {%- endmacro %}
 
 {%- macro dropdown_item(content, href="#") -%}
+    {%- do kwargs -%}
     <li><a class="dropdown-item" href="{{ href }}">{{ content }}</a></li>
 {%- endmacro %}
 
@@ -140,5 +145,6 @@
 {%- endmacro %}
 
 {%- macro breadcrumb_divider() -%}
+    {%- do kwargs -%}
     <li class="breadcrumb-item active" aria-current="page">/</li>
 {%- endmacro %}

ckanext/theming/themes/bulma/macros/ui/container.html

@@ -5,6 +5,7 @@
 {%- endmacro %}
 
 {%- macro accordion_item(title, open=false) -%}
+    {%- do kwargs -%}
     <div class="panel">
         <p class="panel-heading">
             {{ title }}

ckanext/theming/themes/bulma/macros/ui/element.html

@@ -24,6 +24,7 @@
 {%- endmacro %}
 
 {%- macro link(content, href) -%}
+    {%- do kwargs -%}
     <a class="has-text-link" href="{{ href or content }}">{{ content }}</a>
 {%- endmacro %}
 
@@ -36,6 +37,7 @@
 {%- endmacro %}
 
 {%- macro tag(content, id, href) -%}
+    {%- do kwargs -%}
     <a class="tag is-link" href="{{ href or h.url_for('dataset.search', tags=id or content) }}">{{ content }}</a>
 {%- endmacro %}
 

ckanext/theming/themes/bulma/macros/ui/nav.html

@@ -5,6 +5,7 @@
 {%- endmacro %}
 
 {%- macro breadcrumb_item(content, href) -%}
+    {%- do kwargs -%}
     <li><a href="{{ href }}">{{ content }}</a></li>
 {%- endmacro %}
 
@@ -15,6 +16,7 @@
 {%- endmacro %}
 
 {%- macro nav_item(content, href, active=False) -%}
+    {%- do kwargs -%}
     <a class="navbar-item {{ 'is-active' if active }}" href="{{ href }}">{{ content }}</a>
 {%- endmacro %}
 
@@ -25,6 +27,7 @@
 {%- endmacro %}
 
 {%- macro tab_item(content, href, active=False) -%}
+    {%- do kwargs -%}
     <li class="{{ 'is-active' if active }}"><a href="{{ href }}">{{ content }}</a></li>
 {%- endmacro %}
 
@@ -35,6 +38,7 @@
 {%- endmacro %}
 
 {%- macro menu_item(content, href, active=False) -%}
+    {%- do kwargs -%}
     <li>
         <a class="{{ 'is-active' if active }}" href="{{ href }}">{{ content }}</a>
     </li>
@@ -97,6 +101,7 @@
 {%- endmacro %}
 
 {%- macro dropdown_item(content, href="#") -%}
+    {%- do kwargs -%}
     <a href="{{ href }}" class="dropdown-item">{{ content }}</a>
 {%- endmacro %}
 

ckanext/theming/themes/tailwind/macros/ui/nav.html

@@ -7,6 +7,7 @@
 {%- endmacro %}
 
 {%- macro breadcrumb_item(content, href) -%}
+    {%- do kwargs -%}
     <li class="inline-flex items-center">
         <div class="flex items-center">
             {{ ui.link(content, href=href, class="ml-1 text-sm font-medium text-gray-700 hover:text-blue-600 md:ml-2") }}
@@ -21,6 +22,7 @@
 {%- endmacro %}
 
 {%- macro nav_item(content, href, active=False) -%}
+    {%- do kwargs -%}
     <a href="{{ href }}" class="{{ 'bg-blue-100 text-blue-700' if active else 'text-gray-700 hover:bg-gray-50 hover:text-gray-900' }} px-3 py-2 rounded-md text-sm font-medium">
         {{ content }}
     </a>
@@ -35,6 +37,7 @@
 {%- endmacro %}
 
 {%- macro tab_item(content, href, active=False) -%}
+    {%- do kwargs -%}
     <a href="{{ href }}" class="{{ 'border-blue-500 text-blue-600' if active else 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300' }} whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm">
         {{ content }}
     </a>
@@ -49,6 +52,7 @@
 {%- endmacro %}
 
 {%- macro menu_item(content, href, active=False) -%}
+    {%- do kwargs -%}
     <li>
         <a href="{{ href }}" class="{{ 'bg-gray-100 text-gray-900' if active else 'text-gray-700 hover:bg-gray-50 hover:text-gray-900' }} block px-3 py-2 text-sm font-medium rounded-md">
             {{ content }}
@@ -137,6 +141,7 @@
 {%- endmacro %}
 
 {%- macro dropdown_item(content, href="#") -%}
+    {%- do kwargs -%}
     <a href="{{ href }}" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100" role="menuitem" tabindex="-1">
         {{ content }}
     </a>
@@ -168,6 +173,7 @@
 {%- endmacro %}
 
 {%- macro breadcrumb_divider() -%}
+    {%- do kwargs -%}
     <svg class="w-5 h-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
         <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
     </svg>