django-unfold 0.25.0__py3-none-any.whl → 0.26.0__py3-none-any.whl

unfold/templates/admin/edit_inline/stacked.html

@@ -11,19 +11,19 @@
         </h2>
 
         {{ inline_admin_formset.formset.management_form }}
-        {{ inline_admin_formset.formset.non_form_errors }}
+        {% include "unfold/helpers/messages/error.html" with errors=inline_admin_formset.formset.non_form_errors %}
 
         <div class="border border-gray-200 mb-6 overflow-hidden rounded-md shadow-sm text-gray-700 w-full dark:border-gray-800">
             {% for inline_admin_form in inline_admin_formset %}
                 <div class="inline-related group inline-stacked {% if inline_admin_form.original or inline_admin_form.show_url %} has_original{% endif %}{% if forloop.last and inline_admin_formset.has_add_permission %} empty-form last-related{% endif %}" id="{{ inline_admin_formset.formset.prefix }}-{% if not forloop.last %}{{ forloop.counter0 }}{% else %}empty{% endif %}">
-                    <h3 class="border-b {% if not forloop.first %}border-t{% endif %} border-gray-200 flex font-medium items-center mb-3 px-3 py-2 text-gray-400 text-sm dark:border-gray-800">
+                    <h3 class="bg-gray-50 border-b {% if not forloop.first %}border-t{% endif %} border-gray-200 flex font-medium items-center mb-3 px-3 py-2 text-gray-400 text-sm dark:bg-white/[.02] dark:border-gray-800">
                         <span class="mr-2">
                             {{ inline_admin_formset.opts.verbose_name|capfirst }}:
                         </span>
 
-                        <span class="inline_label font-semibold text-gray-900">
+                        <span class="inline_label font-semibold text-gray-900 dark:text-gray-200">
                             {% if inline_admin_form.original and inline_admin_form.model_admin.show_change_link and inline_admin_form.model_admin.has_registered_model %}
-                                <a href="{% url inline_admin_form.model_admin.opts|admin_urlname:'change' inline_admin_form.original.pk|admin_urlquote %}" class="{% if inline_admin_formset.has_change_permission %}inlinechangelink{% else %}inlineviewlink{% endif %} font-medium ml-1 text-primary-600 underline text-xs">
+                                <a href="{% url inline_admin_form.model_admin.opts|admin_urlname:'change' inline_admin_form.original.pk|admin_urlquote %}" class="{% if inline_admin_formset.has_change_permission %}inlinechangelink{% else %}inlineviewlink{% endif %} font-medium text-primary-600 underline">
                                     {{ inline_admin_form.original }}
                                 </a>
                             {% else %}
@@ -42,7 +42,7 @@
                         {% endif %}
 
                         {% if inline_admin_formset.formset.can_delete and inline_admin_formset.has_delete_permission and inline_admin_form.original %}
-                            <span class="delete flex items-center ml-auto text-gray-500">
+                            <span class="delete flex gap-2 items-center ml-auto text-gray-500">
                                 {{ inline_admin_form.deletion_field.field|add_css_class:form_classes.checkbox }} {{ inline_admin_form.deletion_field.label_tag }}
                             </span>
                         {% endif %}
@@ -52,7 +52,7 @@
 
                     {% for fieldset in inline_admin_form %}
                         <div class="px-3 -mb-5">
-                            {% include 'admin/includes/fieldset.html' %}
+                            {% include 'admin/includes/fieldset.html' with stacked=1 %}
                         </div>
                     {% endfor %}
 

unfold/templates/admin/edit_inline/tabular.html

@@ -21,13 +21,13 @@
                         {% trans "No records found." %}
                     </p>
                 {% else %}
-                    <div class="border border-gray-200 mb-6 overflow-x-auto rounded-md shadow-sm dark:border-gray-800">
+                    <div class="border border-gray-200 mb-6 overflow-x-auto rounded-md shadow-sm dark:border-gray-800" data-simplebar data-simplebar-auto-hide="false">
                         <table class="border-spacing-none border-separate text-gray-700 w-full">
                             <thead class="hidden lg:table-header-group">
                                 <tr>
                                     {% for field in inline_admin_formset.fields %}
                                         {% if not field.widget.is_hidden %}
