hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/conf.d/configuration.yml
	templates/mobile/common/index.html.twig
This commit is contained in:
Nicolas Le Goff
2014-02-03 19:02:22 +01:00
parent 0369a4eaf4 fc1bec4816
commit bd1e4516bd
15 changed files with 222 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
templates/mobile/common/index.html.twig
View File

@@ -4,6 +4,7 @@
<meta charset="UTF-8" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<meta name="viewport" content="initial-scale=1">
<title>{{ app['conf'].get(['registry', 'general', 'title']) }} - {{ module_name }} </title>
<link rel="stylesheet" href="{{ path('minifier', { 'f' : 'assets/jquery-mobile/jquery.mobile.css' }) }}" />
<script src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>

6
templates/mobile/common/thumbnail.html.twig
View File

@@ -34,7 +34,7 @@
{% set random = thumbnail.get_random() %}
<div class="record record_video imgTips" style="width:{{d_width|round}}px;height:{{d_height|round}}px;top:{{top|round}}px;">
<video type="video/mp4" controls="controls" style="width:{{d_width|round}}px;height:{{d_height|round}}px;" autoplay="autoplay">
<source src="{{thumbnail.get_url()}}" type="video/mp4"></source>
<source src="{{thumbnail.get_url()}}" type="video/mp4" />
</video>
</div>
{% elseif record_type == 'FLEXPAPER' %}
@@ -79,8 +79,8 @@
{% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %}
{% set random = thumbnail.get_random() %}
<div class="record record_video imgTips">
<video type="video/mp4" controls="controls" style="height:100%;" autoplay="autoplay">
<source src="{{thumbnail.get_url()}}" type="video/mp4"></source>
<video type="video/mp4" controls="controls" style="height:80%;width:80%;max-height: 80%;max-width:80%; margin: 0 auto" autoplay="autoplay">
<source src="{{thumbnail.get_url()}}" type="video/mp4" />
</video>
</div>
{% elseif record_type == 'FLEXPAPER' %}