[CHANGE] Switch to header template where ever possible

Also fixed some Bootstrap misuse
2025-07-09 12:30:15 +02:00 · 2023-12-11 15:36:41 +01:00 · 2023-12-11 15:36:41 +01:00 · dbc19c76c5
commit dbc19c76c5
parent ced7972962
26 changed files with 120 additions and 132 deletions
--- a/allianceauth/eveonline/templatetags/examples.html
+++ b/allianceauth/eveonline/templatetags/examples.html
@ -14,15 +14,13 @@ Needs to be called with a context containing three objects:
 {% block page_title %}Evelinks Examples{% endblock page_title %}

 {% block content %}
+    <div>
+        {% include "framework/header/page-header.html" with title="Evelinks templatetags examples" %}

-    <div class="col-lg-12">
-        <h1 class="page-header text-center mb-3">Evelinks templatetags examples</h1>
        <div class="col-lg-12 container">
-
            <h2>profile URLs</h2>

            <div class="rows">
-
                <div class="col-md-4">
                    <h3>evewho</h3>
                    <p><a href="{{ my_character|evewho_character_url }}">character from character object</a></p>
@ -57,7 +55,6 @@ Needs to be called with a context containing three objects:
            <h2>image URLs</h2>

            <div class="rows">
-
                <div class="col-md-4">
                    <p>character from ID: <img src="{{ my_character.character_id|character_portrait_url:128 }}"></p>
                    <p>character from character object: <img src="{{ my_character|character_portrait_url:128 }}"></p>
@ -77,5 +74,4 @@ Needs to be called with a context containing three objects:
            </div>
        </div>
    </div>
-
 {% endblock content %}
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html
@ -12,9 +12,8 @@

 {% block content %}
    <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "Character not found!" %}
-        </h1>
+        {% translate "Character not found!" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}

        <div class="col-lg-12 container">
            <div class="row">
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkcreate.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkcreate.html
@ -13,9 +13,8 @@

 {% block content %}
    <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "Create Fatlink" %}
-        </h1>
+        {% translate "Create Fatlink" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}

        <div>
            {% if badrequest %}
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
@ -14,15 +14,15 @@
    <div>
        <h1 class="page-header text-center mb-3">
            {% translate "Edit fatlink" %} "{{ fatlink }}"
+        </h1>

-            <div class="text-end">
+        <div class="text-end mb-3">
            <form>
                <button type="submit" onclick="return confirm('{% translate "Are you sure?" %}')" class="btn btn-danger" name="deletefat" value="True">
                    {% translate "Delete fat" %}
                </button>
            </form>
        </div>
