django-unfold 0.29.1__py3-none-any.whl → 0.31.0__py3-none-any.whl

unfold/templates/unfold/helpers/tab_list.html

@@ -1,17 +1,39 @@
+{% load i18n %}
+
 {% if not is_popup %}
-    {% if tab_list or actions_list or actions_detail or actions_items or nav_global %}
-        <div class="flex items-start flex-col mb-4 text-gray-500 text-sm w-full md:border-b dark:md:border-gray-800 md:border-l-0 md:flex-row md:items-center md:justify-end dark:text-gray-400">
-            {% if tab_list %}
+    {% if tabs_list or inlines_list or actions_list or actions_detail or actions_items or nav_global %}
+        <div class="flex items-start flex-col mb-4 text-gray-500 text-sm w-full md:border-b dark:md:border-gray-800 md:border-l-0 md:flex-row md:items-center md:justify-end dark:text-gray-300">
+            {% if inlines_list or tabs_list %}
                 <ul class="border rounded-md flex flex-col w-full md:flex-row md:border-b-0 md:border-t-0 md:border-l-0 md:border-r-0 dark:border-gray-800">
-                    {% for item in tab_list %}
+                    {% for item in tabs_list %}
                         {% if item.has_permission %}
                             <li class="border-b last:border-b-0 md:border-b-0 md:mr-8 dark:border-gray-800">
-                                <a href="{{ item.link }}" class="block px-3 py-2 {% if item.link|stringformat:"s" in request.path %} border-b md:border-primary-500 dark:md:border-primary-600 font-medium -mb-px text-primary-600 hover:text-primary-600 dark:text-primary-500{% else %} hover:text-gray-700 dark:hover:text-gray-200{% endif %} md:py-4 md:px-0 dark:border-gray-800">
+                                <a href="{% if item.link_callback %}{{ item.link_callback }}{% else %}{{ item.link }}{% endif %}" class="block px-3 py-2 {% if item.active %} border-b md:border-primary-500 dark:md:border-primary-600 font-medium -mb-px text-primary-600 hover:text-primary-600 dark:text-primary-500{% else %} hover:text-gray-700 dark:hover:text-gray-200{% endif %} md:py-4 md:px-0 dark:border-gray-800">
                                     {{ item.title }}
                                 </a>
                             </li>
                         {% endif %}
                     {% endfor %}
+
+                    {% if inlines_list %}
+                        <li class="border-b last:border-b-0 md:border-b-0 md:mr-8 dark:border-gray-800">
+                            <a class="block cursor-pointer px-3 py-2 hover:text-gray-700 dark:hover:text-gray-200  md:py-4 md:px-0 dark:border-gray-800" x-on:click="activeTab = 'general'" x-bind:class="{'border-b md:border-primary-500 dark:md:border-primary-600 font-medium -mb-px text-primary-600 hover:text-primary-600 dark:text-primary-500': activeTab == 'general'}">
+                                {% trans "General" %}
+                            </a>
+                        </li>
+
+                        {% for inline in inlines_list %}
+                            <li class="border-b last:border-b-0 md:border-b-0 md:mr-8 dark:border-gray-800">
+                                <a class="block cursor-pointer px-3 py-2 hover:text-gray-700 dark:hover:text-gray-200  md:py-4 md:px-0 dark:border-gray-800"  x-on:click="activeTab = '{{ inline.opts.verbose_name|slugify }}'" x-bind:class="{'border-b md:border-primary-500 dark:md:border-primary-600 font-medium -mb-px text-primary-600 hover:text-primary-600 dark:text-primary-500': activeTab == '{{ inline.opts.verbose_name|slugify }}'}">
+                                    {% if inline.formset.max_num == 1 %}
+                                        {{ inline.opts.verbose_name|capfirst }}
+                                    {% else %}
+                                        {{ inline.opts.verbose_name_plural|capfirst }}
+                                    {% endif %}
+                                </a>
+                            </li>
+                        {% endfor %}
+                    {% endif %}
                 </ul>
             {% endif %}
 

unfold/templates/unfold/helpers/theme_switch.html

@@ -1,13 +1,13 @@
 {% load i18n %}
 
 <div class="relative" x-data="{ openTheme: false }">
