From ae7843f9c25ea79e119d9b6c4cc4db734027bd5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felipe=20Mart=C3=ADn?= <fmartin@bytepix.com>
Date: Tue, 28 May 2013 15:17:29 +0200
Subject: [PATCH] TIME_ZONE is not UTC (from Europe/Madrid) Added blog app urls
 to urls.py Added blog link to navigation menu Added timezone info to footer

---
 minecraftcodex/database/templates/layout.html | 6 +++++-
 minecraftcodex/herobrine/settings.py          | 3 ++-
 minecraftcodex/herobrine/urls.py              | 5 +++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/minecraftcodex/database/templates/layout.html b/minecraftcodex/database/templates/layout.html
index cd4ae7b..b0f031b 100644
--- a/minecraftcodex/database/templates/layout.html
+++ b/minecraftcodex/database/templates/layout.html
@@ -68,6 +68,9 @@ Thank you!
                             </li>
                         </ul>
                         <ul class="nav pull-right">
+                            <li class="pull-right {% if section == 'blog' %}active{% endif %}">
+                                <a href="{{ url('blog_list') }}">Blog</a>
+                            </li>
                             <li class="pull-right {% if section == 'about' %}active{% endif %}">
                                 <a href="{{ url('aboutpage') }}">About the project</a>
                             </li>
@@ -86,7 +89,8 @@ Thank you!
         <div class="pull-left">
             <small>
                 MinecraftCodex {% if app_version %}v.{{ app_version }}{% endif %}<br />
-                If you have feedback, please use the contact information to the right.
+                If you have feedback, please use the contact information to the right.<br />
+                All dates are UTC
             </small>
         </div>
         <div class="pull-right text-right">
diff --git a/minecraftcodex/herobrine/settings.py b/minecraftcodex/herobrine/settings.py
index 55f7498..8ce36d0 100644
--- a/minecraftcodex/herobrine/settings.py
+++ b/minecraftcodex/herobrine/settings.py
@@ -29,7 +29,7 @@ ALLOWED_HOSTS = []
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
 # In a Windows environment this must be set to your system time zone.
-TIME_ZONE = 'Europe/Madrid'
+TIME_ZONE = 'UTC'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
@@ -131,6 +131,7 @@ INSTALLED_APPS = (
     'grappelli',
     'django.contrib.admin',
     'database',
+    'blog',
     'south'
 )
 
diff --git a/minecraftcodex/herobrine/urls.py b/minecraftcodex/herobrine/urls.py
index ea6735d..4cf8bf0 100644
--- a/minecraftcodex/herobrine/urls.py
+++ b/minecraftcodex/herobrine/urls.py
@@ -42,6 +42,11 @@ urlpatterns = patterns('',
     # Items
     url(r'^blocks/', 'database.views.blocks', name='blocks_list'),
 
+    # Blog
+    url(r'^blog/$', 'blog.views.blog', name='blog_list'),
+    url(r'^blog/(?P<year>\d+)/(?P<month>\d+)/(?P<day>\d+)/(?P<slug>[\w\-]+)/$',
+        'blog.views.blog_item', name='blog_item'),
+
     # Robots
     (r'^robots\.txt$', lambda r: HttpResponse("", mimetype="text/plain")),