django-unfold 0.54.0__py3-none-any.whl → 0.55.0__py3-none-any.whl

unfold/templates/unfold_crispy/layout/fieldset.html

@@ -0,0 +1,9 @@
+<fieldset {% if fieldset.css_id %}id="{{ fieldset.css_id }}"{% endif %} class="fieldset group flex flex-col gap-5 grow rounded border-base-200 shadow-sm aligned border p-3 relative dark:border-base-800 {% if fieldset.css_class %} {{ fieldset.css_class }}{% endif %}" {{ fieldset.flat_attrs }}>
+    {% if legend %}
+        <legend class="border-b border-base-200 font-semibold float-left pb-3 -mx-3 px-3 text-font-important-light dark:text-font-important-dark dark:border-base-800">
+            {{ legend|safe }}
+        </legend>
+    {% endif %}
+
+    {{ fields|safe }}
+</fieldset>

unfold/templates/unfold_crispy/layout/help_text.html

@@ -0,0 +1,5 @@
+{% if field.help_text %}
+    <div {% if field.id_for_label %}id="{{ field.id_for_label }}_helptext" {% endif %}class="leading-relaxed mt-2 text-xs">
+        {{ field.help_text|safe }}
+    </div>
+{% endif %}

unfold/templates/unfold_crispy/layout/help_text_and_errors.html

@@ -0,0 +1,3 @@
+{% include 'unfold_crispy/layout/field_errors.html' %}
+
+{% include 'unfold_crispy/layout/help_text.html' %}

unfold/templates/unfold_crispy/layout/radio_checkbox_select.html

@@ -0,0 +1,21 @@
+{% load crispy_forms_filters l10n %}
+
+<div class="flex flex-col gap-2 {% if field_class %}{{ field_class }}{% endif %}"{% if flat_attrs %} {{ flat_attrs }}{% endif %}>
+    {% for group, options, index in field|optgroups %}
+        {% if group %}
+            <strong>{{ group }}</strong>
+        {% endif %}
+
+        {% for option in options %}
+            <div>
+                <label for="{{ option.attrs.id }}" class="flex flex-row items-center gap-2">
+                    <input type="{{ option.type }}" class="{% if field.errors %}errors{% endif %} {% if option.type == "radio" %}{{ form_classes.radio }}{% else %}{{ form_classes.checkbox }}{% endif %}" name="{{ field.html_name }}" value="{{ option.value|unlocalize }}" {% include "unfold_crispy/layout/attrs.html" with widget=option %}>
+
+                    {{ option.label|unlocalize }}
+                </label>
+            </div>
+        {% endfor %}
+    {% endfor %}
+</div>
+
+{% include 'unfold_crispy/layout/help_text_and_errors.html' %}

unfold/templates/unfold_crispy/layout/row.html

@@ -0,0 +1,3 @@
+<div {% if div.css_id %}id="{{ div.css_id }}"{% endif %} class="flex flex-col gap-5 grow lg:flex-row {{ div.css_class|default:'' }}" {{ div.flat_attrs }}>
+    {{ fields|safe }}
+</div>

unfold/templates/unfold_crispy/layout/table_inline_formset.html