-                                            <th class="column-{{ field.name }}{% if field.required %} required{% endif %} align-middle border-b border-gray-200 font-medium px-3 py-2 text-left text-gray-400 text-sm dark:border-gray-800">
+                                            <th class="column-{{ field.name }}{% if field.required %} required{% endif %} align-middle border-b border-gray-200 font-medium px-3 py-2 text-left text-gray-400 text-sm whitespace-nowrap dark:border-gray-800">
                                                 <span class="flex flex-row items-center">
                                                     {{ field.label|capfirst }}
 
@@ -40,7 +40,7 @@
                                     {% endfor %}
 
                                     {% if inline_admin_formset.formset.can_delete and inline_admin_formset.has_delete_permission %}
-                                        <th class="align-middle border-b border-gray-200 font-medium px-3 py-2 text-left text-gray-400 text-sm lg:w-px dark:border-gray-800">
+                                        <th class="align-middle border-b border-gray-200 font-medium px-3 py-2 text-left text-gray-400 text-sm whitespace-nowrap lg:w-px dark:border-gray-800">
                                             {% translate "Delete?" %}
                                         </th>
                                     {% endif %}

unfold/templates/admin/includes/fieldset.html

@@ -13,7 +13,7 @@
         </div>
     {% endif %}
 
-    <div class="aligned border border-gray-200 mb-8 rounded-md pt-3 px-3 shadow-sm dark:border-gray-800">
+    <div class="aligned mb-8 {% if not stacked %}border border-gray-200 rounded-md pt-3 px-3 shadow-sm dark:border-gray-800{% endif %}">
         {% for line in fieldset %}
             <div class="form-row block {% if not line.fields|length_is:'1' %}flex flex-row flex-wrap gap-x-8{% endif %}{% if not line.has_visible_field %} hidden{% endif %}{% for field in line %}{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% endfor %}">
                 {% for field in line %}

unfold/templates/unfold/helpers/app_list.html

@@ -1,7 +1,7 @@
 {% load i18n %}
 
 {% if sidebar_navigation %}
-    <div class="overflow-auto">
+    <div class="h-0 flex-grow overflow-auto" data-simplebar>
         {% for group in sidebar_navigation %}
             {% if group.items %}
                 {% if group.separator %}

unfold/templates/unfold/helpers/display_header.html

@@ -1,20 +1,23 @@
-<div class="flex gap-4 items-center">
+<span class="flex gap-4 items-center">
     {% if value.3 and value.3.path %}
-        <div class="bg-center bg-cover bg-white border flex font-medium h-8 w-8 dark:bg-gray-900 dark:border-gray-700 {% if value.3.squared %}rounded-sm{% else %}rounded-full{% endif %}" style="background-image: url('{{ value.3.path }}')">
-        </div>
+        <span class="bg-center bg-cover bg-white flex font-medium justify-center overflow-hidden dark:bg-gray-900 dark:border-gray-700 {% if value.3.squared %}rounded-sm{% else %}rounded-full{% endif %}{% if not value.3.borderless %} border{% endif %}{% if not value.3.width or not value.3.height %}h-8 max-w-8 min-w-8{% endif %}">
+            <img loading="lazy" src="{{ value.3.path }}" class="object-cover" {% if value.3.width %}width="{{ value.3.width }}"{% endif %} {% if value.3.height %}height="{{ value.3.height }}"{% endif %}/>
+        </span>
     {% elif value.2 %}
-        <div class="bg-white border flex font-medium h-8 justify-center items-center rounded-full text-xs uppercase w-8 dark:bg-gray-900 dark:border-gray-700">
+        <span class="bg-white border flex font-medium h-8 justify-center items-center rounded-full text-xs uppercase w-8 dark:bg-gray-900 dark:border-gray-700">
             {{ value.2 }}
