hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-2829 #comment fix lightbox mobile #time 8h

Browse Source
This commit is contained in:
Harrys Ravalomanana
2019-11-22 17:50:55 +04:00
parent 443fce14da
commit fb708cb131
6 changed files with 190 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/mobile/lightbox/basket_element.html.twig
View File

@@ -63,7 +63,7 @@
{% endif %}
<div style="clear: both;"></div>
</div>
{{ thumbnail.format100percent(record.get_preview()) }}
<div class="center-image">{{ thumbnail.format100percent(record.get_preview()) }}</div>
{% if basket_element.getBasket().getValidation() %}
{% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanAgree() %}
<fieldset data-role="controlgroup" data-type="horizontal" style="text-align:center;">

25
templates/mobile/lightbox/sc_note.html.twig
View File

@@ -1,14 +1,21 @@
{% for validationDatas in basket_element.getValidationDatas() %}
<li>
<h3 style="text-align:left;">
{% if validationDatas.getAgreement() is not null %}
<img style="vertical-align:middle;"
src="/assets/lightbox/images/{% if validationDatas.getAgreement() == true %}agree.png{% else %}disagree.png{% endif %}" />
<div class="validate-icon">
{% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
{% if validationDatas.getAgreement() == true %}<span class="icomoon icon-agree">&#xe95f;</span>{% else %}<span class="icomoon icon-disagree">&#xe971;</span>{% endif %}
{% endif %}
</div>
<div class="validate-info">
<h3>
{{ validationDatas.getParticipant().getUser().getDisplayName() }}
</h3>
{% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
{% if validationDatas.getNote() != '' and validationDatas.getAgreement() == true %}
<p style="text-align:left;">{{ 'validation:: note' | trans }} : {{ validationDatas.getNote()|nl2br }} </p>
{% endif %}
{% endif %}
{{ validationDatas.getParticipant().getUser().getDisplayName() }}
</h3>
{% if validationDatas.getNote() != '' %}
<p style="text-align:left;">{{ 'validation:: note' | trans }} : {{ validationDatas.getNote()|nl2br }} </p>
{% endif %}
</div>
</li>
{% endfor %}

6
templates/mobile/lightbox/validate.html.twig
View File

@@ -66,10 +66,14 @@
<div id="report" class="summary_block">
<ul class="image_set">
{% for basket_element in basket.getElements() %}
<li class="image_box" id="sselcontid_{{basket_element.getId()}}">
<div class="display_id">
{{basket_element.getOrd()}}
</div>
{% if basket_element.getBasket().getValidation() and basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanAgree() %}
<div class="valid_choice valid_choice_{{basket_element.getId()}} {% if basket_element.getUserValidationDatas(app.getAuthenticatedUser()).getAgreement() == true %}agree{% elseif basket_element.getUserValidationDatas(app.getAuthenticatedUser()).getAgreement() == false and basket_element.getUserValidationDatas(app.getAuthenticatedUser()).getAgreement() is not null %}disagree{% endif %}">
</div>
</div>
{% endif %}
<a href="{{ path('lightbox_ajax_load_basketelement', { 'sselcont_id' : basket_element.getId() }) }}">
{{thumbnail.format(basket_element.getRecord(app).get_thumbnail(), 80, 80, '', true, false)}}

21
templates/web/lightbox/basket_content_report.html.twig
View File

@@ -18,20 +18,28 @@
<div class="chim-right">
{% for validationDatas in basket_element.getValidationDatas()%}
<div class="basket_report_user_wrapper ui-corner-all">
<div class="basket_report_user">
{% if validationDatas.getAgreement() == true %}
{% set imguser = '<img src="/assets/lightbox/images/agree.png" />' %}
{% set imguser = '<span class="icomoon icon-agree">&#xe95f;</span>' %}
{% set styleuser = '' %}
{% elseif validationDatas.getAgreement() is null %}
{% set imguser = '' %}
{% set imguser = '&nbsp;' %}
{% set styleuser = 'margin-left:18px;' %}
{% else %}
{% set imguser = '<img src="/assets/lightbox/images/disagree.png" />' %}
{% set imguser = '<span class="icomoon icon-disagree">&#xe971;</span>' %}
{% set styleuser = '' %}
{% endif %}
<b style="{{styleuser}}">{{imguser|raw}} {{validationDatas.getParticipant().getUser().getDisplayName()}}</b>
<div class="validate-icon">
{% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
{{imguser|raw}}
{% endif %}
</div>
<div class="validate-info">
<h3> {{validationDatas.getParticipant().getUser().getDisplayName()}}</h3>
{% if validationDatas.getNote() != '' %}
: {{validationDatas.getNote()|nl2br}}
{% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
<p> {{validationDatas.getNote()|nl2br}}</p>
{% endif %}
{% endif %}
</div>
</div>
@@ -40,7 +48,6 @@
</div>
</div>
</div>
<div><hr/></div>
{% endfor %}
</div>