diff --git a/useradmin/admin.py b/useradmin/admin.py index f4cf1ddd..4b3def48 100644 --- a/useradmin/admin.py +++ b/useradmin/admin.py @@ -1,5 +1,28 @@ +# -*- mode: python; coding: utf-8 -*- +# Re2o est un logiciel d'administration développé initiallement au rezometz. Il +# se veut agnostique au réseau considéré, de manière à être installable en +# quelques clics. +# +# Copyright © 2019 Alexandre Iooss +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + from django.contrib import admin +from preferences.models import GeneralOption + class UserAdmin(admin.sites.AdminSite): def has_permission(self, request): @@ -11,6 +34,14 @@ class ModelUserAdmin(admin.ModelAdmin): # Display actions on changelist bottom bu default actions_on_bottom = True + # Correct number of item per page + list_per_page = GeneralOption.get_cached_value('pagination_number') + + # Custom templates + change_form_template = 'useradmin/change_form.html' + delete_confirmation_template = 'useradmin/delete_confirmation.html' + delete_selected_confirmation_template = 'useradmin/delete_selected_confirmation.html' + # Defines new management site user_admin_site = UserAdmin(name='user_admin') diff --git a/useradmin/templates/admin/change_form.html b/useradmin/templates/admin/change_form.html deleted file mode 100644 index 76d6d039..00000000 --- a/useradmin/templates/admin/change_form.html +++ /dev/null @@ -1,86 +0,0 @@ -{# Please keep this template in sync with django/contrib/admin one #} -{% extends "admin/base_site.html" %} -{% load i18n admin_urls static admin_modify %} - -{% block extrahead %}{{ block.super }} - -{{ media }} -{% endblock %} - -{% block extrastyle %}{{ block.super }}{% endblock %} - -{% block coltype %}colM{% endblock %} - -{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-form{% endblock %} - -{% if not is_popup %} -{% block breadcrumbs %} - -{% endblock %} -{% endif %} - -{% block content %}
-{% block object-tools %} -{% if change %}{% if not is_popup %} - -{% endif %}{% endif %} -{% endblock %} -
{% csrf_token %}{% block form_top %}{% endblock %} -
-{% if is_popup %}{% endif %} -{% if to_field %}{% endif %} -{% if save_on_top %}{% block submit_buttons_top %}{% submit_row %}{% endblock %}{% endif %} -{% if errors %} -

- {% if errors|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %} -

- {{ adminform.form.non_field_errors }} -{% endif %} - -{% block field_sets %} -{% for fieldset in adminform %} - {% include "admin/includes/fieldset.html" %} -{% endfor %} -{% endblock %} - -{% block after_field_sets %}{% endblock %} - -{% block inline_field_sets %} -{% for inline_admin_formset in inline_admin_formsets %} - {% include inline_admin_formset.opts.template %} -{% endfor %} -{% endblock %} - -{% block after_related_objects %}{% endblock %} - -{% block submit_buttons_bottom %}{% submit_row %}{% endblock %} - -{% block admin_change_form_document_ready %} - -{% endblock %} - -{# JavaScript for prepopulated fields #} -{% prepopulated_fields_js %} - -
-
-{% endblock %} diff --git a/useradmin/templates/admin/object_history.html b/useradmin/templates/admin/object_history.html deleted file mode 100644 index 5bf5e4db..00000000 --- a/useradmin/templates/admin/object_history.html +++ /dev/null @@ -1,43 +0,0 @@ -{# Please keep this template in sync with django/contrib/admin one #} -{% extends "admin/base_site.html" %} -{% load i18n admin_urls %} - -{% block breadcrumbs %} - -{% endblock %} - -{% block content %} -
-
- -{% if action_list %} - - - - - - - - - - {% for action in action_list %} - - - - - - {% endfor %} - -
{% trans 'Date/time' %}{% trans 'User' %}{% trans 'Action' %}
{{ action.action_time|date:"DATETIME_FORMAT" }}{{ action.user.get_username }}{% if action.user.get_full_name %} ({{ action.user.get_full_name }}){% endif %}{{ action.get_change_message }}
-{% else %} -

{% trans "This object doesn't have a change history. It probably wasn't added via this admin site." %}

-{% endif %} -
-
-{% endblock %} diff --git a/useradmin/templates/useradmin/change_form.html b/useradmin/templates/useradmin/change_form.html new file mode 100644 index 00000000..efae2d0d --- /dev/null +++ b/useradmin/templates/useradmin/change_form.html @@ -0,0 +1,37 @@ +{% extends "admin/change_form.html" %} +{% comment %} +Re2o est un logiciel d'administration développé initiallement au rezometz. Il +se veut agnostique au réseau considéré, de manière à être installable en +quelques clics. + +Copyright © 2019 Alexandre Iooss + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +{% endcomment %} +{% load i18n admin_urls admin_modify %} + +{% block object-tools %} +{% if change %}{% if not is_popup %} + +{% endif %}{% endif %} +{% endblock %} diff --git a/useradmin/templates/admin/delete_confirmation.html b/useradmin/templates/useradmin/delete_confirmation.html similarity index 57% rename from useradmin/templates/admin/delete_confirmation.html rename to useradmin/templates/useradmin/delete_confirmation.html index 3b58e558..eca368a5 100644 --- a/useradmin/templates/admin/delete_confirmation.html +++ b/useradmin/templates/useradmin/delete_confirmation.html @@ -1,24 +1,26 @@ -{# Please keep this template in sync with django/contrib/admin one #} -{% extends "admin/base_site.html" %} -{% load i18n admin_urls static %} +{% extends "admin/delete_confirmation.html" %} +{% comment %} +Re2o est un logiciel d'administration développé initiallement au rezometz. Il +se veut agnostique au réseau considéré, de manière à être installable en +quelques clics. -{% block extrahead %} - {{ block.super }} - {{ media }} - -{% endblock %} +Copyright © 2019 Alexandre Iooss -{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation{% endblock %} +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. -{% block breadcrumbs %} - -{% endblock %} +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +{% endcomment %} +{% load i18n admin_urls %} {% block content %} {% if perms_lacking %} @@ -46,7 +48,7 @@ {% if is_popup %}{% endif %} {% if to_field %}{% endif %} - {% trans "No, take me back" %} + {% trans "No, take me back" %} {% endif %} diff --git a/useradmin/templates/admin/delete_selected_confirmation.html b/useradmin/templates/useradmin/delete_selected_confirmation.html similarity index 57% rename from useradmin/templates/admin/delete_selected_confirmation.html rename to useradmin/templates/useradmin/delete_selected_confirmation.html index 371be030..50444bdd 100644 --- a/useradmin/templates/admin/delete_selected_confirmation.html +++ b/useradmin/templates/useradmin/delete_selected_confirmation.html @@ -1,23 +1,26 @@ -{# Please keep this template in sync with django/contrib/admin one #} -{% extends "admin/base_site.html" %} -{% load i18n l10n admin_urls static %} +{% extends "admin/delete_selected_confirmation.html" %} +{% comment %} +Re2o est un logiciel d'administration développé initiallement au rezometz. Il +se veut agnostique au réseau considéré, de manière à être installable en +quelques clics. -{% block extrahead %} - {{ block.super }} - {{ media }} - -{% endblock %} +Copyright © 2019 Alexandre Iooss -{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation delete-selected-confirmation{% endblock %} +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. -{% block breadcrumbs %} - -{% endblock %} +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +{% endcomment %} +{% load i18n l10n admin_urls %} {% block content %} {% if perms_lacking %} @@ -49,7 +52,7 @@ - {% trans "No, take me back" %} + {% trans "No, take me back" %} {% endif %}