-        </h1>

        <div class="card card-default">
            <div class="card-header">
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
@ -14,9 +14,10 @@
    <div>
        <h1 class="page-header text-center mb-3">
            {% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
+        </h1>

        {% if char_id %}
-                <div class="text-end">
+            <div class="text-end mb-3">
                <a href="{% url 'fatlink:user_statistics_month' char_id previous_month|date:'Y' previous_month|date:'m' %}" class="btn btn-info">
                    {% translate "Previous month" %}
                </a>
@ -25,9 +26,8 @@
                </a>
            </div>
        {% endif %}
-        </h1>

-        <div class="card card-default mb-4">
+        <div class="card card-default mb-3">
            <div class="card-header">
                <div class="card-title mb-0">
                    {% blocktranslate count links=n_fats trimmed %}
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
@ -14,15 +14,15 @@
    <div>
        <h1 class="page-header text-center mb-3">
            {% blocktranslate %}Participation data statistics for {{ year }}{% endblocktranslate %}
+        </h1>

-            <div class="text-end">
+        <div class="text-end mb-3">
            <a href="{% url "fatlink:personal_statistics_year" previous_year %}" class="btn btn-info"><i class="fa-solid fa-chevron-left"></i> {% translate "Previous year" %}</a>

            {% if next_year %}
                <a href="{% url "fatlink:personal_statistics_year" next_year %}" class="btn btn-info">{% translate "Next year" %} <i class="fa-solid fa-chevron-right"></i></a>
            {% endif %}
        </div>
-        </h1>

        <div class="col-lg-2 offset-lg-5">
            <table class="table table-responsive">
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html
@ -11,18 +11,18 @@
 {% endblock header_nav_brand %}

 {% block content %}
-    <div class="col-lg-12">
+    <div>
        <h1 class="page-header text-center mb-3">
            {% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
+        </h1>

-            <div class="text-end">
+        <div class="text-end mb-3">
            <a href="{% url "fatlink:statistics_corp_month" corpid previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% translate "Previous month" %}</a>

            {% if next_month %}
                <a href="{% url "fatlink:statistics_corp_month" corpid next_month|date:"Y" next_month|date:"m" %}" class="btn btn-info">{% translate "Next month" %}</a>
            {% endif %}
        </div>
-        </h1>

        {% if fatStats %}
            <div class="table-responsive">
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
@ -14,15 +14,15 @@
    <div>
        <h1 class="page-header text-center mb-3">
            {% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
+        </h1>

-            <div class="text-end">
+        <div class="text-end mb-3">
            <a href="{% url "fatlink:statistics_month" previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% translate "Previous month" %}</a>

            {% if next_month %}
                <a href="{% url 'fatlink:statistics_month' next_month|date:"Y" next_month|date:"m"  %}" class="btn btn-info">{% translate "Next month" %}</a>
            {% endif %}
        </div>
-        </h1>

        {% if fatStats %}
            <div class="table-responsive">
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
@ -11,10 +11,9 @@
 {% endblock header_nav_brand %}

 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center mb-3">
-            {% translate "Participation data" %}
-        </h1>
+    <div>
+        {% translate "Participation data" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}

        <div class="table-responsive">
            <table class="table table-striped">
--- a/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
+++ b/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
@ -12,9 +12,8 @@

 {% block content %}
    <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "Choose a Corp" %}
-        </h1>
+        {% translate "Choose a Corp" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}

        {% if choices %}
            <div class="card card-primary">
--- a/allianceauth/hrapplications/templates/hrapplications/management.html
+++ b/allianceauth/hrapplications/templates/hrapplications/management.html
@ -13,8 +13,10 @@

 {% block content %}
    <div>
-        <h1 class="page-header text-center mb-3">{% translate "Personal Applications" %}
-            <div class="text-end">
+        {% translate "Personal Applications" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
+
+        <div class="text-end mb-3">
            {% if create %}
                <a href="{% url 'hrapplications:create_view' %}">
                    <button type="button" class="btn btn-success">{% translate "Create Application" %}</button>
@ -23,7 +25,6 @@
                <button type="button" class="btn btn-success" disabled>{% translate "Create Application" %}</button>
            {% endif %}
        </div>
-        </h1>

        {% if personal_apps %}
            <div class="card card-default mb-3">
@ -68,16 +69,17 @@
        {% endif %}

        {% if perms.auth.human_resources %}
-            <h1 class="page-header text-center mb-3">{% translate "Application Management" %}
-                <div class="text-end">
+            {% translate "Application Management" as page_header %}
+            {% include "framework/header/page-header.html" with title=page_header %}
+
+            <div class="text-end mb-3">
                <!-- Button trigger modal -->
                <button type="button" class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#modal-hr-search">
                    {% translate "Search Applications" %}
                </button>
            </div>
-            </h1>

-            <div class="card card-default mt-4">
+            <div class="card card-default">
                <div class="card-body clearfix">
                    <ul class="nav nav-tabs" id="application-list" role="tablist">
                        <li class="nav-item" role="presentation">
--- a/allianceauth/hrapplications/templates/hrapplications/searchview.html
+++ b/allianceauth/hrapplications/templates/hrapplications/searchview.html
@ -14,9 +14,8 @@
 {% block content %}
    <div>
        {% if perms.auth.human_resources %}
-            <h1 class="page-header text-center mb-3">
-                {% translate "Application Search Results" %}
-            </h1>
+            {% translate "Application Search Results" as page_header %}
+            {% include "framework/header/page-header.html" with title=page_header %}

            <div class="text-end mb-3">
                <!-- Button trigger modal -->
--- a/allianceauth/hrapplications/templates/hrapplications/view.html
+++ b/allianceauth/hrapplications/templates/hrapplications/view.html
@ -13,7 +13,8 @@

 {% block content %}
    <div>
-        <h1 class="page-header text-center mb-3">{% translate "View Application" %}</h1>
+        {% translate "View Application" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}

        <div>
            {% if app.approved %}
--- a/allianceauth/optimer/templates/optimer/add.html
+++ b/allianceauth/optimer/templates/optimer/add.html
@ -18,9 +18,8 @@

 {% block content %}
    <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "Create Fleet Operation" %}
-        </h1>
+        {% translate "Create Fleet Operation" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}

        <div class="card card-primary border-0">
            <div class="card-header">
--- a/allianceauth/optimer/templates/optimer/update.html
+++ b/allianceauth/optimer/templates/optimer/update.html
@ -18,9 +18,8 @@

 {% block content %}
    <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "Update Fleet Operation" %}
-        </h1>
+        {% translate "Update Fleet Operation" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}

        <div class="card card-primary border-0">
            <div class="card-header">
--- a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
+++ b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
@ -7,9 +7,8 @@

 {% block content %}
    <div class="col-lg-12">
-        <h1 class="page-header text-center mb-3">
-            {% translate "Verify TeamSpeak3 Identity" %}
-        </h1>
+        {% translate "Verify TeamSpeak3 Identity" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}

        <div class="row justify-content-center">
            <div class="col-md-4">
--- a/allianceauth/services/templates/services/service_credentials.html
+++ b/allianceauth/services/templates/services/service_credentials.html
@ -11,7 +11,7 @@
 {% endblock header_nav_brand %}

 {% block content %}
-    <div class="col-lg-12">
+    <div>
        <h1 class="page-header text-center mb-3">
            {% blocktranslate with service_name=view.service_name|title %}{{ service_name }} Credentials{% endblocktranslate %}
        </h1>
--- a/allianceauth/srp/templates/srp/add.html
+++ b/allianceauth/srp/templates/srp/add.html
@ -17,9 +17,8 @@

 {% block content %}
    <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "Create SRP Fleet" %}