@@ -0,0 +1,100 @@
+{% load crispy_forms_tags crispy_forms_utils crispy_forms_field i18n %}
+
+{% specialspaceless %}
+    {% if formset_tag %}
+        <form {{ flat_attrs }} method="{{ form_method }}" {% if formset.is_multipart %} enctype="multipart/form-data"{% endif %}>
+    {% endif %}
+
+    {% if formset_method|lower == 'post' and not disable_csrf %}
+        {% csrf_token %}
+    {% endif %}
+
+    <div class="overflow-x-auto border border-base-200 rounded shadow-sm dark:border-base-800" {% if form_id %} id="{{ form_id }}"{% endif %}>
+        {{ formset.management_form|crispy }}
+
+        <table class="w-full">
+            <thead>
+                {% if formset.readonly and not formset.queryset.exists %}
+                {% else %}
+                    <tr>
+                        {% for field in formset.forms.0 %}
+                            {% if field.label and not field.is_hidden %}
+                                <th for="{{ field.auto_id }}" class="align-middle font-semibold py-2 text-left text-font-important-light dark:text-font-important-dark whitespace-nowrap px-3 {% if field.name == "DELETE" %}w-0{% endif %}">
+                                    {{ field.label }}{% if field.field.required and not field|is_checkbox %} <span class="asteriskField">*</span>{% endif %}
+                                </th>
+                            {% endif %}
+                        {% endfor %}
+                    </tr>
+                {% endif %}
+            </thead>
+
+            <tbody {% if formset_id %}id="{{ formset_id }}-rows"{% endif %}>
+                {% for form in formset %}
+                    {% if form_show_errors and form.non_field_errors and not form.is_extra %}
+                        <tr>
+                            <td colspan="100%" class="border-t border-base-200 px-3 pt-3 dark:border-base-800">
+                                {% include "unfold_crispy/errors.html" %}
+                            </td>
+                        </tr>
+                    {% endif %}
+
+                    <tr>
+                        {% for field in form %}
+                            {% include 'unfold_crispy/field.html' with tag="td" form_show_labels=False %}
+                        {% endfor %}
+                    </tr>
+                {% endfor %}
+            </tbody>
+
+            {% if form_add and formset_id %}
+                <tbody>
+                    <tr class="empty-form">
+                        {% for field in formset.empty_form %}
+                            {% include 'unfold_crispy/field.html' with tag="td" form_show_labels=False %}
+                        {% endfor %}
+                    </tr>
+
+                    <tr id="{{ formset_id }}-add-row-wrapper">
+                        <td colspan="100%" class="border-t border-base-200 p-3 dark:border-base-800">
+                            <div class="flex justify-end">
+                                <button type="button" id="{{ formset_id }}-add-row-button" class="border border-base-200 font-medium px-3 py-2 rounded transition-all w-full hover:bg-base-50 lg:block lg:w-auto dark:border-base-700 dark:hover:text-base-200 dark:hover:bg-base-900">
+                                    {% trans "Add row" %}
+                                </button>
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            {% endif %}
+        </table>
+
+        {% include "unfold_crispy/inputs.html" %}
+    </div>
+
+    {% if formset_tag %}
+        </form>
+    {% endif %}
+
+    {% if form_add and formset_id %}
+        <script>
+            document.getElementById('{{ formset_id }}-add-row-button').addEventListener('click', function() {
+                const formTotalEl = document.querySelector(`#{{ formset_id }} input[name*="TOTAL_FORMS"]`)
+                const formCount = parseInt(formTotalEl.value);
+                const newForm = document.querySelector('#{{ formset_id }} .empty-form').cloneNode(true);
+
+                newForm.classList.remove('empty-form');
+                newForm.innerHTML = newForm.innerHTML.replaceAll(/__prefix__/g, formCount);
+
+                document.getElementById('{{ formset_id }}-rows').insertBefore(
+                    newForm,
+                    document.getElementById("#{{ formset_id }}-add-row-wrapper")
+                )
+
+                formTotalEl.value = formCount + 1;
+
+                newForm.dispatchEvent(new CustomEvent('formset:added', {
+                    bubbles: true
+                }));
+            });
+        </script>
+    {% endif %}
+{% endspecialspaceless %}

unfold/templates/unfold_crispy/uni_form.html

@@ -0,0 +1,11 @@
+{% load crispy_forms_utils %}
+
+{% specialspaceless %}
+    {% if include_media %}{{ form.media }}{% endif %}
+    {% if form_show_errors %}
+        {% include "unfold_crispy/errors.html" %}
+    {% endif %}
+    {% for field in form %}
+        {% include field_template %}
+    {% endfor %}
+{% endspecialspaceless %}

