django-unfold 0.36.0__py3-none-any.whl → 0.38.0__py3-none-any.whl

unfold/contrib/import_export/forms.py

@@ -4,6 +4,7 @@ from import_export.forms import ImportForm as BaseImportForm
 from import_export.forms import (
     SelectableFieldsExportForm as BaseSelectableFieldsExportForm,
 )
+
 from unfold.widgets import (
     SELECT_CLASSES,
     UnfoldAdminFileFieldWidget,

unfold/contrib/import_export/templates/admin/import_export/change_form.html

@@ -5,6 +5,6 @@
     {{ block.super }}
 
     {% if show_change_form_export %}
-        <input type="submit" value="{% translate 'Export' %}" name="_export-item" class="bg-white text-gray-500 border cursor-pointer flex font-medium items-center px-3 py-2 mr-3 rounded-md shadow-sm text-sm dark:bg-gray-900 dark:border dark:border-gray-700 dark:text-gray-300">
+        <input type="submit" value="{% translate 'Export' %}" name="_export-item" class="bg-white text-gray-500 border cursor-pointer flex font-medium items-center px-3 py-2 mr-3 rounded-md shadow-sm text-sm dark:bg-gray-900 dark:border dark:border-gray-700 dark:text-font-default-dark">
     {% endif %}
 {% endblock %}

unfold/contrib/import_export/templates/admin/import_export/import.html

@@ -44,19 +44,19 @@
 {% endblock %}
 
 {% block content %}
-  {% if confirm_form %}
-    {% include "admin/import_export/import_confirm.html" %}
-  {% else %}
-    {% include "admin/import_export/import_form.html" %}
-  {% endif %}
-
-  {% if result %}
-    {% if result.has_errors %}
-        {% include "admin/import_export/import_errors.html" %}
-    {% elif result.has_validation_errors %}
-      {% include "admin/import_export/import_validation.html" %}
+    {% if confirm_form %}
+        {% include "admin/import_export/import_confirm.html" %}
     {% else %}
-      {% include "admin/import_export/import_preview.html" %}
+        {% include "admin/import_export/import_form.html" %}
+    {% endif %}
+
+    {% if result %}
+        {% if result.has_errors %}
+            {% include "admin/import_export/import_errors.html" %}
+        {% elif result.has_validation_errors %}
+            {% include "admin/import_export/import_validation.html" %}
+        {% else %}
+            {% include "admin/import_export/import_preview.html" %}
+        {% endif %}
     {% endif %}
-  {% endif %}
 {% endblock %}

unfold/contrib/import_export/templates/admin/import_export/import_errors.html

@@ -6,9 +6,9 @@
     <ul>
         {% for error in result.base_errors  %}
             <li>
-            {{ error.error }}
+                {{ error.error }}
 
-            <div class="traceback">{{ error.traceback|linebreaks }}</div></li>
+                <div class="traceback">{{ error.traceback|linebreaks }}</div></li>
         {% endfor %}
 
         {% for line, errors in result.row_errors %}
@@ -26,7 +26,7 @@
                         </div>
                     </div>
 
-                    <div class="block border leading-relaxed mb-4 rounded p-4 traceback dark:border-gray-800 dark:text-gray-300 " x-show="open">
+                    <div class="block border leading-relaxed mb-4 rounded p-4 traceback dark:border-gray-800 dark:text-font-default-dark " x-show="open">
                         {{ error.traceback|linebreaks }}
                     </div>
                 </li>

unfold/contrib/inlines/admin.py

@@ -11,6 +11,7 @@ from django.forms.models import modelform_defines_fields
 from django.http import HttpRequest
 from django.utils.text import get_text_list
 from django.utils.translation import gettext_lazy as _
+
 from unfold.admin import StackedInline, TabularInline
 
 from .checks import NonrelatedModelAdminChecks

unfold/contrib/simple_history/templates/simple_history/object_history.html

@@ -4,7 +4,7 @@
 
 {% block content %}
     {% if not revert_disabled %}
-        <p class="px-3 py-3 rounded-md text-sm last:mb-8 er-amber-600/10 bg-blue-50 mb-8 text-blue-500 dark:bg-blue-500/20 dark:border-blue-500/10">
+        <p class="px-3 py-3 rounded-md text-sm last:mb-8 mb-8 bg-blue-100 text-blue-700 dark:bg-blue-500/20 dark:text-blue-400">
             {% blocktrans %}Choose a date from the list below to revert to a previous version of this object.{% endblocktrans %}
         </p>
     {% endif %}

unfold/contrib/simple_history/templates/simple_history/object_history_list.html

@@ -4,35 +4,35 @@
 {% load getattribute from getattributes %}
 
 <table id="change-history" class="border-gray-200 border-spacing-none border-separate mb-6 w-full lg:border lg:rounded-md lg:shadow-sm lg:dark:border-gray-800">
-    <thead class="hidden text-gray-900 lg:table-header-group dark:text-gray-100">
+    <thead class="hidden text-font-important-light lg:table-header-group dark:text-font-important-dark">
         <tr>
-            <th class="align-middle font-medium px-3 py-2 text-left ">
+            <th class="align-middle font-semibold px-3 py-2 text-left ">
                 {% trans 'Object' %}
             </th>
 
             {% for column in history_list_display %}
-                <th class="align-middle font-medium px-3 py-2 text-left ">
+                <th class="align-middle font-semibold px-3 py-2 text-left ">
                     {% trans column %}
                 </th>
             {% endfor %}
 
-            <th class="align-middle font-medium px-3 py-2 text-left">
+            <th class="align-middle font-semibold px-3 py-2 text-left">
                 {% trans 'Date/time' %}
             </th>
 
-            <th class="align-middle font-medium px-3 py-2 text-left">
+            <th class="align-middle font-semibold px-3 py-2 text-left">
                 {% trans 'Comment' %}
             </th>
 
-            <th class="align-middle font-medium px-3 py-2 text-left">
+            <th class="align-middle font-semibold px-3 py-2 text-left">
                 {% trans 'Changed by' %}
             </th>
 
-            <th class="align-middle font-medium px-3 py-2 text-left">
+            <th class="align-middle font-semibold px-3 py-2 text-left">
                 {% trans 'Change reason' %}
             </th>
 
-            <th class="align-middle font-medium px-3 py-2 text-left">
+            <th class="align-middle font-semibold px-3 py-2 text-left">
                 {% trans 'Changes' %}
             </th>
         </tr>

unfold/contrib/simple_history/templates/simple_history/submit_line.html

@@ -16,7 +16,7 @@
                     </button>
                 {% endif %}
 
-                <a href="{{ history_url }}" class="border font-medium mr-auto px-3 py-2 rounded-md text-sm text-gray-500 text-center transition-all w-full hover:bg-gray-50 lg:block lg:w-auto dark:border-gray-700 dark:text-gray-300 dark:hover:text-gray-200 dark:hover:bg-gray-900">
+                <a href="{{ history_url }}" class="border font-medium mr-auto px-3 py-2 rounded-md text-sm text-gray-500 text-center transition-all w-full hover:bg-gray-50 lg:block lg:w-auto dark:border-gray-700 dark:text-font-default-dark dark:hover:text-gray-200 dark:hover:bg-gray-900">
                     {% trans 'Close' %}
                 </a>
             </div>

unfold/settings.py

@@ -1,3 +1,5 @@
+from typing import Any, Dict
+
 from django.conf import settings
 
 CONFIG_DEFAULTS = {
@@ -11,6 +13,14 @@ CONFIG_DEFAULTS = {
     "SHOW_HISTORY": True,
     "SHOW_VIEW_ON_SITE": True,
     "COLORS": {
+        "font": {
+            "subtle-light": "107 114 128",  # text-gray-500
+            "subtle-dark": "156 163 175",  # text-gray-400
+            "default-light": "75 85 99",  # text-gray-600
+            "default-dark": "209 213 219",  # text-gray-300
+            "important-light": "17 24 39",  # text-gray-900
+            "important-dark": "243 244 246",  # text-gray-100
+        },
         "primary": {
             "50": "250 245 255",
             "100": "243 232 255",
@@ -47,4 +57,19 @@ def get_config(settings_name=None):
     if settings_name is None:
         settings_name = "UNFOLD"
 
-    return {**CONFIG_DEFAULTS, **getattr(settings, settings_name, {})}
+    def merge_dicts(dict1: Dict[str, Any], dict2: Dict[str, Any]) -> Dict[str, Any]:
+        result = dict1.copy()
+
+        for key, value in dict2.items():
+            if (
+                key in result
+                and isinstance(result[key], dict)
+                and isinstance(value, dict)
+            ):
+                result[key] = merge_dicts(result[key], value)
+            else:
+                result[key] = value
+
+        return result
+
+    return merge_dicts(CONFIG_DEFAULTS, getattr(settings, settings_name, {}))