Fix Conference live streaming

diff --git a/teleforma/management/commands/teleforma-import-seminar-media-update.py b/teleforma/management/commands/teleforma-import-seminar-media-update.py
index 47d4a62fe26a234a4bf6e3e3a6756bf4279a7f2a..b25d2183c8a365bcdf135c3484264729314b175b 100644 (file)
--- a/teleforma/management/commands/teleforma-import-seminar-media-update.py
+++ b/teleforma/management/commands/teleforma-import-seminar-media-update.py
@@ -165,6 +165,10 @@ class Command(BaseCommand):
                     course = Course.objects.get(code=course_code)
                     department, c = Department.objects.get_or_create(name=department_name,
                                                                      organization=organization)
+                    #ss = Seminar.objects.filter(course=course,
+                    #                        rank=seminar_rank, period=period)
+                    #print([s.id for s in ss])
+
                     seminar, c = Seminar.objects.get_or_create(course=course,
                                             rank=seminar_rank, period=period)
                     if c:

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index 618f1df061edf189a2da94f7624fe4e74ab13158..619ceed33c92bbe5b83c1e03869390ca7eddb608 100644 (file)
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -324,14 +324,14 @@ class LiveStream(Model):
     @property
     def slug(self):
         slug = '-'.join([self.conference.course.department.slug,
-                         self.conference.course.slug,
+                         self.conference.course.code,
                          self.conference.course_type.name.lower()])
         return slug
 
     @property
     def mount_point(self):
         if self.server.type == 'stream-m':
-            return  'consume/' + self.slug
+            return self.server.type +'/consume/' + self.slug
         else:
             return self.slug + '.' + self.stream_type
 
@@ -345,11 +345,12 @@ class LiveStream(Model):
 
     @property
     def url(self):
-        return 'http://' + self.server.host + ':' + self.server.port + '/' + self.mount_point
+        url = 'https://' + self.server.host + ':' + str(self.server.port) + '/' + self.mount_point
+        return url
 
     def __unicode__(self):
         if self.conference:
-            return self.conference.description
+            return self.conference.title
         else:
             return self.slug
 

diff --git a/teleforma/templates/teleforma/course_conference.html b/teleforma/templates/teleforma/course_conference.html
index 8bd754b2528ca1259426bc651552b81da5a4d8d6..3d4b26832ee541247c3aaf47bbbc67658fa01aa3 100644 (file)
--- a/teleforma/templates/teleforma/course_conference.html
+++ b/teleforma/templates/teleforma/course_conference.html
@@ -53,7 +53,7 @@
 <div class="video">
 <video width="640" height="360" controls autoplay preload="auto">
 <!-- Hello Chrome and Firefox (and Opera?) -->
-<source src="{{ livestream.url|set_host:HOST }}" type="video/webm" />
+<source src="{{ livestream.url }}" type="video/webm" />
 </video>
 </div>
 {% endif %}

diff --git a/teleforma/templates/teleforma/seminars.html b/teleforma/templates/teleforma/seminars.html
index 51d86b118e4e23c3460d3b18d12427b84f35ad24..da38f318b1deb15ad33a75b109bd7cbc6a8562ed 100644 (file)
--- a/teleforma/templates/teleforma/seminars.html
+++ b/teleforma/templates/teleforma/seminars.html
@@ -53,6 +53,7 @@ $(function() {
 </div>
 </div>
 
+<div class="module">
 <h3><a href="{% url teleforma-desk %}"><img src="{{ STATIC_URL }}telemeta/images/module_playlist.png" alt="playlists" style="vertical-align:middle" />{% trans "My conferences" %}</a></h3>
 <div style="background: white;">
 <ul id="seminars">