conf info

1 files changed, 10 insertions, 8 deletions

diff --git a/page-confinfo.php b/page-confinfo.php
index 0f7cf1cb..77a0b259 100644
--- a/page-confinfo.php
+++ b/page-confinfo.php
@@ -3,20 +3,23 @@
     <p>Here you find everything you need to know while participating in the Nextcloud Conference!</p>
 </div>
 
+<img src="https://raw.githubusercontent.com/nextcloud/promo/8dbb6978d22761589b012ec440d8ab11cc9bb46f/conference/conference-social-media-banner.png" style="width: 100%" alt="front door" class="alignright" />
 <div class="row conf-info">
     <div class="col-md-6">
     <h2>What and where</h2>
     <p>Be sure to have <a href="https://conf.nextcloud.com/conference/NextcloudConference2016/register/new">registered in advance for the conference</a>! Pick up your badge and some food tickets at the entree of the "<em>Haubtgebaude</em>" building, Straße des 17. Juni 135 (<a href="http://www.openstreetmap.org/?mlat=52.512085&amp;mlon=13.32675#map=16/52.5132/13.3234">see on a map</a>).</p>
     <p>"<em>Ernst-Reuter-Platz (U)</em>" and "<em>Tiergarten (S)</em>" are the closest public transport stops. Use <a href="http://fahrinfo.bvg.de/Fahrinfo/bin/query.bin/en?pk_campaign=BVG.de_Eingabe&from=&REQ0JourneyStopsS0ID=&REQ0JourneyStopsfromID=&REQ0JourneyStopsSA1=7&HWAI%3DJS!js=yes&HWAI%3DJS!ajax=yes&to=+10623+Berlin-Charlottenburg%2C+Str.+des+17.+Juni+136&REQ0JourneyStopsZ0ID=&REQ0JourneyStopstoID=A%3D2%40O%3D10623+Berlin-Charlottenburg%2C+Str.+des+17.+Juni+135%40X%3D13326247%40Y%3D52513247%40U%3D103%40L%3D7706964%40B%3D1%40p%3D1431509568%40&REQ0JourneyStopsZA1=7&date=16.09.2016&time=09%3A00&timesel=arrive&start=1">this</a> to plan your trip.</p>
-<!--     <img src="<?php echo get_template_directory_uri(); ?>/assets/img/conference/frontdoor.jpg" style="width: 100%" alt="front door" class="aligncenter" /></p> -->
+    <img src="<?php echo get_template_directory_uri(); ?>/assets/img/conference/frontdoornew.jpg" style="width: 100%" alt="front door" class="aligncenter" /></p>
 
     <p>Note that carrying your badge is mandatory, especially after 18:00 and on the weekend!</p>
     </div>
     <div class="col-md-6">
-    <img src="https://raw.githubusercontent.com/nextcloud/promo/8dbb6978d22761589b012ec440d8ab11cc9bb46f/conference/conference-social-media-banner.png" style="width: 100%" alt="front door" class="alignright" />
     <h2>In the building</h2>
+    <h3>Conference days - Saturday and Sunday</h3>
+    <p>Registration opens at 9 and at 10 we start with opening, keynotes and lightning talks in room <code>H1058</code>, 1st floor in the back of the "<em>Haubtgebaude</em>" building. After lunch (outside) the hacking rooms open. You can find the workshops in <code>H3004</code>, with the Nextcloud coding for beginners session in <code>H3006</code></p>
+    <p>Find the <a href="https://conf.nextcloud.com/conference/NextcloudConference2016/schedule">conference program here</a>.</p>
     <h3>Hackathon</h3>
-    <p>Friday, registration and hacking rooms open at 9. Walk from registration desk to the elevators on the XXX. This is where we are:
+    <p>Friday, registration and hacking rooms open at 9. Walk from registration desk to the elevators in the back. This is where we are:
     <ul>
 	<li>3th floor:
 		<ul>
@@ -27,10 +30,8 @@
 	<li>In the Mathematik building across the street, all the way to the top and up the stairs one more floor for lunch (with your food ticket!) and a great view over the city in the restaurant</li>
     </ul>
     </p>
-    <h3>Conference days - Saturday and Sunday</h3>
-    <p>Registration opens at 9 and at 10 we start with opening, keynotes and lightning talks in room <code>H1058</code>, main hall of the "<em>Haubtgebaude</em>" building, ground floor. After lunch (outside) the hacking rooms open. You can find the workshops in <code>H3004</code>, with the Nextcloud coding for beginners session in <code>H3006</code></p>
-    <p>Find the <a href="https://conf.nextcloud.com/conference/NextcloudConference2016/schedule">conference program here</a>.</p>
     </div>
+    <img src="<?php echo get_template_directory_uri(); ?>/assets/img/conference/map.jpg" style="width: 100%" alt="front door" class="aligncenter" />
 </div>
 
 <div class="row conf-info">
@@ -68,12 +69,12 @@
     <p>During the hackathon we have free bread with a variety of things to put on it in room <code>H3008</code> - make your own dinner. Restaurants can be found at <a href="http://www.openstreetmap.org/?mlat=52.50602&mlon=13.32248#map=18/52.50602/13.32248">Savignyplatz</a>, a 10 minute walk from the venue.</p>
     <p>During weekdays, there is an open cafe at the entree of the "<em>Mathematik</em>" building and one in the Haubtgebaude itself.</p>
     </div>
+    <img src="<?php echo get_template_directory_uri(); ?>/assets/img/conference/room_307.jpg" style="width: 100%" alt="front door" class="aligncenter" />
 </div>
 
 <div class="row conf-info">
 	<h2 class="text-center">For speakers</h2>
-	<div class="col-md-6">
-	<p>A few things for speakers:
+	<div class="col-md-8 col-md-offset-2">
 	<ul>
 	    <ol>1. We will record video and audio. If you're unhappy with that, please let me know and I'll make sure not to publish your video. I won't publish without permission anyway, I'll let you review them before I put them out.</ol>
 	    <ol>2. For the Friday talks and the workshops:<br />
@@ -94,6 +95,7 @@
 		<li>We start after the keynotes, so please sit there at the beginning of the event! That is at 10:00, at 11 the lightning talks start.</li>
 	</ul></ul>
 </div>
+</div>
 
 <div class="row">
     <div class="col-md-8 col-md-offset-2">