django-unfold 0.62.0__py3-none-any.whl → 0.64.0__py3-none-any.whl

unfold/templates/unfold/helpers/unauthenticated_header.html

@@ -2,8 +2,8 @@
 
 <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 href="{{ site_url }}" class="flex font-medium gap-2 group items-center text-sm text-primary-600 dark:text-primary-500">
+            <span class="material-symbols-outlined left-0 relative text-sm transition-all group-hover:-left-1">arrow_back</span> {% trans 'Return to site' %}
         </a>
     {% endif %}
 

unfold/templates/unfold/helpers/unauthenticated_title.html

@@ -6,6 +6,6 @@
             <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>
+        <span class="block font-semibold text-primary-600 tracking-tight text-xl dark:text-primary-500">{{ title }}</span>
     </h1>
 </div>

unfold/templates/unfold/helpers/welcomemsg.html

@@ -1,4 +1,4 @@
-{% load unfold i18n %}
+{% load unfold i18n admin_urls unfold %}
 
 <div class="flex flex-row grow font-semibold items-center min-w-0 mr-3">
     {% if is_nav_sidebar_enabled %}
@@ -17,25 +17,13 @@
 
     {% include "unfold/helpers/header_back_button.html" %}
 
-    <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">
-                {{ pretitle }}
+    <h1 class="overflow-hidden leading-5 text-ellipsis text-font-important-light whitespace-nowrap xl:text-base dark:text-font-important-dark">
+        {% header_title %}
 
-                {{ content_title }}
+        {% if cl and cl.full_result_count != cl.result_count and cl.paginator|class_name != "InfinitePaginator" %}
+            <span class="font-medium ml-2 text-font-subtle-light text-sm dark:text-font-subtle-dark">
+                {% blocktranslate count counter=cl.result_count %}{{ counter }} result{% plural %}{{ counter }} results{% endblocktranslate %} (<a href="?{% if cl.is_popup %}_popup=1{% endif %}">{% if cl.show_full_result_count %}{% blocktranslate with full_result_count=cl.full_result_count %}{{ full_result_count }} total{% endblocktranslate %}{% else %}{% translate "Show all" %}{% endif %}</a>)
             </span>
-
-            {% if cl and cl.full_result_count != cl.result_count and cl.paginator|class_name != "InfinitePaginator" %}
-                <span class="font-medium ml-2 text-font-subtle-light text-sm dark:text-font-subtle-dark">
-                    {% blocktranslate count counter=cl.result_count %}{{ counter }} result{% plural %}{{ counter }} results{% endblocktranslate %} (<a href="?{% if cl.is_popup %}_popup=1{% endif %}">{% if cl.show_full_result_count %}{% blocktranslate with full_result_count=cl.full_result_count %}{{ full_result_count }} total{% endblocktranslate %}{% else %}{% translate "Show all" %}{% endif %}</a>)
-                </span>
-            {% endif %}
-
-            {% if content_subtitle %}
-                {{ content_subtitle }}
-            {% endif %}
-        {% else %}
-            {% translate 'Welcome,' %} <strong>{% firstof user.get_short_name user.get_username %}</strong>.
         {% endif %}
     </h1>
 </div>

unfold/templates/unfold/layouts/base_simple.html

@@ -15,12 +15,6 @@
                 {% include "unfold/helpers/header.html" %}
             {% endblock %}
 
-            {% if not is_popup %}
-                {% spaceless %}
-                    {% block breadcrumbs %}{% endblock %}
-                {% endspaceless %}
-            {% endif %}
-
             <div class="px-4">
                 <div id="content" class="container mx-auto {% block coltype %}colM{% endblock %}">
                     {% block content %}

unfold/templates/unfold/layouts/skeleton.html

@@ -11,6 +11,7 @@
 {% capture as nav_global_side silent %}{% block nav-global-side %}{% endblock %}{% endcapture %}
 {% capture as actions_items silent %}{% block actions-items %}{% endblock %}{% endcapture %}
 {% capture as extra_userlinks silent %}{% block extra_userlinks %}{% endblock %}{% endcapture %}
