From 105e256b55d7d601b7f1e00c9639bc28ee4755da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Tue, 21 Aug 2018 07:30:06 +0200
Subject: [PATCH] manager: update appbar actions to new markup (#25960)

---
 .../manager/templates/authentic2/manager/homepage.html          | 2 ++
 .../manager/templates/authentic2/manager/ou_detail.html         | 2 ++
 src/authentic2/manager/templates/authentic2/manager/ous.html    | 2 ++
 .../manager/templates/authentic2/manager/role_members.html      | 2 ++
 .../manager/templates/authentic2/manager/role_permissions.html  | 2 ++
 src/authentic2/manager/templates/authentic2/manager/roles.html  | 2 ++
 .../manager/templates/authentic2/manager/user_detail.html       | 2 ++
 src/authentic2/manager/templates/authentic2/manager/users.html  | 2 ++
 8 files changed, 16 insertions(+)

diff --git a/src/authentic2/manager/templates/authentic2/manager/homepage.html b/src/authentic2/manager/templates/authentic2/manager/homepage.html
index 53e54ae6..31cc920a 100644
--- a/src/authentic2/manager/templates/authentic2/manager/homepage.html
+++ b/src/authentic2/manager/templates/authentic2/manager/homepage.html
@@ -7,11 +7,13 @@
 {% block appbar %}
   <h2>{% blocktrans %}Here you can manage objects related to organizational units, users, roles and applications.{% endblocktrans %}</h2>
   {% if user.is_superuser %}
+  <span class="actions">
   <a class="extra-actions-menu-opener"></a>
   <ul class="extra-actions-menu">
     <li><a href="{% url 'a2-manager-site-export' %}">{% trans 'Export Site' %}</a></li>
     <li><a rel="popup" href="{% url 'a2-manager-site-import' %}">{% trans 'Import Site' %}</a></li>
   </ul>
+  </span>
   {% endif %}
 {% endblock %}
 
diff --git a/src/authentic2/manager/templates/authentic2/manager/ou_detail.html b/src/authentic2/manager/templates/authentic2/manager/ou_detail.html
index bef894c6..9f22ac9e 100644
--- a/src/authentic2/manager/templates/authentic2/manager/ou_detail.html
+++ b/src/authentic2/manager/templates/authentic2/manager/ou_detail.html
@@ -16,6 +16,7 @@
 
 {% block appbar %}
   {{ block.super }}
+  <span class="actions">
   {% if view.can_delete %}
     <a rel="popup" href="{% url "a2-manager-ou-delete" pk=object.pk %}">{% trans "Delete" %}</a>
   {% else %}
@@ -27,4 +28,5 @@
   {% else %}
     <a class="disabled" title="{% trans "You do not have the rights to edit this organizational unit." %}" href="#">{% trans "Edit" %}</a>
   {% endif %}
+  </span>
 {% endblock %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/ous.html b/src/authentic2/manager/templates/authentic2/manager/ous.html
index 42fbb3c4..3d0e2884 100644
--- a/src/authentic2/manager/templates/authentic2/manager/ous.html
+++ b/src/authentic2/manager/templates/authentic2/manager/ous.html
@@ -9,9 +9,11 @@
 
 {% block appbar %}
   {{ block.super }}
+  <span class="actions">
   {% if view.can_add %}
     <a href="{% url "a2-manager-ou-add" %}" rel="popup">{% trans "Add organizational unit" %}</a>
   {% endif %}
+  </span>
 {% endblock %}
 
 {% block sidebar %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/role_members.html b/src/authentic2/manager/templates/authentic2/manager/role_members.html
index 4a87e24e..de5ca308 100644
--- a/src/authentic2/manager/templates/authentic2/manager/role_members.html
+++ b/src/authentic2/manager/templates/authentic2/manager/role_members.html
@@ -18,6 +18,7 @@
 
 {% block appbar %}
   {{ block.super }}
+  <span class="actions">
   {% if not object.is_internal and view.can_delete %}
     <a rel="popup" href="{% url "a2-manager-role-delete" pk=object.pk %}">{% trans "Delete" %}</a>
   {% else %}
@@ -35,6 +36,7 @@
   {% if perms.a2_rbac.admin_permission %}
     <a href="{% url "a2-manager-role-permissions" pk=object.pk %}">{% trans "Permissions" %}</a>
   {% endif %}
+  </span>
 {% endblock %}
 
 
diff --git a/src/authentic2/manager/templates/authentic2/manager/role_permissions.html b/src/authentic2/manager/templates/authentic2/manager/role_permissions.html
index ae31f426..95708862 100644
--- a/src/authentic2/manager/templates/authentic2/manager/role_permissions.html
+++ b/src/authentic2/manager/templates/authentic2/manager/role_permissions.html
@@ -9,6 +9,7 @@
 
 {% block appbar %}
   {{ block.super }}
+  <span class="actions">
   {% if view.can_delete %}
     <a rel="popup" href="{% url "a2-manager-role-delete" pk=object.pk %}">{% trans "Delete" %}</a>
   {% endif %}
@@ -16,6 +17,7 @@
     <a href="{% url "a2-manager-role-edit" pk=object.pk %}">{% trans "Edit" %}</a>
   {% endif %}
   <a href="{% url "a2-manager-role-members" pk=object.pk %}">{% trans "Members" %}</a>
+  </span>
 {% endblock %}
 
 {% block main %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/roles.html b/src/authentic2/manager/templates/authentic2/manager/roles.html
index 164889f2..92e309bb 100644
--- a/src/authentic2/manager/templates/authentic2/manager/roles.html
+++ b/src/authentic2/manager/templates/authentic2/manager/roles.html
@@ -5,11 +5,13 @@
 
 {% block appbar %}
   {{ block.super }}
+  <span class="actions">
   {% if view.can_add %}
     <a href="{% url "a2-manager-role-add" %}">{% trans "Add role" %}</a>
   {% else %}
     <a href="#" class="disabled">{% trans "Add role" %}</a>
   {% endif %}
+  </span>
 {% endblock %}
 
 {% block sidebar %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/user_detail.html b/src/authentic2/manager/templates/authentic2/manager/user_detail.html
index 4e3ce934..cf487400 100644
--- a/src/authentic2/manager/templates/authentic2/manager/user_detail.html
+++ b/src/authentic2/manager/templates/authentic2/manager/user_detail.html
@@ -5,6 +5,7 @@
 
 {% block appbar %}
   {{ block.super }}
+  <span class="actions">
   {% if view.can_delete %}
     <a rel="popup" href="{% url "a2-manager-user-delete" pk=object.pk %}">{% trans "Delete" %}</a>
   {% else %}
@@ -16,6 +17,7 @@
   {% else %}
     <a class="disabled" title="{% trans "You do not have the rights to edit this user." %}" href="#">{% trans "Edit" %}</a>
   {% endif %}
+  </span>
 {% endblock %}
 
 {% block breadcrumb %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/users.html b/src/authentic2/manager/templates/authentic2/manager/users.html
index caf4b585..34489519 100644
--- a/src/authentic2/manager/templates/authentic2/manager/users.html
+++ b/src/authentic2/manager/templates/authentic2/manager/users.html
@@ -5,6 +5,7 @@
 
 {% block appbar %}
   {{ block.super }}
+  <span class="actions">
     {% if add_ou %}
      <a
         href="{% url "a2-manager-user-add" ou_pk=add_ou.pk %}"
@@ -19,6 +20,7 @@
          {% trans "Add user" %}
      </a>
    {% endif %}
+  </span>
 {% endblock %}
 
 {% block breadcrumb %}
-- 
2.18.0