django-unfold 0.52.0__py3-none-any.whl → 0.53.0__py3-none-any.whl

unfold/templates/admin/auth/user/add_form.html

@@ -6,7 +6,7 @@
         {% if not is_popup %}
             {% translate 'First, enter a username and password. Then, you’ll be able to edit more user options.' %}
         {% else %}
-            {% translate "Enter a username and password." %}x
+            {% translate "Enter a username and password." %}
         {% endif %}
         <p>
 {% endblock %}

unfold/templates/admin/change_form.html

@@ -1,6 +1,6 @@
 {% extends "admin/base_site.html" %}
 
-{% load i18n admin_urls static admin_modify %}
+{% load i18n admin_urls static admin_modify unfold %}
 
 {% block extrahead %}{{ block.super }}
     <script src="{% url 'admin:jsi18n' %}"></script>
@@ -65,7 +65,7 @@
             {% include adminform.model_admin.change_form_outer_before_template %}
         {% endif %}
 
-        <form {% if has_file_field %}enctype="multipart/form-data" {% endif %}{% if form_url %}action="{{ form_url }}" {% endif %}method="post" id="{{ opts.model_name }}_form" {% if adminform.model_admin.warn_unsaved_form %}class="warn-unsaved-form"{% endif %} novalidate>
+        <form {% if adminform.model_admin.conditional_fields %}x-data='{{ adminform|changeform_data }}'{% endif %} {% if has_file_field %}enctype="multipart/form-data" {% endif %}{% if form_url %}action="{{ form_url }}" {% endif %}method="post" id="{{ opts.model_name }}_form" {% if adminform.model_admin.warn_unsaved_form %}class="warn-unsaved-form"{% endif %} novalidate>
             {% csrf_token %}
 
             {% if adminform.model_admin.change_form_before_template %}
@@ -87,12 +87,13 @@
                 {% include "unfold/helpers/messages/error.html" with errors=adminform.form.non_field_errors %}
 
                 {% block field_sets %}
-                    {% for fieldset in adminform %}
-                        {% if "tab" not in fieldset.classes %}
-                            {% include 'admin/includes/fieldset.html' %}
-                        {% endif %}
-                    {% endfor %}
-
+                    {% with has_conditional_display=adminform.model_admin.conditional_fields %}
+                        {% for fieldset in adminform %}
+                            {% if "tab" not in fieldset.classes %}
+                                {% include 'admin/includes/fieldset.html' %}
+                            {% endif %}
+                        {% endfor %}
+                    {% endwith %}
                     {% include "unfold/helpers/fieldsets_tabs.html" %}
                 {% endblock %}
 

unfold/templates/admin/pagination.html

@@ -4,28 +4,12 @@
     <div class="{% if not is_popup %}max-w-full lg:bottom-0 lg:fixed lg:left-0 lg:right-0{% endif %}" {% if not is_popup %}x-bind:class="{'xl:left-0': !sidebarDesktopOpen, 'xl:left-72': sidebarDesktopOpen}"{% endif %} x-bind:style="'width: ' + mainWidth + 'px'">
         <div class="lg:backdrop-blur-sm lg:bg-white/80 lg:flex lg:items-center lg:dark:bg-base-900/80 {% if not is_popup %}lg:border-t lg:border-base-200 lg:h-[71px] lg:py-2 lg:relative lg:scrollable-top lg:px-8 lg:dark:border-base-800{% endif %}">
             <div class="flex flex-row items-center {% if not cl.model_admin.list_fullwidth %}lg:mx-auto{% endif %}" x-bind:style="'width: ' + changeListWidth + 'px'">
-                {% if pagination_required %}
-                    {% for i in page_range %}
-                        <div class="{% if forloop.last %}pr-2{% else %}pr-4{% endif %}">
-                            {% paginator_number cl i %}
-                        </div>
-                    {% endfor %}
+                {% if cl.paginator.template_name %}
+                    {% include cl.paginator.template_name %}
+                {% else %}
+                    {% include "unfold/helpers/pagination_default.html" %}
                 {% endif %}
 
-                <div class="py-4">
-                    {% if pagination_required %}
-                        -
-                    {% endif %}
-
-                    {{ cl.result_count }}
-
-                    {% if cl.result_count == 1 %}
-                        {{ cl.opts.verbose_name }}
-                    {% else %}
-                        {{ cl.opts.verbose_name_plural }}
-                    {% endif %}
-                </div>
-
                 {% if show_all_url %}
                     <a href="{{ show_all_url }}" class="showall ml-4 text-primary-600 dark:text-primary-500">
                         {% translate 'Show all' %}

unfold/templates/unfold/helpers/fieldset_row.html

