[CHANGE] Update FA icons to new classes

Base Classes:
- `far` => `fa-regular`
- `fas` => `fa-solid`
- `fab` => `fa-brand`
This commit is contained in:
Peter Pfeufer 2023-12-10 13:44:32 +01:00
parent 9a62c729eb
commit f0fe3929d4
No known key found for this signature in database
GPG Key ID: 6051D2C6AD4EBC27
23 changed files with 55 additions and 55 deletions

View File

@ -21,7 +21,7 @@
<td style="white-space:initial;">{% for s in t.scopes.all %}<span class="badge bg-secondary">{{ s.name }}</span>{% endfor %}</td>
<td nowrap class="text-end">
<a href="{% url 'authentication:token_delete' t.id %}" class="btn btn-danger"><i class="fa-solid fa-trash-can"></i></a>
<a href="{% url 'authentication:token_refresh' t.id %}" class="btn btn-success"><i class="fas fa-sync-alt"></i></a>
<a href="{% url 'authentication:token_refresh' t.id %}" class="btn btn-success"><i class="fa-solid fa-rotate"></i></a>
</td>
<td>{{ t.character_name }}</td>
</tr>

View File

@ -16,7 +16,7 @@ class GroupManagementMenuItem(MenuItemHook):
MenuItemHook.__init__(
self,
text=_("Group Management"),
classes="fas fa-users-cog fa-fw",
classes="fa-solid fa-users-gear",
url_name="groupmanagement:management",
order=50,
navactive=[
@ -36,7 +36,7 @@ class GroupManagementMenuItem(MenuItemHook):
"""
<li class="d-flex m-2 p-2 pt-0 pb-0 mt-0 mb-0">
<i class="fas fa-users fa-fw align-self-center me-2"></i>
<i class="fa-solid fa-users fa-fw align-self-center me-2"></i>
<a class="nav-link flex-fill align-self-center {% navactive request 'groupmanagement:groups' %}" href="{% url 'groupmanagement:groups' %}">
{% translate "Groups" %}
</a>
@ -49,7 +49,7 @@ class GroupsMenuItem(MenuItemHook):
MenuItemHook.__init__(
self,
text=_("Groups"),
classes="fas fa-user fa-fw",
classes="fa-solid fa-user",
url_name="groupmanagement:groups",
order=25,
navactive=[

View File

@ -54,15 +54,15 @@
<td class="text-end">
<a href="{% url 'groupmanagement:membership' group.id %}" class="btn btn-primary" title="{% translate "View Members" %}">
<i class="far fa-eye"></i>
<i class="fa-regular fa-eye"></i>
</a>
<a href="{% url "groupmanagement:audit_log" group.id %}" class="btn btn-info" title="{% translate "Audit Members" %}">
<i class="far fa-list-alt"></i>
<i class="fa-regular fa-rectangle-list"></i>
</a>
<a id="clipboard-copy" data-clipboard-text="{{ request.scheme }}://{{request.get_host}}{% url 'groupmanagement:request_add' group.id %}" class="btn btn-warning" title="{% translate "Copy Direct Join Link" %}">
<i class="far fa-clipboard"></i>
<i class="fa-regular fa-clipboard"></i>
</a>
</td>
</tr>

View File

@ -144,7 +144,7 @@ class MenuItem(models.Model):
"render": _render,
"text": mi.text,
"rank": mi.rank,
"classes": (mi.icon_classes if mi.icon_classes != "" else "fas fa-folder"),
"classes": (mi.icon_classes if mi.icon_classes != "" else "fa-solid fa-folder"),
"hide": mi.hide
}

View File

@ -7,7 +7,7 @@
href="{% url 'notifications:list' %}">
<span class="fa">
{% with unread_count=request.user|user_unread_notification_count %}
<i class="fas fa-bell{% if unread_count %} text-danger{% endif %}"></i>
<i class="fa-regular fa-bell{% if unread_count %} text-danger{% endif %}"></i>
{% endwith %}
</span>
<span class="d-lg-none d-md-inline m-2">

View File

@ -28,7 +28,7 @@
{% block header_nav_collapse_right %}
<li class="nav-item">
<a href="{% url 'notifications:mark_all_read' %}" class="nav-link" title="{% translate 'Mark all notifications as read' %}">
<i class="fas fa-check-double"></i>
<i class="fa-solid fa-check-double"></i>
</a>
</li>
<li class="nav-item">

View File

@ -13,7 +13,7 @@
<td>{{ notif.title }}</td>
<td class="text-end">
<a href="{% url 'notifications:view' notif.id %}" class="btn btn-primary btn-sm" title="View">
<span class="fas fa-eye"></span>
<span class="fa-solid fa-eye"></span>
</a>
<a href="{% url 'notifications:remove' notif.id %}" class="btn btn-danger btn-sm" title="Remove">
<span class="fa-solid fa-trash-can"></span>

View File

@ -24,26 +24,26 @@
{% if not user_has_account %}
{% if urls.auth_activate %}
<a class="btn btn-warning" href="{% url urls.auth_activate %}" title="{% translate 'Activate' %}">
<span class="fas fa-check fa-fw"></span>
<i class="fa-solid fa-check fa-fw"></i>
</a>
{% endif %}
{% else %}
{% if urls.auth_reset %}
<a class="btn btn-primary" href="{% url urls.auth_reset %}" title="{% translate 'Reset Password' %}">
<span class="fas fa-sync fa-fw"></span>
<i class="fa-solid fa-rotate fa-fw"></i>
</a>
{% endif %}
{% if urls.auth_deactivate %}
<a class="btn btn-danger" href="{% url urls.auth_deactivate %}" title="{% translate 'Deactivate' %}">
<span class="fas fa-times fa-fw"></span>
<i class="fa-solid fa-xmark fa-fw"></i>
</a>
{% endif %}
{% endif %}
{% if request.user.is_superuser %}
<a class="btn btn-primary" type="button" id="btnLinkDiscordServer" href="{% url urls.auth_add_bot %}" title="{% translate 'Link Discord Server' %}">
<span class="fas fa-link fa-fw"></span>
<i class="fa-solid fa-link fa-fw"></i>
</a>
{% endif %}
{% endblock %}

View File

@ -21,6 +21,6 @@
{% block controls %}
<a class="btn btn-success" href="{{ DISCOURSE_URL }}" title="{% translate 'Go to forums' %}">
<span class="fas fa-arrow-right fa-fw"></span>
<i class="fa-solid fa-arrow-right fa-fw"></i>
</a>
{% endblock %}

View File

@ -18,31 +18,31 @@
{% if username == "" %}
{% if urls.auth_activate %}
<a class="btn btn-warning" href="{% url urls.auth_activate %}" title="{% translate 'Activate' %}">
<span class="fas fa-check fa-fw"></span>
<i class="fa-solid fa-check fa-fw"></i>
</a>
{% endif %}
{% else %}
{% if urls.auth_set_password %}
<a class="btn btn-warning" href="{% url urls.auth_set_password %}" title="{% translate 'Set Password' %}">
<span class="fas fa-edit fa-fw"></span>
<i class="fa-solid fa-pen-to-square fa-fw"></i>
</a>
{% endif %}
{% if urls.auth_reset_password %}
<a class="btn btn-primary" href="{% url urls.auth_reset_password %}" title="{% translate 'Reset Password' %}">
<span class="fas fa-sync fa-fw"></span>
<i class="fa-solid fa-rotate fa-fw"></i>
</a>
{% endif %}
{% if urls.auth_deactivate %}
<a class="btn btn-danger" href="{% url urls.auth_deactivate %}" title="{% translate 'Deactivate' %}">
<span class="fas fa-times fa-fw"></span>
<i class="fa-solid fa-xmark fa-fw"></i>
</a>
{% endif %}
{% if connect_url %}
<a class="btn btn-success" href="mumble://{{ connect_url }}" title="{% translate 'Connect' %}">
<span class="fas fa-arrow-right fa-fw"></span>
<i class="fa-solid fa-arrow-right fa-fw"></i>
</a>
{% endif %}
{% endif %}

View File

@ -20,20 +20,20 @@
{% block controls %}
{% if authinfo.teamspeak3_uid == "" %}
<a href="{% url 'teamspeak3:activate' %}" title="Activate" class="btn btn-warning">
<span class="fas fa-check fa-fw"></span>
<i class="fa-solid fa-check fa-fw"></i>
</a>
{% else %}
<a href="{% url 'teamspeak3:verify' %}" title="Verify Client ID" class="btn btn-success">
<span class="far fa-sign-in fa-fw"></span>
<i class="fa-solid fa-right-to-bracket fa-fw"></i>
</a>
<a href="{% url 'teamspeak3:reset_perm' %}" title="Refresh Token" class="btn btn-primary">
<span class="fas fa-sync fa-fw"></span>
<i class="fa-solid fa-rotate fa-fw"></i>
</a>
<a href="{% url 'teamspeak3:deactivate' %}" title="Deactivate" class="btn btn-danger">
<span class="fas fa-times fa-fw"></span>
<i class="fa-solid fa-xmark fa-fw"></i>
</a>
<a href="ts3server://{{ TEAMSPEAK3_PUBLIC_URL }}?nickname={{ authinfo.teamspeak3_uid }}" title="Connect" class="btn btn-success">
<span class="fas fa-arrow-right fa-fw"></span>
<i class="fa-solid fa-arrow-right fa-fw"></i>
</a>
{% endif %}
{% endblock %}

View File

@ -19,7 +19,7 @@
<div class="d-inline-flex bd-highlight justify-content-center flex-wrap">
<div class="d-inline-flex align-items-center m-2">
<span title="Activate" class="btn btn-warning btn-sm">
<i class="fas fa-check fa-fw"></i>
<i class="fa-solid fa-check fa-fw"></i>
</span>
<p class="m-2 p-0 align-self-center">
{% translate "Click to activate the service for your user." %}
@ -28,7 +28,7 @@
<div class="d-inline-flex align-items-center m-2">
<span title="Set Password" class="btn btn-warning btn-sm">
<i class="fas fa-edit fa-fw"></i>
<i class="fa-solid fa-pen-to-square"></i>
</span>
<p class="m-2 p-0 align-self-center">
{% translate "Click to manually set your password." %}
@ -37,7 +37,7 @@
<div class="d-inline-flex align-items-center m-2">
<span title="Reset Password" class="btn btn-primary btn-sm">
<i class="fas fa-sync fa-fw"></i>
<i class="fa-solid fa-rotate fa-fw"></i>
</span>
<p class="m-2 p-0 align-self-center">
{% translate "Click to randomly generate your password." %}
@ -46,7 +46,7 @@
<div class="d-inline-flex align-items-center m-2">
<span title="Deactivate" class="btn btn-danger btn-sm">
<i class="fas fa-times fa-fw"></i>
<i class="fa-solid fa-xmark fa-fw"></i>
</span>
<p class="m-2 p-0 align-self-center">
{% translate "Click to deactivate the service for your user" %}

View File

@ -13,23 +13,23 @@
{% if username == "" %}
{% if urls.auth_activate %}
<a href="{% url urls.auth_activate %}" title="Activate" class="btn btn-warning">
<span class="fas fa-check fa-fw"></span>
<i class="fa-solid fa-check fa-fw"></i>
</a>
{% endif %}
{% else %}
{% if urls.auth_set_password %}
<a href="{% url urls.auth_set_password %}" title="Set Password" class="btn btn-warning">
<span class="fas fa-edit fa-fw"></span>
<i class="fa-solid fa-pen-to-square"></i>
</a>
{% endif %}
{% if urls.auth_reset_password %}
<a href="{% url urls.auth_reset_password %}" title="Reset Password" class="btn btn-primary">
<span class="fas fa-sync fa-fw"></span>
<i class="fa-solid fa-rotate fa-fw"></i>
</a>
{% endif %}
{% if urls.auth_deactivate %}
<a href="{% url urls.auth_deactivate %}" title="Deactivate" class="btn btn-danger">
<span class="fas fa-times fa-fw"></span>
<i class="fa-solid fa-xmark fa-fw"></i>
</a>
{% endif %}
{% endif %}

View File

@ -27,7 +27,7 @@ $(function () {
`Notifications <span class="badge">${unreadCount}</span>`
);
} else {
innerHtml = '<i class="far fa-bell"></i>';
innerHtml = '<i class="fa-regular fa-bell"></i>';
}
$('#menu_item_notifications').html(

View File

@ -51,7 +51,7 @@
<div class="container-fluid justify-content-start">
{% if user.is_authenticated %}
<a class="navbar-brand" data-bs-toggle="collapse" data-bs-target="#sidebar" role="button">
<i class="fas fa-solid fa-bars ms-2 me-2"></i>
<i class="fa-solid fa-bars ms-2 me-2"></i>
</a>
{% endif %}
@ -74,7 +74,7 @@
</div>
<a class="navbar-toggler navbar-brand border-0 collapsed" data-bs-toggle="collapse" data-bs-target="#navbarexpand" aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation" style="margin-left: auto;">
<i class="fas fa-solid fa-chevron-up"></i>
<i class="fa-solid fa-chevron-up"></i>
</a>
</div>
</nav>

View File

@ -4,13 +4,13 @@
<div>
{% if message.level_tag == "info" %}
<i class="fas fa-info-circle"></i>
<i class="fa-solid fa-info-circle"></i>
{% elif message.level_tag == "success" %}
<i class="fas fa-check-circle"></i>
<i class="fa-solid fa-check-circle"></i>
{% elif message.level_tag == "warning" %}
<i class="fas fa-exclamation-circle"></i>
<i class="fa-solid fa-exclamation-circle"></i>
{% elif "danger" in message.level_tag %}
<i class="fas fa-exclamation-triangle"></i>
<i class="fa-solid fa-exclamation-triangle"></i>
{% endif %}
</div>

View File

@ -8,13 +8,13 @@
<div class="message-icon pull-left" style="margin-right: 0.5rem;">
{% if message.level_tag == "info" %}
<i class="fas fa-info-circle"></i>
<i class="fa-solid fa-info-circle"></i>
{% elif message.level_tag == "success" %}
<i class="fas fa-check-circle"></i>
<i class="fa-solid fa-check-circle"></i>
{% elif message.level_tag == "warning" %}
<i class="fas fa-exclamation-circle"></i>
<i class="fa-solid fa-exclamation-circle"></i>
{% elif "danger" in message.level_tag %}
<i class="fas fa-exclamation-triangle"></i>
<i class="fa-solid fa-exclamation-triangle"></i>
{% endif %}
</div>

View File

@ -2,7 +2,7 @@
<li>
<a href="{% url 'nightmode' %}?next={{ request.path|urlencode }}">
<i class="fas {% if NIGHT_MODE %}fa-toggle-on{% else %}fa-toggle-off{% endif %}" aria-hidden="true"></i>
<i class="fa-solid {% if NIGHT_MODE %}fa-toggle-on{% else %}fa-toggle-off{% endif %}" aria-hidden="true"></i>
{% translate "Night Mode" %}
</a>
</li>

View File

@ -8,7 +8,7 @@
</a>
{% else %}
<a href="{% url 'notifications:list' %}">
<i class="far fa-bell"></i>
<i class="fa-regular fa-bell"></i>
</a>
{% endif %}
{% endwith %}

View File

@ -7,12 +7,12 @@
<ul class="nav nav-pills nav-stacked gray-icon-color" id="side-menu">
<li>
<a class="{% navactive request 'authentication:dashboard' %}" href="{% url 'authentication:dashboard' %}">
<i class="fas fa-tachometer-alt fa-fw"></i> {% translate "Dashboard" %}
<i class="fa-solid fa-gauge-high fa-fw"></i></i> {% translate "Dashboard" %}
</a>
</li>
<li>
<a class="{% navactive request 'groupmanagement:groups' %}" href="{% url 'groupmanagement:groups' %}">
<i class="fas fa-users fa-fw"></i> {% translate "Groups" %}
<i class="fa-solid fa-users fa-fw"></i> {% translate "Groups" %}
</a>
</li>

View File

@ -5,7 +5,7 @@
{% if user.is_staff %}
<li role="separator" class="divider"></li>
<li><a href="{% url 'admin:index' %}" target="_blank" rel="noopener noreferer">
<i class="fas fa-user-shield"></i>
<i class="fa-solid fa-user-shield fa-fw"></i>
{% translate "Admin" %}</a>
</li>
{% endif %}
@ -15,14 +15,14 @@
<li role="separator" class="divider"></li>
<li>
<a href="https://allianceauth.readthedocs.io/" target="_blank" rel="noopener noreferer">
<i class="fas fa-question-circle fa-fw"></i>
<i class="fa-solid fa-question-circle fa-fw"></i>
{% translate "AA Documentation" %}
</a>
</li>
<li>
<a href="https://discord.gg/fjnHAmk" target="_blank" rel="noopener noreferer">
<i class="fab fa-discord fa-fw"></i>
<i class="fa-brands fa-discord fa-fw"></i>
{% translate "AA Support Discord" %}
</a>
</li>

View File

@ -1,8 +1,8 @@
{% load i18n %}
<li class="nav-item active">
<a href="{% url 'authentication:add_character' %}" class="nav-link" title="{% translate 'Add Character' %}"><i class="fas fa-plus"></i><span class="d-lg-none d-md-inline m-2">{% translate "Add Character" %}</span></a>
<a href="{% url 'authentication:add_character' %}" class="nav-link" title="{% translate 'Add Character' %}"><i class="fa-solid fa-plus"></i><span class="d-lg-none d-md-inline m-2">{% translate "Add Character" %}</span></a>
</li>
<li class="nav-item">
<a href="{% url 'authentication:change_main_character' %}" class="nav-link" title="{% translate 'Change Main' %}"><i class="fas fa-random"></i><span class="d-lg-none d-md-inline m-2">{% translate "Change Main" %}</span></a>
<a href="{% url 'authentication:change_main_character' %}" class="nav-link" title="{% translate 'Change Main' %}"><i class="fa-solid fa-shuffle"></i><span class="d-lg-none d-md-inline m-2">{% translate "Change Main" %}</span></a>
</li>

View File

@ -58,7 +58,7 @@
{% if user.is_authenticated %}
<li>
<a href="{% url 'authentication:token_management' %}">
<i class="fas fa-user-lock"></i>
<i class="fa-solid fa-user-lock"></i>
{% translate "Token Management" %}
</a>
</li>