-    <a class="block cursor-pointer leading-none hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200" x-on:click="openTheme = !openTheme">
+    <a class="block cursor-pointer leading-none hover:text-gray-700 dark:text-gray-300 dark:hover:text-gray-200" x-on:click="openTheme = !openTheme">
         <span class="material-symbols-outlined">
             <span x-text="adminTheme == 'dark' && 'dark_mode' || adminTheme == 'light' && 'light_mode' || 'computer'"></span>
         </span>
     </a>
 
-    <nav class="absolute bg-white border flex flex-col leading-none overflow-hidden py-1 -right-2 rounded shadow-lg text-sm text-gray-500 top-7 w-40 z-50 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400" x-cloak x-show="openTheme" @click.outside="openTheme = false">
+    <nav class="absolute bg-white border flex flex-col leading-none overflow-hidden py-1 -right-2 rounded shadow-lg text-sm text-gray-500 top-7 w-40 z-50 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-300" x-cloak x-show="openTheme" @click.outside="openTheme = false">
         <a class="cursor-pointer flex flex-row leading-none mx-1 px-3 py-1.5 rounded hover:bg-gray-100 hover:text-gray-700 dark:hover:bg-gray-700 dark:hover:text-gray-200"
            x-on:click="adminTheme = 'dark'"
            x-bind:class="adminTheme == 'dark' && 'text-primary-600 dark:text-primary-500 dark:hover:!text-primary-500 hover:!text-primary-600'">

unfold/templates/unfold/layouts/skeleton.html

@@ -24,9 +24,14 @@
         <link href="{{ style }}" rel="stylesheet">
     {% endfor %}
 