@@ -2,12 +2,24 @@
 
 <div class="{% fieldset_row_classes %} {% if forloop.last %}last{% endif %}">
     {% for field in line %}
-        <div class="{% fieldset_line_classes %}">
-            {% if field.is_checkbox %}
-                {% include "unfold/helpers/fieldset_row_checkbox.html" %}
-            {% else %}
-                {% include "unfold/helpers/fieldset_row_field.html" %}
-            {% endif %}
-        </div>
+        {% with adminform.model_admin.conditional_fields|index:field.field.name as conditional_display %}
+            <div class="{% fieldset_line_classes %}" {% if has_conditional_display and conditional_display %}x-show="{{ conditional_display }}"{% endif %}>
+                {% if has_conditional_display %}
+                    {% with field|changeform_condition as field %}
+                        {% if field.is_checkbox %}
+                            {% include "unfold/helpers/fieldset_row_checkbox.html" %}
+                        {% else %}
+                            {% include "unfold/helpers/fieldset_row_field.html" %}
+                        {% endif %}
+                    {% endwith %}
+                {% else %}
+                    {% if field.is_checkbox %}
+                        {% include "unfold/helpers/fieldset_row_checkbox.html" %}
+                    {% else %}
+                        {% include "unfold/helpers/fieldset_row_field.html" %}
+                    {% endif %}
+                {% endif %}
+            </div>
+        {% endwith %}
     {% endfor %}
 </div>

unfold/templates/unfold/helpers/pagination_default.html

@@ -0,0 +1,23 @@
+{% load unfold_list %}
+
+{% if pagination_required %}
+    {% for i in page_range %}
+        <div class="{% if forloop.last %}pr-2{% else %}pr-4{% endif %}">
+            {% paginator_number cl i %}
+        </div>
+    {% endfor %}
+{% endif %}
+
+<div class="py-4">
+    {% if pagination_required %}
+        -
+    {% endif %}
+
+    {{ cl.result_count }}
+
+    {% if cl.result_count == 1 %}
+        {{ cl.opts.verbose_name }}
+    {% else %}
+        {{ cl.opts.verbose_name_plural }}
+    {% endif %}
+</div>

unfold/templates/unfold/helpers/pagination_infinite.html

@@ -0,0 +1,11 @@
+{% load unfold_list i18n %}
+
+<div class="flex flex-row gap-4">
+    <a {% if cl.page_num != 1 %}href="?p={{ cl.page_num|add:-1 }}"{% endif %} class="{% if cl.page_num != 1 %}hover:text-primary-600 dark:hover:text-primary-500{% endif %}">
+        {% trans "Previous" %}
+    </a>
+
+    <a href="?p={{ cl.page_num|add:1 }}" class="hover:text-primary-600 dark:hover:text-primary-500">
+        {% trans "Next" %}
+    </a>
+</div>

unfold/templates/unfold/helpers/site_icon.html

@@ -2,29 +2,29 @@
 
 {% if site_icon %}
     <div class="shrink-0">
-        <a href="{% url "admin:index" %}">
-            {% if site_icon.light and site_icon.dark %}
-                <img src="{{ site_icon.dark }}" alt="{% trans 'Home' %}" class="h-8 hidden dark:block"/>
+        <{% if site_dropdown %}span{% else %}a href="{% url "admin:index" %}"{% endif %}>
+        {% if site_icon.light and site_icon.dark %}
+            <img src="{{ site_icon.dark }}" alt="{% trans 'Home' %}" class="h-8 hidden dark:block"/>
 
-                <img src="{{ site_icon.light }}" alt="{% trans 'Home' %}" class="block h-8 dark:hidden" />
-            {% else %}
-                <img src="{{ site_icon }}" class="h-8" alt="{% trans 'Home' %}" />
-            {% endif %}
-        </a>
+            <img src="{{ site_icon.light }}" alt="{% trans 'Home' %}" class="block h-8 dark:hidden" />
+        {% else %}
+            <img src="{{ site_icon }}" class="h-8" alt="{% trans 'Home' %}" />
+        {% endif %}
+    </{% if site_dropdown %}span{% else %}a{% endif %}>
     </div>
 {% else %}
-    <a href="{% url "admin:index" %}" class="bg-primary-600 flex h-8 items-center justify-center rounded text-white text-xs w-8">
-        <span class="material-symbols-outlined md-18">{% if site_symbol %}{{ site_symbol }}{% else %}settings{% endif %}</span>
-    </a>
+    <{% if site_dropdown %}span{% else %}a href="{% url "admin:index" %}"{% endif %} class="bg-primary-600 flex h-8 items-center justify-center rounded shrink-0 text-white text-xs w-8">
+    <span class="material-symbols-outlined md-18">{% if site_symbol %}{{ site_symbol }}{% else %}settings{% endif %}</span>
+    </{% if site_dropdown %}span{% else %}a{% endif %}>
 {% endif %}
 
