From 0feeb808665151b5ac9855e75b2f985800831fab Mon Sep 17 00:00:00 2001 From: Louis Charette Date: Tue, 27 Feb 2024 20:30:44 -0500 Subject: [PATCH] Update FontAwesome --- app/src/Controller/Group/GroupCreateModal.php | 2 +- app/templates/forms/group.html.twig | 4 +- .../partials/user-set-password.html.twig | 4 +- app/templates/forms/role.html.twig | 4 +- app/templates/forms/user.html.twig | 14 +- .../modals/role-manage-permissions.html.twig | 2 +- .../modals/user-manage-roles.html.twig | 2 +- .../navigation/sidebar-menu.html.twig | 14 +- .../pages/abstract/dashboard.html.twig | 2 +- app/templates/pages/activities.html.twig | 2 +- app/templates/pages/dashboard.html.twig | 14 +- app/templates/pages/group.html.twig | 10 +- app/templates/pages/groups.html.twig | 4 +- app/templates/pages/permission.html.twig | 6 +- app/templates/pages/permissions.html.twig | 2 +- app/templates/pages/role.html.twig | 16 +- app/templates/pages/roles.html.twig | 4 +- app/templates/pages/user.html.twig | 32 +- app/templates/pages/users.html.twig | 4 +- app/templates/tables/activities.html.twig | 8 +- app/templates/tables/groups.html.twig | 8 +- app/templates/tables/permissions.html.twig | 4 +- app/templates/tables/roles.html.twig | 10 +- app/templates/tables/users.html.twig | 22 +- package-lock.json | 1170 +++++++++-------- package.json | 2 +- 26 files changed, 705 insertions(+), 661 deletions(-) diff --git a/app/src/Controller/Group/GroupCreateModal.php b/app/src/Controller/Group/GroupCreateModal.php index c88298a..85d739b 100644 --- a/app/src/Controller/Group/GroupCreateModal.php +++ b/app/src/Controller/Group/GroupCreateModal.php @@ -40,7 +40,7 @@ class GroupCreateModal protected string $schema = 'schema://requests/group/create.yaml'; // Default group icon - protected string $defaultIcon = 'fas fa-user'; + protected string $defaultIcon = 'fa-solid fa-user'; /** * Inject dependencies. diff --git a/app/templates/forms/group.html.twig b/app/templates/forms/group.html.twig index 70d7b60..fd01924 100644 --- a/app/templates/forms/group.html.twig +++ b/app/templates/forms/group.html.twig @@ -9,7 +9,7 @@
- +
@@ -20,7 +20,7 @@
- + {% if 'slug' not in form.fields.disabled %} diff --git a/app/templates/forms/partials/user-set-password.html.twig b/app/templates/forms/partials/user-set-password.html.twig index dabc35e..cfa0229 100644 --- a/app/templates/forms/partials/user-set-password.html.twig +++ b/app/templates/forms/partials/user-set-password.html.twig @@ -21,14 +21,14 @@
- +
- +
diff --git a/app/templates/forms/role.html.twig b/app/templates/forms/role.html.twig index 5a8fc07..c4acbb7 100644 --- a/app/templates/forms/role.html.twig +++ b/app/templates/forms/role.html.twig @@ -8,7 +8,7 @@
- +
@@ -19,7 +19,7 @@
- + {% if 'slug' not in form.fields.disabled %} diff --git a/app/templates/forms/user.html.twig b/app/templates/forms/user.html.twig index a30425b..e369d8e 100644 --- a/app/templates/forms/user.html.twig +++ b/app/templates/forms/user.html.twig @@ -9,7 +9,7 @@
- +
@@ -20,7 +20,7 @@
- + {% if 'group' in form.fields.disabled %} {% else %} @@ -41,7 +41,7 @@
- +
@@ -50,7 +50,7 @@
- +
@@ -61,11 +61,11 @@
- + {% if 'email' in form.fields.disabled %} - + {% endif %}
@@ -77,7 +77,7 @@
- + {% if 'locale' in form.fields.disabled %} {% else %} diff --git a/app/templates/modals/role-manage-permissions.html.twig b/app/templates/modals/role-manage-permissions.html.twig index 5eb9c30..c07d437 100644 --- a/app/templates/modals/role-manage-permissions.html.twig +++ b/app/templates/modals/role-manage-permissions.html.twig @@ -81,7 +81,7 @@
- + diff --git a/app/templates/modals/user-manage-roles.html.twig b/app/templates/modals/user-manage-roles.html.twig index 43a0f7f..035bd45 100644 --- a/app/templates/modals/user-manage-roles.html.twig +++ b/app/templates/modals/user-manage-roles.html.twig @@ -64,7 +64,7 @@ {{description}} - + diff --git a/app/templates/navigation/sidebar-menu.html.twig b/app/templates/navigation/sidebar-menu.html.twig index 61a20b3..afe891f 100644 --- a/app/templates/navigation/sidebar-menu.html.twig +++ b/app/templates/navigation/sidebar-menu.html.twig @@ -1,38 +1,38 @@ {% block navigation %} {% if checkAccess('uri_dashboard') %}
  • - {{ translate("DASHBOARD") }} + {{ translate("DASHBOARD") }}
  • {% endif %} {% if checkAccess('uri_users') %}
  • - {{ translate("USER", 2) }} + {{ translate("USER", 2) }}
  • {% elseif checkAccess('uri_group', { 'group': current_user.group }) %}
  • - {{ translate("GROUP.MANAGE") }} + {{ translate("GROUP.MANAGE") }}
  • {% endif %} {% if checkAccess('uri_activities') %}
  • - {{ translate("ACTIVITY", 2) }} + {{ translate("ACTIVITY", 2) }}
  • {% endif %} {% if checkAccess('uri_roles') %}
  • - {{ translate("ROLE", 2) }} + {{ translate("ROLE", 2) }}
  • {% endif %} {% if checkAccess('uri_permissions') %}
  • - {{ translate("PERMISSION", 2) }} + {{ translate("PERMISSION", 2) }}
  • {% endif %} {% if checkAccess('uri_groups') %}
  • - {{ translate("GROUP", 2) }} + {{ translate("GROUP", 2) }}
  • {% endif %} {% endblock %} diff --git a/app/templates/pages/abstract/dashboard.html.twig b/app/templates/pages/abstract/dashboard.html.twig index fc123bb..3bc7e28 100644 --- a/app/templates/pages/abstract/dashboard.html.twig +++ b/app/templates/pages/abstract/dashboard.html.twig @@ -29,7 +29,7 @@ {% block navbar_logo %} {% endblock %} diff --git a/app/templates/pages/activities.html.twig b/app/templates/pages/activities.html.twig index 2a5b126..f3b3ec3 100644 --- a/app/templates/pages/activities.html.twig +++ b/app/templates/pages/activities.html.twig @@ -10,7 +10,7 @@
    -

    {{translate('ACTIVITY', 2)}}

    +

    {{translate('ACTIVITY', 2)}}

    {% include "tables/table-tool-menu.html.twig" %}
    diff --git a/app/templates/pages/dashboard.html.twig b/app/templates/pages/dashboard.html.twig index ef67859..1e46fa0 100644 --- a/app/templates/pages/dashboard.html.twig +++ b/app/templates/pages/dashboard.html.twig @@ -11,7 +11,7 @@
    - +
    {{ translate("USER", 2) }} {{counter.users}} @@ -26,7 +26,7 @@
    - +
    {{ translate("ROLE", 2) }} {{counter.roles}} @@ -41,7 +41,7 @@
    - +
    {{ translate("GROUP", 2) }} {{counter.groups}} @@ -72,7 +72,7 @@
    - +
    {{ translate("USER", 2) }} {{current_user.group.users.count}} @@ -196,7 +196,7 @@
    -

    {{translate('ACTIVITY', 2)}}

    +

    {{translate('ACTIVITY', 2)}}

    {% include "tables/table-tool-menu.html.twig" %}
    @@ -217,7 +217,7 @@
    -

    {{translate('USER', 2)}}

    +

    {{translate('USER', 2)}}

    {% include "tables/table-tool-menu.html.twig" %}
    @@ -230,7 +230,7 @@
    diff --git a/app/templates/pages/group.html.twig b/app/templates/pages/group.html.twig index f8d6938..5d6ea42 100644 --- a/app/templates/pages/group.html.twig +++ b/app/templates/pages/group.html.twig @@ -20,19 +20,19 @@