Fix #1419 Fix resize issue on mobile view

This commit is contained in:
Nicolas Le Goff
2013-09-03 17:22:18 +02:00
parent bd956aebe0
commit 66bcf32d81
5 changed files with 50 additions and 22 deletions

View File

@@ -8,6 +8,31 @@
<link rel="stylesheet" href="{{ path('minifier', { 'f' : 'include/jslibs/jquery.mobile-1.2.1/jquery.mobile-1.2.1.css' }) }}" /> <link rel="stylesheet" href="{{ path('minifier', { 'f' : 'include/jslibs/jquery.mobile-1.2.1/jquery.mobile-1.2.1.css' }) }}" />
<script src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script> <script src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
<script src="{{ path('minifier', { 'f' : 'include/jslibs/jquery.mobile-1.2.1/jquery.mobile-1.2.1.js' }) }}"></script> <script src="{{ path('minifier', { 'f' : 'include/jslibs/jquery.mobile-1.2.1/jquery.mobile-1.2.1.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 stylesheet %}{% endblock %}
{% block icon %}{% endblock %} {% block icon %}{% endblock %}
{% block javascript %}{% endblock %} {% block javascript %}{% endblock %}

View File

@@ -72,11 +72,11 @@
{% macro format100percent(thumbnail, extraclass)%} {% macro format100percent(thumbnail, extraclass)%}
{% set record_type = thumbnail.get_type() %} {% set record_type = thumbnail.get_type() %}
<div style="width:100%" class="thumb_wrapper {{extraclass|default('')}}"> <div id="map">
{% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %} {% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %}
{% set random = thumbnail.get_random() %} {% set random = thumbnail.get_random() %}
<div class="record record_video imgTips" style="100%;"> <div class="record record_video imgTips">
<video type="video/mp4" controls="controls" style="width:100%;" autoplay="autoplay"> <video type="video/mp4" controls="controls" style="height:100%;" autoplay="autoplay">
<source src="{{thumbnail.get_url()}}" type="video/mp4"></source> <source src="{{thumbnail.get_url()}}" type="video/mp4"></source>
</video> </video>
</div> </div>
@@ -84,8 +84,6 @@
{% set random = thumbnail.get_random() %} {% set random = thumbnail.get_random() %}
<div class="record record_document imgTips" style="width:100%;"> <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> <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> </div>
<script type="text/javascript"> <script type="text/javascript">
swfobject.embedSWF("/include/FlexPaper_flash/FlexPaperViewer.swf", swfobject.embedSWF("/include/FlexPaper_flash/FlexPaperViewer.swf",
@@ -97,8 +95,6 @@
{% set random = thumbnail.get_random() %} {% set random = thumbnail.get_random() %}
<div class="record record_audio audioTips" style="width:100%;"> <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> <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> </div>
<script type="text/javascript"> <script type="text/javascript">
swfobject.embedSWF("/include/jslibs/audio-player/player.swf", swfobject.embedSWF("/include/jslibs/audio-player/player.swf",
@@ -106,12 +102,8 @@
"{{thumbnail.get_width()}}", "{{thumbnail.get_height()}}", "9.0.0", false, false, "{{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> {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 %} {% 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;"> 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 %} {% endif %}
</div> </div>
{% endmacro %} {% endmacro %}

View File

@@ -19,13 +19,12 @@
<a rel="external" href="{{ path('lightbox') }}" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a> <a rel="external" href="{{ path('lightbox') }}" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a>
</div> </div>
<div data-role="content"> <div data-role="content">
{{ thumbnail.format100percent(record.get_preview(),'', record.get_thumbnail()) }} {{ thumbnail.format100percent(record.get_preview()) }}
{% if basket_element.getBasket().getValidation() %} {% if basket_element.getBasket().getValidation() %}
{% if basket_element.getBasket().getValidation().getParticipant(app['authentication'].getUser(), app).getCanAgree() %} {% if basket_element.getBasket().getValidation().getParticipant(app['authentication'].getUser(), app).getCanAgree() %}
<fieldset data-role="controlgroup" data-type="horizontal" style="text-align:center;"> <fieldset data-role="controlgroup" data-type="horizontal" style="text-align:center;">
<input {% if basket_element.getUserValidationDatas(app['authentication'].getUser(), app).getAgreement() == true%}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-yes_{{basket_element.getId()}}" value="yes" /> <input {% if basket_element.getUserValidationDatas(app['authentication'].getUser(), app).getAgreement() == true%}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-yes_{{basket_element.getId()}}" value="yes" />
<label class="agreement_radio" style="width:130px;text-align:center;" for="radio-view-yes_{{basket_element.getId()}}">{% trans 'validation:: OUI' %}</label> <label class="agreement_radio" style="width:130px;text-align:center;" for="radio-view-yes_{{basket_element.getId()}}">{% trans 'validation:: OUI' %}</label>
<input {% if basket_element.getUserValidationDatas(app['authentication'].getUser(), app).getAgreement() == false and basket_element.getUserValidationDatas(app['authentication'].getUser(), app).getAgreement() is not null %}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-no_{{basket_element.getId()}}" value="no" /> <input {% if basket_element.getUserValidationDatas(app['authentication'].getUser(), app).getAgreement() == false and basket_element.getUserValidationDatas(app['authentication'].getUser(), app).getAgreement() is not null %}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-no_{{basket_element.getId()}}" value="no" />
<label class="agreement_radio" style="width:130px;text-align:center;" for="radio-view-no_{{basket_element.getId()}}">{% trans 'validation:: NON' %}</label> <label class="agreement_radio" style="width:130px;text-align:center;" for="radio-view-no_{{basket_element.getId()}}">{% trans 'validation:: NON' %}</label>
</fieldset> </fieldset>
@@ -45,5 +44,11 @@
<div data-role="footer"> <div data-role="footer">
</div> </div>
<script type="text/javascript">
$( window ).on( "orientationchange", function( event ) {
$("#map").height($(window).height() - 50);
});
$( window ).orientationchange();
</script>
</div> </div>
{% endblock %} {% endblock %}

View File

@@ -19,10 +19,16 @@
<a rel="external" href="{{ path('lightbox') }}" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a> <a rel="external" href="{{ path('lightbox') }}" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a>
</div> </div>
<div data-role="content"> <div data-role="content">
{{ thumbnail.format100percent(record.get_preview(),'', record.get_thumbnail()) }} {{ thumbnail.format100percent(record.get_preview()) }}
</div> </div>
<div data-role="footer"> <div data-role="footer">
</div> </div>
<script type="text/javascript">
$( window ).on( "orientationchange", function( event ) {
$("#map").height($(window).height() - 50);
});
$( window ).orientationchange();
</script>
</div> </div>
{% endblock %} {% endblock %}

View File

@@ -39,7 +39,7 @@
<a href="#about" class="ui-btn-right">{% trans 'a propos'%}</a> <a href="#about" class="ui-btn-right">{% trans 'a propos'%}</a>
</div> </div>
<div data-role="content"> <div data-role="content">
<ul data-role="listview"> <ul data-role="listview" style="width:100%;margin: 0;">
<li> <li>
<a href="#validation">{% trans 'Validations'%}</a> <a href="#validation">{% trans 'Validations'%}</a>
<span class="ui-li-count">{{_self.valid_baskets_length(baskets_collection)}}</span> <span class="ui-li-count">{{_self.valid_baskets_length(baskets_collection)}}</span>
@@ -86,7 +86,7 @@
<p> <p>
{% trans 'Voici vos validations en cours' %} {% trans 'Voici vos validations en cours' %}
</p> </p>
<ul data-role="listview"> <ul data-role="listview" style="width:100%;margin: 0;">
{% for basket in baskets_collection %} {% for basket in baskets_collection %}
{% if basket.getValidation() %} {% if basket.getValidation() %}
{% set basket_length = basket.getElements().count() %} {% set basket_length = basket.getElements().count() %}
@@ -115,7 +115,7 @@
<p> <p>
{% trans 'Voici vos paniers' %} {% trans 'Voici vos paniers' %}
</p> </p>
<ul data-role="listview"> <ul data-role="listview" style="width:100%;margin: 0;">
{% for basket in baskets_collection %} {% for basket in baskets_collection %}
{% if basket.getValidation() is empty %} {% if basket.getValidation() is empty %}
{% set basket_length = basket.getElements().count() %} {% set basket_length = basket.getElements().count() %}