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/conf.d/minifyGroupsConfig.php
	templates/web/overview.html.twig
This commit is contained in:
Romain Neutron
2014-02-26 13:17:30 +01:00
parent ed24b3e6d8 b7cd76dbf2
commit ce94b80d58
20 changed files with 349 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/web/overview.html.twig
View File

@@ -62,7 +62,7 @@
{% block javascript %}
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js,include/jslibs/jquery.mousewheel.js,include/jquery.image_enhancer.js,assets/swfobject/swfobject.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery.ui/jquery-ui.js' }) }}"></script>
<script type="text/javascript" src="/include/jslibs/flowplayer/flowplayer-3.2.11.min.js"></script>
<script type="text/javascript" src="/include/jslibs/flowplayer/flowplayer-3.2.13.min.js"></script>
<script type="text/javascript">
$(document).ready(function(){
$('.preview .thumb_wrapper').width('100%');