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

Fix latest merge

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-10-09 21:50:32 +02:00
parent 28eecf6a09
commit 10a83bc6c4
37 changed files with 1178 additions and 1848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/web/prod/index.html.twig
View File

@@ -340,7 +340,7 @@
<select name="sort" class="input-small">
<option value="" {% if app['phraseanet.SE'].getDefaultSort() is empty %}selected="selected default-selection"{% endif %}>{{ "No sort"|trans }}</option>
{% for sort in search_datas['sort'] %}
<option value="{{ sort.fieldname }}" {% if sort.fieldname == app['phraseanet.SE'].getDefaultSort() %}selected="selected default-selection"{% endif %}>{{ sort.fieldname }}</option>
<option value="{{ sort.fieldname }}" {% if sort.fieldname == app['phraseanet.SE'].getDefaultSort() %}selected="selected default-selection"{% endif %}>{{ sort.fieldname }}</option>
{% endfor %}
</select>
<select name="ord" class="input-medium">
@@ -423,7 +423,7 @@
{% set date_field_names = date_field_names|merge([field.fieldname]) %}
{% endfor %}
<option value="{{ date_field_names|join('|') }}" selected="selected">
{% trans 'rechercher dans tous les champs' %}
{{ 'rechercher dans tous les champs'| trans }}
</option>
</select>
</td>