-<div class="flex flex-col grow min-w-0">
-    <div class="text-font-important-light leading-normal tracking-tight dark:text-font-important-dark *:leading-none {% if site_subheader %}xl:text-sm{% else %}xl:text-base{% endif %}">
+<div class="flex flex-col gap-0.5 grow justify-center min-w-0">
+    <div class="text-font-important-light leading-normal tracking-tight dark:text-font-important-dark *:leading-none *:truncate {% if site_subheader %}xl:text-sm{% else %}xl:text-base{% endif %}">
         {{ branding }}
     </div>
 
     {% if site_subheader %}
-        <div class="font-normal leading-normal text-font-subtle-light text-xs truncate dark:text-font-subtle-dark">
+        <div class="font-normal text-font-subtle-light text-xs leading-none dark:text-font-subtle-dark">
             {{ site_subheader }}
         </div>
     {% endif %}

unfold/templates/unfold/helpers/tab_action.html

@@ -25,7 +25,7 @@
         <template x-teleport="body">
             <nav x-anchor.bottom-end.offset.4="$refs.actionDropdown{{ action.method_name }}" class="absolute bg-white border flex flex-col -mr-px py-1 right-0 rounded shadow-lg top-10 w-52 z-50 dark:bg-base-800 dark:border-base-700" x-transition x-show="actionDropdownOpen" x-on:click.outside="actionDropdownOpen = false">
                 {% for item in action.items %}
-                    <a href="{{ item.path }}" class="flex items-center font-normal gap-2 max-h-[30px] mx-1 px-3 py-2 rounded text-left hover:bg-base-100 hover:text-base-700 dark:hover:bg-base-700 dark:hover:text-base-200"{% if blank %} target="_blank"{% endif %} {% include "unfold/helpers/attrs.html" with attrs=action.attrs %}>
+                    <a href="{{ item.path }}" class="flex items-center font-normal gap-2 max-h-[30px] mx-1 px-3 py-2 rounded text-left hover:bg-base-100 hover:text-base-700 dark:hover:bg-base-700 dark:hover:text-base-200"{% if blank %} target="_blank"{% endif %} {% include "unfold/helpers/attrs.html" with attrs=item.attrs %}>
                         {% if item.icon %}
                             <span class="material-symbols-outlined">
                                 {{ item.icon }}

unfold/templates/unfold/helpers/welcomemsg.html

@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load unfold i18n %}
 
 <div class="flex flex-row flex-grow font-semibold items-center min-w-0 mr-3">
     <span class="cursor-pointer flex flex-row items-center">
@@ -23,7 +23,7 @@
                 {{ content_title }}
             </span>
 
-            {% if cl and cl.full_result_count != cl.result_count %}
+            {% if cl and cl.full_result_count != cl.result_count and cl.paginator|class_name != "InfinitePaginator" %}
                 <span class="font-medium ml-2 text-font-subtle-light text-sm dark:text-font-subtle-dark">
                     {% blocktranslate count counter=cl.result_count %}{{ counter }} result{% plural %}{{ counter }} results{% endblocktranslate %} (<a href="?{% if cl.is_popup %}_popup=1{% endif %}">{% if cl.show_full_result_count %}{% blocktranslate with full_result_count=cl.full_result_count %}{{ full_result_count }} total{% endblocktranslate %}{% else %}{% translate "Show all" %}{% endif %}</a>)
                 </span>

unfold/templatetags/unfold.py

@@ -1,21 +1,24 @@
+import json
 from collections.abc import Mapping
 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.contrib.admin.widgets import RelatedFieldWidgetWrapper
 from django.db.models import Model
 from django.db.models.options import Options
-from django.forms import Field
+from django.forms import BoundField, Field
 from django.http import HttpRequest
 from django.template import Context, Library, Node, RequestContext, TemplateSyntaxError
 from django.template.base import NodeList, Parser, Token, token_kwargs
 from django.template.loader import render_to_string
-from django.utils.safestring import SafeText
+from django.utils.safestring import SafeText, mark_safe
 
 from unfold.components import ComponentRegistry
 from unfold.dataclasses import UnfoldAction
 from unfold.enums import ActionVariant
+from unfold.widgets import UnfoldAdminSplitDateTimeWidget
 
 register = Library()
 
@@ -107,7 +110,10 @@ def class_name(value: Any) -> str:
 
 @register.filter
 def index(indexable: Mapping[int, Any], i: int) -> Any:
-    return indexable[i]
+    try:
+        return indexable[i]
+    except (KeyError, TypeError):
+        return None
 
 
 @register.filter
