django-unfold 0.50.0__py3-none-any.whl → 0.51.0__py3-none-any.whl

unfold/templates/admin/change_list_results.html

@@ -1,4 +1,4 @@
-{% load admin_urls i18n %}
+{% load admin_urls i18n unfold %}
 
 {% if result_hidden_fields %}
     <div class="hiddenfields">
@@ -11,6 +11,10 @@
         <table id="result_list" class="block border-base-200 border-spacing-none border-separate w-full lg:table">
             <thead>
                 <tr>
+                    {% if cl.model_admin.list_sections|length > 0 %}
+                        <th></th>
+                    {% endif %}
+
                     {% for header in result_headers %}
                         <th class="align-middle font-semibold py-2 text-left text-font-important-light dark:text-font-important-dark whitespace-nowrap {{ header.class_attrib }} {% if "action-toggle" in header.text and forloop.counter == 1 %}lg:px-3 lg:w-10{% else %}hidden px-3 lg:table-cell{% endif %}" scope="col">
                             <div class="flex items-center">
@@ -65,8 +69,8 @@
                 </tr>
             </thead>
 
-            <tbody class="block lg:table-row-group">
-                {% for result in results %}
+            {% for result in results %}
+                <tbody class="block lg:table-row-group" x-data="{rowOpen: false}">
                     {% if result.form and result.form.non_field_errors %}
                         <tr>
                             <td class="text-left" colspan="{{ result|length }}">
@@ -76,13 +80,39 @@
                     {% endif %}
 
                     <tr class="{% cycle '' 'bg-base-50 dark:bg-white/[.02]' %} block border mb-3 rounded shadow-sm lg:table-row lg:border-none lg:mb-0 lg:shadow-none dark:border-base-800">
+                        {% if cl.model_admin.list_sections|length > 0 %}
+                            <td class="align-middle cursor-pointer flex border-b border-base-200 font-normal px-2.5 py-2 relative text-left before:font-semibold before:text-font-important-light before:block before:capitalize before:content-[attr(data-label)] before:mr-auto lg:before:hidden lg:border-b-0 lg:border-t lg:pl-3 lg:pr-0 lg:py-3 lg:table-cell dark:border-base-800 dark:lg:border-base-800 dark:before:text-font-important-dark lg:w-px"
+                                data-label="{% trans "Expand row" %}"
+                                x-on:click="rowOpen = !rowOpen">
+                                <div class="absolute bg-primary-600 -bottom-px hidden left-0 top-0 w-0.5 z-10 lg:block" x-show="rowOpen"></div>
+                                <span class="material-symbols-outlined select-none !block -rotate-90 transition-all" x-bind:class="rowOpen && 'rotate-0'">
+                                    expand_more
+                                </span>
+                            </td>
+                        {% endif %}
+
                         {% for item in result %}
                             {{ item }}
                         {% endfor %}
-                        {% include 'unfold/helpers/actions_row.html' with actions=actions_row instance_pk=result.instance_pk %}
+
+                        {% include 'unfold/helpers/actions_row.html' with actions=actions_row instance_pk=result.instance.pk %}
                     </tr>
-                {% endfor %}
-            </tbody>
+
+                    {% if cl.model_admin.list_sections|length > 0 %}
+                        <tr class="block mb-3 lg:table-row" x-show="rowOpen">
+                            <td colspan="{{ result|length|add:1 }}" class="border bg-base-200/10 block border-base-200 relative rounded p-3 lg:shadow-inner lg:border-0 lg:border-t lg:rounded-none lg:table-cell dark:border-base-800">
+                                <div class="absolute bg-primary-600 h-full hidden left-0 top-0 w-0.5 lg:block"></div>
+
+                                <div class="grid gap-3 {{ cl.model_admin.list_sections_classes }}">
+                                    {% for section in cl.model_admin.list_sections %}
+                                        {% render_section cl.model_admin.list_sections|index:forloop.counter0 result.instance %}
+                                    {% endfor %}
+                                </div>
+                            </td>
+                        </tr>
+                    {% endif %}
+                </tbody>
+            {% endfor %}
         </table>
     </div>
 {% else %}

unfold/templates/admin/filter.html

@@ -15,7 +15,7 @@
         <ul class="dark:bg-base-900 border border-base-200 flex min-w-20 rounded shadow-sm text-font-default-light dark:border-base-700 dark:text-font-default-dark w-full">
             {% for choice in choices %}
                 <li class="basis-1/3 border-r border-base-200 flex-grow truncate last:border-r-0 dark:border-base-700 {% if choice.selected %}font-semibold text-primary-600 dark:text-primary-500 {% else %}hover:text-base-700 dark:hover:text-base-200{% endif %}">