unfold/templates/unfold_crispy/whole_uni_form.html

@@ -0,0 +1,14 @@
+{% load crispy_forms_utils %}
+
+{% specialspaceless %}
+    {% if form_tag %}<form {{ flat_attrs }} method="{{ form_method }}" {% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>{% endif %}
+    {% if form_method|lower == 'post' and not disable_csrf %}
+        {% csrf_token %}
+    {% endif %}
+
+    {% include "unfold_crispy/display_form.html" %}
+
+    {% include "unfold_crispy/inputs.html" %}
+
+    {% if form_tag %}</form>{% endif %}
+{% endspecialspaceless %}

unfold/templatetags/unfold.py

@@ -8,7 +8,7 @@ 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 BoundField, Field
+from django.forms import BoundField, CheckboxSelectMultiple, 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
@@ -18,7 +18,7 @@ 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
+from unfold.widgets import UnfoldAdminMoneyWidget, UnfoldAdminSplitDateTimeWidget
 
 register = Library()
 
@@ -495,7 +495,7 @@ def action_item_classes(context: Context, action: UnfoldAction) -> str:
 
 @register.filter
 def changeform_data(adminform: AdminForm) -> str:
-    fields = []
+    fields = {}
 
     for fieldset in adminform:
         for line in fieldset:
@@ -503,15 +503,19 @@ def changeform_data(adminform: AdminForm) -> str:
                 if isinstance(field.field, dict):
                     continue
 
-                if isinstance(field.field.field.widget, UnfoldAdminSplitDateTimeWidget):
+                if isinstance(
+                    field.field.field.widget, UnfoldAdminSplitDateTimeWidget
+                ) or isinstance(field.field.field.widget, UnfoldAdminMoneyWidget):
                     for index, _widget in enumerate(field.field.field.widget.widgets):
-                        fields.append(
+                        fields[
                             f"{field.field.name}{field.field.field.widget.widgets_names[index]}"
-                        )
+                        ] = None
+                elif isinstance(field.field.field.widget, CheckboxSelectMultiple):
+                    fields[field.field.name] = []
                 else:
-                    fields.append(field.field.name)
+                    fields[field.field.name] = None
 
-    return mark_safe(json.dumps(dict.fromkeys(fields, "")))
+    return mark_safe(json.dumps(fields))
 
 
 @register.filter(takes_context=True)
@@ -524,7 +528,9 @@ def changeform_condition(field: BoundField) -> BoundField:
         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):
