Summit

Merge lp:~mhall119/summit/video-placeholder into lp:summit

  1. video-placeholder
  2. Merge into trunk
Proposed by Michael Hall
Status: Merged
Approved by: Chris Johnston
Approved revision: 486
Merged at revision: 486
Proposed branch: lp:~mhall119/summit/video-placeholder
Merge into: lp:summit
Diff against target: 29 lines (+8/-2)
1 file modified
summit/schedule/templates/schedule/virtual_meeting.html (+8/-2)
To merge this branch: bzr merge lp:~mhall119/summit/video-placeholder
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+150661@code.launchpad.net

Commit message

Adds a placeholder image where the video will be when a broadcast url hasn't been set

Description of the change

Adds a placeholder image where the video will be when a broadcast url hasn't been set

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'summit/media/images/youtube_placeholder.png'
2Binary files summit/media/images/youtube_placeholder.png 1970-01-01 00:00:00 +0000 and summit/media/images/youtube_placeholder.png 2013-02-26 20:18:20 +0000 differ
3=== modified file 'summit/schedule/templates/schedule/virtual_meeting.html'
4--- summit/schedule/templates/schedule/virtual_meeting.html 2013-02-23 17:30:12 +0000
5+++ summit/schedule/templates/schedule/virtual_meeting.html 2013-02-26 20:18:20 +0000
6@@ -72,7 +72,7 @@
7 <h2>{{ meeting.title }}</h2>
8 <div id="description">
9 {{ meeting.description|markdown:'safe' }}
10- {% if required %}
11+ {% if required and meeting.hangout_url %}
12 <h3><a href="{{ meeting.hangout_url }}">Join the Hangout on Air</a></h3>
13 {% endif %}
14 </div>
15@@ -104,7 +104,13 @@
16 </div>
17 <div class="row">
18 <div class="span-4">
19- <div align="center"><iframe width="420" height="295" src="{{ meeting.broadcast_url }}" frameborder="0" allowfullscreen></iframe></div>
20+ <div align="center">
21+ {% if meeting.broadcast_url %}
22+ <iframe width="420" height="295" src="{{ meeting.broadcast_url }}" frameborder="0" allowfullscreen></iframe>
23+ {% else %}
24+ <img width="420" height="295" src="/media/images/youtube_placeholder.png">
25+ {% endif %}
26+ </div>
27 <iframe src="http://webchat.freenode.net?channels={% for ai in agenda_items %}{{ ai.room.irc_channel }}{% endfor %}&uio=Mj10cnVlJjQ9dHJ1ZSY5PXRydWUmMTA9dHJ1ZSYxMz1mYWxzZSYxND1mYWxzZQbf" width="100%" height="395"></iframe>
28 </div>
29 <div class="span-7 last">

Subscribers

People subscribed via source and target branches