ewandor/vision
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix and Enhancements

Browse Source
This commit is contained in:
Xbird
2022-04-26 19:17:57 +00:00
parent 200c6ac256
commit 72123b8782
22 changed files with 173 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
templates/_cells/directoryCard.html.twig
View File

@@ -1,5 +1,5 @@
<div class="card user-card user-card-1">
<div class="card-header">{{ directory.fullname}} <span class="float-end">{% include '_cells/directoryActions.html.twig' with {'directory': directory} %}</span></div>
<div class="card-header">{{ directory.fullname}} {% if app.user %}<span class="float-end">{% include '_cells/directoryActions.html.twig' with {'directory': directory} %}</span>{% endif %}</div>
<div class="card-body pb-0">
{% if directory.dead %}<p class="text-danger">{% trans %}title_directory_dead{% endtrans %}</p>{% endif %}
{% if directory.wanted %}<p class="text-danger">{% trans %}title_directory_wanted{% endtrans %}</p>{% endif %}
@@ -25,29 +25,29 @@
{% if directory.idCardImageSize != 0 %}
<div class="col-2 col-xs-4">
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.idCardImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.idCardImageName) }}" alt="{% trans %}tooltip_id_card{% endtrans %}"></a>
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.idCardImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.idCardImageName) }}" data-bs-toggle="tooltip" data-placement="top" title="{% trans %}tooltip_id_card{% endtrans %}" alt="{% trans %}tooltip_id_card{% endtrans %}"></a>
</div>
{% endif %}
{% if app.user.hasPermission('general_legal_view') %}
{% if app.user and app.user.hasPermission('general_legal_view') %}
{% if directory.carLicenceImageSize != 0 %}
<div class="col-2 col-xs-4">
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.carLicenceImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.carLicenceImageName) }}" alt="{% trans %}tooltip_car_licence{% endtrans %}"></a>
</div>
<div class="col-2 col-xs-4">
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.carLicenceImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.carLicenceImageName) }}" data-bs-toggle="tooltip" data-placement="top" title="{% trans %}tooltip_car_licence{% endtrans %}" alt="{% trans %}tooltip_car_licence{% endtrans %}"></a>
</div>
{% endif %}
{% if directory.motorcycleLicenceImageSize != 0 %}
<div class="col-2 col-xs-4">
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.motorcycleLicenceImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.motorcycleLicenceImageName) }}" alt="{% trans %}tooltip_motorcycle_licence{% endtrans %}"></a>
</div>
<div class="col-2 col-xs-4">
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.motorcycleLicenceImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.motorcycleLicenceImageName) }}" data-bs-toggle="tooltip" data-placement="top" title="{% trans %}tooltip_motorcycle_licence{% endtrans %}" alt="{% trans %}tooltip_motorcycle_licence{% endtrans %}"></a>
</div>
{% endif %}
{% if directory.truckLicenceImageSize != 0 %}
<div class="col-2 col-xs-4">
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.truckLicenceImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.truckLicenceImageName) }}" alt="{% trans %}tooltip_truck_licence{% endtrans %}"></a>
</div>
<div class="col-2 col-xs-4">
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.truckLicenceImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.truckLicenceImageName) }}" data-bs-toggle="tooltip" data-placement="top" title="{% trans %}tooltip_truck_licence{% endtrans %}" alt="{% trans %}tooltip_truck_licence{% endtrans %}"></a>
</div>
{% endif %}
{% if directory.boatLicenceImageSize != 0 %}
<div class="col-2 col-xs-4">
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.boatLicenceImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.boatLicenceImageName) }}" alt="{% trans %}tooltip_boat_licence{% endtrans %}"></a>
</div>
<div class="col-2 col-xs-4">
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.boatLicenceImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.boatLicenceImageName) }}" data-bs-toggle="tooltip" data-placement="top" title="{% trans %}tooltip_boat_licence{% endtrans %}" alt="{% trans %}tooltip_boat_licence{% endtrans %}"></a>
</div>
{% endif %}
{% endif %}
</div>
@@ -58,7 +58,7 @@
<li class="list-group-item"><span class="fa-li"><i class="fas fa-transgender-alt"></i></span>{% trans %}title_gender{% endtrans %} : {{ directory.gender | default('value_no_value'|trans) }}</li>
<li class="list-group-item"><span class="fa-li"><i class="fas fa-arrows-alt-v"></i></span>{% trans %}title_height{% endtrans %} : {{ directory.height | default('value_no_value'|trans) }}</li>
<li class="list-group-item"><span class="fa-li"><i class="fas fa-weight"></i></span>{% trans %}title_weight{% endtrans %} : {{ directory.weight | default('value_no_value'|trans) }}</li>
{% if app.user.hasPermission('general_legal_view') %}
{% if app.user and app.user.hasPermission('general_legal_view') %}
<li class="list-group-item"><span class="fa-li"><i class="fas fa-wheelchair"></i></span>{% trans %}title_gang{% endtrans %} : {% if directory.gang %} <a href="{{ path('document_view', {id: directory.gang.id}) }}">{{ directory.gang.title }}</a> {% endif %}{% if directory.gangInfo %}( {{ directory.gangInfo }} ){% endif %}</li>
{% if directory.hasnopapers %}
<li class="list-group-item"><span class="fa-li"><i class="fas fa-scroll"></i></span>{% trans %}title_hasnopapers{% endtrans %}</li>
@@ -76,6 +76,6 @@
</div>
</div>
</div>
{% if app.user.hasPermission('general_medical_view') %}
{% if app.user and app.user.hasPermission('general_medical_view') %}
{% include '_cells/directoryCardMedical.html.twig' with {'directory': directory} %}
{% endif %}

