From b66a61addb6c8e66cb26fcf74b532d68891267e4 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Wed, 23 May 2018 22:23:28 +0200 Subject: Refactored code, many fixes and improvements in chat backend+frontend --- .../admin/templates/forms/group.html.twig | 81 ++-- .../sprinkles/admin/templates/forms/role.html.twig | 65 ++-- .../sprinkles/admin/templates/forms/user.html.twig | 181 +++++---- .../admin/templates/mail/password-create.html.twig | 32 +- .../templates/modals/confirm-clear-cache.html.twig | 28 +- .../modals/confirm-delete-group.html.twig | 27 +- .../templates/modals/confirm-delete-role.html.twig | 27 +- .../templates/modals/confirm-delete-user.html.twig | 27 +- .../admin/templates/modals/group.html.twig | 2 +- .../modals/role-manage-permissions.html.twig | 88 ++--- .../admin/templates/modals/role.html.twig | 2 +- .../templates/modals/user-manage-roles.html.twig | 85 ++--- .../templates/modals/user-set-password.html.twig | 101 ++--- .../admin/templates/modals/user.html.twig | 2 +- .../templates/navigation/sidebar-menu.html.twig | 57 +-- .../templates/navigation/sidebar-user.html.twig | 14 +- .../admin/templates/navigation/sidebar.html.twig | 8 +- .../admin/templates/navigation/user-card.html.twig | 3 +- .../templates/pages/abstract/dashboard.html.twig | 109 +++--- .../admin/templates/pages/activities.html.twig | 13 +- .../admin/templates/pages/dashboard.html.twig | 414 +++++++++++---------- .../admin/templates/pages/group.html.twig | 55 +-- .../admin/templates/pages/groups.html.twig | 21 +- .../admin/templates/pages/permission.html.twig | 52 +-- .../admin/templates/pages/permissions.html.twig | 16 +- .../sprinkles/admin/templates/pages/role.html.twig | 76 ++-- .../admin/templates/pages/roles.html.twig | 17 +- .../sprinkles/admin/templates/pages/user.html.twig | 141 +++---- .../admin/templates/pages/users.html.twig | 27 +- .../admin/templates/tables/activities.html.twig | 19 +- .../admin/templates/tables/groups.html.twig | 19 +- .../admin/templates/tables/permissions.html.twig | 15 +- .../admin/templates/tables/roles.html.twig | 21 +- .../admin/templates/tables/users.html.twig | 46 ++- 34 files changed, 1007 insertions(+), 884 deletions(-) (limited to 'main/app/sprinkles/admin/templates') diff --git a/main/app/sprinkles/admin/templates/forms/group.html.twig b/main/app/sprinkles/admin/templates/forms/group.html.twig index 36d6632..fade5ab 100644 --- a/main/app/sprinkles/admin/templates/forms/group.html.twig +++ b/main/app/sprinkles/admin/templates/forms/group.html.twig @@ -1,69 +1,80 @@ -
+ {% include "forms/csrf.html.twig" %}
{% block group_form %} {% if 'name' not in form.fields.hidden %} -
-
- -
- - +
+
+ +
+ + +
-
{% endif %} {% if 'slug' not in form.fields.hidden %} -
-
- -
- - - {% if 'slug' not in form.fields.disabled %} - +
+
+ +
+ + + {% if 'slug' not in form.fields.disabled %} + - {% endif %} + {% endif %} +
-
{% endif %} {% if 'icon' not in fields.hidden %} -
-
- -
- - +
+
+ +
+ + +
-
{% endif %} {% if 'description' not in fields.hidden %} -
-
- - +
+
+ + +
-
{% endif %} {% endblock %} -

+
+
- +
- +
diff --git a/main/app/sprinkles/admin/templates/forms/role.html.twig b/main/app/sprinkles/admin/templates/forms/role.html.twig index 46a4477..7759783 100644 --- a/main/app/sprinkles/admin/templates/forms/role.html.twig +++ b/main/app/sprinkles/admin/templates/forms/role.html.twig @@ -1,56 +1,65 @@ -
+ {% include "forms/csrf.html.twig" %}
{% if 'name' not in form.fields.hidden %} -
-
- -
- - +
+
+ +
+ + +
-
{% endif %} {% if 'slug' not in form.fields.hidden %} -
-
- -
- - - {% if 'slug' not in form.fields.disabled %} - +
+
+ +
+ + + {% if 'slug' not in form.fields.disabled %} + - {% endif %} + {% endif %} +
-
{% endif %} {% if 'description' not in fields.hidden %} -
-
- - +
+
+ + +
-
{% endif %} -

+
+
- +
- +
diff --git a/main/app/sprinkles/admin/templates/forms/user.html.twig b/main/app/sprinkles/admin/templates/forms/user.html.twig index 3ee7fc9..e42cc6d 100644 --- a/main/app/sprinkles/admin/templates/forms/user.html.twig +++ b/main/app/sprinkles/admin/templates/forms/user.html.twig @@ -1,125 +1,142 @@ -
+ {% include "forms/csrf.html.twig" %}
{% block user_form %} {% if 'user_name' not in form.fields.hidden %} -
-
- -
- - +
+
+ +
+ + +
-
{% endif %} {% if 'group' not in form.fields.hidden %} -
-
- -
- - {% if 'group' in form.fields.disabled %} - - {% else %} - - {% endif %} +
+
+ +
+ + {% if 'group' in form.fields.disabled %} + + {% else %} + + {% endif %} +
-
{% endif %} {% if 'name' not in form.fields.hidden %} -
-
- -
- - +
+
+ +
+ + +
-
-
-
- -
- - +
+
+ +
+ + +
-
{% endif %} {% if 'email' not in form.fields.hidden %} -
-
- -
- - - {% if 'email' in form.fields.disabled %} - - +
+
+ +
+ + + {% if 'email' in form.fields.disabled %} + + - {% endif %} + {% endif %} +
-
{% endif %} {% if 'theme' not in form.fields.hidden %} -
-
- -
- - {% if 'theme' in form.fields.disabled %} - - {% else %} - - {% endif %} +
+
+ +
+ + {% if 'theme' in form.fields.disabled %} + + {% else %} + + {% endif %} +
-
{% endif %} {% if 'locale' not in form.fields.hidden %} -
-
- -
- - {% if 'locale' in form.fields.disabled %} - - {% else %} - - {% endif %} +
+
+ +
+ + {% if 'locale' in form.fields.disabled %} + + {% else %} + + {% endif %} +
-
{% endif %} {% endblock %} -

