From 7516005008af2b1279b798b065a15269de09c68c Mon Sep 17 00:00:00 2001
From: Valentin Deniaud <vdeniaud@entrouvert.com>
Date: Mon, 19 Jul 2021 17:48:38 +0200
Subject: [PATCH] manager: reorganize buttons on user details page (#55641)

---
 .../templates/authentic2/manager/user_detail.html | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/authentic2/manager/templates/authentic2/manager/user_detail.html b/src/authentic2/manager/templates/authentic2/manager/user_detail.html
index cfd8d562..530b452c 100644
--- a/src/authentic2/manager/templates/authentic2/manager/user_detail.html
+++ b/src/authentic2/manager/templates/authentic2/manager/user_detail.html
@@ -5,24 +5,21 @@
   {{ block.super }}
   <span class="actions">
     <a class="extra-actions-menu-opener"></a>
-
-  {% if view.can_delete %}
-    <a rel="popup" href="{% url "a2-manager-user-delete" pk=object.pk %}">{% trans "Delete" %}</a>
-  {% else %}
-    <a class="disabled" title="{% trans "You do not have the rights to delete this user." %}" href="#">{% trans "Delete" %}</a>
-  {% endif %}
-
+    <a href="{% url "a2-manager-user-journal" pk=object.pk %}">{% trans "Journal" %}</a>
   {% if view.can_change %}
     <a href="{% url "a2-manager-user-edit" pk=object.pk %}">{% trans "Edit" %}</a>
   {% else %}
     <a class="disabled" title="{% trans "You do not have the rights to edit this user." %}" href="#">{% trans "Edit" %}</a>
   {% endif %}
-
     <ul class="extra-actions-menu">
+      {% if view.can_delete %}
+      <li><a rel="popup" href="{% url "a2-manager-user-delete" pk=object.pk %}">{% trans "Delete" %}</a></li>
+      {% else %}
+      <li><a class="disabled" title="{% trans "You do not have the rights to delete this user." %}" href="#">{% trans "Delete" %}</a></li>
+      {% endif %}
       {% if view.is_oidc_services %}
       <li><a href="{% url "a2-manager-user-authorizations" pk=object.pk %}">{% trans "Consents" %}</a></li>
       {% endif %}
-      <li><a href="{% url "a2-manager-user-journal" pk=object.pk %}">{% trans "Journal" %}</a></li>
     </ul>
   </span>
 {% endblock %}
-- 
2.20.1