2
templates/_cells/documentTable.html.twig
View File

@@ -44,7 +44,7 @@
{% endif %}
<td>
<a href="{{ path('document_view', {'id': i.id}) }}" class="text-{{ (i.archive)? 'danger' : 'primary' }}" {% if i.archive %} data-bs-toggle="tooltip" data-placement="top" title="{% trans %}tooltip_archived{% endtrans %}" {% endif %} >`{{i.title | u.truncate(50, '...')}}`</a>
<a href="{{ path('document_view', {'id': i.id}) }}" class="text-{{ (i.archive)? 'danger' : 'primary' }}" {% if i.archive %} data-bs-toggle="tooltip" data-placement="top" title="{% trans %}tooltip_archived{% endtrans %}" {% endif %} >{{i.title | u.truncate(50, '...')}}</a>
{% if notype is defined %}
<br /><small>N°: #{{i.id}}</small>
{% endif %}

13
templates/admin/user.html.twig
View File

@@ -5,6 +5,19 @@
{% block body %}
<div class="row">
<div class="col-5">{{form(searchForm)}}</div>
<div class="col">
{% if admin %}
<a href="{{ path('admin_user_list') }}" class="btn btn-primary my-1">{% trans %}button_exit_admin_users{% endtrans %}</a>
{% else %}
<a href="{{ path('admin_user_list_admin') }}" class="btn btn-info my-1">{% trans %}button_go_to_admin_users{% endtrans %}</a>
{% endif %}
{% if desactivated %}
<a href="{{ path('admin_user_list') }}" class="btn btn-primary my-1">{% trans %}button_exit_desactivated_users{% endtrans %}</a>
{% else %}
<a href="{{ path('admin_user_list_desactivated') }}" class="btn btn-info my-1">{% trans %}button_go_to_desactivated_users{% endtrans %}</a>
{% endif %}
</div>
</div>
<div class="row">
<div class="col-12">

3
templates/document/types/Gang.html.twig
View File

@@ -21,6 +21,9 @@
{% if i.wanted %}
<li class="text-danger">{% trans %}title_directory_wanted_light{% endtrans %} : {{ i.wantedReason | default('value_no_value'|trans) }}</li>
{% endif %}
{% if i.dead %}
<li class="text-warning">{% trans %}title_directory_dead{% endtrans %}</li>
{% endif %}
<li>{% trans %}title_informations{% endtrans %}: {{i.gangInfo}}</li>
<li>{% trans %}title_gender{% endtrans %}: {{i.gender}}</li>
<li>{% trans %}title_phone{% endtrans %}: {{i.phone}}</li>

42
templates/document/view.html.twig
View File

@@ -4,16 +4,14 @@
{% block subtitle %}#{{ document.id }}: {{ document.getTitle }} {% endblock %}
{% block body %}
{% set groupLogo = 'img/nologo.png' %}
{% if document.mainGroup %}
{% if document.mainGroup.imageSize != 0 %}
{% set groupLogo = 'uploads/groups/' ~ document.mainGroup.imageName %}
{% endif %}
{% endif %}
<div class="row">
<div class="col-12 col-md-8 mb-5{% if shared is defined %} mx-5 my-2{% endif %}">
<div class="row p-2">
<div class="col-lg-8 col-xs-12">
{% if document.archive %}
<div class="card prod-p-card bg-primary background-pattern-white">
<div class="card-body">
@@ -96,40 +94,20 @@
</ul>
</div>
</div>
</div>
<div class="col-12 col-md-4">
<div class="col-lg-4 col-xs-12">
{% if document.directory is defined and document.directory is not null %}
<h3>{% trans %}title_directory_linked{% endtrans %}</h3><hr>
{% include '_cells/directoryCard.html.twig' with {'directory': document.directory} %}
{% endif %}
{% if document.user is defined and document.user is not null %}
<h3>{% trans %}title_user_linked{% endtrans %}</h3><hr>
{% include '_cells/userInformations.html.twig' with {'user': document.user} %}
{% endif %}
{% include '_cells/directoryCard.html.twig' with {'directory': document.directory} %}
{% endif %}
{% if document.user is defined and document.user is not null %}
<h3>{% trans %}title_user_linked{% endtrans %}</h3><hr>
{% include '_cells/userInformations.html.twig' with {'user': document.user} %}
{% endif %}
</div>
</div>
{% if shared is not defined %}
<!-- Modal -->
<div class="modal fade" id="addCommentModal" tabindex="-1" role="dialog" aria-labelledby="addCommentModalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-xl" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="addCommentModalTitle">{% trans %}title_add_comment{% endtrans %}</h5>
</div>
<div class="modal-body">
{{ form(formComment) }}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">{% trans %}button_cancel{% endtrans %}</button>
</div>
</div>
</div>
</div>
{% endif %}
{% endblock %}

2
templates/group/index.html.twig
View File

@@ -9,7 +9,7 @@
<h3>{% trans %}title_members{% endtrans %}</h3> <hr>
<div class="row">
<div class="col-12">
{% include '_cells/userTable.html.twig' with {'users': group.users} %}
{% include '_cells/userTable.html.twig' with {'users': group.UsersActive} %}
</div>
</div>
</div>