+
+
- +
- +
diff --git a/main/app/sprinkles/admin/templates/mail/password-create.html.twig b/main/app/sprinkles/admin/templates/mail/password-create.html.twig index 854eb77..f3a36d8 100644 --- a/main/app/sprinkles/admin/templates/mail/password-create.html.twig +++ b/main/app/sprinkles/admin/templates/mail/password-create.html.twig @@ -1,19 +1,23 @@ {% block subject %} - {{site.title}} - please set a password for your new account + {{ site.title }} - please set a password for your new account {% endblock %} {% block body %} -

- Dear {{user.first_name}}, -

-

- Someone has created an account for you with {{site.title}} ({{site.uri.public}}). Your username is {{user.user_name}}. -

-

- To access your account, you must first create a password by visiting: {{site.uri.public}}/account/set-password/confirm?token={{token}}. This link has been generated especially for you, and will expire in {{create_password_expiration}}. Do not share it with anyone! -

-

- With regards,
- The {{site.title}} Team -

+

+ Dear {{ user.first_name }}, +

+

+ Someone has created an account for you with {{ site.title }} ({{ site.uri.public }}). Your username is + {{ user.user_name }}. +

+

+ To access your account, you must first create a password by visiting: {{ site.uri.public }} + /account/set-password/confirm?token={{ token }}. This link has been generated especially for you, and + will expire in {{ create_password_expiration }}. Do not share it with anyone! +

+

+ With regards,
+ The {{ site.title }} Team +

{% endblock %} \ No newline at end of file diff --git a/main/app/sprinkles/admin/templates/modals/confirm-clear-cache.html.twig b/main/app/sprinkles/admin/templates/modals/confirm-clear-cache.html.twig index e5457d3..bf3ccca 100644 --- a/main/app/sprinkles/admin/templates/modals/confirm-clear-cache.html.twig +++ b/main/app/sprinkles/admin/templates/modals/confirm-clear-cache.html.twig @@ -1,17 +1,21 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate("CACHE.CLEAR")}}{% endblock %} +{% block modal_title %}{{ translate("CACHE.CLEAR") }}{% endblock %} {% block modal_body %} -
- {% include "forms/csrf.html.twig" %} -
-
-

{{translate("CACHE.CLEAR_CONFIRM")}}
{{translate("DELETE_CANNOT_UNDONE")}}

-
-
- - -
-
+
+ {% include "forms/csrf.html.twig" %} +
+
+

{{ translate("CACHE.CLEAR_CONFIRM") }}
+ {{ translate("DELETE_CANNOT_UNDONE") }} +

+
+
+ + +
+
{% endblock %} diff --git a/main/app/sprinkles/admin/templates/modals/confirm-delete-group.html.twig b/main/app/sprinkles/admin/templates/modals/confirm-delete-group.html.twig index 7889a1e..e53bf6e 100644 --- a/main/app/sprinkles/admin/templates/modals/confirm-delete-group.html.twig +++ b/main/app/sprinkles/admin/templates/modals/confirm-delete-group.html.twig @@ -1,17 +1,20 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate("GROUP.DELETE")}}{% endblock %} +{% block modal_title %}{{ translate("GROUP.DELETE") }}{% endblock %} {% block modal_body %} -
- {% include "forms/csrf.html.twig" %} -
-
-

{{translate("GROUP.DELETE_CONFIRM", {name: group.name})}}
{{translate("DELETE_CANNOT_UNDONE")}}

-
-
- - -
-
+
+ {% include "forms/csrf.html.twig" %} +
+
+

{{ translate("GROUP.DELETE_CONFIRM", {name: group.name}) }}
+ {{ translate("DELETE_CANNOT_UNDONE") }} +

+
+
+ + +
+
{% endblock %} diff --git a/main/app/sprinkles/admin/templates/modals/confirm-delete-role.html.twig b/main/app/sprinkles/admin/templates/modals/confirm-delete-role.html.twig index 618039b..ae528f9 100644 --- a/main/app/sprinkles/admin/templates/modals/confirm-delete-role.html.twig +++ b/main/app/sprinkles/admin/templates/modals/confirm-delete-role.html.twig @@ -1,17 +1,20 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate("ROLE.DELETE")}}{% endblock %} +{% block modal_title %}{{ translate("ROLE.DELETE") }}{% endblock %} {% block modal_body %} -
- {% include "forms/csrf.html.twig" %} -
-
-

{{translate("ROLE.DELETE_CONFIRM", {name: role.name})}}
{{translate("DELETE_CANNOT_UNDONE")}}

-
-
- - -
-
+
+ {% include "forms/csrf.html.twig" %} +
+
+

{{ translate("ROLE.DELETE_CONFIRM", {name: role.name}) }}
+ {{ translate("DELETE_CANNOT_UNDONE") }} +

+
+
+ + +
+
{% endblock %} diff --git a/main/app/sprinkles/admin/templates/modals/confirm-delete-user.html.twig b/main/app/sprinkles/admin/templates/modals/confirm-delete-user.html.twig index ce86301..17fe859 100644 --- a/main/app/sprinkles/admin/templates/modals/confirm-delete-user.html.twig +++ b/main/app/sprinkles/admin/templates/modals/confirm-delete-user.html.twig @@ -1,17 +1,20 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate("USER.DELETE")}}{% endblock %} +{% block modal_title %}{{ translate("USER.DELETE") }}{% endblock %} {% block modal_body %} -
- {% include "forms/csrf.html.twig" %} -
-
-

{{translate("USER.DELETE_CONFIRM", {name: user.user_name})}}
{{translate("DELETE_CANNOT_UNDONE")}}

-
-
- - -
-
+
+ {% include "forms/csrf.html.twig" %} +
+
+

