django-unfold 0.41.0__py3-none-any.whl → 0.43.0__py3-none-any.whl

unfold/templates/unfold/helpers/tab_list.html

@@ -8,7 +8,7 @@
                     {% for item in tabs_list %}
                         {% if item.has_permission %}
                             <li class="border-b last:border-b-0 md:border-b-0 md:mr-8 dark:border-gray-800">
-                                <a href="{% if item.link_callback %}{{ item.link_callback }}{% else %}{{ item.link }}{% endif %}" class="block px-3 py-2 md:py-4 md:px-0 dark:border-gray-800 {% if item.active %} border-b font-semibold -mb-px text-primary-600 hover:text-primary-600 dark:text-primary-500 dark:hover:text-primary-500 md:border-primary-500 dark:md:!border-primary-600{% else %}font-medium hover:text-gray-700 dark:hover:text-gray-200{% endif %}">
+                                <a href="{% if item.link_callback %}{{ item.link_callback }}{% else %}{{ item.link }}{% endif %}" class="block px-3 py-2 md:py-4 md:px-0 dark:border-gray-800 {% if item.active %} border-b font-semibold -mb-px text-primary-600 hover:text-primary-600 dark:text-primary-500 dark:hover:text-primary-500 md:border-primary-500 dark:md:!border-primary-600{% else %}font-medium hover:text-primary-600 dark:hover:text-primary-500{% endif %}">
                                     {{ item.title }}
                                 </a>
                             </li>
@@ -20,7 +20,7 @@
                             <a class="block cursor-pointer font-medium px-3 py-2 md:py-4 md:px-0"
                                href="#general"
                                x-on:click="activeTab = 'general'"
-                               x-bind:class="{'border-b border-gray-200 dark:border-gray-800 md:border-primary-500 dark:md:!border-primary-600 font-semibold -mb-px text-primary-600 dark:text-primary-500': activeTab == 'general', 'hover:text-gray-700 dark:hover:text-gray-200 dark:border-gray-800': activeTab != 'general'}">
+                               x-bind:class="{'border-b border-gray-200 dark:border-gray-800 md:border-primary-500 dark:md:!border-primary-600 font-semibold -mb-px text-primary-600 dark:text-primary-500': activeTab == 'general', 'hover:text-primary-600 dark:hover:text-primary-500 dark:border-gray-800': activeTab != 'general'}">
                                 {% trans "General" %}
                             </a>
                         </li>
@@ -30,7 +30,7 @@
                                 <a class="block cursor-pointer font-medium px-3 py-2 md:py-4 md:px-0"
                                    href="#{{ inline.opts.verbose_name|slugify }}"
                                    x-on:click="activeTab = '{{ inline.opts.verbose_name|slugify }}'"
-                                   x-bind:class="{'border-b border-gray-200 dark:border-gray-800 md:border-primary-500 dark:md:!border-primary-600 font-semibold -mb-px text-primary-600 dark:text-primary-500': activeTab == '{{ inline.opts.verbose_name|slugify }}', 'hover:text-gray-700 dark:hover:text-gray-200 dark:border-gray-800': activeTab != '{{ inline.opts.verbose_name|slugify }}'}">
+                                   x-bind:class="{'border-b border-gray-200 dark:border-gray-800 md:border-primary-500 dark:md:!border-primary-600 font-semibold -mb-px text-primary-600 dark:text-primary-500': activeTab == '{{ inline.opts.verbose_name|slugify }}', 'hover:text-primary-600 dark:hover:text-primary-500 dark:border-gray-800': activeTab != '{{ inline.opts.verbose_name|slugify }}'}">
                                     {% if inline.formset.max_num == 1 %}
                                         {{ inline.opts.verbose_name|capfirst }}
                                     {% else %}

unfold/templates/unfold/helpers/theme_switch.html

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

unfold/templates/unfold/helpers/userlinks.html

@@ -7,6 +7,10 @@
                 {% include "unfold/helpers/label.html" with text=environment.0 type=environment.1 %}
             {% endif %}
 
+            {% if show_languages %}
+                {% include "unfold/helpers/language_switch.html" %}
+            {% endif %}
+
             {% if not theme %}
                 {% include "unfold/helpers/theme_switch.html" %}
             {% endif %}

unfold/templates/unfold/helpers/welcomemsg.html

@@ -1,6 +1,14 @@
 {% load i18n %}
 
