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:
	composer.lock
	templates/mobile/common/index.html.twig
This commit is contained in:
Romain Neutron
2013-09-05 13:57:42 +02:00
parent c53017b1ab a5b58730fd
commit 6c29fc88e9
20 changed files with 382 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,31 @@
<link rel="stylesheet" href="{{ path('minifier', { 'f' : 'assets/jquery-mobile/jquery.mobile.css' }) }}" />
<script src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
<script src="{{ path('minifier', { 'f' : 'assets/jquery-mobile/jquery.mobile.js' }) }}"></script>
<style type="text/css">
html,body, div[data-role ="page"] {
height: 100%;
width: 100%;
margin: 0px;
padding: 0px;
}
.ui-content{
height: 85%;
width: 100%;
margin: 0px;
padding: 0px;
display:table;
}
#map {
height: 100%;
width: 100%;
padding: 0px;
display:table-cell;
vertical-align: middle;
text-align: center
}
</style>
{% block stylesheet %}{% endblock %}
{% block icon %}{% endblock %}
{% block javascript %}{% endblock %}

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

@@ -71,12 +71,12 @@
{% endmacro %}
{% macro format100percent(thumbnail, extraclass)%}
{% set record_type = thumbnail.get_type() %}
<div style="width:100%" class="thumb_wrapper {{extraclass|default('')}}">
{% set record_type = thumbnail.get_type() %}
<div id="map">
{% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %}
{% set random = thumbnail.get_random() %}
<div class="record record_video imgTips" style="100%;">
<video type="video/mp4" controls="controls" style="width:100%;" autoplay="autoplay">
<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>
</div>
@@ -84,8 +84,6 @@
{% set random = thumbnail.get_random() %}
<div class="record record_document imgTips" style="width:100%;">
<div id="preview_{{thumbnail.get_base_id()}}_{{thumbnail.get_record_id()}}_{{random}}" class="PNB" style=""></div>
<input type="hidden" name="width" value="{{thumbnail.get_width()}}"/>
<input type="hidden" name="height" value="{{thumbnail.get_height()}}"/>
</div>
<script type="text/javascript">
swfobject.embedSWF("/include/FlexPaper_flash/FlexPaperViewer.swf",
@@ -97,8 +95,6 @@
{% set random = thumbnail.get_random() %}
<div class="record record_audio audioTips" style="width:100%;">
<div id="preview_{{thumbnail.get_base_id()}}_{{thumbnail.get_record_id()}}_{{random}}" class="PNB" style=""></div>
<input type="hidden" name="width" value="{{thumbnail.get_width()}}"/>
<input type="hidden" name="height" value="{{thumbnail.get_height()}}"/>
</div>
<script type="text/javascript">
swfobject.embedSWF("/include/jslibs/audio-player/player.swf",
@@ -106,12 +102,8 @@
"{{thumbnail.get_width()}}", "{{thumbnail.get_height()}}", "9.0.0", false, false,
{menu: "false",flashvars: "playerID=2&autostart=yes&noinfo=yes&animation=no&remaining=yes&soundFile={{thumbnail.get_url()}}", movie: "/include/jslibs/audio-player/player.swf", allowFullScreen :"true",wmode: "transparent"}, false);</script>
{% else %}
<img class="record record_image imgTips zoomable thumb" oncontextMenu="return(false);"
<img style="height:100%;" class="record record_image imgTips zoomable thumb" oncontextMenu="return(false);"
src="{{thumbnail.get_url()}}" ondragstart="return false;">
<input type="hidden" name="width" value="{{thumbnail.get_width()}}"/>
<input type="hidden" name="height" value="{{thumbnail.get_height()}}"/>
{% endif %}
</div>
</div>
{% endmacro %}