From 59054c69e44c6f160b3ae7a1a3692f596baba937 Mon Sep 17 00:00:00 2001
From: Lucas Brandstaetter <lucas@brandstaetter.tech>
Date: Sat, 2 Nov 2024 00:57:16 +0100
Subject: [PATCH] Fix bootstrap5 classes
Some classes have been renamed in bootstrap5.
This commit fixes the classes in the backoffice templates.
---
src/backoffice/templates/backoffice/assembly_badges.html | 2 +-
src/backoffice/templates/backoffice/assembly_detail.html | 6 +++---
src/backoffice/templates/backoffice/assembly_events.html | 2 +-
.../templates/backoffice/assembly_list_export.html | 2 +-
.../templates/backoffice/assembly_members_edit.html | 2 +-
src/backoffice/templates/backoffice/assembly_room.html | 4 ++--
src/backoffice/templates/backoffice/assembly_room_wa.html | 2 +-
.../templates/backoffice/assembly_room_wa_linterblock.html | 2 +-
src/backoffice/templates/backoffice/base.html | 6 +++---
.../templates/backoffice/schedule_source-detail.html | 4 ++--
src/backoffice/templates/backoffice/wa-map-detail.html | 2 +-
src/backoffice/templates/backoffice/wa-session-detail.html | 6 +++---
src/backoffice/templates/backoffice/wa-texture-form.html | 2 +-
src/backoffice/templates/backoffice/wa-texture-list.html | 2 +-
src/backoffice/templates/backoffice/wiki_page_detail.html | 2 +-
15 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/backoffice/templates/backoffice/assembly_badges.html b/src/backoffice/templates/backoffice/assembly_badges.html
index 055cb24c9..1c2ffcfc6 100644
--- a/src/backoffice/templates/backoffice/assembly_badges.html
+++ b/src/backoffice/templates/backoffice/assembly_badges.html
@@ -17,7 +17,7 @@
{% trans "Badges" %}
{% if can_manage %}
<a href="{% url 'backoffice:assembly-create-badge' assembly=assembly.id %}"
- class="btn btn-sm btn-primary float-right">+</a>
+ class="btn btn-sm btn-primary float-end">+</a>
{% endif %}
</div>
<div class="card-body">
diff --git a/src/backoffice/templates/backoffice/assembly_detail.html b/src/backoffice/templates/backoffice/assembly_detail.html
index 4a5503cc6..7a045c327 100644
--- a/src/backoffice/templates/backoffice/assembly_detail.html
+++ b/src/backoffice/templates/backoffice/assembly_detail.html
@@ -10,13 +10,13 @@
<div class="col-md-10">
<div class="card border-primary">
<div class="card-header bg-primary text-white">
- {% if assembly.is_official %}<span class="badge badge-light float-right">official</span>{% endif %}
+ {% if assembly.is_official %}<span class="badge badge-light float-end">official</span>{% endif %}
{% if can_manage %}
- <span class="float-right"><a href="{% url 'backoffice:assembly-edit' pk=assembly.pk %}"
+ <span class="float-end"><a href="{% url 'backoffice:assembly-edit' pk=assembly.pk %}"
class="btn btn-sm btn-light">{% trans "edit" %}</a></span>
{% endif %}
{% if assembly.is_public %}
- <a class="float-right btn btn-sm btn-info me-2"
+ <a class="float-end btn btn-sm btn-info me-2"
href="{% hub_absolute 'plainui:assembly' assembly_slug=assembly.slug %}">{% trans "public" %}</a>
{% endif %}
{{ assembly.name }}
diff --git a/src/backoffice/templates/backoffice/assembly_events.html b/src/backoffice/templates/backoffice/assembly_events.html
index ec65a69bf..3229cb926 100644
--- a/src/backoffice/templates/backoffice/assembly_events.html
+++ b/src/backoffice/templates/backoffice/assembly_events.html
@@ -56,7 +56,7 @@
{% trans "Events" %}
{% if can_manage %}
<a href="{% url 'backoffice:assembly-create-event' assembly=assembly.id %}"
- class="btn btn-sm btn-primary float-right">+</a>
+ class="btn btn-sm btn-primary float-end">+</a>
{% endif %}
</div>
<div class="card-body">
diff --git a/src/backoffice/templates/backoffice/assembly_list_export.html b/src/backoffice/templates/backoffice/assembly_list_export.html
index 62e817608..c8a03c94e 100644
--- a/src/backoffice/templates/backoffice/assembly_list_export.html
+++ b/src/backoffice/templates/backoffice/assembly_list_export.html
@@ -8,7 +8,7 @@
<div class="col-md-12">
<div class="card border-default">
<div class="card-header bg-default">
- <span class="float-right">
+ <span class="float-end">
<form class="form-inline"
method="get"
action="{% url 'backoffice:assemblieslist' variant=variant %}">
diff --git a/src/backoffice/templates/backoffice/assembly_members_edit.html b/src/backoffice/templates/backoffice/assembly_members_edit.html
index 23fc93427..8efb61e9d 100644
--- a/src/backoffice/templates/backoffice/assembly_members_edit.html
+++ b/src/backoffice/templates/backoffice/assembly_members_edit.html
@@ -41,7 +41,7 @@
</div>
{% endfor %}
</div>
- <div class="card-footer text-right">
+ <div class="card-footer text-end">
<button type="submit" class="btn btn-primary">{% trans "assemblyedit_submitbtn" %}</button>
</div>
</div>
diff --git a/src/backoffice/templates/backoffice/assembly_room.html b/src/backoffice/templates/backoffice/assembly_room.html
index ac51ff19d..833226b59 100644
--- a/src/backoffice/templates/backoffice/assembly_room.html
+++ b/src/backoffice/templates/backoffice/assembly_room.html
@@ -23,11 +23,11 @@
<div class="card border-default">
<div class="card-header bg-default">
{% if assembly.is_public %}
- <a class="float-right btn btn-sm btn-info"
+ <a class="float-end btn btn-sm btn-info"
href="{% hub_absolute 'plainui:room' slug=room.slug %}">{% trans "public" %}</a>
{% endif %}
{% if room.id %}
- <span class="text-muted float-right me-2" style="font-size: 75%;">ID: <strong>{{ room.id }}</strong></span>
+ <span class="text-muted float-end me-2" style="font-size: 75%;">ID: <strong>{{ room.id }}</strong></span>
{% endif %}
{% if room.name %}
{% if room.room_type != 'project' %}
diff --git a/src/backoffice/templates/backoffice/assembly_room_wa.html b/src/backoffice/templates/backoffice/assembly_room_wa.html
index b1626d44d..b258c7a75 100644
--- a/src/backoffice/templates/backoffice/assembly_room_wa.html
+++ b/src/backoffice/templates/backoffice/assembly_room_wa.html
@@ -26,7 +26,7 @@
<div class="card border-default">
<div class="card-header bg-default">
{% if room.id %}
- <span class="text-muted float-right" style="font-size: 75%;">ID: <strong>{{ room.id }}</strong></span>
+ <span class="text-muted float-end" style="font-size: 75%;">ID: <strong>{{ room.id }}</strong></span>
{% endif %}
{% if room.name %}
{{ room.get_room_type_display }} {% trans "Room" %} "{{ room.name }}"
diff --git a/src/backoffice/templates/backoffice/assembly_room_wa_linterblock.html b/src/backoffice/templates/backoffice/assembly_room_wa_linterblock.html
index 7a233f0e5..3bae576a7 100644
--- a/src/backoffice/templates/backoffice/assembly_room_wa_linterblock.html
+++ b/src/backoffice/templates/backoffice/assembly_room_wa_linterblock.html
@@ -74,7 +74,7 @@
<h4 class="border-bottom">
<code class="text-muted">{{ map }}</code>
</h4>
- <div class="pl-3">
+ <div class="ps-3">
{% for category, issues in infos.items %}
{% if issues|length > 0 %}
<h5>{{ category }}</h5>
diff --git a/src/backoffice/templates/backoffice/base.html b/src/backoffice/templates/backoffice/base.html
index d87a697a7..c214f0479 100644
--- a/src/backoffice/templates/backoffice/base.html
+++ b/src/backoffice/templates/backoffice/base.html
@@ -25,7 +25,7 @@
</head>
<body>
- <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+ <nav class="navbar navbar-expand-lg navbar-dark bg-dark px-2">
<a class="navbar-brand" href="{% url 'backoffice:index' %}">{{ conference.slug }} {% trans "title_suffix" %}</a>
<button class="navbar-toggler"
type="button"
@@ -140,7 +140,7 @@
data-bs-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false">{{ LANGUAGE_CODE }}</a>
- <div class="dropdown-menu dropdown-menu-right"
+ <div class="dropdown-menu dropdown-menu-end"
aria-labelledby="navbarLangDropdown">
<form method="post" action="{% url 'set_language' %}">
{% csrf_token %}
@@ -166,7 +166,7 @@
data-bs-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false">{{ user.get_full_name|default:user.username }}</a>
- <div class="dropdown-menu dropdown-menu-right"
+ <div class="dropdown-menu dropdown-menu-end"
aria-labelledby="navbarUserDropdown">
<a class="dropdown-item" href="{% url 'backoffice:profile' %}">{% trans "nav_profile" %}</a>
<a class="dropdown-item" href="{% url 'backoffice:password_change' %}">{% trans "nav_change_password" %}</a>
diff --git a/src/backoffice/templates/backoffice/schedule_source-detail.html b/src/backoffice/templates/backoffice/schedule_source-detail.html
index 8407cc6cd..474b7c5d2 100644
--- a/src/backoffice/templates/backoffice/schedule_source-detail.html
+++ b/src/backoffice/templates/backoffice/schedule_source-detail.html
@@ -11,7 +11,7 @@
<div class="card mb-3">
<div class="card-header">
ID <code>{{ object.id }}</code>
- <span class="float-right">
+ <span class="float-end">
<a href="{% url 'backoffice:schedulesource-edit' pk=object.id %}"
class="btn btn-sm btn-outline-primary text-primary">edit</a>
<a href="{% url 'backoffice:schedulesource-remove' pk=object.id %}"
@@ -50,7 +50,7 @@
<form action="{% url 'backoffice:schedulesource-import' pk=object.id %}"
method="post">
{% csrf_token %}
- <button type="submit" class="btn btn-sm btn-primary float-right">run an import NOW</button>
+ <button type="submit" class="btn btn-sm btn-primary float-end">run an import NOW</button>
</form>
Imports
</div>
diff --git a/src/backoffice/templates/backoffice/wa-map-detail.html b/src/backoffice/templates/backoffice/wa-map-detail.html
index f5da6bc2c..add7aac05 100644
--- a/src/backoffice/templates/backoffice/wa-map-detail.html
+++ b/src/backoffice/templates/backoffice/wa-map-detail.html
@@ -216,7 +216,7 @@ $(function() {
<div class="col col-md-12">
<div class="card mt-3">
<div class="card-header bg-{{ wa_linter.status }}">
- <span class="float-right small bg-white p-1">
+ <span class="float-end small bg-white p-1">
preview from <a href="{% url 'backoffice:assembly-room' assembly=room.assembly.id pk=room.id %}"
title="maybe 403 for u?">assembly backoffice room page</a>
</span>
diff --git a/src/backoffice/templates/backoffice/wa-session-detail.html b/src/backoffice/templates/backoffice/wa-session-detail.html
index 494270a98..707fdb23f 100644
--- a/src/backoffice/templates/backoffice/wa-session-detail.html
+++ b/src/backoffice/templates/backoffice/wa-session-detail.html
@@ -9,13 +9,13 @@
action="{% url 'backoffice:workadventure-session-delete' pk=object.id %}">
{% csrf_token %}
<input type="hidden" name="terminate" value="1">
- <button class="btn btn-danger btn-sm ms-3 float-right" type="submit">terminate session</button>
+ <button class="btn btn-danger btn-sm ms-3 float-end" type="submit">terminate session</button>
</form>
<form method="post"
action="{% url 'backoffice:workadventure-session-delete' pk=object.id %}">
{% csrf_token %}
<input type="hidden" name="terminate" value="0">
- <button class="btn btn-outline-danger btn-sm ms-3 float-right" type="submit">delete session</button>
+ <button class="btn btn-outline-danger btn-sm ms-3 float-end" type="submit">delete session</button>
</form>
WorkAdventure session {{ object.id }}
</div>
@@ -80,7 +80,7 @@
<form method="post"
action="{% url 'backoffice:workadventure-session-pushdata' pk=object.id %}">
{% csrf_token %}
- <button class="btn btn-sm btn-primary float-right"
+ <button class="btn btn-sm btn-primary float-end"
type="submit"
title="push data to backend">push</button>
</form>
diff --git a/src/backoffice/templates/backoffice/wa-texture-form.html b/src/backoffice/templates/backoffice/wa-texture-form.html
index d016ebb3e..deed0e5d3 100644
--- a/src/backoffice/templates/backoffice/wa-texture-form.html
+++ b/src/backoffice/templates/backoffice/wa-texture-form.html
@@ -10,7 +10,7 @@
<form action="{% url 'backoffice:workadventure-texture-remove' pk=object.id %}"
method="post">
{% csrf_token %}
- <button type="submit" class="btn btn-danger btn-sm float-right">delete</button>
+ <button type="submit" class="btn btn-danger btn-sm float-end">delete</button>
</form>
{% endif %}
WorkAdventure Texture {{ object.id|default:"(NEW)" }}
diff --git a/src/backoffice/templates/backoffice/wa-texture-list.html b/src/backoffice/templates/backoffice/wa-texture-list.html
index 07aa4b349..fa59e0347 100644
--- a/src/backoffice/templates/backoffice/wa-texture-list.html
+++ b/src/backoffice/templates/backoffice/wa-texture-list.html
@@ -5,7 +5,7 @@
<div class="card mt-3">
<div class="card-header">
<a href="{% url 'backoffice:workadventure-texture-add' %}"
- class="btn btn-sm btn-secondary float-right">add</a>
+ class="btn btn-sm btn-secondary float-end">add</a>
WorkAdventure Textures
<span class="badge badge-primary">{{ object_list|length }}</span>
</div>
diff --git a/src/backoffice/templates/backoffice/wiki_page_detail.html b/src/backoffice/templates/backoffice/wiki_page_detail.html
index f54315ced..037674a3a 100644
--- a/src/backoffice/templates/backoffice/wiki_page_detail.html
+++ b/src/backoffice/templates/backoffice/wiki_page_detail.html
@@ -31,7 +31,7 @@
{% endif %}
{% bootstrap_form form %}
</div>
- <div class="card-footer text-right">
+ <div class="card-footer text-end">
<button type="submit" class="btn btn-danger" form="delete_page">{% trans "StaticPage--delete-page" %}</button>
<button type="submit" class="btn btn-primary">{% trans "assemblyedit_submitbtn" %}</button>
</div>
--
GitLab