From 2455da83b0644c0ddb68a57e82f6eb02f37320bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de>
Date: Tue, 3 Jan 2023 17:55:27 +0100
Subject: [PATCH] Upgrade to fontawesome 6
Use official fontawesome django app for static file handling
Switch to fork/new version of django-bootstrap (for icon field and rendering shortcuts)
Add migration to bump icon field of dashboard buttons to new version
Update templates to load new app and use new tags
---
AKDashboard/migrations/0001_initial.py | 4 +--
AKDashboard/migrations/0002_update_fa.py | 19 +++++++++++++
AKDashboard/models.py | 2 +-
.../templates/AKDashboard/dashboard.html | 4 +--
.../AKDashboard/dashboard_event.html | 6 ++--
.../templates/AKDashboard/dashboard_row.html | 2 +-
AKModel/templates/AKModel/user.html | 2 +-
.../admin/AKModel/action_intermediate.html | 6 ++--
.../admin/AKModel/event_wizard/activate.html | 8 +++---
.../event_wizard/created_prepare_import.html | 10 +++----
.../admin/AKModel/event_wizard/finish.html | 6 ++--
.../admin/AKModel/event_wizard/import.html | 6 ++--
.../admin/AKModel/event_wizard/settings.html | 8 +++---
.../admin/AKModel/event_wizard/start.html | 6 ++--
.../admin/AKModel/message_delete.html | 2 +-
.../admin/AKModel/requirements_overview.html | 6 ++--
AKPlan/templates/AKPlan/plan_base.html | 4 +--
AKPlan/templates/AKPlan/plan_detail.html | 2 +-
AKPlan/templates/AKPlan/plan_index.html | 4 +--
AKPlan/templates/AKPlan/plan_room.html | 4 +--
AKPlan/templates/AKPlan/plan_wall.html | 4 +--
AKPlanning/settings.py | 7 +++--
.../AKScheduling/constraint_violations.html | 6 ++--
.../admin/AKScheduling/interest.html | 4 +--
.../admin/AKScheduling/manage_tracks.html | 8 +++---
.../admin/AKScheduling/scheduling.html | 14 +++++-----
.../admin/AKScheduling/special_attention.html | 2 +-
.../templates/AKSubmission/ak_detail.html | 28 +++++++++----------
.../templates/AKSubmission/ak_edit.html | 4 +--
.../templates/AKSubmission/ak_history.html | 8 +++---
.../AKSubmission/ak_interest_script.html | 4 +--
.../templates/AKSubmission/ak_overview.html | 4 +--
.../templates/AKSubmission/ak_table.html | 14 +++++-----
.../templates/AKSubmission/akmessage_add.html | 8 +++---
.../AKSubmission/akowner_create_update.html | 8 +++---
.../AKSubmission/akslot_add_update.html | 8 +++---
.../templates/AKSubmission/akslot_delete.html | 6 ++--
.../AKSubmission/submission_base.html | 4 +--
.../submission_not_configured.html | 2 +-
.../AKSubmission/submission_overview.html | 2 +-
.../templates/AKSubmission/submit_new.html | 8 +++---
.../templatetags/tags_AKSubmission.py | 6 ++--
requirements.txt | 3 +-
templates/admin/base_site.html | 4 +--
templates/base.html | 4 +--
45 files changed, 151 insertions(+), 130 deletions(-)
create mode 100644 AKDashboard/migrations/0002_update_fa.py
diff --git a/AKDashboard/migrations/0001_initial.py b/AKDashboard/migrations/0001_initial.py
index 0d969dca..54689922 100644
--- a/AKDashboard/migrations/0001_initial.py
+++ b/AKDashboard/migrations/0001_initial.py
@@ -2,7 +2,7 @@
from django.db import migrations, models
import django.db.models.deletion
-import fontawesome_5.fields
+import fontawesome_6.fields
class Migration(migrations.Migration):
@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('text', models.CharField(help_text='Text that will be shown on the button', max_length=50, verbose_name='Text')),
('url', models.URLField(help_text='URL this button links to', verbose_name='Link URL')),
- ('icon', fontawesome_5.fields.IconField(blank=True, default='external-link-alt', help_text='Symbol represeting this button.', max_length=60, verbose_name='Icon')),
+ ('icon', fontawesome_6.fields.IconField(blank=True, default='external-link-alt', help_text='Symbol represeting this button.', max_length=60, verbose_name='Icon')),
('color', models.PositiveSmallIntegerField(choices=[(0, 'primary'), (1, 'success'), (2, 'info'), (3, 'warning'), (4, 'danger')], default=0, help_text='Style (Color) of this button (bootstrap class)', verbose_name='Button Style')),
('event', models.ForeignKey(help_text='Event this button belongs to', on_delete=django.db.models.deletion.CASCADE, to='AKModel.Event', verbose_name='Event')),
],
diff --git a/AKDashboard/migrations/0002_update_fa.py b/AKDashboard/migrations/0002_update_fa.py
new file mode 100644
index 00000000..ec198c6d
--- /dev/null
+++ b/AKDashboard/migrations/0002_update_fa.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.2.16 on 2023-01-03 16:50
+
+from django.db import migrations
+import fontawesome_6.fields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('AKDashboard', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='dashboardbutton',
+ name='icon',
+ field=fontawesome_6.fields.IconField(blank=True, default='external-link-alt', help_text='Symbol represeting this button.', max_length=60, verbose_name='Icon'),
+ ),
+ ]
diff --git a/AKDashboard/models.py b/AKDashboard/models.py
index f0e2745a..130a8e37 100644
--- a/AKDashboard/models.py
+++ b/AKDashboard/models.py
@@ -1,6 +1,6 @@
from django.db import models
from django.utils.translation import gettext_lazy as _
-from fontawesome_5.fields import IconField
+from fontawesome_6.fields import IconField
from AKModel.models import Event
diff --git a/AKDashboard/templates/AKDashboard/dashboard.html b/AKDashboard/templates/AKDashboard/dashboard.html
index d93cbb14..7086854e 100644
--- a/AKDashboard/templates/AKDashboard/dashboard.html
+++ b/AKDashboard/templates/AKDashboard/dashboard.html
@@ -1,6 +1,6 @@
{% extends 'base.html' %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load i18n %}
{% load static %}
@@ -22,7 +22,7 @@
{% include "AKDashboard/dashboard_row.html" %}
{% if event.contact_email %}
<p>
- <a href="mailto:{{ event.contact_email }}">{% fa5_icon "envelope" "fas" %} {% trans "Write to organizers of this event for questions and comments" %}</a>
+ <a href="mailto:{{ event.contact_email }}">{% fa6_icon "envelope" "fas" %} {% trans "Write to organizers of this event for questions and comments" %}</a>
</p>
{% endif %}
</div>
diff --git a/AKDashboard/templates/AKDashboard/dashboard_event.html b/AKDashboard/templates/AKDashboard/dashboard_event.html
index 121c72e2..4a4726a9 100644
--- a/AKDashboard/templates/AKDashboard/dashboard_event.html
+++ b/AKDashboard/templates/AKDashboard/dashboard_event.html
@@ -1,6 +1,6 @@
{% extends 'base.html' %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load i18n %}
{% load static %}
{% load tags_AKModel %}
@@ -27,14 +27,14 @@
<h3 class="mt-1" id="history">{% trans "Recent" %}:</h3>
<ul id="recent-changes-list">
{% for recent in recent_changes %}
- <li><a href="{{ recent.link }}">{% fa5_icon recent.icon.0 recent.icon.1 %} {{ recent.text }}</a> <span style="color: #999999;">{{ recent.timestamp | timezone:event.timezone | date:"d.m. H:i" }}</span></li>
+ <li><a href="{{ recent.link }}">{% fa6_icon recent.icon.0 recent.icon.1 %} {{ recent.text }}</a> <span style="color: #999999;">{{ recent.timestamp | timezone:event.timezone | date:"d.m. H:i" }}</span></li>
{% endfor %}
</ul>
{% endif %}
{% if event.contact_email %}
<p>
- <a href="mailto:{{ event.contact_email }}">{% fa5_icon "envelope" "fas" %} {% trans "Write to organizers of this event for questions and comments" %}</a>
+ <a href="mailto:{{ event.contact_email }}">{% fa6_icon "envelope" "fas" %} {% trans "Write to organizers of this event for questions and comments" %}</a>
</p>
{% endif %}
</div>
diff --git a/AKDashboard/templates/AKDashboard/dashboard_row.html b/AKDashboard/templates/AKDashboard/dashboard_row.html
index 87e61272..e06c6af8 100644
--- a/AKDashboard/templates/AKDashboard/dashboard_row.html
+++ b/AKDashboard/templates/AKDashboard/dashboard_row.html
@@ -1,6 +1,6 @@
{% load i18n %}
{% load tags_AKModel %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
<h2><a href="{% url 'dashboard:dashboard_event' slug=event.slug %}">{{ event.name }}</a></h2>
<div class="mt-2">
diff --git a/AKModel/templates/AKModel/user.html b/AKModel/templates/AKModel/user.html
index 7c74fde8..47ccc35a 100644
--- a/AKModel/templates/AKModel/user.html
+++ b/AKModel/templates/AKModel/user.html
@@ -1,6 +1,6 @@
{% extends 'base.html' %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load i18n %}
{% load static %}
diff --git a/AKModel/templates/admin/AKModel/action_intermediate.html b/AKModel/templates/admin/AKModel/action_intermediate.html
index de6d76c5..ad1d0e52 100644
--- a/AKModel/templates/admin/AKModel/action_intermediate.html
+++ b/AKModel/templates/admin/AKModel/action_intermediate.html
@@ -3,7 +3,7 @@
{% load i18n %}
{% load django_bootstrap5 %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% block title %}{{event}}: {{ title }}{% endblock %}
@@ -20,11 +20,11 @@
<div class="float-end">
<button type="submit" class="save btn btn-success" value="Submit">
- {% fa5_icon "check" 'fas' %} {% trans "Confirm" %}
+ {% fa6_icon "check" 'fas' %} {% trans "Confirm" %}
</button>
</div>
<a href="javascript:history.back()" class="btn btn-info">
- {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
+ {% fa6_icon "times" 'fas' %} {% trans "Cancel" %}
</a>
</form>
{% endblock %}
diff --git a/AKModel/templates/admin/AKModel/event_wizard/activate.html b/AKModel/templates/admin/AKModel/event_wizard/activate.html
index fd382f2f..44c08a31 100644
--- a/AKModel/templates/admin/AKModel/event_wizard/activate.html
+++ b/AKModel/templates/admin/AKModel/event_wizard/activate.html
@@ -3,7 +3,7 @@
{% load i18n %}
{% load django_bootstrap5 %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load tz %}
{% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %}
@@ -12,7 +12,7 @@
{% include "admin/AKModel/event_wizard/wizard_steps.html" %}
<div class="text-center btn-success disabled mt-3 mb-3" style="font-size: 8em;">
- {% fa5_icon "copy" "fas" %}
+ {% fa6_icon "copy" "fas" %}
</div>
<h5 class="mb-3">{% trans "Successfully imported.<br><br>Do you want to activate your event now?" %}</h5>
@@ -24,12 +24,12 @@
<div class="float-end">
<button type="submit" class="save btn btn-success" value="Submit">
- {% fa5_icon "check" 'fas' %} {% trans "Finish" %}
+ {% fa6_icon "check" 'fas' %} {% trans "Finish" %}
</button>
</div>
<a href="{% url 'admin:event_status' event.slug %}" class="btn btn-info">
- {% fa5_icon "info" 'fas' %} {% trans "Status" %}
+ {% fa6_icon "info" 'fas' %} {% trans "Status" %}
</a>
</form>
diff --git a/AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html b/AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html
index ce41deec..75e93653 100644
--- a/AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html
+++ b/AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html
@@ -3,7 +3,7 @@
{% load i18n %}
{% load django_bootstrap5 %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load tz %}
{% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %}
@@ -22,7 +22,7 @@
{% endtimezone %}
<div class="text-center btn-success disabled mb-3" style="font-size: 8em;">
- {% fa5_icon "calendar-plus" "fas" %}
+ {% fa6_icon "calendar-plus" "fas" %}
</div>
@@ -36,16 +36,16 @@
<div class="float-end">
<a href="{% url 'admin:new_event_wizard_activate' event.slug %}" class="btn btn-info">
- {% fa5_icon "forward" 'fas' %} {% trans "Skip Import" %}
+ {% fa6_icon "forward" 'fas' %} {% trans "Skip Import" %}
</a>
<button type="submit" class="save btn btn-success" value="Submit">
- {% fa5_icon "check" 'fas' %} {% trans "Continue" %}
+ {% fa6_icon "check" 'fas' %} {% trans "Continue" %}
</button>
</div>
<a href="{% url 'admin:event_status' event.slug %}" class="btn btn-info">
- {% fa5_icon "info" 'fas' %} {% trans "Status" %}
+ {% fa6_icon "info" 'fas' %} {% trans "Status" %}
</a>
</form>
diff --git a/AKModel/templates/admin/AKModel/event_wizard/finish.html b/AKModel/templates/admin/AKModel/event_wizard/finish.html
index 7dd0d19e..82c795a4 100644
--- a/AKModel/templates/admin/AKModel/event_wizard/finish.html
+++ b/AKModel/templates/admin/AKModel/event_wizard/finish.html
@@ -3,7 +3,7 @@
{% load i18n %}
{% load django_bootstrap5 %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load tz %}
{% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %}
@@ -12,13 +12,13 @@
{% include "admin/AKModel/event_wizard/wizard_steps.html" %}
<div class="text-center btn-success disabled mt-3 mb-3" style="font-size: 8em;">
- {% fa5_icon "check-circle" "fas" %}
+ {% fa6_icon "check-circle" "fas" %}
</div>
<h5>{% trans "Congratulations. Everything is set up!" %}</h5>
<a href="{% url 'admin:event_status' event.slug %}" class="btn btn-info float-end">
- {% fa5_icon "info" 'fas' %} {% trans "Status" %}
+ {% fa6_icon "info" 'fas' %} {% trans "Status" %}
</a>
{% endblock %}
diff --git a/AKModel/templates/admin/AKModel/event_wizard/import.html b/AKModel/templates/admin/AKModel/event_wizard/import.html
index d27cd8af..c99ca2b2 100644
--- a/AKModel/templates/admin/AKModel/event_wizard/import.html
+++ b/AKModel/templates/admin/AKModel/event_wizard/import.html
@@ -3,7 +3,7 @@
{% load i18n %}
{% load django_bootstrap5 %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load tz %}
{% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %}
@@ -17,11 +17,11 @@
{% bootstrap_form form %}
<button type="submit" class="save btn btn-success float-end" value="Submit">
- {% fa5_icon "check" 'fas' %} {% trans "Continue" %}
+ {% fa6_icon "check" 'fas' %} {% trans "Continue" %}
</button>
<a href="{% url 'admin:index' %}" class="btn btn-info">
- {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
+ {% fa6_icon "times" 'fas' %} {% trans "Cancel" %}
</a>
</form>
diff --git a/AKModel/templates/admin/AKModel/event_wizard/settings.html b/AKModel/templates/admin/AKModel/event_wizard/settings.html
index 3cb3329a..df5f9cae 100644
--- a/AKModel/templates/admin/AKModel/event_wizard/settings.html
+++ b/AKModel/templates/admin/AKModel/event_wizard/settings.html
@@ -3,7 +3,7 @@
{% load i18n %}
{% load django_bootstrap5 %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load tz %}
{% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %}
@@ -19,14 +19,14 @@
{% bootstrap_form form %}
<button type="submit" class="save btn btn-success float-end" value="Submit">
- {% fa5_icon "check" 'fas' %} {% trans "Continue" %}
+ {% fa6_icon "check" 'fas' %} {% trans "Continue" %}
</button>
<a href="{% url 'admin:new_event_wizard_start' %}" class="btn btn-info">
- {% fa5_icon "chevron-left" 'fas' %} {% trans "Back" %}
+ {% fa6_icon "chevron-left" 'fas' %} {% trans "Back" %}
</a>
<a href="{% url 'admin:index' %}" class="btn btn-warning">
- {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
+ {% fa6_icon "times" 'fas' %} {% trans "Cancel" %}
</a>
</form>
diff --git a/AKModel/templates/admin/AKModel/event_wizard/start.html b/AKModel/templates/admin/AKModel/event_wizard/start.html
index 3723d722..6389a2ee 100644
--- a/AKModel/templates/admin/AKModel/event_wizard/start.html
+++ b/AKModel/templates/admin/AKModel/event_wizard/start.html
@@ -3,7 +3,7 @@
{% load i18n %}
{% load django_bootstrap5 %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %}
@@ -16,11 +16,11 @@
{% bootstrap_form form %}
<button type="submit" class="save btn btn-success float-end" value="Submit">
- {% fa5_icon "check" 'fas' %} {% trans "Continue" %}
+ {% fa6_icon "check" 'fas' %} {% trans "Continue" %}
</button>
<a href="{% url 'admin:index' %}" class="btn btn-info">
- {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
+ {% fa6_icon "times" 'fas' %} {% trans "Cancel" %}
</a>
</form>
{% endblock %}
diff --git a/AKModel/templates/admin/AKModel/message_delete.html b/AKModel/templates/admin/AKModel/message_delete.html
index 1bdbf0a5..3fa80e60 100644
--- a/AKModel/templates/admin/AKModel/message_delete.html
+++ b/AKModel/templates/admin/AKModel/message_delete.html
@@ -2,7 +2,7 @@
{% load tags_AKModel %}
{% load i18n %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% block action_preview %}
<p>{% blocktrans with message_count=ak_messages.count %}Are you sure you want to delete all orga messages for {{ event }}? This will permanently delete {{ message_count }} message(s):{% endblocktrans %}</p>
diff --git a/AKModel/templates/admin/AKModel/requirements_overview.html b/AKModel/templates/admin/AKModel/requirements_overview.html
index a8b34930..b557a9c2 100644
--- a/AKModel/templates/admin/AKModel/requirements_overview.html
+++ b/AKModel/templates/admin/AKModel/requirements_overview.html
@@ -3,7 +3,7 @@
{% load i18n %}
{% load tz %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% block title %}{% trans "Status" %}: {{event}}{% endblock %}
@@ -25,11 +25,11 @@
<td class="text-end">
<a href="{% url 'submit:ak_detail' event_slug=ak.event.slug pk=ak.pk %}" data-bs-toggle="tooltip"
title="{% trans 'Details' %}"
- class="btn btn-primary">{% fa5_icon 'info' 'fas' %}</a>
+ class="btn btn-primary">{% fa6_icon 'info' 'fas' %}</a>
{% if event.active %}
<a href="{% url 'submit:ak_edit' event_slug=event.slug pk=ak.pk %}" data-bs-toggle="tooltip"
title="{% trans 'Edit' %}"
- class="btn btn-success">{% fa5_icon 'pencil-alt' 'fas' %}</a>
+ class="btn btn-success">{% fa6_icon 'pencil-alt' 'fas' %}</a>
{% endif %}
{% endif %}
</td>
diff --git a/AKPlan/templates/AKPlan/plan_base.html b/AKPlan/templates/AKPlan/plan_base.html
index 351e39d0..914b5e75 100644
--- a/AKPlan/templates/AKPlan/plan_base.html
+++ b/AKPlan/templates/AKPlan/plan_base.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load i18n %}
{% load static %}
@@ -18,7 +18,7 @@
{% block footer_custom %}
{% if event.contact_email %}
<h4>
- <a href="mailto:{{ event.contact_email }}">{% fa5_icon "envelope" "far" %} {% trans "Write to organizers of this event for questions and comments" %}</a>
+ <a href="mailto:{{ event.contact_email }}">{% fa6_icon "envelope" "far" %} {% trans "Write to organizers of this event for questions and comments" %}</a>
</h4>
{% endif %}
{% endblock %}
diff --git a/AKPlan/templates/AKPlan/plan_detail.html b/AKPlan/templates/AKPlan/plan_detail.html
index dff4f3cb..11d97817 100644
--- a/AKPlan/templates/AKPlan/plan_detail.html
+++ b/AKPlan/templates/AKPlan/plan_detail.html
@@ -1,6 +1,6 @@
{% extends "AKPlan/plan_base.html" %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load i18n %}
{% load static %}
{% load tz %}
diff --git a/AKPlan/templates/AKPlan/plan_index.html b/AKPlan/templates/AKPlan/plan_index.html
index 414c5759..633428cf 100644
--- a/AKPlan/templates/AKPlan/plan_index.html
+++ b/AKPlan/templates/AKPlan/plan_index.html
@@ -1,6 +1,6 @@
{% extends "AKPlan/plan_base.html" %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load i18n %}
{% load static %}
{% load tz %}
@@ -110,7 +110,7 @@
{% if event.active %}
<li class="nav-item">
<a class="nav-link active"
- href="{% url 'plan:plan_wall' event_slug=event.slug %}">{% fa5_icon 'desktop' 'fas' %} {% trans "AK Wall" %}</a>
+ href="{% url 'plan:plan_wall' event_slug=event.slug %}">{% fa6_icon 'desktop' 'fas' %} {% trans "AK Wall" %}</a>
</li>
{% endif %}
</ul>
diff --git a/AKPlan/templates/AKPlan/plan_room.html b/AKPlan/templates/AKPlan/plan_room.html
index 7d95afd2..6620a5d7 100644
--- a/AKPlan/templates/AKPlan/plan_room.html
+++ b/AKPlan/templates/AKPlan/plan_room.html
@@ -1,5 +1,5 @@
{% extends "AKPlan/plan_detail.html" %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load tags_AKModel %}
{% load tz %}
@@ -60,7 +60,7 @@
{% if "AKOnline"|check_app_installed and room.virtualroom and room.virtualroom.url != '' %}
<a class="btn btn-success" target="_parent" href="{{ room.virtualroom.url }}">
- {% fa5_icon 'external-link-alt' 'fas' %} {% trans "Go to virtual room" %}
+ {% fa6_icon 'external-link-alt' 'fas' %} {% trans "Go to virtual room" %}
</a>
{% endif %}
diff --git a/AKPlan/templates/AKPlan/plan_wall.html b/AKPlan/templates/AKPlan/plan_wall.html
index fde0e8de..0659317b 100644
--- a/AKPlan/templates/AKPlan/plan_wall.html
+++ b/AKPlan/templates/AKPlan/plan_wall.html
@@ -1,7 +1,7 @@
{% load static %}
{% load i18n %}
{% load django_bootstrap5 %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load tags_AKModel %}
{% load tags_AKPlan %}
{% load tz %}
@@ -17,7 +17,7 @@
{% bootstrap_css %}
{% bootstrap_javascript %}
<script src="{% static 'common/vendor/jquery/jquery-3.3.1.min.js' %}"></script>
- {% fontawesome_5_static %}
+ {% fontawesome_6_static %}
<link rel="stylesheet" href="{% static 'common/css/custom.css' %}">
diff --git a/AKPlanning/settings.py b/AKPlanning/settings.py
index 051ff5fb..5c416d92 100644
--- a/AKPlanning/settings.py
+++ b/AKPlanning/settings.py
@@ -46,7 +46,8 @@ INSTALLED_APPS = [
'django.contrib.staticfiles',
'debug_toolbar',
'django_bootstrap5',
- 'fontawesome_5',
+ 'fontawesomefree',
+ 'fontawesome_6',
'timezone_field',
'rest_framework',
'simple_history',
@@ -173,8 +174,8 @@ BOOTSTRAP5 = {
}
# Settings for FontAwesome
-FONTAWESOME_5_CSS_URL = "//cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.css"
-FONTAWESOME_5_PREFIX = "fa"
+FONTAWESOME_6_CSS_URL = STATIC_URL + "fontawesomefree/css/all.min.css"
+FONTAWESOME_6_PREFIX = "fa"
# Treat wishes as seperate category in submission views?
WISHES_AS_CATEGORY = True
diff --git a/AKScheduling/templates/admin/AKScheduling/constraint_violations.html b/AKScheduling/templates/admin/AKScheduling/constraint_violations.html
index 17195f06..6a71f9b4 100644
--- a/AKScheduling/templates/admin/AKScheduling/constraint_violations.html
+++ b/AKScheduling/templates/admin/AKScheduling/constraint_violations.html
@@ -6,7 +6,7 @@
{% load tz %}
{% load static %}
{% load tags_AKPlan %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% block title %}{% trans "Constraint Violations for" %} {{event}}{% endblock %}
@@ -30,7 +30,7 @@
// Update violations table
for(let i=0;i<response.length;i++) {
if(response[i].manually_resolved)
- table_html += '<tr class="text-muted"><td class="nowrap">{% fa5_icon "check" "fas" %}</td>';
+ table_html += '<tr class="text-muted"><td class="nowrap">{% fa6_icon "check" "fas" %}</td>';
else
table_html += '<tr><td></td>';
table_html += "<td>" + response[i].level_display + "</td><td>" + response[i].type_display + "</td><td>" + response[i].details + "</td><td class='nowrap'>" + response[i].timestamp_display + "</td><td><a href='" + response[i].edit_url + "'><i class='btn btn-primary fa fa-pen'></i></a></td></tr>";
@@ -81,7 +81,7 @@
<br>
- <a href="#" id="btnReloadNow" class="btn btn-info">{% fa5_icon "sync-alt" "fas" %} {% trans "Reload now" %}</a>
+ <a href="#" id="btnReloadNow" class="btn btn-info">{% fa6_icon "sync-alt" "fas" %} {% trans "Reload now" %}</a>
<table class="table table-striped mt-4 mb-4">
<thead>
diff --git a/AKScheduling/templates/admin/AKScheduling/interest.html b/AKScheduling/templates/admin/AKScheduling/interest.html
index 22887472..a0e5e4a6 100644
--- a/AKScheduling/templates/admin/AKScheduling/interest.html
+++ b/AKScheduling/templates/admin/AKScheduling/interest.html
@@ -5,7 +5,7 @@
{% load l10n %}
{% load tz %}
{% load static %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% block title %}{{ title }}{% endblock %}
@@ -29,7 +29,7 @@
<form method="POST" class="post-form">{% csrf_token %}
{% bootstrap_form form %}
<button type="submit" class="save btn btn-primary float-end">
- {% fa5_icon "check" 'fas' %} {% trans "Submit" %}
+ {% fa6_icon "check" 'fas' %} {% trans "Submit" %}
</button>
</form>
</div>
diff --git a/AKScheduling/templates/admin/AKScheduling/manage_tracks.html b/AKScheduling/templates/admin/AKScheduling/manage_tracks.html
index bbc765e2..cf542e5e 100644
--- a/AKScheduling/templates/admin/AKScheduling/manage_tracks.html
+++ b/AKScheduling/templates/admin/AKScheduling/manage_tracks.html
@@ -6,7 +6,7 @@
{% load tz %}
{% load static %}
{% load tags_AKPlan %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% block title %}{% trans "Scheduling for" %} {{event}}{% endblock %}
@@ -136,7 +136,7 @@
},
success: function (response) {
console.log(response);
- $('<div class="card border-success mb-3 track-container" style="width: 20rem;margin-right:20px;margin-bottom: 20px;"><div class="card-header"><span class="btn btn-danger float-end track-delete" data-track-id="' + response["id"] + '">{% fa5_icon "trash" "fas" %}</span><input class="track-name" data-track-id="None" type="text" value="' + response["name"] + '"></div><div class="card-body"><ul data-track-id="' + response["id"] + '" data-name="' + response["name"] + '" data-sync="true" class="ak-list"></ul></div></div>')
+ $('<div class="card border-success mb-3 track-container" style="width: 20rem;margin-right:20px;margin-bottom: 20px;"><div class="card-header"><span class="btn btn-danger float-end track-delete" data-track-id="' + response["id"] + '">{% fa6_icon "trash" "fas" %}</span><input class="track-name" data-track-id="None" type="text" value="' + response["name"] + '"></div><div class="card-body"><ul data-track-id="' + response["id"] + '" data-name="' + response["name"] + '" data-sync="true" class="ak-list"></ul></div></div>')
.appendTo($("#workspace"))
.find("ul").sortable(sortable_options)
},
@@ -201,7 +201,7 @@
<div class="mb-5">
<h3>{{ event }}: {% trans "Manage AK Tracks" %}</h3>
- <a id="btn-add-track" href="#" class="btn btn-primary">{% fa5_icon "plus" "fas" %} {% trans "Add ak track" %}</a>
+ <a id="btn-add-track" href="#" class="btn btn-primary">{% fa6_icon "plus" "fas" %} {% trans "Add ak track" %}</a>
</div>
<div id="workspace" class="row" style="">
@@ -222,7 +222,7 @@
<div class="card border-success mb-3 track-container" style="width: 20rem;margin-right:20px;margin-bottom: 20px;">
<div class="card-header">
<span class="btn btn-danger float-end track-delete" data-track-id="{{ track.pk }}">
- {% fa5_icon "trash" "fas" %}
+ {% fa6_icon "trash" "fas" %}
</span>
<input class="track-name" data-track-id="{{ track.pk }}" type="text" value="{{ track }}">
</div>
diff --git a/AKScheduling/templates/admin/AKScheduling/scheduling.html b/AKScheduling/templates/admin/AKScheduling/scheduling.html
index e516091c..6e34087f 100644
--- a/AKScheduling/templates/admin/AKScheduling/scheduling.html
+++ b/AKScheduling/templates/admin/AKScheduling/scheduling.html
@@ -7,7 +7,7 @@
{% load static %}
{% load django_bootstrap5 %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% get_current_language as LANGUAGE_CODE %}
@@ -22,7 +22,7 @@
{% bootstrap_css %}
{% bootstrap_javascript %}
<script src="{% static 'common/vendor/jquery/jquery-3.3.1.min.js' %}"></script>
- {% fontawesome_5_static %}
+ {% fontawesome_6_static %}
{% include "AKModel/load_fullcalendar.html" %}
@@ -203,16 +203,16 @@
// Update violations table
for(let i=0;i<response.length;i++) {
if(response[i].manually_resolved)
- table_html += '<tr class="text-muted"><td class="nowrap">{% fa5_icon "check" "fas" %} ';
+ table_html += '<tr class="text-muted"><td class="nowrap">{% fa6_icon "check" "fas" %} ';
else {
table_html += '<tr><td>';
unresolved_violations_count++;
}
if(response[i].level_display==='{% trans "Violation" %}')
- table_html += '{% fa5_icon "exclamation-triangle" "fas" %}';
+ table_html += '{% fa6_icon "exclamation-triangle" "fas" %}';
else
- table_html += '{% fa5_icon "info-circle" "fas" %}';
+ table_html += '{% fa6_icon "info-circle" "fas" %}';
table_html += "</td><td class='small'>" + response[i].type_display + "</td></tr>";
table_html += "<tr><td colspan='2' class='small'>" + response[i].details + "</td></tr>"
@@ -308,12 +308,12 @@
<div class="col">
<h2 class="d-inline">
<button class="btn btn-outline-warning" id="reloadBtn" style="vertical-align: text-bottom;">
- <span id="reloadBtnVisDefault">{% fa5_icon "redo" "fas" %}</span>
+ <span id="reloadBtnVisDefault">{% fa6_icon "redo" "fas" %}</span>
</button>
{% trans "Scheduling for" %} {{event}}
</h2>
<h5 class="d-inline ml-2">
- <a href="{% url 'admin:event_status' event.slug %}">{% trans "Event Status" %} {% fa5_icon "level-up-alt" "fas" %}</a>
+ <a href="{% url 'admin:event_status' event.slug %}">{% trans "Event Status" %} {% fa6_icon "level-up-alt" "fas" %}</a>
</h5>
</div>
</div>
diff --git a/AKScheduling/templates/admin/AKScheduling/special_attention.html b/AKScheduling/templates/admin/AKScheduling/special_attention.html
index 44d2ced1..f0cc5f58 100644
--- a/AKScheduling/templates/admin/AKScheduling/special_attention.html
+++ b/AKScheduling/templates/admin/AKScheduling/special_attention.html
@@ -6,7 +6,7 @@
{% load tz %}
{% load static %}
{% load tags_AKPlan %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% block title %}{{ title }}{% endblock %}
diff --git a/AKSubmission/templates/AKSubmission/ak_detail.html b/AKSubmission/templates/AKSubmission/ak_detail.html
index 41919773..4cb54ebe 100644
--- a/AKSubmission/templates/AKSubmission/ak_detail.html
+++ b/AKSubmission/templates/AKSubmission/ak_detail.html
@@ -1,7 +1,7 @@
{% extends 'AKSubmission/submission_base.html' %}
{% load i18n %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load tz %}
{% load tags_AKSubmission %}
@@ -68,7 +68,7 @@
data: {
},
success: function (response) {
- btn.html('{% fa5_icon 'check' 'fas' %}');
+ btn.html('{% fa6_icon 'check' 'fas' %}');
btn.off('click');
$('#interest-counter').html(response.interest_counter);
},
@@ -100,29 +100,29 @@
{% trans 'Interest' %}: <b class='mx-1 text-muted' id="interest-counter">{{ ak.interest_counter }}</b>
<a href="#" data-bs-toggle="tooltip"
title="{% trans 'Show Interest' %}"
- class="btn btn-primary" id="btn-indicate-interest">{% fa5_icon 'thumbs-up' 'fas' %}</a>
+ class="btn btn-primary" id="btn-indicate-interest">{% fa6_icon 'thumbs-up' 'fas' %}</a>
{% endif %}
{% endif %}
{% if ak.link != "" %}
<a href="{{ ak.link }}" data-bs-toggle="tooltip"
title="{% trans 'Open external link' %}"
- class="btn btn-info">{% fa5_icon 'external-link-alt' 'fas' %}</a>
+ class="btn btn-info">{% fa6_icon 'external-link-alt' 'fas' %}</a>
{% endif %}
{% if ak.protocol_link != "" %}
<a href="{{ ak.protocol_link }}" data-bs-toggle="tooltip"
title="{% trans 'Open protocol link' %}"
- class="btn btn-warning">{% fa5_icon 'file-alt' 'far' %}</a>
+ class="btn btn-warning">{% fa6_icon 'file-alt' 'far' %}</a>
{% endif %}
<a href="{% url 'submit:ak_history' event_slug=ak.event.slug pk=ak.pk %}"
data-bs-toggle="tooltip"
- title="{% trans 'History' %}" class="btn btn-light">{% fa5_icon 'clock' 'fas' %}</a>
+ title="{% trans 'History' %}" class="btn btn-light">{% fa6_icon 'clock' 'fas' %}</a>
{% if ak.event.active %}
<a href="{% url 'submit:akmessage_add' event_slug=ak.event.slug pk=ak.pk %}" data-bs-toggle="tooltip"
title="{% trans 'Add confidential message to organizers' %}"
- class="btn btn-warning">{% fa5_icon 'envelope' 'fas' %}</a>
+ class="btn btn-warning">{% fa6_icon 'envelope' 'fas' %}</a>
<a href="{% url 'submit:ak_edit' event_slug=ak.event.slug pk=ak.pk %}" data-bs-toggle="tooltip"
title="{% trans 'Edit' %}"
- class="btn btn-success">{% fa5_icon 'pencil-alt' 'fas' %}</a>
+ class="btn btn-success">{% fa6_icon 'pencil-alt' 'fas' %}</a>
{% endif %}
</div>
@@ -146,7 +146,7 @@
{% if "AKOnline"|check_app_installed and featured_slot.room.virtualroom and featured_slot.room.virtualroom.url != '' %}
<a class="btn btn-success" target="_parent" href="{{ featured_slot.room.virtualroom.url }}">
- {% fa5_icon 'external-link-alt' 'fas' %} {% trans "Go to virtual room" %}
+ {% fa6_icon 'external-link-alt' 'fas' %} {% trans "Go to virtual room" %}
</a>
{% endif %}
</div>
@@ -267,21 +267,21 @@
{% if not slot.start %}
<a href="{% url 'submit:akslot_edit' event_slug=ak.event.slug pk=slot.pk %}"
data-bs-toggle="tooltip" title="{% trans 'Edit' %}"
- class="btn btn-success">{% fa5_icon 'pencil-alt' 'fas' %}</a>
+ class="btn btn-success">{% fa6_icon 'pencil-alt' 'fas' %}</a>
<a href="{% url 'submit:akslot_delete' event_slug=ak.event.slug pk=slot.pk %}"
data-bs-toggle="tooltip" title="{% trans 'Delete' %}"
- class="btn btn-danger">{% fa5_icon 'times' 'fas' %}</a>
+ class="btn btn-danger">{% fa6_icon 'times' 'fas' %}</a>
{% else %}
{% if "AKOnline"|check_app_installed and slot.room and slot.room.virtualroom and slot.room.virtualroom.url != '' %}
<a class="btn btn-success" target="_parent" href="{{ slot.room.virtualroom.url }}">
- {% fa5_icon 'external-link-alt' 'fas' %} {% trans "Go to virtual room" %}
+ {% fa6_icon 'external-link-alt' 'fas' %} {% trans "Go to virtual room" %}
</a>
{% endif %}
{% endif %}
{% if user.is_staff %}
<a href="{% url 'admin:AKModel_akslot_change' slot.pk %}"
data-bs-toggle="tooltip" title="{% trans 'Schedule' %}"
- class="btn btn-outline-success">{% fa5_icon 'stream' 'fas' %}</a>
+ class="btn btn-outline-success">{% fa6_icon 'stream' 'fas' %}</a>
{% endif %}
</td>
</tr>
@@ -292,7 +292,7 @@
{% if ak.event.active %}
<div class="">
<a href="{% url 'submit:akslot_add' event_slug=ak.event.slug pk=ak.pk %}"
- class="btn btn-success">{% fa5_icon 'plus' 'fas' %} {% trans "Add another slot" %}</a>
+ class="btn btn-success">{% fa6_icon 'plus' 'fas' %} {% trans "Add another slot" %}</a>
</div>
{% endif %}
diff --git a/AKSubmission/templates/AKSubmission/ak_edit.html b/AKSubmission/templates/AKSubmission/ak_edit.html
index 70cace8f..72dff0d1 100644
--- a/AKSubmission/templates/AKSubmission/ak_edit.html
+++ b/AKSubmission/templates/AKSubmission/ak_edit.html
@@ -2,7 +2,7 @@
{% load i18n %}
{% load django_bootstrap5 %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load static %}
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "Edit AK" %}: {{ ak.name }}{% endblock %}
@@ -21,7 +21,7 @@
<div class="form-group">
{% bootstrap_field form.owners form_group_class="" %}
<a href="{% url 'submit:akowner_create' event_slug=event.slug %}?add_to_existing_ak={{ ak.pk }}">
- {% fa5_icon "plus" "fas" %} {% trans "Add person not in the list yet. Unsaved changes in this form will be lost." %}
+ {% fa6_icon "plus" "fas" %} {% trans "Add person not in the list yet. Unsaved changes in this form will be lost." %}
</a>
</div>
{% bootstrap_form form exclude='name,owners' %}
diff --git a/AKSubmission/templates/AKSubmission/ak_history.html b/AKSubmission/templates/AKSubmission/ak_history.html
index 3288fad0..bcc8963c 100644
--- a/AKSubmission/templates/AKSubmission/ak_history.html
+++ b/AKSubmission/templates/AKSubmission/ak_history.html
@@ -2,7 +2,7 @@
{% load tz %}
{% load i18n %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load tags_AKSubmission %}
{% load tags_AKModel %}
@@ -25,7 +25,7 @@
<div class="float-end">
<a href='{% url 'submit:ak_detail' event_slug=ak.event.slug pk=ak.pk %}' data-bs-toggle="tooltip"
title="{% trans 'Back' %}"
- class="btn btn-info">{% fa5_icon 'arrow-circle-left' 'fas' %}</a>
+ class="btn btn-info">{% fa6_icon 'arrow-circle-left' 'fas' %}</a>
</div>
<h2>{% if ak.wish %}{% trans "AK Wish" %}: {% endif %}{{ ak.name }} ({% trans 'History' %})</h2>
@@ -45,11 +45,11 @@
<b>{{ h.name }}</b>
{% if h.present %}
<span class="badge bg-dark rounded-pill"
- title="{% trans 'Present results of this AK' %}">{% fa5_icon "bullhorn" 'fas' %}</span>
+ title="{% trans 'Present results of this AK' %}">{% fa6_icon "bullhorn" 'fas' %}</span>
{% endif %}
{% if h.reso %}
<span class="badge bg-dark rounded-pill"
- title="{% trans 'Intends to submit a resolution' %}">{% fa5_icon "scroll" 'fas' %}</span>
+ title="{% trans 'Intends to submit a resolution' %}">{% fa6_icon "scroll" 'fas' %}</span>
{% endif %}
</td>
<td>{% category_linked_badge h.category event.slug %}</td>
diff --git a/AKSubmission/templates/AKSubmission/ak_interest_script.html b/AKSubmission/templates/AKSubmission/ak_interest_script.html
index 952f5720..b568d7d3 100644
--- a/AKSubmission/templates/AKSubmission/ak_interest_script.html
+++ b/AKSubmission/templates/AKSubmission/ak_interest_script.html
@@ -1,5 +1,5 @@
{% load i18n %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
<script>
document.addEventListener('DOMContentLoaded', function () {
@@ -42,7 +42,7 @@
data: {
},
success: function (response) {
- btn.html('{% fa5_icon 'check' 'fas' %}');
+ btn.html('{% fa6_icon 'check' 'fas' %}');
btn.off('click');
},
error: function (response) {
diff --git a/AKSubmission/templates/AKSubmission/ak_overview.html b/AKSubmission/templates/AKSubmission/ak_overview.html
index 6d55a0a5..48b2c416 100644
--- a/AKSubmission/templates/AKSubmission/ak_overview.html
+++ b/AKSubmission/templates/AKSubmission/ak_overview.html
@@ -1,7 +1,7 @@
{% extends 'AKSubmission/submission_base.html' %}
{% load i18n %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load tags_AKSubmission %}
@@ -26,7 +26,7 @@
{% block content %}
{% if event.active %}
<a class="btn btn-success float-end" href="{% url 'submit:submission_overview' event_slug=event.slug %}">
- {% fa5_icon 'plus' 'fas' %} {% trans "Add AK" %}
+ {% fa6_icon 'plus' 'fas' %} {% trans "Add AK" %}
</a>
{% endif %}
diff --git a/AKSubmission/templates/AKSubmission/ak_table.html b/AKSubmission/templates/AKSubmission/ak_table.html
index b2d39c08..d856a896 100644
--- a/AKSubmission/templates/AKSubmission/ak_table.html
+++ b/AKSubmission/templates/AKSubmission/ak_table.html
@@ -1,5 +1,5 @@
{% load i18n %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load tags_AKSubmission %}
@@ -22,11 +22,11 @@
</a>
{% if ak.present %}
<span class="badge bg-dark rounded-pill"
- title="{% trans 'Present results of this AK' %}">{% fa5_icon "bullhorn" 'fas' %}</span>
+ title="{% trans 'Present results of this AK' %}">{% fa6_icon "bullhorn" 'fas' %}</span>
{% endif %}
{% if ak.reso %}
<span class="badge bg-dark rounded-pill"
- title="{% trans 'Intends to submit a resolution' %}">{% fa5_icon "scroll" 'fas' %}</span>
+ title="{% trans 'Intends to submit a resolution' %}">{% fa6_icon "scroll" 'fas' %}</span>
{% endif %}
</td>
<td>
@@ -40,20 +40,20 @@
<td class="text-end" style="white-space: nowrap;">
<a href="{% url 'submit:ak_detail' event_slug=ak.event.slug pk=ak.pk %}" data-bs-toggle="tooltip"
title="{% trans 'Details' %}"
- class="btn btn-primary">{% fa5_icon 'info' 'fas' %}</a>
+ class="btn btn-primary">{% fa6_icon 'info' 'fas' %}</a>
{% if ak.link %}
<a href="{{ ak.link }}" data-bs-toggle="tooltip"
title="{% trans 'Open external link' %}"
- class="btn btn-info">{% fa5_icon 'external-link-alt' 'fas' %}</a>
+ class="btn btn-info">{% fa6_icon 'external-link-alt' 'fas' %}</a>
{% endif %}
{% if event.active %}
<a href="{% url 'submit:ak_edit' event_slug=event.slug pk=ak.pk %}" data-bs-toggle="tooltip"
title="{% trans 'Edit' %}"
- class="btn btn-success">{% fa5_icon 'pencil-alt' 'fas' %}</a>
+ class="btn btn-success">{% fa6_icon 'pencil-alt' 'fas' %}</a>
{% if interest_indication_active %}
<span data-ak_id="{{ ak.pk }}" data-bs-toggle="tooltip"
title="{% trans 'Show Interest' %}"
- class="btn btn-primary btn-interest" style="cursor: pointer">{% fa5_icon 'thumbs-up' 'fas' %}</span>
+ class="btn btn-primary btn-interest" style="cursor: pointer">{% fa6_icon 'thumbs-up' 'fas' %}</span>
{% endif %}
{% endif %}
</td>
diff --git a/AKSubmission/templates/AKSubmission/akmessage_add.html b/AKSubmission/templates/AKSubmission/akmessage_add.html
index af4d96e8..ea85b8c9 100644
--- a/AKSubmission/templates/AKSubmission/akmessage_add.html
+++ b/AKSubmission/templates/AKSubmission/akmessage_add.html
@@ -2,7 +2,7 @@
{% load i18n %}
{% load django_bootstrap5 %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% block title %}{% trans "AKs" %}: {{ event.name }} -
{% trans "Add confidential message to organizers" %}{% endblock %}
@@ -24,15 +24,15 @@
<form method="POST" class="post-form">{% csrf_token %}
{% bootstrap_form form %}
<button type="submit" class="save btn btn-primary float-end">
- {% fa5_icon "check" 'fas' %} {% trans "Send" %}
+ {% fa6_icon "check" 'fas' %} {% trans "Send" %}
</button>
<button type="reset" class="btn btn-danger">
- {% fa5_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
+ {% fa6_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
</button>
<a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}" class="btn btn-secondary">
- {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
+ {% fa6_icon "times" 'fas' %} {% trans "Cancel" %}
</a>
</form>
{% endblock %}
diff --git a/AKSubmission/templates/AKSubmission/akowner_create_update.html b/AKSubmission/templates/AKSubmission/akowner_create_update.html
index fd6a1770..f5a49b5a 100644
--- a/AKSubmission/templates/AKSubmission/akowner_create_update.html
+++ b/AKSubmission/templates/AKSubmission/akowner_create_update.html
@@ -2,7 +2,7 @@
{% load i18n %}
{% load django_bootstrap5 %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Owner" %}{% endblock %}
@@ -20,14 +20,14 @@
<form method="POST" class="post-form">{% csrf_token %}
{% bootstrap_form form %}
<button type="submit" class="save btn btn-primary float-end">
- {% fa5_icon "check" 'fas' %} {% trans "Continue" %}
+ {% fa6_icon "check" 'fas' %} {% trans "Continue" %}
</button>
<button type="reset" class="btn btn-danger">
- {% fa5_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
+ {% fa6_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
</button>
<a href="{% url 'submit:submission_overview' event_slug=event.slug %}" class="btn btn-secondary">
- {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
+ {% fa6_icon "times" 'fas' %} {% trans "Cancel" %}
</a>
</form>
{% endblock %}
\ No newline at end of file
diff --git a/AKSubmission/templates/AKSubmission/akslot_add_update.html b/AKSubmission/templates/AKSubmission/akslot_add_update.html
index 41ed070d..ac0d6d13 100644
--- a/AKSubmission/templates/AKSubmission/akslot_add_update.html
+++ b/AKSubmission/templates/AKSubmission/akslot_add_update.html
@@ -2,7 +2,7 @@
{% load i18n %}
{% load django_bootstrap5 %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Duration(s)" %}{% endblock %}
@@ -22,15 +22,15 @@
<form method="POST" class="post-form">{% csrf_token %}
{% bootstrap_form form %}
<button type="submit" class="save btn btn-primary float-end">
- {% fa5_icon "check" 'fas' %} {% trans "Continue" %}
+ {% fa6_icon "check" 'fas' %} {% trans "Continue" %}
</button>
<button type="reset" class="btn btn-danger">
- {% fa5_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
+ {% fa6_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
</button>
<a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}" class="btn btn-secondary">
- {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
+ {% fa6_icon "times" 'fas' %} {% trans "Cancel" %}
</a>
</form>
{% endblock %}
diff --git a/AKSubmission/templates/AKSubmission/akslot_delete.html b/AKSubmission/templates/AKSubmission/akslot_delete.html
index 3b91c092..613d69a5 100644
--- a/AKSubmission/templates/AKSubmission/akslot_delete.html
+++ b/AKSubmission/templates/AKSubmission/akslot_delete.html
@@ -2,7 +2,7 @@
{% load i18n %}
{% load django_bootstrap5 %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Duration(s)" %}{% endblock %}
@@ -38,11 +38,11 @@
</tbody>
</table>
<button type="submit" class="save btn btn-danger float-end" value="Confirm">
- {% fa5_icon "check" 'fas' %} {% trans "Confirm" %}
+ {% fa6_icon "check" 'fas' %} {% trans "Confirm" %}
</button>
<a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}" class="btn btn-secondary">
- {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
+ {% fa6_icon "times" 'fas' %} {% trans "Cancel" %}
</a>
</form>
{% endblock %}
diff --git a/AKSubmission/templates/AKSubmission/submission_base.html b/AKSubmission/templates/AKSubmission/submission_base.html
index 85c0bf29..ff47d3ca 100644
--- a/AKSubmission/templates/AKSubmission/submission_base.html
+++ b/AKSubmission/templates/AKSubmission/submission_base.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load i18n %}
{% block breadcrumbs %}
@@ -10,7 +10,7 @@
{% block footer_custom %}
{% if event.contact_email %}
<h4>
- <a href="mailto:{{ event.contact_email }}">{% fa5_icon "envelope" 'fas' %} {% trans "Write to organizers of this event for questions and comments" %}</a>
+ <a href="mailto:{{ event.contact_email }}">{% fa6_icon "envelope" 'fas' %} {% trans "Write to organizers of this event for questions and comments" %}</a>
</h4>
{% endif %}
{% endblock %}
diff --git a/AKSubmission/templates/AKSubmission/submission_not_configured.html b/AKSubmission/templates/AKSubmission/submission_not_configured.html
index f6370a27..caaeed85 100644
--- a/AKSubmission/templates/AKSubmission/submission_not_configured.html
+++ b/AKSubmission/templates/AKSubmission/submission_not_configured.html
@@ -1,7 +1,7 @@
{% extends 'AKSubmission/submission_base.html' %}
{% load i18n %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load static %}
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Submission" %}{% endblock %}
diff --git a/AKSubmission/templates/AKSubmission/submission_overview.html b/AKSubmission/templates/AKSubmission/submission_overview.html
index 4497fa58..43a59ed1 100644
--- a/AKSubmission/templates/AKSubmission/submission_overview.html
+++ b/AKSubmission/templates/AKSubmission/submission_overview.html
@@ -1,7 +1,7 @@
{% extends 'AKSubmission/submission_base.html' %}
{% load i18n %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load static %}
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Submission" %}{% endblock %}
diff --git a/AKSubmission/templates/AKSubmission/submit_new.html b/AKSubmission/templates/AKSubmission/submit_new.html
index 2ef19a6a..1b0d94b2 100644
--- a/AKSubmission/templates/AKSubmission/submit_new.html
+++ b/AKSubmission/templates/AKSubmission/submit_new.html
@@ -2,7 +2,7 @@
{% load i18n %}
{% load django_bootstrap5 %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load static %}
{% load tz %}
@@ -48,15 +48,15 @@
{% bootstrap_form form %}
{% endblock %}
<button type="submit" class="save btn btn-primary float-end">
- {% fa5_icon "check" 'fas' %} {% trans "Submit" %}
+ {% fa6_icon "check" 'fas' %} {% trans "Submit" %}
</button>
<button type="reset" class="btn btn-danger">
- {% fa5_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
+ {% fa6_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
</button>
<a href="{% url 'submit:submission_overview' event_slug=event.slug %}" class="btn btn-secondary">
- {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
+ {% fa6_icon "times" 'fas' %} {% trans "Cancel" %}
</a>
</form>
{% endblock %}
diff --git a/AKSubmission/templatetags/tags_AKSubmission.py b/AKSubmission/templatetags/tags_AKSubmission.py
index d7578416..c1d42989 100644
--- a/AKSubmission/templatetags/tags_AKSubmission.py
+++ b/AKSubmission/templatetags/tags_AKSubmission.py
@@ -1,5 +1,5 @@
from django import template
-from fontawesome_5.templatetags.fontawesome_5 import fa5_icon
+from fontawesome_6.templatetags.fontawesome_6 import fa6_icon
register = template.Library()
@@ -7,8 +7,8 @@ register = template.Library()
@register.filter
def bool_symbol(bool_val):
if bool_val:
- return fa5_icon("check", "fas")
- return fa5_icon("times", "fas")
+ return fa6_icon("check", "fas")
+ return fa6_icon("times", "fas")
@register.inclusion_tag("AKSubmission/tracks_list.html")
diff --git a/requirements.txt b/requirements.txt
index 9b268a63..66d2db7a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,7 @@
Django==3.2.16
django-bootstrap5==22.2
-django-fontawesome-5==1.0.18
+fontawesomefree==6.2.1 # Makes static files (css, fonts) available locally
+django-fontawesome-6==1.0.0.0 # Provides an icon field for models and forms as well as handy shortcuts to render icons
django-split-settings==1.2.0
django-timezone-field==4.1.2
djangorestframework==3.14.0
diff --git a/templates/admin/base_site.html b/templates/admin/base_site.html
index 83f7edfe..5bbc5bc0 100644
--- a/templates/admin/base_site.html
+++ b/templates/admin/base_site.html
@@ -1,7 +1,7 @@
{% extends "admin/base_site.html" %}
{% load django_bootstrap5 %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load static %}
{% block stylesheet %}{% static "common/css/admin-bootstrap.css" %}{% endblock %}
@@ -16,7 +16,7 @@
<!-- Load bootstrap, jquery and fontawesome-->
{% bootstrap_javascript %}
<script src="{% static 'common/vendor/jquery/jquery-3.3.1.min.js' %}"></script>
- {% fontawesome_5_static %}
+ {% fontawesome_6_static %}
<style>
a.btn {
diff --git a/templates/base.html b/templates/base.html
index 1faeac8f..21bb6f1e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,7 +1,7 @@
{% load static %}
{% load i18n %}
{% load django_bootstrap5 %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
{% load tags_AKModel %}
<!DOCTYPE html>
@@ -16,7 +16,7 @@
{% bootstrap_css %}
{% bootstrap_javascript %}
<script src="{% static 'common/vendor/jquery/jquery-3.3.1.min.js' %}"></script>
- {% fontawesome_5_static %}
+ {% fontawesome_6_static %}
<link rel="stylesheet" href="{% static 'common/css/custom.css' %}">
--
GitLab