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

unfold/templates/unfold/helpers/theme_switch.html

@@ -1,32 +1,34 @@
 {% load i18n %}
 
-<div class="relative" x-data="{ openTheme: false }">
-    <a class="block cursor-pointer h-[18px] leading-none hover:text-base-700 dark:hover:text-base-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 border-base-200 flex flex-col leading-none py-1 -right-2 rounded-default 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-default 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!'">
-            <span class="material-symbols-outlined mr-2">dark_mode</span>
-            <span class="leading-none self-center">{% trans "Dark" %}</span>
+{% if not theme %}
+    <div class="relative" x-data="{ openTheme: false }">
+        <a class="block cursor-pointer h-[18px] leading-none hover:text-base-700 dark:hover:text-base-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>
 
-        <a class="cursor-pointer flex flex-row mx-1 px-3 py-1.5 rounded-default hover:bg-base-100 hover:text-base-700 dark:hover:bg-base-700 dark:hover:text-base-200"
-           x-on:click="adminTheme = 'light'"
-           x-bind:class="adminTheme == 'light'  && 'text-primary-600 dark:text-primary-500 dark:hover:text-primary-500! hover:text-primary-600!'">
-            <span class="material-symbols-outlined mr-2">light_mode</span>
-            <span class="leading-none self-center">{% trans "Light" %}</span>
-        </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-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-default 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!'">
+                <span class="material-symbols-outlined mr-2">dark_mode</span>
+                <span class="leading-none self-center">{% trans "Dark" %}</span>
+            </a>
 
-        <a class="cursor-pointer flex flex-row mx-1 px-3 py-1.5 rounded-default hover:bg-base-100 hover:text-base-700 dark:hover:bg-base-700 dark:hover:text-base-200"
-           x-on:click="adminTheme = 'auto'"
-           x-bind:class="adminTheme == 'auto' && 'text-primary-600 dark:text-primary-500 dark:hover:text-primary-500! hover:text-primary-600!'">
-            <span class="material-symbols-outlined mr-2">computer</span>
-            <span class="leading-none self-center">{% trans "System" %}</span>
-        </a>
-    </nav>
-</div>
+            <a class="cursor-pointer flex flex-row mx-1 px-3 py-1.5 rounded-default hover:bg-base-100 hover:text-base-700 dark:hover:bg-base-700 dark:hover:text-base-200"
+               x-on:click="adminTheme = 'light'"
+               x-bind:class="adminTheme == 'light'  && 'text-primary-600 dark:text-primary-500 dark:hover:text-primary-500! hover:text-primary-600!'">
+                <span class="material-symbols-outlined mr-2">light_mode</span>
+                <span class="leading-none self-center">{% trans "Light" %}</span>
+            </a>
+
+            <a class="cursor-pointer flex flex-row mx-1 px-3 py-1.5 rounded-default hover:bg-base-100 hover:text-base-700 dark:hover:bg-base-700 dark:hover:text-base-200"
+               x-on:click="adminTheme = 'auto'"
+               x-bind:class="adminTheme == 'auto' && 'text-primary-600 dark:text-primary-500 dark:hover:text-primary-500! hover:text-primary-600!'">
+                <span class="material-symbols-outlined mr-2">computer</span>
+                <span class="leading-none self-center">{% trans "System" %}</span>
+            </a>
+        </nav>
+    </div>
+{% endif %}

unfold/templates/unfold/helpers/unauthenticated_header.html

@@ -0,0 +1,15 @@
+{% load i18n %}
+
+<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>

unfold/templates/unfold/helpers/unauthenticated_title.html

@@ -0,0 +1,11 @@
+{% load i18n %}
+
+<div class="border-b border-base-200 mb-8 pb-6 dark:border-base-800">
+    <h1 class="font-semibold">
+        {% if subtitle %}
+            <span class="block text-font-important-light dark:text-font-important-dark">{{ subtitle }} </span>
+        {% endif %}
+
+        <span class="block text-primary-600 text-xl dark:text-primary-500">{{ title }}</span>
+    </h1>
+</div>

unfold/templates/unfold/helpers/userlinks.html

@@ -11,13 +11,9 @@
                 {{ extra_userlinks }}
             {% endif %}
 
-            {% if show_languages %}
-                {% include "unfold/helpers/language_switch.html" %}
-            {% endif %}
+            {% include "unfold/helpers/language_switch.html" %}
 
-            {% if not theme %}
-                {% include "unfold/helpers/theme_switch.html" %}
-            {% endif %}
+            {% include "unfold/helpers/theme_switch.html" %}
 
             {% include "unfold/helpers/account_links.html" %}
         </div>

unfold/templates/unfold/helpers/welcomemsg.html

@@ -1,15 +1,17 @@
 {% load unfold i18n %}
 
 <div class="flex flex-row grow font-semibold items-center min-w-0 mr-3">