-<div class="flex-grow font-semibold min-w-0 mr-3">
+<div class="flex flex-row flex-grow font-semibold items-center min-w-0 mr-3">
+    <span class="cursor-pointer hidden flex-row items-center text-sm xl:flex">
+        <span class="material-symbols-outlined" hx-get="{% url "admin:toggle_sidebar" %}" hx-swap="none" x-on:click="sidebarDesktopOpen = !sidebarDesktopOpen">
+            dock_to_right
+        </span>
+    </span>
+
+    <span class="hidden bg-gray-200 h-5 mx-3 w-px xl:block dark:bg-gray-700"></span>
+
     <h1 class="overflow-hidden text-ellipsis text-sm whitespace-nowrap xl:text-base text-font-important-light dark:text-font-important-dark">
         {% if content_title %}
             <span class="tracking-tight">

unfold/templates/unfold/layouts/base_simple.html

@@ -21,7 +21,7 @@
                 {% endspaceless %}
             {% endif %}
 
-            <div class="px-4 lg:px-12">
+            <div class="px-4 lg:px-8">
                 <div id="content" class="container mx-auto {% block coltype %}colM{% endblock %}">
                     {% block content %}
                         {% block object-tools %}{% endblock %}

unfold/templates/unfold/layouts/skeleton.html

@@ -58,7 +58,7 @@
 
         {% if colors %}
             <style>
-                html {
+                :root {
                     {% for name, weights in colors.items %}
                         {% for weight, value in weights.items %}
                             --color-{{ name }}-{{ weight }}: {{ value }};

unfold/templates/unfold/templatetags/preserve_changelist_filters.html

@@ -0,0 +1,3 @@
+{% for key, value in params.items %}
+  <input type="hidden" name="{{ key }}" value="{{ value }}">
+{% endfor %}

unfold/templates/unfold/widgets/clearable_file_input.html

@@ -21,7 +21,7 @@
         </div>
     {% endif %}
 
-    <input type="text" aria-label="{% trans 'Choose file to upload' %}" value="{% if widget.value %}{{ widget.value.url }}{% else %}{% trans 'Choose file to upload' %}{% endif %}" disabled class="bg-white flex-grow font-medium px-3 py-2 text-ellipsis dark:bg-gray-900">
+    <input type="text" aria-label="{% trans 'Choose file to upload' %}" value="{% if widget.value %}{{ widget.value.url }}{% else %}{% trans 'Choose file to upload' %}{% endif %}" disabled class="bg-white flex-grow font-medium min-w-0 px-3 py-2 text-ellipsis dark:bg-gray-900">
 
     <div class="flex flex-none items-center leading-none self-stretch">
         <div class="hidden">

unfold/templates/unfold/widgets/clearable_file_input_small.html

@@ -14,7 +14,7 @@
             </div>
         {% endif %}
 
-        <input type="text" aria-label="{% trans 'Choose file to upload' %}" value="{% if widget.value %}{{ widget.value.url }}{% else %}{% trans 'Choose file to upload' %}{% endif %}" disabled class="bg-white flex-grow font-medium px-3 py-2 text-ellipsis dark:bg-gray-900">
+        <input type="text" aria-label="{% trans 'Choose file to upload' %}" value="{% if widget.value %}{{ widget.value.url }}{% else %}{% trans 'Choose file to upload' %}{% endif %}" disabled class="bg-white flex-grow font-medium min-w-0 px-3 py-2 text-ellipsis dark:bg-gray-900">
 
         <div class="flex flex-none items-center leading-none self-stretch">
             <div class="hidden">

unfold/templates/unfold/widgets/split_datetime_vertical.html

@@ -1,4 +1,4 @@
-<div class="datetime flex flex-col max-w-2xl">
+<div class="datetime flex flex-col max-w-2xl w-full">
     <div class="flex flex-col flex-wrap mb-2">
         {% if date_label %}
             <div class="mb-2">

unfold/templatetags/unfold.py

@@ -1,13 +1,17 @@
-from typing import Any, Dict, List, Mapping, Optional, Union
+from typing import Any, Dict, List, Mapping, Optional, Set, Union
 
 from django import template
 from django.contrib.admin.helpers import AdminForm, Fieldset
+from django.contrib.admin.views.main import ChangeList
 from django.forms import Field
-from django.template import Library, Node, RequestContext, TemplateSyntaxError
+from django.http import HttpRequest
+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
 from django.utils.safestring import SafeText
 
+from unfold.components import ComponentRegistry
+
 register = Library()
 
 
@@ -152,24 +156,37 @@ class RenderComponentNode(template.Node):
         template_name: str,
         nodelist: NodeList,
         extra_context: Optional[Dict] = None,
+        include_context: bool = False,
         *args,
         **kwargs,
     ):
         self.template_name = template_name
         self.nodelist = nodelist
         self.extra_context = extra_context or {}
+        self.include_context = include_context
         super().__init__(*args, **kwargs)
 
     def render(self, context: RequestContext) -> str:
-        result = self.nodelist.render(context)
+        values = {
+            name: var.resolve(context) for name, var in self.extra_context.items()
+        }
+
+        values.update(
+            {
+                "children": self.nodelist.render(context),
+            }
+        )
 
-        ctx = {name: var.resolve(context) for name, var in self.extra_context.items()}
-        ctx.update({"children": result})
+        if "component_class" in values:
+            values = ComponentRegistry.create_instance(
+                values["component_class"], request=context.request
+            ).get_context_data(**values)
+
+        if self.include_context:
+            values.update(context.flatten())
 
         return render_to_string(
-            self.template_name,
-            request=context.request,
-            context=ctx,
+            self.template_name, request=context.request, context=values
         )
 
 
@@ -200,17 +217,21 @@ def do_component(parser: Parser, token: Token) -> str:
                 raise TemplateSyntaxError(
                     '"with" in {bits[0]} tag needs at least one keyword argument.'
                 )
+        elif option == "include_context":
+            value = True
         else:
             raise TemplateSyntaxError(f"Unknown argument for {bits[0]} tag: {option}.")
 
         options[option] = value
 
+    include_context = options.get("include_context", False)
     nodelist = parser.parse(("endcomponent",))
     template_name = bits[1][1:-1]
+
     extra_context = options.get("with", {})
     parser.next_token()
 
-    return RenderComponentNode(template_name, nodelist, extra_context)
+    return RenderComponentNode(template_name, nodelist, extra_context, include_context)
 
 
 @register.filter
@@ -224,3 +245,28 @@ def add_css_class(field: Field, classes: Union[list, tuple]) -> Field:
         field.field.widget.attrs["class"] = classes
 
     return field
+
+
+@register.inclusion_tag(
+    "unfold/templatetags/preserve_changelist_filters.html",
+    takes_context=True,
+    name="preserve_filters",
+)
+def preserve_changelist_filters(context: Context) -> Dict[str, Dict[str, str]]:
+    """
+    Generate hidden input fields to preserve filters for POST forms.
+    """
+    request: Optional[HttpRequest] = context.get("request")
+    changelist: Optional[ChangeList] = context.get("cl")
+
+    if not request or not changelist:
+        return {"params": {}}
+
+    used_params: Set[str] = {
+        param for spec in changelist.filter_specs for param in spec.used_parameters
+    }
+    preserved_params: Dict[str, str] = {
+        param: value for param, value in request.GET.items() if param not in used_params
+    }
+
+    return {"params": preserved_params}

unfold/utils.py

@@ -3,6 +3,7 @@ import decimal
 import json
 from typing import Any, Iterable, List, Optional
 
+from django.conf import settings
 from django.db import models
 from django.template.loader import render_to_string
 from django.utils import formats, timezone
@@ -146,3 +147,19 @@ def prettify_json(data: Any) -> Optional[str]:
         f'<div class="block dark:hidden">{format_response(response, "colorful")}</div>'
         f'<div class="hidden dark:block">{format_response(response, "monokai")}</div>'
     )