-                    <a href="{{ choice.query_string|iriencode }}" title="{{ choice.display }}" class="block px-3 py-2 text-center hover:text-primary-600 dark:hover:text-primary-500">
+                    <a href="{{ choice.query_string|iriencode }}" title="{{ choice.display }}" class="block py-2 text-center hover:text-primary-600 dark:hover:text-primary-500">
                         {{ choice.display }}
                     </a>
                 </li>

unfold/templates/unfold/components/card.html

@@ -1,4 +1,4 @@
-<div class="border flex flex-col flex-grow overflow-hidden p-6 relative rounded shadow-sm dark:border-base-800 {% if class %} {{ class }}{% endif %}">
+<div class="bg-white border flex flex-col flex-grow overflow-hidden p-6 relative rounded shadow-sm dark:bg-base-900 dark:border-base-800 {% if class %} {{ class }}{% endif %}">
     {% if title %}
         <h2 class="bg-base-50 border-b font-semibold mb-6 -mt-6 -mx-6 py-4 px-6 text-font-important-light dark:text-font-important-dark dark:border-base-800 dark:bg-white/[.02]">
             {{ title }}

unfold/templates/unfold/components/table.html

@@ -1,31 +1,47 @@
-{% load unfold %}
+{% load i18n unfold %}
 
-<div class="{% if card_included == 1 %}-m-6{% else %}lg:border lg:rounded lg:shadow-sm{% endif %} overflow-x-auto lg:dark:border-base-800">
-    <table class="block border-base-200 border-spacing-none border-separate w-full lg:table">
-        {% if table.headers %}
-            <thead class="text-base-900 dark:text-base-100">
-                <tr class="bg-base-50 dark:bg-white/[.02]">
-                    {% for  header in table.headers %}
-                        <th class="align-middle font-semibold py-2 text-left text-sm whitespace-nowrap sortable column-description hidden px-3 lg:table-cell {% if card_included == 1 %}first:pl-6 last:pr-6{% endif %}">
-                            {{ header }}
-                        </th>
-                    {% endfor %}
-                </tr>
-            </thead>
-        {% endif %}
+<div class="flex flex-col">
+    {% if title %}
+        <h3 class="font-semibold mb-1 text-font-important-light text-sm dark:text-font-important-dark">
+            {{ title }}
+        </h3>
+    {% endif %}
+
+    <div class="{% if card_included == 1 %}-m-6{% else %} bg-white flex flex-col grow lg:border lg:border-base-200 lg:overflow-hidden lg:rounded lg:shadow-sm{% endif %} lg:dark:border-base-800 dark:bg-base-900">
+        <div {% if height %}style="max-height: {{ height }}px;" data-simplebar{% endif %}>
+            <table class="block border-spacing-none border-separate w-full lg:table">
+                {% if table.headers %}
+                    <thead class="text-base-900 dark:text-base-100 {% if height %}sticky top-0{% endif %}">
+                        <tr class="bg-base-50 dark:bg-white/[.02]">
+                            {% for  header in table.headers %}
+                                <th class="align-middle border-b border-base-200 font-semibold py-2 text-left text-sm whitespace-nowrap sortable column-description hidden px-3 lg:table-cell dark:border-base-800 {% if card_included == 1 %}first:pl-6 last:pr-6{% endif %}">
+                                    {{ header|capfirst }}
+                                </th>
+                            {% endfor %}
+                        </tr>
+                    </thead>
+                {% endif %}
 
-        {% if table.rows %}
-            <tbody class="block lg:table-row-group">
-                {% for row in table.rows %}
-                    <tr class="{% if striped == 1 %}{% cycle '' 'bg-base-50 dark:bg-white/[.02]' %}{% endif %} block {% if not card_included == 1 %}border mb-3 rounded shadow-sm{% else %}border-t{% endif %} lg:table-row lg:border-none lg:mb-0 lg:shadow-none dark:border-base-800">
-                        {% for cell in row %}
-                            <td class="px-3 py-2 align-middle flex border-t border-base-200 font-normal gap-4 min-w-0 overflow-hidden text-left before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto first:border-t-0 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-base-800 {% if card_included == 1 %}lg:first:pl-6 lg:last:pr-6{% endif %}" {% if table.headers %}data-label="{{ table.headers|index:forloop.counter0 }}"{% endif %}>
-                                {{ cell }}
-                            </td>
+                {% if table.rows %}
+                    <tbody class="block lg:table-row-group">
+                        {% for row in table.rows %}
+                            <tr class="{% if striped == 1 %}{% cycle '' 'bg-base-50 dark:bg-white/[.02]' %}{% endif %} block group {% if forloop.first %}first-row{% endif %} {% if not card_included == 1 %}border mb-3 rounded shadow-sm{% else %}border-b{% endif %} lg:table-row lg:border-none lg:mb-0 lg:shadow-none dark:border-base-800">
+                                {% for cell in row %}
+                                    <td class="px-3 py-2 align-middle flex border-t border-base-200 font-normal gap-4 min-w-0 overflow-hidden text-left before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto first:border-t-0 lg:group-[.first-row]:border-t-0 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-base-800 {% if card_included == 1 %}lg:first:pl-6 lg:last:pr-6{% endif %}" {% if table.headers %}data-label="{{ table.headers|index:forloop.counter0 }}"{% endif %}>
+                                        {{ cell }}
+                                    </td>
+                                {% endfor %}
+                            </tr>
                         {% endfor %}
