From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 17 Sep 2013 16:38:08 +0000 (+0200)
Subject: Merge branch 'crfpa' into tc202
X-Git-Tag: 1.3-TC~20^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cead587b425e3d24f101e78262b31c54416df04f;p=teleforma.git

Merge branch 'crfpa' into tc202

Conflicts:
	teleforma/templates/teleforma/course_media.html
---

cead587b425e3d24f101e78262b31c54416df04f
diff --cc teleforma/templates/teleforma/course_media.html
index c817acd4,102319de..ad61076a
--- a/teleforma/templates/teleforma/course_media.html
+++ b/teleforma/templates/teleforma/course_media.html
@@@ -97,8 -97,7 +97,7 @@@ $(document).ready(function()
  {% if "video" in media.mime_type %}
  <div class="video">
  <video id="my_video_1" class="video-js vjs-default-skin" width="640" height="360" controls preload="auto" data-setup='{}' {% if media.item.related.all %}{% for related in media.item.related.all %}{% if related.title == "preview" %}{% thumbnail related.file "640" as im %}poster="{{ im.url }}"{% endthumbnail %}{% endif %}{% endfor %}{% endif %}>
- <!-- Hello Chrome and Firefox (and Opera?) -->
 -<source src="{{ MEDIA_URL }}{{ media.item.file }}" type="{{ media.mime_type }}" />
 +<source src="{{ MEDIA_URL|set_host:host }}{{ media.item.file }}" type="{{ media.mime_type }}" />
  </video>
  </div>