Template: Create macro for user details in reporting - refs BT#15617

pull/2901/head
Angel Fernando Quiroz Campos 7 years ago
parent e4143df0ca
commit 4e74c84af8
  1. 1
      app/Resources/public/css/base.css
  2. 26
      main/template/default/admin/user_information.tpl
  3. 62
      main/template/default/macro/macro.tpl
  4. 49
      main/template/default/my_space/user_details.tpl

@ -10012,7 +10012,6 @@ ul.dropdown-menu.inner > li > a {
}
.details{
margin-top: 2rem;
padding: 1rem;
}
.details .user .avatar,
.details .user .name,

@ -3,31 +3,7 @@
<div class="details">
<div class="row">
<div class="col-md-4">
{% set content %}
<div class="user">
<div class="avatar">
<img width="128px" src="{{ user.avatar }}" class="img-responsive">
</div>
<div class="name">
<h3>{{ user.complete_name }}</h3>
<p class="email">{{ user.email }}</p>
</div>
<div class="parameters">
<dl class="dl-horizontal">
<dt>{{ 'Tel'|get_lang }}</dt>
<dd>{{ user.phone == '' ? 'NoTel'|get_lang : user.phone }}</dd>
<dt>{{ 'OfficialCode'|get_lang }}</dt>
<dd>{{ user.official_code == '' ? 'NoOfficialCode'|get_lang : user.official_code }}</dd>
<dt>{{ 'OnLine'|get_lang }}</dt>
<dd>{{ user.user_is_online }}</dd>
<dt>{{ 'Status'|get_lang }}</dt>
<dd>{{ user.status }}</dd>
</dl>
<div class="create">{{ user.created }}</div>
</div>
</div>
{% endset %}
{{ display.panel('',content,'') }}
{{ display.panel('', display.reporting_user_box(user), '') }}
</div>
<div class="col-md-8">
<div class="list-card">

@ -154,4 +154,64 @@
</div>
</div>
</div>
{% endmacro %}
{% endmacro %}
{% macro reporting_user_details(user) %}
<div class="parameters">
<dl class="dl-horizontal">
{% if user.status %}
<dt>{{ 'Status'|get_lang }}</dt>
<dd>{{ user.status }}</dd>
{% endif %}
<dt>{{ 'OfficialCode'|get_lang }}</dt>
<dd>{{ user.code == '' ? 'NoOfficialCode'|get_lang : user.code }}</dd>
<dt>{{ 'OnLine'|get_lang }}</dt>
<dd>
{{ user.user_is_online }}
{{ user.online }}
</dd>
<dt>{{ 'Tel'|get_lang }}</dt>
<dd>{{ user.phone == '' ? 'NoTel'|get_lang : user.phone }}</dd>
{% if user.timezone %}
<dt>{{ 'Timezone'|get_lang }}</dt>
<dd>{{ user.timezone }}</dd>
{% endif %}
</dl>
{% if user.created %}
<div class="create">{{ user.created }}</div>
{% endif %}
{% if user.url_access or user.legal.url_send %}
<div class="access">
{{ user.url_access }}
{{ user.legal.url_send }}
</div>
{% endif %}
</div>
{% endmacro %}
{% macro reporting_user_box(user) %}
{% import _self as display %}
<div class="user">
<div class="avatar">
<img width="128px" src="{{ user.avatar }}" class="img-responsive">
</div>
<div class="name">
<h3>
{% if user.complete_name_link %}
{{ user.complete_name_link }}
{% else %}
{{ user.complete_name }}
{% endif %}
</h3>
<p class="email">{{ user.email }}</p>
</div>
{{ display.reporting_user_details(user) }}
</div>
{% endmacro %}

@ -25,24 +25,7 @@
</div>
</div>
<div class="col-md-4">
<div class="user text-center">
<div class="parameters">
<dl class="dl-horizontal">
<dt>{{ 'Tel'|get_lang }}</dt>
<dd>{{ user.phone == '' ? 'NoTel'|get_lang : user.phone }}</dd>
<dt>{{ 'OfficialCode'|get_lang }}</dt>
<dd>{{ user.code == '' ? 'NoOfficialCode'|get_lang : user.code }}</dd>
<dt>{{ 'OnLine'|get_lang }}</dt>
<dd>{{ user.online }}</dd>
<dt>{{ 'Timezone'|get_lang }}</dt>
<dd>{{ user.timezone }}</dd>
</dl>
</div>
<div class="access">
{{ user.url_access }}
{{ user.legal.url_send }}
</div>
</div>
{{ display.reporting_user_details(user) }}
</div>
<div class="col-md-4">
{{ display.card_widget('FirstLoginInPlatform'|get_lang, user.first_connection, 'calendar') }}
@ -61,35 +44,7 @@
<div class="details">
<div class="row">
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-body">
<div class="user">
<div class="avatar">
<img width="128px" src="{{ user.avatar }}" class="img-responsive">
</div>
<div class="name">
<h3>{{ user.complete_name_link }}</h3>
<p class="email">{{ user.email }}</p>
</div>
<div class="parameters">
<dl class="dl-horizontal">
<dt>{{ 'Tel'|get_lang }}</dt>
<dd>{{ user.phone == '' ? 'NoTel'|get_lang : user.phone }}</dd>
<dt>{{ 'OfficialCode'|get_lang }}</dt>
<dd>{{ user.code == '' ? 'NoOfficialCode'|get_lang : user.code }}</dd>
<dt>{{ 'OnLine'|get_lang }}</dt>
<dd>{{ user.online }}</dd>
<dt>{{ 'Timezone'|get_lang }}</dt>
<dd>{{ user.timezone }}</dd>
</dl>
</div>
<div class="access">
{{ user.url_access }}
{{ user.legal.url_send }}
</div>
</div>
</div>
</div>
{{ display.panel('', display.reporting_user_box(user), '') }}
</div>
<div class="col-md-8">

Loading…
Cancel
Save