From 69f9f484888a1f4dcae6fc14e5fa0605f85eec5c Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 9 Sep 2014 12:56:10 +0100
Subject: [PATCH 1/6] Added __version__ to wagtailcore

---
 wagtail/wagtailcore/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wagtail/wagtailcore/__init__.py b/wagtail/wagtailcore/__init__.py
index 160f57430..c45294088 100644
--- a/wagtail/wagtailcore/__init__.py
+++ b/wagtail/wagtailcore/__init__.py
@@ -1 +1,2 @@
+__version__ = '0.6'
 default_app_config = 'wagtail.wagtailcore.apps.WagtailCoreAppConfig'

From 1d7ca5a685af18f4bda1d771e2bd09299fa53baf Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 9 Sep 2014 12:56:26 +0100
Subject: [PATCH 2/6] Made docs look at wagtailcore.__version__

---
 docs/conf.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 64f4ab934..b8ff46164 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,6 +29,9 @@ if not on_rtd:  # only import and set the theme if we're building docs locally
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath('..'))
 
+# Get Wagtail version
+from wagtail.wagtailcore import __version__
+
 # Autodoc may need to import some models modules which require django settings
 # be configured
 os.environ['DJANGO_SETTINGS_MODULE'] = 'wagtail.tests.settings'
@@ -70,9 +73,9 @@ copyright = u'2014, Torchbox'
 # built documents.
 #
 # The short X.Y version.
-version = '0.5'
+version = __version__
 # The full version, including alpha/beta/rc tags.
-release = '0.5'
+release = __version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From bce455a5cce822709d086cea86c74f3957cb92cc Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 9 Sep 2014 12:57:01 +0100
Subject: [PATCH 3/6] Made setup.py look at wagtailcore.__version__

---
 setup.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index abd6bb61e..08b7dfd1b 100644
--- a/setup.py
+++ b/setup.py
@@ -2,6 +2,8 @@
 
 import sys
 
+from wagtail.wagtailcore import __version__
+
 
 try:
     from setuptools import setup, find_packages
@@ -47,7 +49,7 @@ if not PY3:
 
 setup(
     name='wagtail',
-    version='0.5',
+    version=__version__,
     description='A Django content management system focused on flexibility and user experience',
     author='Matthew Westcott',
     author_email='matthew.westcott@torchbox.com',

From 74686ccbeec9c79c8fa2cd6e74dd253f6d691f48 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 9 Sep 2014 13:00:56 +0100
Subject: [PATCH 4/6] Added wagtail version indicator to the dashboard

---
 wagtail/wagtailadmin/templates/wagtailadmin/home.html | 5 ++++-
 wagtail/wagtailcore/templatetags/wagtailcore_tags.py  | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home.html b/wagtail/wagtailadmin/templates/wagtailadmin/home.html
index 65c6b8bc0..4e766ac48 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/home.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/home.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load gravatar compress %}
+{% load gravatar compress wagtailcore_tags %}
 {% load i18n %}
 {% block titletag %}{% trans "Dashboard" %}{% endblock %}
 {% block bodyclass %}homepage{% endblock %}
@@ -22,6 +22,9 @@
                 <h1>{% blocktrans %}Welcome to the {{ site_name }} Wagtail CMS{% endblocktrans %}</h1> 
                 <h2>{{ user.get_full_name|default:user.username }}</h2>
             </div>
+            <div class="col1">
+                Wagtail Version: {% wagtail_version %}
+            </div>
         </div>
     </header>
 
diff --git a/wagtail/wagtailcore/templatetags/wagtailcore_tags.py b/wagtail/wagtailcore/templatetags/wagtailcore_tags.py
index 5e137c7a2..b68a66d63 100644
--- a/wagtail/wagtailcore/templatetags/wagtailcore_tags.py
+++ b/wagtail/wagtailcore/templatetags/wagtailcore_tags.py
@@ -3,6 +3,7 @@ from django.utils.safestring import mark_safe
 
 from wagtail.wagtailcore.models import Page
 from wagtail.wagtailcore.rich_text import expand_db_html
+from wagtail.wagtailcore import __version__
 
 register = template.Library()
 
@@ -27,6 +28,11 @@ def slugurl(context, slug):
         return None
 
 
+@register.simple_tag
+def wagtail_version():
+    return __version__
+
+
 @register.filter
 def richtext(value):
     return mark_safe('<div class="rich-text">' + expand_db_html(value) + '</div>')

From 97959b8f4dd88ccf2abb8d67ea09abf204de4ca5 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 9 Sep 2014 13:01:31 +0100
Subject: [PATCH 5/6] Changed version to 0.5

---
 wagtail/wagtailcore/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/wagtailcore/__init__.py b/wagtail/wagtailcore/__init__.py
index c45294088..8055a55e9 100644
--- a/wagtail/wagtailcore/__init__.py
+++ b/wagtail/wagtailcore/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '0.6'
+__version__ = '0.5'
 default_app_config = 'wagtail.wagtailcore.apps.WagtailCoreAppConfig'

From 6d5747b6dad4e81e0c2c50eec514b57ae7574c88 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Tue, 9 Sep 2014 15:22:30 +0100
Subject: [PATCH 6/6] moved version into title tag on logo

---
 wagtail/wagtailadmin/templates/wagtailadmin/base.html | 4 ++--
 wagtail/wagtailadmin/templates/wagtailadmin/home.html | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/base.html
index c7a89def7..130fe47d6 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/base.html
@@ -1,10 +1,10 @@
 {% extends "wagtailadmin/admin_base.html" %}
-{% load wagtailadmin_tags %}
+{% load wagtailadmin_tags wagtailcore_tags %}
 {% load i18n %}
 {% block furniture %}
     <div class="nav-wrapper">
         <div class="inner">
-            <a href="{% url 'wagtailadmin_home' %}" class="logo"><img src="{{ STATIC_URL }}wagtailadmin/images/wagtail-logo.svg" alt="Wagtail" width="80" /><span>{% trans "Dashboard" %}</span></a>
+            <a href="{% url 'wagtailadmin_home' %}" class="logo" title="Wagtail v.{% wagtail_version %}"><img src="{{ STATIC_URL }}wagtailadmin/images/wagtail-logo.svg" alt="Wagtail" width="80" /><span>{% trans "Dashboard" %}</span></a>
             {% main_nav %}
         </div>
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home.html b/wagtail/wagtailadmin/templates/wagtailadmin/home.html
index 4e766ac48..ab855154e 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/home.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/home.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load gravatar compress wagtailcore_tags %}
+{% load gravatar compress %}
 {% load i18n %}
 {% block titletag %}{% trans "Dashboard" %}{% endblock %}
 {% block bodyclass %}homepage{% endblock %}
@@ -18,13 +18,10 @@
                     <div class="avatar icon icon-user"><img src="{% gravatar_url user.email %}" /></div>
                 </div>
             {% endif %}
-            <div class="col10">
+            <div class="col9">
                 <h1>{% blocktrans %}Welcome to the {{ site_name }} Wagtail CMS{% endblocktrans %}</h1> 
                 <h2>{{ user.get_full_name|default:user.username }}</h2>
             </div>
-            <div class="col1">
-                Wagtail Version: {% wagtail_version %}
-            </div>
         </div>
     </header>