chore: merge

.pre-commit-config.yaml

@@ -10,11 +10,11 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/psf/black
-    rev: 23.9.1
+    rev: 23.10.0
     hooks:
       - id: black
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.0.292
+    rev: v0.1.1
     hooks:
       - id: ruff
   - repo: https://github.com/compilerla/conventional-pre-commit

src/unfold/admin.py

@@ -175,9 +175,6 @@ def label_tag(self) -> SafeText:
             "class": " ".join(LABEL_CLASSES + ["mb-2"]),
         }
 
-        if not self.is_first:
-            attrs["class"] = "inline"
-
         label = self.field["label"]
 
         return format_html(

src/unfold/contrib/guardian/templates/admin/guardian/model/change_form.html

@@ -5,9 +5,9 @@
 {% block object-tools-items %}
     {% url opts|admin_urlname:'permissions' original.pk|admin_urlquote as history_url %}
 
-    <a href="{% add_preserved_filters history_url %}" class="permissionslink mx-1 px-3 py-2 rounded-md transition-all hover:bg-gray-100 hover:text-gray-700 dark:hover:bg-gray-700 dark:hover:text-gray-200">
-        {% trans "Object permissions" %}
-    </a>
+    {% trans "Object permissions" as title %}
+    {% add_preserved_filters history_url as link %}
+    {% include "unfold/helpers/tab_action.html" with title=title link=link %}
 
     {{ block.super }}
 {% endblock %}

src/unfold/contrib/import_export/templates/admin/import_export/change_list_export_item.html

@@ -1,9 +1,7 @@
 {% load admin_urls i18n %}
 
 {% if has_export_permission %}
-    <li class="border-r flex-grow text-center last:border-0 dark:border-gray-700">
-        <a href="{% url opts|admin_urlname:'export' %}{{ cl.get_query_string }}" class="block px-4 py-2 text-gray-500 whitespace-nowrap hover:text-gray-700 dark:text-gray-400 hover:dark:text-gray-200">
-            {% trans "Export" %}
-        </a>
-    </li>
+    {% trans "Export" as title %}
+    {% url opts|admin_urlname:'export' as link %}
+    {% include "unfold/helpers/tab_action.html" with title=title link=link|add:cl.get_query_string %}
 {% endif %}

src/unfold/contrib/import_export/templates/admin/import_export/change_list_import_item.html

@@ -1,9 +1,7 @@
 {% load admin_urls i18n %}
 
 {% if has_import_permission %}
-    <li class="border-r flex-grow text-center last:border-0 dark:border-gray-700">
-        <a href="{% url opts|admin_urlname:"import" %}" class="block px-4 py-2 text-gray-500 whitespace-nowrap hover:text-gray-700 dark:text-gray-400 hover:dark:text-gray-200">
-            {% trans "Import" %}
-        </a>
-    </li>
+    {% trans "Import" as title %}
+    {% url opts|admin_urlname:"import" as link %}
+    {% include "unfold/helpers/tab_action.html" with title=title link=link %}
 {% endif %}

src/unfold/contrib/simple_history/templates/simple_history/object_history_form.html

@@ -1,7 +1,7 @@
 {% extends "admin/change_form.html" %}
 
 {% load admin_urls i18n %}
-{% load url from simple_history_compat%}
+{% load url from simple_history_compat %}
 
 {% block breadcrumbs %}
     <div class="px-4 lg:px-12">

src/unfold/templates/admin/change_form_object_tools.html

@@ -3,13 +3,12 @@
 {% block object-tools-items %}
     {% url opts|admin_urlname:'history' original.pk|admin_urlquote as history_url %}
 
-    <a href="{% add_preserved_filters history_url %}" class="historylink mx-1 px-3 py-2 rounded-md transition-all hover:bg-gray-100 hover:text-gray-700 dark:hover:bg-gray-700 dark:hover:text-gray-200">
-        {% trans 'History' %}
-    </a>
+    {% trans 'History' as title %}
+    {% add_preserved_filters history_url as link %}
+    {% include "unfold/helpers/tab_action.html" with title=title link=link %}
 
     {% if has_absolute_url %}
-        <a href="{{ absolute_url }}" target="_blank" class="viewsitelink mx-1 px-3 py-2 rounded-md transition-all hover:bg-gray-100 hover:text-gray-700 dark:hover:bg-gray-700 dark:hover:text-gray-200">
-            {% trans 'View on site' %}
-        </a>
+        {% trans 'View on site' as title %}
+        {% include "unfold/helpers/tab_action.html" with title=title link=absolute_url blank=1 %}
     {% endif %}
 {% endblock %}

src/unfold/templates/unfold/change_list_filter.html

@@ -4,7 +4,7 @@
     <label for="show-filters" id="changelist-filter-close" class="flex-grow"></label>
 
     <div class="bg-white flex mr-4 my-4 overflow-hidden rounded shadow-sm w-96 dark:bg-gray-800">
-        <div class="flex-grow h-full overflow-auto relative" data-simplebar>
+        <div class="flex-grow h-full overflow-auto relative">
             <h3 class="border-b flex font-medium mb-6 px-6 py-4 text-gray-700 text-sm dark:text-gray-200 dark:border-gray-700">
                 {% trans "Filter results" %}
 

src/unfold/templates/unfold/helpers/account_links.html

@@ -12,10 +12,6 @@
             </span>
         </div>
 
-        {% if nav_global %}
-            {{ nav_global }}
-        {% endif %}
-
         {% if site_url %}
             <a href="{{ site_url }}" target="_blank" class="mx-1 px-3 py-2 rounded hover:bg-gray-100 hover:text-gray-700 dark:hover:bg-gray-700 dark:hover:text-gray-200">
                 {% translate 'View site' %}

src/unfold/templates/unfold/helpers/app_list.html

@@ -55,7 +55,7 @@ <h3 class="font-medium my-3 px-6 text-gray-900 text-sm first:mt-0 dark:text-gray
             <div class="absolute bottom-0 left-72 right-0 top-0 z-50 peer-checked:block" x-cloak x-show="openAllApplications">
                 <label class="absolute bg-gray-900 bg-opacity-80 backdrop-blur-sm bottom-0 left-0 right-0 top-0 z-10 w-screen" for="show-applications"></label>
 
-                <div class="bg-white flex flex-col h-full overflow-x-hidden overflow-y-auto py-5 px-8 relative text-sm w-80 z-20 dark:bg-gray-900 dark:border-r dark:border-gray-800" data-simplebar x-on:click.outside="openAllApplications = false" x-on:keydown.escape.window="openAllApplications = false">
+                <div class="bg-white flex flex-col h-full overflow-x-hidden overflow-y-auto py-5 px-8 relative text-sm w-80 z-20 dark:bg-gray-900 dark:border-r dark:border-gray-800" x-on:click.outside="openAllApplications = false" x-on:keydown.escape.window="openAllApplications = false">
                     {% for app in app_list %}
                         <div class="mb-6 last:mb-0">
                             <h3 class="mb-4 font-medium overflow-hidden text-ellipsis text-gray-700 whitespace-nowrap dark:text-gray-200">

src/unfold/templates/unfold/helpers/tab_action.html

@@ -0,0 +1,5 @@
+<li class="border-b flex-grow text-center md:border-b-0 md:border-r last:border-0 dark:border-gray-800">
+    <a href="{{ link }}" class="block px-4 py-2 text-gray-500 text-left whitespace-nowrap hover:text-gray-700 dark:text-gray-400 hover:dark:text-gray-200"{% if blank %} target="_blank"{% endif %}>
+        {{ title }}
+    </a>
+</li>

src/unfold/templates/unfold/helpers/tab_list.html

@@ -13,21 +13,22 @@
                 </ul>
             {% endif %}
 
-            {% if actions_list or actions_items %}
-                <ul class="border flex mb-4 mt-2 rounded-md shadow-sm md:mb-2 md:mt-0 dark:border-gray-700 max-md:w-full">
+            {% if actions_list or actions_items or nav_global %}
+                <ul class="border flex flex-col mb-4 mt-2 rounded-md shadow-sm md:flex-row md:mb-2 md:mt-0 dark:border-gray-800 max-md:w-full">
                     {% for action in actions_list %}
-                        <li class="border-r flex-grow text-center last:border-0 dark:border-gray-700">
-                            <a href="{{ action.path }}" class="block px-4 py-2 text-gray-500 whitespace-nowrap hover:text-gray-700 dark:text-gray-400 hover:dark:text-gray-200">
-                                {{ action.title }}
-                            </a>
-                        </li>
+                        {% include "unfold/helpers/tab_action.html" with title=action.title link=action.path %}
                     {% endfor %}
 
                     {% if actions_items %}
                         {{ actions_items }}
                     {% endif %}
+
+                    {% if nav_global %}
+                        {{ nav_global }}
+                    {% endif %}
                 </ul>
             {% endif %}
         </div>
     {% endif %}
+
 {% endif %}

src/unfold/templates/unfold/layouts/skeleton.html

@@ -25,9 +25,7 @@
     {% endfor %}
 
     <link href="{% static 'unfold/css/styles.css' %}" rel="stylesheet">
-    <link href="{% static 'unfold/css/simplebar.css' %}" rel="stylesheet">
 
-    <script src="{% static 'unfold/js/simplebar.js' %}"></script>
     <script src="{% static 'unfold/js/alpine.persist.js' %}" defer></script>
     <script src="{% static 'unfold/js/alpine.js' %}" defer></script>
     <script src="{% static 'unfold/js/htmx.js' %}"></script>

src/unfold/templatetags/unfold.py

@@ -24,6 +24,7 @@ def tab_list(context, opts) -> str:
         request=context.request,
         context={
             "tab_list": tabs,
+            "nav_global": context.get("nav_global"),
             "actions_list": context.get("actions_list"),
             "actions_items": context.get("actions_items"),
             "is_popup": context.get("is_popup"),