+{% capture as show_back_button silent %}{% block show_back_button %}{{ show_back_button }}{% endblock %}{% endcapture %}
 
 <!DOCTYPE html>
 <html lang="{{ LANGUAGE_CODE|default:"en-us" }}" dir="{{ LANGUAGE_BIDI|yesno:"rtl,ltr,auto" }}" {% if theme %}class="{{ theme }}"{% endif %} x-data="{ adminTheme: {% if theme %}'{{ theme }}'{% else %}$persist('auto').as('adminTheme'){% endif %} }" x-bind:class="{'dark': adminTheme === 'dark' || (adminTheme === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches)}" x-cloak>
@@ -78,7 +79,9 @@
         {% block base %}{% endblock %}
 
         <div id="modal-overlay" class="backdrop-blur-xs bg-base-900/80 bottom-0 fixed hidden left-0 mr-1 right-0 top-0 z-50"></div>
+
+        {% include "unfold/helpers/command.html" %}
+
         <script src="{% static 'unfold/js/simplebar/simplebar.js' %}"></script>
     </body>
-
 </html>

unfold/templates/unfold/layouts/unauthenticated.html

@@ -13,8 +13,6 @@
 
 {% block content_title %}{% endblock %}
 
-{% block breadcrumbs %}{% endblock %}
-
 {% block title %}
     {{ title }} | {{ site_title }}
 {% endblock %}

unfold/templates/unfold/widgets/related_widget_wrapper.html

@@ -9,7 +9,7 @@
                 {% if not is_hidden %}
                     {% if can_add_related or can_change_related or can_delete_related or can_view_related%}
                         {% if can_change_related %}
-                            <a class="related-widget-wrapper-link change-related bg-white border border-base-200 cursor-pointer flex items-center h-[38px] justify-center ml-2 rounded-default shadow-xs shrink-0 text-base-400 text-sm w-[38px] hover:text-base-700 dark:bg-base-900 dark:border-base-700 dark:text-base-500 dark:hover:text-base-200"
+                            <a class="related-widget-wrapper-link change-related bg-white border border-base-200 cursor-pointer flex items-center h-[38px] justify-center ml-2 rounded-default shadow-xs shrink-0 text-base-400 text-sm w-[38px] hover:text-base-700 dark:bg-base-900 dark:border-base-700 dark:text-base-500 dark:hover:text-base-200 focus:outline-2 focus:-outline-offset-2 focus:outline-primary-600"
                                id="change_id_{{ name }}"
                                data-popup="yes"
                                data-href-template="{{ change_related_template_url }}?{{ url_params }}"
@@ -19,7 +19,7 @@
                         {% endif %}
 
                         {% if can_add_related %}
-                            <a class="related-widget-wrapper-link add-related bg-white border border-base-200  cursor-pointer flex items-center h-[38px] justify-center ml-2 rounded-default shadow-xs shrink-0 text-base-400 text-sm w-[38px] hover:text-base-700 dark:bg-base-900 dark:border-base-700 dark:text-base-500 dark:hover:text-base-200"
+                            <a class="related-widget-wrapper-link add-related bg-white border border-base-200  cursor-pointer flex items-center h-[38px] justify-center ml-2 rounded-default shadow-xs shrink-0 text-base-400 text-sm w-[38px] hover:text-base-700 dark:bg-base-900 dark:border-base-700 dark:text-base-500 dark:hover:text-base-200 focus:outline-2 focus:-outline-offset-2 focus:outline-primary-600"
                                data-popup="yes"
                                id="add_id_{{ name }}"
                                href="{{ add_related_url }}?{{ url_params }}"
@@ -29,7 +29,7 @@
                         {% endif %}
 
                         {% if can_view_related %}
-                            <a class="related-widget-wrapper-link view-related bg-white border border-base-200 cursor-pointer flex items-center h-[38px] justify-center ml-2 rounded-default shadow-xs shrink-0 text-base-400 text-sm w-[38px] hover:text-base-700 dark:bg-base-900 dark:border-base-700 dark:text-base-500 dark:hover:text-base-200"
+                            <a class="related-widget-wrapper-link view-related bg-white border border-base-200 cursor-pointer flex items-center h-[38px] justify-center ml-2 rounded-default shadow-xs shrink-0 text-base-400 text-sm w-[38px] hover:text-base-700 dark:bg-base-900 dark:border-base-700 dark:text-base-500 dark:hover:text-base-200 focus:outline-2 focus:-outline-offset-2 focus:outline-primary-600"
                                id="view_id_{{ name }}"
                                data-href-template="{{ change_related_template_url }}?{{ view_related_url_params }}"
                                title="{% blocktranslate %}View selected {{ model }}{% endblocktranslate %}">