+    {% for favicon in site_favicons %}
+        <link {% if favicon.rel %}rel="{{ favicon.rel }}"{% endif %} {% if favicon.href %}href="{{ favicon.href }}"{% endif %} {% if favicon.type %}type="{{ favicon.type }}"{% endif %} {% if favicon.sizes %}sizes="{{ favicon.sizes }}"{% endif %}>
+    {% 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.anchor.js' %}" defer></script>
     <script src="{% static 'unfold/js/alpine.persist.js' %}" defer></script>
     <script src="{% static 'unfold/js/alpine.js' %}" defer></script>
     <script src="{% static 'unfold/js/htmx.js' %}"></script>
@@ -63,7 +68,7 @@
     {% endif %}
 </head>
 
-<body class="antialiased bg-white font-sans text-gray-500 dark:bg-gray-900 dark:text-gray-400 {% if is_popup %}popup {% endif %}{% block bodyclass %}{% endblock %}" data-admin-utc-offset="{% now "Z" %}" x-data="{ sidebarMobileOpen: false, sidebarDesktopOpen: {% if request.session.toggle_sidebar == False %}false{% else %}true{% endif %} }">
+<body class="antialiased bg-white font-sans text-gray-500 dark:bg-gray-900 dark:text-gray-300 {% if is_popup %}popup {% endif %}{% block bodyclass %}{% endblock %}" data-admin-utc-offset="{% now "Z" %}" x-data="{ activeTab: 'general', sidebarMobileOpen: false, sidebarDesktopOpen: {% if request.session.toggle_sidebar == False %}false{% else %}true{% endif %} }">
     {% 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>

unfold/templates/unfold/widgets/clearable_file_input.html

@@ -10,24 +10,32 @@
 
 <div class="border flex items-center overflow-hidden rounded-md shadow-sm text-sm max-w-2xl dark:border-gray-700">
     {% if widget.is_initial and not widget.required %}
-        <div class="bg-gray-50 border-r flex flex-none items-center self-stretch px-3 dark:bg-white/[.02] dark:border-gray-700 dark:text-gray-400">
+        <div class="bg-gray-50 border-r flex flex-none items-center self-stretch px-3 dark:bg-white/[.02] dark:border-gray-700 dark:text-gray-300">
             <label for="{{ widget.checkbox_id }}" class="flex items-center">
                 <input type="checkbox"{% if widget.class %} class="{{ widget.class }}"{% endif %} name="{{ widget.checkbox_name }}" id="{{ widget.checkbox_id }}" />
 
-                <span class="ml-2 text-gray-500 dark:text-gray-400">
+                <span class="ml-2 text-gray-500 dark:text-gray-300">
                     {{ widget.clear_checkbox_label }}
                 </span>
             </label>
         </div>
     {% endif %}
 
-    <input type="text" value="{% if widget.value %}{{ widget.value.url }}{% else %}{% trans 'Choose file to upload' %}{% endif %}" disabled class="bg-white flex-grow font-medium px-3 py-2 text-ellipsis dark:bg-gray-900 {% if widget.value %}text-gray-500 dark:text-gray-400{% else %}text-gray-300 dark:text-gray-400{% endif %}">
+    <input type="text" value="{% if widget.value %}{{ widget.value.url }}{% else %}{% trans 'Choose file to upload' %}{% endif %}" disabled class="bg-white flex-grow font-medium px-3 py-2 text-ellipsis dark:bg-gray-900 {% if widget.value %}text-gray-500 dark:text-gray-300{% else %}text-gray-300 dark:text-gray-300{% endif %}">
 
     <div class="flex flex-none items-center leading-none self-stretch">
-        <input id="{{ widget.name }}" type="{{ widget.type }}" name="{{ widget.name }}" class="hidden" {% include "django/forms/widgets/attrs.html" %} />
+        <div class="hidden">
+            <input type="{{ widget.type }}" name="{{ widget.name }}" {% include "django/forms/widgets/attrs.html" %} />
+        </div>
+
+        {% if widget.is_initial %}
+            <a href="{{ widget.value.url }}" class="border-r cursor-pointer text-gray-400 px-3 hover:text-gray-700 dark:border-gray-700 dark:text-gray-500 dark:hover:text-gray-200" target="_blank">
+                <span class="material-symbols-outlined">download</span>
+            </a>
+        {% endif %}
 
-        <label for="{{ widget.name }}" class="cursor-pointer text-gray-400 px-3 hover:text-gray-700 dark:text-gray-500 dark:hover:text-gray-200">
-            <span class="material-symbols-outlined">file_upload</span>
+        <label for="{{ widget.attrs.id }}" class="cursor-pointer text-gray-400 px-3 hover:text-gray-700 dark:text-gray-500 dark:hover:text-gray-200">
+            <span class="material-symbols-outlined">upload</span>
         </label>
     </div>
 </div>

unfold/templates/unfold/widgets/clearable_file_input_small.html

@@ -7,19 +7,19 @@
                 <label for="{{ widget.checkbox_id }}" class="flex items-center">
                     <input type="checkbox"{% if widget.class %} class="{{ widget.class }}"{% endif %} name="{{ widget.checkbox_name }}" id="{{ widget.checkbox_id }}" />
 
-                    <span class="ml-2 text-gray-500 dark:text-gray-400">
+                    <span class="ml-2 text-gray-500 dark:text-gray-300">
                         {{ widget.clear_checkbox_label }}
                     </span>
                 </label>
             </div>
         {% endif %}
 
-        <input type="text" value="{% if widget.value %}{{ widget.value.url }}{% else %}{% trans 'Choose file to upload' %}{% endif %}" disabled class="bg-white flex-grow font-medium px-3 py-2 text-ellipsis dark:bg-gray-900 {% if widget.value %}text-gray-500 dark:text-gray-400{% else %}text-gray-300 dark:text-gray-400{% endif %}">
+        <input type="text" value="{% if widget.value %}{{ widget.value.url }}{% else %}{% trans 'Choose file to upload' %}{% endif %}" disabled class="bg-white flex-grow font-medium px-3 py-2 text-ellipsis dark:bg-gray-900 {% if widget.value %}text-gray-500 dark:text-gray-300{% else %}text-gray-300 dark:text-gray-300{% endif %}">
 
         <div class="flex flex-none items-center leading-none self-stretch">
-            <input id="{{ widget.name }}" type="{{ widget.type }}" name="{{ widget.name }}" class="{{ widget.file_input_class }}" {% include "django/forms/widgets/attrs.html" %} />
+            <input type="{{ widget.type }}" name="{{ widget.name }}" class="{{ widget.file_input_class }}" {% include "django/forms/widgets/attrs.html" %} />
 
-            <label for="{{ widget.name }}" class="cursor-pointer text-gray-400 px-3 hover:text-gray-700 dark:text-gray-500 dark:hover:text-gray-200">
+            <label for="{{ widget.attrs.id }}" class="cursor-pointer text-gray-400 px-3 hover:text-gray-700 dark:text-gray-500 dark:hover:text-gray-200">
                 <span class="material-symbols-outlined">file_upload</span>
             </label>
         </div>

unfold/templates/unfold/widgets/split_datetime.html

@@ -1,6 +1,6 @@
 <div class="datetime flex flex-col gap-2 max-w-2xl lg:flex-row lg:group-[.field-row]:flex-row lg:group-[.field-row]:items-center lg:group-[.field-tabular]:flex-row lg:group-[.field-tabular]:items-center">
     <div class="basis-1/2 flex flex-col lg:group-[.field-row]:flex-row group-[.field-row]:gap-2 lg:group-[.field-tabular]:flex-row group-[.field-tabular]:gap-2">
-        <div class="font-medium mb-2 text-gray-500 text-sm dark:text-gray-400 group-[.field-row]:mb-0 group-[.field-row]:flex group-[.field-row]:items-center group-[.field-tabular]:mb-0 group-[.field-tabular]:flex group-[.field-tabular]:items-center">
+        <div class="font-medium mb-2 text-gray-500 text-sm dark:text-gray-300 group-[.field-row]:mb-0 group-[.field-row]:flex group-[.field-row]:items-center group-[.field-tabular]:mb-0 group-[.field-tabular]:flex group-[.field-tabular]:items-center">
             {{ date_label }}
         </div>
 
@@ -12,7 +12,7 @@
     </div>
 
     <div class="basis-1/2 flex flex-col lg:ml-auto md:mt-0 lg:group-[.field-row]:flex-row group-[.field-row]:gap-2 lg:group-[.field-tabular]:flex-row group-[.field-tabular]:gap-2">
-        <div class="font-medium mb-2 text-gray-500 text-sm dark:text-gray-400 group-[.field-row]:mb-0 group-[.field-row]:flex group-[.field-row]:items-center group-[.field-tabular]:mb-0 group-[.field-tabular]:flex group-[.field-tabular]:items-center">
+        <div class="font-medium mb-2 text-gray-500 text-sm dark:text-gray-300 group-[.field-row]:mb-0 group-[.field-row]:flex group-[.field-row]:items-center group-[.field-tabular]:mb-0 group-[.field-tabular]:flex group-[.field-tabular]:items-center">
             {{ time_label }}
         </div>
 

unfold/templatetags/unfold.py

@@ -12,28 +12,49 @@ register = Library()
 
 
 @register.simple_tag(name="tab_list", takes_context=True)
-def tab_list(context, opts) -> str:
-    tabs = None
+def tab_list(context, page, opts) -> str:
+    tabs_list = []
+    inlines_list = []
+
+    data = {
+        "nav_global": context.get("nav_global"),
+        "actions_detail": context.get("actions_detail"),
+        "actions_list": context.get("actions_list"),
+        "actions_items": context.get("actions_items"),
+        "is_popup": context.get("is_popup"),
+    }
 
     for tab in context.get("tab_list", []):
         if str(opts) in tab["models"]:
-            tabs = tab["items"]
+            tabs_list = tab["items"]
             break
 
+    if page == "changelist":
+        data["tabs_list"] = tabs_list
+
+    for inline in context.get("inline_admin_formsets", []):
+        if hasattr(inline.opts, "tab"):
+            inlines_list.append(inline)
+
+    if page == "changeform" and len(inlines_list) > 0:
+        data["inlines_list"] = inlines_list
+
     return render_to_string(
         "unfold/helpers/tab_list.html",
-        request=context.request,
-        context={
-            "tab_list": tabs,
-            "nav_global": context.get("nav_global"),
-            "actions_detail": context.get("actions_detail"),
-            "actions_list": context.get("actions_list"),
-            "actions_items": context.get("actions_items"),
-            "is_popup": context.get("is_popup"),
-        },
+        request=context["request"],
+        context=data,
     )
 
 
+@register.simple_tag(name="has_nav_item_active")
+def has_nav_item_active(items: list) -> bool:
+    for item in items:
+        if "active" in item and item["active"]:
+            return True
+
+    return False
+
+
 @register.filter
 def class_name(value: Any) -> str:
     return value.__class__.__name__

unfold/templatetags/unfold_list.py

@@ -63,8 +63,8 @@ ROW_CLASSES = [
     "before:mr-auto",
     "before:text-gray-500",
     "first:border-t-0",
-    "dark:before:text-gray-400",
-    "dark:text-gray-400",
+    "dark:before:text-gray-300",
+    "dark:text-gray-300",
     "lg:before:hidden",
     "lg:first:border-t",
     "lg:py-3",
@@ -90,7 +90,7 @@ CHECKBOX_CLASSES = [
     "lg:border-t",
     "lg:border-gray-200",
     "lg:table-cell",
-    "dark:before:text-gray-400",
+    "dark:before:text-gray-300",
     "dark:lg:border-gray-800",
 ]
 
@@ -254,7 +254,7 @@ def items_for_result(cl: ChangeList, result: HttpRequest, form) -> SafeText:
                     f, (models.DateField, models.TimeField, models.ForeignKey)
                 ):
                     row_classes.append("nowrap")
-        row_class = mark_safe(f' class="{" ".join(row_classes)}"')
+
         # If list_display_links not defined, add the link tag to the first field
 
         if link_in_col(first, field_name, cl):
@@ -287,7 +287,7 @@ def items_for_result(cl: ChangeList, result: HttpRequest, form) -> SafeText:
                     else "",
                     result_repr,
                 )
-
+            row_class = mark_safe(f' class="{" ".join(row_classes)}"')
             yield format_html(
                 '<{}{} data-label="{}">{}</{}>',
                 table_tag,
@@ -309,7 +309,17 @@ def items_for_result(cl: ChangeList, result: HttpRequest, form) -> SafeText:
                 )
             ):
                 bf = form[field_name]
