Move the videos in a different slider than the images

diff --git a/app/templates/core/inc/slider.html b/app/templates/core/inc/slider.html
index 39993ce5b750bf168d18f72977aec19ed86ce862..4b10131937bfecc482969827d45d5549b9bbb42b 100644 (file)
--- a/app/templates/core/inc/slider.html
+++ b/app/templates/core/inc/slider.html
@@ -17,21 +17,5 @@
                 </div>
             </li>
         {% endfor %}
-        {% for video in videos %}
-            <li class="slider-page__slide">
-                <div class="slider-page__wrapper">
-                    <div class="slider-page__video">
-                        <video controls class="video-js vjs-ircam-skin" data-setup='{"aspectRatio":"905:520"}' {% if video.poster_url %}poster="{{ video.poster_url }}"{% endif %}>
-                            <source src="{{ video.closed_source_url }}" type="{{ video.closed_source_mime_type }}">
-                            <source src="{{ video.open_source_url }}" type="{{ video.open_source_mime_type }}">
-                            Your browser does not support the video tag.
-                        </video>
-                    </div>
-                    <div class="slider-page__caption">
-                        {{ video.title }}
-                    </div>
-                </div>
-            </li>
-        {% endfor %}
     </ul>
 </div>

diff --git a/app/templates/core/inc/slider_video.html b/app/templates/core/inc/slider_video.html
new file mode 100644 (file)
index 0000000..30ebaad
--- /dev/null
+++ b/app/templates/core/inc/slider_video.html
@@ -0,0 +1,21 @@
+{% load mezzanine_tags %}
+<div class="page__slider">
+    <ul class="slider-page" data-slider-page>
+        {% for video in videos %}
+            <li class="slider-page__slide">
+                <div class="slider-page__wrapper">
+                    <div class="slider-page__video">
+                        <video controls class="video-js vjs-ircam-skin" data-setup='{"aspectRatio":"905:520"}' {% if video.poster_url %}poster="{{ video.poster_url }}"{% endif %}>
+                            <source src="{{ video.closed_source_url }}" type="{{ video.closed_source_mime_type }}">
+                            <source src="{{ video.open_source_url }}" type="{{ video.open_source_mime_type }}">
+                            Your browser does not support the video tag.
+                        </video>
+                    </div>
+                    <div class="slider-page__caption">
+                        {{ video.title }}
+                    </div>
+                </div>
+            </li>
+        {% endfor %}
+    </ul>
+</div>

diff --git a/app/templates/pages/custompage.html b/app/templates/pages/custompage.html
index de79eb9238d17be3e7f81fe484e2f9509826f1f8..8820e006aac0e8fcd9b8d5b6699684438749cf6a 100644 (file)
--- a/app/templates/pages/custompage.html
+++ b/app/templates/pages/custompage.html
@@ -68,11 +68,17 @@
 
 {% block page_slider %}
   {% with page.custompage.images.all|get_type:'page_slider' as slider_images %}
-  {% with page.custompage.videos.all as videos %}
     {% if slider_images %}
       {% include 'core/inc/slider.html' %}
     {% endif %}
   {% endwith %}
+{% endblock %}
+
+{% block page_video %}
+  {% with page.custompage.videos.all as videos %}
+    {% if videos %}
+      {% include 'core/inc/slider_video.html' %}
+    {% endif %}
   {% endwith %}
 {% endblock %}
 

diff --git a/app/templates/pages/departmentpage.html b/app/templates/pages/departmentpage.html
index 1715a7e68828bd822bf0f141aeffbdfa94ee078e..ee2a69268e71c2a14e716f7b220c04a02ffe714d 100644 (file)
--- a/app/templates/pages/departmentpage.html
+++ b/app/templates/pages/departmentpage.html
@@ -58,15 +58,20 @@
   {% endwith %}
 {% endblock %}
 
-
 {% block page_slider %}
 {% with page.departmentpage.images.all|get_type:'page_slider' as slider_images %}
-{% with page.departmentpage.videos.all as videos %}
   {% if slider_images %}
     {% include 'core/inc/slider.html' %}
   {% endif %}
 {% endwith %}
-{% endwith %}
+{% endblock %}
+
+{% block page_video %}
+  {% with page.departmentpage.videos.all as videos %}
+    {% if videos %}
+      {% include 'core/inc/slider_video.html' %}
+    {% endif %}
+  {% endwith %}
 {% endblock %}
 
 {% block page_sub_content %}

diff --git a/app/templates/pages/page.html b/app/templates/pages/page.html
index f353fbdab691e34f60189ce8bf71afba90b39ec2..0c6c0f4824eeb7d23c2f25d97579ee3b4666dc25 100644 (file)
--- a/app/templates/pages/page.html
+++ b/app/templates/pages/page.html
@@ -61,6 +61,8 @@
         </div>
         {% block page_slider %}
         {% endblock %}
+        {% block page_video %}
+        {% endblock %}
         {% block page_audio %}
         {% endblock %}
         {% block page_sub_content %}

diff --git a/app/templates/pages/teampage.html b/app/templates/pages/teampage.html
index da260abbc60f3a5fc07a1930ee7e1f7b681a4070..7560e1ba832a23bb0a26595dde7e04683b72d19d 100644 (file)
--- a/app/templates/pages/teampage.html
+++ b/app/templates/pages/teampage.html
@@ -70,14 +70,21 @@
 
 {% block page_slider %}
     {% with page.teampage.images.all|get_type:'page_slider' as slider_images %}
-    {% with page.teampage.videos.all as videos %}
       {% if slider_images %}
         {% include 'core/inc/slider.html' %}
       {% endif %}
     {% endwith %}
-    {% endwith %}
 {% endblock %}
 
+{% block page_video %}
+  {% with page.teampage.videos.all as videos %}
+    {% if videos %}
+      {% include 'core/inc/slider_video.html' %}
+    {% endif %}
+  {% endwith %}
+{% endblock %}
+
+
 {% block page_sub_content %}
   {% with page.teampage.blocks.all as blocks %}
     {% include "core/inc/block.html" %}