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'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Helper/Prod.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
	lib/classes/User/Adapter.php
	lib/classes/caption/Field/Value.php
	lib/classes/collection.php
	lib/classes/module/report/filter.php
	lib/classes/task/period/ftp.php
	templates/web/common/dialog_export.html.twig
	templates/web/report/ajax_dashboard_content_child.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
This commit is contained in:
Romain Neutron
2013-12-18 12:12:58 +01:00
parent 569b564e66 33f709e985
commit 09c74afab6
44 changed files with 389 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/web/prod/preview/basket_train.html.twig
View File

@@ -5,7 +5,11 @@
{% set thumbnail = child.getRecord(app).get_thumbnail() %}
{% if thumbnail.is_paysage() %}
{% set style = 'width:65px;top:' %}
{% set top = ((66 - (65 / (thumbnail.get_width() / thumbnail.get_height()))) / 2)|round %}
{% if thumbnail.get_width() > 0 and thumbnail.get_height() > 0 %}
{% set top = ((66 - (65 / (thumbnail.get_width() / thumbnail.get_height()))) / 2)|round %}
{% else %}
{% set top = 65 %}
{% endif %}
{% set style = style ~ top %}
{% set style = style ~ 'px;' %}
{% else %}

8
templates/web/prod/preview/feed_train.html.twig
View File

@@ -5,7 +5,11 @@
{% set thumbnail = child.getRecord(app).get_thumbnail() %}
{% if thumbnail.is_paysage() %}
{% set style = 'width:65px;top:' %}
{% set top = ((66 - (65 / (thumbnail.get_width() / thumbnail.get_height()))) / 2)|round %}
{% if thumbnail.get_width() > 0 and thumbnail.get_height() > 0 %}
{% set top = ((66 - (65 / (thumbnail.get_width() / thumbnail.get_height()))) / 2)|round %}
{% else %}
{% set top = 65 %}
{% endif %}
{% set style = style ~ top %}
{% set style = style ~ 'px;' %}
{% else %}
@@ -40,4 +44,4 @@
</div>
<div id="PREVIEWTOOL">
{% include 'prod/preview/tools.html.twig' %}
</div>
</div>

8
templates/web/prod/preview/reg_train.html.twig
View File

@@ -2,7 +2,11 @@
{% set regroupement = record.get_container() %}
{% set thumbnail = regroupement.get_thumbnail() %}
{% set ratio = thumbnail.get_width() / thumbnail.get_height() %}
{% if thumbnail.get_height() > 0 %}
{% set ratio = thumbnail.get_width() / thumbnail.get_height() %}
{% else %}
{% set ratio = 1 %}
{% endif %}
{% if thumbnail.is_paysage %}
{% set style = 'width:80px;top:' %}
{% set top = (8 + (80 - (80 / ratio)) / 2)|round %}
@@ -59,4 +63,4 @@
</div>
<div id="PREVIEWTOOL">
{% include 'prod/preview/tools.html.twig' %}
</div>
</div>