Merge branch 'master' into 'master'

Fix: better consistency of admin dropdown menu

See merge request yaal/canaille!39

canaille/admin.py

@@ -43,7 +43,7 @@ def mail_index(user):
         else:
             flash(_("The test invitation mail has been sent correctly"), "error")
 
-    return render_template("mail/admin.html", form=form)
+    return render_template("mail/admin.html", form=form, menuitem="admin")
 
 
 @bp.route("/mail/password-init.html")

canaille/oidc/authorizations.py

@@ -12,7 +12,9 @@ bp = Blueprint("authorizations", __name__, url_prefix="/admin/authorization")
 def index(user):
     authorizations = AuthorizationCode.filter()
     return render_template(
-        "oidc/admin/authorization_list.html", authorizations=authorizations
+        "oidc/admin/authorization_list.html",
+        authorizations=authorizations,
+        menuitem="admin",
     )
 
 

canaille/static/css/base.css

@@ -64,3 +64,7 @@ i.massive.massive.massive.portrait.icon, i.massive.massive.massive.portrait.icon
 .profile-form label i{
     cursor: pointer;
 }
+
+.dropdown-active {
+    background: rgba(0,0,0,.05) !important;
+}

canaille/themes/default/base.html

@@ -60,7 +60,7 @@
                         </a>
                     {% endif %}
                     {% if user.can_manage_oidc %}
-                        <div class="ui dropdown item {% if menuitem == "admin" %}active{% endif %}">
+                        <div class="ui dropdown item {% if menuitem == "admin" %}dropdown-active{% endif %}">
                             <i class="settings icon"></i>
                             Admin
                             <div class="menu">

canaille/translations/messages.pot

@@ -1171,4 +1171,3 @@ msgstr ""
 #: canaille/themes/default/base.html:88
 msgid "Log out"
 msgstr ""
-