From f0fe3929d4570d0e74402e0494829bd90c397418 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Sun, 10 Dec 2023 13:44:32 +0100 Subject: [PATCH] [CHANGE] Update FA icons to new classes Base Classes: - `far` => `fa-regular` - `fas` => `fa-solid` - `fab` => `fa-brand` --- .../templates/authentication/tokens.html | 2 +- allianceauth/groupmanagement/auth_hooks.py | 6 +++--- .../templates/groupmanagement/groupmembership.html | 6 +++--- allianceauth/menu/models.py | 2 +- .../menu/templates/menu/menu-notification-block.html | 2 +- .../notifications/templates/notifications/list.html | 2 +- .../templates/notifications/list_partial.html | 2 +- .../services/discord/discord_service_ctrl.html | 8 ++++---- .../services/discourse/discourse_service_ctrl.html | 2 +- .../templates/services/mumble/mumble_service_ctrl.html | 10 +++++----- .../services/teamspeak3/teamspeak3_service_ctrl.html | 10 +++++----- allianceauth/services/templates/services/services.html | 8 ++++---- .../services/templates/services/services_ctrl.html | 8 ++++---- .../static/allianceauth/js/refresh_notifications.js | 2 +- allianceauth/templates/allianceauth/base-bs5.html | 4 ++-- allianceauth/templates/allianceauth/messages-bs5.html | 8 ++++---- allianceauth/templates/allianceauth/messages.html | 8 ++++---- allianceauth/templates/allianceauth/night-toggle.html | 2 +- .../allianceauth/notifications_menu_item.html | 2 +- allianceauth/templates/allianceauth/side-menu.html | 4 ++-- .../templates/allianceauth/top-menu-admin.html | 6 +++--- .../templates/allianceauth/top-menu-rh-default.html | 4 ++-- .../templates/allianceauth/top-menu-user-dropdown.html | 2 +- 23 files changed, 55 insertions(+), 55 deletions(-) diff --git a/allianceauth/authentication/templates/authentication/tokens.html b/allianceauth/authentication/templates/authentication/tokens.html index e14a69f6..801c3f8c 100644 --- a/allianceauth/authentication/templates/authentication/tokens.html +++ b/allianceauth/authentication/templates/authentication/tokens.html @@ -21,7 +21,7 @@ {% for s in t.scopes.all %}{{ s.name }}{% endfor %} - + {{ t.character_name }} diff --git a/allianceauth/groupmanagement/auth_hooks.py b/allianceauth/groupmanagement/auth_hooks.py index 211973ac..318d2095 100644 --- a/allianceauth/groupmanagement/auth_hooks.py +++ b/allianceauth/groupmanagement/auth_hooks.py @@ -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): """
  • - + {% translate "Groups" %} @@ -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=[ diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html index e50f3838..89f10d66 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html @@ -54,15 +54,15 @@ - + - + - + diff --git a/allianceauth/menu/models.py b/allianceauth/menu/models.py index 81121408..cfcebdd3 100644 --- a/allianceauth/menu/models.py +++ b/allianceauth/menu/models.py @@ -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 } diff --git a/allianceauth/menu/templates/menu/menu-notification-block.html b/allianceauth/menu/templates/menu/menu-notification-block.html index fc3b3dcd..80959258 100644 --- a/allianceauth/menu/templates/menu/menu-notification-block.html +++ b/allianceauth/menu/templates/menu/menu-notification-block.html @@ -7,7 +7,7 @@ href="{% url 'notifications:list' %}"> {% with unread_count=request.user|user_unread_notification_count %} - + {% endwith %} diff --git a/allianceauth/notifications/templates/notifications/list.html b/allianceauth/notifications/templates/notifications/list.html index 8d946fdc..49eacce5 100644 --- a/allianceauth/notifications/templates/notifications/list.html +++ b/allianceauth/notifications/templates/notifications/list.html @@ -28,7 +28,7 @@ {% block header_nav_collapse_right %}
  • - +
  • diff --git a/allianceauth/notifications/templates/notifications/list_partial.html b/allianceauth/notifications/templates/notifications/list_partial.html index bf3700b7..8cb16f41 100644 --- a/allianceauth/notifications/templates/notifications/list_partial.html +++ b/allianceauth/notifications/templates/notifications/list_partial.html @@ -13,7 +13,7 @@ {{ notif.title }} - + diff --git a/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html b/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html index 96e98a7f..ca86d1df 100644 --- a/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html +++ b/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html @@ -24,26 +24,26 @@ {% if not user_has_account %} {% if urls.auth_activate %} - + {% endif %} {% else %} {% if urls.auth_reset %} - + {% endif %} {% if urls.auth_deactivate %} - + {% endif %} {% endif %} {% if request.user.is_superuser %} - + {% endif %} {% endblock %} diff --git a/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html b/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html index bcc54610..70acdf28 100644 --- a/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html +++ b/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html @@ -21,6 +21,6 @@ {% block controls %} - + {% endblock %} diff --git a/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html b/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html index d4b589e1..ef70a136 100644 --- a/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html +++ b/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html @@ -18,31 +18,31 @@ {% if username == "" %} {% if urls.auth_activate %} - + {% endif %} {% else %} {% if urls.auth_set_password %} - + {% endif %} {% if urls.auth_reset_password %} - + {% endif %} {% if urls.auth_deactivate %} - + {% endif %} {% if connect_url %} - + {% endif %} {% endif %} diff --git a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html index 4fafbead..a55d2c6d 100644 --- a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html +++ b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html @@ -20,20 +20,20 @@ {% block controls %} {% if authinfo.teamspeak3_uid == "" %} - + {% else %} - + - + - + - + {% endif %} {% endblock %} diff --git a/allianceauth/services/templates/services/services.html b/allianceauth/services/templates/services/services.html index 4febf3b8..faa3ea4f 100644 --- a/allianceauth/services/templates/services/services.html +++ b/allianceauth/services/templates/services/services.html @@ -19,7 +19,7 @@
    - +

    {% translate "Click to activate the service for your user." %} @@ -28,7 +28,7 @@

    - +

    {% translate "Click to manually set your password." %} @@ -37,7 +37,7 @@

    - +

    {% translate "Click to randomly generate your password." %} @@ -46,7 +46,7 @@

    - +

    {% translate "Click to deactivate the service for your user" %} diff --git a/allianceauth/services/templates/services/services_ctrl.html b/allianceauth/services/templates/services/services_ctrl.html index 5e551c40..9da4a975 100644 --- a/allianceauth/services/templates/services/services_ctrl.html +++ b/allianceauth/services/templates/services/services_ctrl.html @@ -13,23 +13,23 @@ {% if username == "" %} {% if urls.auth_activate %} - + {% endif %} {% else %} {% if urls.auth_set_password %} - + {% endif %} {% if urls.auth_reset_password %} - + {% endif %} {% if urls.auth_deactivate %} - + {% endif %} {% endif %} diff --git a/allianceauth/static/allianceauth/js/refresh_notifications.js b/allianceauth/static/allianceauth/js/refresh_notifications.js index c0cc6e10..ecebeb5c 100644 --- a/allianceauth/static/allianceauth/js/refresh_notifications.js +++ b/allianceauth/static/allianceauth/js/refresh_notifications.js @@ -27,7 +27,7 @@ $(function () { `Notifications ${unreadCount}` ); } else { - innerHtml = ''; + innerHtml = ''; } $('#menu_item_notifications').html( diff --git a/allianceauth/templates/allianceauth/base-bs5.html b/allianceauth/templates/allianceauth/base-bs5.html index 802f0512..c321355d 100644 --- a/allianceauth/templates/allianceauth/base-bs5.html +++ b/allianceauth/templates/allianceauth/base-bs5.html @@ -51,7 +51,7 @@

    {% if user.is_authenticated %} - + {% endif %} @@ -74,7 +74,7 @@
    diff --git a/allianceauth/templates/allianceauth/messages-bs5.html b/allianceauth/templates/allianceauth/messages-bs5.html index ee89eaac..1f1a6bb5 100644 --- a/allianceauth/templates/allianceauth/messages-bs5.html +++ b/allianceauth/templates/allianceauth/messages-bs5.html @@ -4,13 +4,13 @@
    {% if message.level_tag == "info" %} - + {% elif message.level_tag == "success" %} - + {% elif message.level_tag == "warning" %} - + {% elif "danger" in message.level_tag %} - + {% endif %}
    diff --git a/allianceauth/templates/allianceauth/messages.html b/allianceauth/templates/allianceauth/messages.html index 41fc2756..dff04389 100644 --- a/allianceauth/templates/allianceauth/messages.html +++ b/allianceauth/templates/allianceauth/messages.html @@ -8,13 +8,13 @@
    {% if message.level_tag == "info" %} - + {% elif message.level_tag == "success" %} - + {% elif message.level_tag == "warning" %} - + {% elif "danger" in message.level_tag %} - + {% endif %}
    diff --git a/allianceauth/templates/allianceauth/night-toggle.html b/allianceauth/templates/allianceauth/night-toggle.html index 632eddf2..8a58c8b0 100644 --- a/allianceauth/templates/allianceauth/night-toggle.html +++ b/allianceauth/templates/allianceauth/night-toggle.html @@ -2,7 +2,7 @@
  • - + {% translate "Night Mode" %}
    • diff --git a/allianceauth/templates/allianceauth/notifications_menu_item.html b/allianceauth/templates/allianceauth/notifications_menu_item.html index dd912fb3..517a3ecd 100644 --- a/allianceauth/templates/allianceauth/notifications_menu_item.html +++ b/allianceauth/templates/allianceauth/notifications_menu_item.html @@ -8,7 +8,7 @@ {% else %} - + {% endif %} {% endwith %} diff --git a/allianceauth/templates/allianceauth/side-menu.html b/allianceauth/templates/allianceauth/side-menu.html index 0c996a96..fdaac059 100644 --- a/allianceauth/templates/allianceauth/side-menu.html +++ b/allianceauth/templates/allianceauth/side-menu.html @@ -7,12 +7,12 @@