+    elif isinstance(
+        field.field.field.widget, UnfoldAdminSplitDateTimeWidget
+    ) or isinstance(field.field.field.widget, UnfoldAdminMoneyWidget):
         for index, widget in enumerate(field.field.field.widget.widgets):
             field_name = (
                 f"{field.field.name}{field.field.field.widget.widgets_names[index]}"

unfold/widgets.py

@@ -33,6 +33,20 @@ from django.utils.translation import gettext_lazy as _
 
 from .exceptions import UnfoldException
 
+BUTTON_CLASSES = [
+    "border",
+    "cursor-pointer",
+    "font-medium",
+    "px-3",
+    "py-2",
+    "rounded",
+    "text-center",
+    "whitespace-nowrap",
+    "bg-primary-600",
+    "border-transparent",
+    "text-white",
+]
+
 LABEL_CLASSES = [
     "block",
     "font-semibold",
@@ -106,7 +120,7 @@ TEXTAREA_CLASSES = [
 TEXTAREA_EXPANDABLE_CLASSES = [
     "block",
     "field-sizing-content",
-    "!max-w-2xl",
+    "min-h-[38px]",
 ]
 
 SELECT_CLASSES = [
@@ -254,6 +268,28 @@ SWITCH_CLASSES = [
     "dark:checked:bg-green-700",
 ]
 
+FILE_CLASSES = [
+    "border",
+    "border-base-200",
+    "flex",
+    "grow",
+    "items-center",
+    "overflow-hidden",
+    "rounded",
+    "shadow-sm",
+    "max-w-2xl",
+    "focus-within:ring",
+    "group-[.errors]:border-red-600",
+    "group-[.errors]:focus-within:ring-red-200",
+    "focus-within:ring-primary-300",
+    "focus-within:border-primary-600",
+    "dark:border-base-700",
+    "dark:focus-within:border-primary-600",
+    "dark:focus-within:ring-primary-700",
+    "dark:group-[.errors]:border-red-500",
+    "dark:group-[.errors]:focus-within:ring-red-600/40",
+]
+
 
 class UnfoldAdminTextInputWidget(AdminTextInputWidget):
     def __init__(self, attrs: Optional[dict[str, Any]] = None) -> None:
@@ -342,9 +378,11 @@ class UnfoldAdminEmailInputWidget(AdminEmailInputWidget):
 class FileFieldMixin:
     def get_context(self, name, value, attrs):
         widget = super().get_context(name, value, attrs)
+
         widget["widget"].update(
             {
                 "class": " ".join([*CHECKBOX_CLASSES, *["form-check-input"]]),
+                "file_wrapper_class": " ".join(FILE_CLASSES),
                 "file_input_class": " ".join(
                     [
                         self.attrs.get("class", ""),
@@ -356,6 +394,7 @@ class FileFieldMixin:
                 ),
             }
         )
+
         return widget
 
 
@@ -390,6 +429,13 @@ class UnfoldAdminDateWidget(AdminDateWidget):
         }
         super().__init__(attrs=attrs, format=format)
 
+    class Media:
+        js = [
+            "admin/js/core.js",
+            "admin/js/calendar.js",
+            "admin/js/admin/DateTimeShortcuts.js",
+        ]
+
 
 class UnfoldAdminSingleDateWidget(AdminDateWidget):
     template_name = "unfold/widgets/date.html"
@@ -430,6 +476,13 @@ class UnfoldAdminTimeWidget(AdminTimeWidget):
         }
         super().__init__(attrs=attrs, format=format)
 
+    class Media:
+        js = [
+            "admin/js/core.js",
+            "admin/js/calendar.js",
+            "admin/js/admin/DateTimeShortcuts.js",
+        ]
+
 
 class UnfoldAdminSingleTimeWidget(AdminTimeWidget):
     template_name = "unfold/widgets/time.html"
@@ -502,6 +555,13 @@ class UnfoldAdminSplitDateTimeWidget(AdminSplitDateTime):
         ]
         MultiWidget.__init__(self, widgets, attrs)
 
+    class Media:
+        js = [
+            "admin/js/core.js",
+            "admin/js/calendar.js",
+            "admin/js/admin/DateTimeShortcuts.js",
+        ]
+
 
 class UnfoldAdminSplitDateTimeVerticalWidget(AdminSplitDateTime):
     template_name = "unfold/widgets/split_datetime_vertical.html"
@@ -599,6 +659,31 @@ class UnfoldAdminSelectWidget(Select):
         super().__init__(attrs, choices)
 
 
+class UnfoldAdminSelect2Widget(Select):
+    def __init__(self, attrs=None, choices=()):
+        if attrs is None:
+            attrs = {}
+
+        attrs["data-theme"] = "admin-autocomplete"
+        attrs["class"] = "unfold-admin-autocomplete admin-autocomplete"
+
+        super().__init__(attrs, choices)
+
+    class Media:
+        js = (
+            "admin/js/vendor/jquery/jquery.js",
+            "admin/js/vendor/select2/select2.full.js",
+            "admin/js/jquery.init.js",
+            "unfold/js/select2.init.js",
+        )
+        css = {
+            "screen": (
+                "admin/css/vendor/select2/select2.css",
+                "admin/css/autocomplete.css",
+            ),
+        }
+
+
 class UnfoldAdminSelectMultipleWidget(SelectMultiple):
     def __init__(self, attrs=None, choices=()):
         if attrs is None: