From de9650d33a8c839db27cca187e54ee4c2a289425 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Fri, 9 Aug 2019 22:29:57 +0200 Subject: [PATCH] Drop django-bootstrap3 --- logs/templates/logs/aff_actions.html | 22 +-------- logs/templates/logs/aff_stats_users.html | 58 ++++++++---------------- logs/templates/logs/delete.html | 38 +++------------- logs/templates/logs/index.html | 33 ++------------ logs/templates/logs/sidebar.html | 22 +-------- logs/templates/logs/stats_users.html | 33 ++------------ med/settings.py | 1 - requirements.txt | 3 +- 8 files changed, 36 insertions(+), 174 deletions(-) diff --git a/logs/templates/logs/aff_actions.html b/logs/templates/logs/aff_actions.html index 7e70d21..4c049c0 100644 --- a/logs/templates/logs/aff_actions.html +++ b/logs/templates/logs/aff_actions.html @@ -1,25 +1,5 @@ {% 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 © 2017 Gabriel Détraz -Copyright © 2017 Goulven Kermarec -Copyright © 2017 Augustin Lemesle - -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. +SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% if revisions_list.paginator %} diff --git a/logs/templates/logs/aff_stats_users.html b/logs/templates/logs/aff_stats_users.html index f5b21c7..3317d8f 100644 --- a/logs/templates/logs/aff_stats_users.html +++ b/logs/templates/logs/aff_stats_users.html @@ -1,45 +1,25 @@ {% 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 © 2017 Gabriel Détraz -Copyright © 2017 Goulven Kermarec -Copyright © 2017 Augustin Lemesle - -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. +SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} - {% for key_dict, stats_dict in stats_list.items %} +{% for key_dict, stats_dict in stats_list.items %} {% for key, stats in stats_dict.items %} - - -

Statistiques par {{ key_dict }} de {{ key }}

+
+ +

Statistiques par {{ key_dict }} de {{ key }}

- - - + + + - - {% for stat in stats %} - - - - - - {% endfor %} -
{{ key_dict }}Nombre de {{ key }} par {{ key_dict }}Rang{{ key_dict }}Nombre de {{ key }} par {{ key_dict }}Rang
{{ stat|truncatechars:25 }}{{ stat.num }}{{ forloop.counter }}
- {% endfor %} - {% endfor %} + + {% for stat in stats %} + + {{ stat|truncatechars:25 }} + {{ stat.num }} + {{ forloop.counter }} + + {% endfor %} + + {% endfor %} +{% endfor %} diff --git a/logs/templates/logs/delete.html b/logs/templates/logs/delete.html index 8bda7cb..fbe648c 100644 --- a/logs/templates/logs/delete.html +++ b/logs/templates/logs/delete.html @@ -1,40 +1,14 @@ {% extends "logs/sidebar.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 © 2017 Gabriel Détraz -Copyright © 2017 Goulven Kermarec -Copyright © 2017 Augustin Lemesle - -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. +SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} -{% load bootstrap3 %} - {% block title %}Supression d'action{% endblock %} {% block content %} - -
- {% csrf_token %} -

Attention, voulez-vous vraiment annuler cette action {{ objet_name }} ( {{ objet }} ) ?

- {% bootstrap_button "Confirmer" button_type="submit" icon="trash" %} -
-
-
-
+
+ {% csrf_token %} +

Attention, voulez-vous vraiment annuler cette action {{ objet_name }} ( {{ objet }} ) ?

+ +
{% endblock %} diff --git a/logs/templates/logs/index.html b/logs/templates/logs/index.html index 0255672..b23ba2f 100644 --- a/logs/templates/logs/index.html +++ b/logs/templates/logs/index.html @@ -1,36 +1,11 @@ {% extends "logs/sidebar.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 © 2017 Gabriel Détraz -Copyright © 2017 Goulven Kermarec -Copyright © 2017 Augustin Lemesle - -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. +SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} -{% load bootstrap3 %} - {% block title %}Statistiques{% endblock %} {% block content %} -

Actions effectuées

- {% include "logs/aff_actions.html" with revisions_list=revisions_list %} -
-
-
- {% endblock %} +

Actions effectuées

+ {% include "logs/aff_actions.html" with revisions_list=revisions_list %} +{% endblock %} diff --git a/logs/templates/logs/sidebar.html b/logs/templates/logs/sidebar.html index 8ad6516..7376ce7 100644 --- a/logs/templates/logs/sidebar.html +++ b/logs/templates/logs/sidebar.html @@ -1,26 +1,6 @@ {% extends "base.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 © 2017 Gabriel Détraz -Copyright © 2017 Goulven Kermarec -Copyright © 2017 Augustin Lemesle - -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. +SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% block sidebar %} diff --git a/logs/templates/logs/stats_users.html b/logs/templates/logs/stats_users.html index fa0843e..d77af0e 100644 --- a/logs/templates/logs/stats_users.html +++ b/logs/templates/logs/stats_users.html @@ -1,36 +1,11 @@ {% extends "logs/sidebar.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 © 2017 Gabriel Détraz -Copyright © 2017 Goulven Kermarec -Copyright © 2017 Augustin Lemesle - -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. +SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} -{% load bootstrap3 %} - {% block title %}Statistiques par utilisateur{% endblock %} {% block content %} -

Statistiques par utilisateur

- {% include "logs/aff_stats_users.html" with stats_list=stats_list %} -
-
-
- {% endblock %} +

Statistiques par utilisateur

+ {% include "logs/aff_stats_users.html" with stats_list=stats_list %} +{% endblock %} diff --git a/med/settings.py b/med/settings.py index 88602ee..930376a 100644 --- a/med/settings.py +++ b/med/settings.py @@ -33,7 +33,6 @@ INSTALLED_APPS = [ 'theme', # External apps - 'bootstrap3', 'reversion', # Django contrib diff --git a/requirements.txt b/requirements.txt index 0254909..869f0c4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,5 +4,4 @@ Pillow==5.4.1 pytz==2019.1 six==1.12.0 sqlparse==0.2.4 -django-reversion==3.0.3 -django-bootstrap3==11.1.0 +django-reversion==3.0.3 \ No newline at end of file