From a3e388c0e766a1dd1e2c801fd792a800ed26b9c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de>
Date: Mon, 13 Jan 2020 00:57:53 +0100
Subject: [PATCH] Update to fontawesome 5
---
.../templates/AKDashboard/dashboard.html | 27 ++++++++++---------
AKPlanning/settings.py | 5 ++--
.../templates/AKSubmission/ak_detail.html | 12 ++++-----
.../templates/AKSubmission/ak_edit.html | 2 +-
.../templates/AKSubmission/ak_list.html | 2 +-
.../templates/AKSubmission/ak_list_table.html | 12 ++++-----
.../AKSubmission/akowner_create_update.html | 8 +++---
.../AKSubmission/akslot_add_update.html | 8 +++---
.../templates/AKSubmission/akslot_delete.html | 6 ++---
.../AKSubmission/submission_base.html | 4 +--
.../AKSubmission/submission_overview.html | 2 +-
.../templates/AKSubmission/submit_new.html | 8 +++---
.../templatetags/tags_AKSubmission.py | 6 ++---
requirements.txt | 2 +-
templates/base.html | 4 +--
15 files changed, 56 insertions(+), 52 deletions(-)
diff --git a/AKDashboard/templates/AKDashboard/dashboard.html b/AKDashboard/templates/AKDashboard/dashboard.html
index ec261fde..3d28e9e4 100644
--- a/AKDashboard/templates/AKDashboard/dashboard.html
+++ b/AKDashboard/templates/AKDashboard/dashboard.html
@@ -1,6 +1,6 @@
{% extends 'base.html' %}
-{% load fontawesome %}
+{% load fontawesome_5 %}
{% load i18n %}
{% load static %}
{% load tags_AKModel %}
@@ -26,29 +26,32 @@
<a class="dashboard-box btn btn-primary"
href="{% url 'plan:ak_plan_current_next' event_slug=event.slug %}">
- <div class="col-sm-12 col-md-3 col-lg-2 dashboard-button"><span
- class="fa fa-list-ul"></span> <span
- class='text'>{% trans 'Current AKs' %}</span></div>
+ <div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">
+ <span class="fa fa-list-ul"></span>
+ <span class='text'>{% trans 'Current AKs' %}</span>
+ </div>
</a>
<a class="dashboard-box btn btn-primary"
href="{% url 'plan:ak_plan_timeline' event_slug=event.slug %}">
- <div class="col-sm-12 col-md-3 col-lg-2 dashboard-button"><span
- class="fa fa-calendar"></span> <span class='text'>{% trans "AK Wall" %}</span></div>
+ <div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">
+ <span class="fa fa-calendar"></span>
+ <span class='text'>{% trans "AK Wall" %}</span>
+ </div>
</a>
{% endif %}
{% if 'AKSubmission'|check_app_installed %}
<a class="dashboard-box btn btn-primary"
href="{% url 'submit:submission_overview' event_slug=event.slug %}">
- <div class="col-sm-12 col-md-3 col-lg-2 dashboard-button"><span
- class="fa fa-pencil-alt"></span> <span
- class='text'>{% trans 'AK Submission' %}</span></div>
+ <div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">
+ <span class="fa fa-pencil-alt"></span>
+ <span class='text'>{% trans 'AK Submission' %}</span>
+ </div>
</a>
-
{% endif %}
</div>
{% if event.contact_email %}
<p>
- <a href="mailto:{{ event.contact_email }}">{% fontawesome_icon "envelope" %} {% trans "Write to organizers of this event for questions and comments" %}</a>
+ <a href="mailto:{{ event.contact_email }}">{% fa5_icon "envelope" "fas" %} {% trans "Write to organizers of this event for questions and comments" %}</a>
</p>
{% endif %}
</div>
@@ -62,4 +65,4 @@
</p>
</div>
{% endfor %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/AKPlanning/settings.py b/AKPlanning/settings.py
index 4d10d860..b99554f3 100644
--- a/AKPlanning/settings.py
+++ b/AKPlanning/settings.py
@@ -44,7 +44,7 @@ INSTALLED_APPS = [
'django.contrib.messages',
'django.contrib.staticfiles',
'bootstrap4',
- 'fontawesome',
+ 'fontawesome_5',
]
MIDDLEWARE = [
@@ -144,7 +144,8 @@ BOOTSTRAP4 = {
}
# Settings for FontAwesome
-FONTAWESOME_CSS_URL = "//cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.css"
+FONTAWESOME_5_CSS_URL = "//cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.css"
+FONTAWESOME_5_PREFIX = "fa"
# Treat wishes as seperate category in submission views?
WISHES_AS_CATEGORY = True
diff --git a/AKSubmission/templates/AKSubmission/ak_detail.html b/AKSubmission/templates/AKSubmission/ak_detail.html
index b8e1c830..2d003de0 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 %}
+{% load fontawesome_5 %}
{% load tags_AKSubmission %}
@@ -19,11 +19,11 @@
<div class="float-right">
{% if ak.link != "" %}
- <a href="{{ ak.link }}" class="btn btn-info">{% fontawesome_icon 'external-link-alt' %}</a>
+ <a href="{{ ak.link }}" class="btn btn-info">{% fa5_icon 'external-link-alt' 'fas' %}</a>
{% endif %}
{% if ak.event.active %}
<a href="{% url 'submit:ak_edit' event_slug=ak.event.slug pk=ak.pk %}"
- class="btn btn-success">{% fontawesome_icon 'pencil-alt' %}</a>
+ class="btn btn-success">{% fa5_icon 'pencil-alt' 'fas' %}</a>
{% endif %} </div>
<h2>{% if ak.wish %}{% trans "AK Wish" %}: {% endif %}{{ ak.name }}</h2>
@@ -79,9 +79,9 @@
<td>
{% if not slot.start %}
<a href="{% url 'submit:akslot_edit' event_slug=ak.event.slug pk=slot.pk %}"
- class="btn btn-success">{% fontawesome_icon 'pencil-alt' %}</a>
+ class="btn btn-success">{% fa5_icon 'pencil-alt' 'fas' %}</a>
<a href="{% url 'submit:akslot_delete' event_slug=ak.event.slug pk=slot.pk %}"
- class="btn btn-danger">{% fontawesome_icon 'times' %}</a>
+ class="btn btn-danger">{% fa5_icon 'times' 'fas' %}</a>
{% endif %}
</td>
</tr>
@@ -92,7 +92,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">{% fontawesome_icon 'plus' %} {% trans "Add another slot" %}</a>
+ class="btn btn-success">{% fa5_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 a5e0b1c6..b78135be 100644
--- a/AKSubmission/templates/AKSubmission/ak_edit.html
+++ b/AKSubmission/templates/AKSubmission/ak_edit.html
@@ -2,7 +2,7 @@
{% load i18n %}
{% load bootstrap4 %}
-{% load fontawesome %}
+{% load fontawesome_5 %}
{% load staticfiles %}
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "Edit AK" %}: {{ ak.name }}{% endblock %}
diff --git a/AKSubmission/templates/AKSubmission/ak_list.html b/AKSubmission/templates/AKSubmission/ak_list.html
index 68373e6d..3c51279e 100644
--- a/AKSubmission/templates/AKSubmission/ak_list.html
+++ b/AKSubmission/templates/AKSubmission/ak_list.html
@@ -1,7 +1,7 @@
{% extends 'AKSubmission/submission_base.html' %}
{% load i18n %}
-{% load fontawesome %}
+{% load fontawesome_5 %}
{% load tags_AKSubmission %}
diff --git a/AKSubmission/templates/AKSubmission/ak_list_table.html b/AKSubmission/templates/AKSubmission/ak_list_table.html
index 6ce385f9..e378f8bb 100644
--- a/AKSubmission/templates/AKSubmission/ak_list_table.html
+++ b/AKSubmission/templates/AKSubmission/ak_list_table.html
@@ -1,5 +1,5 @@
{% load i18n %}
-{% load fontawesome %}
+{% load fontawesome_5 %}
{% load tags_AKSubmission %}
@@ -20,11 +20,11 @@
<b>{{ ak.name }}</b>
{% if ak.present %}
<span class="badge badge-dark badge-pill"
- title="{% trans 'present this AK' %}">{% fontawesome_icon "bullhorn" %}</span>
+ title="{% trans 'present this AK' %}">{% fa5_icon "bullhorn" 'fas' %}</span>
{% endif %}
{% if ak.reso %}
<span class="badge badge-dark badge-pill"
- title="{% trans 'Reso' %}">{% fontawesome_icon "scroll" %}</span>
+ title="{% trans 'Reso' %}">{% fa5_icon "scroll" 'fas' %}</span>
{% endif %}
</td>
<td>
@@ -38,13 +38,13 @@
<td>{% tag_list ak.tags.all event.slug %}</td>
<td class="text-right">
<a href="{% url 'submit:ak_detail' event_slug=ak.event.slug pk=ak.pk %}"
- class="btn btn-primary">{% fontawesome_icon 'info' %}</a>
+ class="btn btn-primary">{% fa5_icon 'info' 'fas' %}</a>
{% if ak.link %}
- <a href="{{ ak.link }}" class="btn btn-info">{% fontawesome_icon 'external-link-alt' %}</a>
+ <a href="{{ ak.link }}" class="btn btn-info">{% fa5_icon 'external-link-alt' 'fas' %}</a>
{% endif %}
{% if event.active %}
<a href="{% url 'submit:ak_edit' event_slug=event.slug pk=ak.pk %}"
- class="btn btn-success">{% fontawesome_icon 'pencil-alt' %}</a>
+ class="btn btn-success">{% fa5_icon 'pencil-alt' 'fas' %}</a>
{% endif %}
</td>
</tr>
diff --git a/AKSubmission/templates/AKSubmission/akowner_create_update.html b/AKSubmission/templates/AKSubmission/akowner_create_update.html
index d0f22cec..870bcc46 100644
--- a/AKSubmission/templates/AKSubmission/akowner_create_update.html
+++ b/AKSubmission/templates/AKSubmission/akowner_create_update.html
@@ -2,7 +2,7 @@
{% load i18n %}
{% load bootstrap4 %}
-{% load fontawesome %}
+{% load fontawesome_5 %}
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Owner" %}{% endblock %}
@@ -21,14 +21,14 @@
{% bootstrap_form form %}
{% buttons %}
<button type="reset" class="btn btn-danger">
- {% fontawesome_icon "undo-alt" %} {% trans "Reset" %}
+ {% fa5_icon "undo-alt" 'fas' %} {% trans "Reset" %}
</button>
<a href="{% url 'submit:submission_overview' event_slug=event.slug %}" class="btn btn-secondary">
- {% fontawesome_icon "times" %} {% trans "Cancel" %}
+ {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
</a>
<button type="submit" class="save btn btn-primary float-right">
- {% fontawesome_icon "check" %} {% trans "Continue" %}
+ {% fa5_icon "check" 'fas' %} {% trans "Continue" %}
</button>
{% endbuttons %}
</form>
diff --git a/AKSubmission/templates/AKSubmission/akslot_add_update.html b/AKSubmission/templates/AKSubmission/akslot_add_update.html
index c602fd6f..319cc399 100644
--- a/AKSubmission/templates/AKSubmission/akslot_add_update.html
+++ b/AKSubmission/templates/AKSubmission/akslot_add_update.html
@@ -2,7 +2,7 @@
{% load i18n %}
{% load bootstrap4 %}
-{% load fontawesome %}
+{% load fontawesome_5 %}
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Duration(s)" %}{% endblock %}
@@ -23,14 +23,14 @@
{% bootstrap_form form %}
{% buttons %}
<button type="reset" class="btn btn-danger">
- {% fontawesome_icon "undo-alt" %} {% trans "Reset" %}
+ {% fa5_icon "undo-alt" 'fas' %} {% trans "Reset" %}
</button>
<a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}" class="btn btn-secondary">
- {% fontawesome_icon "times" %} {% trans "Cancel" %}
+ {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
</a>
<button type="submit" class="save btn btn-primary float-right">
- {% fontawesome_icon "check" %} {% trans "Continue" %}
+ {% fa5_icon "check" 'fas' %} {% trans "Continue" %}
</button>
{% endbuttons %}
</form>
diff --git a/AKSubmission/templates/AKSubmission/akslot_delete.html b/AKSubmission/templates/AKSubmission/akslot_delete.html
index cfa69c21..2ae502df 100644
--- a/AKSubmission/templates/AKSubmission/akslot_delete.html
+++ b/AKSubmission/templates/AKSubmission/akslot_delete.html
@@ -2,7 +2,7 @@
{% load i18n %}
{% load bootstrap4 %}
-{% load fontawesome %}
+{% load fontawesome_5 %}
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Duration(s)" %}{% endblock %}
@@ -39,10 +39,10 @@
</table>
{% buttons %}
<a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}" class="btn btn-secondary">
- {% fontawesome_icon "times" %} {% trans "Cancel" %}
+ {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
</a>
<button type="submit" class="save btn btn-danger float-right" value="Confirm">
- {% fontawesome_icon "check" %} {% trans "Confirm" %}
+ {% fa5_icon "check" 'fas' %} {% trans "Confirm" %}
</button>
{% endbuttons %}
</form>
diff --git a/AKSubmission/templates/AKSubmission/submission_base.html b/AKSubmission/templates/AKSubmission/submission_base.html
index 1700a9a6..85c0bf29 100644
--- a/AKSubmission/templates/AKSubmission/submission_base.html
+++ b/AKSubmission/templates/AKSubmission/submission_base.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
-{% load fontawesome %}
+{% load fontawesome_5 %}
{% load i18n %}
{% block breadcrumbs %}
@@ -10,7 +10,7 @@
{% block footer_custom %}
{% if event.contact_email %}
<h4>
- <a href="mailto:{{ event.contact_email }}">{% fontawesome_icon "envelope" %} {% trans "Write to organizers of this event for questions and comments" %}</a>
+ <a href="mailto:{{ event.contact_email }}">{% fa5_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_overview.html b/AKSubmission/templates/AKSubmission/submission_overview.html
index 5403d979..15748b2a 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 %}
+{% load fontawesome_5 %}
{% 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 28024bd6..b177d801 100644
--- a/AKSubmission/templates/AKSubmission/submit_new.html
+++ b/AKSubmission/templates/AKSubmission/submit_new.html
@@ -2,7 +2,7 @@
{% load i18n %}
{% load bootstrap4 %}
-{% load fontawesome %}
+{% load fontawesome_5 %}
{% load staticfiles %}
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "New AK" %}{% endblock %}
@@ -31,14 +31,14 @@
{% bootstrap_form form %}
{% buttons %}
<button type="reset" class="btn btn-danger">
- {% fontawesome_icon "undo-alt" %} {% trans "Reset" %}
+ {% fa5_icon "undo-alt" 'fas' %} {% trans "Reset" %}
</button>
<a href="{% url 'submit:submission_overview' event_slug=event.slug %}" class="btn btn-secondary">
- {% fontawesome_icon "times" %} {% trans "Cancel" %}
+ {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
</a>
<button type="submit" class="save btn btn-primary float-right">
- {% fontawesome_icon "check" %} {% trans "Submit" %}
+ {% fa5_icon "check" 'fas' %} {% trans "Submit" %}
</button>
{% endbuttons %}
</form>
diff --git a/AKSubmission/templatetags/tags_AKSubmission.py b/AKSubmission/templatetags/tags_AKSubmission.py
index fa0019c0..0a80c2ab 100644
--- a/AKSubmission/templatetags/tags_AKSubmission.py
+++ b/AKSubmission/templatetags/tags_AKSubmission.py
@@ -1,5 +1,5 @@
from django import template
-from fontawesome.templatetags.fontawesome import fontawesome_icon
+from fontawesome_5.templatetags.fontawesome import fa5_icon
register = template.Library()
@@ -7,8 +7,8 @@ register = template.Library()
@register.filter
def bool_symbol(bool_val):
if bool_val:
- return fontawesome_icon("check")
- return fontawesome_icon("times")
+ return fa5_icon("check", "fas")
+ return fa5_icon("times", "fas")
@register.inclusion_tag("AKSubmission/tags_list.html")
diff --git a/requirements.txt b/requirements.txt
index cdccac9c..fb43f8fd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
Django==2.2.6
django-bootstrap4==1.0.1
-django-fontawesome==1.0
+django-fontawesome-5==1.0.16
django-split-settings==1.0.0
diff --git a/templates/base.html b/templates/base.html
index 70a3de8e..37311f1e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,7 +1,7 @@
{% load static %}
{% load i18n %}
{% load bootstrap4 %}
-{% load fontawesome %}
+{% load fontawesome_5 %}
{% load tags_AKModel %}
<!DOCTYPE html>
@@ -13,7 +13,7 @@
{# Load Bootstrap CSS and JavaScript as well as font awesome #}
{% bootstrap_css %}
{% bootstrap_javascript jquery='slim' %}
- {% fontawesome_stylesheet %}
+ {% fontawesome_5_static %}
<link rel="stylesheet" href="{% static 'common/css/custom.css' %}">
--
GitLab