PHRAS-2282 #comment add new design #time 24h

This commit is contained in:
Harrys Ravalomanana
2019-08-07 16:43:53 +04:00
parent 6b01a5df23
commit 366c486733
2 changed files with 12 additions and 26 deletions

View File

@@ -1,7 +1,7 @@
<div class="PNB" id="BasketBrowser"> <div class="PNB BasketBrowser" id="BasketBrowser">
<div class="PNB10 Browser"> <div class="PNB10 Browser">
<div class="PNB10" style="width:190px;right:auto;"> <div class="PNB10 leftBrowser">
<form name="BasketBrowser" method="GET" action="{{ path('prod_workzone_search') }}"> <form name="BasketBrowser" method="GET" action="{{ path('prod_workzone_search') }}">
<input name="Query" class="Query search" placeholder="{{ 'Search baskets' | trans }}" type="text"/> <input name="Query" class="Query search" placeholder="{{ 'Search baskets' | trans }}" type="text"/>
@@ -78,7 +78,7 @@
</form> </form>
</div> </div>
<div class="PNB results" style="left:220px;"> <div class="PNB results rightBrowser">
</div> </div>
</div> </div>
<div class="PNB10 Basket"> <div class="PNB10 Basket">

View File

@@ -7,24 +7,9 @@
{% if Total == 0 %} {% if Total == 0 %}
{{ 'No results' | trans }} {{ 'No results' | trans }}
{% elseif Total == 1 %} {% elseif Total == 1 %}
{{ '1 result' | trans }} {{ 'Result' | trans }}
{% else %} {% else %}
{% trans with {'%Total%' : Total} %}%Total% results{% endtrans %} {{ 'Results' | trans }}
{% endif %}
</td>
<td class="paginator">
{% if Page - 1 > 0 %}
<a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page - 1) }) }}" class="result">
<img src="/assets/prod/images/Basket/Browser/left.png" />
</a>
{% endif %}
<span>
Page {{ Page }} / {{ MaxPage }}
</span>
{% if Page + 1 <= MaxPage %}
<a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page + 1) }) }}" class="result">
<img src="/assets/prod/images/Basket/Browser/right.png" />
</a>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@@ -35,18 +20,16 @@
{% for Basket in Baskets %} {% for Basket in Baskets %}
<div class="result {% if loop.index is odd %}odd{% endif %}"> <div class="result {% if loop.index is odd %}odd{% endif %}">
<a href="{{ path('basket_delete', {basket: Basket.getId()}) }}" class="delete-basket close" title="{% trans %}Delete basket{% endtrans %}" style="color:#fff;padding:2px">×</a> <a href="{{ path('basket_delete', {basket: Basket.getId()}) }}" class="delete-basket close" title="{% trans %}Delete basket{% endtrans %}" style="color:#fff;padding:2px">×</a>
<div class="PNB10" style="right:15px;"> <div class="PNB10 rightBrowserInner">
<table> <table>
<tr> <tr>
<td class="thumbnail"> <td class="thumbnail">
{% set BasketElement = Basket.getElements().first() %} {% set BasketElement = Basket.getElements().first() %}
{% if BasketElement %} {% if BasketElement %}
{{thumbnail.format(BasketElement.getRecord(app).get_thumbnail(), 80, 80, '', true, false)}} {{thumbnail.format(BasketElement.getRecord(app).get_thumbnail(), 150, 106, '', true, false)}}
{% endif %} {% endif %}
<div class="counter">
{{ Basket.getElements().count() }}
</div>
</td> </td>
<td class="" width="12" style="font-size: 0">&nbsp;</td>
<td class="content"> <td class="content">
<h1 class="title"> <h1 class="title">
<img class="loader" src="/assets/prod/images/Basket/Browser/loader.gif" /> <img class="loader" src="/assets/prod/images/Basket/Browser/loader.gif" />
@@ -64,9 +47,12 @@
{% endif %} {% endif %}
<a class="basket_link" href="{{ path('prod_workzone_basket', { basket : Basket.getId() }) }}"> <a class="basket_link" href="{{ path('prod_workzone_basket', { basket : Basket.getId() }) }}">
{{ Basket.getName() }} {{ Basket.getName() }}
</a> <br><span class="basketCount">
{{ Basket.getElements().count() }} {{ ' records' }}
</span></a>
</h1> </h1>
{% if Basket.getPusher() %} {% if Basket.getPusher() %}
<p> <p>
{% set user_name = '<a href="/user/' ~ Basket.getPusher().get_id() ~ '/" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Basket.getPusher(app).getId() }) ~ '" class="UserTips">' ~ Basket.getPusher(app).get_display_name() ~ '</a>' %} {% set user_name = '<a href="/user/' ~ Basket.getPusher().get_id() ~ '/" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Basket.getPusher(app).getId() }) ~ '" class="UserTips">' ~ Basket.getPusher(app).get_display_name() ~ '</a>' %}