From ea006574055d43b65a8f0709e3ee0eb9303823bf Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Mon, 20 Feb 2023 14:52:25 +0100 Subject: [PATCH] Use Bootstrap 5 instead of Bootstrap 4 --- .../templates/eastereggs/xp_modal.html | 6 +- apps/participation/tables.py | 6 - .../participation/participation_detail.html | 4 +- .../participation/passage_detail.html | 12 +- .../templates/participation/pool_detail.html | 16 +- .../templates/participation/team_detail.html | 36 ++-- .../participation/tournament_detail.html | 38 ++-- .../participation/tournament_list.html | 4 +- apps/registration/tables.py | 1 - .../templates/registration/user_detail.html | 66 +++---- .../templates/registration/user_list.html | 8 +- locale/fr/LC_MESSAGES/django.po | 182 ++++++++---------- tfjm/settings.py | 5 +- tfjm/static/bootstrap/css/bootstrap.min.css | 9 +- .../bootstrap/js/bootstrap.bundle.min.js | 6 +- tfjm/static/jquery/jquery-3.6.0.min.js | 2 - tfjm/static/jquery/jquery.min.js | 2 + tfjm/templates/base.html | 94 ++++----- tfjm/templates/base_modal.html | 6 +- tfjm/templates/index.html | 13 +- 20 files changed, 254 insertions(+), 262 deletions(-) delete mode 100644 tfjm/static/jquery/jquery-3.6.0.min.js create mode 100644 tfjm/static/jquery/jquery.min.js diff --git a/apps/eastereggs/templates/eastereggs/xp_modal.html b/apps/eastereggs/templates/eastereggs/xp_modal.html index c456517..f3726c8 100644 --- a/apps/eastereggs/templates/eastereggs/xp_modal.html +++ b/apps/eastereggs/templates/eastereggs/xp_modal.html @@ -5,15 +5,13 @@ diff --git a/apps/participation/tables.py b/apps/participation/tables.py index a935ed5..a3525d8 100644 --- a/apps/participation/tables.py +++ b/apps/participation/tables.py @@ -23,7 +23,6 @@ class TeamTable(tables.Table): } model = Team fields = ('name', 'trigram',) - template_name = 'django_tables2/bootstrap4.html' # noinspection PyTypeChecker @@ -55,7 +54,6 @@ class ParticipationTable(tables.Table): } model = Team fields = ('name', 'trigram', 'valid',) - template_name = 'django_tables2/bootstrap4.html' class TournamentTable(tables.Table): @@ -75,7 +73,6 @@ class TournamentTable(tables.Table): model = Tournament fields = ('name', 'date',) order_by = ('name', ) - template_name = 'django_tables2/bootstrap4.html' class PoolTable(tables.Table): @@ -96,7 +93,6 @@ class PoolTable(tables.Table): } model = Pool fields = ('teams', 'round', 'tournament',) - template_name = 'django_tables2/bootstrap4.html' class PassageTable(tables.Table): @@ -121,7 +117,6 @@ class PassageTable(tables.Table): } model = Passage fields = ('defender', 'opponent', 'reporter', 'solution_number', ) - template_name = 'django_tables2/bootstrap4.html' class NoteTable(tables.Table): @@ -140,4 +135,3 @@ class NoteTable(tables.Table): model = Note fields = ('jury', 'defender_writing', 'defender_oral', 'opponent_writing', 'opponent_oral', 'reporter_writing', 'reporter_oral',) - template_name = 'django_tables2/bootstrap4.html' diff --git a/apps/participation/templates/participation/participation_detail.html b/apps/participation/templates/participation/participation_detail.html index c6c0ac0..600a714 100644 --- a/apps/participation/templates/participation/participation_detail.html +++ b/apps/participation/templates/participation/participation_detail.html @@ -51,7 +51,7 @@ {% trans "If you upload a solution, this will replace the version for the final tournament." %} {% endif %} - + @@ -64,7 +64,7 @@ {% block extrajavascript %} + @@ -37,13 +37,13 @@ {% block extracss %}{% endblock %} -
-