From 4d6869cd3ce64d5ff7c7266c86c9ba0fea27616b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Sun, 11 Mar 2018 23:28:41 +0100
Subject: [PATCH] manager: switch to gadjo sidebar (#22440)

---
 .../static/authentic2/manager/css/style.css      | 16 ----------------
 .../templates/authentic2/manager/base.html       |  7 +++++++
 .../templates/authentic2/manager/delete.html     |  2 +-
 .../templates/authentic2/manager/ou_common.html  |  2 +-
 .../templates/authentic2/manager/ous.html        |  2 ++
 .../authentic2/manager/role_common.html          |  2 +-
 .../authentic2/manager/role_members.html         |  2 ++
 .../manager/role_remove_admin_role.html          |  2 +-
 .../manager/role_remove_admin_user.html          |  2 +-
 .../authentic2/manager/role_remove_child.html    |  2 +-
 .../authentic2/manager/role_remove_parent.html   |  2 +-
 .../templates/authentic2/manager/roles.html      |  4 +++-
 .../authentic2/manager/search_form.html          |  1 +
 .../templates/authentic2/manager/service.html    |  2 ++
 .../templates/authentic2/manager/services.html   |  6 ++++--
 .../templates/authentic2/manager/sidebar.html    | 12 ------------
 .../authentic2/manager/user_ou_roles.html        |  6 ++++--
 .../templates/authentic2/manager/user_roles.html |  6 ++++--
 .../templates/authentic2/manager/users.html      |  6 ++++--
 19 files changed, 40 insertions(+), 44 deletions(-)
 delete mode 100644 src/authentic2/manager/templates/authentic2/manager/sidebar.html

diff --git a/src/authentic2/manager/static/authentic2/manager/css/style.css b/src/authentic2/manager/static/authentic2/manager/css/style.css
index 10b98112..a933bf5d 100644
--- a/src/authentic2/manager/static/authentic2/manager/css/style.css
+++ b/src/authentic2/manager/static/authentic2/manager/css/style.css
@@ -1,19 +1,3 @@
-div.content {
-  float: left;
-  width: 82%;
-  margin-left: 8px;
-  margin-top: -10px;
-}
-
-
-#sidebar {
-	width: 15%;
-	float: left;
-	padding-right: 10px;
-	text-align: left;
-	margin-bottom: 2em;
-}
-
 #sidebar label {
         display: inline;
 }
diff --git a/src/authentic2/manager/templates/authentic2/manager/base.html b/src/authentic2/manager/templates/authentic2/manager/base.html
index 1a87fb65..6db407c7 100644
--- a/src/authentic2/manager/templates/authentic2/manager/base.html
+++ b/src/authentic2/manager/templates/authentic2/manager/base.html
@@ -30,3 +30,10 @@
   <a href="{% url 'a2-manager-homepage' %}">{% trans 'Administration' as default_site_tile %}{% firstof manager_site_title default_site_tile %}</a>
   {% endif %}
 {% endblock %}
+
+{% block content %}
+  <div class="content">
+    {% block main %}
+    {% endblock %}
+  </div>
+{% endblock %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/delete.html b/src/authentic2/manager/templates/authentic2/manager/delete.html
index 1805c303..50a0251a 100644
--- a/src/authentic2/manager/templates/authentic2/manager/delete.html
+++ b/src/authentic2/manager/templates/authentic2/manager/delete.html
@@ -1,4 +1,4 @@
-{% extends "authentic2/manager/sidebar.html" %}
+{% extends "authentic2/manager/base.html" %}
 {% load i18n %}
 
 {% block messages %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/ou_common.html b/src/authentic2/manager/templates/authentic2/manager/ou_common.html
index fc63f47a..4c5d6789 100644
--- a/src/authentic2/manager/templates/authentic2/manager/ou_common.html
+++ b/src/authentic2/manager/templates/authentic2/manager/ou_common.html
@@ -1,4 +1,4 @@
-{% extends "authentic2/manager/sidebar.html" %}
+{% extends "authentic2/manager/base.html" %}
 {% load i18n staticfiles %}
 
 {% block title %}{{ block.super }} - {% trans "Organizational units" %}{% endblock %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/ous.html b/src/authentic2/manager/templates/authentic2/manager/ous.html
index 34747d5b..42fbb3c4 100644
--- a/src/authentic2/manager/templates/authentic2/manager/ous.html
+++ b/src/authentic2/manager/templates/authentic2/manager/ous.html
@@ -15,7 +15,9 @@
 {% endblock %}
 
 {% block sidebar %}
+  <aside id="sidebar">
   {% include "authentic2/manager/search_form.html" %}
+  </aside>
 {% endblock %}
 
 {% block main %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/role_common.html b/src/authentic2/manager/templates/authentic2/manager/role_common.html
index 6c947e1c..245a6956 100644
--- a/src/authentic2/manager/templates/authentic2/manager/role_common.html
+++ b/src/authentic2/manager/templates/authentic2/manager/role_common.html
@@ -1,4 +1,4 @@
-{% extends "authentic2/manager/sidebar.html" %}
+{% extends "authentic2/manager/base.html" %}
 {% load i18n staticfiles %}
 
 {% block title %}{{ block.super }} - {% trans "Roles" %}{% endblock %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/role_members.html b/src/authentic2/manager/templates/authentic2/manager/role_members.html
index 496df181..a973536d 100644
--- a/src/authentic2/manager/templates/authentic2/manager/role_members.html
+++ b/src/authentic2/manager/templates/authentic2/manager/role_members.html
@@ -10,8 +10,10 @@
 {% endblock %}
 
 {% block sidebar %}
+<aside id="sidebar">
 <p>{{ object.description }}</p>
 {% include "authentic2/manager/search_form.html" %}
+</aside>
 {% endblock %}
 
 {% block appbar %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/role_remove_admin_role.html b/src/authentic2/manager/templates/authentic2/manager/role_remove_admin_role.html
index d8e67689..bd355808 100644
--- a/src/authentic2/manager/templates/authentic2/manager/role_remove_admin_role.html
+++ b/src/authentic2/manager/templates/authentic2/manager/role_remove_admin_role.html
@@ -1,4 +1,4 @@
-{% extends "authentic2/manager/sidebar.html" %}
+{% extends "authentic2/manager/base.html" %}
 {% load i18n %}
 
 {% block messages %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/role_remove_admin_user.html b/src/authentic2/manager/templates/authentic2/manager/role_remove_admin_user.html
index 2cc69b8f..895c4183 100644
--- a/src/authentic2/manager/templates/authentic2/manager/role_remove_admin_user.html
+++ b/src/authentic2/manager/templates/authentic2/manager/role_remove_admin_user.html
@@ -1,4 +1,4 @@
-{% extends "authentic2/manager/sidebar.html" %}
+{% extends "authentic2/manager/base.html" %}
 {% load i18n %}
 
 {% block messages %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/role_remove_child.html b/src/authentic2/manager/templates/authentic2/manager/role_remove_child.html
index 7e613b26..eae32f0f 100644
--- a/src/authentic2/manager/templates/authentic2/manager/role_remove_child.html
+++ b/src/authentic2/manager/templates/authentic2/manager/role_remove_child.html
@@ -1,4 +1,4 @@
-{% extends "authentic2/manager/sidebar.html" %}
+{% extends "authentic2/manager/base.html" %}
 {% load i18n %}
 
 {% block messages %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/role_remove_parent.html b/src/authentic2/manager/templates/authentic2/manager/role_remove_parent.html
index 66e0afb4..c6f48100 100644
--- a/src/authentic2/manager/templates/authentic2/manager/role_remove_parent.html
+++ b/src/authentic2/manager/templates/authentic2/manager/role_remove_parent.html
@@ -1,4 +1,4 @@
-{% extends "authentic2/manager/sidebar.html" %}
+{% extends "authentic2/manager/base.html" %}
 {% load i18n %}
 
 {% block messages %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/roles.html b/src/authentic2/manager/templates/authentic2/manager/roles.html
index 12e3fa2e..e0222c4f 100644
--- a/src/authentic2/manager/templates/authentic2/manager/roles.html
+++ b/src/authentic2/manager/templates/authentic2/manager/roles.html
@@ -13,7 +13,9 @@
 {% endblock %}
 
 {% block sidebar %}
-  {% include "authentic2/manager/search_form.html" %}
+  <aside id="sidebar">
+    {% include "authentic2/manager/search_form.html" %}
+  </aside>
 {% endblock %}
 
 {% block main %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/search_form.html b/src/authentic2/manager/templates/authentic2/manager/search_form.html
index a8f9f119..fc832d29 100644
--- a/src/authentic2/manager/templates/authentic2/manager/search_form.html
+++ b/src/authentic2/manager/templates/authentic2/manager/search_form.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+ <h3>{% trans "Search" context "title" %}</h3>
  <form id="search-form" method="get">
    {{ search_form.as_p }}
    <button>{% trans "Search" %}</button>
diff --git a/src/authentic2/manager/templates/authentic2/manager/service.html b/src/authentic2/manager/templates/authentic2/manager/service.html
index 9204fdf2..ff6b123e 100644
--- a/src/authentic2/manager/templates/authentic2/manager/service.html
+++ b/src/authentic2/manager/templates/authentic2/manager/service.html
@@ -7,6 +7,7 @@
 {% endblock %}
 
 {% block sidebar %}
+  <aside id="sidebar">
    {% include "authentic2/manager/search_form.html" %}
    <div id="details">
      <dl>
@@ -19,6 +20,7 @@
      </dl>
      <button rel="popup" data-url="{% url "a2-manager-service-edit" service_pk=view.kwargs.service_pk %}">{% trans "Edit" %}</button>
    </div>
+  </aside>
 {% endblock %}
 
 {% block main %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/services.html b/src/authentic2/manager/templates/authentic2/manager/services.html
index 6b0ed1c1..cf7fdc9b 100644
--- a/src/authentic2/manager/templates/authentic2/manager/services.html
+++ b/src/authentic2/manager/templates/authentic2/manager/services.html
@@ -1,4 +1,4 @@
-{% extends "authentic2/manager/sidebar.html" %}
+{% extends "authentic2/manager/base.html" %}
 {% load i18n staticfiles django_tables2 %}
 
 {% block page-title %}{{ block.super }} - {% trans "Services" %}{% endblock %}
@@ -9,7 +9,9 @@
 {% endblock %}
 
 {% block sidebar %}
-   {% include "authentic2/manager/search_form.html" %}
+  <aside id="sidebar">
+    {% include "authentic2/manager/search_form.html" %}
+  </aside>
 {% endblock %}
 
 {% block main %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/sidebar.html b/src/authentic2/manager/templates/authentic2/manager/sidebar.html
deleted file mode 100644
index 0c3c5528..00000000
--- a/src/authentic2/manager/templates/authentic2/manager/sidebar.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends "authentic2/manager/base.html" %}
-
-{% block content %}
-  <div id="sidebar">
-    {% block sidebar %}
-    {% endblock %}
-  </div>
-  <div class="content">
-    {% block main %}
-    {% endblock %}
-  </div>
-{% endblock %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/user_ou_roles.html b/src/authentic2/manager/templates/authentic2/manager/user_ou_roles.html
index 5620c00d..7ab9fd21 100644
--- a/src/authentic2/manager/templates/authentic2/manager/user_ou_roles.html
+++ b/src/authentic2/manager/templates/authentic2/manager/user_ou_roles.html
@@ -1,4 +1,4 @@
-{% extends "authentic2/manager/sidebar.html" %}
+{% extends "authentic2/manager/base.html" %}
 {% load i18n staticfiles django_tables2 %}
 
 {% block breadcrumb %}
@@ -47,7 +47,9 @@
 {% endblock %}
 
 {% block sidebar %}
-  {% include "authentic2/manager/search_form.html" %}
+  <aside id="sidebar">
+    {% include "authentic2/manager/search_form.html" %}
+  </aside>
 {% endblock %}
 
 {% block main %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/user_roles.html b/src/authentic2/manager/templates/authentic2/manager/user_roles.html
index 7db441e6..36227f24 100644
--- a/src/authentic2/manager/templates/authentic2/manager/user_roles.html
+++ b/src/authentic2/manager/templates/authentic2/manager/user_roles.html
@@ -1,4 +1,4 @@
-{% extends "authentic2/manager/sidebar.html" %}
+{% extends "authentic2/manager/base.html" %}
 {% load i18n staticfiles django_tables2 %}
 
 {% block breadcrumb %}
@@ -20,7 +20,9 @@
 {% endblock %}
 
 {% block sidebar %}
-   {% include "authentic2/manager/search_form.html" %}
+  <aside id="sidebar">
+    {% include "authentic2/manager/search_form.html" %}
+  </aside>
 {% endblock %}
 
 {% block main %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/users.html b/src/authentic2/manager/templates/authentic2/manager/users.html
index 1e878e27..caf4b585 100644
--- a/src/authentic2/manager/templates/authentic2/manager/users.html
+++ b/src/authentic2/manager/templates/authentic2/manager/users.html
@@ -1,4 +1,4 @@
-{% extends "authentic2/manager/sidebar.html" %}
+{% extends "authentic2/manager/base.html" %}
 {% load i18n staticfiles django_tables2 %}
 
 {% block page-title %}{{ block.super }} - {% trans "Users" %}{% endblock %}
@@ -27,7 +27,9 @@
 {% endblock %}
 
 {% block sidebar %}
-  {% include "authentic2/manager/search_form.html" %}
+  <aside id="sidebar">
+    {% include "authentic2/manager/search_form.html" %}
+  </aside>
 {% endblock %}
 
 {% block main %}
-- 
2.17.0