Merge branch '3.8'

Conflicts:
	locale/de_DE/LC_MESSAGES/phraseanet.mo
	locale/de_DE/LC_MESSAGES/phraseanet.po
	locale/en_GB/LC_MESSAGES/phraseanet.mo
	locale/en_GB/LC_MESSAGES/phraseanet.po
	locale/es_ES/LC_MESSAGES/phraseanet.mo
	locale/es_ES/LC_MESSAGES/phraseanet.po
	locale/fr_FR/LC_MESSAGES/phraseanet.mo
	locale/fr_FR/LC_MESSAGES/phraseanet.po
	locale/nl_NL/LC_MESSAGES/phraseanet.mo
	locale/nl_NL/LC_MESSAGES/phraseanet.po
	templates/web/prod/actions/Property/index.html.twig
This commit is contained in:
Romain Neutron
2014-02-24 16:29:32 +01:00

View File

@@ -10,7 +10,7 @@
<ul>
<li><a href="#property-statut">{{ 'Records Statut' | trans }}</a></li>
{# <span>&nbsp;</span> element is required for the jQuery loading spinner appears && disappears properly #}
<li><a href="{{ path('display_type_property') }}">{{ 'Records type' | trans }}&nbsp;<span>&nbsp;</span></a></li>
<li><a href="{{ path('display_type_property', { 'lst' : records.serializedList() } ) }}">{{ 'Records type' | trans }}&nbsp;<span>&nbsp;</span></a></li>
</ul>
<div id='property-statut'>