-        </h1>
+        {% translate "Create SRP Fleet" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}

        <div class="card card-primary border-0">
            <div class="card-header">
--- a/allianceauth/srp/templates/srp/data.html
+++ b/allianceauth/srp/templates/srp/data.html
@ -13,10 +13,10 @@

 {% block content %}
    <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "SRP Fleet Data" %}
+        {% translate "SRP Fleet Data" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}

-            <div class="text-end">
+        <div class="text-end mb-3">
            {% if perms.auth.srp_management %}
                {% if fleet_status == "Completed" %}
                    <a href="{% url 'srp:mark_uncompleted' fleet_id %}" class="btn btn-warning">
@ -29,7 +29,6 @@
                {% endif %}
            {% endif %}
        </div>
-        </h1>

        {% if srpfleetrequests %}
            <form method="POST">
--- a/allianceauth/srp/templates/srp/request.html
+++ b/allianceauth/srp/templates/srp/request.html
@ -13,9 +13,8 @@

 {% block content %}
    <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "Create SRP Request" %}
-        </h1>
+        {% translate "Create SRP Request" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}

        <div class="card card-primary border-0">
            <div class="card-header">
--- a/allianceauth/srp/templates/srp/update.html
+++ b/allianceauth/srp/templates/srp/update.html
@ -13,9 +13,8 @@

 {% block content %}
    <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "Update AAR Link" %}
-        </h1>
+        {% translate "Update AAR Link" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}

        <div class="card card-primary border-0">
            <div class="card-header">
--- a/allianceauth/templates/allianceauth/error.html
+++ b/allianceauth/templates/allianceauth/error.html
@ -5,8 +5,8 @@
 {% endblock page_title %}

 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center mb-3">{{ error_title }}</h1>
+    <div>
+        {% include "framework/header/page-header.html" with title=error_title %}

        <div class="text-center">
            <svg
--- a/allianceauth/timerboard/templates/timerboard/form.html
+++ b/allianceauth/timerboard/templates/timerboard/form.html
@ -15,9 +15,10 @@
        <h1 class="page-header text-center mb-3">
            {% block page_header %}
            {% endblock page_header %}
-            {% include "timerboard/index_button.html" %}
        </h1>

+        {% include "timerboard/index_button.html" %}
+
        <div class="card card-primary border-0">
            <div class="card-header">
                <div class="card-title mb-0">
--- a/allianceauth/timerboard/templates/timerboard/index_button.html
+++ b/allianceauth/timerboard/templates/timerboard/index_button.html
@ -1,5 +1,5 @@
 {% load i18n %}

-<div class="text-end">
+<div class="text-end mb-3">
    <a href="{% url 'timerboard:view' %}" class="btn btn-secondary">{% translate "Back" %}</a>
 </div>
--- a/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html
+++ b/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html
@ -12,13 +12,13 @@

 {% block content %}
    <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "Delete Timer" %}
+        {% translate "Delete Timer" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
+
        {% include "timerboard/index_button.html" %}
-        </h1>

        <div class="row justify-content-center">
-            <div class="col-md-2">
+            <div class="col-md-4">
                <div class="row">
                    <form action="" method="post">
                        {% csrf_token %}