+
+
+def parse_date_str(value: str) -> Optional[datetime.date]:
+    for format in settings.DATE_INPUT_FORMATS:
+        try:
+            return datetime.datetime.strptime(value, format).date()
+        except (ValueError, TypeError):
+            continue
+
+
+def parse_datetime_str(value: str) -> Optional[datetime.datetime]:
+    for format in settings.DATETIME_INPUT_FORMATS:
+        try:
+            return datetime.datetime.strptime(value, format)
+        except (ValueError, TypeError):
+            continue

unfold/widgets.py

@@ -35,7 +35,7 @@ from .exceptions import UnfoldException
 
 LABEL_CLASSES = [
     "block",
-    "font-medium",
+    "font-semibold",
     "mb-2",
     "text-font-important-light",
     "text-sm",
@@ -43,7 +43,7 @@ LABEL_CLASSES = [
 ]
 
 CHECKBOX_LABEL_CLASSES = [
-    "font-medium",
+    "font-semibold",
     "ml-2",
     "text-sm",
     "text-font-important-light",
@@ -332,6 +332,8 @@ class UnfoldAdminImageSmallFieldWidget(FileFieldMixin, AdminFileWidget):
 
 
 class UnfoldAdminDateWidget(AdminDateWidget):
+    template_name = "unfold/widgets/date.html"
+
     def __init__(
         self, attrs: Optional[Dict[str, Any]] = None, format: Optional[str] = None
     ) -> None:
@@ -358,6 +360,8 @@ class UnfoldAdminSingleDateWidget(AdminDateWidget):
 
 
 class UnfoldAdminTimeWidget(AdminTimeWidget):
+    template_name = "unfold/widgets/time.html"
+
     def __init__(
         self, attrs: Optional[Dict[str, Any]] = None, format: Optional[str] = None
     ) -> None: