django-unfold 0.60.0__py3-none-any.whl → 0.62.0__py3-none-any.whl

unfold/templates/unfold/helpers/tab_action.html

@@ -1,11 +1,12 @@
 {% load unfold %}
 
-<li class="{% action_item_classes action %}" {% if not link %}x-data="{actionDropdownOpen: false}" x-ref="actionDropdown{{ action.method_name }}"{% endif %}>
+<li class="{% action_item_classes action %}" {% if not link and action.items|length > 0 %}x-data="{actionDropdownOpen: false}" x-ref="actionDropdown{{ action.method_name }}"{% endif %}>
     <a {% if link %}href="{{ link }}"{% endif %}class="cursor-pointer flex grow items-center gap-2 px-3 py-2 text-left whitespace-nowrap" {% if blank %} target="_blank"{% endif %} {% include "unfold/helpers/attrs.html" with attrs=action.attrs %}
        {% if not link %}
            x-on:click="actionDropdownOpen = !actionDropdownOpen"
            x-bind:class="{'{% if action.variant.value == "default" %}text-primary-600 dark:text-primary-500{% endif %}': actionDropdownOpen }"
        {% endif %}>
+
         {% if action.icon %}
             <span class="material-symbols-outlined">
                 {{ action.icon }}
@@ -14,7 +15,7 @@
 
         {{ title }}
 
-        {% if not link %}
+        {% if not link and action.items|length > 0 %}
             <span class="border-l border-base-200 flex items-center select-none self-stretch ml-auto -mr-1 -my-2 pl-2
                          {% if action.variant.value == "primary" %}
                              border-primary-700 dark:border-primary-500
@@ -36,7 +37,7 @@
         {% endif %}
     </a>
 
-    {% if not link %}
+    {% if not link and action.items|length > 0 %}
         <template x-teleport="body">
             <nav x-anchor.bottom-end.offset.4="$refs.actionDropdown{{ action.method_name }}" class="absolute bg-white border border-base-200 flex flex-col -mr-px py-1 right-0 rounded-default 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 %}

unfold/templates/unfold/helpers/tab_actions.html

@@ -1,5 +1,5 @@
 {% if actions_list or actions_detail or actions_items or nav_global %}
-    <ul class="flex flex-col font-medium mb-4 ml-auto mt-2 md:flex-row md:mb-2 md:mt-0 max-md:w-full">
+    <ul class="flex flex-col font-medium mb-4 ml-auto mt-2 md:flex-row md:mb-0 md:mt-0 max-md:w-full">
         {% if actions_items %}
             {{ actions_items }}
         {% endif %}

unfold/templates/unfold/helpers/tab_list.html

@@ -2,7 +2,7 @@
 
 {% if not is_popup %}
     {% if tabs_list or inlines_list or actions_list or actions_detail or actions_items or nav_global %}
-        <div class="border-base-200 flex items-start flex-col mb-4 md:border-b dark:md:border-base-800 md:border-l-0 md:flex-row md:items-center">
+        <div class="border-base-200 flex items-start flex-col mb-4 min-h-13 md:border-b dark:md:border-base-800 md:border-l-0 md:flex-row md:items-center">
             {% include "unfold/helpers/tab_items.html" %}
 
             {% include "unfold/helpers/tab_actions.html" %}

unfold/templates/unfold/widgets/text.html

@@ -1,5 +1,5 @@
 
-<div class="max-w-2xl relative">
+<div class="max-w-2xl relative w-full">
     {% if widget.prefix %}
         <span class="absolute left-3 top-0 bottom-0 flex items-center justify-center">
             {{ widget.prefix }}

unfold/templates/unfold_crispy/field.html

@@ -3,21 +3,23 @@
 {% if field.is_hidden %}
     {{ field }}
 {% else %}
