django-unfold 0.59.0__py3-none-any.whl → 0.61.0__py3-none-any.whl

unfold/static/unfold/js/app.js

@@ -25,6 +25,67 @@ const sortRecords = (e) => {
   });
 };
 
+/*************************************************************
+ * Search form
+ *************************************************************/
+function searchForm() {
+  return {
+    applyShortcut(event) {
+      if (
+        event.key === "/" &&
+        document.activeElement.tagName.toLowerCase() !== "input" &&
+        document.activeElement.tagName.toLowerCase() !== "textarea" &&
+        !document.activeElement.isContentEditable
+      ) {
+        event.preventDefault();
+        this.$refs.searchInput.focus();
+      }
+    },
+  };
+}
+
+/*************************************************************
+ * Search dropdown
+ *************************************************************/
+function searchDropdown() {
+  return {
+    openSearchResults: true,
+    currentIndex: 0,
+    applyShortcut(event) {
+      if (
+        event.key === "t" &&
+        document.activeElement.tagName.toLowerCase() !== "input" &&
+        document.activeElement.tagName.toLowerCase() !== "textarea" &&
+        !document.activeElement.isContentEditable
+      ) {
+        event.preventDefault();
+        this.$refs.searchInput.focus();
+      }
+    },
+    nextItem() {
+      if (this.currentIndex < this.maxItem()) {
+        this.currentIndex++;
+      }
+    },
+    prevItem() {
+      if (this.currentIndex > 0) {
+        this.currentIndex--;
+      }
+    },
+    maxItem() {
+      return document.getElementById("search-results").querySelectorAll("li")
+        .length;
+    },
+    selectItem() {
+      const items = document
+        .getElementById("search-results")
+        .querySelectorAll("li");
+
+      window.location = items[this.currentIndex - 1].querySelector("a").href;
+    },
+  };
+}
+
 /*************************************************************
  * Warn without saving
  *************************************************************/

unfold/styles.css

@@ -35,6 +35,8 @@
 
 @theme {
   --font-sans: 'Inter', sans-serif;
+  --shadow-raised: 0 2px 12px rgba(0, 0, 0, 0.12);
+  --shadow-raised-dark: 0 2px 12px rgba(255, 255, 255, 0.12);
 }
 
 @theme inline{
@@ -197,7 +199,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;
 }
 
@@ -218,7 +220,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,
@@ -319,7 +321,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 {
@@ -338,10 +340,6 @@ td .inline-deletelink {
   @apply block lg:mt-2.5;
 }
 
-h3 span:nth-child(3) {
-  @apply ml-auto;
-}
-
 /*******************************************************
  Autocomplete
  *******************************************************/
@@ -483,7 +481,7 @@ fieldset details > summary {
 }
 
 fieldset details > summary:after {
-  @apply material-symbols-outlined absolute right-3 top-3.5;
+  @apply material-symbols-outlined absolute cursor-pointer right-3 top-3.5;
   content: "expand_more";
 }
 

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/auth/user/add_form.html

@@ -3,10 +3,6 @@
 
 {% block form_top %}
     <p class="bg-blue-50 border-blue-200 mb-8 p-3 rounded-default text-blue-500 text-sm dark:bg-blue-500/20 dark:border-blue-500/10">
-        {% if not is_popup %}
-            {% translate 'First, enter a username and password. Then, you’ll be able to edit more user options.' %}
-        {% else %}
-            {% translate "Enter a username and password." %}
-        {% endif %}
+        {% translate "After you've created a user, you’ll be able to edit more user options." %}
         <p>
 {% endblock %}

unfold/templates/admin/change_form.html

@@ -59,13 +59,15 @@
 
 {% block content %}
     <div id="content-main">
+        {% include "unfold/helpers/popup_header.html" %}
+
         {% block form_before %}{% endblock %}
 
         {% if adminform.model_admin.change_form_outer_before_template %}
             {% include adminform.model_admin.change_form_outer_before_template %}
         {% endif %}
 
-        <form {% if adminform.model_admin.conditional_fields %}x-data='{{ adminform|changeform_data }}'{% endif %} {% if has_file_field %}enctype="multipart/form-data" {% endif %}{% if form_url %}action="{{ form_url }}" {% endif %}method="post" id="{{ opts.model_name }}_form" {% if adminform.model_admin.warn_unsaved_form %}class="warn-unsaved-form"{% endif %} novalidate>
+        <form {% if adminform.model_admin.conditional_fields %}x-data='{{ adminform|changeform_data }}'{% endif %} {% if has_file_field %}enctype="multipart/form-data" {% endif %}{% if form_url %}action="{{ form_url }}"{% else %}x-bind:value="activeTab && activeTab !== 'general' ? '#' + activeTab : ''" {% endif %}method="post" id="{{ opts.model_name }}_form" {% if adminform.model_admin.warn_unsaved_form %}class="warn-unsaved-form"{% endif %} novalidate>
             {% csrf_token %}
 
             {% if adminform.model_admin.change_form_before_template %}

unfold/templates/admin/change_list.html

@@ -55,6 +55,8 @@
 
 {% block content %}
     <div id="content-main" x-data="{ filterOpen: false }">
+        {% include "unfold/helpers/popup_header.html" %}
+
         {% if cl.formset and cl.formset.errors %}
             {% include "unfold/helpers/messages/errornote.html" with errors=cl.formset.errors %}
 
@@ -70,7 +72,7 @@
                         {% endif %}
                     {% endblock %}
 
-                    {% if cl.model_admin.list_before_template %}
+                    {% if cl.model_admin.list_before_template and not is_popup %}
                         {% include cl.model_admin.list_before_template %}
                     {% endif %}
 
@@ -106,7 +108,7 @@
                         {% endblock %}
                     </form>
 
-                    {% if cl.model_admin.list_after_template %}
+                    {% if cl.model_admin.list_after_template and not is_popup %}
                         {% include cl.model_admin.list_after_template %}
                     {% endif %}
                 </div>

unfold/templates/admin/change_list_results.html

@@ -70,7 +70,7 @@
             </thead>
 
             {% for result in results %}
-                <tbody class="block lg:table-row-group" x-data="{rowOpen: false}">
+                <tbody class="{% cycle '' 'after:bg-base-50 dark:after:bg-white/[.02]' %} block relative lg:table-row-group lg:hover:shadow-raised lg:dark:hover:shadow-raised-dark lg:hover:z-20 after:content-[''] after:absolute after:inset-0" x-data="{rowOpen: false}">
                     {% if result.form and result.form.non_field_errors %}
                         <tr>
                             <td class="text-left" colspan="{{ result|length }}">
@@ -79,7 +79,7 @@
                         </tr>
                     {% endif %}
 
-                    <tr class="{% cycle '' 'bg-base-50 dark:bg-white/[.02]' %} block border border-base-200 mb-3 rounded-default shadow-xs lg:table-row lg:border-none lg:mb-0 lg:shadow-none dark:border-base-800">
+                    <tr class="block border border-base-200 mb-3 relative rounded-default shadow-xs z-20 lg:table-row lg:border-none lg:mb-0 lg:rounded-none lg:shadow-none dark:border-base-800">
                         {% if cl.model_admin.list_sections|length > 0 %}
                             <td class="align-middle cursor-pointer flex border-b border-base-200 font-normal px-2.5 py-2 relative text-left before:font-semibold before:text-font-important-light before:block before:capitalize before:content-[attr(data-label)] before:mr-auto lg:before:hidden lg:border-b-0 lg:border-t lg:pl-3 lg:pr-0 lg:py-3 lg:table-cell dark:border-base-800 dark:lg:border-base-800 dark:before:text-font-important-dark lg:w-px"
                                 data-label="{% trans "Expand row" %}"
@@ -99,7 +99,7 @@
                     </tr>
 
                     {% if cl.model_admin.list_sections|length > 0 %}
-                        <tr class="block mb-3 lg:table-row" x-show="rowOpen">
+                        <tr class="block mb-3 relative z-30 lg:table-row" x-show="rowOpen">
                             <td colspan="{{ result|length|add:2 }}" class="border bg-base-200/10 block border-base-200 relative rounded-default p-3 lg:shadow-inner lg:border-0 lg:border-t lg:rounded-none lg:table-cell dark:border-base-800">
                                 <div class="absolute bg-primary-600 h-full hidden left-0 top-0 w-0.5 lg:block"></div>
 

unfold/templates/admin/edit_inline/stacked.html

@@ -17,15 +17,21 @@
         {{ 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-of-type: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.collapsible and inline_admin_form.original %}
+                                <span class="material-symbols-outlined select-none block! -rotate-90 transition-all" x-bind:class="open && 'rotate-0'">
+                                    expand_more
+                                </span>
+                            {% 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 +88,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 }}
@@ -97,6 +105,8 @@
             {% endfor %}
         </div>
 
+        {% include "unfold/helpers/pagination_inline.html" %}
+
         {% if inline_admin_formset.is_collapsible %}</details>{% endif %}
     </fieldset>
 </div>

unfold/templates/admin/edit_inline/tabular.html

@@ -34,6 +34,8 @@
                 </table>
             </div>
 
+            {% include "unfold/helpers/pagination_inline.html" %}
+
             {% if inline_admin_formset.is_collapsible %}</details>{% endif %}
         </fieldset>
     </div>

unfold/templates/admin/includes/fieldset.html

@@ -1,18 +1,22 @@
 {% load unfold %}
 
-<fieldset class="module{% if fieldset.classes %} {{ fieldset.classes }}{% endif %}" {% if stacked != 1 %}x-show="activeTab == 'general'"{% endif %}>
+<fieldset class="module relative {% if fieldset.classes %} {{ fieldset.classes }}{% endif %}" {% if stacked != 1 %}x-show="activeTab == 'general'"{% endif %}>
+    {% if fieldset.is_collapsible %}<details><summary>{% endif %}
+
     {% if fieldset.name and "tab" not in fieldset.classes %}
         {% if stacked == 1 %}
-            <h2 class="bg-base-50 border-b border-base-200 border-t border-dashed font-semibold text-font-important-light px-3 py-2 dark:text-font-important-dark dark:bg-white/[.02] dark:border-base-800">
+            <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 {% if fieldset.is_collapsible %}cursor-pointer{% endif %}">
                 {{ 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">
+            <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 {% if fieldset.is_collapsible %}cursor-pointer{% endif %}">
                 {{ fieldset.name }}
             </h2>
         {% endif %}
     {% endif %}
 
+    {% if fieldset.is_collapsible %}</summary>{% endif %}
+
     {% if fieldset.description %}
         <div class="leading-relaxed mb-4 max-w-4xl text-sm">
             {{ fieldset.description|safe }}
@@ -24,4 +28,6 @@
             {% include "unfold/helpers/fieldset_row.html" %}
         {% endfor %}
     </div>
+
+    {% if fieldset.name and fieldset.is_collapsible %}</details>{% endif %}
 </fieldset>

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 cursor-pointer 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/search_form.html

@@ -2,13 +2,22 @@
 
 {% if cl.search_fields %}
     <div id="toolbar">
-        <form id="changelist-search" method="get" role="search">
-            <div class="bg-white border border-base-200 flex rounded-default overflow-hidden shadow-xs lg:w-96 focus-within:outline-2 focus-within:-outline-offset-2 focus-within:outline-primary-600 dark:bg-base-900 dark:border-base-700">
-                <input class="font-medium grow min-w-0 h-9 px-3 text-font-default-light text-sm focus:outline-hidden dark:bg-base-900 dark:text-font-default-dark placeholder-shown:truncate placeholder-base-400" type="text" name="{{ search_var }}" value="{{ cl.query }}" id="searchbar" placeholder="{% if cl.search_help_text %}{{ cl.search_help_text }}{% else %}{% trans "Type to search" %}{% endif %}" />
-
-                <button type="submit" class="flex items-center px-2 focus:outline-hidden" id="searchbar-submit">
+        <form id="changelist-search" method="get" role="search" x-data="searchForm()">
+            <div class="bg-white border border-base-200 flex flex-row items-center px-3 rounded-default relative shadow-xs w-full focus-within:outline-2 focus-within:-outline-offset-2 focus-within:outline-primary-600 lg:w-96 dark:bg-base-900 dark:border-base-700">
+                <button type="submit" class="flex items-center focus:outline-hidden" id="searchbar-submit">
                     <span class="material-symbols-outlined md-18 text-base-400 dark:text-base-500">search</span>
                 </button>
+
+                <input type="text"
+                       x-ref="searchInput"
+                       x-on:keydown.window="applyShortcut($event)"
+                       class="grow font-medium min-w-0 overflow-hidden p-2 placeholder-font-subtle-light truncate focus:outline-hidden dark:bg-base-900 dark:placeholder-font-subtle-dark dark:text-font-default-dark"
+                       name="{{ search_var }}"
+                       value="{{ cl.query }}"
+                       id="searchbar"
+                       placeholder="{% if cl.search_help_text %}{{ cl.search_help_text }}{% else %}{% trans "Type to search" %}{% endif %}" />
+
+                {% include "unfold/helpers/shortcut.html" with shortcut="/" %}
             </div>
 
             {% for pair in cl.filter_params.items %}

unfold/templates/admin/submit_line.html

@@ -1,7 +1,7 @@
 {% load i18n admin_urls %}
 
 <div {% if not is_popup %}id="submit-row"{% endif %} class="relative lg:sticky lg:bottom-0 z-40">
-    <div class="backdrop-blur-xs bg-white/80 rounded-b-default pb-4 px-4 dark:bg-base-900/80 {% if not is_popup %}lg:border-t lg:border-base-200 relative lg:scrollable-top lg:py-0 dark:border-base-800{% endif %}">
+    <div class="backdrop-blur-xs bg-white/80 rounded-b-default pb-4 px-4 dark:bg-base-900/80 lg:border-t lg:border-base-200 relative lg:scrollable-top lg:py-0 dark:border-base-800">
         <div class="flex flex-col-reverse gap-3 items-center mx-auto lg:flex-row-reverse container lg:h-[64px]">
             {% block submit-row %}
                 {% if show_save %}

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 text-font-important-light dark:border-base-700 dark:bg-transparent dark:text-font-important-dark{% 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/components/card.html

@@ -5,7 +5,7 @@
     </h2>
 {% endif %}
 
-<span class="grow relative {% if icon %} pl-6{% endif %}">
+<div class="grow relative {% if icon %} pl-6{% endif %}">
     {{ children }}
 
     {% if label %}
@@ -17,11 +17,11 @@
     {% if icon %}
         <span class="material-symbols-outlined absolute -left-6 text-base-300 top-1/2 -translate-x-1/3 -translate-y-1/2 text-6xl! dark:text-base-500">{{ icon }}</span>
     {% endif %}
-</span>
+</div>
 
 {% if footer %}
-    <span class="border-t border-base-200 flex items-center -mb-6 -mx-6 mt-6 pb-2 pt-2 px-6 text-sm dark:border-base-800">
+    <div class="border-t border-base-200 flex items-center -mb-6 -mx-6 mt-6 pb-2 pt-2 px-6 text-sm dark:border-base-800">
         {{ footer }}
-    </span>
+    </div>
 {% endif %}
 </{% if href %}a{% else %}div{% endif %}>

unfold/templates/unfold/helpers/add_link.html

@@ -10,7 +10,9 @@
 
 {% if add_url %}
     <div class="flex flex-row items-center">
-        <span class="block bg-base-200 h-5 mx-4 w-px dark:bg-base-700"></span>
+        {% if not hide_separator %}
+            <span class="block bg-base-200 h-5 mx-4 w-px dark:bg-base-700"></span>
+        {% endif %}
 
         <a href="{% add_preserved_filters add_url is_popup to_field %}" class="addlink bg-primary-600 flex items-center h-9 justify-center -my-1 rounded-full w-9" title="{{ title }}">
             <span class="material-symbols-outlined text-white">add</span>

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/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/fieldsets_tabs.html

@@ -3,12 +3,12 @@
 {% with tabs=adminform|tabs %}
     {% if tabs %}
         <div x-data="{openTab: null}" x-show="activeTab == 'general'">
-            <ul class="bg-base-100 flex gap-10 mb-6 px-4 py-3 rounded-default text-font-default-light 2xl:-mx-4 dark:bg-white/[.02] dark:text-font-default-dark">
+            <ul class="bg-base-100 flex gap-1 mb-6 px-1.5 py-1.5 rounded-default text-font-default-light 2xl:-mx-4 dark:bg-white/[.02] dark:text-font-default-dark">
                 {% for fieldset in tabs %}
                     <li>
-                        <a class="cursor-pointer font-semibold hover:text-base-700 dark:hover:text-white"
+                        <a class="block cursor-pointer font-semibold px-2.5 py-2 rounded-default hover:text-base-700 dark:hover: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-font-important-light dark:text-font-important-dark' : ''">
+                           x-bind:class="openTab == '{{ forloop.counter0 }}-{{ fieldset.name|slugify }}'{% if forloop.first %} || openTab == null{% endif %} ? 'bg-white text-font-important-light shadow-xs dark:bg-base-900 dark:text-font-important-dark' : ''">
                             {{ fieldset.name }}
                         </a>
                     </li>

unfold/templates/unfold/helpers/help_text.html

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