-                result_repr = mark_safe(str(bf.errors) + str(bf))
+                result_repr = mark_safe(
+                    str(bf)
+                    + render_to_string(
+                        "unfold/helpers/form_errors.html", {"errors": bf.errors}
+                    )
+                )
+
+                if bf.errors:
+                    row_classes += ["group", "errors"]
+
+            row_class = mark_safe(f' class="{" ".join(row_classes)}"')
 
             if field_index != 0:
                 yield format_html(

unfold/widgets.py

@@ -23,6 +23,7 @@ from django.forms import (
     MultiWidget,
     NullBooleanSelect,
     NumberInput,
+    PasswordInput,
     Select,
 )
 from django.utils.translation import gettext_lazy as _
@@ -62,7 +63,7 @@ BASE_CLASSES = [
     "group-[.errors]:focus:ring-red-200",
     "dark:bg-gray-900",
     "dark:border-gray-700",
-    "dark:text-gray-400",
+    "dark:text-gray-300",
     "dark:focus:border-primary-600",
     "dark:focus:ring-primary-700",
     "dark:focus:ring-opacity-50",
@@ -90,12 +91,10 @@ TEXTAREA_CLASSES = [
     "max-w-4xl",
     "appearance-none",
     "expandable",
-    "overflow-hidden",
     "transition",
     "transition-height",
     "duration-75",
     "ease-in-out",
-    "resize-none",
 ]
 
 TEXTAREA_EXPANDABLE_CLASSES = [
@@ -116,6 +115,7 @@ SELECT_CLASSES = [
 
 PROSE_CLASSES = [
     "font-normal",
+    "whitespace-normal",
     "prose-sm",
     "prose-blockquote:border-l-4",
     "prose-blockquote:not-italic",
@@ -131,7 +131,7 @@ PROSE_CLASSES = [
     "prose-strong:text-gray-700",
     "dark:prose-pre:bg-gray-800",
     "dark:prose-blockquote:border-gray-700",
-    "dark:prose-blockquote:text-gray-400",
+    "dark:prose-blockquote:text-gray-300",
     "dark:prose-headings:text-gray-200",
     "dark:prose-strong:text-gray-200",
 ]
@@ -567,3 +567,10 @@ class UnfoldForeignKeyRawIdWidget(ForeignKeyRawIdWidget):
             **(attrs or {}),
         }
         super().__init__(rel, admin_site, attrs, using)
+
+
+class UnfoldAdminPasswordInput(PasswordInput):
+    def __init__(self, attrs=None, render_value=False):
+        super().__init__(
+            {"class": " ".join(INPUT_CLASSES), **(attrs or {})}, render_value
+        )