From: Emilie Date: Wed, 15 Mar 2017 15:18:05 +0000 (+0100) Subject: [Vertigo M&C] responsive iframe, overlay, video X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e299fdc475b4d90f25eff87c4f223a2cd0c97dfa;p=mezzo.git [Vertigo M&C] responsive iframe, overlay, video --- diff --git a/app/themes/base/static/src/sass/modules/_live-streaming.scss b/app/themes/base/static/src/sass/modules/_live-streaming.scss index 9e36fc41..34f96a92 100644 --- a/app/themes/base/static/src/sass/modules/_live-streaming.scss +++ b/app/themes/base/static/src/sass/modules/_live-streaming.scss @@ -26,27 +26,37 @@ $module: ".page--live-streaming"; margin-bottom : 30px; } & .page__content { - text-align: center; - + height: 720px; + padding-left: 70px; + padding-right: 70px; } video { - margin-top: 30px; } + iframe { + height: 100%; + max-height: 720px; + + @include mq($until: sm) { + max-height: 690px; + } + } .countdown-overlay { background: #000000 none repeat scroll 0 0; color: white; + font-family: "Oswald",sans-serif; font-size: 2em; - height: 720px; - left: 70px; + height: 100%; + max-height: 720px; + padding-left: 70px; + padding-right: 70px; position: absolute; top: 60px; - width: 1280px; + left: 0px; + width: 100%; z-index: 90; - vertical-align: auto; - font-family: "Oswald",sans-serif; } #countdown-title { diff --git a/app/themes/base/templates/media/live_streaming/base.html b/app/themes/base/templates/media/live_streaming/base.html deleted file mode 100644 index 3e3fd0b7..00000000 --- a/app/themes/base/templates/media/live_streaming/base.html +++ /dev/null @@ -1,174 +0,0 @@ -{% extends "base.html" %} -{% load i18n mezzanine_tags keyword_tags organization_tags pages_tags %} - -{% block meta_title %}{{ page.meta_title }}{% endblock %} - -{% block meta_keywords %}{% metablock %} -{% keywords_for page as keywords %} -{% for keyword in keywords %} - {% if not forloop.first %}, {% endif %} - {{ keyword }} -{% endfor %} -{% endmetablock %}{% endblock %} - -{% block meta_description %}{% metablock %} -{{ page.description }} -{% endmetablock %}{% endblock %} - -{% block main %} - - {% block hero %} - {% endblock %} - -
-
- -
- -
- {% block page_title %} - {{ page.title }} - {% endblock %} -
- -
- -
- -
- -
- {% block page_sidebar %} - {% endblock %} -
- -
- -
- {% block page_content %} - {{ page.content }} - {% endblock %} - {% block page_link %} - {% with object.links.all as links %} - {% if links %} - {% include 'core/inc/link.html' %} - {% endif %} - {% endwith %} - {% endblock %} - {% block page_file %} - {% with object.files.all as files %} - {% if files %} - {% include 'core/inc/files.html' %} - {% endif %} - {% endwith %} - {% endblock %} - {% block page_audio %} - {% for related in object.playlists.all %} - {% with related.playlist as playlist %} - {% if playlist.type == 'audio' %} - {% include 'media/inc/playlist_audio_detail.html' %} - {% endif %} - {% endwith %} - {% endfor %} - {% endblock %} -
- -
- -
- - {% block page_slider %} - {% with object.images.all|get_type:'page_slider' as slider_images %} - {% if slider_images %} - {% include 'core/inc/slider.html' %} - {% endif %} - {% endwith %} - {% endblock %} - - {% block page_video %} - {% for related in object.playlists.all %} - {% with related.playlist as playlist %} - {% if playlist.type == 'video' %} - {% include 'media/inc/playlist_video_slider.html' %} - {% endif %} - {% endwith %} - {% endfor %} - {% endblock %} - -
- - {% block page_person_list %} - {% endblock %} - - {% block page_demo %} - {% endblock %} - - {% block page_blog %} - {% endblock %} - - {% block page_sub_content %} - {% with object.blocks.all as blocks %} - {% include "core/inc/block.html" %} - {% endwith %} - {% endblock %} - - {% block related_project %} - {% endblock %} - - {% block products %} - {% if page.product_lists.all|length > 0 %} - {% for page_product_list in page.product_lists.all %} - {% with page_product_list.list as list %} - {% with "shop/includes/product_list_"|add:list.style|add:"_style.html" as template %} - {% include template %} - {% endwith %} - {% endwith %} - {% endfor %} - {% endif %} - {% endblock %} - - {% block page_sub_content_2 %} - {% endblock %} - - {% block page_person_list_team %} - {% endblock %} - - {% block page_sub_content_3 %} - {% endblock %} - - {% block logo %} - {% with page.images.all|get_type:'logo' as images %} - {% if images %} -
-
-
-
-
-
    - {% include 'core/inc/logo.html' %} -
-
-
-
-
-
- {% endif %} - {% endwith %} - {% endblock %} - -
- -
- -
- - {% block page_related_content %} - {% with dynamic_content=page.dynamic_content_pages.all|filter_content object=page %} - {% include "core/inc/related_content.html" %} - {% endwith %} - {% endblock %} - -
- - -{% endblock %} diff --git a/app/themes/base/templates/media/live_streaming/live_streaming_detail.html b/app/themes/base/templates/media/live_streaming/live_streaming_detail.html index 09b145b9..fef8b508 100644 --- a/app/themes/base/templates/media/live_streaming/live_streaming_detail.html +++ b/app/themes/base/templates/media/live_streaming/live_streaming_detail.html @@ -21,19 +21,15 @@ {% if type == "youtube" %} {% if object.youtube_id %} -

{% trans "If the YouTube streaming does not work, try the HTML5 version by" %} {% trans "clicking here" %} - -

- -
+

If YouTube streaming is not working, try HTML5 version by clicking here

+ {% else %}

Please fill youtube id

{% endif %} {% elif type == "html5" %} {% if object.html5_url %} -

{% trans "If the HTML5 streaming does not work, try the YouTube version by" %} {% trans "clicking here" %} - -

If HTML5 streaming is not working, try Youtube version by clicking here

+ {% else %} diff --git a/app/themes/base/templates/media/media_base.html b/app/themes/base/templates/media/media_base.html index cfe5065b..ad9d892f 100644 --- a/app/themes/base/templates/media/media_base.html +++ b/app/themes/base/templates/media/media_base.html @@ -22,7 +22,7 @@
-
+
{% block page_content %} {{ page.content }} {% endblock %}