From 25570632b2901d88a4a8a046d68e5e8c88d5830c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?=
 <valberg@orn.li>
Date: Sun, 10 Jul 2016 20:06:08 +0200
Subject: [PATCH] Updating info about villages. Styling buttons in the village
 CRUD.

---
 bornhack/templates/info.html                  | 22 +++++++++++--------
 .../templates/village_confirm_delete.html     |  4 ++--
 villages/templates/village_detail.html        |  4 ++--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/bornhack/templates/info.html b/bornhack/templates/info.html
index 2a6a9278..a50a5108 100644
--- a/bornhack/templates/info.html
+++ b/bornhack/templates/info.html
@@ -205,16 +205,21 @@ Info | {{ block.super }}
         confusing but it is fairly simple: a village is just a spot on the
         campsite where you and a bunch of your friends/likeminded people camp
         together. Apart from peoples individual tents which they sleep in, many
-        villages bring a large common tent where you can hack and hang out during the day.
+        villages bring a large common tent where you can hack and hang out
+        during the day.
       </p>
-      <p>Villages can also rent village tents. The details are not in place yet,
-        but stay tuned for the announcement. The idea is that you order and pay
-        for a large tent which will then be setup and ready when you arrive. The
-        tents have wooden floors and you can rent folding tables and chairs as needed.
+      <p>Villages can also rent village tents via us, head over to the
+       <a href="{% url 'shop:index' %}?category=villages">
+         villages section of the shop</a>.
+       The tents will be ready for when you arrive and will be teared down
+       again saturday the 3rd of September at 12:00. The tents have optional
+       floors and you can rent folding tables and chairs as needed.
+      </p>
+      <p><a href="{% url 'villages:list' %}">You can register your village registration here</a>!
+        If you don't want to make your own village you will possibly be able to
+        find and join one that suits your interests.
+        Get in touch if you have any questions!
       </p>
-      <p>Village registration is not finished yet, but stay tuned! 
-        If you don't want to make your own village you will likely 
-        be able to find and join one that suits your interests.</p>
     </div>
   </div>
 
@@ -235,7 +240,6 @@ Info | {{ block.super }}
           <dt>Kiosk</dt>
           <dd>We sell a few beverages and sweets as well as practical things like coal for the barbeque. We will accept the same payment methods at the venue as we do on the website: cash, cards, and blockchain.</dd>
         </dl>
-      </p>
     </div>
   </div>
 
diff --git a/villages/templates/village_confirm_delete.html b/villages/templates/village_confirm_delete.html
index 4f28b3b2..d4fd816c 100644
--- a/villages/templates/village_confirm_delete.html
+++ b/villages/templates/village_confirm_delete.html
@@ -5,9 +5,9 @@
 
 <form action="" method="post" class="col-md-6 col-md-offset-3">{% csrf_token %}
     <p>Are you sure you want to delete the village "{{ village }}"?</p>
-    <button type="submit" class="btn btn-black form-control">Confirm</button>
+    <button type="submit" class="btn btn-danger form-control">Confirm</button>
     <br />
     <br />
-    <a href="{% url 'villages:detail' slug=village.slug %}" class="btn btn-black form-control">Cancel</a>
+    <a href="{% url 'villages:detail' slug=village.slug %}" class="btn btn-default form-control">Cancel</a>
 </form>
 {% endblock %}
diff --git a/villages/templates/village_detail.html b/villages/templates/village_detail.html
index c5aebff5..aa2134a8 100644
--- a/villages/templates/village_detail.html
+++ b/villages/templates/village_detail.html
@@ -10,8 +10,8 @@
 <hr />
 
 {% if user == village.contact %}
-<a href="{% url 'villages:update' slug=village.slug %}">Edit</a> |
-<a href="{% url 'villages:delete' slug=village.slug %}">Delete</a>
+<a href="{% url 'villages:update' slug=village.slug %}" class="btn btn-primary">Edit</a>
+<a href="{% url 'villages:delete' slug=village.slug %}" class="btn btn-danger">Delete</a>
 {% endif %}
 
 {% endblock %}