Merge branch 'master' into chore/bump-to-3.2.8

django-cms · Jan 27, 2024 · b869ab8 · b869ab8
2 parents 571fc15 + d7dcfba
commit b869ab8
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 6 deletions.
diff --git a/djangocms_admin_style/sass/components/_header.scss b/djangocms_admin_style/sass/components/_header.scss
@@ -131,6 +131,40 @@
                             background: $color-primary;
                         }
                     }
+                    form {
+                        box-shadow: none;
+                        margin: 0;
+                        padding: 0;
+                        button {
+                            float: none;
+                            white-space: nowrap;
+                            line-height: 30px;
+                            height: 30px;
+                            padding: 0 10px 0 15px !important;
+                            cursor: pointer;
+
+                            border: none !important;
+                            border-radius: 0 !important;
+                            width: 100% !important;
+                            color: $black !important;
+                            font-size: $font-size-normal !important;
+                            font-family: $base-font-family !important;
+                            text-align: left;
+
+                            &:active,
+                            &:focus {
+                                filter: none !important;
+                                box-shadow: none !important;
+                                text-decoration: underline !important;
+                            }
+                            &:hover {
+                                filter: none !important;
+                                color: $white !important;
+                                background: $color-primary !important;
+                                text-decoration: none !important;
+                            }
+                        }
+                    }
                 }
             }
         }

diff --git a/djangocms_admin_style/static/djangocms_admin_style/css/djangocms-admin.css b/djangocms_admin_style/static/djangocms_admin_style/css/djangocms-admin.css
diff --git a/djangocms_admin_style/templates/admin/inc/branding.html b/djangocms_admin_style/templates/admin/inc/branding.html
@@ -23,11 +23,16 @@ <h1>{{ site_header|default:_('Django Administration') }}</h1>
                 </li>
                 <li class="toolbar-item-navigation-break">-----</li>
             {% endif %}
-            <li>
-                <a href="{% url 'admin:logout' %}">
-                    <span>{% trans 'Log out' %} {% firstof user.get_short_name user.get_username %}</span>
-                </a>
-            </li>
+            {% if user.is_authenticated %}
+                <li>
+                    <form method="POST" action="{% url 'admin:logout' %}"> 
+                        {% csrf_token %}
+                        <button type="submit">
+                            <b>{% trans 'Log out' %} {% firstof user.get_short_name user.get_username %}</b>
+                        </button>
+                    </form>
+                </li>
+            {% endif %}
         </ul>
     </li>
 </ul>