@@ -346,7 +352,6 @@ def fieldset_row_classes(context: Context) -> str:
     ]
 
     formset = context.get("inline_admin_formset", None)
-    adminform = context.get("adminform", None)
     line = context.get("line")
 
     # Hide the field in case of ordering field for sorting
@@ -359,28 +364,11 @@ def fieldset_row_classes(context: Context) -> str:
         ):
             classes.append("hidden")
 
-    # Compressed fields special styling
-    if (
-        adminform
-        and hasattr(adminform.model_admin, "compressed_fields")
-        and adminform.model_admin.compressed_fields
-    ):
-        classes.extend(
-            [
-                "lg:border-b",
-                "lg:border-base-200",
-                "lg:border-dashed",
-                "dark:lg:border-base-800",
-                "last:lg:border-b-0",
-            ]
-        )
-
     if len(line.fields) > 1:
         classes.extend(
             [
-                "flex",
-                "flex-row",
-                "flex-wrap",
+                "grid",
+                f"lg:grid-cols-{len(line.fields)}",
             ]
         )
 
@@ -421,7 +409,6 @@ def fieldset_line_classes(context: Context) -> str:
                 "border-base-200",
                 "border-dashed",
                 "group-[.last]/row:border-b-0",
-                "lg:border-b-0",
                 "lg:border-l",
                 "lg:flex-row",
                 "dark:border-base-800",
@@ -498,3 +485,47 @@ def action_item_classes(context: Context, action: UnfoldAction) -> str:
         )
 
     return " ".join(set(classes))
+
+
+@register.filter
+def changeform_data(adminform: AdminForm) -> str:
+    fields = []
+
+    for fieldset in adminform:
+        for line in fieldset:
+            for field in line:
+                if isinstance(field.field, dict):
+                    continue
+
+                if isinstance(field.field.field.widget, UnfoldAdminSplitDateTimeWidget):
+                    for index, _widget in enumerate(field.field.field.widget.widgets):
+                        fields.append(
+                            f"{field.field.name}{field.field.field.widget.widgets_names[index]}"
+                        )
+                else:
+                    fields.append(field.field.name)
+
+    return mark_safe(json.dumps(dict.fromkeys(fields, "")))
+
+
+@register.filter(takes_context=True)
+def changeform_condition(field: BoundField) -> BoundField:
+    if isinstance(field.field, dict):
+        return field
+
+    if isinstance(field.field.field.widget, RelatedFieldWidgetWrapper):
+        field.field.field.widget.widget.attrs["x-model.fill"] = field.field.name
+        field.field.field.widget.widget.attrs["x-init"] = mark_safe(
+            f"const $ = django.jQuery; $(function () {{ const select = $('#{field.field.auto_id}'); select.on('change', (ev) => {{ {field.field.name} = select.val(); }}); }});"
+        )
+    elif isinstance(field.field.field.widget, UnfoldAdminSplitDateTimeWidget):
+        for index, widget in enumerate(field.field.field.widget.widgets):
+            field_name = (
+                f"{field.field.name}{field.field.field.widget.widgets_names[index]}"
+            )
+
+            widget.attrs["x-model.fill"] = field_name
+    else:
+        field.field.field.widget.attrs["x-model.fill"] = field.field.name
+
+    return field

unfold/utils.py

@@ -15,6 +15,13 @@ from django.utils.safestring import SafeText, mark_safe
 
 from .exceptions import UnfoldException
 
+try:
+    from djmoney.models.fields import MoneyField
+    from djmoney.money import Money
+except ImportError:
+    MoneyField = None
+    Money = None
+
 
 def _boolean_icon(field_val: Any) -> str:
     return render_to_string("unfold/helpers/boolean.html", {"value": field_val})
@@ -89,6 +96,8 @@ def display_for_value(
         return formats.localize(timezone.template_localtime(value))
     elif isinstance(value, (datetime.date, datetime.time)):
         return formats.localize(value)
+    elif Money is not None and isinstance(value, Money):
+        return str(value)
     elif isinstance(value, (int, decimal.Decimal, float)):
         return formats.number_format(value)
     elif isinstance(value, (list, tuple)):
@@ -114,6 +123,8 @@ def display_for_field(value: Any, field: Any, empty_value_display: str) -> str:
         return formats.localize(timezone.template_localtime(value))
     elif isinstance(field, (models.DateField, models.TimeField)):
         return formats.localize(value)
+    elif MoneyField is not None and isinstance(field, MoneyField):
+        return str(value)
     elif isinstance(field, models.DecimalField):
         return formats.number_format(value, field.decimal_places)
     elif isinstance(field, (models.IntegerField, models.FloatField)):