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

unfold/styles.css

@@ -1,6 +1,14 @@
 @import 'tailwindcss';
 @plugin '@tailwindcss/typography';
-@custom-variant dark (&:where(.dark, .dark *));
+
+@custom-variant dark {
+  @media not print {
+      &:where(.dark, .dark *) {
+          @slot
+      }
+  }
+}
+
 @source inline("h-3 w-3 h-[64px] w-[65px]! left-[65px] dark:hover:bg-white/[.06] translate-x-1/4 -translate-y-1/4");
 @source inline("{-,}{top,bottom,left,right}-{0..6}");
 @source inline("rounded rounded-{t,r,b,l} rounded-{t,r,b,l}-default");
@@ -145,18 +153,6 @@ select:after {
 /*******************************************************
  Table
  *******************************************************/
-table select {
-  @apply appearance-none bg-no-repeat border border-base-200 block cursor-pointer font-medium px-3 py-2 pr-5 rounded-default shadow-xs text-base-500;
-
-  background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="rgb(156, 163, 175)"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M7 10l5 5 5-5H7z"/></svg>');
-  background-size: 1.125rem 1.125rem;
-  background-position: right 0.5rem center;
-}
-
-
-table select:focus {
-  @apply border-primary-600;
-}
 
 table tr.selected td,
 table tr.selected th {
@@ -201,7 +197,7 @@ table tr.selected th {
 }
 
 .timezonewarning {
-  @apply absolute block items-center right-20 top-2.5 text-base-500 truncate;
+  @apply absolute block items-center right-11 top-2 text-base-500 truncate;
   font-size: 0;
 }
 
@@ -222,7 +218,7 @@ table tr.selected th {
  Selector
  *******************************************************/
 .selector {
-  @apply flex flex-col grow items-center md:flex-row;
+  @apply flex flex-col grow items-center max-w-5xl md:flex-row;
 }
 
 .selector .selector-available-title label,
@@ -323,7 +319,7 @@ table tr.selected th {
 }
 
 [data-inline-type="stacked"] .add-row {
-  @apply border-t border-base-200 overflow-hidden dark:border-base-800;
+  @apply overflow-hidden;
 }
 
 .add-row td {

unfold/templates/admin/app_list.html

@@ -44,5 +44,8 @@
         {% endfor %}
     </div>
 {% else %}
-    <p>{% translate 'You don’t have permission to view or edit anything.' %}</p>
+    <p>
+        {% trans "You don’t have permission to view or edit anything." as error_message %}
+        {% include "unfold/helpers/messages/error.html" with error=error_message %}
+    </p>
 {% endif %}

unfold/templates/admin/base.html

@@ -38,7 +38,7 @@
                 </div>
             {% endblock messages %}
 
-            <div class="px-4 pb-8 grow">
+            <div class="px-4 pb-4 grow">
                 <div id="content" class="{% if not cl.model_admin.list_fullwidth %}container{% endif %} mx-auto {% block coltype %}colM{% endblock %}">
                     {% if cl %}
                         {% tab_list "changelist" cl.opts %}

unfold/templates/admin/change_form.html

@@ -93,8 +93,9 @@
                                 {% include 'admin/includes/fieldset.html' %}
                             {% endif %}
                         {% endfor %}
+
+                        {% include "unfold/helpers/fieldsets_tabs.html" %}
                     {% endwith %}
-                    {% include "unfold/helpers/fieldsets_tabs.html" %}
                 {% endblock %}
 
                 {% block after_field_sets %}{% endblock %}

unfold/templates/admin/edit_inline/stacked.html

@@ -17,15 +17,15 @@
         {{ inline_admin_formset.formset.management_form }}
         {% include "unfold/helpers/messages/error.html" with errors=inline_admin_formset.formset.non_form_errors %}
 
-        <div class="border border-base-200 mb-6 overflow-hidden rounded-default shadow-xs w-full dark:border-base-800 *:border-t *:first:border-t-0 *:border-base-200 dark:*:border-base-800"
+        <div class="border border-base-200 mb-6 overflow-hidden rounded-default shadow-xs w-full dark:border-base-800"
              {% if inline_admin_formset.opts.ordering_field %}
                  data-ordering-field="{{ inline_admin_formset.opts.ordering_field }}" x-on:end="sortRecords" x-sort.ghost
              {% endif %}>
 
             {% for inline_admin_form in inline_admin_formset %}
-                <div x-sort:item 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 %}">
+                <div x-sort:item 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 %}" {% if inline_admin_formset.opts.collapsible and inline_admin_form.original %}x-data="{ open: {% if inline_admin_form.errors %}true{% else %}false{% endif %} }"{% endif %}>
                     {% if not inline_admin_formset.opts.hide_title or inline_admin_formset.formset.can_delete and inline_admin_formset.has_delete_permission %}
-                        <h3 class="bg-base-50 border-b border-base-200 flex font-medium items-center gap-2 px-3 py-2 text-sm dark:bg-white/[.02] dark:border-base-800">
+                        <h3 class="border-b border-base-200 flex font-medium items-center gap-2 px-3 py-2 text-sm dark:border-base-800 {% if inline_admin_formset.opts.collapsible and inline_admin_form.original %}cursor-pointer{% endif %}" {% if inline_admin_formset.opts.collapsible and inline_admin_form.original %}x-on:click="open = !open"{% endif %}>
                             {% if inline_admin_formset.opts.ordering_field %}
                                 {% if inline_admin_form.original %}
                                     <span class="material-symbols-outlined cursor-pointer" x-sort:handle>drag_indicator</span>
@@ -82,11 +82,13 @@
 
                     {% include "unfold/helpers/messages/error.html" with errors=inline_admin_form.form.non_field_errors %}
 
-                    {% for fieldset in inline_admin_form %}
-                        <div class="{% if inline_admin_formset.opts.hide_title %}{% if not inline_admin_formset.formset.can_delete or not inline_admin_formset.has_delete_permission  %}pt-3{% endif %}{% endif %}">
-                            {% include 'admin/includes/fieldset.html' with stacked=1 %}
-                        </div>
-                    {% endfor %}
+                    <div class="border-b border-base-200 dark:border-base-800" {% if inline_admin_formset.opts.collapsible and inline_admin_form.original %}x-show="open"{% endif %}>
+                        {% for fieldset in inline_admin_form %}
+                            <div class="{% if inline_admin_formset.opts.hide_title %}{% if not inline_admin_formset.formset.can_delete or not inline_admin_formset.has_delete_permission  %}pt-3{% endif %}{% endif %}">
+                                {% include 'admin/includes/fieldset.html' with stacked=1 %}
+                            </div>
+                        {% endfor %}
+                    </div>
 
                     {% if inline_admin_form.needs_explicit_pk_field %}
                         {{ inline_admin_form.pk_field.field }}
@@ -99,4 +101,6 @@
 
         {% if inline_admin_formset.is_collapsible %}</details>{% endif %}
     </fieldset>
+
+    {% include "unfold/helpers/pagination_inline.html" %}
 </div>

unfold/templates/admin/edit_inline/tabular.html

@@ -36,5 +36,7 @@
 
             {% if inline_admin_formset.is_collapsible %}</details>{% endif %}
         </fieldset>
+
+        {% include "unfold/helpers/pagination_inline.html" %}
     </div>
 </div>

unfold/templates/admin/includes/fieldset.html

@@ -2,9 +2,15 @@
 
 <fieldset class="module{% if fieldset.classes %} {{ fieldset.classes }}{% endif %}" {% if stacked != 1 %}x-show="activeTab == 'general'"{% endif %}>
     {% if fieldset.name and "tab" not in fieldset.classes %}
-        <h2 class="bg-base-100 font-semibold mb-6 px-4 py-3 rounded-default text-font-important-light text-sm 2xl:-mx-4 dark:bg-white/[.02] dark:text-font-important-dark">
-            {{ fieldset.name }}
-        </h2>
+        {% if stacked == 1 %}
+            <h2 class="border-b border-base-200 border-t border-dashed font-semibold text-font-important-light px-3 py-4.5 dark:text-font-important-dark dark:border-base-800">
+                {{ fieldset.name }}
+            </h2>
+        {% else %}
+            <h2 class="bg-base-100 font-semibold mb-6 px-4 py-3 rounded-default text-font-important-light text-sm 2xl:-mx-4 dark:bg-white/[.02] dark:text-font-important-dark">
+                {{ fieldset.name }}
+            </h2>
+        {% endif %}
     {% endif %}
 
     {% if fieldset.description %}

unfold/templates/admin/login.html

@@ -1,105 +1,62 @@
-{% extends 'unfold/layouts/skeleton.html' %}
+{% extends 'unfold/layouts/unauthenticated.html' %}
 
-{% load i18n static %}
+{% load i18n static unfold %}
 
 {% block extrastyle %}
     {{ block.super }}
     {{ form.media }}
 {% endblock %}
 
-{% block bodyclass %}{{ block.super }}bg-base-50 login dark:bg-base-900{% endblock %}
+{% block title %}
+    {{ title }} | {{ site_title }}
+{% endblock %}
 
-{% block usertools %}{% endblock %}
+{% block content %}
+    {% include "unfold/helpers/unauthenticated_title.html" with title=site_title|default:_('Django site admin') subtitle=_('Welcome back to') %}
 
-{% block nav-global %}{% endblock %}
+    {% include "unfold/helpers/messages.html" %}
 
-{% block nav-sidebar %}{% endblock %}
+    {% if form.errors or form.non_field_errors %}
+        <div class="flex flex-col gap-4 mb-8 *:mb-0">
+            {% include "unfold/helpers/messages/errornote.html" with errors=form.errors %}
 
-{% block content_title %}{% endblock %}
+            {% include "unfold/helpers/messages/error.html" with errors=form.non_field_errors %}
 
-{% block breadcrumbs %}{% endblock %}
+            {% if user.is_authenticated %}
+                {% blocktranslate trimmed asvar message %}
+                    You are authenticated as {{ username }}, but are not authorized to
+                    access this page. Would you like to login to a different account?
+                {% endblocktranslate %}
 
-{% block title %}
-    {{ title }} | {{ site_title }}
-{% endblock %}
+                {% include "unfold/helpers/messages/error.html" with error=message %}
+            {% endif %}
+        </div>
+    {% endif %}
+
+    {% block login_before %}{% endblock %}
+
+    <form action="{{ app_path }}" method="post" id="login-form">
+        {% csrf_token %}
+
+        {% include "unfold/helpers/field.html" with field=form.username %}
+
+        {% include "unfold/helpers/field.html" with field=form.password %}
+
+        <div class="flex flex-col gap-3 mt-6">
+            {% component "unfold/components/button.html" with submit=1 variant="primary" class="submit-row w-full" %}
+                {% translate 'Log in' %} <span class="material-symbols-outlined ml-2 relative right-0 transition-all group-hover:-right-1">arrow_forward</span>
+            {% endcomponent %}
+
+            {% url 'admin_password_reset' as password_reset_url %}
+            {% url 'admin:admin_password_reset' as unfold_password_reset_url %}
 
-{% block base %}
-    <div id="page" class="bg-white flex min-h-screen dark:bg-base-900 ">
-        <div class="flex grow items-center justify-center mx-auto px-4 relative">
-            <div class="w-full sm:w-96">
-                <h1 class="font-semibold mb-10">
-                    <span class="block text-font-important-light dark:text-font-important-dark">{% trans 'Welcome back to' %}</span>
-                    <span class="block text-primary-600 text-xl dark:text-primary-500">{{ site_title|default:_('Django site admin') }}</span>
-                </h1>
-
-                {% include "unfold/helpers/messages.html" %}
-
-                {% if form.errors or form.non_field_errors %}
-                    <div class="flex flex-col gap-4 mb-8 *:mb-0">
-                        {% include "unfold/helpers/messages/errornote.html" with errors=form.errors %}
-
-                        {% include "unfold/helpers/messages/error.html" with errors=form.non_field_errors %}
-
-                        {% if user.is_authenticated %}
-                            {% blocktranslate trimmed asvar message %}
-                                You are authenticated as {{ username }}, but are not authorized to
-                                access this page. Would you like to login to a different account?
-                            {% endblocktranslate %}
-
-                            {% include "unfold/helpers/messages/error.html" with error=message %}
-                        {% endif %}
-                    </div>
-                {% endif %}
-
-                {% block login_before %}{% endblock %}
-
-                <form action="{{ app_path }}" method="post" id="login-form">
-                    {% csrf_token %}
-
-                    {% include "unfold/helpers/field.html" with field=form.username %}
-
-                    {% include "unfold/helpers/field.html" with field=form.password %}
-
-                    {% url 'admin_password_reset' as password_reset_url %}
-
-                    <div class="submit-row">
-                        <button type="submit" class="bg-primary-600 border border-transparent flex flex-row font-semibold group items-center justify-center py-2 rounded-default text-sm text-white w-full">
-                            {% translate 'Log in' %}
-
-                            <span class="material-symbols-outlined ml-2 relative right-0 text-base transition-all group-hover:-right-1">arrow_forward</span>
-                        </button>
-                    </div>
-
-                    {% if password_reset_url %}
-                        <div class="password-reset-link">
-                            <a href="{{ password_reset_url }}" class="border border-base-200 font-medium hidden mt-4 px-3 py-2 rounded-default text-center text-sm text-base-500 transition-all w-full hover:bg-base-50 lg:block lg:w-auto dark:border-base-700 dark:text-font-default-dark dark:hover:text-base-200 dark:hover:bg-base-900">
-                                {% translate 'Forgotten your password or username?' %}
-                            </a>
-                        </div>
-                    {% endif %}
-                </form>
-
-                {% block login_after %}{% endblock %}
-            </div>
-
-            <div class="absolute flex flex-row items-center justify-between left-0 m-4 right-0 top-0">
-                {% if site_url %}
-                    <a href="{{ site_url }}" class="flex font-medium items-center text-sm text-primary-600 dark:text-primary-500">
-                        <span class="material-symbols-outlined mr-2">arrow_back</span> {% trans 'Return to site' %}
-                    </a>
-                {% endif %}
-
-                {% if not theme %}
-                    <div class="ml-auto">
-                        {% include "unfold/helpers/theme_switch.html" %}
-                    </div>
-                {% endif %}
-            </div>
+            {% if password_reset_url or unfold_password_reset_url %}
+                {% component "unfold/components/button.html" with href=password_reset_url|default:unfold_password_reset_url variant="secondary" class="password-reset-link w-full" %}
+                    {% translate 'Forgotten your password or username?' %}
+                {% endcomponent %}
+            {% endif %}
         </div>
+    </form>
 
-        {% if image %}
-            <div class="bg-cover grow hidden max-w-3xl xl:max-w-4xl xl:block" style="background-image: url('{{ image }}')">
-            </div>
-        {% endif %}
-    </div>
+    {% block login_after %}{% endblock %}
 {% endblock %}

unfold/templates/admin/pagination.html

@@ -15,7 +15,7 @@
 
     {% if cl.formset and cl.result_count %}
         <div class="ml-auto">
-            <button type="submit" name="_save" form="changelist-form" class="bg-primary-600 block border border-transparent font-medium px-3 py-2 rounded-default text-white w-full">
+            <button type="submit" name="_save" form="changelist-form" class="bg-primary-600 block border border-transparent cursor-pointer font-medium px-3 py-2 rounded-default text-white w-full">
                 {% translate 'Save' %}
             </button>
         </div>

unfold/templates/unfold/components/button.html

@@ -1,4 +1,13 @@
 <{% if href %}a href="{{ href }}"{% else %}button{% endif%} {% if submit %}type="submit"{% endif%} {% if name %}name="{{ name }}"{% endif %}
-class="border border-base-200 font-medium flex items-center gap-2 px-3 py-2 rounded-default justify-center whitespace-nowrap {% if attrs.disabled %}cursor-not-allowed opacity-50{% endif %} {% if variant == "default" %}bg-white dark:border-base-700 dark:bg-transparent dark:text-white{% else %}bg-primary-600 border-transparent text-white{% endif %}{% if class %} {{ class }}{% endif %}" {% include "unfold/helpers/attrs.html" %}>
+class="font-medium flex group items-center gap-2 px-3 py-2 rounded-default justify-center whitespace-nowrap {% if attrs.disabled %}cursor-not-allowed opacity-50{% else %}cursor-pointer{% endif %}
+{% if variant == "default" %}
+    border border-base-200 bg-white text-font-important-light dark:border-base-700 dark:bg-transparent dark:text-font-important-dark
+{% elif variant == "secondary" %}
+    bg-gray-100 border border-transparent dark:bg-base-800
+{% elif variant == "ghost" %}
+    bg-transparent text-font-important-light dark:text-font-important-dark
+{% else %}
+    border border-base-200 bg-primary-600 border-transparent text-white
+{% endif %}{% if class %} {{ class }}{% endif %}" {% include "unfold/helpers/attrs.html" %}>
 {{ children }}
 </{% if href %}a{% else %}button{% endif%}>

unfold/templates/unfold/helpers/account_links.html

@@ -6,7 +6,7 @@
     </a>
 
     <nav class="absolute bg-white border border-base-200 flex flex-col leading-none py-1 -right-2 rounded-default shadow-lg top-7 w-52 z-50 dark:bg-base-800 dark:border-base-700" x-cloak x-show="openUserLinks" x-transition x-on:click.outside="openUserLinks = false">
-        <div class="border-b border-base-100 flex flex-row shrink-0 items-start justify-start mb-1 pb-1 dark:border-base-700">
+        <div class="border-b border-base-200 flex flex-row shrink-0 items-start justify-start mb-1 pb-1 dark:border-base-700">
             <span class="block mx-1 px-3 py-2 truncate">
                 {% firstof user.get_short_name user.get_username %}
             </span>
@@ -18,17 +18,25 @@
             </a>
         {% endif %}
 
-        {% if user.has_usable_password %}
-            <a href="{% url 'admin:password_change' %}" class="mx-1 px-3 py-2 rounded-default hover:bg-base-100 hover:text-base-700 dark:hover:bg-base-700 dark:hover:text-base-200">
-                {% translate 'Change password' %}
-            </a>
+        {% if account_links %}
+            {% for link in account_links %}
+                <a href="{{ link.link }}" class="mx-1 px-3 py-2 rounded-default hover:bg-base-100 hover:text-base-700 dark:hover:bg-base-700 dark:hover:text-base-200">
+                    {{ link.title }}
+                </a>
+            {% endfor %}
+        {% else %}
+            {% if user.has_usable_password %}
+                <a href="{% url 'admin:password_change' %}" class="mx-1 px-3 py-2 rounded-default hover:bg-base-100 hover:text-base-700 dark:hover:bg-base-700 dark:hover:text-base-200">
+                    {% translate 'Change password' %}
+                </a>
+            {% endif %}
         {% endif %}
 
         <div class="border-t border-base-200 mt-1 pt-1 dark:border-base-700">
             <form id="logout-form" method="post" action="{% url 'admin:logout' %}" class="mx-1">
                 {% csrf_token %}
 
-                <button type="submit" class="bg-none block px-3 py-2 text-left text-red-500 rounded-default w-full hover:bg-red-100 dark:hover:bg-red-500/20 dark:hover:text-red-500">
+                <button type="submit" class="bg-none block cursor-pointer px-3 py-2 text-left text-red-500 rounded-default w-full hover:bg-red-100 dark:hover:bg-red-500/20 dark:hover:text-red-500">
                     {% translate 'Log out' %}
                 </button>
             </form>

unfold/templates/unfold/helpers/app_list.html

@@ -57,7 +57,7 @@
         {% endfor %}
     </div>
 
-    {% if sidebar_show_all_applications %}
+    {% if sidebar_show_all_applications and app_list|length > 0 %}
         <div class="mt-auto" x-data="{ openAllApplications: false }">
             <a class="cursor-pointer flex items-center h-[64px] px-6 py-3 text-sm dark:text-font-default-dark hover:text-primary-600 dark:hover:text-primary-500" x-on:click="openAllApplications = !openAllApplications">
                 <span class="material-symbols-outlined md-18 mr-3">
@@ -95,5 +95,8 @@
         </div>
     {% endif %}
 {% else %}
-    <p>{% translate "You don’t have permission to view or edit anything." %}</p>
+    <p>
+        {% trans "You don’t have permission to view or edit anything." as error_message %}
+        {% include "unfold/helpers/messages/error.html" with error=error_message %}
+    </p>
 {% endif %}

unfold/templates/unfold/helpers/app_list_default.html

@@ -56,6 +56,7 @@
     {% endfor %}
 {% else %}
     <p>
-        {% translate 'You don’t have permission to view or edit anything.' %}
+        {% trans "You don’t have permission to view or edit anything." as error_message %}
+        {% include "unfold/helpers/messages/error.html" with error=error_message %}
     </p>
 {% endif %}

unfold/templates/unfold/helpers/change_list_actions.html

@@ -2,8 +2,8 @@
 
 {% if actions_on_top %}
     {% if cl.search_fields or action_form or cl.has_filters %}
-        <div class="bottom-0 left-0 right-0 hidden bg-primary-600 group-has-[input.action-select:checked]:flex fixed gap-3 lg:h-[71px] items-center p-3 z-50 lg:flex-row dark:bg-primary-500">
-            <div id="changelist-actions-wrapper" class="grow lg:px-4" {% if not is_popup %}x-bind:class="{'xl:ml-0': !sidebarDesktopOpen, 'xl:ml-72': sidebarDesktopOpen}"{% endif %}>
+        <div class="bottom-0 left-0 right-0 hidden bg-primary-600 group-has-[input.action-select:checked]:flex fixed gap-3 lg:h-[64px] items-center p-3 z-50 lg:flex-row dark:bg-primary-500">
+            <div id="changelist-actions-wrapper" class="grow" {% if not is_popup %}x-bind:class="{'xl:ml-0': !sidebarDesktopOpen, 'xl:ml-72': sidebarDesktopOpen}"{% endif %}>
                 {% if action_form %}
                     {% admin_actions %}
                 {% endif %}

unfold/templates/unfold/helpers/change_list_filter_actions.html

@@ -12,7 +12,7 @@
             <span id="changelist-filter-extra-actions" class="flex flex-row gap-2 items-center mt-2">
                 {% if cl.is_facets_optional %}
                     {% if cl.add_facets %}
-                        <a href="{{ cl.remove_facet_link }}" class="hidelink border grow font-medium px-3 py-2 rounded-default text-center transition-all w-full hover:bg-base-50 lg:w-auto dark:border-base-700 dark:hover:text-base-200">
+                        <a href="{{ cl.remove_facet_link }}" class="hidelink border border-base-200 grow font-medium px-3 py-2 rounded-default text-center transition-all w-full lg:w-auto dark:border-base-700 dark:hover:text-base-200">
                             {% trans "Hide counts" %}
                         </a>
                     {% else %}

unfold/templates/unfold/helpers/edit_inline/tabular_heading.html

@@ -9,7 +9,7 @@
                         {{ field.label|capfirst }}
 
                         {% if field.help_text %}
-                            <span class="cursor-pointer material-symbols-outlined ml-2 text-base-400 dark:text-base-500" title="{{ field.help_text|striptags }}">help</span>
+                            <span class="cursor-help material-symbols-outlined ml-2 text-base-400 dark:text-base-500" title="{{ field.help_text|striptags }}">help</span>
                         {% endif %}
                     </span>
                 </th>

unfold/templates/unfold/helpers/empty_results.html

@@ -25,8 +25,8 @@
             {% endif %}
 
 
-            {% if cl.has_filters %}
-                <a href="{{ cl.clear_all_filters_qs }}" class="border border-base-200 flex flex-row font-medium gap-2 group/button h-[38px] items-center justify-center px-3 py-2 rounded-default w-full hover:text-primary-600 lg:w-auto dark:border-base-700 dark:hover:bg-base-900 dark:hover:text-primary-500">
+            {% if cl.has_filters or cl.query %}
+                <a href="?" class="border border-base-200 flex flex-row font-medium gap-2 group/button h-[38px] items-center justify-center px-3 py-2 rounded-default w-full hover:text-primary-600 lg:w-auto dark:border-base-700 dark:hover:bg-base-900 dark:hover:text-primary-500">
                     <span class="material-symbols-outlined ml-1">filter_list_off</span> {% trans "Reset filters" %}
                 </a>
             {% endif %}

unfold/templates/unfold/helpers/field.html

@@ -13,10 +13,12 @@
         {% include "unfold/helpers/help_text.html" with help_text=field.help_text %}
     </div>
 {% else %}
-    <div class="{% if field.errors %}errors {% endif %}flex flex-col gap-2 group mb-5 last:mb-4">
-        {% include "unfold/helpers/form_label.html" with field=field %}
+    <div class="{% if field.errors %}errors {% endif %}flex flex-col group mb-5 last:mb-4">
+        <div class="flex flex-col gap-2">
+            {% include "unfold/helpers/form_label.html" with field=field %}
 
-        {{ field }}
+            {{ field }}
+        </div>
 
         {% include "unfold/helpers/form_errors.html" with errors=field.errors %}
 

unfold/templates/unfold/helpers/header.html

@@ -2,7 +2,7 @@
 
 {% if not is_popup %}
     {% block header %}
-        <div class="bg-white border-b border-base-200 mb-6 px-4 z-40 dark:bg-base-900 dark:border-base-800 {% element_classes 'header' %}">
+        <div class="bg-white border-b border-base-200 mb-6 px-4 z-40 dark:bg-base-900 dark:border-base-800 dark:text-font-default-dark {% element_classes 'header' %}">
             <div class="{% if not cl.model_admin.list_fullwidth %}container{% endif %} flex items-center h-16 mx-auto py-4">
                 <div id="header-inner" class="flex items-center w-full">
                     <div class="flex items-center w-full">

unfold/templates/unfold/helpers/language_form.html

@@ -0,0 +1,10 @@
+<form action="{% if languages_action %}{{ languages_action }}{% else %}{% url 'set_language' %}{% endif %}" method="post" class="flex w-full">
+    {% csrf_token %}
+
+    <input name="next" type="hidden" value="{{ redirect_to }}">
+    <input name="language" type="hidden" value="{{ language.code }}">
+
+    <button type="submit" class="block cursor-pointer grow mx-1 px-3 py-2 rounded-default text-left hover:bg-base-100 hover:text-base-700 dark:hover:bg-base-700 dark:hover:text-base-200 {% if language.code == LANGUAGE_CODE %}text-primary-600 dark:text-primary-500 dark:hover:text-primary-500! hover:text-primary-600!{% endif %}">
+        {{ language.name_local }} ({{ language.code }})
+    </button>
+</form>

unfold/templates/unfold/helpers/language_switch.html

@@ -4,24 +4,22 @@
 {% get_available_languages as LANGUAGES %}
 {% get_language_info_list for LANGUAGES as languages %}
 
+{% if show_languages %}
+    <div class="relative" x-data="{ openLanguageLinks: false }">
+        <a class="block cursor-pointer h-[18px] hover:text-base-700 dark:hover:text-base-200" x-on:click="openLanguageLinks = !openLanguageLinks">
+            <span class="material-symbols-outlined">translate</span>
+        </a>
 
-<div class="relative" x-data="{ openLanguageLinks: false }">
-    <a class="block cursor-pointer h-[18px] hover:text-base-700 dark:hover:text-base-200" x-on:click="openLanguageLinks = !openLanguageLinks">
-        <span class="material-symbols-outlined">translate</span>
-    </a>
-
-    <div class="absolute bg-white border border-base-200 flex flex-col leading-none py-1 -right-2 rounded-default shadow-lg top-7 w-52 z-50 dark:bg-base-800 dark:border-base-700" x-cloak x-show="openLanguageLinks" x-transition x-on:click.outside="openLanguageLinks = false">
-        {% for language in languages %}
-            <form action="{% url 'set_language' %}" method="post" class="flex w-full">
-                {% csrf_token %}
-
-                <input name="next" type="hidden" value="{{ redirect_to }}">
-                <input name="language" type="hidden" value="{{ language.code }}">
-
-                <button type="submit" class="block grow mx-1 px-3 py-2 rounded-default text-left hover:bg-base-100 hover:text-base-700 dark:hover:bg-base-700 dark:hover:text-base-200 {% if language.code == LANGUAGE_CODE %}text-primary-600 dark:text-primary-500 dark:hover:text-primary-500! hover:text-primary-600!{% endif %}">
-                    {{ language.name_local }} ({{ language.code }})
-                </button>
-            </form>
-        {% endfor %}
+        <div class="absolute bg-white border border-base-200 flex flex-col leading-none py-1 -right-2 rounded-default shadow-lg top-7 w-52 z-50 dark:bg-base-800 dark:border-base-700" x-cloak x-show="openLanguageLinks" x-transition x-on:click.outside="openLanguageLinks = false">
+            {% if languages_list %}
+                {% for language in languages_list %}
+                    {% include "unfold/helpers/language_form.html" with language=language %}
+                {% endfor %}
+            {% else %}
+                {% for language in languages %}
+                    {% include "unfold/helpers/language_form.html" with language=language %}
+                {% endfor %}
+            {% endif %}
+        </div>
     </div>
-</div>
+{% endif %}

unfold/templates/unfold/helpers/navigation.html

@@ -1,6 +1,6 @@
 {% load i18n unfold %}
 
-<nav id="nav-sidebar-inner" class="bg-base-50 flex flex-col min-h-screen dark:bg-base-950/20 {% element_classes 'navigation_inner' %}">
+<nav id="nav-sidebar-inner" class="bg-base-50 flex flex-col min-h-screen dark:text-font-default-dark dark:bg-base-950/20 {% element_classes 'navigation_inner' %}">
     {% include "unfold/helpers/navigation_header.html" %}
 
     {% include "unfold/helpers/search.html" %}

unfold/templates/unfold/helpers/pagination_infinite.html

@@ -1,11 +1,11 @@
-{% load unfold_list i18n %}
+{% load unfold 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 %}">
+    <a {% if cl.page_num != 1 %}href="{% infinite_paginator_url cl 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">
+    <a {% if cl.result_list|length %}href="{% infinite_paginator_url cl cl.page_num|add:1 %}"{% endif %} class="{% if cl.result_list|length %}hover:text-primary-600 dark:hover:text-primary-500{% endif %}">
         {% trans "Next" %}
     </a>
 </div>

unfold/templates/unfold/helpers/pagination_inline.html

@@ -0,0 +1,28 @@
+{% load i18n admin_urls unfold %}
+
+{% with page_obj=inline_admin_formset.formset.page has_tab=inline_admin_formset.opts.tab pagination_key=inline_admin_formset.formset.get_pagination_key %}
+    {% elided_page_range page_obj.paginator page_obj.number as elided_page_range %}
+    <input type="hidden" name="{{ inline_admin_formset.formset.get_pagination_key }}" value="{{ page_obj.number }}" />
+
+    {% if page_obj.paginator.count and page_obj.paginator.num_pages > 1%}
+        <div class="flex items-center gap-2 mb-6">
+            {% for i in elided_page_range %}
+                {% if i == page_obj.paginator.ELLIPSIS %}
+                    <span>{{ page_obj.paginator.ELLIPSIS }}</span>
+                {% elif i == page_obj.number %}
+                    <span class="font-medium text-primary-600">{{ i }}</span>
+                {% else %}
+                    <a href="?{% querystring_params pagination_key i %}{% if has_tab %}#{{ inline_admin_formset.formset.prefix|slugify }}{% endif %}">
+                        {{ i }}
+                    </a>
+                {% endif %}
+            {% endfor %}
+
+            <div>-</div>
+
+            <div>
+                {{ page_obj.paginator.count }} {% if page_obj.paginator.count == 1 %}{{ inline_admin_formset.opts.verbose_name }}{% else %}{{ inline_admin_formset.opts.verbose_name_plural }}{% endif %}
+            </div>
+        </div>
+    {% endif %}
+{% endwith %}