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.8' into fix-latest-merge

Browse Source 
Conflicts:
	CHANGELOG.md
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Media/Subdef/Image.php
	lib/conf.d/_GV_template.inc
	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/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/Story/Reorder.html.twig
	templates/web/prod/WorkZone/Macros.html.twig
	templates/web/prod/actions/Download/prepare.html.twig
	templates/web/prod/templates/push.html.twig
This commit is contained in:
Nicolas Le Goff
2014-07-11 17:19:39 +02:00
parent 24b885eb7c b4141f92a7
commit 3565d1c795
20 changed files with 300 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
templates/web/prod/Baskets/Reorder.html.twig
View File

@@ -21,15 +21,15 @@
<div class="elements row-fluid">
{% for element in basket.getElements() %}
<div id="ORDER_{{ element.getId() }}" class="CHIM diapo" style="height:130px;overflow:hidden;">
<div class="title" title="{{ element.getRecord(app).get_title() }}" style="position:relative;z-index:1200;height:30px;overflow:visible;text-align:center;">
<span>{{ element.getRecord(app).get_title() }}</span>
{{ thumbnail.format(element.getRecord(app).get_thumbnail(), 80, 80, '', false, false) }}
<form style="display:none;">
<input type="hidden" name="id" value="{{ element.getId() }}"/>
<input type="hidden" name="title" value="{{ element.getRecord(app).get_title() }}"/>
<input type="hidden" name="default" value="{{ element.getOrd() }}"/>
</form>
<div class="title" title="{{ element.getRecord(app).get_title() }}" style="position:relative;z-index:1200;height:30px;overflow:hidden;text-align:center;text-overflow: ellipsis; line-height: 15px;">
{{ element.getRecord(app).get_title() }} {{ element.getRecord(app).get_title() }}{{ element.getRecord(app).get_title() }}
</div>
{{ thumbnail.format(element.getRecord(app).get_thumbnail(), 80, 80, '', false, false) }}
<form style="display:none;">
<input type="hidden" name="id" value="{{ element.getId() }}"/>
<input type="hidden" name="title" value="{{ element.getRecord(app).get_title() }}"/>
<input type="hidden" name="default" value="{{ element.getOrd() }}"/>
</form>
</div>
{% endfor %}
</div>