-                    </tr>
-                {% endfor %}
-            </tbody>
+                    </tbody>
+                {% endif %}
+            </table>
+        </div>
+
+        {% if not table.rows %}
+            <p class="bg-white border border-base-200 flex grow items-center justify-center py-2 rounded shadow-sm dark:bg-base-900 lg:border-0 lg:rounded-none lg:shadow-none">
+                {% trans "No data" %}
+            </p>
         {% endif %}
-    </table>
+    </div>
 </div>

unfold/templates/unfold/helpers/change_list_filter_actions.html

@@ -22,7 +22,7 @@
             {% endif %}
 
             {% if cl.has_active_filters %}
-                <a href="{{ cl.clear_all_filters_qs }}" class="border flex-grow font-medium px-3 py-2 rounded text-center transition-all w-full hover:bg-base-50 lg:w-auto dark:border-base-700 dark:hover:text-base-200">
+                <a href="{{ cl.clear_all_filters_qs }}" class="border flex-grow font-medium px-3 py-2 rounded text-center transition-all w-full lg:w-auto dark:border-base-700 dark:hover:text-base-200">
                     {% trans "Clear all filters" %}
                 </a>
             {% endif %}

unfold/templatetags/unfold.py

@@ -4,6 +4,7 @@ from typing import Any, Optional, Union
 from django import template
 from django.contrib.admin.helpers import AdminForm, Fieldset
 from django.contrib.admin.views.main import ChangeList
+from django.db.models import Model
 from django.db.models.options import Options
 from django.forms import Field
 from django.http import HttpRequest
@@ -85,6 +86,11 @@ def tab_list(context: RequestContext, page: str, opts: Optional[Options] = None)
     )
 
 
+@register.simple_tag(name="render_section", takes_context=True)
+def render_section(context: Context, section_class, instance: Model) -> str:
+    return section_class(context.request, instance).render()
+
+
 @register.simple_tag(name="has_nav_item_active")
 def has_nav_item_active(items: list) -> bool:
     for item in items:
@@ -214,14 +220,17 @@ class RenderComponentNode(template.Node):
 
         if "component_class" in values:
             values = ComponentRegistry.create_instance(
-                values["component_class"], request=context.request
+                values["component_class"],
+                request=context.request if hasattr(context, "request") else None,
             ).get_context_data(**values)
 
         if self.include_context:
             values.update(context.flatten())
 
         return render_to_string(
-            self.template_name, request=context.request, context=values
+            self.template_name,
+            request=context.request if hasattr(context, "request") else None,
+            context=values,
         )
 
 

unfold/templatetags/unfold_list.py

@@ -16,6 +16,7 @@ from django.contrib.admin.views.main import (
 )
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
+from django.db.models import Model
 from django.forms import Form
 from django.http import HttpRequest
 from django.template import Library
@@ -26,13 +27,13 @@ from django.utils.html import format_html
 from django.utils.safestring import SafeText, mark_safe
 from django.utils.translation import gettext_lazy as _
 
-from ..utils import (
+from unfold.utils import (
     display_for_field,
     display_for_header,
     display_for_label,
     display_for_value,
 )
-from ..widgets import UnfoldBooleanWidget
+from unfold.widgets import UnfoldBooleanWidget
 
 register = Library()
 
@@ -336,23 +337,22 @@ def items_for_result(cl: ChangeList, result: HttpRequest, form) -> SafeText:
 
 class UnfoldResultList(ResultList):
     def __init__(
-        self, instance_pk: Union[int, str], form: Optional[Form], *items: Any
+        self,
+        instance: Model,
+        form: Optional[Form],
+        *items: Any,
     ) -> None:
-        self.instance_pk = instance_pk
+        self.instance = instance
         super().__init__(form, *items)
 
 
 def results(cl: ChangeList):
     if cl.formset:
         for res, form in zip(cl.result_list, cl.formset.forms):
-            pk = cl.lookup_opts.pk.attname
-            pk_value = getattr(res, pk)
-            yield UnfoldResultList(pk_value, form, items_for_result(cl, res, form))
+            yield UnfoldResultList(res, form, items_for_result(cl, res, form))
     else:
         for res in cl.result_list:
-            pk = cl.lookup_opts.pk.attname
-            pk_value = getattr(res, pk)
-            yield UnfoldResultList(pk_value, None, items_for_result(cl, res, None))
+            yield UnfoldResultList(res, None, items_for_result(cl, res, None))
 
 
 def result_list(context: dict[str, Any], cl: ChangeList) -> dict[str, Any]: