django-unfold 0.47.0__py3-none-any.whl → 0.49.0__py3-none-any.whl

unfold/templates/admin/app_index.html

@@ -25,11 +25,7 @@
 {% endif %}
 
 {% block branding %}
-    <h1 id="site-name">
-        <a href="{% url 'admin:index' %}">
-            {{ site_header|default:_('Django administration') }}
-        </a>
-    </h1>
+    {% include "unfold/helpers/site_branding.html" %}
 {% endblock %}
 
 {% block content %}

unfold/templates/admin/base_site.html

@@ -3,7 +3,7 @@
 {% block title %}{% if subtitle %}{{ subtitle }} | {% endif %}{{ title }} | {{ site_title|default:_('Django site admin') }}{% endblock %}
 
 {% block branding %}
-    <h1 id="site-name"><a href="{% url 'admin:index' %}">{{ site_header|default:_('Django administration') }}</a></h1>
+    {% include "unfold/helpers/site_branding.html" %}
 {% endblock %}
 
 {% block nav-global %}{% endblock %}

unfold/templates/admin/index.html

@@ -7,11 +7,7 @@
 {% block title %}{% if subtitle %}{{ subtitle }} | {% endif %}{{ title }} | {{ site_title|default:_('Django site admin') }}{% endblock %}
 
 {% block branding %}
-    <h1 id="site-name">
-        <a href="{% url 'admin:index' %}">
-            {{ site_header|default:_('Django administration') }}
-        </a>
-    </h1>
+    {% include "unfold/helpers/site_branding.html" %}
 {% endblock %}
 
 {% block content %}

unfold/templates/admin/login.html

@@ -29,7 +29,7 @@
             <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 }}</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" %}

unfold/templates/admin/search_form.html

@@ -11,8 +11,10 @@
                 </button>
             </div>
 
-            {% for pair in cl.params.items %}
-                {% if pair.0 != search_var %}<input type="hidden" name="{{ pair.0 }}" value="{{ pair.1 }}">{% endif %}
+            {% for pair in cl.filter_params.items %}
+                {% for val in pair.1 %}
+                    {% if pair.0 != search_var %}<input type="hidden" name="{{ pair.0 }}" value="{{ val }}">{% endif %}
+                {% endfor %}
             {% endfor %}
         </form>
     </div>

unfold/templates/admin/submit_line.html

@@ -12,7 +12,13 @@
                     {% endif %}
 
                     {% for action in actions_submit_line %}
-                        <button type="submit" {% if not action.attrs.name %}name="{{ action.action_name }}"{% endif %} class="border border-base-200 font-medium px-3 py-2 rounded transition-all w-full hover:bg-base-50 lg:w-auto dark:border-base-700 dark:hover:text-base-200 dark:hover:bg-base-900" {% include "unfold/helpers/attrs.html" with attrs=action.attrs %}>
+                        <button type="submit" {% if not action.attrs.name %}name="{{ action.action_name }}"{% endif %} class="border border-base-200 flex font-medium gap-2 items-center px-3 py-2 rounded transition-all w-full hover:bg-base-50 lg:w-auto dark:border-base-700 dark:hover:text-base-200 dark:hover:bg-base-900" {% include "unfold/helpers/attrs.html" with attrs=action.attrs %}>
+                            {% if action.icon %}
+                                <span class="material-symbols-outlined">
+                                    {{ action.icon }}
+                                </span>
+                            {% endif %}
+
                             {{ action.description }}
                         </button>
                     {% endfor %}

unfold/templates/unfold/helpers/account_links.html

@@ -5,7 +5,7 @@
         <span class="material-symbols-outlined">person</span>
     </a>
 
-    <nav class="absolute bg-white border flex flex-col leading-none py-1 -right-2 rounded shadow-lg top-7 w-52 z-50 dark:bg-base-800 dark:border-base-700" x-cloak x-show="openUserLinks" @click.outside="openUserLinks = false">
+    <nav class="absolute bg-white border flex flex-col leading-none py-1 -right-2 rounded 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 flex-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 %}

unfold/templates/unfold/helpers/actions_row.html

@@ -4,15 +4,25 @@
     <td data-label="{% trans "More actions" %}" class="field-actions_holder align-middle flex border-t border-base-200 font-normal px-3 py-2 text-left text-sm before:block before:capitalize before:content-[attr(data-label)] before:mr-auto before:text-base-500 dark:before:text-base-300 lg:before:hidden lg:py-3 lg:table-cell dark:border-base-800 lg:w-px">
         {% with action_id=instance_pk|cut:"-" %}
             <div class="group/action leading-none relative" x-data="{ openActionsId{{ action_id }}: false }">
-                <span x-ref="rowDropdown{{ action_id }}" class="cursor-pointer flex h-7 material-symbols-outlined md-18 -my-1 !leading-7 rounded text-center text-base-400 w-7 group-hover/action:bg-base-100 group-hover/action:text-base-700 dark:text-font-default-dark group-hover/action:dark:bg-base-800 group-hover/action:dark:text-white" @click="openActionsId{{ action_id }} = !openActionsId{{ action_id }}">
+                <span x-ref="rowDropdown{{ action_id }}" class="cursor-pointer flex h-7 material-symbols-outlined md-18 -my-1 !leading-7 rounded text-center text-base-400 w-7 group-hover/action:bg-base-100 group-hover/action:text-base-700 dark:text-font-default-dark group-hover/action:dark:bg-base-800 group-hover/action:dark:text-white"
+                      x-on:click="openActionsId{{ action_id }} = !openActionsId{{ action_id }}"
+                      x-bind:class="{'bg-base-100 text-base-700 dark:bg-base-800 dark:text-white': openActionsId{{ action_id }} }">
                     more_horiz
                 </span>
 
                 <template x-teleport="body">
-                    <nav x-anchor.bottom-end.offset.4="$refs.rowDropdown{{ action_id }}" class="bg-white border flex flex-col leading-none py-1 rounded shadow-lg text-sm top-7 z-50 w-48 dark:bg-base-800 dark:border-base-700" x-cloak x-show="openActionsId{{ action_id }}" @click.outside="openActionsId{{ action_id }} = false">
+                    <nav x-anchor.bottom-end.offset.4="$refs.rowDropdown{{ action_id }}" class="bg-white border flex flex-col py-1 rounded shadow-lg text-sm top-7 z-50 w-48 dark:bg-base-800 dark:border-base-700" x-cloak x-show="openActionsId{{ action_id }}" x-transition x-on:click.outside="openActionsId{{ action_id }} = false">
                         {% for action in actions %}
-                            <a href="{% url action.raw_path instance_pk %}" class="mx-1 px-3 py-2 rounded truncate hover:bg-base-100 dark:hover:bg-base-700 dark:hover:text-base-200"{% for attr_name, attr_value in action.attrs.items %} {{ attr_name }}="{{ attr_value }}"{% endfor %}>
-                                {{ action.title }}
+                            <a href="{% url action.raw_path instance_pk %}" class="flex items-center gap-2 mx-1 px-3 py-2 max-h-[30px] rounded hover:bg-base-100 dark:hover:bg-base-700 dark:hover:text-base-200"{% for attr_name, attr_value in action.attrs.items %} {{ attr_name }}="{{ attr_value }}"{% endfor %}>
+                                {% if action.icon %}
+                                    <span class="material-symbols-outlined">
+                                        {{ action.icon }}
+                                    </span>
+                                {% endif %}
+
+                                <span class="grow truncate">
+                                    {{ action.title }}
+                                </span>
                             </a>
                         {% endfor %}
                     </nav>

unfold/templates/unfold/helpers/language_switch.html

@@ -10,7 +10,7 @@
         <span class="material-symbols-outlined">translate</span>
     </a>
 
-    <div class="absolute bg-white border flex flex-col leading-none py-1 -right-2 rounded shadow-lg top-7 w-52 z-50 dark:bg-base-800 dark:border-base-700" x-cloak x-show="openLanguageLinks" @click.outside="openLanguageLinks = false">
+    <div class="absolute bg-white border flex flex-col leading-none py-1 -right-2 rounded 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 %}

unfold/templates/unfold/helpers/navigation_header.html

@@ -1,13 +1,26 @@
-<div class="border-b border-base-200 mb-5 py-3 dark:border-base-800">
-    <div class="flex font-semibold gap-3 h-10 items-center px-6">
+<div class="border-b border-base-200 flex gap-3 items-center h-[65px] mb-5 dark:border-base-800 px-3" {% if site_dropdown %}x-data="{ openDropdown: false }"{% endif %}>
+    <div class="bg-transparent border border-transparent flex font-semibold gap-3 grow min-w-0 -mx-px h-[48px] items-center px-3 {% if site_dropdown %}cursor-pointer rounded transition-all hover:bg-white hover:border-base-200 hover:shadow-sm hover:dark:bg-base-800 hover:dark:border-base-700{% endif %}"
+         {% if site_dropdown %}
+             x-on:click="openDropdown = !openDropdown"
+             x-bind:class="{'bg-white border-base-200 shadow-sm dark:bg-base-800 dark:border-base-700': openDropdown, 'bg-transparent border-transparent': !openDropdown}"
+         {% endif %}
+    >
         {% if site_logo %}
             {% include "unfold/helpers/site_logo.html" %}
         {% elif branding %}
             {% include "unfold/helpers/site_icon.html" %}
         {% endif %}
 
-        <div class="block cursor-pointer h-4.5 ml-auto xl:!hidden hover:text-base-700 dark:hover:text-base-200" x-on:click="sidebarMobileOpen = !sidebarMobileOpen">
-            <span class="material-symbols-outlined">close</span>
-        </div>
+        {% if site_dropdown %}
+            <span class="material-symbols-outlined ml-auto select-none">
+                unfold_more
+            </span>
+        {% endif %}
     </div>
+
+    <span class="material-symbols-outlined block cursor-pointer h-4.5 xl:!hidden hover:text-base-700 dark:hover:text-base-200" x-on:click="sidebarMobileOpen = !sidebarMobileOpen">
+        close
+    </span>
+
+    {% include "unfold/helpers/site_dropdown.html" %}
 </div>

unfold/templates/unfold/helpers/site_branding.html

@@ -0,0 +1,9 @@
+<h1 id="site-name">
+    {% if site_dropdown %}
+        {{ site_header|default:_('Django administration') }}
+    {% else %}
+        <a href="{% url 'admin:index' %}">
+            {{ site_header|default:_('Django administration') }}
+        </a>
+    {% endif %}
+</h1>

unfold/templates/unfold/helpers/site_dropdown.html

@@ -0,0 +1,19 @@
+{% load i18n %}
+
+{% if site_dropdown %}
+    <div class="absolute bg-white border flex flex-col left-3 py-1 rounded shadow-lg top-[73px] w-[264px] z-50 dark:bg-base-800 dark:border-base-700" x-cloak x-show="openDropdown" x-transition x-on:click.outside="openDropdown = false">
+        {% for item in site_dropdown %}
+            <a href="{{ item.link }}" class="flex flex-row items-center gap-3 max-h-[30px] mx-1 px-2 py-2 rounded hover:bg-base-100 hover:text-base-700 dark:hover:bg-base-700 dark:hover:text-base-200">
+                {% if item.icon %}
+                    <span class="material-symbols-outlined">
+                        {{ item.icon }}
+                    </span>
+                {% endif %}
+
+                <span class="grow truncate">
+                    {{ item.title }}
+                </span>
+            </a>
+        {% endfor %}
+    </div>
+{% endif %}

unfold/templates/unfold/helpers/site_icon.html

@@ -1,21 +1,31 @@
 {% load i18n %}
 
 {% if site_icon %}
-    <a href="{% url "admin:index" %}">
-        {% if site_icon.light and site_icon.dark %}
-            <img src="{{ site_icon.dark }}" alt="{% trans 'Home' %}" class="h-8 hidden dark:block"/>
+    <div class="shrink-0">
+        <a href="{% url "admin:index" %}">
+            {% if site_icon.light and site_icon.dark %}
+                <img src="{{ site_icon.dark }}" alt="{% trans 'Home' %}" class="h-8 hidden dark:block"/>
 
-            <img src="{{ site_icon.light }}" alt="{% trans 'Home' %}" class="block h-8 dark:hidden" />
-        {% else %}
-            <img src="{{ site_icon }}" class="h-8" alt="{% trans 'Home' %}" />
-        {% endif %}
-    </a>
+                <img src="{{ site_icon.light }}" alt="{% trans 'Home' %}" class="block h-8 dark:hidden" />
+            {% else %}
+                <img src="{{ site_icon }}" class="h-8" alt="{% trans 'Home' %}" />
+            {% endif %}
+        </a>
+    </div>
 {% else %}
     <a href="{% url "admin:index" %}" class="bg-primary-600 flex h-8 items-center justify-center rounded text-white text-xs w-8">
         <span class="material-symbols-outlined md-18">{% if site_symbol %}{{ site_symbol }}{% else %}settings{% endif %}</span>
     </a>
 {% endif %}
 
-<div class="text-font-important-light tracking-tight dark:text-font-important-dark xl:text-base">
-    {{ branding }}
+<div class="flex flex-col grow min-w-0">
+    <div class="text-font-important-light leading-normal tracking-tight dark:text-font-important-dark *:leading-none {% if site_subheader %}xl:text-sm{% else %}xl:text-base{% endif %}">
+        {{ branding }}
+    </div>
+
+    {% if site_subheader %}
+        <div class="font-normal leading-normal text-font-subtle-light text-xs truncate dark:text-font-subtle-dark">
+            {{ site_subheader }}
+        </div>
+    {% endif %}
 </div>

unfold/templates/unfold/helpers/tab_action.html

@@ -1,5 +1,38 @@
-<li class="border-b flex-grow text-center md:border-b-0 md:border-r last:border-0 dark:border-base-700">
-    <a href="{{ link }}" class="block px-4 py-2 text-left whitespace-nowrap hover:text-primary-600 dark:hover:text-primary-500"{% if blank %} target="_blank"{% endif %} {% include "unfold/helpers/attrs.html" with attrs=action.attrs %}>
+{% load unfold %}
+
+<li class="border-b flex-grow relative text-center md:border-b-0 md:border-r last:border-0 dark:border-base-700" {% if not link %}x-data="{actionDropdownOpen: false}"{% endif %}>
+    <a {% if link %}href="{{ link }}"{% endif %}class="cursor-pointer flex items-center gap-2 px-4 py-2 text-left whitespace-nowrap hover:text-primary-600 dark:hover:text-primary-500"{% 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="{'text-primary-600 dark:text-primary-500': actionDropdownOpen }"{% endif %}>
+
+        {% if action.icon %}
+            <span class="material-symbols-outlined -ml-1">
+                {{ action.icon }}
+            </span>
+        {% endif %}
+
         {{ title }}
+
+        {% if not link %}
+            <span class="material-symbols-outlined -mr-1 rotate-90">
+                chevron_right
+            </span>
+        {% endif %}
     </a>
+
+    {% if not link %}
+        <nav class="absolute bg-white border flex flex-col -mr-px py-1 right-0 rounded 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 %}
+                <a href="{{ item.path }}" class="flex items-center font-normal gap-2 max-h-[30px] mx-1 px-3 py-2 rounded text-left hover:bg-base-100 hover:text-base-700 dark:hover:bg-base-700 dark:hover:text-base-200"{% if blank %} target="_blank"{% endif %} {% include "unfold/helpers/attrs.html" with attrs=action.attrs %}>
+                    {% if item.icon %}
+                        <span class="material-symbols-outlined -ml-1">
+                            {{ item.icon }}
+                        </span>
+                    {% endif %}
+
+                    <span class="grow truncate">
+                        {{ item.title }}
+                    </span>
+                </a>
+            {% endfor %}
+        </nav>
+    {% endif %}
 </li>

unfold/templates/unfold/helpers/theme_switch.html

@@ -7,7 +7,7 @@
         </span>
     </a>
 
-    <nav class="absolute bg-white border flex flex-col leading-none py-1 -right-2 rounded shadow-lg top-7 w-40 z-50 dark:bg-base-800 dark:border-base-700" x-cloak x-show="openTheme" @click.outside="openTheme = false">
+    <nav class="absolute bg-white border flex flex-col leading-none py-1 -right-2 rounded shadow-lg top-7 w-40 z-50 dark:bg-base-800 dark:border-base-700" x-cloak x-show="openTheme" x-transition x-on:click.outside="openTheme = false">
         <a class="cursor-pointer flex flex-row leading-none mx-1 px-3 py-1.5 rounded hover:bg-base-100 hover:text-base-700 dark:hover:bg-base-700 dark:hover:text-base-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/base.html

@@ -1,11 +1,7 @@
 {% extends "unfold/layouts/base_simple.html" %}
 
 {% block branding %}
-    <h1 id="site-name">
-        <a href="{% url 'admin:index' %}">
-            {{ site_header|default:_('Django administration') }}
-        </a>
-    </h1>
+    {% include "unfold/helpers/site_branding.html" %}
 {% endblock %}
 
 {% block title %}{% if subtitle %}{{ subtitle }} | {% endif %}{{ title }} | {{ site_title|default:_('Django site admin') }}{% endblock %}

unfold/typing.py

@@ -1,5 +1,5 @@
 from collections.abc import Iterable
-from typing import Any, Protocol, Union
+from typing import Any, Optional, Protocol, Union
 
 
 class ActionFunction(Protocol):
@@ -13,6 +13,7 @@ class ActionFunction(Protocol):
     short_description: str
     url_path: str
     attrs: dict[str, Any]
+    icon: Optional[str] = None
 
     def __call__(self, *args, **kwargs):
         pass

unfold/widgets.py

@@ -177,7 +177,9 @@ CHECKBOX_CLASSES = [
     "after:w-4",
     "after:dark:text-base-700",
     "checked:bg-primary-600",
+    "checked:dark:bg-primary-600",
     "checked:border-primary-600",
+    "checked:dark:border-primary-600",
     "checked:transition-all",
     "checked:hover:border-primary-600",
 ]