-        </div>
+        </span>
     {% endif %}
 
-    <div class="flex flex-col text-right lg:text-left">
-        <h3>{{ value.0 }}</h3>
+    <span class="flex flex-col text-right lg:text-left">
+        {% if value.0 %}
+            <h3>{{ value.0 }}</h3>
+        {% endif %}
 
         {% if value.1 %}
             <p class="text-gray-500">
                 {{ value.1 }}
             </p>
         {% endif %}
-    </div>
+    </span>
 </div>

unfold/templates/unfold/helpers/field.html

@@ -1,9 +1,23 @@
-<div class="{% if field.errors %}errors {% endif %}flex group mb-6 flex-col last:mb-4">
-    {% include "unfold/helpers/form_label.html" with field=field %}
+{% if field.field.widget.input_type == "checkbox" %}
+    <div class="{% if field.errors %}errors {% endif %}flex flex-col group mb-6 last:mb-4">
+        <div class="flex flex-row gap-2 items-center">
+            {{ field }}
 
-    {{ field }}
+            {% include "unfold/helpers/form_label.html" with field=field %}
+        </div>
 
-    {% include "unfold/helpers/form_errors.html" with errors=field.errors %}
+        {% include "unfold/helpers/form_errors.html" with errors=field.errors %}
 
-    {% include "unfold/helpers/help_text.html" with help_text=field.help_text %}
-</div>
+        {% include "unfold/helpers/help_text.html" with help_text=field.help_text %}
+    </div>
+{% else %}
+    <div class="{% if field.errors %}errors {% endif %}flex flex-col group mb-6 last:mb-4">
+        {% include "unfold/helpers/form_label.html" with field=field %}
+
+        {{ field }}
+
+        {% include "unfold/helpers/form_errors.html" with errors=field.errors %}
+
+        {% include "unfold/helpers/help_text.html" with help_text=field.help_text %}
+    </div>
+{% endif %}

unfold/templates/unfold/helpers/fieldsets_tabs.html

@@ -7,8 +7,8 @@
                 {% for fieldset in tabs %}
                     <li>
                         <a class="cursor-pointer font-semibold hover:text-gray-700 dark:hover:text-white"
-                        x-on:click="openTab = '{{ fieldset.name|slugify }}'"
-                        x-bind:class="openTab == '{{ fieldset.name|slugify }}'{% if forloop.first %} || openTab == null{% endif %} ? 'text-gray-700 dark:text-white' : ''">
+                        x-on:click="openTab = '{{ forloop.counter0 }}-{{ fieldset.name|slugify }}'"
+                        x-bind:class="openTab == '{{ forloop.counter0 }}-{{ fieldset.name|slugify }}'{% if forloop.first %} || openTab == null{% endif %} ? 'text-gray-700 dark:text-white' : ''">
                             {{ fieldset.name }}
                         </a>
                     </li>
@@ -16,8 +16,8 @@
             </ul>
 
             {% for fieldset in tabs %}
-                <div class="tab-wrapper{% if fieldset.name %} fieldset-{{ fieldset.name|slugify }}{% endif %}"
-                    x-show="openTab == '{{ fieldset.name|slugify }}'{% if forloop.first %} || openTab == null{% endif %}">
+                <div class="tab-wrapper{% if fieldset.name %} fieldset-{{ fieldset.name|slugify }} fieldset-{{ forloop.counter0 }}-{{ fieldset.name|slugify }}{% endif %}"
+                    x-show="openTab == '{{ forloop.counter0 }}-{{ fieldset.name|slugify }}'{% if forloop.first %} || openTab == null{% endif %}">
                     {% include 'admin/includes/fieldset.html' %}
                 </div>
             {% endfor %}

unfold/templates/unfold/helpers/form_label.html

