entrouvert
/
authentic
16
0
Fork 0
Code Issues Pull Requests 32 Releases Activity

manager: switch to gadjo sidebar (#22440)

This commit is contained in:
Frédéric Péters 2018-03-11 23:28:41 +01:00
parent 17dd1b2338
commit dbed99be54
19 changed files with 40 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/authentic2/manager/static/authentic2/manager/css/style.css
View File

@ -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;
}

7
src/authentic2/manager/templates/authentic2/manager/base.html
View File

@ -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 %}

2
src/authentic2/manager/templates/authentic2/manager/delete.html
View File

@ -1,4 +1,4 @@
{% extends "authentic2/manager/sidebar.html" %}
{% extends "authentic2/manager/base.html" %}
{% load i18n %}
{% block messages %}

2
src/authentic2/manager/templates/authentic2/manager/ou_common.html
View File

@ -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 %}

2
src/authentic2/manager/templates/authentic2/manager/ous.html
View File

@ -15,7 +15,9 @@
{% endblock %}
{% block sidebar %}
<aside id="sidebar">
{% include "authentic2/manager/search_form.html" %}
</aside>
{% endblock %}
{% block main %}

2
src/authentic2/manager/templates/authentic2/manager/role_common.html
View File

@ -1,4 +1,4 @@
{% extends "authentic2/manager/sidebar.html" %}
{% extends "authentic2/manager/base.html" %}
{% load i18n staticfiles %}
{% block title %}{{ block.super }} - {% trans "Roles" %}{% endblock %}

2
src/authentic2/manager/templates/authentic2/manager/role_members.html
View File

@ -10,8 +10,10 @@
{% endblock %}
{% block sidebar %}
<aside id="sidebar">
<p>{{ object.description }}</p>
{% include "authentic2/manager/search_form.html" %}
</aside>
{% endblock %}
{% block appbar %}

2
src/authentic2/manager/templates/authentic2/manager/role_remove_admin_role.html
View File

@ -1,4 +1,4 @@
{% extends "authentic2/manager/sidebar.html" %}
{% extends "authentic2/manager/base.html" %}
{% load i18n %}
{% block messages %}

2
src/authentic2/manager/templates/authentic2/manager/role_remove_admin_user.html
View File

@ -1,4 +1,4 @@
{% extends "authentic2/manager/sidebar.html" %}
{% extends "authentic2/manager/base.html" %}
{% load i18n %}
{% block messages %}

2
src/authentic2/manager/templates/authentic2/manager/role_remove_child.html
View File

@ -1,4 +1,4 @@
{% extends "authentic2/manager/sidebar.html" %}
{% extends "authentic2/manager/base.html" %}
{% load i18n %}
{% block messages %}

2
src/authentic2/manager/templates/authentic2/manager/role_remove_parent.html
View File

@ -1,4 +1,4 @@
{% extends "authentic2/manager/sidebar.html" %}
{% extends "authentic2/manager/base.html" %}
{% load i18n %}
{% block messages %}

4
src/authentic2/manager/templates/authentic2/manager/roles.html
View File

@ -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 %}

1
src/authentic2/manager/templates/authentic2/manager/search_form.html
View File

@ -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>

2
src/authentic2/manager/templates/authentic2/manager/service.html
View File

@ -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 %}

6
src/authentic2/manager/templates/authentic2/manager/services.html
View File

@ -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 %}

12
src/authentic2/manager/templates/authentic2/manager/sidebar.html
View File

@ -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 %}

6
src/authentic2/manager/templates/authentic2/manager/user_ou_roles.html
View File

@ -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 %}

6
src/authentic2/manager/templates/authentic2/manager/user_roles.html
View File

@ -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 %}

6
src/authentic2/manager/templates/authentic2/manager/users.html
View File

@ -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 %}