-    <{% if tag %}{{ tag }}{% else %}div{% endif %} id="div_{{ field.auto_id }}" class="group {% if tag == "td" %}align-top border-t border-base-200 font-normal gap-4 min-w-0 overflow-hidden px-3 py-3 text-left dark:border-base-800 dark:before:text-font-important-dark {% if form_show_labels and forloop.parentloop.first %}border-t-0{% endif %}{% endif %} {% if field.errors %}errors{% endif %} {% if field_class %} {{ field_class }}{% endif %} {% if field|is_checkbox and tag == "td" %}flex flex-row gap-2 items-center{% else %}{% if 'form-horizontal' in form_class %} row{% endif %}{% endif %}{% if wrapper_class %} {{ wrapper_class }}{% endif %}{% if field.css_classes %} {{ field.css_classes }}{% endif %}">
+    <{% if tag %}{{ tag }}{% else %}div{% endif %} id="div_{{ field.auto_id }}" class="group {% if tag == "td" %}align-top border-t border-base-200 font-normal gap-4 min-w-0 overflow-hidden px-3 py-3 text-left dark:border-base-800 dark:before:text-font-important-dark {% if form_show_labels and forloop.parentloop.first %}border-t-0{% endif %}{% endif %} {% if field.errors %}errors{% endif %} {% if field_class %} {{ field_class }}{% endif %} {% if field|is_checkbox and tag == "td" %}flex flex-row gap-2 items-center{% else %} {% if 'form-horizontal' in form_class %} border-b border-base-200 border-dashed flex flex-col -mx-3 px-3 py-2.5 lg:flex-row last:-mb-3 dark:border-base-800 last:border-b-0 {% endif %}{% endif %}{% if wrapper_class %} {{ wrapper_class }}{% endif %}{% if field.css_classes %} {{ field.css_classes }}{% endif %}">
     {% if field.label and not field|is_checkbox and form_show_labels %}
-        <label {% if field.id_for_label %}for="{{ field.id_for_label }}"{% endif %} class="block font-semibold mb-2 text-font-important-light text-sm dark:text-font-important-dark {% if label_class %} {{ label_class }}{% endif %}">
+        <label {% if field.id_for_label %}for="{{ field.id_for_label }}"{% endif %} class="block font-semibold text-font-important-light dark:text-font-important-dark {% if 'form-horizontal' in form_class %}mb-2 lg:mb-0 lg:min-w-56 {% if not field|is_checkbox and not field|is_radioselect and not field|is_checkboxselectmultiple %}lg:mt-2{% endif %} lg:w-56{% else %}mb-2{% endif %} {% if label_class %} {{ label_class }}{% endif %}">
             {{ field.label }}{% if field.field.required %} <span class="asteriskField">*</span>{% endif %}
         </label>
     {% endif %}
 
-    {% if field|is_checkboxselectmultiple or field|is_radioselect %}
-        {% include 'unfold_crispy/layout/radio_checkbox_select.html' %}
-    {% elif field|is_checkbox  %}
-        {% include 'unfold_crispy/layout/checkbox.html' %}
-    {% else %}
-        {% crispy_field field %}
+    <div class="grow">
+        {% if field|is_checkboxselectmultiple or field|is_radioselect %}
+            {% include 'unfold_crispy/layout/radio_checkbox_select.html' %}
+        {% elif field|is_checkbox  %}
+            {% include 'unfold_crispy/layout/checkbox.html' %}
+        {% else %}
+            {% crispy_field field %}
 
-        {% include 'unfold_crispy/layout/help_text_and_errors.html' %}
-    {% endif %}
+            {% include 'unfold_crispy/layout/help_text_and_errors.html' %}
+        {% endif %}
+    </div>
     </{% if tag %}{{ tag }}{% else %}div{% endif %}>
 {% endif %}

unfold/templates/unfold_crispy/layout/checkbox.html

@@ -1,11 +1,27 @@
 {% load crispy_forms_field unfold %}
 
 {% if form_show_labels %}
-    <label for="{{ field.id_for_label }}" class="flex flex-row gap-3 items-center {% if tag == "td" %}mt-9{% endif %}">
-        {% crispy_field field 'class' form_classes.switch %} <span>{{ field.label }}{% if field.field.required %} <span class="asteriskField">*</span>{% endif %}</span>
-    </label>
+    {% if 'form-horizontal' in form_class %}
+        <div class="flex flex-col min-h-[38px] lg:flex-row lg:gap-3 lg:items-center">
+            <div class="flex flex-row max-lg:flex-row-reverse max-lg:justify-end gap-3 lg:items-center lg:gap-0 lg:justify-start">
+                <label for="{{ field.id_for_label }}" class="flex flex-row font-semibold gap-3 items-center text-base-900 lg:min-w-56 lg:w-56 dark:text-base-100 {% if tag == "td" %}mt-9{% endif %}">
+                    <span>{{ field.label }}{% if field.field.required %} <span class="asteriskField">*</span>{% endif %}</span>
+                </label>
 
