diff --git a/resources/views/admin/users/index.twig b/resources/views/admin/users/index.twig index 602c4dba48..cbe5832e92 100644 --- a/resources/views/admin/users/index.twig +++ b/resources/views/admin/users/index.twig @@ -14,47 +14,47 @@
| + | {{ trans('list.email') }} | -{{ trans('list.registered_at') }} | -{{ trans('list.registered_from') }} | -{{ trans('list.confirmed_from') }} | -{{ trans('list.is_admin') }} | -{{ trans('list.has_two_factor') }} | +{{ trans('list.registered_at') }} | +{{ trans('list.registered_from') }} | +{{ trans('list.confirmed_from') }} | +{{ trans('list.is_admin') }} | +{{ trans('list.has_two_factor') }} | {{ trans('list.is_activated') }} | {{ trans('list.is_blocked') }} | -{{ trans('list.blocked_code') }} | +{{ trans('list.blocked_code') }} | |||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| + | - | #{{ user.id }} | +#{{ user.id }} | {{ user.email }} | -+ | {{ user.created_at.formatLocalized(monthAndDayFormat) }} {{ user.created_at.format('H:i') }} | -+ | {{ Preferences.getForUser(user,"registration_ip_address").data }} | -+ | {{ Preferences.getForUser(user,"confirmation_ip_address").data }} | -+ | {% if user.isAdmin %} {% else %} {% endif %} | -+ | {% if user.has2FA %} {% else %} @@ -75,7 +75,7 @@ {% endif %} | -+ |
{% if user.blocked == 1 %}
{% if user.blocked_code == "" %}
diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twig
index 5730340721..e2ea0f42a8 100644
--- a/resources/views/bills/show.twig
+++ b/resources/views/bills/show.twig
@@ -105,7 +105,7 @@
{{ 'connected_journals'|_ }}
+
diff --git a/resources/views/list/journals-tasker.twig b/resources/views/list/journals-tasker.twig
index 1af28d1a5d..daa673cfb9 100644
--- a/resources/views/list/journals-tasker.twig
+++ b/resources/views/list/journals-tasker.twig
@@ -113,14 +113,14 @@
{% endfor %}
{% include 'list.journals-tasker' %}
| ||