- 
-
-
-
+
+{{ 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 59f87b0..f5465a0 100644
--- a/main/app/sprinkles/admin/templates/navigation/sidebar.html.twig
+++ b/main/app/sprinkles/admin/templates/navigation/sidebar.html.twig
@@ -1,10 +1,10 @@
-{% block sidebar_user %}
- {% include 'navigation/sidebar-user.html.twig' %}
-{% endblock %}
-
-{% block sidebar_menu %}
-
+{% block sidebar_user %}
+ {% include 'navigation/sidebar-user.html.twig' %}
+{% endblock %}
+
+{% block sidebar_menu %}
+
{% 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 8b40cd3..a844ce1 100644
--- a/main/app/sprinkles/admin/templates/navigation/user-card.html.twig
+++ b/main/app/sprinkles/admin/templates/navigation/user-card.html.twig
@@ -1,9 +1,9 @@
-{% extends "@account/navigation/user-card.html.twig" %}
-
-{% block userCard_menu %}
- {% if checkAccess('uri_dashboard') %}
- {{ translate("DASHBOARD") }}
- {% endif %}
- {{ parent() }}
+{% extends "@account/navigation/user-card.html.twig" %}
+
+{% block userCard_menu %}
+ {% if checkAccess('uri_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 0d2e0ef..b24c621 100644
--- a/main/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig
+++ b/main/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig
@@ -1,90 +1,90 @@
-{% extends "pages/abstract/base.html.twig" %}
-
-{% block stylesheets_page_group %}
-
- {{ assets.css('css/admin') | raw }}
-{% endblock %}
-
-{% block body_attributes %}
- {% if current_user.isMaster() %}
- class="hold-transition skin-red sidebar-mini"
- {% else %}
- class="hold-transition skin-{{ site.AdminLTE.skin }} sidebar-mini"
- {% endif %}
-{% endblock %}
-
-{% block content %}
- {# This needs to be here (early in the body) to make sure the animation doesn't fire #}
-
-
-
+
+
+
+
{{ current_user.first_name }} {{ current_user.last_name }}
+ {{ current_user.group.name }} +
-
-
-
- {% block navbar_logo %}
-
-
- {{ site.title }}
-
- {% endblock %}
-
-
-
-
-
-
-
-
-
-
-{% endblock %}
-
-{% block scripts_page_group %}
- {{ assets.js('js/admin') | raw }}
+{% extends "pages/abstract/base.html.twig" %}
+
+{% block stylesheets_page_group %}
+
+ {{ assets.css('css/admin') | raw }}
+{% endblock %}
+
+{% block body_attributes %}
+ {% if current_user.isMaster() %}
+ class="hold-transition skin-red sidebar-mini"
+ {% else %}
+ class="hold-transition skin-{{ site.AdminLTE.skin }} sidebar-mini"
+ {% endif %}
+{% endblock %}
+
+{% block content %}
+ {# This needs to be here (early in the body) to make sure the animation doesn't fire #}
+
+
+
-
- {% block content_header %}
-
-
- {% endblock %}
-
- {% block body_matter %}{% endblock %}
-
-
-
-
-
- {% block footer %}
- {% include "pages/partials/footer.html.twig" %}
- {% endblock %}
-
- {% 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 %} - -
+
+
+
+ {% block navbar_logo %}
+
+
+ {{ site.title }}
+
+ {% endblock %}
+
+
+
+
+
+
+
+
+
+
+{% endblock %}
+
+{% block scripts_page_group %}
+ {{ assets.js('js/admin') | raw }}
{% endblock %}
\ No newline at end of file
diff --git a/main/app/sprinkles/admin/templates/pages/activities.html.twig b/main/app/sprinkles/admin/templates/pages/activities.html.twig
index 7927601..c6bd007 100644
--- a/main/app/sprinkles/admin/templates/pages/activities.html.twig
+++ b/main/app/sprinkles/admin/templates/pages/activities.html.twig
@@ -1,45 +1,45 @@
-{% extends "pages/abstract/dashboard.html.twig" %}
-
-{% block stylesheets_page %}
-
- {{ assets.css('css/form-widgets') | raw }}
-{% endblock %}
-
-{# Overrides blocks in head of base template #}
-{% block page_title %}{{ translate("ACTIVITY", 2) }}{% endblock %}
-
-{% block page_description %}{{ translate("ACTIVITY.PAGE") }}.{% endblock %}
-
-{% block body_matter %}
-
+
+ {% block content_header %}
+
+
+ {% endblock %}
+
+ {% block body_matter %}{% endblock %}
+
+
+
+
+
+ {% block footer %}
+ {% include "pages/partials/footer.html.twig" %}
+ {% endblock %}
+
+ {% 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 scripts_page %}
-
-
-
-
- {{ assets.js('js/form-widgets') | raw }}
-
-
- {{ assets.js('js/pages/activities') | raw }}
-
-{% endblock %}
+{% extends "pages/abstract/dashboard.html.twig" %}
+
+{% block stylesheets_page %}
+
+ {{ assets.css('css/form-widgets') | raw }}
+{% endblock %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{ translate("ACTIVITY", 2) }}{% endblock %}
+
+{% block page_description %}{{ translate("ACTIVITY.PAGE") }}.{% endblock %}
+
+{% block body_matter %}
+
-
-
-
-
-
- {{ translate('ACTIVITY', 2) }}
- {% include "tables/table-tool-menu.html.twig" %} -
- {% include "tables/activities.html.twig" with {
- "table" : {
- "id" : "table-activities",
- "columns" : ["user"]
- }
- } %}
-
-
+
+{% endblock %}
+{% block scripts_page %}
+
+
+
+
+ {{ assets.js('js/form-widgets') | raw }}
+
+
+ {{ assets.js('js/pages/activities') | raw }}
+
+{% endblock %}
diff --git a/main/app/sprinkles/admin/templates/pages/dashboard.html.twig b/main/app/sprinkles/admin/templates/pages/dashboard.html.twig
index 461e13d..30ef280 100644
--- a/main/app/sprinkles/admin/templates/pages/dashboard.html.twig
+++ b/main/app/sprinkles/admin/templates/pages/dashboard.html.twig
@@ -1,284 +1,284 @@
-{% extends "pages/abstract/dashboard.html.twig" %}
-
-{# Overrides blocks in head of base template #}
-{% block page_title %}{{ translate("DASHBOARD") }}{% endblock %}
-{% block page_description %}{% endblock %}
-
-{% block body_matter %}
-
- {% if checkAccess('uri_users') %}
-
+
+
+
+
+
+ {{ translate('ACTIVITY', 2) }}
+ {% include "tables/table-tool-menu.html.twig" %} +
+ {% include "tables/activities.html.twig" with {
+ "table" : {
+ "id" : "table-activities",
+ "columns" : ["user"]
+ }
+ } %}
+
+
-
-
-
-
-
-
-
-
-
-
-
- {% elseif checkAccess('uri_group', {
- 'group': current_user.group
- }) %}
-
-
-
- {% endif %}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ current_user.group.name }}
-
-
-
-
-
-
-
-
- {{ translate("USER", 2) }}
- {{ current_user.group.users.count }}
-
-
-
- {% if checkAccess('uri_users') or checkAccess('view_system_info') %}
-
-
-{% endblock %}
-
-{% block scripts_page %}
-
-
-
-
- {{ assets.js('js/pages/dashboard') | raw }}
-
+{% extends "pages/abstract/dashboard.html.twig" %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{ translate("DASHBOARD") }}{% endblock %}
+{% block page_description %}{% endblock %}
+
+{% block body_matter %}
+
+ {% if checkAccess('uri_users') %}
+
- {% if checkAccess('uri_users') %}
-
-
- {% endif %}
-
- {% if checkAccess('uri_activities') %}
-
-
-
- {% endif %}
-
- {% if checkAccess('view_system_info') %}
-
-
-
-
-
-
-
-
-
-
- {{ translate("USER.LATEST") }}
-
-
-
-
-
- -
- {% for user in users %}
-
-
-
- {{ user.first_name }} {{ user.last_name }} - {{ user.registered }} -
- {% endfor %}
-
-
-
- {% endif %}
-
-
-
-
-
-
-
-
-
- {{ translate("SYSTEM_INFO") }}
-
-
-
-
-
- -
-
- {{ translate("SYSTEM_INFO.UF_VERSION") }} -
- {{ info.version.UF }} - -
- {{ translate("SYSTEM_INFO.PHP_VERSION") }} -
- {{ info.version.php }} - -
- {{ 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_NAME") }} -
- {{ info.database.name }} - -
- {{ translate("SYSTEM_INFO.DIRECTORY") }} -
- {{ info.path.project }} - -
- {{ translate("SYSTEM_INFO.URL") }} -
- {{ site.uri.public }} - -
- {{ translate("SYSTEM_INFO.SPRINKLES") }} -
-
-
-
- {% for sprinkle in sprinkles %}
-
- - {{ sprinkle }} - - {% endfor %} -
-
-
- {% elseif checkAccess('view_group_field', {
- 'group': current_user.group,
- 'property': 'users'
- }) %}
-
-
-
-
- {{ translate('ACTIVITY', 2) }}
- {% include "tables/table-tool-menu.html.twig" %} -
- {% include "tables/activities.html.twig" with {
- "table" : {
- "id" : "table-activities",
- "columns" : ["user"]
- }
- } %}
-
-
-
- {% else %}
-
-
-
-
- {{ translate('USER', 2) }}
- {% include "tables/table-tool-menu.html.twig" %} -
- {% include "tables/users.html.twig" with {
- "table" : {
- "id" : "table-group-users"
- }
- } %}
-
-
-
-
-
- {% endif %}
-
-
-
-
-
-
-
-
-  }})
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {% elseif checkAccess('uri_group', {
+ 'group': current_user.group
+ }) %}
+
+
+
+ {% endif %}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ current_user.group.name }}
+
+
+
+
+
+
+
+
+ {{ translate("USER", 2) }}
+ {{ current_user.group.users.count }}
+
+
+
+ {% if checkAccess('uri_users') or checkAccess('view_system_info') %}
+
+
+{% endblock %}
+
+{% block scripts_page %}
+
+
+
+
+ {{ assets.js('js/pages/dashboard') | raw }}
+
{% endblock %}
\ No newline at end of file
diff --git a/main/app/sprinkles/admin/templates/pages/group.html.twig b/main/app/sprinkles/admin/templates/pages/group.html.twig
index bab5b13..204f66e 100644
--- a/main/app/sprinkles/admin/templates/pages/group.html.twig
+++ b/main/app/sprinkles/admin/templates/pages/group.html.twig
@@ -1,107 +1,107 @@
-{% extends "pages/abstract/dashboard.html.twig" %}
-
-{% block stylesheets_page %}
-
- {{ assets.css('css/form-widgets') | raw }}
-{% endblock %}
-
-{# Overrides blocks in head of base template #}
-{% block page_title %}{{ translate("GROUP", 2) }} | {{ group.name }}{% endblock %}
-
-{% block page_description %}{{ translate("GROUP.INFO_PAGE", {name: group.name}) }}{% endblock %}
-
-{% block body_matter %}
-
+ {% if checkAccess('uri_users') %}
+
+
+ {% endif %}
+
+ {% if checkAccess('uri_activities') %}
+
+
+
+ {% endif %}
+
+ {% if checkAccess('view_system_info') %}
+
+
+
+
+
+
+
+
+
+
+ {{ translate("USER.LATEST") }}
+
+
+
+
+
+ -
+ {% for user in users %}
+
-
+
+ {% endfor %}
+
+
+
+ {% endif %}
+
+
+
+
+
+
+
+
+
+ {{ translate("SYSTEM_INFO") }}
+
+
+
+
+
+ -
+
- {{ translate("SYSTEM_INFO.UF_VERSION") }} +
- {{ info.version.UF }} + +
- {{ translate("SYSTEM_INFO.PHP_VERSION") }} +
- {{ info.version.php }} + +
- {{ 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_NAME") }} +
- {{ info.database.name }} + +
- {{ translate("SYSTEM_INFO.DIRECTORY") }} +
- {{ info.path.project }} + +
- {{ translate("SYSTEM_INFO.URL") }} +
- {{ site.uri.public }} + +
- {{ translate("SYSTEM_INFO.SPRINKLES") }} +
-
+
-
+ {% for sprinkle in sprinkles %}
+
- + {{ sprinkle }} + + {% endfor %} +
+
+
+ {% elseif checkAccess('view_group_field', {
+ 'group': current_user.group,
+ 'property': 'users'
+ }) %}
+
+
+
+
+ {{ translate('ACTIVITY', 2) }}
+ {% include "tables/table-tool-menu.html.twig" %} +
+ {% include "tables/activities.html.twig" with {
+ "table" : {
+ "id" : "table-activities",
+ "columns" : ["user"]
+ }
+ } %}
+
+
+
+ {% else %}
+
+
+
+
+ {{ translate('USER', 2) }}
+ {% include "tables/table-tool-menu.html.twig" %} +
+ {% include "tables/users.html.twig" with {
+ "table" : {
+ "id" : "table-group-users"
+ }
+ } %}
+
+
+
+
+
+ {% endif %}
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-{% endblock %}
-{% block scripts_page %}
-
-
-
-
- {{ assets.js('js/form-widgets') | raw }}
-
-
- {{ assets.js('js/pages/group') | raw }}
-{% endblock %}
+{% extends "pages/abstract/dashboard.html.twig" %}
+
+{% block stylesheets_page %}
+
+ {{ assets.css('css/form-widgets') | raw }}
+{% endblock %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{ translate("GROUP", 2) }} | {{ group.name }}{% endblock %}
+
+{% block page_description %}{{ translate("GROUP.INFO_PAGE", {name: group.name}) }}{% endblock %}
+
+{% block body_matter %}
+
-
-
-
-
-
- {{ translate('GROUP.SUMMARY') }}
- {% if 'tools' not in tools.hidden %} -
-
- {% endif %}
-
-
-
-
-
-
- {{ translate('USER', 2) }} -
-
-
-
-
- {{ group.name }}
- - {% if 'description' not in fields.hidden %} -- {{ group.description }} -
- {% endif %} - {% if 'users' not in fields.hidden %} -- {{ translate('USER', 2) }} -
- {{ group.users.count }} -
- {% endif %} - {% block group_profile %}{% endblock %} -
-
-
-
-
-
- {{ translate('USER', 2) }}
- {% include "tables/table-tool-menu.html.twig" %} -
- {% include "tables/users.html.twig" with {
- "table" : {
- "id" : "table-group-users"
- }
- } %}
-
-
+
+{% endblock %}
+{% block scripts_page %}
+
+
+
+
+ {{ assets.js('js/form-widgets') | raw }}
+
+
+ {{ assets.js('js/pages/group') | raw }}
+{% endblock %}
diff --git a/main/app/sprinkles/admin/templates/pages/groups.html.twig b/main/app/sprinkles/admin/templates/pages/groups.html.twig
index 43b0618..014c678 100644
--- a/main/app/sprinkles/admin/templates/pages/groups.html.twig
+++ b/main/app/sprinkles/admin/templates/pages/groups.html.twig
@@ -1,51 +1,51 @@
-{% extends "pages/abstract/dashboard.html.twig" %}
-
-{% block stylesheets_page %}
-
- {{ assets.css('css/form-widgets') | raw }}
-{% endblock %}
-
-{# Overrides blocks in head of base template #}
-{% block page_title %}{{ translate("GROUP", 2) }}{% endblock %}
-
-{% block page_description %}{{ translate("GROUP.PAGE_DESCRIPTION") }}{% endblock %}
-
-{% block body_matter %}
-
+
+
+
+
+
+ {{ translate('GROUP.SUMMARY') }}
+ {% if 'tools' not in tools.hidden %} +
+
+ {% endif %}
+
+
+
+
+
+
+ {{ translate('USER', 2) }} +
+
+
+
+
+ {{ group.name }}
+ + {% if 'description' not in fields.hidden %} ++ {{ group.description }} +
+ {% endif %} + {% if 'users' not in fields.hidden %} ++ {{ translate('USER', 2) }} +
+ {{ group.users.count }} +
+ {% endif %} + {% block group_profile %}{% endblock %} +
+
+
+
+
+
+ {{ translate('USER', 2) }}
+ {% include "tables/table-tool-menu.html.twig" %} +
+ {% include "tables/users.html.twig" with {
+ "table" : {
+ "id" : "table-group-users"
+ }
+ } %}
+
+
-
-{% endblock %}
-{% block scripts_page %}
-
-
-
-
- {{ assets.js('js/form-widgets') | raw }}
-
-
- {{ assets.js('js/pages/groups') | raw }}
-
-{% endblock %}
+{% extends "pages/abstract/dashboard.html.twig" %}
+
+{% block stylesheets_page %}
+
+ {{ assets.css('css/form-widgets') | raw }}
+{% endblock %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{ translate("GROUP", 2) }}{% endblock %}
+
+{% block page_description %}{{ translate("GROUP.PAGE_DESCRIPTION") }}{% endblock %}
+
+{% block body_matter %}
+
-
-
-
-
-
- {{ translate('GROUP', 2) }}
- {% include "tables/table-tool-menu.html.twig" %} -
- {% include "tables/groups.html.twig" with {
- "table" : {
- "id" : "table-groups"
- }
- } %}
-
- {% if checkAccess('create_group') %}
-
- {% endif %}
-
+
+{% endblock %}
+{% block scripts_page %}
+
+
+
+
+ {{ assets.js('js/form-widgets') | raw }}
+
+
+ {{ assets.js('js/pages/groups') | raw }}
+
+{% endblock %}
diff --git a/main/app/sprinkles/admin/templates/pages/permission.html.twig b/main/app/sprinkles/admin/templates/pages/permission.html.twig
index 004131e..2b1ae3e 100644
--- a/main/app/sprinkles/admin/templates/pages/permission.html.twig
+++ b/main/app/sprinkles/admin/templates/pages/permission.html.twig
@@ -1,91 +1,91 @@
-{% extends "pages/abstract/dashboard.html.twig" %}
-
-{% block stylesheets_page %}
-
- {{ assets.css('css/form-widgets') | raw }}
-{% endblock %}
-
-{# Overrides blocks in head of base template #}
-{% block page_title %}{{ translate("PERMISSION", 2) }} | {{ permission.name }}{% endblock %}
-
-{% block page_description %}{{ translate("PERMISSION.INFO_PAGE", {name: permission.name}) }}{% endblock %}
-
-{% block body_matter %}
-
+
+
+
+
+
+ {{ translate('GROUP', 2) }}
+ {% include "tables/table-tool-menu.html.twig" %} +
+ {% include "tables/groups.html.twig" with {
+ "table" : {
+ "id" : "table-groups"
+ }
+ } %}
+
+ {% if checkAccess('create_group') %}
+
+ {% endif %}
+
-
-{% endblock %}
-{% block scripts_page %}
-
-
-
-
- {{ assets.js('js/form-widgets') | raw }}
-
-
- {{ assets.js('js/pages/permission') | raw }}
-{% endblock %}
+{% extends "pages/abstract/dashboard.html.twig" %}
+
+{% block stylesheets_page %}
+
+ {{ assets.css('css/form-widgets') | raw }}
+{% endblock %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{ translate("PERMISSION", 2) }} | {{ permission.name }}{% endblock %}
+
+{% block page_description %}{{ translate("PERMISSION.INFO_PAGE", {name: permission.name}) }}{% endblock %}
+
+{% block body_matter %}
+
-
-
-
-
-
- {{ translate("PERMISSION.SUMMARY") }}
-
-
- {{ translate("PERMISSION.ID") }}: - - {{ permission.id }} - - -
- {{ translate("SLUG_CONDITION") }} -
-
-
-
-
-
-
-
- {{ permission.name }}
- -- {{ permission.description }} -
-- {{ translate("PERMISSION.ID") }}: - - {{ permission.id }} - - -
- {{ translate("SLUG_CONDITION") }} -
-
-
- {{ permission.slug }}
-
- ↳
- {{ permission.conditions }}
-
-
-
-
-
-
- {{ 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"]
- }
- } %}
-
-
+
+{% endblock %}
+{% block scripts_page %}
+
+
+
+
+ {{ assets.js('js/form-widgets') | raw }}
+
+
+ {{ assets.js('js/pages/permission') | raw }}
+{% endblock %}
diff --git a/main/app/sprinkles/admin/templates/pages/permissions.html.twig b/main/app/sprinkles/admin/templates/pages/permissions.html.twig
index 5cf95da..099aa39 100644
--- a/main/app/sprinkles/admin/templates/pages/permissions.html.twig
+++ b/main/app/sprinkles/admin/templates/pages/permissions.html.twig
@@ -1,45 +1,45 @@
-{% extends "pages/abstract/dashboard.html.twig" %}
-
-{% block stylesheets_page %}
-
- {{ assets.css('css/form-widgets') | raw }}
-{% endblock %}
-
-{# Overrides blocks in head of base template #}
-{% block page_title %}{{ translate("PERMISSION", 2) }}{% endblock %}
-
-{% block page_description %}{{ translate("PERMISSION.PAGE_DESCRIPTION") }}{% endblock %}
-
-{% block body_matter %}
-
+
+
+
+
+
+ {{ translate("PERMISSION.SUMMARY") }}
+
+
+ {{ translate("PERMISSION.ID") }}: + + {{ permission.id }} + + +
+ {{ translate("SLUG_CONDITION") }} +
+
+
+
+
+
+
+
+ {{ permission.name }}
+ ++ {{ permission.description }} +
++ {{ translate("PERMISSION.ID") }}: + + {{ permission.id }} + + +
+ {{ translate("SLUG_CONDITION") }} +
+
+
+ {{ permission.slug }}
+
+ ↳
+ {{ permission.conditions }}
+
+
+
+
+
+
+ {{ 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"]
+ }
+ } %}
+
+
-
-{% endblock %}
-{% block scripts_page %}
-
-
-
-
- {{ assets.js('js/form-widgets') | raw }}
-
-
- {{ assets.js('js/pages/permissions') | raw }}
-
-{% endblock %}
+{% extends "pages/abstract/dashboard.html.twig" %}
+
+{% block stylesheets_page %}
+
+ {{ assets.css('css/form-widgets') | raw }}
+{% endblock %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{ translate("PERMISSION", 2) }}{% endblock %}
+
+{% block page_description %}{{ translate("PERMISSION.PAGE_DESCRIPTION") }}{% endblock %}
+
+{% block body_matter %}
+
-
-
-
-
-
- {{ translate('PERMISSION', 2) }} -
- {% include "tables/table-tool-menu.html.twig" %} -
- {% include "tables/permissions.html.twig" with {
- "table" : {
- "id" : "table-permissions"
- }
- } %}
-
-
+
+{% endblock %}
+{% block scripts_page %}
+
+
+
+
+ {{ assets.js('js/form-widgets') | raw }}
+
+
+ {{ assets.js('js/pages/permissions') | raw }}
+
+{% endblock %}
diff --git a/main/app/sprinkles/admin/templates/pages/role.html.twig b/main/app/sprinkles/admin/templates/pages/role.html.twig
index 1892d32..31a9f8a 100644
--- a/main/app/sprinkles/admin/templates/pages/role.html.twig
+++ b/main/app/sprinkles/admin/templates/pages/role.html.twig
@@ -1,129 +1,129 @@
-{% extends "pages/abstract/dashboard.html.twig" %}
-
-{% block stylesheets_page %}
-
- {{ assets.css('css/form-widgets') | raw }}
-{% endblock %}
-
-{# Overrides blocks in head of base template #}
-{% block page_title %}{{ translate("ROLE", 2) }} | {{ role.name }}{% endblock %}
-
-{% block page_description %}{{ translate("ROLE.INFO_PAGE", {name: role.name}) }}{% endblock %}
-
-{% block body_matter %}
-
+
+
+
+
+
+ {{ translate('PERMISSION', 2) }} +
+ {% include "tables/table-tool-menu.html.twig" %} +
+ {% include "tables/permissions.html.twig" with {
+ "table" : {
+ "id" : "table-permissions"
+ }
+ } %}
+
+
-
-{% endblock %}
-{% block scripts_page %}
-
-
-
-
- {{ assets.js('js/form-widgets') | raw }}
-
-
- {{ assets.js('js/pages/role') | raw }}
-{% endblock %}
+{% extends "pages/abstract/dashboard.html.twig" %}
+
+{% block stylesheets_page %}
+
+ {{ assets.css('css/form-widgets') | raw }}
+{% endblock %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{ translate("ROLE", 2) }} | {{ role.name }}{% endblock %}
+
+{% block page_description %}{{ translate("ROLE.INFO_PAGE", {name: role.name}) }}{% endblock %}
+
+{% block body_matter %}
+
-
-
-
-
-
- {{ translate('ROLE.SUMMARY') }}
- {% if 'tools' not in tools.hidden %} -
-
- {% endif %}
-
-
-
-
-
-
- {{ translate('USER', 2) }} -
-
-
-
-
- {{ role.name }}
- - {% if 'description' not in fields.hidden %} -- {{ role.description }} -
- {% endif %} - {% if 'users' not in fields.hidden %} -- {{ translate('USER', 2) }} -
- {{ role.users.count }} -
- {% endif %} -
-
-
-
-
-
- {{ translate('PERMISSION', 2) }}
- {% include "tables/table-tool-menu.html.twig" %} -
- {% include "tables/permissions.html.twig" with {
- "table" : {
- "id" : "table-role-permissions"
- }
- } %}
-
-
-
-
-
-
-
- {{ translate('USER', 2) }}
- {% include "tables/table-tool-menu.html.twig" %} -
- {% include "tables/users.html.twig" with {
- "table" : {
- "id" : "table-role-users",
- "columns" : ["last_activity"]
- }
- } %}
-
-
+
+{% endblock %}
+{% block scripts_page %}
+
+
+
+
+ {{ assets.js('js/form-widgets') | raw }}
+
+
+ {{ assets.js('js/pages/role') | raw }}
+{% endblock %}
diff --git a/main/app/sprinkles/admin/templates/pages/roles.html.twig b/main/app/sprinkles/admin/templates/pages/roles.html.twig
index 2677f87..a535a11 100644
--- a/main/app/sprinkles/admin/templates/pages/roles.html.twig
+++ b/main/app/sprinkles/admin/templates/pages/roles.html.twig
@@ -1,49 +1,49 @@
-{% extends "pages/abstract/dashboard.html.twig" %}
-
-{% block stylesheets_page %}
-
- {{ assets.css('css/form-widgets') | raw }}
-{% endblock %}
-
-{# Overrides blocks in head of base template #}
-{% block page_title %}{{ translate("ROLE", 2) }}{% endblock %}
-
-{% block page_description %}{{ translate("ROLE.PAGE_DESCRIPTION") }}{% endblock %}
-
-{% block body_matter %}
-
+
+
+
+
+
+ {{ translate('ROLE.SUMMARY') }}
+ {% if 'tools' not in tools.hidden %} +
+
+ {% endif %}
+
+
+
+
+
+
+ {{ translate('USER', 2) }} +
+
+
+
+
+ {{ role.name }}
+ + {% if 'description' not in fields.hidden %} ++ {{ role.description }} +
+ {% endif %} + {% if 'users' not in fields.hidden %} ++ {{ translate('USER', 2) }} +
+ {{ role.users.count }} +
+ {% endif %} +
+
+
+
+
+
+ {{ translate('PERMISSION', 2) }}
+ {% include "tables/table-tool-menu.html.twig" %} +
+ {% include "tables/permissions.html.twig" with {
+ "table" : {
+ "id" : "table-role-permissions"
+ }
+ } %}
+
+
+
+
+
+
+
+ {{ translate('USER', 2) }}
+ {% include "tables/table-tool-menu.html.twig" %} +
+ {% include "tables/users.html.twig" with {
+ "table" : {
+ "id" : "table-role-users",
+ "columns" : ["last_activity"]
+ }
+ } %}
+
+
-
-{% endblock %}
-{% block scripts_page %}
-
-
-
-
- {{ assets.js('js/form-widgets') | raw }}
-
-
- {{ assets.js('js/pages/roles') | raw }}
-
-{% endblock %}
+{% extends "pages/abstract/dashboard.html.twig" %}
+
+{% block stylesheets_page %}
+
+ {{ assets.css('css/form-widgets') | raw }}
+{% endblock %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{ translate("ROLE", 2) }}{% endblock %}
+
+{% block page_description %}{{ translate("ROLE.PAGE_DESCRIPTION") }}{% endblock %}
+
+{% block body_matter %}
+
-
-
-
-
-
- {{ translate('ROLE', 2) }}
- {% include "tables/table-tool-menu.html.twig" %} -
- {% include "tables/roles.html.twig" with {
- "table" : {
- "id" : "table-roles"
- }
- } %}
-
-
-
+
+{% endblock %}
+{% block scripts_page %}
+
+
+
+
+ {{ assets.js('js/form-widgets') | raw }}
+
+
+ {{ assets.js('js/pages/roles') | raw }}
+
+{% endblock %}
diff --git a/main/app/sprinkles/admin/templates/pages/user.html.twig b/main/app/sprinkles/admin/templates/pages/user.html.twig
index 47228fd..37675d7 100644
--- a/main/app/sprinkles/admin/templates/pages/user.html.twig
+++ b/main/app/sprinkles/admin/templates/pages/user.html.twig
@@ -1,208 +1,208 @@
-{% extends "pages/abstract/dashboard.html.twig" %}
-
-{% block stylesheets_page %}
-
- {{ assets.css('css/form-widgets') | raw }}
-{% endblock %}
-
-{# Overrides blocks in head of base template #}
-{% block page_title %}{{ translate("USER", 2) }} | {{ user.full_name }}{% endblock %}
-
-{% block page_description %}{{ translate("USER.INFO_PAGE", {name: user.user_name}) }}{% endblock %}
-
-{% block body_matter %}
- {% block group_box %}
- {% endblock %}
-
+
+
+
+
+
+ {{ translate('ROLE', 2) }}
+ {% include "tables/table-tool-menu.html.twig" %} +
+ {% include "tables/roles.html.twig" with {
+ "table" : {
+ "id" : "table-roles"
+ }
+ } %}
+
+
+
-
- {% if 'permissions' not in widgets.hidden %}
-
-
- {% if 'activities' not in widgets.hidden %}
-
- {% block user_box %}
-
-
-
- {% endblock %}
-
-
- {{ translate('USER.SUMMARY') }}
- {% if 'tools' not in tools.hidden %} -
-
- {% endif %}
-
-
-
-
-
-
-
-
- {{ translate("EMAIL") }} -
- {{ translate("LOCALE") }} -
- {{ translate("ROLE", 2) }} - -
- {{ 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 %}
- - {% if 'email' not in fields.hidden %} -- {{ translate("EMAIL") }} -
- - {{ user.email }} -
- {% endif %} - - {% if 'locale' not in fields.hidden %} -- {{ translate("LOCALE") }} -
- {{ locales[user.locale] }} -
- {% endif %} - - {% block user_profile %}{% endblock %} - - {% if 'roles' not in fields.hidden %} -- {{ translate("ROLE", 2) }} - -
- {% for role in user.roles %} - {{ role.name }} - {% endfor %} -
- {% endif %} -
- {% block activity_box %}
-
- {% endif %}
-
-
- {% endblock %}
-
-
- {{ translate('ACTIVITY', 2) }}
- {% include "tables/table-tool-menu.html.twig" %} -
- {% include "tables/activities.html.twig" with {
- "table" : {
- "id" : "table-user-activities"
- }
- } %}
-
-
-
- {% endif %}
-{% endblock %}
-{% block scripts_page %}
-
-
-
-
- {{ assets.js('js/form-widgets') | raw }}
-
-
- {{ assets.js('js/pages/user') | raw }}
-{% endblock %}
+{% extends "pages/abstract/dashboard.html.twig" %}
+
+{% block stylesheets_page %}
+
+ {{ assets.css('css/form-widgets') | raw }}
+{% endblock %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{ translate("USER", 2) }} | {{ user.full_name }}{% endblock %}
+
+{% block page_description %}{{ translate("USER.INFO_PAGE", {name: user.user_name}) }}{% endblock %}
+
+{% block body_matter %}
+ {% block group_box %}
+ {% endblock %}
+
-
-
-
-
-
- {{ translate('PERMISSION', 2) }} -
- {% include "tables/table-tool-menu.html.twig" %} -
- {% include "tables/permissions.html.twig" with {
- "table" : {
- "id" : "table-permissions",
- "columns" : ["via_roles"]
- }
- } %}
-
-
+
+ {% if 'permissions' not in widgets.hidden %}
+
+
+ {% if 'activities' not in widgets.hidden %}
+
+ {% block user_box %}
+
+
+
+ {% endblock %}
+
+
+ {{ translate('USER.SUMMARY') }}
+ {% if 'tools' not in tools.hidden %} +
+
+ {% endif %}
+
+
+
+
+
+
+
+
+ {{ translate("EMAIL") }} +
+ {{ translate("LOCALE") }} +
+ {{ translate("ROLE", 2) }} + +
+ {{ 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 %}
+ + {% if 'email' not in fields.hidden %} ++ {{ translate("EMAIL") }} +
+ + {{ user.email }} +
+ {% endif %} + + {% if 'locale' not in fields.hidden %} ++ {{ translate("LOCALE") }} +
+ {{ locales[user.locale] }} +
+ {% endif %} + + {% block user_profile %}{% endblock %} + + {% if 'roles' not in fields.hidden %} ++ {{ translate("ROLE", 2) }} + +
+ {% for role in user.roles %} + {{ role.name }} + {% endfor %} +
+ {% endif %} +
+ {% block activity_box %}
+
+ {% endif %}
+
+
+ {% endblock %}
+
+
+ {{ translate('ACTIVITY', 2) }}
+ {% include "tables/table-tool-menu.html.twig" %} +
+ {% include "tables/activities.html.twig" with {
+ "table" : {
+ "id" : "table-user-activities"
+ }
+ } %}
+
+
+
+ {% endif %}
+{% endblock %}
+{% block scripts_page %}
+
+
+
+
+ {{ assets.js('js/form-widgets') | raw }}
+
+
+ {{ assets.js('js/pages/user') | raw }}
+{% endblock %}
diff --git a/main/app/sprinkles/admin/templates/pages/users.html.twig b/main/app/sprinkles/admin/templates/pages/users.html.twig
index cbd86f4..5aacfc2 100644
--- a/main/app/sprinkles/admin/templates/pages/users.html.twig
+++ b/main/app/sprinkles/admin/templates/pages/users.html.twig
@@ -1,52 +1,52 @@
-{% extends "pages/abstract/dashboard.html.twig" %}
-
-{% block stylesheets_page %}
-
- {{ assets.css('css/form-widgets') | raw }}
-{% endblock %}
-
-{# Overrides blocks in head of base template #}
-{% block page_title %}{{ translate("USER", 2) }}{% endblock %}
-
-{% block page_description %}{{ translate("USER.PAGE_DESCRIPTION") }}{% endblock %}
-
-{% block body_matter %}
-
+
+
+
+
+
+ {{ translate('PERMISSION', 2) }} +
+ {% include "tables/table-tool-menu.html.twig" %} +
+ {% include "tables/permissions.html.twig" with {
+ "table" : {
+ "id" : "table-permissions",
+ "columns" : ["via_roles"]
+ }
+ } %}
+
+
-
-{% endblock %}
-{% block scripts_page %}
-
-
-
-
- {{ assets.js('js/form-widgets') | raw }}
-
-
- {{ assets.js('js/pages/users') | raw }}
-
-{% endblock %}
+{% extends "pages/abstract/dashboard.html.twig" %}
+
+{% block stylesheets_page %}
+
+ {{ assets.css('css/form-widgets') | raw }}
+{% endblock %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{ translate("USER", 2) }}{% endblock %}
+
+{% block page_description %}{{ translate("USER.PAGE_DESCRIPTION") }}{% endblock %}
+
+{% block body_matter %}
+
-
-
-
-
-
- {{ translate('USER', 2) }}
- {% include "tables/table-tool-menu.html.twig" %} -
- {% include "tables/users.html.twig" with {
- "table" : {
- "id" : "table-users",
- "columns" : ["last_activity"]
- }
- } %}
-
- {% if checkAccess('create_user') %}
-
- {% endif %}
-
+
+{% endblock %}
+{% block scripts_page %}
+
+
+
+
+ {{ assets.js('js/form-widgets') | raw }}
+
+
+ {{ assets.js('js/pages/users') | raw }}
+
+{% endblock %}
diff --git a/main/app/sprinkles/admin/templates/tables/activities.html.twig b/main/app/sprinkles/admin/templates/tables/activities.html.twig
index dce1d99..0da5601 100644
--- a/main/app/sprinkles/admin/templates/tables/activities.html.twig
+++ b/main/app/sprinkles/admin/templates/tables/activities.html.twig
@@ -1,80 +1,80 @@
-{# This partial template renders a table of user activities, to be populated with rows via an AJAX request.
- # This extends a generic template for paginated tables.
- #
- # Note that this template contains a "skeleton" table with an empty table body, and then a block of Handlebars templates which are used
- # to render the table cells with the data from the AJAX request.
-#}
-
-{% extends "tables/table-paginated.html.twig" %}
-
-{% block table %}
-
+
+
+
+
+
+ {{ translate('USER', 2) }}
+ {% include "tables/table-tool-menu.html.twig" %} +
+ {% include "tables/users.html.twig" with {
+ "table" : {
+ "id" : "table-users",
+ "columns" : ["last_activity"]
+ }
+ } %}
+
+ {% if checkAccess('create_user') %}
+
+ {% endif %}
+ | {{ translate('ACTIVITY.TIME') }} | - {% if 'user' in table.columns %} -{{ translate('USER') }} | - {% endif %} -{{ translate("DESCRIPTION") }} | -
|---|
| {{ translate('ACTIVITY.TIME') }} | + {% if 'user' in table.columns %} +{{ translate('USER') }} | + {% endif %} +{{ translate("DESCRIPTION") }} | +
|---|
| {{ translate('GROUP') }} | -{{ translate("DESCRIPTION") }} | -{{ translate("ACTIONS") }} | -
|---|
| {{ translate('GROUP') }} | +{{ translate("DESCRIPTION") }} | +{{ translate("ACTIONS") }} | +
|---|
| {{ translate('PERMISSION') }} | -{{ translate('SLUG_CONDITION') }} | - {% if 'via_roles' in table.columns %} -{{ translate('PERMISSION.VIA_ROLES') }} | - {% endif %} -
|---|
| {{ translate('PERMISSION') }} | +{{ translate('SLUG_CONDITION') }} | + {% if 'via_roles' in table.columns %} +{{ translate('PERMISSION.VIA_ROLES') }} | + {% endif %} +
|---|
| {{ translate('ROLE') }} | -{{ translate('DESCRIPTION') }} | -{{ translate('ACTIONS') }} | -
|---|
| {{ translate('ROLE') }} | +{{ translate('DESCRIPTION') }} | +{{ translate('ACTIONS') }} | +
|---|
| {{ translate('USER') }} | - {% if 'last_activity' in table.columns %} -{{ translate("ACTIVITY.LAST") }} | - {% endif %} - {% if 'via_roles' in table.columns %} -{{ translate('PERMISSION.VIA_ROLES') }} | - {% endif %} -{{ translate("STATUS") }} | -{{ translate("ACTIONS") }} | -
|---|
| {{ translate('USER') }} | + {% if 'last_activity' in table.columns %} +{{ translate("ACTIVITY.LAST") }} | + {% endif %} + {% if 'via_roles' in table.columns %} +{{ translate('PERMISSION.VIA_ROLES') }} | + {% endif %} +{{ translate("STATUS") }} | +{{ translate("ACTIONS") }} | +
|---|