diff --git a/base/templates/base/auth/group.html b/base/templates/base/auth/group.html index b6ee7c18f..3d0e27dc1 100644 --- a/base/templates/base/auth/group.html +++ b/base/templates/base/auth/group.html @@ -1,29 +1,26 @@ -{% extends 'settings.html' %} -{% load i18n %} -{% block settings %} +{% extends 'settings.html' %} {% load i18n %} {% block settings %}
- -
- {% csrf_token %} -
-

{% trans "Group Permissions" %}

-
-
-
- {{form.as_p}} -
- -
- -
-
-
- - -
+
+ {% csrf_token %} +
+

+ {% trans "Group Permissions" %} +

+
+
+
{{form.as_p}}
+
+ +
+
+ +
{% include 'base/auth/group_view.html' %}
-{% endblock settings %} \ No newline at end of file +{% endblock settings %} diff --git a/base/templates/base/auth/group_view.html b/base/templates/base/auth/group_view.html index 9683fbbaf..d3ced2ce8 100644 --- a/base/templates/base/auth/group_view.html +++ b/base/templates/base/auth/group_view.html @@ -1,64 +1,101 @@ {% load i18n %}
-
-
-
-
-
-
-
-
{% trans "Group" %}
-
{% trans "Permissions" %}
-
-
-
-
- {% for gp in groups %} -
-
-
- - {{gp}}. -
-
-
- {{gp.permissions.all|length}} {% trans "Permissions" %} - {% for permission in gp.permissions.all %} - - {{permission}} - {% if perms.change_group %} -
- {% csrf_token %} - -
- {% endif %} - - {% endfor %} -
-
-
- {% if perms.change_group %} - - {% endif %} - {% if perms.delete_group %} -
- {% csrf_token %} - -
- {% endif %} -
-
-
-
- {% endfor %} -
-
-
-
-
+
+
+
+
+
+
+
+
{% trans "Group" %}
+
{% trans "Permissions" %}
+
+
+
+
+ {% for gp in groups %} +
+
+
+ + {{gp}}. +
+
+
+ {{gp.permissions.all|length}} {% trans "Permissions"%} + {% for permission in gp.permissions.all %} + + {{permission}} {% if perms.change_group %} +
+ {% csrf_token %} + +
+ {% endif %} + + {% endfor %} +
+
+
+ {% if perms.change_group %} + + + {% endif %} + {% if perms.delete_group %} +
+ {% csrf_token %} + +
+ {% endif %} +
+
+
+ {% endfor %} +
+
+
+
+
+
diff --git a/templates/settings.html b/templates/settings.html index aecc8b8ea..a4f381631 100644 --- a/templates/settings.html +++ b/templates/settings.html @@ -1,131 +1,190 @@ -{% extends 'index.html' %} -{% block content %} -{% load static %} -{% load i18n %} +{% extends 'index.html' %} {% block content %} {% load static %} {% load i18n %}
-
-

{% trans "Settings" %}

-
-
+
+

{% trans "Settings" %}

+
+
-
-
-
- -
- -
-
-
- {% block settings %} - - {% endblock settings %} -
-
-
+
+
+
+ +
+ +
+
+
+ {% block settings %} {% endblock settings %} +
+
+
{% endblock content %}