mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 18:03:17 +00:00
Merge branch '3.8' into fix-latest-merge
Conflicts: README.md composer.json composer.lock config/configuration.sample.yml lib/Alchemy/Phrasea/Application/Api.php lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php lib/Alchemy/Phrasea/Controller/Api/Oauth2.php lib/Alchemy/Phrasea/Controller/Prod/Basket.php lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiExceptionHandlerSubscriber.php lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php lib/Alchemy/Phrasea/Core/Version.php lib/classes/API/V1/adapter.php lib/classes/API/V1/result.php lib/classes/module/console/schedulerStart.php lib/classes/module/console/schedulerState.php lib/classes/module/console/schedulerStop.php lib/classes/module/console/taskrun.php lib/classes/set/export.php lib/conf.d/_GV_template.inc lib/conf.d/configuration.yml templates/web/admin/setup.html.twig templates/web/admin/tasks/list.html.twig templates/web/api/auth/end_user_authorization.html.twig templates/web/prod/actions/Feedback/list.html.twig templates/web/prod/actions/publish/publish.html.twig templates/web/prod/upload/upload.html.twig tests/classes/api/v1/api_v1_adapterTest.php tests/classes/api/v1/api_v1_resultTest.php
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
<li onclick="openPreview('REG',0,'{{par.get_serialize_key()}}'); return(false);"
|
||||
class="otherRegToolTip" {% if app['conf'].get(['registry', 'classic', 'stories-preview']) %}tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : par.get_sbas_id(), 'record_id' : par.get_record_id(), 'context' : 'basket' }) }}" {% endif %}>
|
||||
<img src="{{par.get_thumbnail().get_url()}}" style="width:25px;height:25px;"/>
|
||||
<span class="title"> {{ par.get_title() }} </span>
|
||||
<span class="title" title="{{ par.get_title() }}"> {{ par.get_title() }} </span>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
Reference in New Issue
Block a user