From b501367ed3b6bf01cb3f49bd1d19a27ac049fba0 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Tue, 28 Aug 2012 10:32:15 -0400
Subject: [PATCH 1/8] make the test ajax_url format consistent with real code

* specifically, no trailing slash
---
 common/lib/xmodule/xmodule/tests/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/tests/__init__.py b/common/lib/xmodule/xmodule/tests/__init__.py
index 4103a7373e..654b6beb15 100644
--- a/common/lib/xmodule/xmodule/tests/__init__.py
+++ b/common/lib/xmodule/xmodule/tests/__init__.py
@@ -29,7 +29,7 @@ from nose.plugins.skip import SkipTest
 from mock import Mock
 
 i4xs = ModuleSystem(
-    ajax_url='/',
+    ajax_url='courses/course_id/modx/a_location',
     track_function=Mock(),
     get_module=Mock(),
     render_template=Mock(),

From e47134bd1097a1c703ab1065dd9d914ca8e802f5 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Wed, 12 Sep 2012 13:20:15 -0400
Subject: [PATCH 2/8] turn off psychometrics in dev.py--the necessary migration
 is not present

---
 lms/envs/dev.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index 5a7e019e55..a9f1454193 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -20,7 +20,7 @@ MITX_FEATURES['SUBDOMAIN_COURSE_LISTINGS'] = False  # Enable to test subdomains-
 MITX_FEATURES['SUBDOMAIN_BRANDING'] = True
 MITX_FEATURES['FORCE_UNIVERSITY_DOMAIN'] = None		# show all university courses if in dev (ie don't use HTTP_HOST)
 MITX_FEATURES['ENABLE_MANUAL_GIT_RELOAD'] = True
-MITX_FEATURES['ENABLE_PSYCHOMETRICS'] = True    # real-time psychometrics (eg item response theory analysis in instructor dashboard)
+MITX_FEATURES['ENABLE_PSYCHOMETRICS'] = False    # real-time psychometrics (eg item response theory analysis in instructor dashboard)
 
 
 WIKI_ENABLED = True

From b6b9b1591242a165c6d9365f81a012bcd4e9a705 Mon Sep 17 00:00:00 2001
From: Sarina <sarina@mitx.mit.edu>
Date: Wed, 12 Sep 2012 14:58:23 -0300
Subject: [PATCH 3/8] Make clear where to specify display_name in xml

---
 doc/xml-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/xml-format.md b/doc/xml-format.md
index e1439ee97d..29c60fea99 100644
--- a/doc/xml-format.md
+++ b/doc/xml-format.md
@@ -299,7 +299,7 @@ This is a sketch ("tue" is not a valid start date), that should help illustrate
 
 ## Specifying metadata in the xml file
 
-Metadata can also live in the xml files, but anything defined in the policy file overrides anything in the xml.  This is primarily for backwards compatibility, and you should probably  not use both.  If you do leave some metadata tags in the xml, you should be consistent (e.g. if `display_name`s stay in xml, they should all stay in xml).
+Metadata can also live in the xml files, but anything defined in the policy file overrides anything in the xml.  This is primarily for backwards compatibility, and you should probably  not use both.  If you do leave some metadata tags in the xml, you should be consistent (e.g. if `display_name`s stay in xml, they should all stay in xml. Note `display_name` should be specified in the problem xml definition itself, ie, <problem display_name="Title"> Problem Text </problem>, in file ProblemFoo.xml).
    - note, some xml attributes are not metadata.  e.g. in `<video youtube="xyz987293487293847"/>`, the `youtube` attribute specifies what video this is, and is logically part of the content, not the policy, so it should stay in the xml.
 
 Another example policy file:

From 27fa9a38d8486b59cdb4fc7a9b49229aed1c3401 Mon Sep 17 00:00:00 2001
From: "Carlos A. Rocha" <carlos.rocha@gmail.com>
Date: Wed, 12 Sep 2012 23:56:05 -0400
Subject: [PATCH 4/8] Temporary fix for youTube iframe player issues

---
 .../js/src/video/display/video_player.coffee  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee b/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee
index 4b265d20c8..0a387ea52e 100644
--- a/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee
+++ b/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee
@@ -34,17 +34,17 @@ class @VideoPlayer extends Subview
       @volumeControl = new VideoVolumeControl el: @$('.secondary-controls')
     @speedControl = new VideoSpeedControl el: @$('.secondary-controls'), speeds: @video.speeds, currentSpeed: @currentSpeed()
     @progressSlider = new VideoProgressSlider el: @$('.slider')
-    @player = new YT.Player @video.id,
-      playerVars:
-        controls: 0
-        wmode: 'transparent'
-        rel: 0
-        showinfo: 0
-        enablejsapi: 1
-      videoId: @video.youtubeId()
-      events:
-        onReady: @onReady
-        onStateChange: @onStateChange
+
+    params = { allowScriptAccess: "always" };
+    atts = { id: @videoid };
+    youtubeId = @video.youtubeId()
+
+    window.onYouTubePlayerReady = (e) =>
+        @player = document.getElementById("#{@video.id}")
+
+    swfobject.embedSWF("http://www.youtube.com/apiplayer?video_id=#{youtubeId}&enablejsapi=1&version=3&playerapiid=ytplayer&controls=0",
+                       @video.id, "425", "356", "9", null, null, params, atts )
+
 
   addToolTip: ->
     @$('.add-fullscreen, .hide-subtitles').qtip

From 11d0c0d4b63705455b206b333a387551d336fd2e Mon Sep 17 00:00:00 2001
From: "Carlos A. Rocha" <carlos.rocha@gmail.com>
Date: Thu, 13 Sep 2012 00:10:20 -0400
Subject: [PATCH 5/8] Remove video controls, use default youTube controls
 instead

---
 .../js/src/video/display/video_player.coffee   | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee b/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee
index 0a387ea52e..45d0ed4d50 100644
--- a/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee
+++ b/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee
@@ -24,26 +24,12 @@ class @VideoPlayer extends Subview
       @toggleFullScreen(event)
 
   render: ->
-    @control = new VideoControl el: @$('.video-controls')
-    @caption = new VideoCaption
-        el: @el
-        youtubeId: @video.youtubeId('1.0')
-        currentSpeed: @currentSpeed()
-        captionDataDir: @video.caption_data_dir
-    unless onTouchBasedDevice()
-      @volumeControl = new VideoVolumeControl el: @$('.secondary-controls')
-    @speedControl = new VideoSpeedControl el: @$('.secondary-controls'), speeds: @video.speeds, currentSpeed: @currentSpeed()
-    @progressSlider = new VideoProgressSlider el: @$('.slider')
-
     params = { allowScriptAccess: "always" };
     atts = { id: @videoid };
     youtubeId = @video.youtubeId()
 
-    window.onYouTubePlayerReady = (e) =>
-        @player = document.getElementById("#{@video.id}")
-
-    swfobject.embedSWF("http://www.youtube.com/apiplayer?video_id=#{youtubeId}&enablejsapi=1&version=3&playerapiid=ytplayer&controls=0",
-                       @video.id, "425", "356", "9", null, null, params, atts )
+    swfobject.embedSWF("http://www.youtube.com/v/#{youtubeId}?enablejsapi=1&version=3&playerapiid=ytplayer",
+                         @video.id, "425", "356", "9", null, null, params, atts )
 
 
   addToolTip: ->

From df5e6d68608e4d529e6c65a789c4a6144a4ae231 Mon Sep 17 00:00:00 2001
From: "Carlos A. Rocha" <carlos.rocha@gmail.com>
Date: Thu, 13 Sep 2012 00:16:13 -0400
Subject: [PATCH 6/8] Replace http with https for embedder youTube

---
 .../xmodule/xmodule/js/src/video/display/video_player.coffee    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee b/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee
index 45d0ed4d50..fed4a0b672 100644
--- a/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee
+++ b/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee
@@ -28,7 +28,7 @@ class @VideoPlayer extends Subview
     atts = { id: @videoid };
     youtubeId = @video.youtubeId()
 
-    swfobject.embedSWF("http://www.youtube.com/v/#{youtubeId}?enablejsapi=1&version=3&playerapiid=ytplayer",
+    swfobject.embedSWF("https://www.youtube.com/v/#{youtubeId}?enablejsapi=1&version=3&playerapiid=ytplayer",
                          @video.id, "425", "356", "9", null, null, params, atts )
 
 

From 67cbf50b839b7feb54b8b0c69572040a37000853 Mon Sep 17 00:00:00 2001
From: "Carlos A. Rocha" <carlos.rocha@gmail.com>
Date: Thu, 13 Sep 2012 01:08:59 -0400
Subject: [PATCH 7/8] Fix swfobject and django-pipeline - Cosmetic fix for
 youtube player

---
 .../xmodule/xmodule/js/src/video/display/video_player.coffee    | 2 +-
 lms/envs/common.py                                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee b/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee
index fed4a0b672..b83cda80d6 100644
--- a/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee
+++ b/common/lib/xmodule/xmodule/js/src/video/display/video_player.coffee
@@ -28,7 +28,7 @@ class @VideoPlayer extends Subview
     atts = { id: @videoid };
     youtubeId = @video.youtubeId()
 
-    swfobject.embedSWF("https://www.youtube.com/v/#{youtubeId}?enablejsapi=1&version=3&playerapiid=ytplayer",
+    swfobject.embedSWF("https://www.youtube.com/v/#{youtubeId}?enablejsapi=1&version=3&playerapiid=ytplayer&rel=0&modestbranding=1&showsearch=0&showinfo=0",
                          @video.id, "425", "356", "9", null, null, params, atts )
 
 
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 3cfaae940d..f4e007d926 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -443,9 +443,9 @@ courseware_only_js += [
 main_vendor_js = [
   'js/vendor/jquery.min.js',
   'js/vendor/jquery-ui.min.js',
-  'js/vendor/swfobject/swfobject.js',
   'js/vendor/jquery.cookie.js',
   'js/vendor/jquery.qtip.min.js',
+  'js/vendor/swfobject/swfobject.js',
 ]
 
 discussion_js = sorted(glob2.glob(PROJECT_ROOT / 'static/coffee/src/discussion/*.coffee'))

From e0c7cef65fe245b9d9be7e413014805a9c039636 Mon Sep 17 00:00:00 2001
From: "Carlos A. Rocha" <carlos.rocha@gmail.com>
Date: Thu, 13 Sep 2012 01:35:25 -0400
Subject: [PATCH 8/8] Workaround for swfobject - pipeline problems

---
 lms/templates/video.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lms/templates/video.html b/lms/templates/video.html
index bd3ec77fbe..25652e51fa 100644
--- a/lms/templates/video.html
+++ b/lms/templates/video.html
@@ -2,6 +2,8 @@
   <h2> ${display_name} </h2>
 % endif
 
+<script type="text/javascript" src="/static/js/vendor/swfobject/swfobject.js"></script>
+
 <div id="video_${id}" class="video" data-streams="${streams}" data-caption-data-dir="${data_dir}" data-show-captions="${show_captions}">
   <div class="tc-wrapper">
     <article class="video-wrapper">