Merge lp:~cjohnston/summit/refresh-hangout-link into lp:summit

Proposed by Chris Johnston
Status: Work in progress
Proposed branch: lp:~cjohnston/summit/refresh-hangout-link
Merge into: lp:summit
Diff against target: 25 lines (+5/-0)
1 file modified
summit/schedule/templates/schedule/virtual_meeting.html (+5/-0)
To merge this branch: bzr merge lp:~cjohnston/summit/refresh-hangout-link
Reviewer Review Type Date Requested Status
Michael Hall (community) Needs Fixing
Adnane Belmadiaf Approve
Review via email: mp+151614@code.launchpad.net

Commit message

Refresh hangout link when the broadcast url is added

To post a comment you must log in.
Revision history for this message
Adnane Belmadiaf (daker) wrote :

+1 from me

review: Approve
Revision history for this message
Michael Hall (mhall119) wrote :

Doesn't work

review: Needs Fixing
Revision history for this message
Adnane Belmadiaf (daker) wrote :

i think it should be something like :
$('#hangout_url').html('<h3><a href="'+ meeting.hangout_url +'">Join the Hangout on Air</a></h3>');
since we need to get the link from json object not the python object

Revision history for this message
Michael Hall (mhall119) wrote :

Except you're not going to get meeting.hangout_url from the JSON API because we filter that out so that it isn't publicly available, and we can't filter based on an instance of the data being returned ATM

Unmerged revisions

497. By Chris Johnston

Refresh join hangout link

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/schedule/templates/schedule/virtual_meeting.html'
2--- summit/schedule/templates/schedule/virtual_meeting.html 2013-03-04 17:47:31 +0000
3+++ summit/schedule/templates/schedule/virtual_meeting.html 2013-03-04 21:02:21 +0000
4@@ -91,9 +91,11 @@
5 {% endif %}
6 <div id="description">
7 {{ meeting.description|markdown:'safe' }}
8+ <div id="hangout_url">
9 {% if required and meeting.hangout_url %}
10 <h3><a href="{{ meeting.hangout_url }}">Join the Hangout on Air</a></h3>
11 {% endif %}
12+ </div>
13 </div>
14 </section>
15 </div>
16@@ -112,6 +114,9 @@
17 function(meeting) {
18 if (meeting.broadcast_url != '' && meeting.broadcast_url != null) {
19 $('#broadcast_video').html('<iframe style="width:100%;" height="395" src="'+meeting.broadcast_url+'" frameborder="0" allowfullscreen></iframe>');
20+ {% if required %}
21+ $('#hangout_url').html('<h3><a href="{{ meeting.hangout_url }}">Join the Hangout on Air</a></h3>');
22+ {% endif %}
23 } else {
24 setTimeout(update_video, 20000);
25 }

Subscribers

People subscribed via source and target branches