@@ -38,7 +38,7 @@
                         {% endif %}
 
                         {% if can_delete_related %}
-                            <a class="related-widget-wrapper-link delete-related bg-white border border-base-200 cursor-pointer flex items-center h-[38px] justify-center ml-2 rounded-default shadow-xs shrink-0 text-red-600 text-sm w-[38px] dark:bg-base-900 dark:border-base-700 dark:text-red-500"
+                            <a class="related-widget-wrapper-link delete-related bg-white border border-base-200 cursor-pointer flex items-center h-[38px] justify-center ml-2 rounded-default shadow-xs shrink-0 text-red-600 text-sm w-[38px] dark:bg-base-900 dark:border-base-700 dark:text-red-500 focus:outline-2 focus:-outline-offset-2 focus:outline-red-500"
                                id="delete_id_{{ name }}"
                                data-href-template="{{ delete_related_template_url }}?{{ url_params }}"
                                data-popup="yes"

unfold/templatetags/unfold.py

@@ -14,7 +14,9 @@ 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
+from django.urls import reverse_lazy
 from django.utils.safestring import SafeText, mark_safe
+from django.utils.translation import gettext_lazy as _
 
 from unfold.components import ComponentRegistry
 from unfold.dataclasses import UnfoldAction
@@ -603,3 +605,142 @@ def querystring_params(
     result[query_key] = query_value
 
     return result.urlencode()
+
+
+@register.simple_tag(takes_context=True)
+def header_title(context: RequestContext) -> str:
+    parts = []
+    opts = context.get("opts")
+
+    if opts:
+        parts.append(
+            {
+                "link": reverse_lazy("admin:app_list", args=[opts.app_label]),
+                "title": opts.app_config.verbose_name,
+            }
+        )
+
+        if (original := context.get("original")) and not isinstance(original, str):
+            parts.append(
+                {
+                    "link": reverse_lazy(
+                        f"admin:{original._meta.app_label}_{original._meta.model_name}_changelist"
+                    ),
+                    "title": original._meta.verbose_name_plural,
+                }
+            )
+
+            parts.append(
+                {
+                    "link": reverse_lazy(
+                        f"admin:{original._meta.app_label}_{original._meta.model_name}_change",
+                        args=[original.pk],
+                    ),
+                    "title": original,
+                }
+            )
+        elif object := context.get("object"):
+            parts.append(
+                {
+                    "link": reverse_lazy(
+                        f"admin:{object._meta.app_label}_{object._meta.model_name}_changelist"
+                    ),
+                    "title": object._meta.verbose_name_plural,
+                }
+            )
+
+            parts.append(
+                {
+                    "link": reverse_lazy(
+                        f"admin:{object._meta.app_label}_{object._meta.model_name}_change",
+                        args=[object.pk],
+                    ),
+                    "title": object,
+                }
+            )
+        else:
+            parts.append(
+                {
+                    "link": reverse_lazy(
+                        f"admin:{opts.app_label}_{opts.model_name}_changelist"
+                    ),
+                    "title": opts.verbose_name_plural,
+                }
+            )
+    elif object := context.get("object"):
+        parts.append(
+            {
+                "link": reverse_lazy("admin:app_list", args=[object._meta.app_label]),
+                "title": object._meta.app_label,
+            }
+        )
+
+        parts.append(
+            {
+                "link": reverse_lazy(
+                    f"admin:{object._meta.app_label}_{object._meta.model_name}_changelist",
+                ),
+                "title": object._meta.verbose_name_plural,
+            }
+        )
+
+        parts.append(
+            {
+                "link": reverse_lazy(
+                    f"admin:{object._meta.app_label}_{object._meta.model_name}_change",
+                    args=[object.pk],
+                ),
+                "title": object,
+            }
+        )
+    elif (model_admin := context.get("model_admin")) and hasattr(model_admin, "model"):
+        parts.append(
+            {
+                "link": reverse_lazy(
+                    "admin:app_list", args=[model_admin.model._meta.app_label]
+                ),
+                "title": model_admin.model._meta.app_label,
+            }
+        )
+
+        parts.append(
+            {
+                "link": reverse_lazy(
+                    f"admin:{model_admin.model._meta.app_label}_{model_admin.model._meta.model_name}_changelist",
+                ),
+                "title": model_admin.model._meta.verbose_name_plural,
+            }
+        )
+
+    if not opts and (content_title := context.get("content_title")):
+        parts.append(
+            {
+                "title": content_title,
+            }
+        )
+
+    if len(parts) == 0:
+        username = (
+            context.request.user.get_short_name() or context.request.user.get_username()
+        )
+        parts.append({"title": f"{_('Welcome')} {username}"})
+
+    return render_to_string(
+        "unfold/helpers/header_title.html",
+        request=context.request,
+        context={
+            "parts": parts,
+        },
+    )
+
+
+@register.filter
+def admin_object_app_url(object: Model, arg: str) -> str:
+    return f"admin:{object._meta.app_label}_{object._meta.model_name}_{arg}"
+
+
+@register.filter
+def has_nested_tables(table: dict) -> bool:
+    return any(
+        isinstance(row, dict) and "table" in row for row in table.get("rows", [])
+    )

unfold/utils.py

@@ -140,16 +140,6 @@ def display_for_field(value: Any, field: Any, empty_value_display: str) -> str:
         return display_for_value(value, empty_value_display)
 
 
-def hex_to_rgb(hex_color: str) -> list[int]:
-    hex_color = hex_color.lstrip("#")
-
-    r = int(hex_color[0:2], 16)
-    g = int(hex_color[2:4], 16)
-    b = int(hex_color[4:6], 16)
-
-    return (r, g, b)
-
-
 def prettify_json(data: Any, encoder: Any) -> Optional[str]:
     try:
         from pygments import highlight
@@ -189,3 +179,28 @@ def parse_datetime_str(value: str) -> Optional[datetime.datetime]:
             return datetime.datetime.strptime(value, format)
         except (ValueError, TypeError):
             continue
+
+
+def hex_to_rgb(hex_color: str) -> list[int]:
+    hex_color = hex_color.lstrip("#")
+
+    r = int(hex_color[0:2], 16)
+    g = int(hex_color[2:4], 16)
+    b = int(hex_color[4:6], 16)
+
+    return (r, g, b)
+
+
+def hex_to_values(value: str) -> str:
+    return ", ".join(str(item) for item in hex_to_rgb(value))
+
+
+def convert_color(value: str) -> str:
+    if value[0] == "#":
+        return f"rgb({hex_to_values(value)})"
+    elif value.startswith("rgb") or value.startswith("oklch"):
+        return value
+    elif isinstance(value, str) and all(part.isdigit() for part in value.split()):
+        return f"rgb({', '.join(value.split(' '))})"
+
+    return value

unfold/views.py

@@ -43,5 +43,8 @@ class UnfoldModelAdminViewMixin(PermissionRequiredMixin):
         return super().get_context_data(
             **kwargs,
             **self.model_admin.admin_site.each_context(self.request),
-            **{"title": self.title},
+            **{
+                "title": self.title,
+                "model_admin": self.model_admin,
+            },
         )

unfold/widgets.py

@@ -244,13 +244,17 @@ RADIO_CLASSES = [
 SWITCH_CLASSES = [
     "appearance-none",
     "bg-base-300",
+    "block",
     "cursor-pointer",
     "h-5",
     "relative",
     "rounded-full",
-    "transition-all",
+    "transition-colors",
     "w-8",
     "min-w-8",
+    "focus:outline-2",
+    "focus:outline-offset-2",
+    "focus:outline-primary-600",
     "after:absolute",
     "after:bg-white",
     "after:content-['']",
@@ -258,6 +262,7 @@ SWITCH_CLASSES = [
     "after:h-3",
     "after:rounded-full",
     "after:shadow-xs",
+    "after:transition-all",
     "after:left-1",
     "after:top-1",
     "after:w-3",