-    <span class="cursor-pointer flex flex-row items-center">
-        <span class="material-symbols-outlined hidden! xl:block!" hx-get="{% url "admin:toggle_sidebar" %}" hx-swap="none" x-on:click="sidebarDesktopOpen = !sidebarDesktopOpen">
-            dock_to_right
-        </span>
+    {% if is_nav_sidebar_enabled %}
+        <span class="cursor-pointer flex flex-row items-center">
+            <span class="material-symbols-outlined hidden! xl:block!" hx-get="{% url "admin:toggle_sidebar" %}" hx-swap="none" x-on:click="sidebarDesktopOpen = !sidebarDesktopOpen">
+                dock_to_right
+            </span>
 
-        <span class="material-symbols-outlined block! xl:hidden!" x-on:click="sidebarMobileOpen = !sidebarMobileOpen">
-            dock_to_right
+            <span class="material-symbols-outlined block! xl:hidden!" x-on:click="sidebarMobileOpen = !sidebarMobileOpen">
+                dock_to_right
+            </span>
         </span>
-    </span>
+    {% endif %}
 
     <span class="block bg-base-200 h-5 mx-3 w-px dark:bg-base-700"></span>
 

unfold/templates/unfold/layouts/unauthenticated.html

@@ -0,0 +1,37 @@
+{% extends 'unfold/layouts/skeleton.html' %}
+
+{% load i18n static unfold %}
+
+
+{% block bodyclass %}{{ block.super }}bg-base-50 login dark:bg-base-900{% endblock %}
+
+{% block usertools %}{% endblock %}
+
+{% block nav-global %}{% endblock %}
+
+{% block nav-sidebar %}{% endblock %}
+
+{% block content_title %}{% endblock %}
+
+{% block breadcrumbs %}{% endblock %}
+
+{% block title %}
+    {{ title }} | {{ site_title }}
+{% endblock %}
+
+{% 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">
+                {% block content %}{% endblock %}
+            </div>
+
+            {% include "unfold/helpers/unauthenticated_header.html" %}
+        </div>
+
+        {% if login_image %}
+            <div class="bg-cover grow hidden max-w-3xl xl:max-w-4xl xl:block" style="background-image: url('{{ login_image }}')">
+            </div>
+        {% endif %}
+    </div>
+{% endblock %}

unfold/templates/unfold/widgets/select.html

@@ -5,5 +5,5 @@
                 </optgroup>{% endif %}{% endfor %}
     </select>
 
-    <span class="material-symbols-outlined absolute group-[.primary]:text-white -ml-[31px] pointer-events-none text-base-400 top-0 top-1/2 hover:text-base-700 dark:text-base-500 dark:hover:text-base-200 -translate-y-1/2">expand_more</span>
+    <span class="material-symbols-outlined absolute group-[.primary]:text-white pointer-events-none mr-[12px] right-0 text-base-400 top-0 top-1/2 hover:text-base-700 dark:text-base-500 dark:hover:text-base-200 -translate-y-1/2">expand_more</span>
 </div>

unfold/templates/unfold/widgets/text.html

@@ -0,0 +1,28 @@
+
+<div class="max-w-2xl relative">
+    {% if widget.prefix %}
+        <span class="absolute left-3 top-0 bottom-0 flex items-center justify-center">
+            {{ widget.prefix }}
+        </span>
+    {% endif %}
+
+    {% if widget.prefix_icon %}
+        <span class="material-symbols-outlined absolute left-3 top-0 bottom-0 flex items-center justify-center text-base-400 dark:text-base-500">
+            {{ widget.prefix_icon }}
+        </span>
+    {% endif %}
+
+    {% include "django/forms/widgets/input.html" %}
+
+    {% if widget.suffix %}
+        <span class="absolute right-3 top-0 bottom-0 flex items-center justify-center">
+            {{ widget.suffix }}
+        </span>
+    {% endif %}
+
+    {% if widget.suffix_icon %}
+        <span class="material-symbols-outlined absolute right-3 top-0 bottom-0 flex items-center justify-center text-base-400 dark:text-base-500">
+            {{ widget.suffix_icon }}
+        </span>
+    {% endif %}
+</div>

unfold/templates/unfold_crispy/layout/fieldset.html

@@ -5,5 +5,7 @@
         </legend>
     {% endif %}
 
-    {{ fields|safe }}
+    <div class="flex flex-col gap-5">
+        {{ fields|safe }}
+    </div>
 </fieldset>

unfold/templates/unfold_crispy/layout/fieldset_subheader.html

@@ -0,0 +1,3 @@
+<div class="border-b border-t border-base-200 font-semibold -mx-3 py-2.5 px-3 text-font-important-light first:border-t-0 first:-mt-5 dark:border-base-800 dark:text-font-important-dark">
+    {{ title }}
+</div>

unfold/templatetags/unfold.py

@@ -4,12 +4,13 @@ from typing import Any, Optional, Union
 
 from django import template
 from django.contrib.admin.helpers import AdminForm, Fieldset
-from django.contrib.admin.views.main import ChangeList
+from django.contrib.admin.views.main import PAGE_VAR, ChangeList
 from django.contrib.admin.widgets import RelatedFieldWidgetWrapper
+from django.core.paginator import Paginator
 from django.db.models import Model
 from django.db.models.options import Options
 from django.forms import BoundField, CheckboxSelectMultiple, Field
-from django.http import HttpRequest
+from django.http import HttpRequest, QueryDict
 from django.template import Context, Library, Node, RequestContext, TemplateSyntaxError
 from django.template.base import NodeList, Parser, Token, token_kwargs
 from django.template.loader import render_to_string
@@ -569,3 +570,37 @@ def changeform_condition(field: BoundField) -> BoundField:
         field.field.field.widget.attrs["x-model.fill"] = field.field.name
 
     return field
+
+
+@register.simple_tag
+def infinite_paginator_url(cl, i):
+    return cl.get_query_string({PAGE_VAR: i})
+
+
+@register.simple_tag
+def elided_page_range(
+    paginator: Paginator, number: int
+) -> Optional[list[Union[int, str]]]:
+    if not paginator or not number:
+        return None
+
+    return paginator.get_elided_page_range(number=number)
+
+
+@register.simple_tag(takes_context=True)
+def querystring_params(
+    context: RequestContext, query_key: str, query_value: str
+) -> str:
+    request = context.get("request")
+    result = QueryDict(mutable=True)
+
+    for key, values in request.GET.lists():
+        if key == query_key:
+            continue
+
+        for value in values:
+            result[key] = value
+
+    result[query_key] = query_value
+
+    return result.urlencode()

unfold/utils.py

@@ -150,7 +150,7 @@ def hex_to_rgb(hex_color: str) -> list[int]:
     return (r, g, b)
 
 
-def prettify_json(data: Any) -> Optional[str]:
+def prettify_json(data: Any, encoder: Any) -> Optional[str]:
     try:
         from pygments import highlight
         from pygments.formatters import HtmlFormatter
@@ -167,7 +167,7 @@ def prettify_json(data: Any) -> Optional[str]:
         )
         return highlight(response, JsonLexer(), formatter)
 
