Merge lp:~cjohnston/summit/virt-page-moving into lp:summit

[Chris Johnston]

Moves the fields around on the virtual meeting page per the new mockup

[Michael Hall (mhall119)]

LGTM

review: Approve

=== modified file 'summit/media/css/virt.css'
--- summit/media/css/virt.css	2013-02-27 18:12:21 +0000
+++ summit/media/css/virt.css	2013-05-05 17:33:24 +0000
@@ -54,12 +54,10 @@
 }
 
 #chat {
-  float: left;
-  width: 55%;
+  width: 95%;
 }
 
 #broadcast_video {
-  float: left;
-  width: 45%;
+  width: 95%;
   overflow: hidden;
-}
\ No newline at end of file
+}

=== modified file 'summit/schedule/templates/schedule/virtual_meeting.html'
--- summit/schedule/templates/schedule/virtual_meeting.html	2013-04-02 09:30:42 +0000
+++ summit/schedule/templates/schedule/virtual_meeting.html	2013-05-05 17:33:24 +0000
@@ -98,7 +98,7 @@
     </section>
 </div>
 <div class="row">
-    <section class="span-12">
+    <section class="span-5">
         <div id="broadcast_video" align="center">
             {% if meeting.broadcast_url %}
                 <iframe style="width:100%;" height="395" src="{{ meeting.broadcast_url }}?autoplay=1&amp;autohide=1" frameborder="0" allowfullscreen></iframe>
@@ -130,16 +130,14 @@
         {% endif %}
         </div>
     </section>
-</div>
-<div class="row">
-    <section class="span-12">
+    <section class="span-6 last">
         {% 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>
+        <iframe width "100%" height="800" src="{{ meeting.edit_link_to_pad }}"></iframe>
         {% else %}
-        <iframe width="100%" height="700" src="{{ meeting.link_to_pad }}"></iframe>
+        <iframe width="100%" height="800" src="{{ meeting.link_to_pad }}"></iframe>
         {% endif %}
     </section>
 </div>