diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 0cfa897132..86166555cf 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -10012,7 +10012,6 @@ ul.dropdown-menu.inner > li > a { } .details{ margin-top: 2rem; - padding: 1rem; } .details .user .avatar, .details .user .name, diff --git a/main/template/default/admin/user_information.tpl b/main/template/default/admin/user_information.tpl index 4023b964c6..17b953f70c 100644 --- a/main/template/default/admin/user_information.tpl +++ b/main/template/default/admin/user_information.tpl @@ -3,31 +3,7 @@
- {% set content %} -
-
- -
-
-

{{ user.complete_name }}

- -
-
-
-
{{ 'Tel'|get_lang }}
-
{{ user.phone == '' ? 'NoTel'|get_lang : user.phone }}
-
{{ 'OfficialCode'|get_lang }}
-
{{ user.official_code == '' ? 'NoOfficialCode'|get_lang : user.official_code }}
-
{{ 'OnLine'|get_lang }}
-
{{ user.user_is_online }}
-
{{ 'Status'|get_lang }}
-
{{ user.status }}
-
-
{{ user.created }}
-
-
- {% endset %} - {{ display.panel('',content,'') }} + {{ display.panel('', display.reporting_user_box(user), '') }}
diff --git a/main/template/default/macro/macro.tpl b/main/template/default/macro/macro.tpl index 82d137177e..2a0c99bd43 100644 --- a/main/template/default/macro/macro.tpl +++ b/main/template/default/macro/macro.tpl @@ -154,4 +154,64 @@
-{% endmacro %} \ No newline at end of file +{% endmacro %} + +{% macro reporting_user_details(user) %} +
+
+ {% if user.status %} +
{{ 'Status'|get_lang }}
+
{{ user.status }}
+ {% endif %} + +
{{ 'OfficialCode'|get_lang }}
+
{{ user.code == '' ? 'NoOfficialCode'|get_lang : user.code }}
+
{{ 'OnLine'|get_lang }}
+
+ {{ user.user_is_online }} + {{ user.online }} +
+
{{ 'Tel'|get_lang }}
+
{{ user.phone == '' ? 'NoTel'|get_lang : user.phone }}
+ + {% if user.timezone %} +
{{ 'Timezone'|get_lang }}
+
{{ user.timezone }}
+ {% endif %} +
+ + {% if user.created %} +
{{ user.created }}
+ {% endif %} + + {% if user.url_access or user.legal.url_send %} +
+ {{ user.url_access }} + {{ user.legal.url_send }} +
+ {% endif %} +
+{% endmacro %} + +{% macro reporting_user_box(user) %} + {% import _self as display %} + +
+
+ +
+
+

+ {% if user.complete_name_link %} + {{ user.complete_name_link }} + {% else %} + {{ user.complete_name }} + {% endif %} +

+ +
+ + {{ display.reporting_user_details(user) }} + +
+{% endmacro %} diff --git a/main/template/default/my_space/user_details.tpl b/main/template/default/my_space/user_details.tpl index baf33bb833..d40d532abd 100644 --- a/main/template/default/my_space/user_details.tpl +++ b/main/template/default/my_space/user_details.tpl @@ -25,24 +25,7 @@
-
-
-
-
{{ 'Tel'|get_lang }}
-
{{ user.phone == '' ? 'NoTel'|get_lang : user.phone }}
-
{{ 'OfficialCode'|get_lang }}
-
{{ user.code == '' ? 'NoOfficialCode'|get_lang : user.code }}
-
{{ 'OnLine'|get_lang }}
-
{{ user.online }}
-
{{ 'Timezone'|get_lang }}
-
{{ user.timezone }}
-
-
-
- {{ user.url_access }} - {{ user.legal.url_send }} -
-
+ {{ display.reporting_user_details(user) }}
{{ display.card_widget('FirstLoginInPlatform'|get_lang, user.first_connection, 'calendar') }} @@ -61,35 +44,7 @@
-
-
-
-
- -
-
-

{{ user.complete_name_link }}

- -
-
-
-
{{ 'Tel'|get_lang }}
-
{{ user.phone == '' ? 'NoTel'|get_lang : user.phone }}
-
{{ 'OfficialCode'|get_lang }}
-
{{ user.code == '' ? 'NoOfficialCode'|get_lang : user.code }}
-
{{ 'OnLine'|get_lang }}
-
{{ user.online }}
-
{{ 'Timezone'|get_lang }}
-
{{ user.timezone }}
-
-
-
- {{ user.url_access }} - {{ user.legal.url_send }} -
-
-
-
+ {{ display.panel('', display.reporting_user_box(user), '') }}