Merge branch 'master' into PHRAS-2978_feedback_basket-change_date-format

This commit is contained in:
Harrys Ravalomanana
2020-03-23 14:32:25 +04:00
committed by GitHub

View File

@@ -23,19 +23,19 @@
data-position="0"
data-id="{{basket.getId()}}"
data-reload="true"
class="otherBaskToolTip open-preview-action" title="{{basket.getDescription()}}">
class="otherBaskToolTip to-open-preview-action" title="{{basket.getDescription()}}">
{#<img style="vertical-align:middle" src="/assets/common/images/icons/basket.png" width="16">#}
{% if basket.getValidation() %}
<img src='/assets/common/images/icons/basket_validation.png' title='' width="16" class="btn-image"/>
<img src='/assets/common/images/icons/basket_validation.png' title='' width="24" class="btn-image"/>
{% elseif basket.getPusher() %}
{% if not basket.isRead() %}
<img src='/assets/common/images/icons/basket_push_unread.png' title='' width="16" class="btn-image"/>
<img src='/assets/common/images/icons/basket_push_unread.png' title='' width="24" class="btn-image"/>
{% else %}
<img src='/assets/common/images/icons/basket_push.png' title='' width="16" class="btn-image"/>
<img src='/assets/common/images/icons/basket_push.png' title='' width="24" class="btn-image"/>
{% endif %}
{% else %}
<img src='/assets/common/images/icons/basket.png' title='' width="16" class="btn-image"/>
<img src='/assets/common/images/icons/basket.png' title='' width="24" class="btn-image"/>
{% endif %}
<span class="title">{{basket.getName()}}</span>