From e3b151f2fbdb0d9278b73887e2527418b23b75d8 Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Tue, 31 Oct 2023 10:25:04 +0100
Subject: [PATCH] [CHANGE] Use BS5 forms

---
 .../templates/services/openfire/broadcast.html      |  4 ++--
 .../services/teamspeak3/teamspeakjoin.html          |  6 +++---
 .../templates/services/fleetformattertool.html      |  4 ++--
 .../templates/services/service_password.html        | 13 ++++++-------
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html b/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html
index 2f6791bd..f99e1781 100644
--- a/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html
+++ b/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html
@@ -1,5 +1,5 @@
 {% extends "allianceauth/base.html" %}
-{% load bootstrap %}
+{% load django_bootstrap5 %}
 {% load i18n %}
 
 {% block page_title %}{% translate "Jabber Broadcast" %}{% endblock page_title %}
@@ -17,7 +17,7 @@
                     {% endif %}
                     <form class="form-signin" role="form" action="" method="POST" onsubmit="submitbutton.disabled = true; return true;">
                         {% csrf_token %}
-                        {{ form|bootstrap }}
+                        {% bootstrap_form form %}
                         <br>
                         <button class="btn btn-lg btn-primary btn-block" name="submitbutton" type="submit">{% translate "Broadcast" %}
                         </button>
diff --git a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
index dbe61c28..716c82eb 100644
--- a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
+++ b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
@@ -1,5 +1,5 @@
-{% extends "allianceauth/base.html" %}
-{% load bootstrap %}
+{% extends "allianceauth/base-bs5.html" %}
+{% load django_bootstrap5 %}
 {% load i18n %}
 
 {% block page_title %}{% translate "Verify TeamSpeak3" %}{% endblock page_title %}
@@ -14,7 +14,7 @@
                 <br>
                 <form class="form-signin" role="form" action="{% url 'teamspeak3:verify' %}" method="POST">
                     {% csrf_token %}
-                    {{ form|bootstrap }}
+                    {% bootstrap_form form %}
                     <br>
                     <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Continue" %}</button>
                 </form>
diff --git a/allianceauth/services/templates/services/fleetformattertool.html b/allianceauth/services/templates/services/fleetformattertool.html
index b176fd1f..c5535b6f 100644
--- a/allianceauth/services/templates/services/fleetformattertool.html
+++ b/allianceauth/services/templates/services/fleetformattertool.html
@@ -1,5 +1,5 @@
 {% extends "allianceauth/base-bs5.html" %}
-{% load bootstrap %}
+{% load django_bootstrap5 %}
 {% load i18n %}
 
 {% block page_title %}{% translate "Fleet Formatter Tool" %}{% endblock page_title %}
@@ -18,7 +18,7 @@
                     {% endif %}
                     <form class="form-signin" role="form" action="" method="POST">
                         {% csrf_token %}
-                        {{ form|bootstrap }}
+                        {% bootstrap_form form %}
                         <br>
                         <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Format" %}</button>
                         <br>
diff --git a/allianceauth/services/templates/services/service_password.html b/allianceauth/services/templates/services/service_password.html
index f4466f1b..d431868d 100644
--- a/allianceauth/services/templates/services/service_password.html
+++ b/allianceauth/services/templates/services/service_password.html
@@ -1,5 +1,5 @@
-{% extends "allianceauth/base.html" %}
-{% load bootstrap %}
+{% extends "allianceauth/base-bs5.html" %}
+{% load django_bootstrap5 %}
 {% load i18n %}
 
 {% block page_title %}{% blocktranslate with service_name=view.service_name|title %}{{ service_name }} Password Change{% endblocktranslate %}{% endblock page_title %}
@@ -7,12 +7,12 @@
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% blocktranslate with service_name=view.service_name|title %}Set {{service_name}} Password{% endblocktranslate %}</h1>
-        <div class="container-fluid">
-            <div class="col-md-4 col-md-offset-4">
-                <div class="row">
+        <div class="container">
+            <div class="row justify-content-center">
+                <div class="col-md-4 align-self-center">
                     <form class="form-signin" role="form" action="" method="POST" onsubmit="submitbutton.disabled = true; return true;">
                         {% csrf_token %}
-                        {{ form|bootstrap }}
+                        {% bootstrap_form form %}
                         <br>
                         <button class="btn btn-lg btn-primary btn-block" name="submitbutton" type="submit">{% translate "Set Password" %}</button>
                     </form>
@@ -20,5 +20,4 @@
             </div>
         </div>
     </div>
-
 {% endblock content %}