Merge branch 'master' into PHRAS-2825_Prod_Add_reset_button_to_initialize_search

This commit is contained in:
Harrys Ravalomanana
2020-02-17 17:26:50 +04:00
committed by GitHub
5 changed files with 126 additions and 33 deletions

View File

@@ -20,7 +20,7 @@
<table id="main_wrapper" cellspacing="0" cellpadding="0">
<thead>
<tr>
<th class="title">
<th class="title" id="feed_list">
<h1>{{ 'Validations' | trans }}</h1>
</th>
<th>
@@ -29,10 +29,12 @@
</tr>
</thead>
<tbody>
{% for basket in baskets_collection %}
{% for basket in baskets_collection | sort | reverse%}
{% if basket.getValidation() %}
{% set basket_length = basket.getElements().count() %}
<tr>
{% set counter = ( counter | default(0) ) + 1 %}
<tr class="{% if counter >=4 %}other_feed hidden{% endif %}">
<td colspan="2">
<div class="basket_wrapper ui-corner-all clickable">
<table cellspacing="0" cellpadding="0" border="0">
@@ -84,20 +86,26 @@
</div>
</td>
</tr>
{% if counter == 3 %}<tr><td colspan="2" style="text-align: center"><a href="#see_more_feed" id="see_more_feed" class="see_more_feed btn btn-info">{{ 'lightbox::See_more_feedback' | trans }}</a></td></tr>{% endif %}
{% endif %}
{% endfor %}
<tr><td colspan="2" style="text-align: center"><a href="#feed_list" id="see_less_feed" class="see_more_feed hidden btn btn-success">{{ 'lightbox::See_less_feedback' | trans }}</a></td></tr>
<tr>
<th class="title">
<th class="title" id="panier_list">
<h1>{{ 'Paniers' | trans }}</h1>
</th>
<th>
<i>{{ 'Voici vos paniers' | trans }}</i>
</th>
</tr>
{% for basket in baskets_collection %}
{% for basket in baskets_collection | sort | reverse%}
{% if basket.getValidation is null %}
{% set basket_length = basket.getElements().count() %}
<tr>
{% set counter = ( counter | default(0) ) + 1 %}
{% set counter_length = baskets_collection.length() %}
<tr class="{% if counter >=4 %}other_basket hidden{% endif %}">
<td colspan="2">
<div class="basket_wrapper ui-corner-all clickable">
<table cellspacing="0" cellpadding="0" border="0">
@@ -140,9 +148,14 @@
<input type="hidden" name="ssel_id" value="{{ basket.getId() }}"/>
</div>
</td>
</tr>
{% if counter == 3 %}<tr><td colspan="2" style="text-align: center"><a href="#see_more_basket" id="see_more_basket" class="see_more_basket btn btn-info">{{ 'lightbox::see_more_basket' | trans }}</a></td></tr>{% endif %}
{% endif %}
{% endfor %}
<tr><td colspan="2" style="text-align: center"><a href="#panier_list" id="see_less_basket" class="see_more_basket hidden btn btn-success">{{ 'lightbox::see_less_basket' | trans }}</a></td></tr>
</tbody>
</table>
</div>