@@ -1,4 +1,4 @@
-<label for="{{ field.id_for_label }}" class="block font-medium mb-2 text-gray-900 text-sm dark:text-gray-200">
+<label for="{{ field.id_for_label }}" class="block text-gray-900 text-sm dark:text-gray-200{% if field.field.widget.input_type == "checkbox" %}{% else %} font-medium mb-2{% endif %}">
     {{ field.label }}
 
     {% if field.field.required %}

unfold/templates/unfold/layouts/skeleton.html

@@ -25,6 +25,7 @@
     {% endfor %}
 
     <link href="{% static 'unfold/css/styles.css' %}" rel="stylesheet">
+    <link href="{% static 'unfold/css/simplebar.css' %}" rel="stylesheet">
 
     <script src="{% static 'unfold/js/alpine.persist.js' %}" defer></script>
     <script src="{% static 'unfold/js/alpine.js' %}" defer></script>
@@ -66,6 +67,7 @@
     {% block base %}{% endblock %}
 
     <div id="modal-overlay" class="backdrop-blur-sm bg-opacity-80 bg-gray-900 bottom-0 fixed hidden left-0 mr-1 right-0 top-0 z-50"></div>
+    <script src="{% static 'unfold/js/simplebar.js' %}"></script>
 </body>
 
 </html>

unfold/templates/unfold/widgets/foreign_key_raw_id.html

@@ -0,0 +1,21 @@
+<div class="flex flex-row">
+    {% include 'django/forms/widgets/input.html' %}
+
+    {% if related_url %}
+        <a href="{{ related_url }}" class="related-lookup related-widget-wrapper-link view-related bg-white border cursor-pointer flex items-center h-9.5 justify-center ml-2 rounded shadow-sm shrink-0 text-gray-400 text-sm w-9.5 hover:text-gray-700 dark:bg-gray-900 dark:border-gray-700 dark:text-gray-500 dark:hover:text-gray-200" id="lookup_id_{{ widget.name }}" title="{{ link_title }}">
+            <span class="material-symbols-outlined text-sm">search</span>
+        </a>
+    {% endif %}
+</div>
+
+{% if link_label %}
+    <strong class="mt-2 font-medium text-xs">
+        {% if link_url %}
+            <a href="{{ link_url }}" class="underline text-primary-500">
+                {{ link_label }}
+            </a>
+        {% else %}
+            {{ link_label }}
+        {% endif %}
+    </strong>
+{% endif %}

unfold/templates/unfold/widgets/textarea.html

@@ -1,7 +1 @@
-<div class="relative">
-    <div class="border break-words font-medium invisible max-w-4xl px-3 py-2 text-sm" style="min-height: 64px">
-        {% if widget.value %}{{ widget.value|linebreaks }}{% endif %}
-    </div>
-
-    <textarea onInput="this.previousElementSibling.innerText = this.value + String.fromCharCode(10)" name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %}>{% if widget.value %}{{ widget.value }}{% endif %}</textarea>
-</div>
+<textarea name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %}>{% if widget.value %}{{ widget.value }}{% endif %}</textarea>

unfold/templates/unfold/widgets/textarea_expandable.html

@@ -0,0 +1,7 @@
+<div class="relative">
+    <div class="border break-words font-medium invisible max-w-4xl px-3 py-2 text-sm" style="min-height: 64px">
+        {% if widget.value %}{{ widget.value|linebreaks }}{% endif %}
+    </div>
+
+    <textarea onInput="this.previousElementSibling.innerText = this.value + String.fromCharCode(10)" name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %}>{% if widget.value %}{{ widget.value }}{% endif %}</textarea>
+</div>

unfold/widgets.py

@@ -1,6 +1,7 @@
 from typing import Any, Callable, Dict, Optional, Tuple, Union
 
 from django.contrib.admin.options import VERTICAL
