Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11138 from fghaas/no-video-if-unset

Browse Source 
lms: Only show welcome video if show_homepage_promo_video is set
This commit is contained in:
Matt Drayer
2016-02-03 13:08:31 -05:00
parent b35bfe04f1 e1ce4059e1
commit 71a6779dfa
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@@ -264,3 +264,4 @@ Mariana Araújo <simbelm.ne@gmail.com>
Muhammad Ayub Khan <ayub.khan@arbisoft.com>
Kaloian Doganov <doganov@gmail.com>
Sanford Student <sstudent@edx.org>
Florian Haas <florian@hastexo.com>

3
common/test/acceptance/tests/lms/test_lms_index.py
View File

@@ -48,9 +48,8 @@ class LmsIndexPageTest(BaseLmsIndexTest):
# Ensure the introduction video element is not shown
self.assertFalse(self.page.intro_video_element.visible)
# @fghaas: The below presence check can now be modified along with your changeset
# Still need to figure out how to swap platform settings in the context of a bok choy test
# but we can at least prevent accidental exposure with these validations going forward
# Note: 'present' is a DOM check, whereas 'visible' is an actual browser/screen check
self.assertTrue(self.page.video_modal_element.present)
self.assertFalse(self.page.video_modal_element.present)
self.assertFalse(self.page.video_modal_element.visible)

22
lms/templates/index.html
View File

@@ -53,16 +53,18 @@ from django.core.urlresolvers import reverse
</section>
<section id="video-modal" class="modal home-page-video-modal video-modal">
<div class="inner-wrapper">
<%
youtube_video_id = homepage_promo_video_youtube_id
if self.stanford_theme_enabled():
youtube_video_id = "2gmreZObCY4"
%>
<iframe title="YouTube Video" width="640" height="360" src="//www.youtube.com/embed/${youtube_video_id}?showinfo=0" frameborder="0" allowfullscreen></iframe>
</div>
</section>
% if show_homepage_promo_video:
<section id="video-modal" class="modal home-page-video-modal video-modal">
<div class="inner-wrapper">
<%
youtube_video_id = homepage_promo_video_youtube_id
if self.stanford_theme_enabled():
youtube_video_id = "2gmreZObCY4"
%>
<iframe title="YouTube Video" width="640" height="360" src="//www.youtube.com/embed/${youtube_video_id}?showinfo=0" frameborder="0" allowfullscreen></iframe>
</div>
</section>
% endif
<%block name="js_extra">
<script type="text/javascript">