From 63936fbcdb3dbc694ab0795ec09769cbfce8a384 Mon Sep 17 00:00:00 2001
From: Thomas Steen Rasmussen <thomas@gibfest.dk>
Date: Wed, 1 Jun 2016 10:44:14 +0200
Subject: [PATCH] add more text to info page, rename to info, other small text
 changes

---
 bornhack/templates/base.html                  |  5 +-
 bornhack/templates/frontpage.html             |  8 +-
 .../{good_to_know.html => info.html}          | 79 ++++++++++++++++---
 bornhack/urls.py                              |  6 +-
 4 files changed, 77 insertions(+), 21 deletions(-)
 rename bornhack/templates/{good_to_know.html => info.html} (60%)

diff --git a/bornhack/templates/base.html b/bornhack/templates/base.html
index b8f18659..febeb884 100644
--- a/bornhack/templates/base.html
+++ b/bornhack/templates/base.html
@@ -37,6 +37,9 @@
 
         <div id="navbar" class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
+            <li><a href="{% url 'news:index' %}">News</a></li>
+            <li><a href="{% url 'info' %}">Info</a></li>
+
             {% if current_camp.shop_open %}
             <li><a href="{% url 'shop:index' %}">Shop</a></li>
 
@@ -52,8 +55,6 @@
             {% endif %}
 
             {% endif %}
-            <li><a href="{% url 'news:index' %}">News</a></li>
-            <li><a href="{% url 'good-to-know' %}">Info</a></li>
             <li><a href="{% url 'contact' %}">Contact</a></li>
             {% if user.is_authenticated %}
             <li><a href="{% url 'profiles:detail' %}">Profile</a></li>
diff --git a/bornhack/templates/frontpage.html b/bornhack/templates/frontpage.html
index 5a32a7cc..d942e612 100644
--- a/bornhack/templates/frontpage.html
+++ b/bornhack/templates/frontpage.html
@@ -21,7 +21,7 @@
 
       <p class="lead">
         Bornhack is a <strong>participatory</strong> event where we expect people
-        to come up with crazy ideas and help make the content. We will reach out to
+        to come up with ideas and projects, and help make the content. We will reach out to
         people to ensure interesting, high quality talks and workshops.
       </p>
 
@@ -29,10 +29,6 @@
         You are very welcome to ask questions and show your interest on IRC at
         <strong>#bornhack</strong> on <strong>6nbtgccn5nbcodn3.onion</strong> or
         <strong>irc.baconsvin.org</strong>, both using TLS on port 6697.
-
-        That way you can help us understand what you think would be fun to do.
-        This is a new event, so we don't yet know exactly where this is going - but
-        give us your feedback and you can help us form it.
       </p>
 
       <p class="lead">
@@ -42,7 +38,7 @@
       </p>
 
       <p class="lead">
-        We hope you want to be a part of Bornhack.
+        We hope you want to be a part of Bornhack. Ticket sales are open!
       </p>
 
       <div class="regards-and-button">
diff --git a/bornhack/templates/good_to_know.html b/bornhack/templates/info.html
similarity index 60%
rename from bornhack/templates/good_to_know.html
rename to bornhack/templates/info.html
index cc0b7d89..3ec49642 100644
--- a/bornhack/templates/good_to_know.html
+++ b/bornhack/templates/info.html
@@ -7,6 +7,20 @@
 
 {% block content %}
 
+  <div class="row">
+    <div class="col-md-12">
+      <h2>
+        When is BornHack going to take place?
+      </h2>
+      <p>BornHack 2016 starts saturday, august 27th, at noon (12).</p>
+      <p>
+        BornHack 2016 ends saturday, september 3rd, at noon (12).
+        Participants must leave the site no later than 17:00 on 
+        the closing day (or stay and help us clean up).
+      </p>
+    </div>
+  </div>
+
   <div class="row">
     <div class="col-md-12">
       <h2>
@@ -19,6 +33,7 @@
       </p>
     </div>
   </div>
+
   <div class="row">
     <div class="col-md-12">
       <h2>How do I get to Bornholm?</h2>
@@ -86,29 +101,73 @@
   <div class="row">
     <div class="col-md-12">
       <h2>How much bandwidth is there going to be?</h2>
-        We will have at least a 1
-        gigabit fiber connection. Should be enough for everyone. ;)
+        We will have a 1 gigabit fiber connection with enough v4 and v6 space to go around.
     </div>
   </div>
 
   <div class="row">
     <div class="col-md-12">
-      <h2>Where do I buy food?</h2>
+      <h2>I need to eat!</h2>
+        <h3>Food vendors</h3>
         <p>
-          It will not be possible to buy food at the venue.
-          We are expecting to light up a large grill every evening.
+          There will be a few food vendors at the venue,
+          and we are working on agreements with nearby food 
+          delivery places. If you are interested in becoming a food
+          vendor please contact us.
         </p>
+
+        <h3>Cooking</h3>
+        <p>
+          We know that hackers like to cook for themselves for
+          various reasons, not limited to vegetarians/vegan diets. Everyone
+          is welcome to cook their own food, either in their own village 
+          kitchen or in the food area. Please note that coal powered barbeques
+          are <b>strictly forbidden</b> on the camp grounds for fire
+          safety reasons. If you want to cook with coal use the big 
+          barbeque in the food area! Gas barbeques are allowed in villages.
+        </p>
+
+        <h3>The food area</h3>
+        <p>
+          The venue has a roofed outdoor food area with:
+          <ul>
+            <li>Seating for 80 people</li>
+            <li>An outdoor kitchen with running water and tables for food preparation</li>
+            <li>A large coal powered barbeque (we sell coal in the info kiosk)</li>
+          </ul>
+          Villages without a kitchen of their own are very welcome to utilize 
+          this area for cooking. Please clean up after yourselves! :)
+        </p>
+
+        <h3>Buying groceries</h3>
         <p>
           The closest place to buy groceries is approximately
-          3.5 km away at Pedersker.
-        </p>
-        <p>
-          About 7 km from the venue there is a larger selection
-          at Aakirkeby.
+          3.5 km away at Pedersker. About 7 km from the venue there 
+          is a larger selection at Aakirkeby. We are looking into
+          the possibility of shuttle busses to and from the grocery places.
         </p>
     </div>
   </div>
 
+  <div class="row">
+    <div class="col-md-12">
+      <h2>Bar area</h2>
+      <p>
+        The bar area is the place to go when you a all hacked out and want
+        to socialize with the other participants. Enjoy a cold beer or drink
+        and some music, and discuss your projects with the people around you.
+      </p>
+      <p>
+        The bar will be run with an open budget and flexible prices. More on
+        that later.
+      </p>
+      <p>
+        Opening hours of the bar have not been decided yet (but they will be
+        compatible with the average hackers sleep cycle).
+      </p>
+    </div>
+  </div>
+
   <script src="{% static 'js/leaflet.js' %}"></script>
   <script>
     var map = L.map('map', {center: [55.131520, 14.903000], zoom: 10});
diff --git a/bornhack/urls.py b/bornhack/urls.py
index d85a7fed..5d0dfb21 100644
--- a/bornhack/urls.py
+++ b/bornhack/urls.py
@@ -17,9 +17,9 @@ urlpatterns = [
         name='frontpage'
     ),
     url(
-        r'good-to-know/',
-        TemplateView.as_view(template_name='good_to_know.html'),
-        name='good-to-know'
+        r'info/',
+        TemplateView.as_view(template_name='info.html'),
+        name='info'
     ),
     url(
         r'contact/',