Merge lp:~jose/summit/1152168-fix into lp:summit

[José Antonio Rey]

Changed etherpad embed to the latest version (static) when summit is set as public.

Changed meeting.html and virtual_meeting.html. I added an if summit.state == 'public' in each one, and changed the etherpad embed to statically show the last version if true.

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'summit/schedule/templates/schedule/meeting.html'
--- summit/schedule/templates/schedule/meeting.html	2013-03-04 17:47:31 +0000
+++ summit/schedule/templates/schedule/meeting.html	2013-03-15 03:00:31 +0000
@@ -109,8 +109,11 @@
     {% if meeting.private %}
     <h3>WARNING: Contents of this pad may not be private, and may be searcheable by non-attendees!</h3>
     {% endif %}
-
+    {% if summit.state == 'public' %}
+    <iframe width=100% height=700 src="{{ meeting.edit_link_to_pad }}"></iframe>
+    {% else %}
     <iframe width=100% height=700 src="{{ meeting.link_to_pad }}"></iframe>
+    {% endif %}
 </div>
 </div>
 <div class="row">

=== modified file 'summit/schedule/templates/schedule/virtual_meeting.html'
--- summit/schedule/templates/schedule/virtual_meeting.html	2013-03-09 22:37:04 +0000
+++ summit/schedule/templates/schedule/virtual_meeting.html	2013-03-15 03:00:31 +0000
@@ -132,7 +132,11 @@
         {% if meeting.private %}
         <h3>WARNING: Contents of this pad may not be private, and may be searcheable by non-attendees!</h3>
         {% endif %}
+        {% if summit.state == 'public' %}
+        <iframe width "100%" height="700" src="{{ meeting.edit_link_to_pad }}"></iframe>
+        {% else %}
         <iframe width="100%" height="700" src="{{ meeting.link_to_pad }}"></iframe>
+        {% endif %}
     </section>
 </div>
 <div class="row">