Cadoles/ninegate
20
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'master' into dist/envole/6/master

Browse Source
This commit is contained in:
Arnaud Fornerot 2020-04-20 13:58:46 +02:00
commit d983e70f1d
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Mail/users.html.twig
View File

@ -87,7 +87,8 @@
}
function closeModal() {
window.parent.location.reload();
url=window.parent.location;
window.parent.location=url;
}
{% endblock %}

10
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig
View File

@ -26,17 +26,17 @@ td { font-size: 10px; }
<div class="panel-body">
<div class="dataTable_wrapper">
<table class="table table-striped table-bordered table-hover" id="dataTables" style="width:100%: font-size:11px;">
<table class="table table-striped table-bordered table-hover" id="dataTables" style="width:100%; font-size:11px;">
<thead>
<tr>
{% if access=="config" %}
<th width="90px" class="no-sort">Action</th>
<th class="no-sort">Action</th>
{% endif %}
<th width="70px" class="no-sort {% if fields["avatar"] is defined and fields["avatar"].perm==0 %}no-visible{% endif %}">Avatar</th>
<th width="200px class=="{% if fields["login"] is defined and fields["login"].perm==0 %}no-visible{% endif %}">Login</th>
<th class="no-sort {% if fields["avatar"] is defined and fields["avatar"].perm==0 %}no-visible{% endif %}">Avatar</th>
<th class=="{% if fields["login"] is defined and fields["login"].perm==0 %}no-visible{% endif %}">Login</th>
<th class="{% if fields["lastname"] is defined and fields["lastname"].perm==0 %}no-visible{% endif %}">Nom</th>
<th class="{% if fields["firstname"] is defined and fields["firstname"].perm==0 %}no-visible{% endif %}">Prénom</th>
<th class="{% if fields["email"] is defined and fields["email"].perm==0 %}no-visible{% endif %}" style="width:100px">Email</th>
<th class="{% if fields["email"] is defined and fields["email"].perm==0 %}no-visible{% endif %}">Email</th>
<th class="{% if fields["telephonenumber"] is defined and fields["telephonenumber"].perm==0 %}no-visible{% endif %}">Téléphone</th>
<th class="{% if fields["niveau01"] is defined and fields["niveau01"].perm==0 %}no-visible{% endif %}">{{ labelniveau01 }}</th>
{% if viewniveau02 %}