From fe0bc14ac10185945799f45b258ed6ec2c078a5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?=
 <valberg@orn.li>
Date: Tue, 5 Jul 2016 18:46:32 +0200
Subject: [PATCH] Adding content to <title>. Fix #62

---
 bornhack/templates/base.html                               | 2 +-
 bornhack/templates/coc.html                                | 4 ++++
 bornhack/templates/contact.html                            | 4 ++++
 bornhack/templates/info.html                               | 4 ++++
 bornhack/templates/legal/general_terms_and_conditions.html | 4 ++++
 bornhack/templates/legal/privacy_policy.html               | 4 ++++
 bornhack/templates/speakers.html                           | 4 ++++
 bornhack/templates/sponsors.html                           | 4 ++++
 news/templates/news_detail.html                            | 4 ++++
 news/templates/news_index.html                             | 4 ++++
 shop/templates/product_detail.html                         | 4 ++++
 shop/templates/shop_index.html                             | 4 ++++
 12 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/bornhack/templates/base.html b/bornhack/templates/base.html
index 0a8a2b17..97fcefb1 100644
--- a/bornhack/templates/base.html
+++ b/bornhack/templates/base.html
@@ -7,7 +7,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 
-    <title>Bornhack</title>
+    <title>{% block title %}BornHack{% endblock %}</title>
 
     <!-- Bootstrap core CSS -->
     <link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">
diff --git a/bornhack/templates/coc.html b/bornhack/templates/coc.html
index f735454b..1dccf57d 100644
--- a/bornhack/templates/coc.html
+++ b/bornhack/templates/coc.html
@@ -1,5 +1,9 @@
 {% extends 'base.html' %}
 
+{% block title %}
+Code of Conduct | {{ block.super }}
+{% endblock %}
+
 {% block content %}
 
 <h2>Code of Conduct</h2>
diff --git a/bornhack/templates/contact.html b/bornhack/templates/contact.html
index 0b1e2e31..e9f5dafb 100644
--- a/bornhack/templates/contact.html
+++ b/bornhack/templates/contact.html
@@ -1,5 +1,9 @@
 {% extends 'base.html' %}
 
+{% block title %}
+Contact | {{ block.super }}
+{% endblock %}
+
 {% block content %}
 
 <p class="lead">
diff --git a/bornhack/templates/info.html b/bornhack/templates/info.html
index 8582bfb0..2a6a9278 100644
--- a/bornhack/templates/info.html
+++ b/bornhack/templates/info.html
@@ -1,6 +1,10 @@
 {% extends 'base.html' %}
 {% load static from staticfiles %}
 
+{% block title %}
+Info | {{ block.super }}
+{% endblock %}
+
 {% block extra_head %}
 <link rel="stylesheet" href="{% static 'css/leaflet.css' %}" />
 {% endblock %}
diff --git a/bornhack/templates/legal/general_terms_and_conditions.html b/bornhack/templates/legal/general_terms_and_conditions.html
index 6a66eb37..0cbf8360 100644
--- a/bornhack/templates/legal/general_terms_and_conditions.html
+++ b/bornhack/templates/legal/general_terms_and_conditions.html
@@ -1,5 +1,9 @@
 {% extends 'base.html' %}
 
+{% block title %}
+General Terms and Conditions | {{ block.super }}
+{% endblock %}
+
 {% block content %}
 
 <h2>Terms and Conditions for BornHack IvS’ sale and delivery of (i) merchandise (ii) tickets and/or (iii) accommodation</h2>
diff --git a/bornhack/templates/legal/privacy_policy.html b/bornhack/templates/legal/privacy_policy.html
index 579c48c8..10762aba 100644
--- a/bornhack/templates/legal/privacy_policy.html
+++ b/bornhack/templates/legal/privacy_policy.html
@@ -1,5 +1,9 @@
 {% extends 'base.html' %}
 
+{% block title %}
+Privacy Policy | {{ block.super }}
+{% endblock %}
+
 {% block content %}
 
 <h2>Privacy and cookie policy</h2>
diff --git a/bornhack/templates/speakers.html b/bornhack/templates/speakers.html
index ce9f8d3f..74f17b2e 100644
--- a/bornhack/templates/speakers.html
+++ b/bornhack/templates/speakers.html
@@ -1,5 +1,9 @@
 {% extends 'base.html' %}
 
+{% block title %}
+Call for Speakers | {{ block.super }}
+{% endblock %}
+
 {% block content %}
 <h2>BornHack 2016: Call for Speakers</h2>
 
diff --git a/bornhack/templates/sponsors.html b/bornhack/templates/sponsors.html
index e7271123..91f270ed 100644
--- a/bornhack/templates/sponsors.html
+++ b/bornhack/templates/sponsors.html
@@ -1,5 +1,9 @@
 {% extends 'base.html' %}
 
+{% block title %}
+Call for Sponsors | {{ block.super }}
+{% endblock %}
+
 {% block content %}
 <h2>Sponsoring</h2>
 
diff --git a/news/templates/news_detail.html b/news/templates/news_detail.html
index 15eced7e..8cc0c953 100644
--- a/news/templates/news_detail.html
+++ b/news/templates/news_detail.html
@@ -1,6 +1,10 @@
 {% extends 'base.html' %}
 {% load commonmark %}
 
+{% block title %}
+{{ news_item.title }} | {{ block.super }}
+{% endblock %}
+
 {% block content %}
   <div>
     {% if not_public %}
diff --git a/news/templates/news_index.html b/news/templates/news_index.html
index 18469c3c..30ee0995 100644
--- a/news/templates/news_index.html
+++ b/news/templates/news_index.html
@@ -1,6 +1,10 @@
 {% extends 'base.html' %}
 {% load commonmark %}
 
+{% block title %}
+News | {{ block.super }}
+{% endblock %}
+
 {% block content %}
 {% for item in news_items %}
   <div>
diff --git a/shop/templates/product_detail.html b/shop/templates/product_detail.html
index 8841123e..a5408361 100644
--- a/shop/templates/product_detail.html
+++ b/shop/templates/product_detail.html
@@ -3,6 +3,10 @@
 {% load commonmark %}
 {% load shop_tags %}
 
+{% block title %}
+{{ product.name }} | {{ block.super }}
+{% endblock %}
+
 {% block shop_content %}
 
 <div class="row">
diff --git a/shop/templates/shop_index.html b/shop/templates/shop_index.html
index 45df7340..fc0c8ad7 100644
--- a/shop/templates/shop_index.html
+++ b/shop/templates/shop_index.html
@@ -2,6 +2,10 @@
 {% load bootstrap3 %}
 {% load shop_tags %}
 
+{% block title %}
+Shop | {{ block.super }}
+{% endblock %}
+
 {% block shop_content %}
 
 <div class="row">