+from django.contrib.admin.sites import AdminSite
 from django.contrib.admin.widgets import (
     AdminBigIntegerFieldWidget,
     AdminDateWidget,
@@ -13,8 +14,10 @@ from django.contrib.admin.widgets import (
     AdminTextInputWidget,
     AdminTimeWidget,
     AdminUUIDInputWidget,
+    ForeignKeyRawIdWidget,
     RelatedFieldWidgetWrapper,
 )
+from django.db.models.fields.reverse_related import ForeignObjectRel
 from django.forms import (
     CheckboxInput,
     MultiWidget,
@@ -106,7 +109,6 @@ SELECT_CLASSES = [
     "pr-8",
     "max-w-2xl",
     "appearance-none",
-    "truncate",
 ]
 
 PROSE_CLASSES = [
@@ -358,6 +360,20 @@ class UnfoldAdminSingleTimeWidget(AdminTimeWidget):
 class UnfoldAdminTextareaWidget(AdminTextareaWidget):
     template_name = "unfold/widgets/textarea.html"
 
+    def __init__(self, attrs: Optional[Dict[str, Any]] = None) -> None:
+        attrs = attrs or {}
+
+        super().__init__(
+            attrs={
+                "class": "vLargeTextField " + " ".join(TEXTAREA_CLASSES),
+                **(attrs or {}),
+            }
+        )
+
+
+class UnfoldAdminExpandableTextareaWidget(AdminTextareaWidget):
+    template_name = "unfold/widgets/textarea_expandable.html"
+
     def __init__(self, attrs: Optional[Dict[str, Any]] = None) -> None:
         attrs = attrs or {}
 
@@ -499,7 +515,7 @@ class UnfoldBooleanWidget(CheckboxInput):
         if attrs is None:
             attrs = {}
 
-        return super().__init__(
+        super().__init__(
             {
                 **(attrs or {}),
                 "class": " ".join(CHECKBOX_CLASSES + [attrs.get("class", "")]),
@@ -512,10 +528,27 @@ class UnfoldBooleanSwitchWidget(CheckboxInput):
     def __init__(
         self, attrs: Optional[Dict[str, Any]] = None, check_test: Callable = None
     ) -> None:
-        return super().__init__(
+        super().__init__(
             attrs={"class": " ".join(SWITCH_CLASSES), **(attrs or {})}, check_test=None
         )
 
 
 class UnfoldRelatedFieldWidgetWrapper(RelatedFieldWidgetWrapper):
     template_name = "unfold/widgets/related_widget_wrapper.html"
+
+
+class UnfoldForeignKeyRawIdWidget(ForeignKeyRawIdWidget):
+    template_name = "unfold/widgets/foreign_key_raw_id.html"
+
+    def __init__(
+        self,
+        rel: ForeignObjectRel,
+        admin_site: AdminSite,
+        attrs: Optional[Dict] = None,
+        using: Optional[Any] = None,
+    ) -> None:
+        attrs = {
+            "class": " ".join(["vForeignKeyRawIdAdminField"] + INPUT_CLASSES),
+            **(attrs or {}),
+        }
+        super().__init__(rel, admin_site, attrs, using)

unfold/contrib/import_export/admin.py

@@ -1,37 +0,0 @@
-from django import forms
-from django.utils.translation import gettext_lazy as _
-from import_export.admin import ExportActionModelAdmin as BaseExportActionModelAdmin
-from unfold.admin import ActionForm
-from unfold.widgets import SELECT_CLASSES
-
-
-def export_action_form_factory(formats):
-    class _ExportActionForm(ActionForm):
-        format = forms.ChoiceField(
-            label=" ",
-            choices=formats,
-            required=False,
-            widget=forms.Select(
-                {"class": " ".join([*SELECT_CLASSES, "ml-3", "!w-auto", "lg:!w-40"])}
-            ),
-        )
-
-    _ExportActionForm.__name__ = "ExportActionForm"
-
-    return _ExportActionForm
-
-
-class ExportActionModelAdmin(BaseExportActionModelAdmin):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        choices = []
-        formats = self.get_export_formats()
-        if formats:
-            for i, f in enumerate(formats):
-                choices.append((str(i), f().get_title()))
-
-        if len(formats) > 1:
-            choices.insert(0, ("", _("Select format")))
-
-        self.action_form = export_action_form_factory(choices)