-    response = json.dumps(data, sort_keys=True, indent=4)
+    response = json.dumps(data, sort_keys=True, indent=4, cls=encoder)
 
     return mark_safe(
         f'<div class="block dark:hidden">{format_response(response, "colorful")}</div>'

unfold/widgets.py

@@ -123,9 +123,10 @@ TEXTAREA_EXPANDABLE_CLASSES = [
 
 SELECT_CLASSES = [
     *BASE_INPUT_CLASSES,
-    "pr-8",
+    "pr-8!",
     "max-w-2xl",
     "appearance-none",
+    "truncate",
 ]
 
 PROSE_CLASSES = [
@@ -287,7 +288,47 @@ FILE_CLASSES = [
 ]
 
 
-class UnfoldAdminTextInputWidget(AdminTextInputWidget):
+class UnfoldPrefixSuffixMixin:
+    def get_context(self, name, value, attrs):
+        widget = {}
+
+        if "prefix" in self.attrs:
+            widget["prefix"] = self.attrs["prefix"]
+            del self.attrs["prefix"]
+
+        if "prefix_icon" in self.attrs:
+            widget["prefix_icon"] = self.attrs["prefix_icon"]
+            self.attrs["class"] = " ".join([self.attrs["class"], "pl-9"])
+            del self.attrs["prefix_icon"]
+
+        if "suffix" in self.attrs:
+            widget["suffix"] = self.attrs["suffix"]
+            del self.attrs["suffix"]
+
+        if "suffix_icon" in self.attrs:
+            widget["suffix_icon"] = self.attrs["suffix_icon"]
+            self.attrs["class"] = " ".join([self.attrs["class"], "pr-9"])
+            del self.attrs["suffix_icon"]
+
+        widget.update(
+            {
+                "name": name,
+                "is_hidden": self.is_hidden,
+                "required": self.is_required,
+                "value": self.format_value(value),
+                "attrs": self.build_attrs(self.attrs, attrs),
+                "template_name": self.template_name,
+            }
+        )
+
+        return {
+            "widget": widget,
+        }
+
+
+class UnfoldAdminTextInputWidget(UnfoldPrefixSuffixMixin, AdminTextInputWidget):
+    template_name = "unfold/widgets/text.html"
+
     def __init__(self, attrs: Optional[dict[str, Any]] = None) -> None:
         super().__init__(
             attrs={
@@ -759,8 +800,13 @@ try:
         template_name = "unfold/widgets/split_money.html"
 
         def __init__(self, *args, **kwargs):
+            if "attrs" in kwargs:
+                attrs = kwargs.pop("attrs")
+            else:
+                attrs = {}
+
             super().__init__(
-                amount_widget=UnfoldAdminTextInputWidget,
+                amount_widget=UnfoldAdminTextInputWidget(attrs=attrs),
                 currency_widget=UnfoldAdminSelectWidget(
                     choices=CURRENCY_CHOICES,
                     attrs={