Merge lp:~daker/summit/fix.1147975 into lp:summit

Proposed by Adnane Belmadiaf
Status: Merged
Approved by: Michael Hall
Approved revision: 506
Merged at revision: 509
Proposed branch: lp:~daker/summit/fix.1147975
Merge into: lp:summit
Diff against target: 21 lines (+2/-2)
1 file modified
summit/schedule/templates/schedule/virtual_meeting.html (+2/-2)
To merge this branch: bzr merge lp:~daker/summit/fix.1147975
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+152571@code.launchpad.net

Commit message

Autoplay Youtube stream

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'summit/schedule/templates/schedule/virtual_meeting.html'
--- summit/schedule/templates/schedule/virtual_meeting.html 2013-03-07 03:23:49 +0000
+++ summit/schedule/templates/schedule/virtual_meeting.html 2013-03-09 22:41:19 +0000
@@ -101,7 +101,7 @@
101 <section class="span-12">101 <section class="span-12">
102 <div id="broadcast_video" align="center">102 <div id="broadcast_video" align="center">
103 {% if meeting.broadcast_url %}103 {% if meeting.broadcast_url %}
104 <iframe style="width:100%;" height="395" src="{{ meeting.broadcast_url }}" frameborder="0" allowfullscreen></iframe>104 <iframe style="width:100%;" height="395" src="{{ meeting.broadcast_url }}?autoplay=1&amp;autohide=1" frameborder="0" allowfullscreen></iframe>
105 {% else %}105 {% else %}
106 <img style="width:100%;" height="395" src="{{ MEDIA_URL }}images/youtube_placeholder.png">106 <img style="width:100%;" height="395" src="{{ MEDIA_URL }}images/youtube_placeholder.png">
107 <script>107 <script>
@@ -111,7 +111,7 @@
111 $.getJSON('/api/meeting/{{ meeting.id }}/',111 $.getJSON('/api/meeting/{{ meeting.id }}/',
112 function(meeting) {112 function(meeting) {
113 if (meeting.broadcast_url != '' && meeting.broadcast_url != null) {113 if (meeting.broadcast_url != '' && meeting.broadcast_url != null) {
114 $('#broadcast_video').html('<iframe style="width:100%;" height="395" src="'+meeting.broadcast_url+'" frameborder="0" allowfullscreen></iframe>');114 $('#broadcast_video').html('<iframe style="width:100%;" height="395" src="'+meeting.broadcast_url+'?autoplay=1&amp;autohide=1" frameborder="0" allowfullscreen></iframe>');
115 } else {115 } else {
116 setTimeout(update_video, 20000);116 setTimeout(update_video, 20000);
117 }117 }

Subscribers

People subscribed via source and target branches