Merge branch 'master' into stable/3.0.x

sehmaschine · Dec 14, 2023 · 0c0f263 · 0c0f263
2 parents 187fc6b + c114163
commit 0c0f263
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 14 deletions.
diff --git a/README.rst b/README.rst
@@ -29,7 +29,7 @@ http://www.grappelliproject.com
 Documentation
 -------------
 
-http://readthedocs.org/docs/django-grappelli/
+https://django-grappelli.readthedocs.io/en/latest/
 
 Releases
 --------

diff --git a/grappelli/sass/partials/library/_reset.scss b/grappelli/sass/partials/library/_reset.scss
@@ -164,6 +164,14 @@ table {
     border-spacing: 0;
 }
 
+caption,
+th,
+td {
+    text-align: left;
+    font-weight: normal;
+    vertical-align: middle;
+}
+
 /* change border colour to suit your needs */
 hr {
     display: block;

diff --git a/grappelli/sass/screen.scss b/grappelli/sass/screen.scss
@@ -358,11 +358,28 @@ h1#grp-admin-title {
       border-right: 0;
     }
 
-    a {
+    a,
+    button {
       display: block;
       @include grp-padding($grp-padding-size $grp-padding-size);
       @include ellipsis;
     }
+
+    form button {
+      margin: 0 0 2px 0 !important;
+      width: auto;
+      height: auto;
+      color: lighten($grp-link-color, 10);
+      @extend .grp-font-size;
+      font-weight: bold;
+      outline: 0;
+      border: 0;
+      background: transparent;
+
+      &:hover {
+        color: #fff;
+      }
+    }
   }
 }
 

diff --git a/grappelli/static/grappelli/stylesheets/rtl.css b/grappelli/static/grappelli/stylesheets/rtl.css
diff --git a/grappelli/static/grappelli/stylesheets/screen.css b/grappelli/static/grappelli/stylesheets/screen.css
diff --git a/grappelli/templates/admin/base.html b/grappelli/templates/admin/base.html
@@ -103,7 +103,13 @@ <h1 id="grp-admin-title">
                                                         <li><a href="{% url 'admin:password_change' %}" class="grp-change-password">{% trans 'Change password' %}</a></li>
                                                     {% endif %}
                                                     <!-- Logout -->
-                                                    <li><a href="{% url 'admin:logout' %}" class="grp-logout">{% trans 'Log out' %}</a></li>
+                                                    <li>
+                                                        <form id="logout-form" method="post"
+                                                            action="{% url 'admin:logout' %}">
+                                                            {% csrf_token %}
+                                                            <button type="submit">{% translate 'Log out' %}</button>
+                                                        </form>
+                                                    </li>
                                                     <!-- Switch -->
                                                     {% switch_user_dropdown %}
                                                 </ul>

diff --git a/grappelli/templates/admin/change_form.html b/grappelli/templates/admin/change_form.html
@@ -152,7 +152,7 @@
         <ul>
             <li><a href="{% url 'admin:index' %}">{% trans "Home" %}</a></li>
             <li><a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a></li>
-            <li>{% if has_change_permission %}
+            <li>{% if has_view_permission %}
                 {% url opts|admin_urlname:'changelist' as changelist_url %}
                 <a href="{% add_preserved_filters changelist_url %}">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}
             {% endif %}</li>

diff --git a/grappelli/templates/admin/includes/fieldset.html b/grappelli/templates/admin/includes/fieldset.html
@@ -4,9 +4,9 @@
         {% if fieldset.name %}<h2 class="grp-collapse-handler">{{ fieldset.name }}</h2>{% endif %}
         {% if fieldset.description %}<div class="grp-row"><p class="grp-description">{{ fieldset.description|safe }}</p></div>{% endif %}
         {% for line in fieldset %}
-            <div class="form-row grp-row grp-cells-{{ line.fields|length }}{% if not line.fields|length_is:"1" %} grp-cells{% else %}{% if line.errors %} grp-errors{% endif %}{% endif %}{% if not line.has_visible_field %} grp-row-hidden{% endif %}{% for field in line %} {{ field.field.name }}{% endfor %} ">
+            <div class="form-row grp-row grp-cells-{{ line.fields|length }}{% if not line.fields|length == 1 %} grp-cells{% else %}{% if line.errors %} grp-errors{% endif %}{% endif %}{% if not line.has_visible_field %} grp-row-hidden{% endif %}{% for field in line %} {{ field.field.name }}{% endfor %} ">
                 {% for field in line %}
-                    {% if line.fields|length_is:"1" %}
+                    {% if line.fields|length == 1 %}
                         <div class="field-box l-2c-fluid l-d-4">
                     {% else %}
                         <div class="field-box grp-cell l-2c-fluid l-d-4 {{ field.field.name }}{% if field.field.errors %} grp-errors{% endif %}">
@@ -24,8 +24,8 @@
                                     {{ field.field }}
                                 {% endif %}
                         {% endif %}
-                            {% if line.fields|length_is:'1' %}{{ line.errors }}{% endif %}
-                            {% if not line.fields|length_is:'1' and not field.is_readonly %}{{ field.field.errors }}{% endif %}
+                            {% if line.fields|length == 1 %}{{ line.errors }}{% endif %}
+                            {% if not line.fields|length == 1 and not field.is_readonly %}{{ field.field.errors }}{% endif %}
                             {% if field.field.help_text %}
                                 <p class="grp-help">{{ field.field.help_text|safe }}</p>
                             {% endif %}

diff --git a/grappelli/templates/admin/includes/fieldset_inline.html b/grappelli/templates/admin/includes/fieldset_inline.html
@@ -4,9 +4,9 @@
         {% if fieldset.name %}<h4 class="grp-collapse-handler">{{ fieldset.name }}</h4>{% endif %}
         {% if fieldset.description %}<div class="grp-row"><p class="grp-description">{{ fieldset.description|safe }}</p></div>{% endif %}
         {% for line in fieldset %}
-            <div class="form-row grp-row grp-cells-{{ line.fields|length }}{% if not line.fields|length_is:"1" %} grp-cells{% else %}{% if line.errors %} grp-errors{% endif %}{% endif %}{% if not line.has_visible_field %} grp-row-hidden{% endif %}{% for field in line %} {{ field.field.name }}{% endfor %}">
+            <div class="form-row grp-row grp-cells-{{ line.fields|length }}{% if not line.fields|length == 1 %} grp-cells{% else %}{% if line.errors %} grp-errors{% endif %}{% endif %}{% if not line.has_visible_field %} grp-row-hidden{% endif %}{% for field in line %} {{ field.field.name }}{% endfor %}">
                 {% for field in line %}
-                    {% if line.fields|length_is:"1" %}
+                    {% if line.fields|length == 1 %}
                         <div class="field-box l-2c-fluid l-d-4">
                     {% else %}
                         <div class="field-box grp-cell l-2c-fluid l-d-4 {{ field.field.name }}{% if field.field.errors %} grp-errors{% endif %}">
@@ -24,8 +24,8 @@
                                     {{ field.field }}
                                 {% endif %}
                         {% endif %}
-                            {% if line.fields|length_is:'1' %}{{ line.errors }}{% endif %}
-                            {% if not line.fields|length_is:'1' and not field.is_readonly %}{{ field.field.errors }}{% endif %}
+                            {% if line.fields|length == 1 %}{{ line.errors }}{% endif %}
+                            {% if not line.fields|length == 1 and not field.is_readonly %}{{ field.field.errors }}{% endif %}
                             {% if field.field.help_text %}
                                 <p class="grp-help">{{ field.field.help_text|safe }}</p>
                             {% endif %}