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

Merge branch '3.5.5' into 3.6

Browse Source
This commit is contained in:
Romain Neutron
2011-12-28 15:00:18 +01:00
parent b38f1f1227 f4814e1fe8
commit 607974edcb
14 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/web/common/caption_templates/answer.html
View File

@@ -1,5 +1,5 @@
{% macro format_caption(record, highlight, searchEngine) %}
{% for name, value in record.get_caption().get_highlight_fields(highlight, null, searchEngine) %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value|raw}}</div>
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value.value|raw}}</div>
{% endfor %}
{% endmacro %}

2
templates/web/common/caption_templates/basket_element.html
View File

@@ -1,5 +1,5 @@
{% macro format_caption(record) %}
{% for name, value in record.get_caption().get_highlight_fields() %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value|raw}}</div>
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value.value|raw}}</div>
{% endfor %}
{% endmacro %}

2
templates/web/common/caption_templates/internal_publi.html
View File

@@ -1,5 +1,5 @@
{% macro format_caption(record) %}
{% for name, value in record.get_caption().get_highlight_fields() %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value|raw}}</div>
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value.value|raw}}</div>
{% endfor %}
{% endmacro %}

2
templates/web/common/caption_templates/lazaret.html
View File

@@ -1,5 +1,5 @@
{% macro format_caption(record) %}
{% for name, value in record.get_caption().get_highlight_fields() %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value|raw}}</div>
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value.value|raw}}</div>
{% endfor %}
{% endmacro %}

2
templates/web/common/caption_templates/overview.html
View File

@@ -1,5 +1,5 @@
{% macro format_caption(record) %}
{% for name, value in record.get_caption().get_highlight_fields() %}
<div><b>{{name}}</b> : {{value|raw}}</div>
<div><b>{{name}}</b> : {{value.value|raw}}</div>
{% endfor %}
{% endmacro %}

2
templates/web/common/caption_templates/preview.html
View File

@@ -1,5 +1,5 @@
{% macro format_caption(record, highlight, searchEngine) %}
{% for name, value in record.get_caption().get_highlight_fields(highlight, null, searchEngine) %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value|raw}}</div>
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value.value|raw}}</div>
{% endfor %}
{% endmacro %}

2
templates/web/common/dialog_export.twig
View File

@@ -376,7 +376,7 @@
</div>
<div id="ftp_form">
<div id="ftp_form_stock">
{% for datas in download.ftp_datas %}
{% for datas in download.get_ftp_datas() %}
{{ _self.print_ftp_form(datas) }}
{% endfor %}
</div>