{{ translate("USER.DELETE_CONFIRM", {name: user.user_name}) }}
+ {{ translate("DELETE_CANNOT_UNDONE") }} +

+
+
+ + +
+
{% endblock %} diff --git a/main/app/sprinkles/admin/templates/modals/group.html.twig b/main/app/sprinkles/admin/templates/modals/group.html.twig index be2d98c..a716b4f 100644 --- a/main/app/sprinkles/admin/templates/modals/group.html.twig +++ b/main/app/sprinkles/admin/templates/modals/group.html.twig @@ -1,6 +1,6 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate('GROUP')}}{% endblock %} +{% block modal_title %}{{ translate('GROUP') }}{% endblock %} {% block modal_body %} {% include "forms/group.html.twig" %} diff --git a/main/app/sprinkles/admin/templates/modals/role-manage-permissions.html.twig b/main/app/sprinkles/admin/templates/modals/role-manage-permissions.html.twig index 3914d2e..f8b7ef5 100644 --- a/main/app/sprinkles/admin/templates/modals/role-manage-permissions.html.twig +++ b/main/app/sprinkles/admin/templates/modals/role-manage-permissions.html.twig @@ -1,52 +1,54 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate("PERMISSION.MANAGE")}}{% endblock %} +{% block modal_title %}{{ translate("PERMISSION.MANAGE") }}{% endblock %} {% block modal_size %}modal-lg{% endblock %} {% block modal_body %} -
- {% include "forms/csrf.html.twig" %} -
-
-
- - - - - - - - - - - -
{{translate("NAME")}}{{translate("DESCRIPTION")}}{{translate("PERMISSION.HOOK_CONDITION")}}{{translate("REMOVE")}}
-
- - + + {% include "forms/csrf.html.twig" %} +
-
-
-
-
- +
+ + + + + + + + + + + +
{{ translate("NAME") }}{{ translate("DESCRIPTION") }}{{ translate("PERMISSION.HOOK_CONDITION") }}{{ translate("REMOVE") }}
+
+ + +
-
- +
+
+
+ +
+
+ +
-
- + -{# This contains a series of {% endverbatim %} - - + + {% endblock %} diff --git a/main/app/sprinkles/admin/templates/modals/role.html.twig b/main/app/sprinkles/admin/templates/modals/role.html.twig index 6346461..6ae924e 100644 --- a/main/app/sprinkles/admin/templates/modals/role.html.twig +++ b/main/app/sprinkles/admin/templates/modals/role.html.twig @@ -1,6 +1,6 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate('ROLE')}}{% endblock %} +{% block modal_title %}{{ translate('ROLE') }}{% endblock %} {% block modal_body %} {% include "forms/role.html.twig" %} diff --git a/main/app/sprinkles/admin/templates/modals/user-manage-roles.html.twig b/main/app/sprinkles/admin/templates/modals/user-manage-roles.html.twig index b41c60b..3c0fe18 100644 --- a/main/app/sprinkles/admin/templates/modals/user-manage-roles.html.twig +++ b/main/app/sprinkles/admin/templates/modals/user-manage-roles.html.twig @@ -1,49 +1,50 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate("ROLE.MANAGE")}}{% endblock %} +{% block modal_title %}{{ translate("ROLE.MANAGE") }}{% endblock %} {% block modal_body %} -
- {% include "forms/csrf.html.twig" %} -
-
-
- - - - - - - - - - -
{{translate("NAME")}}{{translate("DESCRIPTION")}}{{translate("REMOVE")}}
-
- - + + {% include "forms/csrf.html.twig" %} +
-
-
-
-
- +
+ + + + + + + + + + +
{{ translate("NAME") }}{{ translate("DESCRIPTION") }}{{ translate("REMOVE") }}
+
+ + +
-
- +
+
+
+ +
+
+ +
-
- + -{# This contains a series of {% endverbatim %} - - + + {% endblock %} diff --git a/main/app/sprinkles/admin/templates/modals/user-set-password.html.twig b/main/app/sprinkles/admin/templates/modals/user-set-password.html.twig index 922d4e2..9b2c017 100644 --- a/main/app/sprinkles/admin/templates/modals/user-set-password.html.twig +++ b/main/app/sprinkles/admin/templates/modals/user-set-password.html.twig @@ -1,62 +1,67 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate("USER.ADMIN.CHANGE_PASSWORD")}}{% endblock %} +{% block modal_title %}{{ translate("USER.ADMIN.CHANGE_PASSWORD") }}{% endblock %} {% block modal_body %} -
- {% include "forms/csrf.html.twig" %} - - - -
-
-
-
-
- -
+ + {% include "forms/csrf.html.twig" %} + + + +
-
-
- +
+
+
+ +
-
-
-
- -
- - +
+
+ +
+
+
+
+ +
+ + +
-
-
- -
- - +
+ +
+ + +
-

-
-
- -
-
- +
+
+
+ +
+
+ +
-
- - - + + + {% endblock %} diff --git a/main/app/sprinkles/admin/templates/modals/user.html.twig b/main/app/sprinkles/admin/templates/modals/user.html.twig index 892fe4f..850844d 100644 --- a/main/app/sprinkles/admin/templates/modals/user.html.twig +++ b/main/app/sprinkles/admin/templates/modals/user.html.twig @@ -1,6 +1,6 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate('USER')}}{% endblock %} +{% block modal_title %}{{ translate('USER') }}{% endblock %} {% block modal_body %} {% include "forms/user.html.twig" %} diff --git a/main/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig b/main/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig index e6d4a7c..446f260 100644 --- a/main/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig +++ b/main/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig @@ -1,38 +1,53 @@ {% 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 %} \ No newline at end of file diff --git a/main/app/sprinkles/admin/templates/navigation/sidebar-user.html.twig b/main/app/sprinkles/admin/templates/navigation/sidebar-user.html.twig index 018e644..4b1881c 100644 --- a/main/app/sprinkles/admin/templates/navigation/sidebar-user.html.twig +++ b/main/app/sprinkles/admin/templates/navigation/sidebar-user.html.twig @@ -1,10 +1,10 @@
    -
    - User Image -
    -
    -

    {{current_user.first_name}} {{current_user.last_name}}

    - {{current_user.group.name}} -
    +
    + User Image +
    +
    +

    {{ current_user.first_name }} {{ current_user.last_name }}

    + {{ current_user.group.name }} +
    \ No newline at end of file diff --git a/main/app/sprinkles/admin/templates/navigation/sidebar.html.twig b/main/app/sprinkles/admin/templates/navigation/sidebar.html.twig index 1b2939e..59f87b0 100644 --- a/main/app/sprinkles/admin/templates/navigation/sidebar.html.twig +++ b/main/app/sprinkles/admin/templates/navigation/sidebar.html.twig @@ -3,8 +3,8 @@ {% endblock %} {% block sidebar_menu %} -
      -
    • {{translate('NAVIGATION')}}
      • - {% include 'navigation/sidebar-menu.html.twig' %} -
    +
      +
    • {{ translate('NAVIGATION') }}
      • + {% include 'navigation/sidebar-menu.html.twig' %} +
    {% endblock %} \ No newline at end of file diff --git a/main/app/sprinkles/admin/templates/navigation/user-card.html.twig b/main/app/sprinkles/admin/templates/navigation/user-card.html.twig index 36fdb4b..8b40cd3 100644 --- a/main/app/sprinkles/admin/templates/navigation/user-card.html.twig +++ b/main/app/sprinkles/admin/templates/navigation/user-card.html.twig @@ -2,7 +2,8 @@ {% block userCard_menu %} {% if checkAccess('uri_dashboard') %} - {{translate("DASHBOARD")}} + {{ translate("DASHBOARD") }} {% endif %} {{ parent() }} {% endblock %} \ No newline at end of file diff --git a/main/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig b/main/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig index 2a53de4..0d2e0ef 100644 --- a/main/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig +++ b/main/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig @@ -9,7 +9,7 @@ {% if current_user.isMaster() %} class="hold-transition skin-red sidebar-mini" {% else %} - class="hold-transition skin-{{site.AdminLTE.skin}} sidebar-mini" + class="hold-transition skin-{{ site.AdminLTE.skin }} sidebar-mini" {% endif %} {% endblock %} @@ -17,65 +17,68 @@ {# This needs to be here (early in the body) to make sure the animation doesn't fire #}
    -
    - - {% block navbar_logo %} - - {% endblock %} - - -
    - - +
    + + {% block navbar_logo %} + + {% endblock %} + + +
    + + - -
    - - {% block content_header %} -
    -

    {% block header_title %}{{ block('page_title') }}{% endblock %}

    - {% if block('page_description') is not empty %}

    {% block header_description %}{{ block('page_description') }}{% endblock %}

    {% endif %} - {% block breadcrumb %} - {% include 'navigation/breadcrumb.html.twig' with {page_title: block('page_title')} %} - {% endblock %} -
    -
    - {% endblock %} -
    - {% block body_matter %}{% endblock %} -
    -
    - + +
    + + {% block content_header %} +
    +

    {% block header_title %}{{ block('page_title') }}{% endblock %}

    + {% if block('page_description') is not empty %} +

    + {% block header_description %}{{ block('page_description') }}{% endblock %} +

    {% endif %} + {% block breadcrumb %} + {% include 'navigation/breadcrumb.html.twig' with {page_title: block('page_title')} %} + {% endblock %} +
    +
    + {% endblock %} +
    + {% block body_matter %}{% endblock %} +
    +
    + - - {% block footer %} - {% include "pages/partials/footer.html.twig" %} - {% endblock %} + + {% block footer %} + {% include "pages/partials/footer.html.twig" %} + {% endblock %}
    diff --git a/main/app/sprinkles/admin/templates/pages/activities.html.twig b/main/app/sprinkles/admin/templates/pages/activities.html.twig index bcbd9c6..7927601 100644 --- a/main/app/sprinkles/admin/templates/pages/activities.html.twig +++ b/main/app/sprinkles/admin/templates/pages/activities.html.twig @@ -15,17 +15,16 @@
    -

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

    +

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

    {% include "tables/table-tool-menu.html.twig" %}
    {% include "tables/activities.html.twig" with { - "table" : { - "id" : "table-activities", - "columns" : ["user"] - } + "table" : { + "id" : "table-activities", + "columns" : ["user"] } - %} + } %}
    @@ -34,7 +33,7 @@ {% block scripts_page %} diff --git a/main/app/sprinkles/admin/templates/pages/dashboard.html.twig b/main/app/sprinkles/admin/templates/pages/dashboard.html.twig index f9c85a3..461e13d 100644 --- a/main/app/sprinkles/admin/templates/pages/dashboard.html.twig +++ b/main/app/sprinkles/admin/templates/pages/dashboard.html.twig @@ -7,255 +7,257 @@ {% block body_matter %} {% if checkAccess('uri_users') %} -
    -
    - -
    - -
    - {{ translate("USER", 2) }} - {{counter.users}} -
    - +
    +
    + +
    + +
    + {{ translate("USER", 2) }} + {{ counter.users }} +
    + +
    + +
    - - -
    - + -
    - -
    - -
    - {{ translate("ROLE", 2) }} - {{counter.roles}} -
    - +
    + +
    + +
    + {{ translate("ROLE", 2) }} + {{ counter.roles }} +
    + +
    + +
    - - -
    - + -
    - -
    - -
    - {{ translate("GROUP", 2) }} - {{counter.groups}} -
    - +
    + +
    + +
    + {{ translate("GROUP", 2) }} + {{ counter.groups }} +
    + +
    + +
    - - +
    - -
    - + {% elseif checkAccess('uri_group', { 'group': current_user.group }) %} -
    -
    -
    - -
    -

    {{current_user.group.name}}

    +
    +
    +
    + +
    +

    {{ current_user.group.name }}

    +
    + +
    +
    - -
    - -
    - -
    -
    - -
    - {{ translate("USER", 2) }} - {{current_user.group.users.count}} + +
    +
    + +
    + {{ translate("USER", 2) }} + {{ current_user.group.users.count }} +
    + +
    +
    - -
    - +
    - -
    - + {% endif %}
    {% if checkAccess('uri_users') or checkAccess('view_system_info') %} -
    - {% if checkAccess('uri_users') %} -
    -
    - -
    -
    -

    {{translate("USER.LATEST")}}

    -
    - -
    - - -
    - -
    - {{translate("USER.VIEW_ALL")}} +
    + {% if checkAccess('uri_users') %} +
    +
    + +
    +
    +

    {{ translate("USER.LATEST") }}

    +
    + +
    + + +
    + +
    + {{ translate("USER.VIEW_ALL") }} +
    + +
    + +
    +
    - -
    - -
    - -
    - - {% endif %} + + {% endif %} - {% if checkAccess('view_system_info') %} -
    -
    -
    -
    -

    {{translate("SYSTEM_INFO")}}

    -
    - -
    -
    -
    {{translate("SYSTEM_INFO.UF_VERSION")}}
    -
    {{info.version.UF}}
    + {% if checkAccess('view_system_info') %} +
    +
    +
    +
    +

    {{ translate("SYSTEM_INFO") }}

    +
    + +
    +
    +
    {{ translate("SYSTEM_INFO.UF_VERSION") }}
    +
    {{ info.version.UF }}
    -
    {{translate("SYSTEM_INFO.PHP_VERSION")}}
    -
    {{info.version.php}}
    +
    {{ translate("SYSTEM_INFO.PHP_VERSION") }}
    +
    {{ info.version.php }}
    -
    {{translate("SYSTEM_INFO.SERVER")}}
    -
    {{info.environment.SERVER_SOFTWARE}}
    +
    {{ translate("SYSTEM_INFO.SERVER") }}
    +
    {{ info.environment.SERVER_SOFTWARE }}
    -
    {{translate("SYSTEM_INFO.DB_VERSION")}}
    -
    {{info.version.database.type}} {{info.version.database.version}}
    +
    {{ translate("SYSTEM_INFO.DB_VERSION") }}
    +
    {{ info.version.database.type }} {{ info.version.database.version }}
    -
    {{translate("SYSTEM_INFO.DB_NAME")}}
    -
    {{info.database.name}}
    +
    {{ translate("SYSTEM_INFO.DB_NAME") }}
    +
    {{ info.database.name }}
    -
    {{translate("SYSTEM_INFO.DIRECTORY")}}
    -
    {{info.path.project}}
    +
    {{ translate("SYSTEM_INFO.DIRECTORY") }}
    +
    {{ info.path.project }}
    -
    {{translate("SYSTEM_INFO.URL")}}
    -
    {{site.uri.public}}
    +
    {{ translate("SYSTEM_INFO.URL") }}
    +
    {{ site.uri.public }}
    -
    {{translate("SYSTEM_INFO.SPRINKLES")}}
    -
    -
      - {% for sprinkle in sprinkles %} -
    • - {{sprinkle}} -
      • - {% endfor %} -
    -
    -
    +
    {{ translate("SYSTEM_INFO.SPRINKLES") }}
    +
    +
      + {% for sprinkle in sprinkles %} +
    • + {{ sprinkle }} +
      • + {% endfor %} +
    +
    +
    +
    + +
    + {{ translate("CACHE.CLEAR") }} +
    + +
    +
    - -
    - {{ translate("CACHE.CLEAR") }} -
    - +
    - -
    - + + {% endif %}
    - - {% endif %} -
    - + {% endif %} {% if checkAccess('uri_activities') %} -
    -
    -
    -

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

    - {% include "tables/table-tool-menu.html.twig" %} -
    -
    - {% include "tables/activities.html.twig" with { +
    +
    +
    +

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

    + {% include "tables/table-tool-menu.html.twig" %} +
    +
    + {% include "tables/activities.html.twig" with { "table" : { "id" : "table-activities", "columns" : ["user"] } - } - %} + } %} +
    -
    {% elseif checkAccess('view_group_field', { 'group': current_user.group, 'property': 'users' }) %} -
    -
    -
    -

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

    - {% include "tables/table-tool-menu.html.twig" %} -
    -
    - {% include "tables/users.html.twig" with { +
    +
    +
    +

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

    + {% include "tables/table-tool-menu.html.twig" %} +
    +
    + {% include "tables/users.html.twig" with { "table" : { "id" : "table-group-users" } - } - %} -
    -
    - + } %} +
    +
    + +
    -
    {% else %} -
    -
    - -
    -

    - {{translate("WELCOME", { - 'first_name': current_user.first_name - })}} -

    -
    -
    - User Avatar -
    -
    -

    - {{translate("WELCOME_TO", { - 'title': site.title - })}} -

    -

    - {{translate("NO_FEATURES_YET")}} -

    +
    +
    + +
    +

    + {{ translate("WELCOME", { + 'first_name': current_user.first_name + }) }} +

    +
    +
    + User Avatar +
    +
    +

    + {{ translate("WELCOME_TO", { + 'title': site.title + }) }} +

    +

    + {{ translate("NO_FEATURES_YET") }} +

    +
    -
    - + -
    - +
    + {% endif %}
    @@ -264,16 +266,16 @@ {% block scripts_page %} diff --git a/main/app/sprinkles/admin/templates/pages/group.html.twig b/main/app/sprinkles/admin/templates/pages/group.html.twig index bf4d275..bab5b13 100644 --- a/main/app/sprinkles/admin/templates/pages/group.html.twig +++ b/main/app/sprinkles/admin/templates/pages/group.html.twig @@ -6,7 +6,7 @@ {% endblock %} {# Overrides blocks in head of base template #} -{% block page_title %}{{ translate("GROUP", 2) }} | {{group.name}}{% endblock %} +{% block page_title %}{{ translate("GROUP", 2) }} | {{ group.name }}{% endblock %} {% block page_description %}{{ translate("GROUP.INFO_PAGE", {name: group.name}) }}{% endblock %} @@ -15,24 +15,26 @@
    -

    {{translate('GROUP.SUMMARY')}}

    +

    {{ translate('GROUP.SUMMARY') }}

    {% if 'tools' not in tools.hidden %}
    -
    - +
    -

    {{group.name}}

    +

    {{ group.name }}

    {% if 'description' not in fields.hidden %}

    - {{group.description}} + {{ group.description }}

    {% endif %} {% if 'users' not in fields.hidden %}
    - {{ translate('USER', 2)}} + {{ translate('USER', 2) }}

    - {{group.users.count}} + {{ group.users.count }}

    {% endif %} {% block group_profile %}{% endblock %} @@ -68,16 +70,15 @@
    -

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

    +

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

    {% include "tables/table-tool-menu.html.twig" %}
    {% include "tables/users.html.twig" with { - "table" : { - "id" : "table-group-users" - } + "table" : { + "id" : "table-group-users" } - %} + } %}
    @@ -86,16 +87,16 @@ {% block scripts_page %} diff --git a/main/app/sprinkles/admin/templates/pages/groups.html.twig b/main/app/sprinkles/admin/templates/pages/groups.html.twig index 35e9a88..43b0618 100644 --- a/main/app/sprinkles/admin/templates/pages/groups.html.twig +++ b/main/app/sprinkles/admin/templates/pages/groups.html.twig @@ -15,23 +15,22 @@
    -

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

    +

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

    {% include "tables/table-tool-menu.html.twig" %}
    {% include "tables/groups.html.twig" with { - "table" : { - "id" : "table-groups" - } + "table" : { + "id" : "table-groups" } - %} + } %}
    {% if checkAccess('create_group') %} -
    - -
    +
    + +
    {% endif %}
    @@ -40,7 +39,7 @@ {% block scripts_page %} diff --git a/main/app/sprinkles/admin/templates/pages/permission.html.twig b/main/app/sprinkles/admin/templates/pages/permission.html.twig index 6adc014..004131e 100644 --- a/main/app/sprinkles/admin/templates/pages/permission.html.twig +++ b/main/app/sprinkles/admin/templates/pages/permission.html.twig @@ -6,63 +6,63 @@ {% endblock %} {# Overrides blocks in head of base template #} -{% block page_title %}{{translate("PERMISSION", 2)}} | {{permission.name}}{% endblock %} +{% block page_title %}{{ translate("PERMISSION", 2) }} | {{ permission.name }}{% endblock %} -{% block page_description %}{{translate("PERMISSION.INFO_PAGE", {name: permission.name})}}{% endblock %} +{% block page_description %}{{ translate("PERMISSION.INFO_PAGE", {name: permission.name}) }}{% endblock %} {% block body_matter %}
    -

    {{translate("PERMISSION.SUMMARY")}}

    +

    {{ translate("PERMISSION.SUMMARY") }}

    -

    {{permission.name}}

    +

    {{ permission.name }}

    - {{permission.description}} + {{ permission.description }}

    - {{translate("PERMISSION.ID")}}: + {{ translate("PERMISSION.ID") }}: - {{permission.id}} + {{ permission.id }}
    - {{translate("SLUG_CONDITION")}} + {{ translate("SLUG_CONDITION") }}

    - {{permission.slug}} + {{ permission.slug }}

    - ↳ {{permission.conditions}} + ↳ + {{ permission.conditions }}

    - {{translate("PERMISSION.NOTE_READ_ONLY")}} + {{ translate("PERMISSION.NOTE_READ_ONLY") }}
    -

    {{translate("USER.WITH_PERMISSION")}}

    +

    {{ translate("USER.WITH_PERMISSION") }}

    {% include "tables/table-tool-menu.html.twig" %}
    {% include "tables/users.html.twig" with { - "table" : { - "id" : "table-permission-users", - "columns" : ["via_roles"] - } + "table" : { + "id" : "table-permission-users", + "columns" : ["via_roles"] } - %} + } %}
    @@ -71,16 +71,16 @@ {% block scripts_page %} diff --git a/main/app/sprinkles/admin/templates/pages/permissions.html.twig b/main/app/sprinkles/admin/templates/pages/permissions.html.twig index 2696209..5cf95da 100644 --- a/main/app/sprinkles/admin/templates/pages/permissions.html.twig +++ b/main/app/sprinkles/admin/templates/pages/permissions.html.twig @@ -6,25 +6,25 @@ {% endblock %} {# Overrides blocks in head of base template #} -{% block page_title %}{{ translate("PERMISSION", 2)}}{% endblock %} +{% block page_title %}{{ translate("PERMISSION", 2) }}{% endblock %} -{% block page_description %}{{ translate("PERMISSION.PAGE_DESCRIPTION")}}{% endblock %} +{% block page_description %}{{ translate("PERMISSION.PAGE_DESCRIPTION") }}{% endblock %} {% block body_matter %}
    -

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

    +

    {{ translate('PERMISSION', 2) }} +

    {% include "tables/table-tool-menu.html.twig" %}
    {% include "tables/permissions.html.twig" with { - "table" : { - "id" : "table-permissions" - } + "table" : { + "id" : "table-permissions" } - %} + } %}
    @@ -33,7 +33,7 @@ {% block scripts_page %} diff --git a/main/app/sprinkles/admin/templates/pages/role.html.twig b/main/app/sprinkles/admin/templates/pages/role.html.twig index daf1004..1892d32 100644 --- a/main/app/sprinkles/admin/templates/pages/role.html.twig +++ b/main/app/sprinkles/admin/templates/pages/role.html.twig @@ -6,40 +6,42 @@ {% endblock %} {# Overrides blocks in head of base template #} -{% block page_title %}{{translate("ROLE", 2)}} | {{role.name}}{% endblock %} +{% block page_title %}{{ translate("ROLE", 2) }} | {{ role.name }}{% endblock %} -{% block page_description %}{{translate("ROLE.INFO_PAGE", {name: role.name})}}{% endblock %} +{% block page_description %}{{ translate("ROLE.INFO_PAGE", {name: role.name}) }}{% endblock %} {% block body_matter %}
    -

    {{translate('ROLE.SUMMARY')}}

    +

    {{ translate('ROLE.SUMMARY') }}

    {% if 'tools' not in tools.hidden %}
    -
    -

    {{role.name}}

    +

    {{ role.name }}

    {% if 'description' not in fields.hidden %}

    - {{role.description}} + {{ role.description }}

    {% endif %} {% if 'users' not in fields.hidden %}
    - {{ translate('USER', 2)}} + {{ translate('USER', 2) }}

    - {{role.users.count}} + {{ role.users.count }}

    {% endif %}
    @@ -74,33 +76,31 @@
    -

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

    +

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

    {% include "tables/table-tool-menu.html.twig" %}
    {% include "tables/permissions.html.twig" with { - "table" : { - "id" : "table-role-permissions" - } + "table" : { + "id" : "table-role-permissions" } - %} + } %}
    -

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

    +

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

    {% include "tables/table-tool-menu.html.twig" %}
    {% include "tables/users.html.twig" with { - "table" : { - "id" : "table-role-users", - "columns" : ["last_activity"] - } + "table" : { + "id" : "table-role-users", + "columns" : ["last_activity"] } - %} + } %}
    @@ -109,16 +109,16 @@ {% block scripts_page %} diff --git a/main/app/sprinkles/admin/templates/pages/roles.html.twig b/main/app/sprinkles/admin/templates/pages/roles.html.twig index c5b3995..2677f87 100644 --- a/main/app/sprinkles/admin/templates/pages/roles.html.twig +++ b/main/app/sprinkles/admin/templates/pages/roles.html.twig @@ -6,29 +6,28 @@ {% endblock %} {# Overrides blocks in head of base template #} -{% block page_title %}{{ translate("ROLE", 2)}}{% endblock %} +{% block page_title %}{{ translate("ROLE", 2) }}{% endblock %} -{% block page_description %}{{ translate("ROLE.PAGE_DESCRIPTION")}}{% endblock %} +{% block page_description %}{{ translate("ROLE.PAGE_DESCRIPTION") }}{% endblock %} {% block body_matter %}
    -

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

    +

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

    {% include "tables/table-tool-menu.html.twig" %}
    {% include "tables/roles.html.twig" with { - "table" : { - "id" : "table-roles" - } + "table" : { + "id" : "table-roles" } - %} + } %}
    @@ -38,7 +37,7 @@ {% block scripts_page %} diff --git a/main/app/sprinkles/admin/templates/pages/user.html.twig b/main/app/sprinkles/admin/templates/pages/user.html.twig index d9c9ab2..47228fd 100644 --- a/main/app/sprinkles/admin/templates/pages/user.html.twig +++ b/main/app/sprinkles/admin/templates/pages/user.html.twig @@ -6,7 +6,7 @@ {% endblock %} {# Overrides blocks in head of base template #} -{% block page_title %}{{ translate("USER", 2)}} | {{user.full_name}}{% endblock %} +{% block page_title %}{{ translate("USER", 2) }} | {{ user.full_name }}{% endblock %} {% block page_description %}{{ translate("USER.INFO_PAGE", {name: user.user_name}) }}{% endblock %} @@ -19,60 +19,69 @@ {% block user_box %}
    -

    {{translate('USER.SUMMARY')}}

    +

    {{ translate('USER.SUMMARY') }}

    {% if 'tools' not in tools.hidden %}
    -
    - {{user.user_name}} + {{ user.user_name }} -

    {{user.full_name}}

    +

    {{ user.full_name }}

    {% if user.flag_enabled == 0 %} - + {% endif %} {% if user.flag_verified == 0 %} - + {% endif %}
    -

    {{user.user_name}}{% if 'group' not in fields.hidden %} • {{user.group.name}}{% endif %}

    +

    {{ user.user_name }}{% if 'group' not in fields.hidden %} • {{ user.group.name }}{% endif %}

    {% if 'email' not in fields.hidden %}
    - {{translate("EMAIL")}} + {{ translate("EMAIL") }}

    - {{user.email}} + {{ user.email }}

    {% endif %} {% if 'locale' not in fields.hidden %}
    - {{translate("LOCALE")}} + {{ translate("LOCALE") }}

    - {{locales[user.locale]}} + {{ locales[user.locale] }}

    {% endif %} @@ -117,10 +129,12 @@ {% if 'roles' not in fields.hidden %}
    - {{translate("ROLE", 2)}} + {{ translate("ROLE", 2) }} +

    {% for role in user.roles %} - {{role.name}} + {{ role.name }} {% endfor %}

    {% endif %} @@ -130,61 +144,60 @@
    {% if 'activities' not in widgets.hidden %} -
    - {% block activity_box %} -
    -
    -

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

    - {% include "tables/table-tool-menu.html.twig" %} -
    -
    - {% include "tables/activities.html.twig" with { +
    + {% block activity_box %} +
    +
    +

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

    + {% include "tables/table-tool-menu.html.twig" %} +
    +
    + {% include "tables/activities.html.twig" with { "table" : { "id" : "table-user-activities" } - } - %} + } %} +
    -
    - {% endblock %} -
    + {% endblock %} +
    {% endif %}
    {% if 'permissions' not in widgets.hidden %} -
    -
    -
    -
    -

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

    - {% include "tables/table-tool-menu.html.twig" %} -
    -
    - {% include "tables/permissions.html.twig" with { +
    +
    +
    +
    +

    {{ translate('PERMISSION', 2) }} +

    + {% include "tables/table-tool-menu.html.twig" %} +
    +
    + {% include "tables/permissions.html.twig" with { "table" : { "id" : "table-permissions", "columns" : ["via_roles"] } - } - %} + } %} +
    -
    {% endif %} {% endblock %} {% block scripts_page %} diff --git a/main/app/sprinkles/admin/templates/pages/users.html.twig b/main/app/sprinkles/admin/templates/pages/users.html.twig index 3e4642d..cbd86f4 100644 --- a/main/app/sprinkles/admin/templates/pages/users.html.twig +++ b/main/app/sprinkles/admin/templates/pages/users.html.twig @@ -6,33 +6,32 @@ {% endblock %} {# Overrides blocks in head of base template #} -{% block page_title %}{{ translate("USER", 2)}}{% endblock %} +{% block page_title %}{{ translate("USER", 2) }}{% endblock %} -{% block page_description %}{{ translate("USER.PAGE_DESCRIPTION")}}{% endblock %} +{% block page_description %}{{ translate("USER.PAGE_DESCRIPTION") }}{% endblock %} {% block body_matter %}
    -

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

    +

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

    {% include "tables/table-tool-menu.html.twig" %}
    {% include "tables/users.html.twig" with { - "table" : { - "id" : "table-users", - "columns" : ["last_activity"] - } + "table" : { + "id" : "table-users", + "columns" : ["last_activity"] } - %} + } %}
    {% if checkAccess('create_user') %} -
    - -
    +
    + +
    {% endif %}
    @@ -41,7 +40,7 @@ {% block scripts_page %} diff --git a/main/app/sprinkles/admin/templates/tables/activities.html.twig b/main/app/sprinkles/admin/templates/tables/activities.html.twig index d70541b..dce1d99 100644 --- a/main/app/sprinkles/admin/templates/tables/activities.html.twig +++ b/main/app/sprinkles/admin/templates/tables/activities.html.twig @@ -8,14 +8,21 @@ {% extends "tables/table-paginated.html.twig" %} {% block table %} - +
    - + {% if 'user' in table.columns %} - + {% endif %} - + @@ -38,7 +45,7 @@ {{ else }} {{/if }} @@ -54,7 +61,7 @@ {{ else }} - {% endverbatim %}{{translate("USER.DELETED")}}{% verbatim %} + {% endverbatim %}{{ translate("USER.DELETED") }}{% verbatim %} {{/if }} diff --git a/main/app/sprinkles/admin/templates/tables/groups.html.twig b/main/app/sprinkles/admin/templates/tables/groups.html.twig index 2c5a84a..8d14e98 100644 --- a/main/app/sprinkles/admin/templates/tables/groups.html.twig +++ b/main/app/sprinkles/admin/templates/tables/groups.html.twig @@ -8,12 +8,17 @@ {% extends "tables/table-paginated.html.twig" %} {% block table %} -
    {{translate('ACTIVITY.TIME')}} {{ translate('ACTIVITY.TIME') }} {{translate('USER')}} {{ translate('USER') }} {{translate("DESCRIPTION")}} {{ translate("DESCRIPTION") }}
    - {% endverbatim %}{{translate("UNKNOWN")}}{% verbatim %} + {% endverbatim %}{{ translate("UNKNOWN") }}{% verbatim %}
    +
    - - - + + + @@ -47,18 +52,18 @@
    {{translate('GROUP')}} {{translate("DESCRIPTION")}} {{translate("ACTIONS")}}{{ translate('GROUP') }} {{ translate("DESCRIPTION") }} {{ translate("ACTIONS") }}
    diff --git a/main/app/sprinkles/admin/templates/tables/permissions.html.twig b/main/app/sprinkles/admin/templates/tables/permissions.html.twig index 92e236a..6ff13c6 100644 --- a/main/app/sprinkles/admin/templates/tables/permissions.html.twig +++ b/main/app/sprinkles/admin/templates/tables/permissions.html.twig @@ -8,13 +8,18 @@ {% extends "tables/table-paginated.html.twig" %} {% block table %} - +
    - - + + {% if 'via_roles' in table.columns %} - + {% endif %} @@ -58,7 +63,7 @@ diff --git a/main/app/sprinkles/admin/templates/tables/roles.html.twig b/main/app/sprinkles/admin/templates/tables/roles.html.twig index dbdb49e..f8e136b 100644 --- a/main/app/sprinkles/admin/templates/tables/roles.html.twig +++ b/main/app/sprinkles/admin/templates/tables/roles.html.twig @@ -8,12 +8,17 @@ {% extends "tables/table-paginated.html.twig" %} {% block table %} -
    {{translate('PERMISSION')}} {{translate('SLUG_CONDITION')}} {{ translate('PERMISSION') }} {{ translate('SLUG_CONDITION') }} {{translate('PERMISSION.VIA_ROLES')}}{{ translate('PERMISSION.VIA_ROLES') }}
    +
    - - - + + + @@ -47,23 +52,23 @@
    {{translate('ROLE')}} {{translate('DESCRIPTION')}} {{translate('ACTIONS')}}{{ translate('ROLE') }} {{ translate('DESCRIPTION') }} {{ translate('ACTIONS') }}
    diff --git a/main/app/sprinkles/admin/templates/tables/users.html.twig b/main/app/sprinkles/admin/templates/tables/users.html.twig index 1cebb47..bd9fffe 100644 --- a/main/app/sprinkles/admin/templates/tables/users.html.twig +++ b/main/app/sprinkles/admin/templates/tables/users.html.twig @@ -8,18 +8,26 @@ {% extends "tables/table-paginated.html.twig" %} {% block table %} - +
    - + {% if 'last_activity' in table.columns %} - + {% endif %} {% if 'via_roles' in table.columns %} - + {% endif %} - - + + @@ -56,7 +64,7 @@ {{ else }} {{/if }} @@ -75,16 +83,16 @@ > {{#ifx row.flag_enabled '==' 0 }} - {% endverbatim %}{{translate("DISABLED")}}{% verbatim %} + {% endverbatim %}{{ translate("DISABLED") }}{% verbatim %} {{ else }} {{#ifx row.flag_verified '==' 0 }} - {% endverbatim %}{{translate("UNACTIVATED")}}{% verbatim %} + {% endverbatim %}{{ translate("UNACTIVATED") }}{% verbatim %} {{ else }} - {% endverbatim %}{{translate("ACTIVE")}}{% verbatim %} + {% endverbatim %}{{ translate("ACTIVE") }}{% verbatim %} {{/ifx }} {{/ifx }} @@ -93,44 +101,44 @@ -- cgit v1.2.3
    {{translate('USER')}} {{ translate('USER') }} {{translate("ACTIVITY.LAST")}} {{ translate("ACTIVITY.LAST") }} {{translate('PERMISSION.VIA_ROLES')}}{{ translate('PERMISSION.VIA_ROLES') }}{{translate("STATUS")}} {{translate("ACTIONS")}}{{ translate("STATUS") }} {{ translate("ACTIONS") }}
    - {% endverbatim %}{{translate("UNKNOWN")}}{% verbatim %} + {% endverbatim %}{{ translate("UNKNOWN") }}{% verbatim %}