-    {% include 'unfold_crispy/layout/help_text_and_errors.html' %}
+                {% crispy_field field 'class' form_classes.switch %}
+            </div>
+
+            <div class="">
+                {% include 'unfold_crispy/layout/help_text_and_errors.html' %}
+            </div>
+        </div>
+    {% else %}
+        <label for="{{ field.id_for_label }}" class="flex flex-row font-semibold gap-3 items-center text-base-900 dark:text-base-100 {% if tag == "td" %}mt-9{% endif %}">
+            {% crispy_field field 'class' form_classes.switch %} <span>{{ field.label }}{% if field.field.required %} <span class="asteriskField">*</span>{% endif %}</span>
+        </label>
+
+        {% include 'unfold_crispy/layout/help_text_and_errors.html' %}
+    {% endif %}
 {% else %}
     {% with field=field|add_css_class:form_classes.switch %}
         {% if tag == "td" %}

unfold/templates/unfold_crispy/layout/fieldset.html

@@ -1,11 +1,11 @@
-<fieldset {% if fieldset.css_id %}id="{{ fieldset.css_id }}"{% endif %} class="fieldset group flex flex-col gap-5 grow rounded-default border-base-200 shadow-xs aligned border p-3 relative dark:border-base-800 {% if fieldset.css_class %} {{ fieldset.css_class }}{% endif %}" {{ fieldset.flat_attrs }}>
+<fieldset {% if fieldset.css_id %}id="{{ fieldset.css_id }}"{% endif %} class="fieldset group flex flex-col grow rounded-default border-base-200 shadow-xs 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-[15px] text-font-important-light dark:text-font-important-dark dark:border-base-800">
+        <legend class="border-b border-base-200 font-semibold float-left {% if 'form-horizontal' not in form_class %}mb-5{% endif %} -mx-3 pb-3 px-3 text-[15px] text-font-important-light dark:text-font-important-dark dark:border-base-800">
             {{ legend|safe }}
         </legend>
     {% endif %}
 
-    <div class="flex flex-col gap-5">
+    <div class="flex flex-col {% if 'form-horizontal' not in form_class %} gap-5{% endif %}">
         {{ fields|safe }}
     </div>
 </fieldset>

unfold/templatetags/unfold.py

@@ -340,7 +340,7 @@ def preserve_changelist_filters(context: Context) -> dict[str, dict[str, str]]:
 @register.simple_tag(takes_context=True)
 def element_classes(context: Context, key: str) -> str:
     if key in context.get("element_classes", {}):
-        if isinstance(context["element_classes"][key], list | tuple):
+        if isinstance(context["element_classes"][key], (list, tuple)):
             return " ".join(context["element_classes"][key])
 
         return context["element_classes"][key]
@@ -359,7 +359,6 @@ def fieldset_rows_classes(context: Context) -> str:
             [
                 "border",
                 "border-base-200",
-                "mb-8",
                 "rounded-default",
                 "shadow-xs",
                 "dark:border-base-800",
@@ -385,8 +384,8 @@ def fieldset_row_classes(context: Context) -> str:
         if (
             formset
             and hasattr(field.field, "name")
-            and field.field.name == formset.opts.ordering_field
-            and formset.opts.hide_ordering_field
+            and field.field.name == getattr(formset.opts, "ordering_field", None)
+            and getattr(formset.opts, "hide_ordering_field", False)
         ):
             classes.append("hidden")
 

unfold/templatetags/unfold_list.py

@@ -38,7 +38,10 @@ from unfold.widgets import UnfoldBooleanWidget
 
 register = Library()
 
-LINK_CLASSES = []
+LINK_CLASSES = [
+    "text-font-important-light",
+    "dark:text-font-important-dark",
+]
 
 ROW_CLASSES = [
     "align-middle",

unfold/widgets.py

@@ -290,7 +290,8 @@ FILE_CLASSES = [
 
 class UnfoldPrefixSuffixMixin:
     def get_context(self, name, value, attrs):
-        widget = {}
+        context = super().get_context(name, value, attrs)
+        widget = context["widget"]
 
         if "prefix" in self.attrs:
             widget["prefix"] = self.attrs["prefix"]