From 8c4c26864103890897ca63708867621f16938a25 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 20 May 2014 11:23:36 +0100
Subject: [PATCH 01/60] Added *args, *kwargs paramters to
 serve/get_context/get_template This makes it easier to pass parameters from
 the route method down to get_context/get_template

---
 wagtail/wagtailcore/models.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 441c74a28..fdf9e7b9a 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -394,23 +394,23 @@ class Page(MP_Node, ClusterableModel, Indexed):
 
         return revision.as_page_object()
 
-    def get_context(self, request):
+    def get_context(self, request, *args, **kwargs):
         return {
             'self': self,
             'request': request,
         }
 
-    def get_template(self, request):
+    def get_template(self, request, *args, **kwargs):
         if request.is_ajax():
             return self.ajax_template or self.template
         else:
             return self.template
 
-    def serve(self, request):
+    def serve(self, request, *args, **kwargs):
         return TemplateResponse(
             request, 
-            self.get_template(request), 
-            self.get_context(request)
+            self.get_template(request, *args, **kwargs), 
+            self.get_context(request, *args, **kwargs)
         )
 
     def is_navigable(self):

From d88a5e596bf2cd6cdf10600c70d23750d86840c4 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 2 Jun 2014 09:36:06 +0100
Subject: [PATCH 02/60] Cleanup wagtailimages backends code

---
 wagtail/wagtailimages/backends/base.py   | 21 +++++++--------------
 wagtail/wagtailimages/backends/pillow.py |  7 +++++--
 wagtail/wagtailimages/backends/wand.py   |  2 +-
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/wagtail/wagtailimages/backends/base.py b/wagtail/wagtailimages/backends/base.py
index 25b7e882d..43ea977c9 100644
--- a/wagtail/wagtailimages/backends/base.py
+++ b/wagtail/wagtailimages/backends/base.py
@@ -1,6 +1,7 @@
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 
+
 class InvalidImageBackendError(ImproperlyConfigured):
     pass
 
@@ -8,23 +9,22 @@ class InvalidImageBackendError(ImproperlyConfigured):
 class BaseImageBackend(object):
     def __init__(self, params):
         self.quality = getattr(settings, 'IMAGE_COMPRESSION_QUALITY', 85)
-        
+
     def open_image(self, input_file):
         """
-        Open an image and return the backend specific image object to pass 
-        to other methods. The object return has to have a size  attribute 
+        Open an image and return the backend specific image object to pass
+        to other methods. The object return has to have a size  attribute
         which is a tuple with the width and height of the image and a format
         attribute with the format of the image.
         """
         raise NotImplementedError('subclasses of BaseImageBackend must provide an open_image() method')
-        
-    
+
     def save_image(self, image, output):
         """
         Save the image to the output
         """
         raise NotImplementedError('subclasses of BaseImageBackend must provide a save_image() method')
-        
+
     def resize(self, image, size):
         """
         resize image to the requested size, using highest quality settings
@@ -32,11 +32,9 @@ class BaseImageBackend(object):
         """
         raise NotImplementedError('subclasses of BaseImageBackend must provide an resize() method')
 
-
     def crop_to_centre(self, image, size):
         raise NotImplementedError('subclasses of BaseImageBackend must provide a crop_to_centre() method')
 
-
     def resize_to_max(self, image, size):
         """
         Resize image down to fit within the given dimensions, preserving aspect ratio.
@@ -58,10 +56,8 @@ class BaseImageBackend(object):
             final_size = (target_width, int(original_height * horz_scale))
         else:
             final_size = (int(original_width * vert_scale), target_height)
-        
-        return self.resize(image, final_size)
-        
 
+        return self.resize(image, final_size)
 
     def resize_to_min(self, image, size):
         """
@@ -87,7 +83,6 @@ class BaseImageBackend(object):
 
         return self.resize(image, final_size)
 
-
     def resize_to_width(self, image, target_width):
         """
         Resize image down to the given width, preserving aspect ratio.
@@ -104,7 +99,6 @@ class BaseImageBackend(object):
 
         return self.resize(image, final_size)
 
-
     def resize_to_height(self, image, target_height):
         """
         Resize image down to the given height, preserving aspect ratio.
@@ -121,7 +115,6 @@ class BaseImageBackend(object):
 
         return self.resize(image, final_size)
 
-
     def resize_to_fill(self, image, size):
         """
         Resize down and crop image to fill the given dimensions. Most suitable for thumbnails.
diff --git a/wagtail/wagtailimages/backends/pillow.py b/wagtail/wagtailimages/backends/pillow.py
index 05d12d291..96976c277 100644
--- a/wagtail/wagtailimages/backends/pillow.py
+++ b/wagtail/wagtailimages/backends/pillow.py
@@ -1,6 +1,9 @@
-from base import BaseImageBackend
+from __future__ import absolute_import
+
+from .base import BaseImageBackend
 import PIL.Image
 
+
 class PillowBackend(BaseImageBackend):
     def __init__(self, params):
         super(PillowBackend, self).__init__(params)
@@ -32,4 +35,4 @@ class PillowBackend(BaseImageBackend):
         top = (original_height - final_height) / 2
         return image.crop(
             (left, top, left + final_width, top + final_height)
-        )
\ No newline at end of file
+        )
diff --git a/wagtail/wagtailimages/backends/wand.py b/wagtail/wagtailimages/backends/wand.py
index 36e352715..0c493eb52 100644
--- a/wagtail/wagtailimages/backends/wand.py
+++ b/wagtail/wagtailimages/backends/wand.py
@@ -1,9 +1,9 @@
 from __future__ import absolute_import
 
 from .base import BaseImageBackend
-
 from wand.image import Image
 
+
 class WandBackend(BaseImageBackend):
     def __init__(self, params):
         super(WandBackend, self).__init__(params)

From 351b74c94b547b70902bab4a0e6e028738021349 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 2 Jun 2014 09:52:33 +0100
Subject: [PATCH 03/60] Wand image backend: Always clone images before
 performing oprations on them

---
 wagtail/wagtailimages/backends/wand.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/wagtail/wagtailimages/backends/wand.py b/wagtail/wagtailimages/backends/wand.py
index 0c493eb52..d1a877436 100644
--- a/wagtail/wagtailimages/backends/wand.py
+++ b/wagtail/wagtailimages/backends/wand.py
@@ -18,8 +18,9 @@ class WandBackend(BaseImageBackend):
         image.save(file=output)
 
     def resize(self, image, size):
-        image.resize(size[0], size[1])
-        return image
+        new_image = image.clone()
+        new_image.resize(size[0], size[1])
+        return new_image
 
     def crop_to_centre(self, image, size):
         (original_width, original_height) = image.size
@@ -34,7 +35,9 @@ class WandBackend(BaseImageBackend):
 
         left = (original_width - final_width) / 2
         top = (original_height - final_height) / 2
-        image.crop(
+
+        new_image = image.clone()
+        new_image.crop(
             left=left, top=top, right=left + final_width, bottom=top + final_height
         )
-        return image
+        return new_image

From e438a6d99b9d936c2a7ea730a3d09da102dc9d85 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 2 Jun 2014 10:51:47 +0100
Subject: [PATCH 04/60] Minor wagtailimages cleanup

---
 wagtail/wagtailimages/models.py | 11 ++++-------
 wagtail/wagtailimages/tests.py  | 16 ++++++++--------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/wagtail/wagtailimages/models.py b/wagtail/wagtailimages/models.py
index 24fd1f0bf..a2be29486 100644
--- a/wagtail/wagtailimages/models.py
+++ b/wagtail/wagtailimages/models.py
@@ -180,27 +180,25 @@ class Filter(models.Model):
         generate an output image with this filter applied, returning it
         as another django.core.files.File object
         """
-        
         backend = get_image_backend(backend_name)
-        
+
         if not self.method:
             self._parse_spec_string()
-        
+
         # If file is closed, open it
         input_file.open('rb')
         image = backend.open_image(input_file)
         file_format = image.format
-        
+
         method = getattr(backend, self.method_name)
 
         image = method(image, self.method_arg)
 
         output = StringIO.StringIO()
         backend.save_image(image, output, file_format)
-        
+
         # and then close the input file
         input_file.close()
-        
 
         # generate new filename derived from old one, inserting the filter spec string before the extension
         input_filename_parts = os.path.basename(input_file.name).split('.')
@@ -210,7 +208,6 @@ class Filter(models.Model):
         output_filename = '.'.join(output_filename_parts)
 
         output_file = File(output, name=output_filename)
-        
 
         return output_file
 
diff --git a/wagtail/wagtailimages/tests.py b/wagtail/wagtailimages/tests.py
index 00d1245e6..1bc2acc93 100644
--- a/wagtail/wagtailimages/tests.py
+++ b/wagtail/wagtailimages/tests.py
@@ -84,10 +84,10 @@ class TestRenditions(TestCase):
         # default backend should be pillow
         backend = get_image_backend()
         self.assertTrue(isinstance(backend, PillowBackend))
-        
+
     def test_minification(self):
         rendition = self.image.get_rendition('width-400')
-        
+
         # Check size
         self.assertEqual(rendition.width, 400)
         self.assertEqual(rendition.height, 300)
@@ -114,7 +114,7 @@ class TestRenditions(TestCase):
 
         # Check that they are the same object
         self.assertEqual(first_rendition, second_rendition)
-        
+
 
 class TestRenditionsWand(TestCase):
     def setUp(self):
@@ -134,18 +134,18 @@ class TestRenditionsWand(TestCase):
 
     def test_minification(self):
         rendition = self.image.get_rendition('width-400')
-        
+
         # Check size
         self.assertEqual(rendition.width, 400)
         self.assertEqual(rendition.height, 300)
-        
+
     def test_resize_to_max(self):
         rendition = self.image.get_rendition('max-100x100')
-        
+
         # Check size
         self.assertEqual(rendition.width, 100)
         self.assertEqual(rendition.height, 75)
-        
+
     def test_resize_to_min(self):
         rendition = self.image.get_rendition('min-120x120')
 
@@ -160,7 +160,7 @@ class TestRenditionsWand(TestCase):
 
         # Check that they are the same object
         self.assertEqual(first_rendition, second_rendition)
-        
+
 
 class TestImageTag(TestCase):
     def setUp(self):

From b5586102ed5ae4bb3f56c33f2dc9de56628fdd2b Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 2 Jun 2014 10:52:34 +0100
Subject: [PATCH 05/60] Cleanup Filter.process_image a bit

---
 wagtail/wagtailimages/models.py | 37 ++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/wagtail/wagtailimages/models.py b/wagtail/wagtailimages/models.py
index a2be29486..ddde18d29 100644
--- a/wagtail/wagtailimages/models.py
+++ b/wagtail/wagtailimages/models.py
@@ -161,15 +161,17 @@ class Filter(models.Model):
         # and save the results to self.method_name and self.method_arg
         try:
             (method_name_simple, method_arg_string) = self.spec.split('-')
-            self.method_name = Filter.OPERATION_NAMES[method_name_simple]
+            method_name = Filter.OPERATION_NAMES[method_name_simple]
 
             if method_name_simple in ('max', 'min', 'fill'):
                 # method_arg_string is in the form 640x480
                 (width, height) = [int(i) for i in method_arg_string.split('x')]
-                self.method_arg = (width, height)
+                method_arg = (width, height)
             else:
                 # method_arg_string is a single number
-                self.method_arg = int(method_arg_string)
+                method_arg = int(method_arg_string)
+
+            return method_name, method_arg
 
         except (ValueError, KeyError):
             raise ValueError("Invalid image filter spec: %r" % self.spec)
@@ -180,36 +182,33 @@ class Filter(models.Model):
         generate an output image with this filter applied, returning it
         as another django.core.files.File object
         """
+        # Get image backend
         backend = get_image_backend(backend_name)
 
-        if not self.method:
-            self._parse_spec_string()
-
-        # If file is closed, open it
+        # Open image file
         input_file.open('rb')
         image = backend.open_image(input_file)
         file_format = image.format
 
-        method = getattr(backend, self.method_name)
+        # Parse filter spec string
+        method_name, method_arg = self._parse_spec_string()
 
-        image = method(image, self.method_arg)
+        # Run filter
+        method_f = getattr(backend, method_name)
+        image = method_f(image, method_arg)
 
+        # Save
         output = StringIO.StringIO()
         backend.save_image(image, output, file_format)
 
-        # and then close the input file
+        # Close input file
         input_file.close()
 
-        # generate new filename derived from old one, inserting the filter spec string before the extension
-        input_filename_parts = os.path.basename(input_file.name).split('.')
-        filename_without_extension = '.'.join(input_filename_parts[:-1])
-        filename_without_extension = filename_without_extension[:60]  # trim filename base so that we're well under 100 chars
-        output_filename_parts = [filename_without_extension, self.spec] + input_filename_parts[-1:]
-        output_filename = '.'.join(output_filename_parts)
+        # Generate new filename derived from old one, inserting the filter spec string before the extension
+        filename_noext, ext = os.path.splitext(input_file.name)
+        output_filename = '.'.join([filename_noext[:60], self.spec]) + ext
 
-        output_file = File(output, name=output_filename)
-
-        return output_file
+        return File(output, name=output_filename)
 
 
 class AbstractRendition(models.Model):

From 7ba7ded7c6cf2183f7ba4dbee80c86ede90d00cb Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 2 Jun 2014 13:40:34 +0100
Subject: [PATCH 06/60] Added WagtailTestCase class with a couple of useful
 methods

---
 wagtail/tests/utils.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/wagtail/tests/utils.py b/wagtail/tests/utils.py
index 6590e6dcc..8e18c661d 100644
--- a/wagtail/tests/utils.py
+++ b/wagtail/tests/utils.py
@@ -1,4 +1,6 @@
+from django.test import TestCase
 from django.contrib.auth.models import User
+from django.utils.six.moves.urllib.parse import urlparse, ParseResult
 
 # We need to make sure that we're using the same unittest library that Django uses internally
 # Otherwise, we get issues with the "SkipTest" and "ExpectedFailure" exceptions being recognised as errors
@@ -20,3 +22,26 @@ def login(client):
     client.login(username='test', password='password')
 
     return user
+
+
+class WagtailTestCase(TestCase):
+    def login(self):
+        login(self.client)
+
+    # From: https://github.com/django/django/blob/255449c1ee61c14778658caae8c430fa4d76afd6/django/contrib/auth/tests/test_views.py#L70-L85
+    def assertURLEqual(self, url, expected, parse_qs=False):
+        """
+        Given two URLs, make sure all their components (the ones given by
+        urlparse) are equal, only comparing components that are present in both
+        URLs.
+        If `parse_qs` is True, then the querystrings are parsed with QueryDict.
+        This is useful if you don't want the order of parameters to matter.
+        Otherwise, the query strings are compared as-is.
+        """
+        fields = ParseResult._fields
+
+        for attr, x, y in zip(fields, urlparse(url), urlparse(expected)):
+            if parse_qs and attr == 'query':
+                x, y = QueryDict(x), QueryDict(y)
+            if x and y and x != y:
+                self.fail("%r != %r (%s doesn't match)" % (url, expected, attr))

From 7e7910ba3b68e524683f4bafda08983805f11708 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 2 Jun 2014 13:41:00 +0100
Subject: [PATCH 07/60] Added LOGIN_REDIRECT_URL to runtests.py settings

---
 runtests.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/runtests.py b/runtests.py
index 6fd37ebeb..346729653 100755
--- a/runtests.py
+++ b/runtests.py
@@ -101,7 +101,8 @@ if not settings.configured:
         ),
         COMPRESS_ENABLED=False,  # disable compression so that we can run tests on the content of the compress tag
         WAGTAILSEARCH_BACKENDS=WAGTAILSEARCH_BACKENDS,
-        WAGTAIL_SITE_NAME='Test Site'
+        WAGTAIL_SITE_NAME='Test Site',
+        LOGIN_REDIRECT_URL = 'wagtailadmin_home',
     )
 
 

From 765f90746a6fac9e3a0caff025e0d668aed23a5d Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 2 Jun 2014 13:41:28 +0100
Subject: [PATCH 08/60] Use new WagtailTestCase class for checking redirect
 URLs in account management tests

---
 .../tests/test_account_management.py          | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_account_management.py b/wagtail/wagtailadmin/tests/test_account_management.py
index 95d54d7d9..0b71d55fb 100644
--- a/wagtail/wagtailadmin/tests/test_account_management.py
+++ b/wagtail/wagtailadmin/tests/test_account_management.py
@@ -1,17 +1,16 @@
-from django.test import TestCase
-from wagtail.tests.utils import login, unittest
+from wagtail.tests.utils import unittest, WagtailTestCase
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
 from django.contrib.auth.tokens import PasswordResetTokenGenerator
 from django.core import mail
 
 
-class TestAuthentication(TestCase):
+class TestAuthentication(WagtailTestCase):
     """
     This tests that users can login and logout of the admin interface
     """
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def test_login_view(self):
         """
@@ -44,6 +43,7 @@ class TestAuthentication(TestCase):
 
         # Check that the user was redirected to the dashboard
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailadmin_home'))
 
         # Check that the user was logged in
         self.assertTrue('_auth_user_id' in self.client.session)
@@ -61,6 +61,7 @@ class TestAuthentication(TestCase):
 
         # Check that the user was redirected to the dashboard
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailadmin_home'))
 
     def test_logout(self):
         """
@@ -71,17 +72,18 @@ class TestAuthentication(TestCase):
 
         # Check that the user was redirected to the login page
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailadmin_login'))
 
         # Check that the user was logged out
         self.assertFalse('_auth_user_id' in self.client.session)
 
 
-class TestAccountSection(TestCase):
+class TestAccountSection(WagtailTestCase):
     """
     This tests that the accounts section is working
     """
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def test_account_view(self):
         """
@@ -117,8 +119,9 @@ class TestAccountSection(TestCase):
         }
         response = self.client.post(reverse('wagtailadmin_account_change_password'), post_data)
 
-        # Check that the user was redirected
+        # Check that the user was redirected to the account page
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailadmin_account'))
 
         # Check that the password was changed
         self.assertTrue(User.objects.get(username='test').check_password('newpassword'))
@@ -146,7 +149,7 @@ class TestAccountSection(TestCase):
         self.assertTrue(User.objects.get(username='test').check_password('password'))
 
 
-class TestPasswordReset(TestCase):
+class TestPasswordReset(WagtailTestCase):
     """
     This tests that the password reset is working
     """
@@ -176,8 +179,9 @@ class TestPasswordReset(TestCase):
         }
         response = self.client.post(reverse('password_reset'), post_data)
 
-        # Check that the user was redirected
+        # Check that the user was redirected to the done page
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('password_reset_done'))
 
         # Check that a password reset email was sent to the user
         self.assertEqual(len(mail.outbox), 1)
@@ -267,8 +271,9 @@ class TestPasswordReset(TestCase):
         }
         response = self.client.post(reverse('password_reset_confirm', kwargs=self.url_kwargs), post_data)
 
-        # Check that the user was redirected
+        # Check that the user was redirected to the complete page
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('password_reset_complete'))
 
         # Check that the password was changed
         self.assertTrue(User.objects.get(username='test').check_password('newpassword'))

From a8ca4f14daefd980b402d987cd6fb7c496d991c4 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 2 Jun 2014 13:56:19 +0100
Subject: [PATCH 09/60] Return user object from login method

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

diff --git a/wagtail/tests/utils.py b/wagtail/tests/utils.py
index 8e18c661d..44e612555 100644
--- a/wagtail/tests/utils.py
+++ b/wagtail/tests/utils.py
@@ -26,7 +26,7 @@ def login(client):
 
 class WagtailTestCase(TestCase):
     def login(self):
-        login(self.client)
+        return login(self.client)
 
     # From: https://github.com/django/django/blob/255449c1ee61c14778658caae8c430fa4d76afd6/django/contrib/auth/tests/test_views.py#L70-L85
     def assertURLEqual(self, url, expected, parse_qs=False):

From 00a06856a8fba6ef838ac41e4a261d9e03d4698a Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 2 Jun 2014 13:56:54 +0100
Subject: [PATCH 10/60] Use WagtailTestCase class in admin page views tests

---
 .../wagtailadmin/tests/test_pages_views.py    | 59 +++++++++++--------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py
index ccaa67dae..f97c26581 100644
--- a/wagtail/wagtailadmin/tests/test_pages_views.py
+++ b/wagtail/wagtailadmin/tests/test_pages_views.py
@@ -1,13 +1,12 @@
-from django.test import TestCase
 from wagtail.tests.models import SimplePage, EventPage
-from wagtail.tests.utils import login, unittest
+from wagtail.tests.utils import unittest, WagtailTestCase
 from wagtail.wagtailcore.models import Page, PageRevision
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User, Permission
 from django.core import mail
 
 
-class TestPageExplorer(TestCase):
+class TestPageExplorer(WagtailTestCase):
     def setUp(self):
         # Find root page
         self.root_page = Page.objects.get(id=2)
@@ -19,7 +18,7 @@ class TestPageExplorer(TestCase):
         self.root_page.add_child(instance=self.child_page)
 
         # Login
-        login(self.client)
+        self.login()
 
     def test_explore(self):
         response = self.client.get(reverse('wagtailadmin_explore', args=(self.root_page.id, )))
@@ -28,13 +27,13 @@ class TestPageExplorer(TestCase):
         self.assertTrue(response.context['pages'].filter(id=self.child_page.id).exists())
 
 
-class TestPageCreation(TestCase):
+class TestPageCreation(WagtailTestCase):
     def setUp(self):
         # Find root page
         self.root_page = Page.objects.get(id=2)
 
         # Login
-        self.user = login(self.client)
+        self.user = self.login()
 
     def test_add_subpage(self):
         response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(self.root_page.id, )))
@@ -86,6 +85,7 @@ class TestPageCreation(TestCase):
 
         # Should be redirected to explorer page
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
 
         # Find the page and check it
         page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific
@@ -104,6 +104,7 @@ class TestPageCreation(TestCase):
 
         # Should be redirected to explorer page
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
 
         # Find the page and check it
         page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific
@@ -126,6 +127,7 @@ class TestPageCreation(TestCase):
 
         # Should be redirected to explorer page
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
 
         # Find the page and check it
         page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific
@@ -186,7 +188,7 @@ class TestPageCreation(TestCase):
         self.assertContains(response, "New page!")
 
 
-class TestPageEdit(TestCase):
+class TestPageEdit(WagtailTestCase):
     def setUp(self):
         # Find root page
         self.root_page = Page.objects.get(id=2)
@@ -206,7 +208,7 @@ class TestPageEdit(TestCase):
         self.root_page.add_child(instance=self.event_page)
 
         # Login
-        self.user = login(self.client)
+        self.user = self.login()
 
     def test_page_edit(self):
         # Tests that the edit page loads
@@ -238,6 +240,7 @@ class TestPageEdit(TestCase):
     
         # Should be redirected to explorer page
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
 
         # The page should have "has_unpublished_changes" flag set
         child_page_new = SimplePage.objects.get(id=self.child_page.id)
@@ -255,6 +258,7 @@ class TestPageEdit(TestCase):
     
         # Should be redirected to explorer page
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
 
         # Check that the page was edited
         child_page_new = SimplePage.objects.get(id=self.child_page.id)
@@ -278,6 +282,7 @@ class TestPageEdit(TestCase):
     
         # Should be redirected to explorer page
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
 
         # The page should have "has_unpublished_changes" flag set
         child_page_new = SimplePage.objects.get(id=self.child_page.id)
@@ -306,7 +311,7 @@ class TestPageEdit(TestCase):
         self.assertContains(response, "I&#39;ve been edited!")
 
 
-class TestPageDelete(TestCase):
+class TestPageDelete(WagtailTestCase):
     def setUp(self):
         # Find root page
         self.root_page = Page.objects.get(id=2)
@@ -318,7 +323,7 @@ class TestPageDelete(TestCase):
         self.root_page.add_child(instance=self.child_page)
 
         # Login
-        self.user = login(self.client)
+        self.user = self.login()
 
     def test_page_delete(self):
         response = self.client.get(reverse('wagtailadmin_pages_delete', args=(self.child_page.id, )))
@@ -344,15 +349,16 @@ class TestPageDelete(TestCase):
 
         # Should be redirected to explorer page
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
 
         # Check that the page is gone
         self.assertEqual(Page.objects.filter(path__startswith=self.root_page.path, slug='hello-world').count(), 0)
 
 
-class TestPageSearch(TestCase):
+class TestPageSearch(WagtailTestCase):
     def setUp(self):
         # Login
-        login(self.client)
+        self.login()
 
     def get(self, params=None, **extra):
         return self.client.get(reverse('wagtailadmin_pages_search'), params or {}, **extra)
@@ -390,7 +396,7 @@ class TestPageSearch(TestCase):
         self.assertTrue(any([r.slug == 'root' for r in results]))
 
 
-class TestPageMove(TestCase):
+class TestPageMove(WagtailTestCase):
     def setUp(self):
         # Find root page
         self.root_page = Page.objects.get(id=2)
@@ -413,7 +419,7 @@ class TestPageMove(TestCase):
         self.section_a.add_child(instance=self.test_page)
 
         # Login
-        self.user = login(self.client)
+        self.user = self.login()
 
     def test_page_move(self):
         response = self.client.get(reverse('wagtailadmin_pages_move', args=(self.test_page.id, )))
@@ -442,18 +448,18 @@ class TestPageMove(TestCase):
         self.assertEqual(response.status_code, 200)
 
 
-class TestPageUnpublish(TestCase):
+class TestPageUnpublish(WagtailTestCase):
     def setUp(self):
-        self.user = login(self.client)
+        self.user = self.login()
 
         # Create a page to unpublish
-        root_page = Page.objects.get(id=2)
+        self.root_page = Page.objects.get(id=2)
         self.page = SimplePage(
             title="Hello world!",
             slug='hello-world',
             live=True,
         )
-        root_page.add_child(instance=self.page)
+        self.root_page.add_child(instance=self.page)
 
     def test_unpublish_view(self):
         """
@@ -502,14 +508,15 @@ class TestPageUnpublish(TestCase):
             'foo': "Must post something or the view won't see this as a POST request",
         })
 
-        # Check that the user was redirected
+        # Check that the user was redirected to the explore page
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
 
         # Check that the page was unpublished
         self.assertFalse(SimplePage.objects.get(id=self.page.id).live)
 
 
-class TestApproveRejectModeration(TestCase):
+class TestApproveRejectModeration(WagtailTestCase):
     def setUp(self):
         self.submitter = User.objects.create_superuser(
             username='submitter',
@@ -517,7 +524,7 @@ class TestApproveRejectModeration(TestCase):
             password='password',
         )
 
-        self.user = login(self.client)
+        self.user = self.login()
 
         # Create a page and submit it for moderation
         root_page = Page.objects.get(id=2)
@@ -540,8 +547,9 @@ class TestApproveRejectModeration(TestCase):
             'foo': "Must post something or the view won't see this as a POST request",
         })
 
-        # Check that the user was redirected
+        # Check that the user was redirected to the dashboard
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailadmin_home'))
 
         # Page must be live
         self.assertTrue(Page.objects.get(id=self.page.id).live)
@@ -591,8 +599,9 @@ class TestApproveRejectModeration(TestCase):
             'foo': "Must post something or the view won't see this as a POST request",
         })
 
-        # Check that the user was redirected
+        # Check that the user was redirected to the dashboard
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailadmin_home'))
 
         # Page must not be live
         self.assertFalse(Page.objects.get(id=self.page.id).live)
@@ -645,11 +654,11 @@ class TestApproveRejectModeration(TestCase):
         self.assertContains(response, "Hello world!")
 
 
-class TestContentTypeUse(TestCase):
+class TestContentTypeUse(WagtailTestCase):
     fixtures = ['test.json']
 
     def setUp(self):
-        self.user = login(self.client)
+        self.user = self.login()
 
     def test_content_type_use(self):
         # Get use of event page

From 301fd6ec3c5e37b8f9b092fade08e49c7bde949c Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 2 Jun 2014 13:59:06 +0100
Subject: [PATCH 11/60] Made WagtailTestCase a mixin and renamed to
 WagtailTestUtils.

---
 wagtail/tests/utils.py                        |  2 +-
 .../tests/test_account_management.py          |  9 ++++----
 .../wagtailadmin/tests/test_pages_views.py    | 21 ++++++++++---------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/wagtail/tests/utils.py b/wagtail/tests/utils.py
index 44e612555..4b22b000c 100644
--- a/wagtail/tests/utils.py
+++ b/wagtail/tests/utils.py
@@ -24,7 +24,7 @@ def login(client):
     return user
 
 
-class WagtailTestCase(TestCase):
+class WagtailTestUtils(object):
     def login(self):
         return login(self.client)
 
diff --git a/wagtail/wagtailadmin/tests/test_account_management.py b/wagtail/wagtailadmin/tests/test_account_management.py
index 0b71d55fb..499cd9554 100644
--- a/wagtail/wagtailadmin/tests/test_account_management.py
+++ b/wagtail/wagtailadmin/tests/test_account_management.py
@@ -1,11 +1,12 @@
-from wagtail.tests.utils import unittest, WagtailTestCase
+from django.test import TestCase
+from wagtail.tests.utils import unittest, WagtailTestUtils
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
 from django.contrib.auth.tokens import PasswordResetTokenGenerator
 from django.core import mail
 
 
-class TestAuthentication(WagtailTestCase):
+class TestAuthentication(TestCase, WagtailTestUtils):
     """
     This tests that users can login and logout of the admin interface
     """
@@ -78,7 +79,7 @@ class TestAuthentication(WagtailTestCase):
         self.assertFalse('_auth_user_id' in self.client.session)
 
 
-class TestAccountSection(WagtailTestCase):
+class TestAccountSection(TestCase, WagtailTestUtils):
     """
     This tests that the accounts section is working
     """
@@ -149,7 +150,7 @@ class TestAccountSection(WagtailTestCase):
         self.assertTrue(User.objects.get(username='test').check_password('password'))
 
 
-class TestPasswordReset(WagtailTestCase):
+class TestPasswordReset(TestCase, WagtailTestUtils):
     """
     This tests that the password reset is working
     """
diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py
index f97c26581..a34b29fd8 100644
--- a/wagtail/wagtailadmin/tests/test_pages_views.py
+++ b/wagtail/wagtailadmin/tests/test_pages_views.py
@@ -1,12 +1,13 @@
+from django.test import TestCase
 from wagtail.tests.models import SimplePage, EventPage
-from wagtail.tests.utils import unittest, WagtailTestCase
+from wagtail.tests.utils import unittest, WagtailTestUtils
 from wagtail.wagtailcore.models import Page, PageRevision
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User, Permission
 from django.core import mail
 
 
-class TestPageExplorer(WagtailTestCase):
+class TestPageExplorer(TestCase, WagtailTestUtils):
     def setUp(self):
         # Find root page
         self.root_page = Page.objects.get(id=2)
@@ -27,7 +28,7 @@ class TestPageExplorer(WagtailTestCase):
         self.assertTrue(response.context['pages'].filter(id=self.child_page.id).exists())
 
 
-class TestPageCreation(WagtailTestCase):
+class TestPageCreation(TestCase, WagtailTestUtils):
     def setUp(self):
         # Find root page
         self.root_page = Page.objects.get(id=2)
@@ -188,7 +189,7 @@ class TestPageCreation(WagtailTestCase):
         self.assertContains(response, "New page!")
 
 
-class TestPageEdit(WagtailTestCase):
+class TestPageEdit(TestCase, WagtailTestUtils):
     def setUp(self):
         # Find root page
         self.root_page = Page.objects.get(id=2)
@@ -311,7 +312,7 @@ class TestPageEdit(WagtailTestCase):
         self.assertContains(response, "I&#39;ve been edited!")
 
 
-class TestPageDelete(WagtailTestCase):
+class TestPageDelete(TestCase, WagtailTestUtils):
     def setUp(self):
         # Find root page
         self.root_page = Page.objects.get(id=2)
@@ -355,7 +356,7 @@ class TestPageDelete(WagtailTestCase):
         self.assertEqual(Page.objects.filter(path__startswith=self.root_page.path, slug='hello-world').count(), 0)
 
 
-class TestPageSearch(WagtailTestCase):
+class TestPageSearch(TestCase, WagtailTestUtils):
     def setUp(self):
         # Login
         self.login()
@@ -396,7 +397,7 @@ class TestPageSearch(WagtailTestCase):
         self.assertTrue(any([r.slug == 'root' for r in results]))
 
 
-class TestPageMove(WagtailTestCase):
+class TestPageMove(TestCase, WagtailTestUtils):
     def setUp(self):
         # Find root page
         self.root_page = Page.objects.get(id=2)
@@ -448,7 +449,7 @@ class TestPageMove(WagtailTestCase):
         self.assertEqual(response.status_code, 200)
 
 
-class TestPageUnpublish(WagtailTestCase):
+class TestPageUnpublish(TestCase, WagtailTestUtils):
     def setUp(self):
         self.user = self.login()
 
@@ -516,7 +517,7 @@ class TestPageUnpublish(WagtailTestCase):
         self.assertFalse(SimplePage.objects.get(id=self.page.id).live)
 
 
-class TestApproveRejectModeration(WagtailTestCase):
+class TestApproveRejectModeration(TestCase, WagtailTestUtils):
     def setUp(self):
         self.submitter = User.objects.create_superuser(
             username='submitter',
@@ -654,7 +655,7 @@ class TestApproveRejectModeration(WagtailTestCase):
         self.assertContains(response, "Hello world!")
 
 
-class TestContentTypeUse(WagtailTestCase):
+class TestContentTypeUse(TestCase, WagtailTestUtils):
     fixtures = ['test.json']
 
     def setUp(self):

From d9825e9531c3067c3261bdc7ac04042c50e92148 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 2 Jun 2014 14:03:02 +0100
Subject: [PATCH 12/60] Fixed missing import

---
 wagtail/tests/utils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wagtail/tests/utils.py b/wagtail/tests/utils.py
index 4b22b000c..0497b239a 100644
--- a/wagtail/tests/utils.py
+++ b/wagtail/tests/utils.py
@@ -1,6 +1,7 @@
 from django.test import TestCase
 from django.contrib.auth.models import User
 from django.utils.six.moves.urllib.parse import urlparse, ParseResult
+from django.http import QueryDict
 
 # We need to make sure that we're using the same unittest library that Django uses internally
 # Otherwise, we get issues with the "SkipTest" and "ExpectedFailure" exceptions being recognised as errors

From 106b27a5a5699fe369f841141bbf3cc219da6864 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 2 Jun 2014 15:23:32 +0100
Subject: [PATCH 13/60] Added template used assertions into many tests

---
 wagtail/wagtailadmin/tests/tests.py           |  2 +-
 wagtail/wagtaildocs/tests.py                  | 54 ++++++++++++++-----
 wagtail/wagtailimages/tests.py                | 48 ++++++++++++-----
 wagtail/wagtailredirects/tests.py             | 24 ++++++---
 .../wagtailsearch/tests/test_editorspicks.py  | 24 ++++++---
 wagtail/wagtailsearch/tests/test_frontend.py  | 12 +++--
 wagtail/wagtailsearch/tests/test_queries.py   |  7 ++-
 wagtail/wagtailsnippets/tests.py              | 24 ++++++---
 wagtail/wagtailusers/tests.py                 | 18 ++++---
 9 files changed, 148 insertions(+), 65 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/tests.py b/wagtail/wagtailadmin/tests/tests.py
index 12aa28a0b..b0c0896e2 100644
--- a/wagtail/wagtailadmin/tests/tests.py
+++ b/wagtail/wagtailadmin/tests/tests.py
@@ -12,7 +12,7 @@ class TestHome(TestCase):
         # Login
         login(self.client)
 
-    def test_status_code(self):
+    def test_simple(self):
         response = self.client.get(reverse('wagtailadmin_home'))
         self.assertEqual(response.status_code, 200)
 
diff --git a/wagtail/wagtaildocs/tests.py b/wagtail/wagtaildocs/tests.py
index d068f9a27..33da3e33a 100644
--- a/wagtail/wagtaildocs/tests.py
+++ b/wagtail/wagtaildocs/tests.py
@@ -46,8 +46,10 @@ class TestDocumentIndexView(TestCase):
     def get(self, params={}):
         return self.client.get(reverse('wagtaildocs_index'), params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtaildocs/documents/index.html')
 
     def test_search(self):
         response = self.get({'q': "Hello"})
@@ -74,8 +76,12 @@ class TestDocumentAddView(TestCase):
     def get(self, params={}):
         return self.client.get(reverse('wagtaildocs_add_document'), params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtaildocs/documents/add.html')
+
+    # TODO: Test posting
 
 
 class TestDocumentEditView(TestCase):
@@ -88,8 +94,12 @@ class TestDocumentEditView(TestCase):
     def get(self, params={}):
         return self.client.get(reverse('wagtaildocs_edit_document', args=(self.document.id,)), params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtaildocs/documents/edit.html')
+
+    # TODO: Test posting
 
 
 class TestDocumentDeleteView(TestCase):
@@ -102,8 +112,12 @@ class TestDocumentDeleteView(TestCase):
     def get(self, params={}):
         return self.client.get(reverse('wagtaildocs_delete_document', args=(self.document.id,)), params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtaildocs/documents/confirm_delete.html')
+
+    # TODO: Test posting
 
 
 class TestDocumentChooserView(TestCase):
@@ -113,8 +127,11 @@ class TestDocumentChooserView(TestCase):
     def get(self, params={}):
         return self.client.get(reverse('wagtaildocs_chooser'), params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtaildocs/chooser/chooser.html')
+        self.assertTemplateUsed(response, 'wagtaildocs/chooser/chooser.js')
 
     def test_search(self):
         response = self.get({'q': "Hello"})
@@ -138,8 +155,12 @@ class TestDocumentChooserChosenView(TestCase):
     def get(self, params={}):
         return self.client.get(reverse('wagtaildocs_document_chosen', args=(self.document.id,)), params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtaildocs/chooser/document_chosen.js')
+
+    # TODO: Test posting
 
 
 class TestDocumentChooserUploadView(TestCase):
@@ -149,8 +170,13 @@ class TestDocumentChooserUploadView(TestCase):
     def get(self, params={}):
         return self.client.get(reverse('wagtaildocs_chooser_upload'), params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtaildocs/chooser/chooser.html')
+        self.assertTemplateUsed(response, 'wagtaildocs/chooser/chooser.js')
+
+    # TODO: Test document upload with chooser
 
 
 class TestDocumentFilenameProperties(TestCase):
diff --git a/wagtail/wagtailimages/tests.py b/wagtail/wagtailimages/tests.py
index 00d1245e6..fdadc3704 100644
--- a/wagtail/wagtailimages/tests.py
+++ b/wagtail/wagtailimages/tests.py
@@ -194,8 +194,10 @@ class TestImageIndexView(TestCase):
     def get(self, params={}):
         return self.client.get(reverse('wagtailimages_index'), params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailimages/images/index.html')
 
     def test_search(self):
         response = self.get({'q': "Hello"})
@@ -225,8 +227,10 @@ class TestImageAddView(TestCase):
     def post(self, post_data={}):
         return self.client.post(reverse('wagtailimages_add_image'), post_data)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailimages/images/add.html')
 
     def test_add(self):
         response = self.post({
@@ -263,8 +267,10 @@ class TestImageEditView(TestCase):
     def post(self, post_data={}):
         return self.client.post(reverse('wagtailimages_edit_image', args=(self.image.id,)), post_data)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailimages/images/edit.html')
 
     def test_edit(self):
         response = self.post({
@@ -295,8 +301,10 @@ class TestImageDeleteView(TestCase):
     def post(self, post_data={}):
         return self.client.post(reverse('wagtailimages_delete_image', args=(self.image.id,)), post_data)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailimages/images/confirm_delete.html')
 
     def test_delete(self):
         response = self.post({
@@ -318,8 +326,11 @@ class TestImageChooserView(TestCase):
     def get(self, params={}):
         return self.client.get(reverse('wagtailimages_chooser'), params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailimages/chooser/chooser.html')
+        self.assertTemplateUsed(response, 'wagtailimages/chooser/chooser.js')
 
     def test_search(self):
         response = self.get({'q': "Hello"})
@@ -346,8 +357,12 @@ class TestImageChooserChosenView(TestCase):
     def get(self, params={}):
         return self.client.get(reverse('wagtailimages_image_chosen', args=(self.image.id,)), params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailimages/chooser/image_chosen.js')
+
+    # TODO: Test posting
 
 
 class TestImageChooserUploadView(TestCase):
@@ -357,5 +372,10 @@ class TestImageChooserUploadView(TestCase):
     def get(self, params={}):
         return self.client.get(reverse('wagtailimages_chooser_upload'), params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailimages/chooser/chooser.html')
+        self.assertTemplateUsed(response, 'wagtailimages/chooser/chooser.js')
+
+    # TODO: Test uploading through chooser
diff --git a/wagtail/wagtailredirects/tests.py b/wagtail/wagtailredirects/tests.py
index a14a853fa..f23ea63c9 100644
--- a/wagtail/wagtailredirects/tests.py
+++ b/wagtail/wagtailredirects/tests.py
@@ -73,8 +73,10 @@ class TestRedirectsIndexView(TestCase):
     def get(self, params={}):
         return self.client.get(reverse('wagtailredirects_index'), params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailredirects/index.html')
 
     def test_search(self):
         response = self.get({'q': "Hello"})
@@ -98,8 +100,10 @@ class TestRedirectsAddView(TestCase):
     def post(self, post_data={}):
         return self.client.post(reverse('wagtailredirects_add_redirect'), post_data)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailredirects/add.html')
 
     def test_add(self):
         response = self.post({
@@ -142,8 +146,10 @@ class TestRedirectsEditView(TestCase):
     def post(self, post_data={}, redirect_id=None):
         return self.client.post(reverse('wagtailredirects_edit_redirect', args=(redirect_id or self.redirect.id, )), post_data)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailredirects/edit.html')
 
     def test_nonexistant_redirect(self):
         self.assertEqual(self.get(redirect_id=100000).status_code, 404)
@@ -188,8 +194,10 @@ class TestRedirectsDeleteView(TestCase):
     def post(self, post_data={}, redirect_id=None):
         return self.client.post(reverse('wagtailredirects_delete_redirect', args=(redirect_id or self.redirect.id, )), post_data)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailredirects/confirm_delete.html')
 
     def test_nonexistant_redirect(self):
         self.assertEqual(self.get(redirect_id=100000).status_code, 404)
diff --git a/wagtail/wagtailsearch/tests/test_editorspicks.py b/wagtail/wagtailsearch/tests/test_editorspicks.py
index e0b49153f..2af0df625 100644
--- a/wagtail/wagtailsearch/tests/test_editorspicks.py
+++ b/wagtail/wagtailsearch/tests/test_editorspicks.py
@@ -52,8 +52,10 @@ class TestEditorsPicksIndexView(TestCase):
     def get(self, params={}):
         return self.client.get('/admin/search/editorspicks/', params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailsearch/editorspicks/index.html')
 
     def test_search(self):
         response = self.get({'q': "Hello"})
@@ -74,8 +76,10 @@ class TestEditorsPicksAddView(TestCase):
     def get(self, params={}):
         return self.client.get('/admin/search/editorspicks/add/', params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailsearch/editorspicks/add.html')
 
 
 class TestEditorsPicksEditView(TestCase):
@@ -89,8 +93,10 @@ class TestEditorsPicksEditView(TestCase):
     def get(self, params={}):
         return self.client.get('/admin/search/editorspicks/' + str(self.query.id) + '/', params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailsearch/editorspicks/edit.html')
 
 
 class TestEditorsPicksDeleteView(TestCase):
@@ -104,5 +110,7 @@ class TestEditorsPicksDeleteView(TestCase):
     def get(self, params={}):
         return self.client.get('/admin/search/editorspicks/' + str(self.query.id) + '/delete/', params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailsearch/editorspicks/confirm_delete.html')
diff --git a/wagtail/wagtailsearch/tests/test_frontend.py b/wagtail/wagtailsearch/tests/test_frontend.py
index 82189cfc9..8081c968d 100644
--- a/wagtail/wagtailsearch/tests/test_frontend.py
+++ b/wagtail/wagtailsearch/tests/test_frontend.py
@@ -5,8 +5,10 @@ class TestSearchView(TestCase):
     def get(self, params={}):
         return self.client.get('/search/', params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailsearch/search_results.html')
 
     def test_search(self):
         response = self.get({'q': "Hello"})
@@ -24,8 +26,10 @@ class TestSuggestionsView(TestCase):
     def get(self, params={}):
         return self.client.get('/search/suggest/', params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        # TODO: Check that a valid JSON document was returned
 
     def test_search(self):
         response = self.get({'q': "Hello"})
diff --git a/wagtail/wagtailsearch/tests/test_queries.py b/wagtail/wagtailsearch/tests/test_queries.py
index 7086d46f4..67325104d 100644
--- a/wagtail/wagtailsearch/tests/test_queries.py
+++ b/wagtail/wagtailsearch/tests/test_queries.py
@@ -146,8 +146,11 @@ class TestQueryChooserView(TestCase):
     def get(self, params={}):
         return self.client.get('/admin/search/queries/chooser/', params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailsearch/queries/chooser/chooser.html')
+        self.assertTemplateUsed(response, 'wagtailsearch/queries/chooser/chooser.js')
 
     def test_search(self):
         response = self.get({'q': "Hello"})
diff --git a/wagtail/wagtailsnippets/tests.py b/wagtail/wagtailsnippets/tests.py
index fd283f7f5..f68062319 100644
--- a/wagtail/wagtailsnippets/tests.py
+++ b/wagtail/wagtailsnippets/tests.py
@@ -13,8 +13,10 @@ class TestSnippetIndexView(TestCase):
     def get(self, params={}):
         return self.client.get(reverse('wagtailsnippets_index'), params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailsnippets/snippets/index.html')
 
     def test_displays_snippet(self):
         self.assertContains(self.get(), "Adverts")
@@ -29,8 +31,10 @@ class TestSnippetListView(TestCase):
                                        args=('tests', 'advert')),
                                params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailsnippets/snippets/type_index.html')
 
     def test_displays_add_button(self):
         self.assertContains(self.get(), "Add advert")
@@ -50,8 +54,10 @@ class TestSnippetCreateView(TestCase):
                                args=('tests', 'advert')),
                                post_data)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailsnippets/snippets/create.html')
 
     def test_create_invalid(self):
         response = self.post(post_data={'foo': 'bar'})
@@ -87,8 +93,10 @@ class TestSnippetEditView(TestCase):
                                         args=('tests', 'advert', self.test_snippet.id)),
                                 post_data)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailsnippets/snippets/edit.html')
 
     def test_non_existant_model(self):
         response = self.client.get(reverse('wagtailsnippets_edit',
diff --git a/wagtail/wagtailusers/tests.py b/wagtail/wagtailusers/tests.py
index bfe0fe4ef..d60d33d47 100644
--- a/wagtail/wagtailusers/tests.py
+++ b/wagtail/wagtailusers/tests.py
@@ -11,8 +11,10 @@ class TestUserIndexView(TestCase):
     def get(self, params={}):
         return self.client.get(reverse('wagtailusers_index'), params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailusers/index.html')
 
     def test_search(self):
         response = self.get({'q': "Hello"})
@@ -36,8 +38,10 @@ class TestUserCreateView(TestCase):
     def post(self, post_data={}):
         return self.client.post(reverse('wagtailusers_create'), post_data)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailusers/create.html')
 
     def test_create(self):
         response = self.post({
@@ -72,8 +76,10 @@ class TestUserEditView(TestCase):
     def post(self, post_data={}, user_id=None):
         return self.client.post(reverse('wagtailusers_edit', args=(user_id or self.test_user.id, )), post_data)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailusers/edit.html')
 
     def test_nonexistant_redirect(self):
         self.assertEqual(self.get(user_id=100000).status_code, 404)

From f4ee926ffaa17f318cca5ec226a4685866811be7 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 2 Jun 2014 15:56:03 +0100
Subject: [PATCH 14/60] Added URL assertions to tests which test redirecting

---
 wagtail/wagtailimages/tests.py    | 11 +++++++----
 wagtail/wagtailredirects/tests.py | 11 +++++++----
 wagtail/wagtailsnippets/tests.py  | 11 +++++++----
 wagtail/wagtailusers/tests.py     |  8 +++++---
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/wagtail/wagtailimages/tests.py b/wagtail/wagtailimages/tests.py
index fdadc3704..c8f0194c0 100644
--- a/wagtail/wagtailimages/tests.py
+++ b/wagtail/wagtailimages/tests.py
@@ -4,7 +4,7 @@ from django.contrib.auth.models import User, Group, Permission
 from django.core.urlresolvers import reverse
 from django.core.files.uploadedfile import SimpleUploadedFile
 
-from wagtail.tests.utils import login, unittest
+from wagtail.tests.utils import login, unittest, WagtailTestUtils
 from wagtail.wagtailimages.models import get_image_model
 from wagtail.wagtailimages.templatetags import image_tags
 
@@ -217,7 +217,7 @@ class TestImageIndexView(TestCase):
             self.assertEqual(response.status_code, 200)
 
 
-class TestImageAddView(TestCase):
+class TestImageAddView(TestCase, WagtailTestUtils):
     def setUp(self):
         login(self.client)
 
@@ -240,6 +240,7 @@ class TestImageAddView(TestCase):
 
         # Should redirect back to index
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailimages_index'))
 
         # Check that the image was created
         images = Image.objects.filter(title="Test image")
@@ -251,7 +252,7 @@ class TestImageAddView(TestCase):
         self.assertEqual(image.height, 480)
 
 
-class TestImageEditView(TestCase):
+class TestImageEditView(TestCase, WagtailTestUtils):
     def setUp(self):
         login(self.client)
 
@@ -279,13 +280,14 @@ class TestImageEditView(TestCase):
 
         # Should redirect back to index
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailimages_index'))
 
         # Check that the image was edited
         image = Image.objects.get(id=self.image.id)
         self.assertEqual(image.title, "Edited")
 
 
-class TestImageDeleteView(TestCase):
+class TestImageDeleteView(TestCase, WagtailTestUtils):
     def setUp(self):
         login(self.client)
 
@@ -313,6 +315,7 @@ class TestImageDeleteView(TestCase):
 
         # Should redirect back to index
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailimages_index'))
 
         # Check that the image was deleted
         images = Image.objects.filter(title="Test image")
diff --git a/wagtail/wagtailredirects/tests.py b/wagtail/wagtailredirects/tests.py
index f23ea63c9..543a8dd70 100644
--- a/wagtail/wagtailredirects/tests.py
+++ b/wagtail/wagtailredirects/tests.py
@@ -1,7 +1,7 @@
 from django.test import TestCase
 from django.test.client import Client
 from wagtail.wagtailredirects import models
-from wagtail.tests.utils import login
+from wagtail.tests.utils import login, WagtailTestUtils
 from django.core.urlresolvers import reverse
 
 
@@ -90,7 +90,7 @@ class TestRedirectsIndexView(TestCase):
             self.assertEqual(response.status_code, 200)
 
 
-class TestRedirectsAddView(TestCase):
+class TestRedirectsAddView(TestCase, WagtailTestUtils):
     def setUp(self):
         login(self.client)
 
@@ -114,6 +114,7 @@ class TestRedirectsAddView(TestCase):
 
         # Should redirect back to index
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailredirects_index'))
 
         # Check that the redirect was created
         redirects = models.Redirect.objects.filter(old_path='/test')
@@ -131,7 +132,7 @@ class TestRedirectsAddView(TestCase):
         self.assertEqual(response.status_code, 200)
 
 
-class TestRedirectsEditView(TestCase):
+class TestRedirectsEditView(TestCase, WagtailTestUtils):
     def setUp(self):
         # Create a redirect to edit
         self.redirect = models.Redirect(old_path='/test', redirect_link='http://www.test.com/')
@@ -163,6 +164,7 @@ class TestRedirectsEditView(TestCase):
 
         # Should redirect back to index
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailredirects_index'))
 
         # Check that the redirect was edited
         redirects = models.Redirect.objects.filter(old_path='/test')
@@ -179,7 +181,7 @@ class TestRedirectsEditView(TestCase):
         # Should not redirect to index
         self.assertEqual(response.status_code, 200)
 
-class TestRedirectsDeleteView(TestCase):
+class TestRedirectsDeleteView(TestCase, WagtailTestUtils):
     def setUp(self):
         # Create a redirect to edit
         self.redirect = models.Redirect(old_path='/test', redirect_link='http://www.test.com/')
@@ -209,6 +211,7 @@ class TestRedirectsDeleteView(TestCase):
 
         # Should redirect back to index
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailredirects_index'))
 
         # Check that the redirect was deleted
         redirects = models.Redirect.objects.filter(old_path='/test')
diff --git a/wagtail/wagtailsnippets/tests.py b/wagtail/wagtailsnippets/tests.py
index f68062319..3adaf5a3b 100644
--- a/wagtail/wagtailsnippets/tests.py
+++ b/wagtail/wagtailsnippets/tests.py
@@ -2,7 +2,7 @@ from django.test import TestCase
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
 
-from wagtail.tests.utils import login, unittest
+from wagtail.tests.utils import login, unittest, WagtailTestUtils
 from wagtail.tests.models import Advert
 
 
@@ -40,7 +40,7 @@ class TestSnippetListView(TestCase):
         self.assertContains(self.get(), "Add advert")
 
 
-class TestSnippetCreateView(TestCase):
+class TestSnippetCreateView(TestCase, WagtailTestUtils):
     def setUp(self):
         login(self.client)
 
@@ -68,13 +68,14 @@ class TestSnippetCreateView(TestCase):
         response = self.post(post_data={'text': 'test_advert',
                                         'url': 'http://www.example.com/'})
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailsnippets_list', args=('tests', 'advert')))
 
         snippets = Advert.objects.filter(text='test_advert')
         self.assertEqual(snippets.count(), 1)
         self.assertEqual(snippets.first().url, 'http://www.example.com/')
 
 
-class TestSnippetEditView(TestCase):
+class TestSnippetEditView(TestCase, WagtailTestUtils):
     def setUp(self):
         self.test_snippet = Advert()
         self.test_snippet.text = 'test_advert'
@@ -117,13 +118,14 @@ class TestSnippetEditView(TestCase):
         response = self.post(post_data={'text': 'edited_test_advert',
                                         'url': 'http://www.example.com/edited'})
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailsnippets_list', args=('tests', 'advert')))
 
         snippets = Advert.objects.filter(text='edited_test_advert')
         self.assertEqual(snippets.count(), 1)
         self.assertEqual(snippets.first().url, 'http://www.example.com/edited')
 
 
-class TestSnippetDelete(TestCase):
+class TestSnippetDelete(TestCase, WagtailTestUtils):
     def setUp(self):
         self.test_snippet = Advert()
         self.test_snippet.text = 'test_advert'
@@ -142,6 +144,7 @@ class TestSnippetDelete(TestCase):
 
         # Should be redirected to explorer page
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailsnippets_list', args=('tests', 'advert')))
 
         # Check that the page is gone
         self.assertEqual(Advert.objects.filter(text='test_advert').count(), 0)
diff --git a/wagtail/wagtailusers/tests.py b/wagtail/wagtailusers/tests.py
index d60d33d47..c9105e3c0 100644
--- a/wagtail/wagtailusers/tests.py
+++ b/wagtail/wagtailusers/tests.py
@@ -1,7 +1,7 @@
 from django.test import TestCase
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
-from wagtail.tests.utils import login
+from wagtail.tests.utils import login, WagtailTestUtils
 
 
 class TestUserIndexView(TestCase):
@@ -28,7 +28,7 @@ class TestUserIndexView(TestCase):
             self.assertEqual(response.status_code, 200)
 
 
-class TestUserCreateView(TestCase):
+class TestUserCreateView(TestCase, WagtailTestUtils):
     def setUp(self):
         login(self.client)
 
@@ -55,6 +55,7 @@ class TestUserCreateView(TestCase):
 
         # Should redirect back to index
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailusers_index'))
 
         # Check that the user was created
         users = User.objects.filter(username='testuser')
@@ -62,7 +63,7 @@ class TestUserCreateView(TestCase):
         self.assertEqual(users.first().email, 'test@user.com')
 
 
-class TestUserEditView(TestCase):
+class TestUserEditView(TestCase, WagtailTestUtils):
     def setUp(self):
         # Create a user to edit
         self.test_user = User.objects.create_user(username='testuser', email='testuser@email.com', password='password')
@@ -96,6 +97,7 @@ class TestUserEditView(TestCase):
 
         # Should redirect back to index
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailusers_index'))
 
         # Check that the user was edited
         user = User.objects.get(id=self.test_user.id)

From eddc3fc917791c80c3bad250721bbb30ace9238e Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 2 Jun 2014 16:07:31 +0100
Subject: [PATCH 15/60] Always use login method from WagtailTestUtils

---
 wagtail/tests/utils.py                        | 18 +++++------
 wagtail/wagtailadmin/tests/tests.py           | 10 +++----
 wagtail/wagtaildocs/tests.py                  | 30 +++++++++----------
 wagtail/wagtailembeds/tests.py                |  6 ++--
 wagtail/wagtailimages/tests.py                | 24 +++++++--------
 wagtail/wagtailredirects/tests.py             | 12 ++++----
 .../wagtailsearch/tests/test_editorspicks.py  | 24 +++++++++------
 wagtail/wagtailsearch/tests/test_queries.py   |  6 ++--
 wagtail/wagtailsnippets/tests.py              | 16 +++++-----
 wagtail/wagtailusers/tests.py                 | 10 +++----
 10 files changed, 79 insertions(+), 77 deletions(-)

diff --git a/wagtail/tests/utils.py b/wagtail/tests/utils.py
index 0497b239a..0b13e5932 100644
--- a/wagtail/tests/utils.py
+++ b/wagtail/tests/utils.py
@@ -15,19 +15,15 @@ except ImportError:
     import unittest
 
 
-def login(client):
-    # Create a user
-    user = User.objects.create_superuser(username='test', email='test@email.com', password='password')
-
-    # Login
-    client.login(username='test', password='password')
-
-    return user
-
-
 class WagtailTestUtils(object):
     def login(self):
-        return login(self.client)
+        # Create a user
+        user = User.objects.create_superuser(username='test', email='test@email.com', password='password')
+
+        # Login
+        self.client.login(username='test', password='password')
+
+        return user
 
     # From: https://github.com/django/django/blob/255449c1ee61c14778658caae8c430fa4d76afd6/django/contrib/auth/tests/test_views.py#L70-L85
     def assertURLEqual(self, url, expected, parse_qs=False):
diff --git a/wagtail/wagtailadmin/tests/tests.py b/wagtail/wagtailadmin/tests/tests.py
index b0c0896e2..f014c026d 100644
--- a/wagtail/wagtailadmin/tests/tests.py
+++ b/wagtail/wagtailadmin/tests/tests.py
@@ -1,26 +1,26 @@
 from django.test import TestCase
 from wagtail.tests.models import SimplePage, EventPage
-from wagtail.tests.utils import login, unittest
+from wagtail.tests.utils import unittest, WagtailTestUtils
 from wagtail.wagtailcore.models import Page
 from wagtail.wagtailadmin.tasks import send_email_task
 from django.core.urlresolvers import reverse
 from django.core import mail
 
 
-class TestHome(TestCase):
+class TestHome(TestCase, WagtailTestUtils):
     def setUp(self):
         # Login
-        login(self.client)
+        self.login()
 
     def test_simple(self):
         response = self.client.get(reverse('wagtailadmin_home'))
         self.assertEqual(response.status_code, 200)
 
 
-class TestEditorHooks(TestCase):
+class TestEditorHooks(TestCase, WagtailTestUtils):
     def setUp(self):
         self.homepage = Page.objects.get(id=2)
-        login(self.client)
+        self.login()
 
     def test_editor_css_and_js_hooks_on_add(self):
         response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.homepage.id)))
diff --git a/wagtail/wagtaildocs/tests.py b/wagtail/wagtaildocs/tests.py
index 33da3e33a..3353ce39e 100644
--- a/wagtail/wagtaildocs/tests.py
+++ b/wagtail/wagtaildocs/tests.py
@@ -1,6 +1,6 @@
 from django.test import TestCase
 from wagtail.wagtaildocs import models
-from wagtail.tests.utils import login
+from wagtail.tests.utils import WagtailTestUtils
 from django.contrib.auth.models import User, Group, Permission
 from django.core.urlresolvers import reverse
 from django.core.files.base import ContentFile
@@ -39,9 +39,9 @@ class TestDocumentPermissions(TestCase):
 ## ===== ADMIN VIEWS =====
 
 
-class TestDocumentIndexView(TestCase):
+class TestDocumentIndexView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtaildocs_index'), params)
@@ -69,9 +69,9 @@ class TestDocumentIndexView(TestCase):
             self.assertEqual(response.status_code, 200)
 
 
-class TestDocumentAddView(TestCase):
+class TestDocumentAddView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtaildocs_add_document'), params)
@@ -84,9 +84,9 @@ class TestDocumentAddView(TestCase):
     # TODO: Test posting
 
 
-class TestDocumentEditView(TestCase):
+class TestDocumentEditView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
         # Create a document to edit
         self.document = models.Document.objects.create(title="Test document")
@@ -102,9 +102,9 @@ class TestDocumentEditView(TestCase):
     # TODO: Test posting
 
 
-class TestDocumentDeleteView(TestCase):
+class TestDocumentDeleteView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
         # Create a document to delete
         self.document = models.Document.objects.create(title="Test document")
@@ -120,9 +120,9 @@ class TestDocumentDeleteView(TestCase):
     # TODO: Test posting
 
 
-class TestDocumentChooserView(TestCase):
+class TestDocumentChooserView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtaildocs_chooser'), params)
@@ -145,9 +145,9 @@ class TestDocumentChooserView(TestCase):
             self.assertEqual(response.status_code, 200)
 
 
-class TestDocumentChooserChosenView(TestCase):
+class TestDocumentChooserChosenView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
         # Create a document to choose
         self.document = models.Document.objects.create(title="Test document")
@@ -163,9 +163,9 @@ class TestDocumentChooserChosenView(TestCase):
     # TODO: Test posting
 
 
-class TestDocumentChooserUploadView(TestCase):
+class TestDocumentChooserUploadView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtaildocs_chooser_upload'), params)
diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py
index b1eefdb17..b1268729e 100644
--- a/wagtail/wagtailembeds/tests.py
+++ b/wagtail/wagtailembeds/tests.py
@@ -1,7 +1,7 @@
 from django.test import TestCase
 from django.test.client import Client
-from wagtail.tests.utils import login
 from wagtail.wagtailembeds import get_embed
+from wagtail.tests.utils import WagtailTestUtils
 
 
 class TestEmbeds(TestCase):
@@ -63,10 +63,10 @@ class TestEmbeds(TestCase):
         self.assertEqual(embed.width, None)
 
 
-class TestChooser(TestCase):
+class TestChooser(TestCase, WagtailTestUtils):
     def setUp(self):
         # login
-        login(self.client)
+        self.login()
 
     def test_chooser(self):
         r = self.client.get('/admin/embeds/chooser/')
diff --git a/wagtail/wagtailimages/tests.py b/wagtail/wagtailimages/tests.py
index c8f0194c0..d01535eda 100644
--- a/wagtail/wagtailimages/tests.py
+++ b/wagtail/wagtailimages/tests.py
@@ -4,7 +4,7 @@ from django.contrib.auth.models import User, Group, Permission
 from django.core.urlresolvers import reverse
 from django.core.files.uploadedfile import SimpleUploadedFile
 
-from wagtail.tests.utils import login, unittest, WagtailTestUtils
+from wagtail.tests.utils import unittest, WagtailTestUtils
 from wagtail.wagtailimages.models import get_image_model
 from wagtail.wagtailimages.templatetags import image_tags
 
@@ -187,9 +187,9 @@ class TestImageTag(TestCase):
 ## ===== ADMIN VIEWS =====
 
 
-class TestImageIndexView(TestCase):
+class TestImageIndexView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtailimages_index'), params)
@@ -219,7 +219,7 @@ class TestImageIndexView(TestCase):
 
 class TestImageAddView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtailimages_add_image'), params)
@@ -254,7 +254,7 @@ class TestImageAddView(TestCase, WagtailTestUtils):
 
 class TestImageEditView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
         # Create an image to edit
         self.image = Image.objects.create(
@@ -289,7 +289,7 @@ class TestImageEditView(TestCase, WagtailTestUtils):
 
 class TestImageDeleteView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
         # Create an image to edit
         self.image = Image.objects.create(
@@ -322,9 +322,9 @@ class TestImageDeleteView(TestCase, WagtailTestUtils):
         self.assertEqual(images.count(), 0)
 
 
-class TestImageChooserView(TestCase):
+class TestImageChooserView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtailimages_chooser'), params)
@@ -347,9 +347,9 @@ class TestImageChooserView(TestCase):
             self.assertEqual(response.status_code, 200)
 
 
-class TestImageChooserChosenView(TestCase):
+class TestImageChooserChosenView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
         # Create an image to edit
         self.image = Image.objects.create(
@@ -368,9 +368,9 @@ class TestImageChooserChosenView(TestCase):
     # TODO: Test posting
 
 
-class TestImageChooserUploadView(TestCase):
+class TestImageChooserUploadView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtailimages_chooser_upload'), params)
diff --git a/wagtail/wagtailredirects/tests.py b/wagtail/wagtailredirects/tests.py
index 543a8dd70..29ad7ec0b 100644
--- a/wagtail/wagtailredirects/tests.py
+++ b/wagtail/wagtailredirects/tests.py
@@ -1,7 +1,7 @@
 from django.test import TestCase
 from django.test.client import Client
 from wagtail.wagtailredirects import models
-from wagtail.tests.utils import login, WagtailTestUtils
+from wagtail.tests.utils import WagtailTestUtils
 from django.core.urlresolvers import reverse
 
 
@@ -66,9 +66,9 @@ class TestRedirects(TestCase):
         self.assertTrue(r.has_header('Location'))
 
 
-class TestRedirectsIndexView(TestCase):
+class TestRedirectsIndexView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtailredirects_index'), params)
@@ -92,7 +92,7 @@ class TestRedirectsIndexView(TestCase):
 
 class TestRedirectsAddView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtailredirects_add_redirect'), params)
@@ -139,7 +139,7 @@ class TestRedirectsEditView(TestCase, WagtailTestUtils):
         self.redirect.save()
 
         # Login
-        login(self.client)
+        self.login()
 
     def get(self, params={}, redirect_id=None):
         return self.client.get(reverse('wagtailredirects_edit_redirect', args=(redirect_id or self.redirect.id, )), params)
@@ -188,7 +188,7 @@ class TestRedirectsDeleteView(TestCase, WagtailTestUtils):
         self.redirect.save()
 
         # Login
-        login(self.client)
+        self.login()
 
     def get(self, params={}, redirect_id=None):
         return self.client.get(reverse('wagtailredirects_delete_redirect', args=(redirect_id or self.redirect.id, )), params)
diff --git a/wagtail/wagtailsearch/tests/test_editorspicks.py b/wagtail/wagtailsearch/tests/test_editorspicks.py
index 2af0df625..7ee974fd0 100644
--- a/wagtail/wagtailsearch/tests/test_editorspicks.py
+++ b/wagtail/wagtailsearch/tests/test_editorspicks.py
@@ -1,5 +1,5 @@
 from django.test import TestCase
-from wagtail.tests.utils import login
+from wagtail.tests.utils import unittest, WagtailTestUtils
 from wagtail.wagtailsearch import models
 
 
@@ -45,9 +45,9 @@ class TestEditorsPicks(TestCase):
         self.assertEqual(models.Query.get("root page").editors_picks.last().description, "Last editors pick")
 
 
-class TestEditorsPicksIndexView(TestCase):
+class TestEditorsPicksIndexView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get('/admin/search/editorspicks/', params)
@@ -69,9 +69,9 @@ class TestEditorsPicksIndexView(TestCase):
             self.assertEqual(response.status_code, 200)
 
 
-class TestEditorsPicksAddView(TestCase):
+class TestEditorsPicksAddView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get('/admin/search/editorspicks/add/', params)
@@ -81,10 +81,12 @@ class TestEditorsPicksAddView(TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtailsearch/editorspicks/add.html')
 
+    # TODO: Test posting
 
-class TestEditorsPicksEditView(TestCase):
+
+class TestEditorsPicksEditView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
         # Create an editors pick to edit
         self.query = models.Query.get("Hello")
@@ -98,10 +100,12 @@ class TestEditorsPicksEditView(TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtailsearch/editorspicks/edit.html')
 
+    # TODO: Test posting
 
-class TestEditorsPicksDeleteView(TestCase):
+
+class TestEditorsPicksDeleteView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
         # Create an editors pick to delete
         self.query = models.Query.get("Hello")
@@ -114,3 +118,5 @@ class TestEditorsPicksDeleteView(TestCase):
         response = self.get()
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtailsearch/editorspicks/confirm_delete.html')
+
+    # TODO: Test posting
diff --git a/wagtail/wagtailsearch/tests/test_queries.py b/wagtail/wagtailsearch/tests/test_queries.py
index 67325104d..ee5382db4 100644
--- a/wagtail/wagtailsearch/tests/test_queries.py
+++ b/wagtail/wagtailsearch/tests/test_queries.py
@@ -1,7 +1,7 @@
 from django.test import TestCase
 from django.core import management
 from wagtail.wagtailsearch import models
-from wagtail.tests.utils import login, unittest
+from wagtail.tests.utils import unittest, WagtailTestUtils
 from StringIO import StringIO
 
 
@@ -139,9 +139,9 @@ class TestGarbageCollectCommand(TestCase):
     # TODO: Test that this command is acctually doing its job
 
 
-class TestQueryChooserView(TestCase):
+class TestQueryChooserView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get('/admin/search/queries/chooser/', params)
diff --git a/wagtail/wagtailsnippets/tests.py b/wagtail/wagtailsnippets/tests.py
index 3adaf5a3b..bf9d62731 100644
--- a/wagtail/wagtailsnippets/tests.py
+++ b/wagtail/wagtailsnippets/tests.py
@@ -2,13 +2,13 @@ from django.test import TestCase
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
 
-from wagtail.tests.utils import login, unittest, WagtailTestUtils
+from wagtail.tests.utils import unittest, WagtailTestUtils
 from wagtail.tests.models import Advert
 
 
-class TestSnippetIndexView(TestCase):
+class TestSnippetIndexView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtailsnippets_index'), params)
@@ -22,9 +22,9 @@ class TestSnippetIndexView(TestCase):
         self.assertContains(self.get(), "Adverts")
 
 
-class TestSnippetListView(TestCase):
+class TestSnippetListView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtailsnippets_list',
@@ -42,7 +42,7 @@ class TestSnippetListView(TestCase):
 
 class TestSnippetCreateView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtailsnippets_create',
@@ -82,7 +82,7 @@ class TestSnippetEditView(TestCase, WagtailTestUtils):
         self.test_snippet.url = 'http://www.example.com/'
         self.test_snippet.save()
 
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtailsnippets_edit',
@@ -132,7 +132,7 @@ class TestSnippetDelete(TestCase, WagtailTestUtils):
         self.test_snippet.url = 'http://www.example.com/'
         self.test_snippet.save()
 
-        login(self.client)
+        self.login()
 
     def test_delete_get(self):
         response = self.client.get(reverse('wagtailsnippets_delete', args=('tests', 'advert', self.test_snippet.id, )))
diff --git a/wagtail/wagtailusers/tests.py b/wagtail/wagtailusers/tests.py
index c9105e3c0..6de97f202 100644
--- a/wagtail/wagtailusers/tests.py
+++ b/wagtail/wagtailusers/tests.py
@@ -1,12 +1,12 @@
 from django.test import TestCase
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
-from wagtail.tests.utils import login, WagtailTestUtils
+from wagtail.tests.utils import WagtailTestUtils
 
 
-class TestUserIndexView(TestCase):
+class TestUserIndexView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtailusers_index'), params)
@@ -30,7 +30,7 @@ class TestUserIndexView(TestCase):
 
 class TestUserCreateView(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtailusers_create'), params)
@@ -69,7 +69,7 @@ class TestUserEditView(TestCase, WagtailTestUtils):
         self.test_user = User.objects.create_user(username='testuser', email='testuser@email.com', password='password')
 
         # Login
-        login(self.client)
+        self.login()
 
     def get(self, params={}, user_id=None):
         return self.client.get(reverse('wagtailusers_edit', args=(user_id or self.test_user.id, )), params)

From 1be56484b410cca6f50b5534b48fba400272f46e Mon Sep 17 00:00:00 2001
From: Jeffrey Hearn <jhearn@insidearm.com>
Date: Mon, 2 Jun 2014 13:47:30 -0400
Subject: [PATCH 16/60] Updated hallo.js library to 1.0.4 from unknown version

---
 .../static/wagtailadmin/js/vendor/hallo.js    | 3975 +++++++++--------
 1 file changed, 2116 insertions(+), 1859 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js
index 7ba3ff2c0..af5950fdb 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js
@@ -1,671 +1,607 @@
-// Generated by CoffeeScript 1.3.3
-(function() {
-
-  $.widget("ncri.hallohtml", {
-    options: {
-      editable: null,
+/* Hallo 1.0.4 - rich text editor for jQuery UI
+* by Henri Bergius and contributors. Available under the MIT license.
+* See http://hallojs.org for more information
+*/(function() {
+  (function(jQuery) {
+    return jQuery.widget('IKS.hallo', {
       toolbar: null,
-      uuid: "",
-      lang: 'en',
-      dialogOpts: {
-        autoOpen: false,
-        width: 600,
-        height: 'auto',
-        modal: false,
-        resizable: true,
-        draggable: true,
-        dialogClass: 'htmledit-dialog'
+      bound: false,
+      originalContent: '',
+      previousContent: '',
+      uuid: '',
+      selection: null,
+      _keepActivated: false,
+      originalHref: null,
+      options: {
+        editable: true,
+        plugins: {},
+        toolbar: 'halloToolbarContextual',
+        parentElement: 'body',
+        buttonCssClass: null,
+        toolbarCssClass: null,
+        toolbarPositionAbove: false,
+        toolbarOptions: {},
+        placeholder: '',
+        forceStructured: true,
+        checkTouch: true,
+        touchScreen: null
       },
-      dialog: null,
-      buttonCssClass: null
-    },
-    translations: {
-      en: {
-        title: 'Edit HTML',
-        update: 'Update'
+      _create: function() {
+        var options, plugin, _ref,
+          _this = this;
+        this.id = this._generateUUID();
+        if (this.options.checkTouch && this.options.touchScreen === null) {
+          this.checkTouch();
+        }
+        _ref = this.options.plugins;
+        for (plugin in _ref) {
+          options = _ref[plugin];
+          if (!jQuery.isPlainObject(options)) {
+            options = {};
+          }
+          jQuery.extend(options, {
+            editable: this,
+            uuid: this.id,
+            buttonCssClass: this.options.buttonCssClass
+          });
+          jQuery(this.element)[plugin](options);
+        }
+        this.element.one('halloactivated', function() {
+          return _this._prepareToolbar();
+        });
+        return this.originalContent = this.getContents();
       },
-      de: {
-        title: 'HTML bearbeiten',
-        update: 'Aktualisieren'
-      }
-    },
-    texts: null,
-    populateToolbar: function($toolbar) {
-      var $buttonHolder, $buttonset, id, widget;
-      widget = this;
-      this.texts = this.translations[this.options.lang];
-      this.options.toolbar = $toolbar;
-      this.options.dialog = $("<div>").attr('id', "" + this.options.uuid + "-htmledit-dialog");
-      $buttonset = $("<span>").addClass(widget.widgetName);
-      id = "" + this.options.uuid + "-htmledit";
-      $buttonHolder = $('<span>');
-      $buttonHolder.hallobutton({
-        label: this.texts.title,
-        icon: 'icon-list-alt',
-        editable: this.options.editable,
-        command: null,
-        queryState: false,
-        uuid: this.options.uuid,
-        cssClass: this.options.buttonCssClass
-      });
-      $buttonset.append($buttonHolder);
-      this.button = $buttonHolder;
-      this.button.click(function() {
-        if (widget.options.dialog.dialog("isOpen")) {
-          widget._closeDialog();
+      _init: function() {
+        if (this.options.editable) {
+          return this.enable();
         } else {
-          widget._openDialog();
+          return this.disable();
+        }
+      },
+      destroy: function() {
+        var options, plugin, _ref;
+        this.disable();
+        if (this.toolbar) {
+          this.toolbar.remove();
+          this.element[this.options.toolbar]('destroy');
+        }
+        _ref = this.options.plugins;
+        for (plugin in _ref) {
+          options = _ref[plugin];
+          jQuery(this.element)[plugin]('destroy');
+        }
+        return jQuery.Widget.prototype.destroy.call(this);
+      },
+      disable: function() {
+        var _this = this;
+        this.element.attr("contentEditable", false);
+        this.element.off("focus", this._activated);
+        this.element.off("blur", this._deactivated);
+        this.element.off("keyup paste change", this._checkModified);
+        this.element.off("keyup", this._keys);
+        this.element.off("keyup mouseup", this._checkSelection);
+        this.bound = false;
+        jQuery(this.element).removeClass('isModified');
+        jQuery(this.element).removeClass('inEditMode');
+        this.element.parents('a').addBack().each(function(idx, elem) {
+          var element;
+          element = jQuery(elem);
+          if (!element.is('a')) {
+            return;
+          }
+          if (!_this.originalHref) {
+            return;
+          }
+          return element.attr('href', _this.originalHref);
+        });
+        return this._trigger("disabled", null);
+      },
+      enable: function() {
+        var _this = this;
+        this.element.parents('a[href]').addBack().each(function(idx, elem) {
+          var element;
+          element = jQuery(elem);
+          if (!element.is('a[href]')) {
+            return;
+          }
+          _this.originalHref = element.attr('href');
+          return element.removeAttr('href');
+        });
+        this.element.attr("contentEditable", true);
+        if (!jQuery.parseHTML(this.element.html())) {
+          this.element.html(this.options.placeholder);
+          jQuery(this.element).addClass('inPlaceholderMode');
+          this.element.css({
+            'min-width': this.element.innerWidth(),
+            'min-height': this.element.innerHeight()
+          });
+        }
+        if (!this.bound) {
+          this.element.on("focus", this, this._activated);
+          this.element.on("blur", this, this._deactivated);
+          this.element.on("keyup paste change", this, this._checkModified);
+          this.element.on("keyup", this, this._keys);
+          this.element.on("keyup mouseup", this, this._checkSelection);
+          this.bound = true;
+        }
+        if (this.options.forceStructured) {
+          this._forceStructured();
+        }
+        return this._trigger("enabled", null);
+      },
+      activate: function() {
+        return this.element.focus();
+      },
+      containsSelection: function() {
+        var range;
+        range = this.getSelection();
+        return this.element.has(range.startContainer).length > 0;
+      },
+      getSelection: function() {
+        var range, sel;
+        sel = rangy.getSelection();
+        range = null;
+        if (sel.rangeCount > 0) {
+          range = sel.getRangeAt(0);
+        } else {
+          range = rangy.createRange();
+        }
+        return range;
+      },
+      restoreSelection: function(range) {
+        var sel;
+        sel = rangy.getSelection();
+        return sel.setSingleRange(range);
+      },
+      replaceSelection: function(cb) {
+        var newTextNode, r, range, sel, t;
+        if (navigator.appName === 'Microsoft Internet Explorer') {
+          t = document.selection.createRange().text;
+          r = document.selection.createRange();
+          return r.pasteHTML(cb(t));
+        } else {
+          sel = window.getSelection();
+          range = sel.getRangeAt(0);
+          newTextNode = document.createTextNode(cb(range.extractContents()));
+          range.insertNode(newTextNode);
+          range.setStartAfter(newTextNode);
+          sel.removeAllRanges();
+          return sel.addRange(range);
+        }
+      },
+      removeAllSelections: function() {
+        if (navigator.appName === 'Microsoft Internet Explorer') {
+          return range.empty();
+        } else {
+          return window.getSelection().removeAllRanges();
+        }
+      },
+      getPluginInstance: function(plugin) {
+        var instance;
+        instance = jQuery(this.element).data("IKS-" + plugin);
+        if (instance) {
+          return instance;
+        }
+        instance = jQuery(this.element).data(plugin);
+        if (instance) {
+          return instance;
+        }
+        throw new Error("Plugin " + plugin + " not found");
+      },
+      getContents: function() {
+        var cleanup, instance, plugin;
+        for (plugin in this.options.plugins) {
+          instance = this.getPluginInstance(plugin);
+          if (!instance) {
+            continue;
+          }
+          cleanup = instance.cleanupContentClone;
+          if (!jQuery.isFunction(cleanup)) {
+            continue;
+          }
+          jQuery(this.element)[plugin]('cleanupContentClone', this.element);
+        }
+        return this.element.html();
+      },
+      setContents: function(contents) {
+        return this.element.html(contents);
+      },
+      isModified: function() {
+        if (!this.previousContent) {
+          this.previousContent = this.originalContent;
+        }
+        return this.previousContent !== this.getContents();
+      },
+      setUnmodified: function() {
+        jQuery(this.element).removeClass('isModified');
+        return this.previousContent = this.getContents();
+      },
+      setModified: function() {
+        jQuery(this.element).addClass('isModified');
+        return this._trigger('modified', null, {
+          editable: this,
+          content: this.getContents()
+        });
+      },
+      restoreOriginalContent: function() {
+        return this.element.html(this.originalContent);
+      },
+      execute: function(command, value) {
+        if (document.execCommand(command, false, value)) {
+          return this.element.trigger("change");
+        }
+      },
+      protectFocusFrom: function(el) {
+        var _this = this;
+        return el.on("mousedown", function(event) {
+          event.preventDefault();
+          _this._protectToolbarFocus = true;
+          return setTimeout(function() {
+            return _this._protectToolbarFocus = false;
+          }, 300);
+        });
+      },
+      keepActivated: function(_keepActivated) {
+        this._keepActivated = _keepActivated;
+      },
+      _generateUUID: function() {
+        var S4;
+        S4 = function() {
+          return ((1 + Math.random()) * 0x10000 | 0).toString(16).substring(1);
+        };
+        return "" + (S4()) + (S4()) + "-" + (S4()) + "-" + (S4()) + "-" + (S4()) + "-" + (S4()) + (S4()) + (S4());
+      },
+      _prepareToolbar: function() {
+        var defaults, instance, plugin, populate, toolbarOptions;
+        this.toolbar = jQuery('<div class="hallotoolbar"></div>').hide();
+        if (this.options.toolbarCssClass) {
+          this.toolbar.addClass(this.options.toolbarCssClass);
+        }
+        defaults = {
+          editable: this,
+          parentElement: this.options.parentElement,
+          toolbar: this.toolbar,
+          positionAbove: this.options.toolbarPositionAbove
+        };
+        toolbarOptions = jQuery.extend({}, defaults, this.options.toolbarOptions);
+        this.element[this.options.toolbar](toolbarOptions);
+        for (plugin in this.options.plugins) {
+          instance = this.getPluginInstance(plugin);
+          if (!instance) {
+            continue;
+          }
+          populate = instance.populateToolbar;
+          if (!jQuery.isFunction(populate)) {
+            continue;
+          }
+          this.element[plugin]('populateToolbar', this.toolbar);
+        }
+        this.element[this.options.toolbar]('setPosition');
+        return this.protectFocusFrom(this.toolbar);
+      },
+      changeToolbar: function(element, toolbar, hide) {
+        var originalToolbar;
+        if (hide == null) {
+          hide = false;
+        }
+        originalToolbar = this.options.toolbar;
+        this.options.parentElement = element;
+        if (toolbar) {
+          this.options.toolbar = toolbar;
+        }
+        if (!this.toolbar) {
+          return;
+        }
+        this.element[originalToolbar]('destroy');
+        this.toolbar.remove();
+        this._prepareToolbar();
+        if (hide) {
+          return this.toolbar.hide();
+        }
+      },
+      _checkModified: function(event) {
+        var widget;
+        widget = event.data;
+        if (widget.isModified()) {
+          return widget.setModified();
+        }
+      },
+      _keys: function(event) {
+        var old, widget;
+        widget = event.data;
+        if (event.keyCode === 27) {
+          old = widget.getContents();
+          widget.restoreOriginalContent(event);
+          widget._trigger("restored", null, {
+            editable: widget,
+            content: widget.getContents(),
+            thrown: old
+          });
+          return widget.turnOff();
+        }
+      },
+      _rangesEqual: function(r1, r2) {
+        if (r1.startContainer !== r2.startContainer) {
+          return false;
+        }
+        if (r1.startOffset !== r2.startOffset) {
+          return false;
+        }
+        if (r1.endContainer !== r2.endContainer) {
+          return false;
+        }
+        if (r1.endOffset !== r2.endOffset) {
+          return false;
+        }
+        return true;
+      },
+      _checkSelection: function(event) {
+        var widget;
+        if (event.keyCode === 27) {
+          return;
+        }
+        widget = event.data;
+        return setTimeout(function() {
+          var sel;
+          sel = widget.getSelection();
+          if (widget._isEmptySelection(sel) || widget._isEmptyRange(sel)) {
+            if (widget.selection) {
+              widget.selection = null;
+              widget._trigger("unselected", null, {
+                editable: widget,
+                originalEvent: event
+              });
+            }
+            return;
+          }
+          if (!widget.selection || !widget._rangesEqual(sel, widget.selection)) {
+            widget.selection = sel.cloneRange();
+            return widget._trigger("selected", null, {
+              editable: widget,
+              selection: widget.selection,
+              ranges: [widget.selection],
+              originalEvent: event
+            });
+          }
+        }, 0);
+      },
+      _isEmptySelection: function(selection) {
+        if (selection.type === "Caret") {
+          return true;
         }
         return false;
-      });
-      this.options.editable.element.on("hallodeactivated", function() {
-        return widget._closeDialog();
-      });
-      $toolbar.append($buttonset);
-      this.options.dialog.dialog(this.options.dialogOpts);
-      return this.options.dialog.dialog("option", "title", this.texts.title);
-    },
-    _openDialog: function() {
-      var $editableEl, html, widget, xposition, yposition,
-        _this = this;
-      widget = this;
-      $editableEl = $(this.options.editable.element);
-      xposition = $editableEl.offset().left + $editableEl.outerWidth() + 10;
-      yposition = this.options.toolbar.offset().top - $(document).scrollTop();
-      this.options.dialog.dialog("option", "position", [xposition, yposition]);
-      this.options.editable.keepActivated(true);
-      this.options.dialog.dialog("open");
-      this.options.dialog.on('dialogclose', function() {
-        $('label', _this.button).removeClass('ui-state-active');
-        _this.options.editable.element.focus();
-        return _this.options.editable.keepActivated(false);
-      });
-      this.options.dialog.html($("<textarea>").addClass('html_source'));
-      html = this.options.editable.element.html();
-      this.options.dialog.children('.html_source').val(html);
-      this.options.dialog.prepend($("<button>" + this.texts.update + "</button>"));
-      return this.options.dialog.on('click', 'button', function() {
-        html = widget.options.dialog.children('.html_source').val();
-        widget.options.editable.element.html(html);
-        widget.options.editable.element.trigger('change');
+      },
+      _isEmptyRange: function(range) {
+        if (range.collapsed) {
+          return true;
+        }
+        if (range.isCollapsed) {
+          if (typeof range.isCollapsed === 'function') {
+            return range.isCollapsed();
+          }
+          return range.isCollapsed;
+        }
         return false;
-      });
-    },
-    _closeDialog: function() {
-      return this.options.dialog.dialog("close");
-    }
-  });
+      },
+      turnOn: function() {
+        if (this.getContents() === this.options.placeholder) {
+          this.setContents('');
+        }
+        jQuery(this.element).removeClass('inPlaceholderMode');
+        jQuery(this.element).addClass('inEditMode');
+        return this._trigger("activated", null, this);
+      },
+      turnOff: function() {
+        jQuery(this.element).removeClass('inEditMode');
+        this._trigger("deactivated", null, this);
+        if (!this.getContents()) {
+          jQuery(this.element).addClass('inPlaceholderMode');
+          return this.setContents(this.options.placeholder);
+        }
+      },
+      _activated: function(event) {
+        return event.data.turnOn();
+      },
+      _deactivated: function(event) {
+        if (event.data._keepActivated) {
+          return;
+        }
+        if (event.data._protectToolbarFocus !== true) {
+          return event.data.turnOff();
+        } else {
+          return setTimeout(function() {
+            return jQuery(event.data.element).focus();
+          }, 300);
+        }
+      },
+      _forceStructured: function(event) {
+        var e;
+        try {
+          return document.execCommand('styleWithCSS', 0, false);
+        } catch (_error) {
+          e = _error;
+          try {
+            return document.execCommand('useCSS', 0, true);
+          } catch (_error) {
+            e = _error;
+            try {
+              return document.execCommand('styleWithCSS', false, false);
+            } catch (_error) {
+              e = _error;
+            }
+          }
+        }
+      },
+      checkTouch: function() {
+        return this.options.touchScreen = !!('createTouch' in document);
+      }
+    });
+  })(jQuery);
 
+}).call(this);
+
+(function() {
   (function(jQuery) {
-    return jQuery.widget("IKS.hallolists", {
+    var z;
+    z = null;
+    if (this.VIE !== void 0) {
+      z = new VIE;
+      z.use(new z.StanbolService({
+        proxyDisabled: true,
+        url: 'http://dev.iks-project.eu:8081'
+      }));
+    }
+    return jQuery.widget('IKS.halloannotate', {
       options: {
+        vie: z,
         editable: null,
         toolbar: null,
         uuid: '',
-        lists: {
-          ordered: true,
-          unordered: true
-        },
+        select: function() {},
+        decline: function() {},
+        remove: function() {},
         buttonCssClass: null
       },
-      populateToolbar: function(toolbar) {
-        var buttonize, buttonset,
-          _this = this;
-        buttonset = jQuery("<span class=\"" + this.widgetName + "\"></span>");
-        buttonize = function(type, label) {
-          var buttonElement;
-          buttonElement = jQuery('<span></span>');
-          buttonElement.hallobutton({
-            uuid: _this.options.uuid,
-            editable: _this.options.editable,
-            label: label,
-            command: "insert" + type + "List",
-            icon: "icon-list-" + (label.toLowerCase()),
-            cssClass: _this.options.buttonCssClass
-          });
-          return buttonset.append(buttonElement);
-        };
-        if (this.options.lists.ordered) {
-          buttonize("Ordered", "OL");
-        }
-        if (this.options.lists.unordered) {
-          buttonize("Unordered", "UL");
-        }
-        buttonset.hallobuttonset();
-        return toolbar.append(buttonset);
-      }
-    });
-  })(jQuery);
-
-  (function(jQuery) {
-    return jQuery.widget("IKS.halloformat", {
-      options: {
-        editable: null,
-        uuid: '',
-        formattings: {
-          bold: true,
-          italic: true,
-          strikeThrough: false,
-          underline: false
-        },
-        buttonCssClass: null
-      },
-      populateToolbar: function(toolbar) {
-        var buttonize, buttonset, enabled, format, widget, _ref,
-          _this = this;
+      _create: function() {
+        var editableElement, turnOffAnnotate, widget;
         widget = this;
-        buttonset = jQuery("<span class=\"" + widget.widgetName + "\"></span>");
-        buttonize = function(format) {
-          var buttonHolder;
-          buttonHolder = jQuery('<span></span>');
-          buttonHolder.hallobutton({
-            label: format,
-            editable: _this.options.editable,
-            command: format,
-            uuid: _this.options.uuid,
-            cssClass: _this.options.buttonCssClass
-          });
-          return buttonset.append(buttonHolder);
-        };
-        _ref = this.options.formattings;
-        for (format in _ref) {
-          enabled = _ref[format];
-          if (!enabled) {
-            continue;
-          }
-          buttonize(format);
+        if (this.options.vie === void 0) {
+          throw new Error('The halloannotate plugin requires VIE');
+          return;
         }
-        buttonset.hallobuttonset();
-        return toolbar.append(buttonset);
-      }
-    });
-  })(jQuery);
-
-  (function(jQuery) {
-    return jQuery.widget("IKS.hallolink", {
-      options: {
-        editable: null,
-        uuid: "",
-        link: true,
-        image: true,
-        defaultUrl: 'http://',
-        dialogOpts: {
-          autoOpen: false,
-          width: 540,
-          height: 95,
-          title: "Enter Link",
-          buttonTitle: "Insert",
-          buttonUpdateTitle: "Update",
-          modal: true,
-          resizable: false,
-          draggable: false,
-          dialogClass: 'hallolink-dialog'
-        },
-        buttonCssClass: null
+        if (typeof this.element.annotate !== 'function') {
+          throw new Error('The halloannotate plugin requires annotate.js');
+          return;
+        }
+        this.state = 'off';
+        this.instantiate();
+        turnOffAnnotate = function() {
+          var editable;
+          editable = this;
+          return jQuery(editable).halloannotate('turnOff');
+        };
+        editableElement = this.options.editable.element;
+        return editableElement.on('hallodisabled', turnOffAnnotate);
       },
       populateToolbar: function(toolbar) {
-        var butTitle, butUpdateTitle, buttonize, buttonset, dialog, dialogId, dialogSubmitCb, isEmptyLink, urlInput, widget,
+        var buttonHolder,
           _this = this;
-        widget = this;
-        dialogId = "" + this.options.uuid + "-dialog";
-        butTitle = this.options.dialogOpts.buttonTitle;
-        butUpdateTitle = this.options.dialogOpts.buttonUpdateTitle;
-        dialog = jQuery("<div id=\"" + dialogId + "\">        <form action=\"#\" method=\"post\" class=\"linkForm\">          <input class=\"url\" type=\"text\" name=\"url\"            value=\"" + this.options.defaultUrl + "\" />          <input type=\"submit\" id=\"addlinkButton\" value=\"" + butTitle + "\"/>        </form></div>");
-        urlInput = jQuery('input[name=url]', dialog).focus(function(e) {
-          return this.select();
+        buttonHolder = jQuery("<span class=\"" + this.widgetName + "\"></span>");
+        this.button = buttonHolder.hallobutton({
+          label: 'Annotate',
+          icon: 'icon-tags',
+          editable: this.options.editable,
+          command: null,
+          uuid: this.options.uuid,
+          cssClass: this.options.buttonCssClass,
+          queryState: false
         });
-        isEmptyLink = function(link) {
-          if ((new RegExp(/^\s*$/)).test(link)) {
-            return true;
+        buttonHolder.on('change', function(event) {
+          if (_this.state === "pending") {
+            return;
           }
-          if (link === widget.options.defaultUrl) {
-            return true;
+          if (_this.state === "off") {
+            return _this.turnOn();
           }
-          return false;
-        };
-        dialogSubmitCb = function(event) {
-          var link, selectionStart;
-          event.preventDefault();
-          link = urlInput.val();
-          widget.options.editable.restoreSelection(widget.lastSelection);
-          if (isEmptyLink(link)) {
-            selectionStart = widget.lastSelection.startContainer;
-            if (widget.lastSelection.collapsed) {
-              widget.lastSelection.setStartBefore(selectionStart);
-              widget.lastSelection.setEndAfter(selectionStart);
-              window.getSelection().addRange(widget.lastSelection);
-            }
-            document.execCommand("unlink", null, "");
-          } else {
-            if (!(/:\/\//.test(link)) && !(/^mailto:/.test(link))) {
-              link = 'http://' + link;
-            }
-            if (widget.lastSelection.startContainer.parentNode.href === void 0) {
-              document.execCommand("createLink", null, link);
-            } else {
-              widget.lastSelection.startContainer.parentNode.href = link;
-            }
-          }
-          widget.options.editable.element.trigger('change');
-          widget.options.editable.removeAllSelections();
-          dialog.dialog('close');
-          return false;
-        };
-        dialog.find("input[type=submit]").click(dialogSubmitCb);
-        buttonset = jQuery("<span class=\"" + widget.widgetName + "\"></span>");
-        buttonize = function(type) {
-          var button, buttonHolder, id;
-          id = "" + _this.options.uuid + "-" + type;
-          buttonHolder = jQuery('<span></span>');
-          buttonHolder.hallobutton({
-            label: 'Link',
-            icon: 'icon-link',
-            editable: _this.options.editable,
-            command: null,
-            queryState: false,
-            uuid: _this.options.uuid,
-            cssClass: _this.options.buttonCssClass
+          return _this.turnOff();
+        });
+        buttonHolder.buttonset();
+        return toolbar.append(this.button);
+      },
+      cleanupContentClone: function(el) {
+        if (this.state === 'on') {
+          return el.find(".entity:not([about])").each(function() {
+            return jQuery(this).replaceWith(jQuery(this).html());
           });
-          buttonset.append(buttonHolder);
-          button = buttonHolder;
-          button.on("click", function(event) {
-            var button_selector, selectionParent;
-            widget.lastSelection = widget.options.editable.getSelection();
-            urlInput = jQuery('input[name=url]', dialog);
-            selectionParent = widget.lastSelection.startContainer.parentNode;
-            if (!selectionParent.href) {
-              urlInput.val(widget.options.defaultUrl);
-              jQuery(urlInput[0].form).find('input[type=submit]').val(butTitle);
-            } else {
-              urlInput.val(jQuery(selectionParent).attr('href'));
-              button_selector = 'input[type=submit]';
-              jQuery(urlInput[0].form).find(button_selector).val(butUpdateTitle);
-            }
-            widget.options.editable.keepActivated(true);
-            dialog.dialog('open');
-            dialog.on('dialogclose', function() {
-              jQuery('label', buttonHolder).removeClass('ui-state-active');
-              widget.options.editable.element.focus();
-              return widget.options.editable.keepActivated(false);
-            });
-            return false;
-          });
-          return _this.element.on("keyup paste change mouseup", function(event) {
-            var nodeName, start;
-            start = jQuery(widget.options.editable.getSelection().startContainer);
-            if (start.prop('nodeName')) {
-              nodeName = start.prop('nodeName');
-            } else {
-              nodeName = start.parent().prop('nodeName');
-            }
-            if (nodeName && nodeName.toUpperCase() === "A") {
-              jQuery('label', button).addClass('ui-state-active');
+        }
+      },
+      instantiate: function() {
+        var widget;
+        widget = this;
+        return this.options.editable.element.annotate({
+          vie: this.options.vie,
+          debug: false,
+          showTooltip: true,
+          select: this.options.select,
+          remove: this.options.remove,
+          success: this.options.success,
+          error: this.options.error
+        }).on('annotateselect', function(event, data) {
+          return widget.options.editable.setModified();
+        }).on('annotateremove', function() {
+          return jQuery.noop();
+        });
+      },
+      turnPending: function() {
+        this.state = 'pending';
+        this.button.hallobutton('checked', false);
+        return this.button.hallobutton('disable');
+      },
+      turnOn: function() {
+        var e, widget,
+          _this = this;
+        this.turnPending();
+        widget = this;
+        try {
+          return this.options.editable.element.annotate('enable', function(success) {
+            if (!success) {
               return;
             }
-            return jQuery('label', button).removeClass('ui-state-active');
+            _this.state = 'on';
+            _this.button.hallobutton('checked', true);
+            return _this.button.hallobutton('enable');
           });
-        };
-        if (this.options.link) {
-          buttonize("A");
+        } catch (_error) {
+          e = _error;
+          return alert(e);
         }
-        if (this.options.link) {
-          toolbar.append(buttonset);
-          buttonset.hallobuttonset();
-          return dialog.dialog(this.options.dialogOpts);
+      },
+      turnOff: function() {
+        this.options.editable.element.annotate('disable');
+        this.state = 'off';
+        if (!this.button) {
+          return;
         }
+        this.button.attr('checked', false);
+        this.button.find("label").removeClass("ui-state-clicked");
+        return this.button.button('refresh');
       }
     });
   })(jQuery);
 
-  $.widget("ncri.hallo-image-insert-edit", {
-    options: {
-      editable: null,
-      toolbar: null,
-      uuid: "",
-      insert_file_dialog_ui_url: null,
-      lang: 'en',
-      dialogOpts: {
-        autoOpen: false,
-        width: 560,
-        height: 'auto',
-        modal: false,
-        resizable: true,
-        draggable: true,
-        dialogClass: 'insert-image-dialog'
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget('IKS.halloblacklist', {
+      options: {
+        tags: []
       },
-      dialog: null,
-      buttonCssClass: null
-    },
-    translations: {
-      en: {
-        title_insert: 'Insert Image',
-        title_properties: 'Image Properties',
-        insert: 'Insert',
-        chage_image: 'Change Image:',
-        source: 'URL',
-        width: 'Width',
-        height: 'Height',
-        alt: 'Alt Text',
-        padding: 'Padding',
-        float: 'Float',
-        float_left: 'left',
-        float_right: 'right',
-        float_none: 'No'
-      },
-      de: {
-        title_insert: 'Bild einfügen',
-        title_properties: 'Bildeigenschaften',
-        insert: 'Einfügen',
-        chage_image: 'Bild ändern:',
-        source: 'URL',
-        width: 'Breite',
-        height: 'Höhe',
-        alt: 'Alt Text',
-        padding: 'Padding',
-        float: 'Float',
-        float_left: 'Links',
-        float_right: 'Rechts',
-        float_none: 'Nein'
-      }
-    },
-    texts: null,
-    dialog_image_selection_ui_loaded: false,
-    $image: null,
-    populateToolbar: function($toolbar) {
-      var $buttonHolder, $buttonset, dialog_html, widget;
-      widget = this;
-      this.texts = this.translations[this.options.lang];
-      this.options.toolbar = $toolbar;
-      dialog_html = "<div id='hallo_img_properties'></div>";
-      if (this.options.insert_file_dialog_ui_url) {
-        dialog_html += "<div id='hallo_img_file_select_ui'></div>";
-      }
-      this.options.dialog = $("<div>").attr('id', "" + this.options.uuid + "-insert-image-dialog").html(dialog_html);
-      $buttonset = $("<span>").addClass(this.widgetName);
-      $buttonHolder = $('<span>');
-      $buttonHolder.hallobutton({
-        label: this.texts.title_insert,
-        icon: 'icon-picture',
-        editable: this.options.editable,
-        command: null,
-        queryState: false,
-        uuid: this.options.uuid,
-        cssClass: this.options.buttonCssClass
-      });
-      $buttonset.append($buttonHolder);
-      this.button = $buttonHolder;
-      this.button.click(function() {
-        if (widget.options.dialog.dialog("isOpen")) {
-          widget._closeDialog();
-        } else {
-          widget.lastSelection = widget.options.editable.getSelection();
-          widget._openDialog();
-        }
-        return false;
-      });
-      this.options.editable.element.on("halloselected, hallounselected", function() {
-        if (widget.options.dialog.dialog("isOpen")) {
-          return widget.lastSelection = widget.options.editable.getSelection();
-        }
-      });
-      this.options.editable.element.on("hallodeactivated", function() {
-        return widget._closeDialog();
-      });
-      $(this.options.editable.element).on("click", "img", function(e) {
-        widget._openDialog($(this));
-        return false;
-      });
-      this.options.editable.element.on('halloselected', function(event, data) {
-        var toolbar_option;
-        toolbar_option = widget.options.editable.options.toolbar;
-        if (toolbar_option === "halloToolbarContextual" && $(data.originalEvent.target).is('img')) {
-          $toolbar.hide();
-          return false;
-        }
-      });
-      $toolbar.append($buttonset);
-      return this.options.dialog.dialog(this.options.dialogOpts);
-    },
-    _openDialog: function($image) {
-      var $editableEl, widget, xposition, yposition,
-        _this = this;
-      this.$image = $image;
-      widget = this;
-      $editableEl = $(this.options.editable.element);
-      xposition = $editableEl.offset().left + $editableEl.outerWidth() + 10;
-      if (this.$image) {
-        yposition = this.$image.offset().top - $(document).scrollTop();
-      } else {
-        yposition = this.options.toolbar.offset().top - $(document).scrollTop();
-      }
-      this.options.dialog.dialog("option", "position", [xposition, yposition]);
-      this.options.editable.keepActivated(true);
-      this.options.dialog.dialog("open");
-      if (this.$image) {
-        this.options.dialog.dialog("option", "title", this.texts.title_properties);
-        $(document).keyup(function(e) {
-          if (e.keyCode === 46 || e.keyCode === 8) {
-            $(document).off();
-            widget._closeDialog();
-            widget.$image.remove();
-            widget.$image = null;
-          }
-          return e.preventDefault();
-        });
-        this.options.editable.element.on("click", function() {
-          widget.$image = null;
-          return widget._closeDialog();
-        });
-      } else {
-        this.options.dialog.children('#hallo_img_properties').hide();
-        this.options.dialog.dialog("option", "title", this.texts.title_insert);
-        if ($('#hallo_img_file_select_title').length > 0) {
-          $('#hallo_img_file_select_title').text('');
-        }
-      }
-      this._load_dialog_image_properties_ui();
-      this.options.dialog.on('dialogclose', function() {
-        var scrollbar_pos;
-        $('label', _this.button).removeClass('ui-state-active');
-        scrollbar_pos = $(document).scrollTop();
-        _this.options.editable.element.focus();
-        $(document).scrollTop(scrollbar_pos);
-        return _this.options.editable.keepActivated(false);
-      });
-      if (this.options.insert_file_dialog_ui_url && !this.dialog_image_selection_ui_loaded) {
-        this.options.dialog.on('click', ".reload_link", function() {
-          widget._load_dialog_image_selection_ui();
-          return false;
-        });
-        this.options.dialog.on('click', '.file_preview img', function() {
-          var new_source;
-          if (widget.$image) {
-            new_source = $(this).attr('src').replace(/-thumb/, '');
-            widget.$image.attr('src', new_source);
-            $('#hallo_img_source').val(new_source);
-          } else {
-            widget._insert_image($(this).attr('src').replace(/-thumb/, ''));
-          }
-          return false;
-        });
-        return this._load_dialog_image_selection_ui();
-      }
-    },
-    _insert_image: function(source) {
-      this.options.editable.restoreSelection(this.lastSelection);
-      document.execCommand("insertImage", null, source);
-      this.options.editable.element.trigger('change');
-      this.options.editable.removeAllSelections();
-      return this._closeDialog();
-    },
-    _closeDialog: function() {
-      return this.options.dialog.dialog("close");
-    },
-    _load_dialog_image_selection_ui: function() {
-      var widget;
-      widget = this;
-      return $.ajax({
-        url: this.options.insert_file_dialog_ui_url,
-        success: function(data, textStatus, jqXHR) {
-          var $properties, file_select_title, t;
-          file_select_title = '';
-          $properties = widget.options.dialog.children('#hallo_img_properties');
-          if ($properties.is(':visible')) {
-            file_select_title = widget.texts.change_image;
-          }
-          t = "<div id='hallo_img_file_select_title'>" + file_select_title + "</div>";
-          widget.options.dialog.children('#hallo_img_file_select_ui').html(t + data);
-          return widget.dialog_image_selection_ui_loaded = true;
-        },
-        beforeSend: function() {
-          return widget.options.dialog.children('#hallo_img_file_select_ui').html('<div class="hallo_insert_file_loader"></div>');
-        }
-      });
-    },
-    _load_dialog_image_properties_ui: function() {
-      var $img_properties, button, height, html, widget, width;
-      widget = this;
-      $img_properties = this.options.dialog.children('#hallo_img_properties');
-      if (this.$image) {
-        width = this.$image.is('[width]') ? this.$image.attr('width') : '';
-        height = this.$image.is('[height]') ? this.$image.attr('height') : '';
-        html = this._property_input_html('source', this.$image.attr('src'), {
-          label: this.texts.source
-        }) + this._property_input_html('alt', this.$image.attr('alt') || '', {
-          label: this.texts.alt
-        }) + this._property_row_html(this._property_input_html('width', width, {
-          label: this.texts.width,
-          row: false
-        }) + this._property_input_html('height', height, {
-          label: this.texts.height,
-          row: false
-        })) + this._property_input_html('padding', this.$image.css('padding'), {
-          label: this.texts.padding
-        }) + this._property_row_html(this._property_cb_html('float_left', this.$image.css('float') === 'left', {
-          label: this.texts.float_left,
-          row: false
-        }) + this._property_cb_html('float_right', this.$image.css('float') === 'right', {
-          label: this.texts.float_right,
-          row: false
-        }) + this._property_cb_html('unfloat', this.$image.css('float') === 'none', {
-          label: this.texts.float_none,
-          row: false
-        }), this.texts.float);
-        $img_properties.html(html);
-        $img_properties.show();
-      } else {
-        if (!this.options.insert_file_dialog_ui_url) {
-          $img_properties.html(this._property_input_html('source', '', {
-            label: this.texts.source
-          }));
-          $img_properties.show();
-        }
-      }
-      if (this.$image) {
-        if (!this.options.insert_file_dialog_ui_url) {
-          $('#insert_image_btn').remove();
-        }
-        if ($('#hallo_img_file_select_title').length > 0) {
-          $('#hallo_img_file_select_title').text(this.texts.chage_image);
-        }
-        $('#hallo_img_properties #hallo_img_source').keyup(function() {
-          return widget.$image.attr('src', this.value);
-        });
-        $('#hallo_img_properties #hallo_img_alt').keyup(function() {
-          return widget.$image.attr('alt', this.value);
-        });
-        $('#hallo_img_properties #hallo_img_padding').keyup(function() {
-          return widget.$image.css('padding', this.value);
-        });
-        $('#hallo_img_properties #hallo_img_height').keyup(function() {
-          widget.$image.css('height', this.value);
-          return widget.$image.attr('height', this.value);
-        });
-        $('#hallo_img_properties #hallo_img_width').keyup(function() {
-          widget.$image.css('width', this.value);
-          return widget.$image.attr('width', this.value);
-        });
-        $('#hallo_img_properties #hallo_img_float_left').click(function() {
-          if (!this.checked) {
-            return false;
-          }
-          widget.$image.css('float', 'left');
-          $('#hallo_img_properties #hallo_img_float_right').removeAttr('checked');
-          return $('#hallo_img_properties #hallo_img_unfloat').removeAttr('checked');
-        });
-        $('#hallo_img_properties #hallo_img_float_right').click(function() {
-          if (!this.checked) {
-            return false;
-          }
-          widget.$image.css('float', 'right');
-          $('#hallo_img_properties #hallo_img_unfloat').removeAttr('checked');
-          return $('#hallo_img_properties #hallo_img_float_left').removeAttr('checked');
-        });
-        return $('#hallo_img_properties #hallo_img_unfloat').click(function() {
-          if (!this.checked) {
-            return false;
-          }
-          widget.$image.css('float', 'none');
-          $('#hallo_img_properties #hallo_img_float_right').removeAttr('checked');
-          return $('#hallo_img_properties #hallo_img_float_left').removeAttr('checked');
-        });
-      } else {
-        if (!this.options.insert_file_dialog_ui_url) {
-          button = "<button id=\"insert_image_btn\">" + this.texts.insert + "</button>";
-          $img_properties.after(button);
-          return $('#insert_image_btn').click(function() {
-            var $img_source;
-            $img_source = $('#hallo_img_properties #hallo_img_source');
-            return widget._insert_image($img_source.val());
+      _init: function() {
+        if (this.options.tags.indexOf('br') !== -1) {
+          return this.element.on('keydown', function(event) {
+            if (event.originalEvent.keyCode === 13) {
+              return event.preventDefault();
+            }
           });
         }
-      }
-    },
-    _property_col_html: function(col_html) {
-      return "<div class='hallo_img_property_col'>" + col_html + "</div>";
-    },
-    _property_row_html: function(row_html, label) {
-      if (label == null) {
-        label = '';
-      }
-      row_html = this._property_col_html(label) + this._property_col_html(row_html);
-      return "<div class='hallo_img_property_row'>" + row_html + "</div>";
-    },
-    _property_html: function(property_html, options) {
-      var entry;
-      if (options == null) {
-        options = {};
-      }
-      if (options.row === false) {
-        if (options.label) {
-          entry = "" + options.label + " " + property_html;
-          property_html = "<span class='img_property_entry'>" + entry + "</span>";
+      },
+      cleanupContentClone: function(el) {
+        var tag, _i, _len, _ref, _results;
+        _ref = this.options.tags;
+        _results = [];
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          tag = _ref[_i];
+          _results.push(jQuery(tag, el).remove());
         }
-        return property_html;
-      } else {
-        entry = "<span class='img_property_entry'>" + property_html + "</span>";
-        return this._property_row_html(entry, options.label);
+        return _results;
       }
-    },
-    _property_input_html: function(id, value, options) {
-      var text_field;
-      if (options == null) {
-        options = {};
-      }
-      text_field = "<input type='text' id='hallo_img_" + id + "' value='" + value + "'>";
-      return this._property_html(text_field, options);
-    },
-    _property_cb_html: function(id, checked, options) {
-      var cb, checked_attr;
-      if (options == null) {
-        options = {};
-      }
-      checked_attr = checked ? 'checked=checked' : '';
-      cb = "<input type='checkbox' id='hallo_img_" + id + "' " + checked_attr + "'>";
-      return this._property_html(cb, options);
-    }
-  });
+    });
+  })(jQuery);
 
+}).call(this);
+
+(function() {
   (function(jQuery) {
     return jQuery.widget('IKS.halloblock', {
       options: {
@@ -753,6 +689,104 @@
     });
   })(jQuery);
 
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    var rangyMessage;
+    rangyMessage = 'The hallocleanhtml plugin requires the selection save and\
+    restore module from Rangy';
+    return jQuery.widget('IKS.hallocleanhtml', {
+      _create: function() {
+        var editor,
+          _this = this;
+        if (jQuery.htmlClean === void 0) {
+          throw new Error('The hallocleanhtml plugin requires jQuery.htmlClean');
+          return;
+        }
+        editor = this.element;
+        return editor.bind('paste', this, function(event) {
+          var lastContent, lastRange, widget;
+          if (rangy.saveSelection === void 0) {
+            throw new Error(rangyMessage);
+            return;
+          }
+          widget = event.data;
+          widget.options.editable.getSelection().deleteContents();
+          lastRange = rangy.saveSelection();
+          lastContent = editor.html();
+          editor.html('');
+          return setTimeout(function() {
+            var cleanPasted, error, pasted, range;
+            pasted = editor.html();
+            cleanPasted = jQuery.htmlClean(pasted, _this.options);
+            editor.html(lastContent);
+            rangy.restoreSelection(lastRange);
+            if (cleanPasted !== '') {
+              try {
+                return document.execCommand('insertHTML', false, cleanPasted);
+              } catch (_error) {
+                error = _error;
+                range = widget.options.editable.getSelection();
+                return range.insertNode(range.createContextualFragment(cleanPasted));
+              }
+            }
+          }, 4);
+        });
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget("IKS.halloformat", {
+      options: {
+        editable: null,
+        uuid: '',
+        formattings: {
+          bold: true,
+          italic: true,
+          strikeThrough: false,
+          underline: false
+        },
+        buttonCssClass: null
+      },
+      populateToolbar: function(toolbar) {
+        var buttonize, buttonset, enabled, format, widget, _ref,
+          _this = this;
+        widget = this;
+        buttonset = jQuery("<span class=\"" + widget.widgetName + "\"></span>");
+        buttonize = function(format) {
+          var buttonHolder;
+          buttonHolder = jQuery('<span></span>');
+          buttonHolder.hallobutton({
+            label: format,
+            editable: _this.options.editable,
+            command: format,
+            uuid: _this.options.uuid,
+            cssClass: _this.options.buttonCssClass
+          });
+          return buttonset.append(buttonHolder);
+        };
+        _ref = this.options.formattings;
+        for (format in _ref) {
+          enabled = _ref[format];
+          if (!enabled) {
+            continue;
+          }
+          buttonize(format);
+        }
+        buttonset.hallobuttonset();
+        return toolbar.append(buttonset);
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
   (function(jQuery) {
     return jQuery.widget("IKS.halloheadings", {
       options: {
@@ -779,7 +813,7 @@
             uuid: _this.options.uuid,
             cssClass: _this.options.buttonCssClass,
             queryState: function(event) {
-              var compared, map, result, val, value, _i, _len, _ref;
+              var compared, e, map, result, val, value, _i, _len, _ref;
               try {
                 value = document.queryCommandValue(command);
                 if (ie) {
@@ -797,8 +831,8 @@
                 }
                 result = compared ? true : false;
                 return buttonHolder.hallobutton('checked', result);
-              } catch (e) {
-
+              } catch (_error) {
+                e = _error;
               }
             }
           });
@@ -816,40 +850,110 @@
     });
   })(jQuery);
 
+}).call(this);
+
+(function() {
   (function(jQuery) {
-    return jQuery.widget("IKS.halloreundo", {
+    return jQuery.widget("IKS.hallohtml", {
       options: {
         editable: null,
         toolbar: null,
-        uuid: '',
+        uuid: "",
+        lang: 'en',
+        dialogOpts: {
+          autoOpen: false,
+          width: 600,
+          height: 'auto',
+          modal: false,
+          resizable: true,
+          draggable: true,
+          dialogClass: 'htmledit-dialog'
+        },
+        dialog: null,
         buttonCssClass: null
       },
-      populateToolbar: function(toolbar) {
-        var buttonize, buttonset,
+      translations: {
+        en: {
+          title: 'Edit HTML',
+          update: 'Update'
+        },
+        de: {
+          title: 'HTML bearbeiten',
+          update: 'Aktualisieren'
+        }
+      },
+      texts: null,
+      populateToolbar: function($toolbar) {
+        var $buttonHolder, $buttonset, id, selector, widget;
+        widget = this;
+        this.texts = this.translations[this.options.lang];
+        this.options.toolbar = $toolbar;
+        selector = "" + this.options.uuid + "-htmledit-dialog";
+        this.options.dialog = jQuery("<div>").attr('id', selector);
+        $buttonset = jQuery("<span>").addClass(widget.widgetName);
+        id = "" + this.options.uuid + "-htmledit";
+        $buttonHolder = jQuery('<span>');
+        $buttonHolder.hallobutton({
+          label: this.texts.title,
+          icon: 'icon-list-alt',
+          editable: this.options.editable,
+          command: null,
+          queryState: false,
+          uuid: this.options.uuid,
+          cssClass: this.options.buttonCssClass
+        });
+        $buttonset.append($buttonHolder);
+        this.button = $buttonHolder;
+        this.button.click(function() {
+          if (widget.options.dialog.dialog("isOpen")) {
+            widget._closeDialog();
+          } else {
+            widget._openDialog();
+          }
+          return false;
+        });
+        this.options.editable.element.on("hallodeactivated", function() {
+          return widget._closeDialog();
+        });
+        $toolbar.append($buttonset);
+        this.options.dialog.dialog(this.options.dialogOpts);
+        return this.options.dialog.dialog("option", "title", this.texts.title);
+      },
+      _openDialog: function() {
+        var $editableEl, html, widget, xposition, yposition,
           _this = this;
-        buttonset = jQuery("<span class=\"" + this.widgetName + "\"></span>");
-        buttonize = function(cmd, label) {
-          var buttonElement;
-          buttonElement = jQuery('<span></span>');
-          buttonElement.hallobutton({
-            uuid: _this.options.uuid,
-            editable: _this.options.editable,
-            label: label,
-            icon: cmd === 'undo' ? 'icon-undo' : 'icon-repeat',
-            command: cmd,
-            queryState: false,
-            cssClass: _this.options.buttonCssClass
-          });
-          return buttonset.append(buttonElement);
-        };
-        buttonize("undo", "Undo");
-        buttonize("redo", "Redo");
-        buttonset.hallobuttonset();
-        return toolbar.append(buttonset);
+        widget = this;
+        $editableEl = jQuery(this.options.editable.element);
+        xposition = $editableEl.offset().left + $editableEl.outerWidth() + 10;
+        yposition = this.options.toolbar.offset().top - jQuery(document).scrollTop();
+        this.options.dialog.dialog("option", "position", [xposition, yposition]);
+        this.options.editable.keepActivated(true);
+        this.options.dialog.dialog("open");
+        this.options.dialog.on('dialogclose', function() {
+          jQuery('label', _this.button).removeClass('ui-state-active');
+          _this.options.editable.element.focus();
+          return _this.options.editable.keepActivated(false);
+        });
+        this.options.dialog.html(jQuery("<textarea>").addClass('html_source'));
+        html = this.options.editable.element.html();
+        this.options.dialog.children('.html_source').val(html);
+        this.options.dialog.prepend(jQuery("<button>" + this.texts.update + "</button>"));
+        return this.options.dialog.on('click', 'button', function() {
+          html = widget.options.dialog.children('.html_source').val();
+          widget.options.editable.element.html(html);
+          widget.options.editable.element.trigger('change');
+          return false;
+        });
+      },
+      _closeDialog: function() {
+        return this.options.dialog.dialog("close");
       }
     });
   })(jQuery);
 
+}).call(this);
+
+(function() {
   (function(jQuery) {
     return jQuery.widget("IKS.halloimage", {
       options: {
@@ -1040,612 +1144,12 @@
           entity: this.options.entity
         });
       }
-      /*
-          insertImage = () ->
-          # This may need to insert an image that does not have the same URL as
-          # the preview image, since it may be a different size
-            # Check if we have a selection and fall back to @lastSelection otherwise
-            try
-              if not widget.options.editable.getSelection()
-              throw new Error "SelectionNotSet"
-            catch error
-              widget.options.editable.restoreSelection(widget.lastSelection)
-      
-            document.execCommand "insertImage", null, jQuery(this).attr('src')
-            img = document.getSelection().anchorNode.firstChild
-            jQuery(img).attr "alt", jQuery(".caption").value
-      
-            triggerModified = () ->
-              widget.element.trigger "hallomodified"
-            window.setTimeout triggerModified, 100
-            widget._closeDialog()
-      
-            addImage = "##{widget.options.uuid}-#{widget.widgetName-addimage"
-            @options.dialog.find(".halloimage-activeImage, addImage).click insertImage
-      */
-
     });
   })(jQuery);
 
-  (function(jQuery) {
-    return jQuery.widget("Liip.hallooverlay", {
-      options: {
-        editable: null,
-        toolbar: null,
-        uuid: "",
-        overlay: null,
-        padding: 10,
-        background: null
-      },
-      _create: function() {
-        var widget;
-        widget = this;
-        if (!this.options.bound) {
-          this.options.bound = true;
-          this.options.editable.element.on("halloactivated", function(event, data) {
-            widget.options.currentEditable = jQuery(event.target);
-            if (!widget.options.visible) {
-              return widget.showOverlay();
-            }
-          });
-          this.options.editable.element.on("hallomodified", function(event, data) {
-            widget.options.currentEditable = jQuery(event.target);
-            if (widget.options.visible) {
-              return widget.resizeOverlay();
-            }
-          });
-          return this.options.editable.element.on("hallodeactivated", function(event, data) {
-            widget.options.currentEditable = jQuery(event.target);
-            if (widget.options.visible) {
-              return widget.hideOverlay();
-            }
-          });
-        }
-      },
-      showOverlay: function() {
-        this.options.visible = true;
-        if (this.options.overlay === null) {
-          if (jQuery("#halloOverlay").length > 0) {
-            this.options.overlay = jQuery("#halloOverlay");
-          } else {
-            this.options.overlay = jQuery("<div id=\"halloOverlay\"            class=\"halloOverlay\">");
-            jQuery(document.body).append(this.options.overlay);
-          }
-          this.options.overlay.on('click', jQuery.proxy(this.options.editable.turnOff, this.options.editable));
-        }
-        this.options.overlay.show();
-        if (this.options.background === null) {
-          if (jQuery("#halloBackground").length > 0) {
-            this.options.background = jQuery("#halloBackground");
-          } else {
-            this.options.background = jQuery("<div id=\"halloBackground\"            class=\"halloBackground\">");
-            jQuery(document.body).append(this.options.background);
-          }
-        }
-        this.resizeOverlay();
-        this.options.background.show();
-        if (!this.options.originalZIndex) {
-          this.options.originalZIndex = this.options.currentEditable.css("z-index");
-        }
-        return this.options.currentEditable.css('z-index', '350');
-      },
-      resizeOverlay: function() {
-        var offset;
-        offset = this.options.currentEditable.offset();
-        return this.options.background.css({
-          top: offset.top - this.options.padding,
-          left: offset.left - this.options.padding,
-          width: this.options.currentEditable.width() + 2 * this.options.padding,
-          height: this.options.currentEditable.height() + 2 * this.options.padding
-        });
-      },
-      hideOverlay: function() {
-        this.options.visible = false;
-        this.options.overlay.hide();
-        this.options.background.hide();
-        return this.options.currentEditable.css('z-index', this.options.originalZIndex);
-      },
-      _findBackgroundColor: function(jQueryfield) {
-        var color;
-        color = jQueryfield.css("background-color");
-        if (color !== 'rgba(0, 0, 0, 0)' && color !== 'transparent') {
-          return color;
-        }
-        if (jQueryfield.is("body")) {
-          return "white";
-        } else {
-          return this._findBackgroundColor(jQueryfield.parent());
-        }
-      }
-    });
-  })(jQuery);
-
-  (function(jQuery) {
-    return jQuery.widget('IKS.halloindicator', {
-      options: {
-        editable: null,
-        className: 'halloEditIndicator'
-      },
-      _create: function() {
-        var _this = this;
-        return this.element.on('halloenabled', function() {
-          return _this.buildIndicator();
-        });
-      },
-      populateToolbar: function() {},
-      buildIndicator: function() {
-        var editButton;
-        editButton = jQuery('<div><i class="icon-edit"></i> Edit</div>');
-        editButton.addClass(this.options.className);
-        editButton.hide();
-        this.element.before(editButton);
-        this.bindIndicator(editButton);
-        return this.setIndicatorPosition(editButton);
-      },
-      bindIndicator: function(indicator) {
-        var _this = this;
-        indicator.on('click', function() {
-          return _this.options.editable.element.focus();
-        });
-        this.element.on('halloactivated', function() {
-          return indicator.hide();
-        });
-        this.element.on('hallodisabled', function() {
-          return indicator.remove();
-        });
-        return this.options.editable.element.hover(function() {
-          if (jQuery(this).hasClass('inEditMode')) {
-            return;
-          }
-          return indicator.show();
-        }, function(data) {
-          if (jQuery(this).hasClass('inEditMode')) {
-            return;
-          }
-          if (data.relatedTarget === indicator.get(0)) {
-            return;
-          }
-          return indicator.hide();
-        });
-      },
-      setIndicatorPosition: function(indicator) {
-        var offset;
-        indicator.css('position', 'absolute');
-        offset = this.element.position();
-        indicator.css('top', offset.top + 2);
-        return indicator.css('left', offset.left + 2);
-      }
-    });
-  })(jQuery);
-
-  (function(jQuery) {
-    var z;
-    z = null;
-    if (this.VIE !== void 0) {
-      z = new VIE;
-      z.use(new z.StanbolService({
-        proxyDisabled: true,
-        url: 'http://dev.iks-project.eu:8081'
-      }));
-    }
-    return jQuery.widget('IKS.halloannotate', {
-      options: {
-        vie: z,
-        editable: null,
-        toolbar: null,
-        uuid: '',
-        select: function() {},
-        decline: function() {},
-        remove: function() {},
-        buttonCssClass: null
-      },
-      _create: function() {
-        var editableElement, turnOffAnnotate, widget;
-        widget = this;
-        if (this.options.vie === void 0) {
-          throw new Error('The halloannotate plugin requires VIE');
-          return;
-        }
-        if (typeof this.element.annotate !== 'function') {
-          throw new Error('The halloannotate plugin requires annotate.js');
-          return;
-        }
-        this.state = 'off';
-        this.instantiate();
-        turnOffAnnotate = function() {
-          var editable;
-          editable = this;
-          return jQuery(editable).halloannotate('turnOff');
-        };
-        editableElement = this.options.editable.element;
-        return editableElement.on('hallodisabled', turnOffAnnotate);
-      },
-      populateToolbar: function(toolbar) {
-        var buttonHolder,
-          _this = this;
-        buttonHolder = jQuery("<span class=\"" + this.widgetName + "\"></span>");
-        this.button = buttonHolder.hallobutton({
-          label: 'Annotate',
-          icon: 'icon-tags',
-          editable: this.options.editable,
-          command: null,
-          uuid: this.options.uuid,
-          cssClass: this.options.buttonCssClass,
-          queryState: false
-        });
-        buttonHolder.on('change', function(event) {
-          if (_this.state === "pending") {
-            return;
-          }
-          if (_this.state === "off") {
-            return _this.turnOn();
-          }
-          return _this.turnOff();
-        });
-        buttonHolder.buttonset();
-        return toolbar.append(this.button);
-      },
-      cleanupContentClone: function(el) {
-        if (this.state === 'on') {
-          return el.find(".entity:not([about])").each(function() {
-            return jQuery(this).replaceWith(jQuery(this).html());
-          });
-        }
-      },
-      instantiate: function() {
-        var widget;
-        widget = this;
-        return this.options.editable.element.annotate({
-          vie: this.options.vie,
-          debug: false,
-          showTooltip: true,
-          select: this.options.select,
-          remove: this.options.remove,
-          success: this.options.success,
-          error: this.options.error
-        }).on('annotateselect', function(event, data) {
-          return widget.options.editable.setModified();
-        }).on('annotateremove', function() {
-          return jQuery.noop();
-        });
-      },
-      turnPending: function() {
-        this.state = 'pending';
-        this.button.hallobutton('checked', false);
-        return this.button.hallobutton('disable');
-      },
-      turnOn: function() {
-        var widget,
-          _this = this;
-        this.turnPending();
-        widget = this;
-        try {
-          return this.options.editable.element.annotate('enable', function(success) {
-            if (!success) {
-              return;
-            }
-            _this.state = 'on';
-            _this.button.hallobutton('checked', true);
-            return _this.button.hallobutton('enable');
-          });
-        } catch (e) {
-          return alert(e);
-        }
-      },
-      turnOff: function() {
-        this.options.editable.element.annotate('disable');
-        this.state = 'off';
-        if (!this.button) {
-          return;
-        }
-        this.button.attr('checked', false);
-        this.button.find("label").removeClass("ui-state-clicked");
-        return this.button.button('refresh');
-      }
-    });
-  })(jQuery);
-
-  (function(jQuery) {
-    return jQuery.widget('IKS.halloimagesearch', {
-      options: {
-        imageWidget: null,
-        searchCallback: null,
-        searchUrl: null,
-        limit: 5
-      },
-      _create: function() {
-        return this.element.html('<div>\
-        <form method="get">\
-          <input type="text" class="searchInput" placeholder="Search" />\
-          <input type="submit" class="btn searchButton" value="OK" />\
-        </form>\
-        <div class="searchResults imageThumbnailContainer">\
-          <div class="activitySpinner">Loading images...</div>\
-          <ul></ul>\
-        </div>\
-      </div>');
-      },
-      _init: function() {
-        var _this = this;
-        if (this.options.searchUrl && !this.options.searchCallback) {
-          this.options.searchCallback = this._ajaxSearch;
-        }
-        jQuery('.activitySpinner', this.element).hide();
-        return jQuery('form', this.element).submit(function(event) {
-          var query;
-          event.preventDefault();
-          jQuery('.activitySpinner', _this.element).show();
-          query = jQuery('.searchInput', _this.element.element).val();
-          return _this.options.searchCallback(query, _this.options.limit, 0, function(results) {
-            return _this._showResults(results);
-          });
-        });
-      },
-      _showResult: function(image) {
-        var html,
-          _this = this;
-        if (!image.label) {
-          image.label = image.alt;
-        }
-        html = jQuery("<li>        <img src=\"" + image.url + "\" class=\"imageThumbnail\"          title=\"" + image.label + "\"></li>");
-        html.on('click', function() {
-          return _this.options.imageWidget.setCurrent(image);
-        });
-        jQuery('img', html).on('mousedown', function(event) {
-          event.preventDefault();
-          return _this.options.imageWidget.setCurrent(image);
-        });
-        return jQuery('.imageThumbnailContainer ul', this.element).append(html);
-      },
-      _showNextPrev: function(results) {
-        var container,
-          _this = this;
-        container = jQuery('imageThumbnailContainer ul', this.element);
-        container.prepend(jQuery('<div class="pager-prev" style="display:none" />'));
-        container.append(jQuery('<div class="pager-next" style="display:none" />'));
-        if (results.offset > 0) {
-          jQuery('.pager-prev', container).show();
-        }
-        if (results.offset < results.total) {
-          jQuery('.pager-next', container).show();
-        }
-        jQuery('.pager-prev', container).click(function(event) {
-          var offset;
-          offset = results.offset - _this.options.limit;
-          return _this.options.searchCallback(query, _this.options.limit, offset, function(results) {
-            return _this._showResults(results);
-          });
-        });
-        return jQuery('.pager-next', container).click(function(event) {
-          var offset;
-          offset = results.offset + _this.options.limit;
-          return _this.options.searchCallback(query, _this.options.limit, offset, function(results) {
-            return _this._showResults(results);
-          });
-        });
-      },
-      _showResults: function(results) {
-        var image, _i, _len, _ref;
-        jQuery('.activitySpinner', this.element).hide();
-        jQuery('.imageThumbnailContainer ul', this.element).empty();
-        jQuery('.imageThumbnailContainer ul', this.element).show();
-        _ref = results.assets;
-        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-          image = _ref[_i];
-          this._showResult(image);
-        }
-        this.options.imageWidget.setCurrent(results.assets.shift());
-        return this._showNextPrev(results);
-      },
-      _ajaxSearch: function(query, limit, offset, success) {
-        var searchUrl;
-        searchUrl = this.searchUrl + '?' + jQuery.param({
-          q: query,
-          limit: limit,
-          offset: offset
-        });
-        return jQuery.getJSON(searchUrl, success);
-      }
-    });
-  })(jQuery);
-
-  (function(jQuery) {
-    return jQuery.widget('IKS.halloimageupload', {
-      options: {
-        uploadCallback: null,
-        uploadUrl: null,
-        imageWidget: null,
-        entity: null
-      },
-      _create: function() {
-        return this.element.html('\
-        <form class="upload">\
-        <input type="file" class="file" name="userfile" accept="image/*" />\
-        <input type="hidden" name="tags" value="" />\
-        <input type="text" class="caption" name="caption" placeholder="Title" />\
-        <button class="uploadSubmit">Upload</button>\
-        </form>\
-      ');
-      },
-      _init: function() {
-        var widget;
-        widget = this;
-        if (widget.options.uploadUrl && !widget.options.uploadCallback) {
-          widget.options.uploadCallback = widget._iframeUpload;
-        }
-        return jQuery('.uploadSubmit', this.element).on('click', function(event) {
-          event.preventDefault();
-          event.stopPropagation();
-          return widget.options.uploadCallback({
-            widget: widget,
-            success: function(url) {
-              return widget.options.imageWidget.setCurrent({
-                url: url,
-                label: ''
-              });
-            }
-          });
-        });
-      },
-      _prepareIframe: function(widget) {
-        var iframe, iframeName;
-        iframeName = "" + widget.widgetName + "_postframe_" + widget.options.uuid;
-        iframeName = iframeName.replace(/-/g, '_');
-        iframe = jQuery("#" + iframeName);
-        if (iframe.length) {
-          return iframe;
-        }
-        iframe = jQuery("<iframe name=\"" + iframeName + "\" id=\"" + iframeName + "\"        class=\"hidden\" style=\"display:none\" />");
-        this.element.append(iframe);
-        iframe.get(0).name = iframeName;
-        return iframe;
-      },
-      _iframeUpload: function(data) {
-        var iframe, uploadForm, uploadUrl, widget;
-        widget = data.widget;
-        iframe = widget._prepareIframe(widget);
-        uploadForm = jQuery('form.upload', widget.element);
-        if (typeof widget.options.uploadUrl === 'function') {
-          uploadUrl = widget.options.uploadUrl(widget.options.entity);
-        } else {
-          uploadUrl = widget.options.uploadUrl;
-        }
-        iframe.on('load', function() {
-          var imageUrl;
-          imageUrl = iframe.get(0).contentWindow.location.href;
-          widget.element.hide();
-          return data.success(imageUrl);
-        });
-        uploadForm.attr('action', uploadUrl);
-        uploadForm.attr('method', 'post');
-        uploadForm.attr('target', iframe.get(0).name);
-        uploadForm.attr('enctype', 'multipart/form-data');
-        uploadForm.attr('encoding', 'multipart/form-data');
-        return uploadForm.submit();
-      }
-    });
-  })(jQuery);
-
-  (function(jQuery) {
-    return jQuery.widget('IKS.halloimagesuggestions', {
-      loaded: false,
-      options: {
-        entity: null,
-        vie: null,
-        dbPediaUrl: null,
-        getSuggestions: null,
-        thumbnailUri: '<http://dbpedia.org/ontology/thumbnail>'
-      },
-      _create: function() {
-        return this.element.html('\
-      <div id="' + this.options.uuid + '-tab-suggestions">\
-        <div class="imageThumbnailContainer">\
-          <div class="activitySpinner">Loading images...</div>\
-          <ul></ul>\
-        </div>\
-      </div>');
-      },
-      _init: function() {
-        return jQuery('.activitySpinner', this.element).hide();
-      },
-      _normalizeRelated: function(related) {
-        if (_.isString(related)) {
-          return related;
-        }
-        if (_.isArray(related)) {
-          return related.join(',');
-        }
-        return related.pluck('@subject').join(',');
-      },
-      _prepareVIE: function() {
-        if (!this.options.vie) {
-          this.options.vie = new VIE;
-        }
-        if (this.options.vie.services.dbpedia) {
-          return;
-        }
-        if (!this.options.dbPediaUrl) {
-          return;
-        }
-        return this.options.vie.use(new vie.DBPediaService({
-          url: this.options.dbPediaUrl,
-          proxyDisabled: true
-        }));
-      },
-      _getSuggestions: function() {
-        var limit, normalizedTags, tags;
-        if (this.loaded) {
-          return;
-        }
-        if (!this.options.entity) {
-          return;
-        }
-        jQuery('.activitySpinner', this.element).show();
-        tags = this.options.entity.get('skos:related');
-        if (tags.length === 0) {
-          jQuery("#activitySpinner").html('No images found.');
-          return;
-        }
-        jQuery('.imageThumbnailContainer ul', this.element).empty();
-        normalizedTags = this._normalizeRelated(tags);
-        limit = this.options.limit;
-        if (this.options.getSuggestions) {
-          this.options.getSuggestions(normalizedTags, limit, 0, this._showSuggestions);
-        }
-        this._prepareVIE();
-        if (this.options.vie.services.dbpedia) {
-          this._getSuggestionsDbPedia(tags);
-        }
-        return this.loaded = true;
-      },
-      _getSuggestionsDbPedia: function(tags) {
-        var thumbId, widget;
-        widget = this;
-        thumbId = 1;
-        return _.each(tags, function(tag) {
-          return vie.load({
-            entity: tag
-          }).using('dbpedia').execute().done(function(entities) {
-            jQuery('.activitySpinner', this.element).hide();
-            return _.each(entities, function(entity) {
-              var img, thumbnail;
-              thumbnail = entity.attributes[widget.options.thumbnailUri];
-              if (!thumbnail) {
-                return;
-              }
-              if (_.isObject(thumbnail)) {
-                img = thumbnail[0].value;
-              }
-              if (_.isString(thumbnail)) {
-                img = widget.options.entity.fromReference(thumbnail);
-              }
-              return widget._showSuggestion({
-                url: img,
-                label: tag
-              });
-            });
-          });
-        });
-      },
-      _showSuggestion: function(image) {
-        var html,
-          _this = this;
-        html = jQuery("<li>        <img src=\"" + image.url + "\" class=\"imageThumbnail\"          title=\"" + image.label + "\">        </li>");
-        html.on('click', function() {
-          return _this.options.imageWidget.setCurrent(image);
-        });
-        return jQuery('.imageThumbnailContainer ul', this.element).append(html);
-      },
-      _showSuggestions: function(suggestions) {
-        var _this = this;
-        jQuery('.activitySpinner', this.element).hide();
-        return _.each(suggestions, function(image) {
-          return _this._showSuggestion(image);
-        });
-      }
-    });
-  })(jQuery);
+}).call(this);
 
+(function() {
   (function(jQuery) {
     return jQuery.widget('IKS.halloimagecurrent', {
       options: {
@@ -1997,6 +1501,734 @@
     });
   })(jQuery);
 
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget('IKS.halloimagesearch', {
+      options: {
+        imageWidget: null,
+        searchCallback: null,
+        searchUrl: null,
+        limit: 5
+      },
+      _create: function() {
+        return this.element.html('<div>\
+        <form method="get">\
+          <input type="text" class="searchInput" placeholder="Search" />\
+          <input type="submit" class="btn searchButton" value="OK" />\
+        </form>\
+        <div class="searchResults imageThumbnailContainer">\
+          <div class="activitySpinner">Loading images...</div>\
+          <ul></ul>\
+        </div>\
+      </div>');
+      },
+      _init: function() {
+        var _this = this;
+        if (this.options.searchUrl && !this.options.searchCallback) {
+          this.options.searchCallback = this._ajaxSearch;
+        }
+        jQuery('.activitySpinner', this.element).hide();
+        return jQuery('form', this.element).submit(function(event) {
+          var query;
+          event.preventDefault();
+          jQuery('.activitySpinner', _this.element).show();
+          query = jQuery('.searchInput', _this.element.element).val();
+          return _this.options.searchCallback(query, _this.options.limit, 0, function(results) {
+            return _this._showResults(results);
+          });
+        });
+      },
+      _showResult: function(image) {
+        var html,
+          _this = this;
+        if (!image.label) {
+          image.label = image.alt;
+        }
+        html = jQuery("<li>        <img src=\"" + image.url + "\" class=\"imageThumbnail\"          title=\"" + image.label + "\"></li>");
+        html.on('click', function() {
+          return _this.options.imageWidget.setCurrent(image);
+        });
+        jQuery('img', html).on('mousedown', function(event) {
+          event.preventDefault();
+          return _this.options.imageWidget.setCurrent(image);
+        });
+        return jQuery('.imageThumbnailContainer ul', this.element).append(html);
+      },
+      _showNextPrev: function(results) {
+        var container,
+          _this = this;
+        container = jQuery('imageThumbnailContainer ul', this.element);
+        container.prepend(jQuery('<div class="pager-prev" style="display:none" />'));
+        container.append(jQuery('<div class="pager-next" style="display:none" />'));
+        if (results.offset > 0) {
+          jQuery('.pager-prev', container).show();
+        }
+        if (results.offset < results.total) {
+          jQuery('.pager-next', container).show();
+        }
+        jQuery('.pager-prev', container).click(function(event) {
+          var offset;
+          offset = results.offset - _this.options.limit;
+          return _this.options.searchCallback(query, _this.options.limit, offset, function(results) {
+            return _this._showResults(results);
+          });
+        });
+        return jQuery('.pager-next', container).click(function(event) {
+          var offset;
+          offset = results.offset + _this.options.limit;
+          return _this.options.searchCallback(query, _this.options.limit, offset, function(results) {
+            return _this._showResults(results);
+          });
+        });
+      },
+      _showResults: function(results) {
+        var image, _i, _len, _ref;
+        jQuery('.activitySpinner', this.element).hide();
+        jQuery('.imageThumbnailContainer ul', this.element).empty();
+        jQuery('.imageThumbnailContainer ul', this.element).show();
+        _ref = results.assets;
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          image = _ref[_i];
+          this._showResult(image);
+        }
+        this.options.imageWidget.setCurrent(results.assets.shift());
+        return this._showNextPrev(results);
+      },
+      _ajaxSearch: function(query, limit, offset, success) {
+        var searchUrl;
+        searchUrl = this.searchUrl + '?' + jQuery.param({
+          q: query,
+          limit: limit,
+          offset: offset
+        });
+        return jQuery.getJSON(searchUrl, success);
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget('IKS.halloimagesuggestions', {
+      loaded: false,
+      options: {
+        entity: null,
+        vie: null,
+        dbPediaUrl: null,
+        getSuggestions: null,
+        thumbnailUri: '<http://dbpedia.org/ontology/thumbnail>'
+      },
+      _create: function() {
+        return this.element.html('\
+      <div id="' + this.options.uuid + '-tab-suggestions">\
+        <div class="imageThumbnailContainer">\
+          <div class="activitySpinner">Loading images...</div>\
+          <ul></ul>\
+        </div>\
+      </div>');
+      },
+      _init: function() {
+        return jQuery('.activitySpinner', this.element).hide();
+      },
+      _normalizeRelated: function(related) {
+        if (_.isString(related)) {
+          return related;
+        }
+        if (_.isArray(related)) {
+          return related.join(',');
+        }
+        return related.pluck('@subject').join(',');
+      },
+      _prepareVIE: function() {
+        if (!this.options.vie) {
+          this.options.vie = new VIE;
+        }
+        if (this.options.vie.services.dbpedia) {
+          return;
+        }
+        if (!this.options.dbPediaUrl) {
+          return;
+        }
+        return this.options.vie.use(new vie.DBPediaService({
+          url: this.options.dbPediaUrl,
+          proxyDisabled: true
+        }));
+      },
+      _getSuggestions: function() {
+        var limit, normalizedTags, tags;
+        if (this.loaded) {
+          return;
+        }
+        if (!this.options.entity) {
+          return;
+        }
+        jQuery('.activitySpinner', this.element).show();
+        tags = this.options.entity.get('skos:related');
+        if (tags.length === 0) {
+          jQuery("#activitySpinner").html('No images found.');
+          return;
+        }
+        jQuery('.imageThumbnailContainer ul', this.element).empty();
+        normalizedTags = this._normalizeRelated(tags);
+        limit = this.options.limit;
+        if (this.options.getSuggestions) {
+          this.options.getSuggestions(normalizedTags, limit, 0, this._showSuggestions);
+        }
+        this._prepareVIE();
+        if (this.options.vie.services.dbpedia) {
+          this._getSuggestionsDbPedia(tags);
+        }
+        return this.loaded = true;
+      },
+      _getSuggestionsDbPedia: function(tags) {
+        var thumbId, widget;
+        widget = this;
+        thumbId = 1;
+        return _.each(tags, function(tag) {
+          return vie.load({
+            entity: tag
+          }).using('dbpedia').execute().done(function(entities) {
+            jQuery('.activitySpinner', this.element).hide();
+            return _.each(entities, function(entity) {
+              var img, thumbnail;
+              thumbnail = entity.attributes[widget.options.thumbnailUri];
+              if (!thumbnail) {
+                return;
+              }
+              if (_.isObject(thumbnail)) {
+                img = thumbnail[0].value;
+              }
+              if (_.isString(thumbnail)) {
+                img = widget.options.entity.fromReference(thumbnail);
+              }
+              return widget._showSuggestion({
+                url: img,
+                label: tag
+              });
+            });
+          });
+        });
+      },
+      _showSuggestion: function(image) {
+        var html,
+          _this = this;
+        html = jQuery("<li>        <img src=\"" + image.url + "\" class=\"imageThumbnail\"          title=\"" + image.label + "\">        </li>");
+        html.on('click', function() {
+          return _this.options.imageWidget.setCurrent(image);
+        });
+        return jQuery('.imageThumbnailContainer ul', this.element).append(html);
+      },
+      _showSuggestions: function(suggestions) {
+        var _this = this;
+        jQuery('.activitySpinner', this.element).hide();
+        return _.each(suggestions, function(image) {
+          return _this._showSuggestion(image);
+        });
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget('IKS.halloimageupload', {
+      options: {
+        uploadCallback: null,
+        uploadUrl: null,
+        imageWidget: null,
+        entity: null
+      },
+      _create: function() {
+        return this.element.html('\
+        <form class="upload">\
+        <input type="file" class="file" name="userfile" accept="image/*" />\
+        <input type="hidden" name="tags" value="" />\
+        <input type="text" class="caption" name="caption" placeholder="Title" />\
+        <button class="uploadSubmit">Upload</button>\
+        </form>\
+      ');
+      },
+      _init: function() {
+        var widget;
+        widget = this;
+        if (widget.options.uploadUrl && !widget.options.uploadCallback) {
+          widget.options.uploadCallback = widget._iframeUpload;
+        }
+        return jQuery('.uploadSubmit', this.element).on('click', function(event) {
+          event.preventDefault();
+          event.stopPropagation();
+          return widget.options.uploadCallback({
+            widget: widget,
+            success: function(url) {
+              return widget.options.imageWidget.setCurrent({
+                url: url,
+                label: ''
+              });
+            }
+          });
+        });
+      },
+      _prepareIframe: function(widget) {
+        var iframe, iframeName;
+        iframeName = "" + widget.widgetName + "_postframe_" + widget.options.uuid;
+        iframeName = iframeName.replace(/-/g, '_');
+        iframe = jQuery("#" + iframeName);
+        if (iframe.length) {
+          return iframe;
+        }
+        iframe = jQuery("<iframe name=\"" + iframeName + "\" id=\"" + iframeName + "\"        class=\"hidden\" style=\"display:none\" />");
+        this.element.append(iframe);
+        iframe.get(0).name = iframeName;
+        return iframe;
+      },
+      _iframeUpload: function(data) {
+        var iframe, uploadForm, uploadUrl, widget;
+        widget = data.widget;
+        iframe = widget._prepareIframe(widget);
+        uploadForm = jQuery('form.upload', widget.element);
+        if (typeof widget.options.uploadUrl === 'function') {
+          uploadUrl = widget.options.uploadUrl(widget.options.entity);
+        } else {
+          uploadUrl = widget.options.uploadUrl;
+        }
+        iframe.on('load', function() {
+          var imageUrl;
+          imageUrl = iframe.get(0).contentWindow.location.href;
+          widget.element.hide();
+          return data.success(imageUrl);
+        });
+        uploadForm.attr('action', uploadUrl);
+        uploadForm.attr('method', 'post');
+        uploadForm.attr('target', iframe.get(0).name);
+        uploadForm.attr('enctype', 'multipart/form-data');
+        uploadForm.attr('encoding', 'multipart/form-data');
+        return uploadForm.submit();
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget("IKS.hallo-image-insert-edit", {
+      options: {
+        editable: null,
+        toolbar: null,
+        uuid: "",
+        insert_file_dialog_ui_url: null,
+        lang: 'en',
+        dialogOpts: {
+          autoOpen: false,
+          width: 560,
+          height: 'auto',
+          modal: false,
+          resizable: true,
+          draggable: true,
+          dialogClass: 'insert-image-dialog'
+        },
+        dialog: null,
+        buttonCssClass: null
+      },
+      translations: {
+        en: {
+          title_insert: 'Insert Image',
+          title_properties: 'Image Properties',
+          insert: 'Insert',
+          chage_image: 'Change Image:',
+          source: 'URL',
+          width: 'Width',
+          height: 'Height',
+          alt: 'Alt Text',
+          padding: 'Padding',
+          'float': 'Float',
+          float_left: 'left',
+          float_right: 'right',
+          float_none: 'No'
+        },
+        de: {
+          title_insert: 'Bild einfügen',
+          title_properties: 'Bildeigenschaften',
+          insert: 'Einfügen',
+          chage_image: 'Bild ändern:',
+          source: 'URL',
+          width: 'Breite',
+          height: 'Höhe',
+          alt: 'Alt Text',
+          padding: 'Padding',
+          'float': 'Float',
+          float_left: 'Links',
+          float_right: 'Rechts',
+          float_none: 'Nein'
+        }
+      },
+      texts: null,
+      dialog_image_selection_ui_loaded: false,
+      $image: null,
+      populateToolbar: function($toolbar) {
+        var $buttonHolder, $buttonset, dialog_html, widget;
+        widget = this;
+        this.texts = this.translations[this.options.lang];
+        this.options.toolbar = $toolbar;
+        dialog_html = "<div id='hallo_img_properties'></div>";
+        if (this.options.insert_file_dialog_ui_url) {
+          dialog_html += "<div id='hallo_img_file_select_ui'></div>";
+        }
+        this.options.dialog = jQuery("<div>").attr('id', "" + this.options.uuid + "-insert-image-dialog").html(dialog_html);
+        $buttonset = jQuery("<span>").addClass(this.widgetName);
+        $buttonHolder = jQuery('<span>');
+        $buttonHolder.hallobutton({
+          label: this.texts.title_insert,
+          icon: 'icon-picture',
+          editable: this.options.editable,
+          command: null,
+          queryState: false,
+          uuid: this.options.uuid,
+          cssClass: this.options.buttonCssClass
+        });
+        $buttonset.append($buttonHolder);
+        this.button = $buttonHolder;
+        this.button.click(function() {
+          if (widget.options.dialog.dialog("isOpen")) {
+            widget._closeDialog();
+          } else {
+            widget.lastSelection = widget.options.editable.getSelection();
+            widget._openDialog();
+          }
+          return false;
+        });
+        this.options.editable.element.on("halloselected, hallounselected", function() {
+          if (widget.options.dialog.dialog("isOpen")) {
+            return widget.lastSelection = widget.options.editable.getSelection();
+          }
+        });
+        this.options.editable.element.on("hallodeactivated", function() {
+          return widget._closeDialog();
+        });
+        jQuery(this.options.editable.element).on("click", "img", function(e) {
+          widget._openDialog(jQuery(this));
+          return false;
+        });
+        this.options.editable.element.on('halloselected', function(event, data) {
+          var toolbar_option;
+          toolbar_option = widget.options.editable.options.toolbar;
+          if (toolbar_option === "halloToolbarContextual" && jQuery(data.originalEvent.target).is('img')) {
+            $toolbar.hide();
+            return false;
+          }
+        });
+        $toolbar.append($buttonset);
+        return this.options.dialog.dialog(this.options.dialogOpts);
+      },
+      _openDialog: function($image) {
+        var $editableEl, widget, xposition, yposition,
+          _this = this;
+        this.$image = $image;
+        widget = this;
+        $editableEl = jQuery(this.options.editable.element);
+        xposition = $editableEl.offset().left + $editableEl.outerWidth() + 10;
+        if (this.$image) {
+          yposition = this.$image.offset().top - jQuery(document).scrollTop();
+        } else {
+          yposition = this.options.toolbar.offset().top - jQuery(document).scrollTop();
+        }
+        this.options.dialog.dialog("option", "position", [xposition, yposition]);
+        this.options.editable.keepActivated(true);
+        this.options.dialog.dialog("open");
+        if (this.$image) {
+          this.options.dialog.dialog("option", "title", this.texts.title_properties);
+          jQuery(document).keyup(function(e) {
+            if (e.keyCode === 46 || e.keyCode === 8) {
+              jQuery(document).off();
+              widget._closeDialog();
+              widget.$image.remove();
+              widget.$image = null;
+            }
+            return e.preventDefault();
+          });
+          this.options.editable.element.on("click", function() {
+            widget.$image = null;
+            return widget._closeDialog();
+          });
+        } else {
+          this.options.dialog.children('#hallo_img_properties').hide();
+          this.options.dialog.dialog("option", "title", this.texts.title_insert);
+          if (jQuery('#hallo_img_file_select_title').length > 0) {
+            jQuery('#hallo_img_file_select_title').text('');
+          }
+        }
+        this._load_dialog_image_properties_ui();
+        this.options.dialog.on('dialogclose', function() {
+          var scrollbar_pos;
+          jQuery('label', _this.button).removeClass('ui-state-active');
+          scrollbar_pos = jQuery(document).scrollTop();
+          _this.options.editable.element.focus();
+          jQuery(document).scrollTop(scrollbar_pos);
+          return _this.options.editable.keepActivated(false);
+        });
+        if (this.options.insert_file_dialog_ui_url && !this.dialog_image_selection_ui_loaded) {
+          this.options.dialog.on('click', ".reload_link", function() {
+            widget._load_dialog_image_selection_ui();
+            return false;
+          });
+          this.options.dialog.on('click', '.file_preview img', function() {
+            var new_source;
+            if (widget.$image) {
+              new_source = jQuery(this).attr('src').replace(/-thumb/, '');
+              widget.$image.attr('src', new_source);
+              jQuery('#hallo_img_source').val(new_source);
+            } else {
+              widget._insert_image(jQuery(this).attr('src').replace(/-thumb/, ''));
+            }
+            return false;
+          });
+          return this._load_dialog_image_selection_ui();
+        }
+      },
+      _insert_image: function(source) {
+        this.options.editable.restoreSelection(this.lastSelection);
+        document.execCommand("insertImage", null, source);
+        this.options.editable.element.trigger('change');
+        this.options.editable.removeAllSelections();
+        return this._closeDialog();
+      },
+      _closeDialog: function() {
+        return this.options.dialog.dialog("close");
+      },
+      _load_dialog_image_selection_ui: function() {
+        var widget;
+        widget = this;
+        return jQuery.ajax({
+          url: this.options.insert_file_dialog_ui_url,
+          success: function(data, textStatus, jqXHR) {
+            var $properties, file_select_title, t;
+            file_select_title = '';
+            $properties = widget.options.dialog.children('#hallo_img_properties');
+            if ($properties.is(':visible')) {
+              file_select_title = widget.texts.change_image;
+            }
+            t = "<div id='hallo_img_file_select_title'>" + file_select_title + "</div>";
+            widget.options.dialog.children('#hallo_img_file_select_ui').html(t + data);
+            return widget.dialog_image_selection_ui_loaded = true;
+          },
+          beforeSend: function() {
+            return widget.options.dialog.children('#hallo_img_file_select_ui').html('<div class="hallo_insert_file_loader"></div>');
+          }
+        });
+      },
+      _load_dialog_image_properties_ui: function() {
+        var $img_properties, button, height, html, widget, width;
+        widget = this;
+        $img_properties = this.options.dialog.children('#hallo_img_properties');
+        if (this.$image) {
+          width = this.$image.is('[width]') ? this.$image.attr('width') : '';
+          height = this.$image.is('[height]') ? this.$image.attr('height') : '';
+          html = this._property_input_html('source', this.$image.attr('src'), {
+            label: this.texts.source
+          }) + this._property_input_html('alt', this.$image.attr('alt') || '', {
+            label: this.texts.alt
+          }) + this._property_row_html(this._property_input_html('width', width, {
+            label: this.texts.width,
+            row: false
+          }) + this._property_input_html('height', height, {
+            label: this.texts.height,
+            row: false
+          })) + this._property_input_html('padding', this.$image.css('padding'), {
+            label: this.texts.padding
+          }) + this._property_row_html(this._property_cb_html('float_left', this.$image.css('float') === 'left', {
+            label: this.texts.float_left,
+            row: false
+          }) + this._property_cb_html('float_right', this.$image.css('float') === 'right', {
+            label: this.texts.float_right,
+            row: false
+          }) + this._property_cb_html('unfloat', this.$image.css('float') === 'none', {
+            label: this.texts.float_none,
+            row: false
+          }), this.texts[float]);
+          $img_properties.html(html);
+          $img_properties.show();
+        } else {
+          if (!this.options.insert_file_dialog_ui_url) {
+            $img_properties.html(this._property_input_html('source', '', {
+              label: this.texts.source
+            }));
+            $img_properties.show();
+          }
+        }
+        if (this.$image) {
+          if (!this.options.insert_file_dialog_ui_url) {
+            jQuery('#insert_image_btn').remove();
+          }
+          if (jQuery('#hallo_img_file_select_title').length > 0) {
+            jQuery('#hallo_img_file_select_title').text(this.texts.chage_image);
+          }
+          jQuery('#hallo_img_properties #hallo_img_source').keyup(function() {
+            return widget.$image.attr('src', this.value);
+          });
+          jQuery('#hallo_img_properties #hallo_img_alt').keyup(function() {
+            return widget.$image.attr('alt', this.value);
+          });
+          jQuery('#hallo_img_properties #hallo_img_padding').keyup(function() {
+            return widget.$image.css('padding', this.value);
+          });
+          jQuery('#hallo_img_properties #hallo_img_height').keyup(function() {
+            widget.$image.css('height', this.value);
+            return widget.$image.attr('height', this.value);
+          });
+          jQuery('#hallo_img_properties #hallo_img_width').keyup(function() {
+            widget.$image.css('width', this.value);
+            return widget.$image.attr('width', this.value);
+          });
+          jQuery('#hallo_img_properties #hallo_img_float_left').click(function() {
+            if (!this.checked) {
+              return false;
+            }
+            widget.$image.css('float', 'left');
+            jQuery('#hallo_img_properties #hallo_img_float_right').removeAttr('checked');
+            return jQuery('#hallo_img_properties #hallo_img_unfloat').removeAttr('checked');
+          });
+          jQuery('#hallo_img_properties #hallo_img_float_right').click(function() {
+            if (!this.checked) {
+              return false;
+            }
+            widget.$image.css('float', 'right');
+            jQuery('#hallo_img_properties #hallo_img_unfloat').removeAttr('checked');
+            return jQuery('#hallo_img_properties #hallo_img_float_left').removeAttr('checked');
+          });
+          return jQuery('#hallo_img_properties #hallo_img_unfloat').click(function() {
+            if (!this.checked) {
+              return false;
+            }
+            widget.$image.css('float', 'none');
+            jQuery('#hallo_img_properties #hallo_img_float_right').removeAttr('checked');
+            return jQuery('#hallo_img_properties #hallo_img_float_left').removeAttr('checked');
+          });
+        } else {
+          if (!this.options.insert_file_dialog_ui_url) {
+            button = "<button id=\"insert_image_btn\">" + this.texts.insert + "</button>";
+            $img_properties.after(button);
+            return jQuery('#insert_image_btn').click(function() {
+              var $img_source;
+              $img_source = jQuery('#hallo_img_properties #hallo_img_source');
+              return widget._insert_image($img_source.val());
+            });
+          }
+        }
+      },
+      _property_col_html: function(col_html) {
+        return "<div class='hallo_img_property_col'>" + col_html + "</div>";
+      },
+      _property_row_html: function(row_html, label) {
+        if (label == null) {
+          label = '';
+        }
+        row_html = this._property_col_html(label) + this._property_col_html(row_html);
+        return "<div class='hallo_img_property_row'>" + row_html + "</div>";
+      },
+      _property_html: function(property_html, options) {
+        var entry;
+        if (options == null) {
+          options = {};
+        }
+        if (options.row === false) {
+          if (options.label) {
+            entry = "" + options.label + " " + property_html;
+            property_html = "<span class='img_property_entry'>" + entry + "</span>";
+          }
+          return property_html;
+        } else {
+          entry = "<span class='img_property_entry'>" + property_html + "</span>";
+          return this._property_row_html(entry, options.label);
+        }
+      },
+      _property_input_html: function(id, value, options) {
+        var text_field;
+        if (options == null) {
+          options = {};
+        }
+        text_field = "<input type='text' id='hallo_img_" + id + "' value='" + value + "'>";
+        return this._property_html(text_field, options);
+      },
+      _property_cb_html: function(id, checked, options) {
+        var cb, checked_attr;
+        if (options == null) {
+          options = {};
+        }
+        checked_attr = checked ? 'checked=checked' : '';
+        cb = "<input type='checkbox' id='hallo_img_" + id + "' " + checked_attr + "'>";
+        return this._property_html(cb, options);
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget('IKS.halloindicator', {
+      options: {
+        editable: null,
+        className: 'halloEditIndicator'
+      },
+      _create: function() {
+        var _this = this;
+        return this.element.on('halloenabled', function() {
+          return _this.buildIndicator();
+        });
+      },
+      populateToolbar: function() {},
+      buildIndicator: function() {
+        var editButton;
+        editButton = jQuery('<div><i class="icon-edit"></i> Edit</div>');
+        editButton.addClass(this.options.className);
+        editButton.hide();
+        this.element.before(editButton);
+        this.bindIndicator(editButton);
+        return this.setIndicatorPosition(editButton);
+      },
+      bindIndicator: function(indicator) {
+        var _this = this;
+        indicator.on('click', function() {
+          return _this.options.editable.element.focus();
+        });
+        this.element.on('halloactivated', function() {
+          return indicator.hide();
+        });
+        this.element.on('hallodisabled', function() {
+          return indicator.remove();
+        });
+        return this.options.editable.element.hover(function() {
+          if (jQuery(this).hasClass('inEditMode')) {
+            return;
+          }
+          return indicator.show();
+        }, function(data) {
+          if (jQuery(this).hasClass('inEditMode')) {
+            return;
+          }
+          if (data.relatedTarget === indicator.get(0)) {
+            return;
+          }
+          return indicator.hide();
+        });
+      },
+      setIndicatorPosition: function(indicator) {
+        var offset;
+        indicator.css('position', 'absolute');
+        offset = this.element.position();
+        indicator.css('top', offset.top + 2);
+        return indicator.css('left', offset.left + 2);
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
   (function(jQuery) {
     return jQuery.widget("IKS.hallojustify", {
       options: {
@@ -2031,35 +2263,324 @@
     });
   })(jQuery);
 
+}).call(this);
+
+(function() {
   (function(jQuery) {
-    return jQuery.widget('IKS.halloblacklist', {
+    return jQuery.widget("IKS.hallolink", {
       options: {
-        tags: []
+        editable: null,
+        uuid: "",
+        link: true,
+        image: true,
+        defaultUrl: 'http://',
+        dialogOpts: {
+          autoOpen: false,
+          width: 540,
+          height: 200,
+          title: "Enter Link",
+          buttonTitle: "Insert",
+          buttonUpdateTitle: "Update",
+          modal: true,
+          resizable: false,
+          draggable: false,
+          dialogClass: 'hallolink-dialog'
+        },
+        buttonCssClass: null
       },
-      _init: function() {
-        if (this.options.tags.indexOf('br') !== -1) {
-          return this.element.on('keydown', function(event) {
-            if (event.originalEvent.keyCode === 13) {
-              return event.preventDefault();
+      populateToolbar: function(toolbar) {
+        var butTitle, butUpdateTitle, buttonize, buttonset, dialog, dialogId, dialogSubmitCb, isEmptyLink, urlInput, widget,
+          _this = this;
+        widget = this;
+        dialogId = "" + this.options.uuid + "-dialog";
+        butTitle = this.options.dialogOpts.buttonTitle;
+        butUpdateTitle = this.options.dialogOpts.buttonUpdateTitle;
+        dialog = jQuery("<div id=\"" + dialogId + "\">        <form action=\"#\" method=\"post\" class=\"linkForm\">          <input class=\"url\" type=\"text\" name=\"url\"            value=\"" + this.options.defaultUrl + "\" />          <input type=\"submit\" id=\"addlinkButton\" value=\"" + butTitle + "\"/>        </form></div>");
+        urlInput = jQuery('input[name=url]', dialog);
+        isEmptyLink = function(link) {
+          if ((new RegExp(/^\s*$/)).test(link)) {
+            return true;
+          }
+          if (link === widget.options.defaultUrl) {
+            return true;
+          }
+          return false;
+        };
+        dialogSubmitCb = function(event) {
+          var link, linkNode;
+          event.preventDefault();
+          link = urlInput.val();
+          dialog.dialog('close');
+          widget.options.editable.restoreSelection(widget.lastSelection);
+          if (isEmptyLink(link)) {
+            document.execCommand("unlink", null, "");
+          } else {
+            if (!(/:\/\//.test(link)) && !(/^mailto:/.test(link))) {
+              link = 'http://' + link;
             }
+            if (widget.lastSelection.startContainer.parentNode.href === void 0) {
+              if (widget.lastSelection.collapsed) {
+                linkNode = jQuery("<a href='" + link + "'>" + link + "</a>")[0];
+                widget.lastSelection.insertNode(linkNode);
+              } else {
+                document.execCommand("createLink", null, link);
+              }
+            } else {
+              widget.lastSelection.startContainer.parentNode.href = link;
+            }
+          }
+          widget.options.editable.element.trigger('change');
+          return false;
+        };
+        dialog.find("input[type=submit]").click(dialogSubmitCb);
+        buttonset = jQuery("<span class=\"" + widget.widgetName + "\"></span>");
+        buttonize = function(type) {
+          var button, buttonHolder, id;
+          id = "" + _this.options.uuid + "-" + type;
+          buttonHolder = jQuery('<span></span>');
+          buttonHolder.hallobutton({
+            label: 'Link',
+            icon: 'icon-link',
+            editable: _this.options.editable,
+            command: null,
+            queryState: false,
+            uuid: _this.options.uuid,
+            cssClass: _this.options.buttonCssClass
           });
+          buttonset.append(buttonHolder);
+          button = buttonHolder;
+          button.on("click", function(event) {
+            var button_selector, selectionParent;
+            widget.lastSelection = widget.options.editable.getSelection();
+            urlInput = jQuery('input[name=url]', dialog);
+            selectionParent = widget.lastSelection.startContainer.parentNode;
+            if (!selectionParent.href) {
+              urlInput.val(widget.options.defaultUrl);
+              jQuery(urlInput[0].form).find('input[type=submit]').val(butTitle);
+            } else {
+              urlInput.val(jQuery(selectionParent).attr('href'));
+              button_selector = 'input[type=submit]';
+              jQuery(urlInput[0].form).find(button_selector).val(butUpdateTitle);
+            }
+            widget.options.editable.keepActivated(true);
+            dialog.dialog('open');
+            dialog.on('dialogclose', function() {
+              widget.options.editable.restoreSelection(widget.lastSelection);
+              jQuery('label', buttonHolder).removeClass('ui-state-active');
+              widget.options.editable.element.focus();
+              return widget.options.editable.keepActivated(false);
+            });
+            return false;
+          });
+          return _this.element.on("keyup paste change mouseup", function(event) {
+            var nodeName, start;
+            start = jQuery(widget.options.editable.getSelection().startContainer);
+            if (start.prop('nodeName')) {
+              nodeName = start.prop('nodeName');
+            } else {
+              nodeName = start.parent().prop('nodeName');
+            }
+            if (nodeName && nodeName.toUpperCase() === "A") {
+              jQuery('label', button).addClass('ui-state-active');
+              return;
+            }
+            return jQuery('label', button).removeClass('ui-state-active');
+          });
+        };
+        if (this.options.link) {
+          buttonize("A");
         }
-      },
-      cleanupContentClone: function(el) {
-        var tag, _i, _len, _ref, _results;
-        _ref = this.options.tags;
-        _results = [];
-        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-          tag = _ref[_i];
-          _results.push(jQuery(tag, el).remove());
+        if (this.options.link) {
+          toolbar.append(buttonset);
+          buttonset.hallobuttonset();
+          return dialog.dialog(this.options.dialogOpts);
         }
-        return _results;
       }
     });
   })(jQuery);
 
+}).call(this);
+
+(function() {
   (function(jQuery) {
-    return jQuery.widget("Liip.hallotoolbarlinebreak", {
+    return jQuery.widget("IKS.hallolists", {
+      options: {
+        editable: null,
+        toolbar: null,
+        uuid: '',
+        lists: {
+          ordered: true,
+          unordered: true
+        },
+        buttonCssClass: null
+      },
+      populateToolbar: function(toolbar) {
+        var buttonize, buttonset,
+          _this = this;
+        buttonset = jQuery("<span class=\"" + this.widgetName + "\"></span>");
+        buttonize = function(type, label) {
+          var buttonElement;
+          buttonElement = jQuery('<span></span>');
+          buttonElement.hallobutton({
+            uuid: _this.options.uuid,
+            editable: _this.options.editable,
+            label: label,
+            command: "insert" + type + "List",
+            icon: "icon-list-" + (label.toLowerCase()),
+            cssClass: _this.options.buttonCssClass
+          });
+          return buttonset.append(buttonElement);
+        };
+        if (this.options.lists.ordered) {
+          buttonize("Ordered", "OL");
+        }
+        if (this.options.lists.unordered) {
+          buttonize("Unordered", "UL");
+        }
+        buttonset.hallobuttonset();
+        return toolbar.append(buttonset);
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget("IKS.hallooverlay", {
+      options: {
+        editable: null,
+        toolbar: null,
+        uuid: "",
+        overlay: null,
+        padding: 10,
+        background: null
+      },
+      _create: function() {
+        var widget;
+        widget = this;
+        if (!this.options.bound) {
+          this.options.bound = true;
+          this.options.editable.element.on("halloactivated", function(event, data) {
+            widget.options.currentEditable = jQuery(event.target);
+            if (!widget.options.visible) {
+              return widget.showOverlay();
+            }
+          });
+          this.options.editable.element.on("hallomodified", function(event, data) {
+            widget.options.currentEditable = jQuery(event.target);
+            if (widget.options.visible) {
+              return widget.resizeOverlay();
+            }
+          });
+          return this.options.editable.element.on("hallodeactivated", function(event, data) {
+            widget.options.currentEditable = jQuery(event.target);
+            if (widget.options.visible) {
+              return widget.hideOverlay();
+            }
+          });
+        }
+      },
+      showOverlay: function() {
+        this.options.visible = true;
+        if (this.options.overlay === null) {
+          if (jQuery("#halloOverlay").length > 0) {
+            this.options.overlay = jQuery("#halloOverlay");
+          } else {
+            this.options.overlay = jQuery("<div id=\"halloOverlay\"            class=\"halloOverlay\">");
+            jQuery(document.body).append(this.options.overlay);
+          }
+          this.options.overlay.on('click', jQuery.proxy(this.options.editable.turnOff, this.options.editable));
+        }
+        this.options.overlay.show();
+        if (this.options.background === null) {
+          if (jQuery("#halloBackground").length > 0) {
+            this.options.background = jQuery("#halloBackground");
+          } else {
+            this.options.background = jQuery("<div id=\"halloBackground\"            class=\"halloBackground\">");
+            jQuery(document.body).append(this.options.background);
+          }
+        }
+        this.resizeOverlay();
+        this.options.background.show();
+        if (!this.options.originalZIndex) {
+          this.options.originalZIndex = this.options.currentEditable.css("z-index");
+        }
+        return this.options.currentEditable.css('z-index', '350');
+      },
+      resizeOverlay: function() {
+        var offset;
+        offset = this.options.currentEditable.offset();
+        return this.options.background.css({
+          top: offset.top - this.options.padding,
+          left: offset.left - this.options.padding,
+          width: this.options.currentEditable.width() + 2 * this.options.padding,
+          height: this.options.currentEditable.height() + 2 * this.options.padding
+        });
+      },
+      hideOverlay: function() {
+        this.options.visible = false;
+        this.options.overlay.hide();
+        this.options.background.hide();
+        return this.options.currentEditable.css('z-index', this.options.originalZIndex);
+      },
+      _findBackgroundColor: function(jQueryfield) {
+        var color;
+        color = jQueryfield.css("background-color");
+        if (color !== 'rgba(0, 0, 0, 0)' && color !== 'transparent') {
+          return color;
+        }
+        if (jQueryfield.is("body")) {
+          return "white";
+        } else {
+          return this._findBackgroundColor(jQueryfield.parent());
+        }
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget("IKS.halloreundo", {
+      options: {
+        editable: null,
+        toolbar: null,
+        uuid: '',
+        buttonCssClass: null
+      },
+      populateToolbar: function(toolbar) {
+        var buttonize, buttonset,
+          _this = this;
+        buttonset = jQuery("<span class=\"" + this.widgetName + "\"></span>");
+        buttonize = function(cmd, label) {
+          var buttonElement;
+          buttonElement = jQuery('<span></span>');
+          buttonElement.hallobutton({
+            uuid: _this.options.uuid,
+            editable: _this.options.editable,
+            label: label,
+            icon: cmd === 'undo' ? 'icon-undo' : 'icon-repeat',
+            command: cmd,
+            queryState: false,
+            cssClass: _this.options.buttonCssClass
+          });
+          return buttonset.append(buttonElement);
+        };
+        buttonize("undo", "Undo");
+        buttonize("redo", "Redo");
+        buttonset.hallobuttonset();
+        return toolbar.append(buttonset);
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget("IKS.hallotoolbarlinebreak", {
       options: {
         editable: null,
         uuid: "",
@@ -2095,226 +2616,139 @@
     });
   })(jQuery);
 
+}).call(this);
+
+(function() {
   (function(jQuery) {
-    jQuery.widget('IKS.hallobutton', {
-      button: null,
-      isChecked: false,
+    return jQuery.widget('IKS.halloToolbarContextual', {
+      toolbar: null,
       options: {
-        uuid: '',
-        label: null,
-        icon: null,
+        parentElement: 'body',
         editable: null,
-        command: null,
-        commandValue: null,
-        queryState: true,
-        cssClass: null
+        toolbar: null,
+        positionAbove: false
       },
       _create: function() {
-        var hoverclass, id, opts, _base, _ref,
-          _this = this;
-        if ((_ref = (_base = this.options).icon) == null) {
-          _base.icon = "icon-" + (this.options.label.toLowerCase());
-        }
-        id = "" + this.options.uuid + "-" + this.options.label;
-        opts = this.options;
-        this.button = this._createButton(id, opts.command, opts.label, opts.icon);
-        this.element.append(this.button);
-        if (this.options.cssClass) {
-          this.button.addClass(this.options.cssClass);
-        }
-        if (this.options.editable.options.touchScreen) {
-          this.button.addClass('btn-large');
-        }
-        this.button.data('hallo-command', this.options.command);
-        if (this.options.commandValue) {
-          this.button.data('hallo-command-value', this.options.commandValue);
-        }
-        hoverclass = 'ui-state-hover';
-        this.button.on('mouseenter', function(event) {
-          if (_this.isEnabled()) {
-            return _this.button.addClass(hoverclass);
-          }
-        });
-        return this.button.on('mouseleave', function(event) {
-          return _this.button.removeClass(hoverclass);
+        var _this = this;
+        this.toolbar = this.options.toolbar;
+        jQuery(this.options.parentElement).append(this.toolbar);
+        this._bindEvents();
+        return jQuery(window).resize(function(event) {
+          return _this._updatePosition(_this._getPosition(event));
         });
       },
-      _init: function() {
-        var editableElement, events, queryState,
-          _this = this;
-        if (!this.button) {
-          this.button = this._prepareButton();
-        }
-        this.element.append(this.button);
-        if (this.options.queryState === true) {
-          queryState = function(event) {
-            var compared, value;
-            if (!_this.options.command) {
-              return;
-            }
-            try {
-              if (_this.options.commandValue) {
-                value = document.queryCommandValue(_this.options.command);
-                compared = value.match(new RegExp(_this.options.commandValue, "i"));
-                return _this.checked(compared ? true : false);
-              } else {
-                return _this.checked(document.queryCommandState(_this.options.command));
-              }
-            } catch (e) {
-
-            }
-          };
-        } else {
-          queryState = this.options.queryState;
-        }
-        if (this.options.command) {
-          this.button.on('click', function(event) {
-            if (_this.options.commandValue) {
-              _this.options.editable.execute(_this.options.command, _this.options.commandValue);
-            } else {
-              _this.options.editable.execute(_this.options.command);
-            }
-            queryState();
-            return false;
-          });
-        }
-        if (!this.options.queryState) {
+      _getPosition: function(event, selection) {
+        var eventType, position;
+        if (!event) {
           return;
         }
-        editableElement = this.options.editable.element;
-        events = 'keyup paste change mouseup hallomodified';
-        editableElement.on(events, queryState);
-        editableElement.on('halloenabled', function() {
-          return editableElement.on(events, queryState);
-        });
-        return editableElement.on('hallodisabled', function() {
-          return editableElement.off(events, queryState);
-        });
+        eventType = event.type;
+        switch (eventType) {
+          case 'keydown':
+          case 'keyup':
+          case 'keypress':
+            return this._getCaretPosition(selection);
+          case 'click':
+          case 'mousedown':
+          case 'mouseup':
+            return position = {
+              top: event.pageY,
+              left: event.pageX
+            };
+        }
       },
-      enable: function() {
-        return this.button.removeAttr('disabled');
+      _getCaretPosition: function(range) {
+        var newRange, position, tmpSpan;
+        tmpSpan = jQuery("<span/>");
+        newRange = rangy.createRange();
+        newRange.setStart(range.endContainer, range.endOffset);
+        newRange.insertNode(tmpSpan.get(0));
+        position = {
+          top: tmpSpan.offset().top,
+          left: tmpSpan.offset().left
+        };
+        tmpSpan.remove();
+        return position;
       },
-      disable: function() {
-        return this.button.attr('disabled', 'true');
+      setPosition: function() {
+        if (this.options.parentElement !== 'body') {
+          this.options.parentElement = 'body';
+          jQuery(this.options.parentElement).append(this.toolbar);
+        }
+        this.toolbar.css('position', 'absolute');
+        this.toolbar.css('top', this.element.offset().top - 20);
+        return this.toolbar.css('left', this.element.offset().left);
       },
-      isEnabled: function() {
-        return this.button.attr('disabled') !== 'true';
-      },
-      refresh: function() {
-        if (this.isChecked) {
-          return this.button.addClass('ui-state-active');
+      _updatePosition: function(position, selection) {
+        var left, selectionRect, toolbar_height_offset, top, top_offset;
+        if (selection == null) {
+          selection = null;
+        }
+        if (!position) {
+          return;
+        }
+        if (!(position.top && position.left)) {
+          return;
+        }
+        toolbar_height_offset = this.toolbar.outerHeight() + 10;
+        if (selection && !selection.collapsed && selection.nativeRange) {
+          selectionRect = selection.nativeRange.getBoundingClientRect();
+          if (this.options.positionAbove) {
+            top_offset = selectionRect.top - toolbar_height_offset;
+          } else {
+            top_offset = selectionRect.bottom + 10;
+          }
+          top = jQuery(window).scrollTop() + top_offset;
+          left = jQuery(window).scrollLeft() + selectionRect.left;
         } else {
-          return this.button.removeClass('ui-state-active');
+          if (this.options.positionAbove) {
+            top_offset = -10 - toolbar_height_offset;
+          } else {
+            top_offset = 20;
+          }
+          top = position.top + top_offset;
+          left = position.left - this.toolbar.outerWidth() / 2 + 30;
         }
+        this.toolbar.css('top', top);
+        return this.toolbar.css('left', left);
       },
-      checked: function(checked) {
-        this.isChecked = checked;
-        return this.refresh();
-      },
-      _createButton: function(id, command, label, icon) {
-        var classes;
-        classes = ['ui-button', 'ui-widget', 'ui-state-default', 'ui-corner-all', 'ui-button-text-only', "" + command + "_button"];
-        return jQuery("<button id=\"" + id + "\"        class=\"" + (classes.join(' ')) + "\" title=\"" + label + "\">          <span class=\"ui-button-text\">            <i class=\"" + icon + "\"></i>          </span>        </button>");
-      }
-    });
-    return jQuery.widget('IKS.hallobuttonset', {
-      buttons: null,
-      _create: function() {
-        return this.element.addClass('ui-buttonset');
-      },
-      _init: function() {
-        return this.refresh();
-      },
-      refresh: function() {
-        var rtl;
-        rtl = this.element.css('direction') === 'rtl';
-        this.buttons = this.element.find('.ui-button');
-        this.buttons.removeClass('ui-corner-all ui-corner-left ui-corner-right');
-        if (rtl) {
-          this.buttons.filter(':first').addClass('ui-corner-right');
-          return this.buttons.filter(':last').addClass('ui-corner-left');
-        } else {
-          this.buttons.filter(':first').addClass('ui-corner-left');
-          return this.buttons.filter(':last').addClass('ui-corner-right');
-        }
-      }
-    });
-  })(jQuery);
-
-  (function(jQuery) {
-    return jQuery.widget('IKS.hallodropdownbutton', {
-      button: null,
-      options: {
-        uuid: '',
-        label: null,
-        icon: null,
-        editable: null,
-        target: '',
-        cssClass: null
-      },
-      _create: function() {
-        var _base, _ref;
-        return (_ref = (_base = this.options).icon) != null ? _ref : _base.icon = "icon-" + (this.options.label.toLowerCase());
-      },
-      _init: function() {
-        var target,
-          _this = this;
-        target = jQuery(this.options.target);
-        target.css('position', 'absolute');
-        target.addClass('dropdown-menu');
-        target.hide();
-        if (!this.button) {
-          this.button = this._prepareButton();
-        }
-        this.button.on('click', function() {
-          if (target.hasClass('open')) {
-            _this._hideTarget();
+      _bindEvents: function() {
+        var _this = this;
+        this.element.on('click', function(event, data) {
+          var position, scrollTop;
+          position = {};
+          scrollTop = $('window').scrollTop();
+          position.top = event.clientY + scrollTop;
+          position.left = event.clientX;
+          _this._updatePosition(position, null);
+          if (_this.toolbar.html() !== '') {
+            return _this.toolbar.show();
+          }
+        });
+        this.element.on('halloselected', function(event, data) {
+          var position;
+          position = _this._getPosition(data.originalEvent, data.selection);
+          if (!position) {
             return;
           }
-          return _this._showTarget();
+          _this._updatePosition(position, data.selection);
+          if (_this.toolbar.html() !== '') {
+            return _this.toolbar.show();
+          }
         });
-        target.on('click', function() {
-          return _this._hideTarget();
+        this.element.on('hallounselected', function(event, data) {
+          return _this.toolbar.hide();
         });
-        this.options.editable.element.on('hallodeactivated', function() {
-          return _this._hideTarget();
+        return this.element.on('hallodeactivated', function(event, data) {
+          return _this.toolbar.hide();
         });
-        return this.element.append(this.button);
-      },
-      _showTarget: function() {
-        var target;
-        target = jQuery(this.options.target);
-        this._updateTargetPosition();
-        target.addClass('open');
-        return target.show();
-      },
-      _hideTarget: function() {
-        var target;
-        target = jQuery(this.options.target);
-        target.removeClass('open');
-        return target.hide();
-      },
-      _updateTargetPosition: function() {
-        var left, target, top, _ref;
-        target = jQuery(this.options.target);
-        _ref = this.button.position(), top = _ref.top, left = _ref.left;
-        top += this.button.outerHeight();
-        target.css('top', top);
-        return target.css('left', left - 20);
-      },
-      _prepareButton: function() {
-        var buttonEl, classes, id;
-        id = "" + this.options.uuid + "-" + this.options.label;
-        classes = ['ui-button', 'ui-widget', 'ui-state-default', 'ui-corner-all', 'ui-button-text-only'];
-        buttonEl = jQuery("<button id=\"" + id + "\"       class=\"" + (classes.join(' ')) + "\" title=\"" + this.options.label + "\">       <span class=\"ui-button-text\"><i class=\"" + this.options.icon + "\"></i></span>       </button>");
-        if (this.options.cssClass) {
-          buttonEl.addClass(this.options.cssClass);
-        }
-        return buttonEl;
       }
     });
   })(jQuery);
 
+}).call(this);
+
+(function() {
   (function(jQuery) {
     return jQuery.widget('IKS.halloToolbarFixed', {
       toolbar: null,
@@ -2411,8 +2845,11 @@
     });
   })(jQuery);
 
+}).call(this);
+
+(function() {
   (function(jQuery) {
-    return jQuery.widget('IKS.halloToolbarContextual', {
+    return jQuery.widget('IKS.halloToolbarInstant', {
       toolbar: null,
       options: {
         parentElement: 'body',
@@ -2506,6 +2943,17 @@
       },
       _bindEvents: function() {
         var _this = this;
+        this.element.on('click', function(event, data) {
+          var position, scrollTop;
+          position = {};
+          scrollTop = $('window').scrollTop();
+          position.top = event.clientY + scrollTop;
+          position.left = event.clientX;
+          _this._updatePosition(position, null);
+          if (_this.toolbar.html() !== '') {
+            return _this.toolbar.show();
+          }
+        });
         this.element.on('halloselected', function(event, data) {
           var position;
           position = _this._getPosition(data.originalEvent, data.selection);
@@ -2527,423 +2975,232 @@
     });
   })(jQuery);
 
-  /*
-  Hallo 1.0.2 - a rich text editing jQuery UI widget
-  (c) 2011 Henri Bergius, IKS Consortium
-  Hallo may be freely distributed under the MIT license
-  http://hallojs.org
-  */
-
+}).call(this);
 
+(function() {
   (function(jQuery) {
-    return jQuery.widget('IKS.hallo', {
-      toolbar: null,
-      bound: false,
-      originalContent: '',
-      previousContent: '',
-      uuid: '',
-      selection: null,
-      _keepActivated: false,
-      originalHref: null,
+    jQuery.widget('IKS.hallobutton', {
+      button: null,
+      isChecked: false,
       options: {
-        editable: true,
-        plugins: {},
-        toolbar: 'halloToolbarContextual',
-        parentElement: 'body',
-        buttonCssClass: null,
-        toolbarCssClass: null,
-        toolbarPositionAbove: false,
-        toolbarOptions: {},
-        placeholder: '',
-        forceStructured: true,
-        checkTouch: true,
-        touchScreen: null
+        uuid: '',
+        label: null,
+        icon: null,
+        editable: null,
+        command: null,
+        commandValue: null,
+        queryState: true,
+        cssClass: null
       },
       _create: function() {
-        var options, plugin, _ref,
+        var hoverclass, id, opts, _base,
           _this = this;
-        this.id = this._generateUUID();
-        if (this.options.checkTouch && this.options.touchScreen === null) {
-          this.checkTouch();
+        if ((_base = this.options).icon == null) {
+          _base.icon = "icon-" + (this.options.label.toLowerCase());
         }
-        _ref = this.options.plugins;
-        for (plugin in _ref) {
-          options = _ref[plugin];
-          if (!jQuery.isPlainObject(options)) {
-            options = {};
+        id = "" + this.options.uuid + "-" + this.options.label;
+        opts = this.options;
+        this.button = this._createButton(id, opts.command, opts.label, opts.icon);
+        this.element.append(this.button);
+        if (this.options.cssClass) {
+          this.button.addClass(this.options.cssClass);
+        }
+        if (this.options.editable.options.touchScreen) {
+          this.button.addClass('btn-large');
+        }
+        this.button.data('hallo-command', this.options.command);
+        if (this.options.commandValue) {
+          this.button.data('hallo-command-value', this.options.commandValue);
+        }
+        hoverclass = 'ui-state-hover';
+        this.button.on('mouseenter', function(event) {
+          if (_this.isEnabled()) {
+            return _this.button.addClass(hoverclass);
           }
-          jQuery.extend(options, {
-            editable: this,
-            uuid: this.id,
-            buttonCssClass: this.options.buttonCssClass
-          });
-          jQuery(this.element)[plugin](options);
-        }
-        this.element.one('halloactivated', function() {
-          return _this._prepareToolbar();
         });
-        return this.originalContent = this.getContents();
+        return this.button.on('mouseleave', function(event) {
+          return _this.button.removeClass(hoverclass);
+        });
       },
       _init: function() {
-        if (this.options.editable) {
-          return this.enable();
+        var editableElement, events, queryState,
+          _this = this;
+        if (!this.button) {
+          this.button = this._prepareButton();
+        }
+        this.element.append(this.button);
+        if (this.options.queryState === true) {
+          queryState = function(event) {
+            var compared, e, value;
+            if (!_this.options.command) {
+              return;
+            }
+            try {
+              if (_this.options.commandValue) {
+                value = document.queryCommandValue(_this.options.command);
+                compared = value.match(new RegExp(_this.options.commandValue, "i"));
+                return _this.checked(compared ? true : false);
+              } else {
+                return _this.checked(document.queryCommandState(_this.options.command));
+              }
+            } catch (_error) {
+              e = _error;
+            }
+          };
         } else {
-          return this.disable();
+          queryState = this.options.queryState;
         }
-      },
-      destroy: function() {
-        var options, plugin, _ref;
-        this.disable();
-        if (this.toolbar) {
-          this.toolbar.remove();
-          this.element[this.options.toolbar]('destroy');
+        if (this.options.command) {
+          this.button.on('click', function(event) {
+            if (_this.options.commandValue) {
+              _this.options.editable.execute(_this.options.command, _this.options.commandValue);
+            } else {
+              _this.options.editable.execute(_this.options.command);
+            }
+            if (typeof queryState === 'function') {
+              queryState();
+            }
+            return false;
+          });
         }
-        _ref = this.options.plugins;
-        for (plugin in _ref) {
-          options = _ref[plugin];
-          jQuery(this.element)[plugin]('destroy');
+        if (!this.options.queryState) {
+          return;
         }
-        return jQuery.Widget.prototype.destroy.call(this);
-      },
-      disable: function() {
-        var _this = this;
-        this.element.attr("contentEditable", false);
-        this.element.off("focus", this._activated);
-        this.element.off("blur", this._deactivated);
-        this.element.off("keyup paste change", this._checkModified);
-        this.element.off("keyup", this._keys);
-        this.element.off("keyup mouseup", this._checkSelection);
-        this.bound = false;
-        jQuery(this.element).removeClass('isModified');
-        jQuery(this.element).removeClass('inEditMode');
-        this.element.parents('a').andSelf().each(function(idx, elem) {
-          var element;
-          element = jQuery(elem);
-          if (!element.is('a')) {
-            return;
-          }
-          if (!_this.originalHref) {
-            return;
-          }
-          return element.attr('href', _this.originalHref);
+        editableElement = this.options.editable.element;
+        events = 'keyup paste change mouseup hallomodified';
+        editableElement.on(events, queryState);
+        editableElement.on('halloenabled', function() {
+          return editableElement.on(events, queryState);
+        });
+        return editableElement.on('hallodisabled', function() {
+          return editableElement.off(events, queryState);
         });
-        return this._trigger("disabled", null);
       },
       enable: function() {
-        var _this = this;
-        this.element.parents('a[href]').andSelf().each(function(idx, elem) {
-          var element;
-          element = jQuery(elem);
-          if (!element.is('a[href]')) {
-            return;
-          }
-          _this.originalHref = element.attr('href');
-          return element.removeAttr('href');
-        });
-        this.element.attr("contentEditable", true);
-        if (!this.element.html().trim()) {
-          this.element.html(this.options.placeholder);
-          this.element.css({
-            'min-width': this.element.innerWidth(),
-            'min-height': this.element.innerHeight()
-          });
-        }
-        if (!this.bound) {
-          this.element.on("focus", this, this._activated);
-          this.element.on("blur", this, this._deactivated);
-          this.element.on("keyup paste change", this, this._checkModified);
-          this.element.on("keyup", this, this._keys);
-          this.element.on("keyup mouseup", this, this._checkSelection);
-          this.bound = true;
-        }
-        if (this.options.forceStructured) {
-          this._forceStructured();
-        }
-        return this._trigger("enabled", null);
+        return this.button.removeAttr('disabled');
       },
-      activate: function() {
-        return this.element.focus();
+      disable: function() {
+        return this.button.attr('disabled', 'true');
       },
-      containsSelection: function() {
-        var range;
-        range = this.getSelection();
-        return this.element.has(range.startContainer).length > 0;
+      isEnabled: function() {
+        return this.button.attr('disabled') !== 'true';
       },
-      getSelection: function() {
-        var range, sel;
-        sel = rangy.getSelection();
-        range = null;
-        if (sel.rangeCount > 0) {
-          range = sel.getRangeAt(0);
+      refresh: function() {
+        if (this.isChecked) {
+          return this.button.addClass('ui-state-active');
         } else {
-          range = rangy.createRange();
+          return this.button.removeClass('ui-state-active');
         }
-        return range;
       },
-      restoreSelection: function(range) {
-        var sel;
-        sel = rangy.getSelection();
-        return sel.setSingleRange(range);
+      checked: function(checked) {
+        this.isChecked = checked;
+        return this.refresh();
       },
-      replaceSelection: function(cb) {
-        var newTextNode, r, range, sel, t;
-        if (navigator.appName === 'Microsoft Internet Explorer') {
-          t = document.selection.createRange().text;
-          r = document.selection.createRange();
-          return r.pasteHTML(cb(t));
+      _createButton: function(id, command, label, icon) {
+        var classes;
+        classes = ['ui-button', 'ui-widget', 'ui-state-default', 'ui-corner-all', 'ui-button-text-only', "" + command + "_button"];
+        return jQuery("<button id=\"" + id + "\"        class=\"" + (classes.join(' ')) + "\" title=\"" + label + "\">          <span class=\"ui-button-text\">            <i class=\"" + icon + "\"></i>          </span>        </button>");
+      }
+    });
+    return jQuery.widget('IKS.hallobuttonset', {
+      buttons: null,
+      _create: function() {
+        return this.element.addClass('ui-buttonset');
+      },
+      _init: function() {
+        return this.refresh();
+      },
+      refresh: function() {
+        var rtl;
+        rtl = this.element.css('direction') === 'rtl';
+        this.buttons = this.element.find('.ui-button');
+        this.buttons.removeClass('ui-corner-all ui-corner-left ui-corner-right');
+        if (rtl) {
+          this.buttons.filter(':first').addClass('ui-corner-right');
+          return this.buttons.filter(':last').addClass('ui-corner-left');
         } else {
-          sel = window.getSelection();
-          range = sel.getRangeAt(0);
-          newTextNode = document.createTextNode(cb(range.extractContents()));
-          range.insertNode(newTextNode);
-          range.setStartAfter(newTextNode);
-          sel.removeAllRanges();
-          return sel.addRange(range);
+          this.buttons.filter(':first').addClass('ui-corner-left');
+          return this.buttons.filter(':last').addClass('ui-corner-right');
         }
-      },
-      removeAllSelections: function() {
-        if (navigator.appName === 'Microsoft Internet Explorer') {
-          return range.empty();
-        } else {
-          return window.getSelection().removeAllRanges();
-        }
-      },
-      getContents: function() {
-        var cleanup, contentClone, plugin;
-        contentClone = this.element.clone();
-        for (plugin in this.options.plugins) {
-          cleanup = jQuery(this.element).data('IKS-' + plugin).cleanupContentClone;
-          if (!jQuery.isFunction(cleanup)) {
-            continue;
-          }
-          jQuery(this.element)[plugin]('cleanupContentClone', contentClone);
-        }
-        return contentClone.html();
-      },
-      setContents: function(contents) {
-        return this.element.html(contents);
-      },
-      isModified: function() {
-        if (!this.previousContent) {
-          this.previousContent = this.originalContent;
-        }
-        return this.previousContent !== this.getContents();
-      },
-      setUnmodified: function() {
-        jQuery(this.element).removeClass('isModified');
-        return this.previousContent = this.getContents();
-      },
-      setModified: function() {
-        jQuery(this.element).addClass('isModified');
-        return this._trigger('modified', null, {
-          editable: this,
-          content: this.getContents()
-        });
-      },
-      restoreOriginalContent: function() {
-        return this.element.html(this.originalContent);
-      },
-      execute: function(command, value) {
-        if (document.execCommand(command, false, value)) {
-          return this.element.trigger("change");
-        }
-      },
-      protectFocusFrom: function(el) {
-        var _this = this;
-        return el.on("mousedown", function(event) {
-          event.preventDefault();
-          _this._protectToolbarFocus = true;
-          return setTimeout(function() {
-            return _this._protectToolbarFocus = false;
-          }, 300);
-        });
-      },
-      keepActivated: function(_keepActivated) {
-        this._keepActivated = _keepActivated;
-      },
-      _generateUUID: function() {
-        var S4;
-        S4 = function() {
-          return ((1 + Math.random()) * 0x10000 | 0).toString(16).substring(1);
-        };
-        return "" + (S4()) + (S4()) + "-" + (S4()) + "-" + (S4()) + "-" + (S4()) + "-" + (S4()) + (S4()) + (S4());
-      },
-      _prepareToolbar: function() {
-        var defaults, plugin, populate, toolbarOptions;
-        this.toolbar = jQuery('<div class="hallotoolbar"></div>').hide();
-        if (this.options.toolbarCssClass) {
-          this.toolbar.addClass(this.options.toolbarCssClass);
-        }
-        defaults = {
-          editable: this,
-          parentElement: this.options.parentElement,
-          toolbar: this.toolbar,
-          positionAbove: this.options.toolbarPositionAbove
-        };
-        toolbarOptions = $.extend({}, defaults, this.options.toolbarOptions);
-        this.element[this.options.toolbar](toolbarOptions);
-        for (plugin in this.options.plugins) {
-          populate = jQuery(this.element).data('IKS-' + plugin).populateToolbar;
-          if (!jQuery.isFunction(populate)) {
-            continue;
-          }
-          this.element[plugin]('populateToolbar', this.toolbar);
-        }
-        this.element[this.options.toolbar]('setPosition');
-        return this.protectFocusFrom(this.toolbar);
-      },
-      changeToolbar: function(element, toolbar, hide) {
-        var originalToolbar;
-        if (hide == null) {
-          hide = false;
-        }
-        originalToolbar = this.options.toolbar;
-        this.options.parentElement = element;
-        if (toolbar) {
-          this.options.toolbar = toolbar;
-        }
-        if (!this.toolbar) {
-          return;
-        }
-        this.element[originalToolbar]('destroy');
-        this.toolbar.remove();
-        this._prepareToolbar();
-        if (hide) {
-          return this.toolbar.hide();
-        }
-      },
-      _checkModified: function(event) {
-        var widget;
-        widget = event.data;
-        if (widget.isModified()) {
-          return widget.setModified();
-        }
-      },
-      _keys: function(event) {
-        var old, widget;
-        widget = event.data;
-        if (event.keyCode === 27) {
-          old = widget.getContents();
-          widget.restoreOriginalContent(event);
-          widget._trigger("restored", null, {
-            editable: widget,
-            content: widget.getContents(),
-            thrown: old
-          });
-          return widget.turnOff();
-        }
-      },
-      _rangesEqual: function(r1, r2) {
-        if (r1.startContainer !== r2.startContainer) {
-          return false;
-        }
-        if (r1.startOffset !== r2.startOffset) {
-          return false;
-        }
-        if (r1.endContainer !== r2.endContainer) {
-          return false;
-        }
-        if (r1.endOffset !== r2.endOffset) {
-          return false;
-        }
-        return true;
-      },
-      _checkSelection: function(event) {
-        var widget;
-        if (event.keyCode === 27) {
-          return;
-        }
-        widget = event.data;
-        return setTimeout(function() {
-          var sel;
-          sel = widget.getSelection();
-          if (widget._isEmptySelection(sel) || widget._isEmptyRange(sel)) {
-            if (widget.selection) {
-              widget.selection = null;
-              widget._trigger("unselected", null, {
-                editable: widget,
-                originalEvent: event
-              });
-            }
-            return;
-          }
-          if (!widget.selection || !widget._rangesEqual(sel, widget.selection)) {
-            widget.selection = sel.cloneRange();
-            return widget._trigger("selected", null, {
-              editable: widget,
-              selection: widget.selection,
-              ranges: [widget.selection],
-              originalEvent: event
-            });
-          }
-        }, 0);
-      },
-      _isEmptySelection: function(selection) {
-        if (selection.type === "Caret") {
-          return true;
-        }
-        return false;
-      },
-      _isEmptyRange: function(range) {
-        if (range.collapsed) {
-          return true;
-        }
-        if (range.isCollapsed) {
-          if (typeof range.isCollapsed === 'function') {
-            return range.isCollapsed();
-          }
-          return range.isCollapsed;
-        }
-        return false;
-      },
-      turnOn: function() {
-        if (this.getContents() === this.options.placeholder) {
-          this.setContents('');
-        }
-        jQuery(this.element).addClass('inEditMode');
-        return this._trigger("activated", null, this);
-      },
-      turnOff: function() {
-        jQuery(this.element).removeClass('inEditMode');
-        this._trigger("deactivated", null, this);
-        if (!this.getContents()) {
-          return this.setContents(this.options.placeholder);
-        }
-      },
-      _activated: function(event) {
-        return event.data.turnOn();
-      },
-      _deactivated: function(event) {
-        if (event.data._keepActivated) {
-          return;
-        }
-        if (event.data._protectToolbarFocus !== true) {
-          return event.data.turnOff();
-        } else {
-          return setTimeout(function() {
-            return jQuery(event.data.element).focus();
-          }, 300);
-        }
-      },
-      _forceStructured: function(event) {
-        try {
-          return document.execCommand('styleWithCSS', 0, false);
-        } catch (e) {
-          try {
-            return document.execCommand('useCSS', 0, true);
-          } catch (e) {
-            try {
-              return document.execCommand('styleWithCSS', false, false);
-            } catch (e) {
-
-            }
-          }
-        }
-      },
-      checkTouch: function() {
-        return this.options.touchScreen = !!('createTouch' in document);
       }
     });
   })(jQuery);
 
 }).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget('IKS.hallodropdownbutton', {
+      button: null,
+      options: {
+        uuid: '',
+        label: null,
+        icon: null,
+        editable: null,
+        target: '',
+        cssClass: null
+      },
+      _create: function() {
+        var _base;
+        return (_base = this.options).icon != null ? (_base = this.options).icon : _base.icon = "icon-" + (this.options.label.toLowerCase());
+      },
+      _init: function() {
+        var target,
+          _this = this;
+        target = jQuery(this.options.target);
+        target.css('position', 'absolute');
+        target.addClass('dropdown-menu');
+        target.hide();
+        if (!this.button) {
+          this.button = this._prepareButton();
+        }
+        this.button.on('click', function() {
+          if (target.hasClass('open')) {
+            _this._hideTarget();
+            return;
+          }
+          return _this._showTarget();
+        });
+        target.on('click', function() {
+          return _this._hideTarget();
+        });
+        this.options.editable.element.on('hallodeactivated', function() {
+          return _this._hideTarget();
+        });
+        return this.element.append(this.button);
+      },
+      _showTarget: function() {
+        var target;
+        target = jQuery(this.options.target);
+        this._updateTargetPosition();
+        target.addClass('open');
+        return target.show();
+      },
+      _hideTarget: function() {
+        var target;
+        target = jQuery(this.options.target);
+        target.removeClass('open');
+        return target.hide();
+      },
+      _updateTargetPosition: function() {
+        var left, target, top, _ref;
+        target = jQuery(this.options.target);
+        _ref = this.button.position(), top = _ref.top, left = _ref.left;
+        top += this.button.outerHeight();
+        target.css('top', top);
+        return target.css('left', left - 20);
+      },
+      _prepareButton: function() {
+        var buttonEl, classes, id;
+        id = "" + this.options.uuid + "-" + this.options.label;
+        classes = ['ui-button', 'ui-widget', 'ui-state-default', 'ui-corner-all', 'ui-button-text-only'];
+        buttonEl = jQuery("<button id=\"" + id + "\"       class=\"" + (classes.join(' ')) + "\" title=\"" + this.options.label + "\">       <span class=\"ui-button-text\"><i class=\"" + this.options.icon + "\"></i></span>       </button>");
+        if (this.options.cssClass) {
+          buttonEl.addClass(this.options.cssClass);
+        }
+        return buttonEl;
+      }
+    });
+  })(jQuery);
+
+}).call(this);
\ No newline at end of file

From c3d4ce868cc6d8820f9ca2872f5dc7e52e936c4c Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Tue, 3 Jun 2014 16:57:17 +0100
Subject: [PATCH 17/60] Unit tests for Wagtail admin chooser

---
 wagtail/wagtailadmin/tests/tests.py | 116 ++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)

diff --git a/wagtail/wagtailadmin/tests/tests.py b/wagtail/wagtailadmin/tests/tests.py
index 12aa28a0b..2a0c5e886 100644
--- a/wagtail/wagtailadmin/tests/tests.py
+++ b/wagtail/wagtailadmin/tests/tests.py
@@ -44,3 +44,119 @@ class TestSendEmailTask(TestCase):
         self.assertEqual(mail.outbox[0].subject, "Test subject")
         self.assertEqual(mail.outbox[0].body, "Test content")
         self.assertEqual(mail.outbox[0].to, ["nobody@email.com"])
+
+
+class TestChooserBrowse(TestCase):
+    def setUp(self):
+        self.root_page = Page.objects.get(id=2)
+
+        # Add child page
+        self.child_page = SimplePage()
+        self.child_page.title = "foobarbaz"
+        self.child_page.slug = "foobarbaz"
+        self.root_page.add_child(instance=self.child_page)
+
+        login(self.client)
+
+    def get(self, params={}):
+        return self.client.get(reverse('wagtailadmin_choose_page'), params)
+
+    def test_status_code(self):
+        self.assertEqual(self.get().status_code, 200)
+
+    def test_search(self):
+        response = self.get({'q': "foobarbaz"})
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "There is one match")
+        self.assertContains(response, "foobarbaz")
+
+    def test_search_no_results(self):
+        response = self.get({'q': "quux"})
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "There are 0 matches")
+
+    def test_get_invalid(self):
+        response = self.get({'page_type': 'foo.bar'})
+        self.assertEqual(response.status_code, 404)
+
+
+class TestChooserBrowseChild(TestCase):
+    def setUp(self):
+        self.root_page = Page.objects.get(id=2)
+
+        # Add child page
+        self.child_page = SimplePage()
+        self.child_page.title = "foobarbaz"
+        self.child_page.slug = "foobarbaz"
+        self.root_page.add_child(instance=self.child_page)
+
+        login(self.client)
+
+    def get(self, params={}):
+        return self.client.get(reverse('wagtailadmin_choose_page_child',
+                                       args=(self.root_page.id,)), params)
+
+    def get_invalid(self, params={}):
+        return self.client.get(reverse('wagtailadmin_choose_page_child',
+                                       args=(9999999,)), params)
+
+    def test_status_code(self):
+        self.assertEqual(self.get().status_code, 200)
+
+    def test_search(self):
+        response = self.get({'q': "foobarbaz"})
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "There is one match")
+        self.assertContains(response, "foobarbaz")
+
+    def test_search_no_results(self):
+        response = self.get({'q': "quux"})
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "There are 0 matches")
+
+    def test_get_invalid(self):
+        self.assertEqual(self.get_invalid().status_code, 404)
+
+
+class TestChooserExternalLink(TestCase):
+    def setUp(self):
+        login(self.client)
+
+    def get(self, params={}):
+        return self.client.get(reverse('wagtailadmin_choose_page_external_link'), params)
+
+    def post(self, post_data={}):
+        return self.client.post(reverse('wagtailadmin_choose_page_external_link'), post_data)
+
+    def test_status_code(self):
+        self.assertEqual(self.get().status_code, 200)
+
+    def test_get_with_param(self):
+        self.assertEqual(self.get({'prompt_for_link_text': 'foo'}).status_code, 200)
+
+    def test_create_link(self):
+        request = self.post({'url': 'http://www.example.com'})
+        self.assertContains(request, "'url': 'http://www.example.com/',")
+        self.assertContains(request, "'title': 'http://www.example.com/'")
+
+
+class TestChooserEmailLink(TestCase):
+    def setUp(self):
+        login(self.client)
+
+    def get(self, params={}):
+        return self.client.get(reverse('wagtailadmin_choose_page_email_link'), params)
+
+    def post(self, post_data={}):
+        return self.client.post(reverse('wagtailadmin_choose_page_email_link'), post_data)
+
+    def test_status_code(self):
+        self.assertEqual(self.get().status_code, 200)
+
+    def test_get_with_param(self):
+        self.assertEqual(self.get({'prompt_for_link_text': 'foo'}).status_code, 200)
+
+    def test_create_link(self):
+        request = self.post({'email_address': 'example@example.com'})
+        self.assertContains(request, "'url': 'mailto:example@example.com',")
+        self.assertContains(request, "'title': 'example@example.com'")

From a885c7a56cdc401c063cfe2b6d35e02114f81e26 Mon Sep 17 00:00:00 2001
From: Jeffrey Hearn <jhearn@insidearm.com>
Date: Mon, 2 Jun 2014 13:47:30 -0400
Subject: [PATCH 18/60] Edit API docs expanded with hooks, modelcluster, and
 InlinePanel usage

---
 docs/editing_api.rst   | 270 ++++++++++++++++++++++++++++++++++++++---
 docs/model_recipes.rst |   2 +
 2 files changed, 256 insertions(+), 16 deletions(-)

diff --git a/docs/editing_api.rst b/docs/editing_api.rst
index 99e859437..c06370026 100644
--- a/docs/editing_api.rst
+++ b/docs/editing_api.rst
@@ -211,7 +211,7 @@ You can explicitly link ``Page``-derived models together using the ``Page`` mode
 Snippets
 --------
 
-Snippets are not subclasses, so you must include the model class directly. A chooser is provided which takes the field name snippet class.
+Snippets are vanilla Django models you create yourself without a Wagtail-provided base class. So using them as a field in a page requires specifying your own ``appname.modelname``. A chooser, ``SnippetChooserPanel``, is provided which takes the field name and snippet class.
 
 .. code-block:: python
 
@@ -248,6 +248,12 @@ Full-Width Input
 Use ``classname="full"`` to make a field (input element) stretch the full width of the Wagtail page editor. This will not work if the field is encapsulated in a ``MultiFieldPanel``, which places its child fields into a formset.
 
 
+Titles
+------
+
+Use ``classname="title"`` to make Page's built-in title field stand out with more vertical padding.
+
+
 Required Fields
 ---------------
 
@@ -264,19 +270,11 @@ Without a panel definition, a default form field (without label) will be used to
 .. _Django model field reference (editable): https://docs.djangoproject.com/en/dev/ref/models/fields/#editable
 
 
-
-
-
-
-
-
-
-
-
-
 MultiFieldPanel
 ~~~~~~~~~~~~~~~
 
+The ``MultiFieldPanel`` groups a list of child fields into a fieldset, which can also be collapsed into a heading bar to save space.
+
 .. code-block:: python
 
   BOOK_FIELD_COLLECTION = [
@@ -294,8 +292,7 @@ MultiFieldPanel
     # ...
   ]
 
-
-
+By default, ``MultiFieldPanel`` s are expanded and not collapsible. Adding the classname ``collapsible`` will enable the collapse control. Adding both ``collapsible`` and ``collapsed`` to the classname parameter will load the editor page with the ``MultiFieldPanel`` collapsed under its heading.
 
 
 .. _inline_panels:
@@ -303,7 +300,55 @@ MultiFieldPanel
 Inline Panels and Model Clusters
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The ``django-modelcluster`` module allows for streamlined relation of extra models to a Wagtail page.
+The ``django-modelcluster`` module allows for streamlined relation of extra models to a Wagtail page. For instance, you can create objects related through a ``ForeignKey`` relationship on the fly and save them to a draft revision of a ``Page`` object. Normally, your related objects "cluster" would need to be created beforehand (or asynchronously) before linking them to a Page.
+
+Let's look at the example of adding related links to a ``Page``-derived model. We want to be able to add as many as we like, assign an order, and do all of this without leaving the page editing screen.
+
+.. code-block:: python
+
+  from wagtail.wagtailcore.models import Orderable, Page
+  from modelcluster.fields import ParentalKey
+
+  # The abstract model for related links, complete with panels
+  class RelatedLink(models.Model):
+      title = models.CharField(max_length=255)
+      link_external = models.URLField("External link", blank=True)
+
+      panels = [
+          FieldPanel('title'),
+          FieldPanel('link_external'),
+      ]
+
+      class Meta:
+          abstract = True
+
+  # The real model which combines the abstract model, an
+  # Orderable helper class, and what amounts to a ForeignKey link
+  # to the model we want to add related links to (BookPage)
+  class BookPageRelatedLinks(Orderable, RelatedLink):
+      page = ParentalKey('demo.BookPage', related_name='related_links')
+
+  class BookPage( Page ):
+    # ...
+
+  BookPage.content_panels = [
+    # ...
+    InlinePanel( BookPage, 'related_links', label="Related Links" ),
+  ]
+
+The ``RelatedLink`` class is a vanilla Django abstract model. The ``BookPageRelatedLinks`` model extends it with capability for being ordered in the Wagtail interface via the ``Orderable`` class as well as adding a ``page`` property which links the model to the ``BookPage`` model we're adding the related links objects to. Finally, in the panel definitions for ``BookPage``, we'll add an ``InlinePanel`` to provide an interface for it all. Let's look again at the parameters that ``InlinePanel`` accepts:
+
+.. code-block:: python
+
+  InlinePanel( base_model, relation_name, panels=None, label='', help_text='' )
+
+``base_model`` is the model you're extending with the cluster. The ``relation_name`` is the ``related_name`` label given to the cluster's ``ParentalKey`` relation. You can add the ``panels`` manually or make them part of the cluster model. Finally, ``label`` and ``help_text`` provide a heading and caption, respectively, for the Wagtail editor.
+
+For another example of using model clusters, see :ref:`tagging`
+
+For more on ``django-modelcluster``, visit `the django-modelcluster github project page`_ ).
+
+.. _the django-modelcluster github page: https://github.com/torchbox/django-modelcluster
 
 
 .. _extending_wysiwyg:
@@ -311,12 +356,205 @@ The ``django-modelcluster`` module allows for streamlined relation of extra mode
 Extending the WYSIWYG Editor (hallo.js)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Adding hallo.js plugins:
-https://github.com/torchbox/wagtail/commit/1ecc215759142e6cafdacb185bbfd3f8e9cd3185
+To inject javascript into the Wagtail page editor, see the :ref:`insert_editor_js` hook. Once you have the hook in place and your hallo.js plugin loads into the Wagtail page editor, use the following Javascript to register the plugin with hallo.js.
+
+.. code-block:: javascript
+
+  registerHalloPlugin(name, opts);
+
+hallo.js plugin names are prefixed with the ``"IKS."`` namespace, but the ``name`` you pass into ``registerHalloPlugin()`` should be without the prefix. ``opts`` is an object passed into the plugin.
+
+For information on developing custom hallo.js plugins, see the project's page: https://github.com/bergie/hallo
 
 
 Edit Handler API
 ~~~~~~~~~~~~~~~~
 
 
+Hooks
+-----
+
+On loading, Wagtail will search for any app with the file ``wagtail_hooks.py`` and execute the contents. This provides a way to register your own functions to execute at certain points in Wagtail's execution, such as when a ``Page`` object is saved or when the main menu is constructed.
+
+Registering functions with a Wagtail hook follows the following pattern:
+
+.. code-block:: python
+
+  from wagtail.wagtailadmin import hooks
+
+  hooks.register('hook', function)
+
+Where ``'hook'`` is one of the following hook strings and ``function`` is a function you've defined to handle the hook.
+
+.. _construct_wagtail_edit_bird:
+
+``construct_wagtail_edit_bird``
+  Add or remove items from the wagtail userbar. Add, edit, and moderation tools are provided by default. The callable passed into the hook must take the ``request`` object and a list of menu objects, ``items``. The menu item objects must have a ``render`` method which can take a ``request`` object and return the HTML string representing the menu item. See the userbar templates and menu item classes for more information.
+
+  .. code-block:: python
+
+    from wagtail.wagtailadmin import hooks
+
+    class UserbarPuppyLinkItem(object):
+      def render(self, request):
+        return '<li><a href="http://cuteoverload.com/tag/puppehs/" ' \
+        + 'target="_parent" class="action icon icon-wagtail">Puppies!</a></li>'
+
+    def add_puppy_link_item(request, items):
+      return items.append( UserbarPuppyLinkItem() )
+
+    hooks.register('construct_wagtail_edit_bird', add_puppy_link_item)
+
+.. _construct_homepage_panels:
+
+``construct_homepage_panels``
+  Add or remove panels from the Wagtail admin homepage. The callable passed into this hook should take a ``request`` object and a list of ``panels``, objects which have a ``render()`` method returning a string. The objects also have an ``order`` property, an integer used for ordering the panels. The default panels use integers between ``100`` and ``300``.
+
+  .. code-block:: python
+
+    from django.utils.safestring import mark_safe
+
+    from wagtail.wagtailadmin import hooks
+
+    class WelcomePanel(object):
+      order = 50
+
+      def render(self):
+        return mark_safe("""
+        <section class="panel summary nice-padding">
+          <h3>No, but seriously -- welcome to the admin homepage.</h3>
+        </section>
+        """)
+
+    def add_another_welcome_panel(request, panels):
+      return panels.append( WelcomePanel() )
+
+    hooks.register('construct_homepage_panels', add_another_welcome_panel)
+
+.. _after_create_page:
+
+``after_create_page``
+  Do something with a ``Page`` object after it has been saved to the database (as a published page or a revision). The callable passed to this hook should take a ``request`` object and a ``page`` object. The function does not have to return anything, but if an object with a ``status_code`` property is returned, Wagtail will use it as a response object. By default, Wagtail will instead redirect to the Explorer page for the new page's parent.
+
+  .. code-block:: python
+
+    from django.http import HttpResponse
+
+    from wagtail.wagtailadmin import hooks
+
+    def do_after_page_create(request, page):
+      return HttpResponse("Congrats on making content!", content_type="text/plain")
+    hooks.register('after_create_page', do_after_page_create)
+
+.. _after_edit_page:
+
+``after_edit_page``
+  Do something with a ``Page`` object after it has been updated. Uses the same behavior as ``after_create_page``.
+
+.. _after_delete_page:
+
+``after_delete_page``
+  Do something after a ``Page`` object is deleted. Uses the same behavior as ``after_create_page``.
+
+.. _register_admin_urls:
+
+``register_admin_urls``
+  Register additional admin page URLs. The callable fed into this hook should return a list of Django URL patterns which define the structure of the pages and endpoints of your extension to the Wagtail admin. For more about vanilla Django URLconfs and views, see `url dispatcher`_.
+
+  .. _url dispatcher: https://docs.djangoproject.com/en/dev/topics/http/urls/
+
+  .. code-block:: python
+
+    from django.http import HttpResponse
+    from django.conf.urls import url
+
+    from wagtail.wagtailadmin import hooks
+
+    def admin_view( request ):
+      return HttpResponse( \
+        "I have approximate knowledge of many things!", \
+        content_type="text/plain")
+
+    def urlconf_time():
+      return [
+        url(r'^how_did_you_almost_know_my_name/$', admin_view, name='frank' ),
+      ]
+    hooks.register('register_admin_urls', urlconf_time)
+
+.. _construct_main_menu:
+
+``construct_main_menu``
+  Add, remove, or alter ``MenuItem`` objects from the Wagtail admin menu. The callable passed to this hook must take a ``request`` object and a list of ``menu_items``; it must return a list of menu items. New items can be constructed from the ``MenuItem`` class by passing in: a ``label`` which will be the text in the menu item, the URL of the admin page you want the menu item to link to (usually by calling ``reverse()`` on the admin view you've set up), CSS class ``name`` applied to the wrapping ``<li>`` of the menu item as ``"menu-{name}"``, CSS ``classnames`` which are used to give the link an icon, and an ``order`` integer which determine's the item's place in the menu. 
+
+  .. code-block:: python
+
+    from django.core.urlresolvers import reverse
+
+    from wagtail.wagtailadmin import hooks
+    from wagtail.wagtailadmin.menu import MenuItem
+
+    def construct_main_menu(request, menu_items):
+      menu_items.append(
+        MenuItem( 'Frank', reverse('frank'), classnames='icon icon-folder-inverse', order=10000)
+      )
+    hooks.register('construct_main_menu', construct_main_menu)
+
+
+.. _insert_editor_js:
+
+``insert_editor_js``
+  Add additional Javascript files or code snippets to the page editor. Output must be compatible with ``compress``, as local static includes or string.
+
+  .. code-block:: python
+
+    from django.utils.html import format_html, format_html_join
+    from django.conf import settings
+
+    from wagtail.wagtailadmin import hooks
+
+    def editor_js():
+      js_files = [
+        'demo/js/hallo-plugins/hallo-demo-plugin.js',
+      ]
+      js_includes = format_html_join('\n', '<script src="{0}{1}"></script>',
+        ((settings.STATIC_URL, filename) for filename in js_files)
+      )
+      return js_includes + format_html(
+        """
+        <script>
+          registerHalloPlugin('demoeditor');
+        </script>
+        """
+      )
+    hooks.register('insert_editor_js', editor_js)
+
+.. _insert_editor_css:
+
+``insert_editor_css``
+  Add additional CSS or SCSS files or snippets to the page editor. Output must be compatible with ``compress``, as local static includes or string.
+
+  .. code-block:: python
+
+    from django.utils.html import format_html
+    from django.conf import settings
+
+    from wagtail.wagtailadmin import hooks
+
+    def editor_css():
+      return format_html('<link rel="stylesheet" href="' \
+      + settings.STATIC_URL \
+      + 'demo/css/vendor/font-awesome/css/font-awesome.min.css">')
+    hooks.register('insert_editor_css', editor_css)
+
+
+Content Index Pages (CRUD)
+--------------------------
+
+
+Custom Choosers
+---------------
+
+
+Tests
+-----
 
diff --git a/docs/model_recipes.rst b/docs/model_recipes.rst
index fe8a89e32..6a4abed47 100644
--- a/docs/model_recipes.rst
+++ b/docs/model_recipes.rst
@@ -118,6 +118,8 @@ Will return::
     tauntaun kennel bed and breakfast
 
 
+.. _tagging:
+
 Tagging
 -------
 

From 8fa0bc07df85f4bcc1cfcc70c29d179a7cef147b Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 2 Jun 2014 13:27:39 +0100
Subject: [PATCH 19/60] Made login view redirect already logged in users to
 dashboard. Fixes #25

---
 .../account/password_reset/complete.html      |  2 +-
 .../templates/wagtailadmin/login.html         |  2 +-
 .../tests/test_account_management.py          |  1 -
 wagtail/wagtailadmin/urls.py                  | 10 ++-------
 wagtail/wagtailadmin/views/account.py         | 22 ++++++++++++++++++-
 5 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html
index c0cf872e2..3dc8272b0 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html
@@ -13,6 +13,6 @@
 {% block furniture %}
     <div class="content-wrapper">
         <h1>{% trans "Password change successful" %}</h1>
-        <p><a href="{% url 'django.contrib.auth.views.login' %}" class="button button-primary">{% trans "Login" %}</a></p>
+        <p><a href="{% url 'wagtailadmin_login' %}" class="button button-primary">{% trans "Login" %}</a></p>
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/login.html b/wagtail/wagtailadmin/templates/wagtailadmin/login.html
index 012dd32f8..22682500f 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/login.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/login.html
@@ -20,7 +20,7 @@
             </div>
         {% endif %}
 
-        <form action="{% url 'django.contrib.auth.views.login' %}" method="post" autocomplete="off">
+        <form action="{% url 'wagtailadmin_login' %}" method="post" autocomplete="off">
             {% csrf_token %}
             <input type="hidden" name="next" value="{{ next }}" />
             <h1>{% trans "Sign in to Wagtail" %}</h1>
diff --git a/wagtail/wagtailadmin/tests/test_account_management.py b/wagtail/wagtailadmin/tests/test_account_management.py
index 95d54d7d9..63c70779b 100644
--- a/wagtail/wagtailadmin/tests/test_account_management.py
+++ b/wagtail/wagtailadmin/tests/test_account_management.py
@@ -49,7 +49,6 @@ class TestAuthentication(TestCase):
         self.assertTrue('_auth_user_id' in self.client.session)
         self.assertEqual(self.client.session['_auth_user_id'], User.objects.get(username='test').id)
 
-    @unittest.expectedFailure # See: https://github.com/torchbox/wagtail/issues/25
     def test_already_logged_in_redirect(self):
         """
         This tests that a user who is already logged in is automatically
diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py
index 8fbf2f6e7..806240c5c 100644
--- a/wagtail/wagtailadmin/urls.py
+++ b/wagtail/wagtailadmin/urls.py
@@ -5,15 +5,8 @@ from wagtail.wagtailadmin.forms import LoginForm, PasswordResetForm
 from wagtail.wagtailadmin.views import account, chooser, home, pages, tags, userbar
 from wagtail.wagtailadmin import hooks
 
-urlpatterns = [
-    url(
-        r'^login/$', 'django.contrib.auth.views.login', {
-            'template_name': 'wagtailadmin/login.html',
-            'authentication_form': LoginForm,
-            'extra_context': {'show_password_reset': getattr(settings, 'WAGTAIL_PASSWORD_MANAGEMENT_ENABLED', True)},
-        }, name='wagtailadmin_login'
-    ),
 
+urlpatterns = [
     # Password reset
     url(
         r'^password_reset/$', 'django.contrib.auth.views.password_reset', {
@@ -81,6 +74,7 @@ urlpatterns += [
 
     url(r'^tag-autocomplete/$', tags.autocomplete, name='wagtailadmin_tag_autocomplete'),
 
+    url(r'^login/$', account.login, name='wagtailadmin_login'),
     url(r'^account/$', account.account, name='wagtailadmin_account'),
     url(r'^account/change_password/$', account.change_password, name='wagtailadmin_account_change_password'),
     url(r'^logout/$', account.logout, name='wagtailadmin_logout'),
diff --git a/wagtail/wagtailadmin/views/account.py b/wagtail/wagtailadmin/views/account.py
index 8479ea6b0..c5e461f55 100644
--- a/wagtail/wagtailadmin/views/account.py
+++ b/wagtail/wagtailadmin/views/account.py
@@ -3,8 +3,13 @@ from django.shortcuts import render, redirect
 from django.contrib import messages
 from django.contrib.auth.forms import SetPasswordForm
 from django.contrib.auth.decorators import permission_required
-from django.contrib.auth.views import logout as auth_logout
+from django.contrib.auth.views import logout as auth_logout, login as auth_login
 from django.utils.translation import ugettext as _ 
+from django.views.decorators.debug import sensitive_post_parameters
+from django.views.decorators.cache import never_cache
+
+from wagtail.wagtailadmin import forms
+
 
 @permission_required('wagtailadmin.access_admin')
 def account(request):
@@ -37,6 +42,21 @@ def change_password(request):
     })
 
 
+@sensitive_post_parameters()
+@never_cache
+def login(request):
+    if request.user.is_authenticated():
+        return redirect('wagtailadmin_home')
+    else:
+        return auth_login(request,
+            template_name='wagtailadmin/login.html',
+            authentication_form=forms.LoginForm,
+            extra_context={
+                'show_password_reset': getattr(settings, 'WAGTAIL_PASSWORD_MANAGEMENT_ENABLED', True),
+            },
+        )
+
+
 def logout(request):
     response = auth_logout(request, next_page = 'wagtailadmin_login')
 

From 3b8ca10fdb9d63863a638fa353d69467a13564af Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Wed, 4 Jun 2014 16:19:34 +0100
Subject: [PATCH 20/60] Embedly unit tests

---
 requirements-dev.txt            |  1 +
 wagtail/wagtailembeds/embeds.py | 16 ++++--
 wagtail/wagtailembeds/tests.py  | 95 +++++++++++++++++++++++++++++++++
 3 files changed, 107 insertions(+), 5 deletions(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index d35d6b087..4a9ff5c5e 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,3 +1,4 @@
 # For coverage and PEP8 linting
 coverage==3.7.1
 flake8==2.1.0
+mock==1.0.1
diff --git a/wagtail/wagtailembeds/embeds.py b/wagtail/wagtailembeds/embeds.py
index f8ab35f16..abe993d1d 100644
--- a/wagtail/wagtailembeds/embeds.py
+++ b/wagtail/wagtailembeds/embeds.py
@@ -16,10 +16,14 @@ import json
 
 
 class EmbedNotFoundException(Exception): pass
-
 class EmbedlyException(Exception): pass
 class AccessDeniedEmbedlyException(EmbedlyException): pass
 
+# This is here for unit testing. It is used if Embedly is not installed.
+class MockEmbedly():
+    def oembed():
+        pass
+
 
 # Pinched from django 1.7 source code.
 # TODO: Replace this with "from django.utils.module_loading import import_string" when django 1.7 is released
@@ -45,14 +49,16 @@ def import_string(dotted_path):
 
 
 def embedly(url, max_width=None, key=None):
-    from embedly import Embedly
-
     # Get embedly key
     if key is None:
         key = settings.EMBEDLY_KEY
 
-    # Get embedly client
-    client = Embedly(key=settings.EMBEDLY_KEY)
+    try:
+        from embedly import Embedly
+        # Get embedly client
+        client = Embedly(key)
+    except ImportError:
+        client = MockEmbedly(key)
 
     # Call embedly
     if max_width is not None:
diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py
index b1eefdb17..ff03fba42 100644
--- a/wagtail/wagtailembeds/tests.py
+++ b/wagtail/wagtailembeds/tests.py
@@ -1,7 +1,23 @@
+try:
+    from embedly import Embedly
+    patch_me = 'embedly.Embedly.oembed'
+except ImportError:
+    patch_me = 'wagtail.wagtailembeds.embeds.MockEmbedly.oembed'
+
 from django.test import TestCase
 from django.test.client import Client
+
+from mock import patch
+
 from wagtail.tests.utils import login
 from wagtail.wagtailembeds import get_embed
+from wagtail.wagtailembeds.embeds import (
+    embedly,
+    EmbedNotFoundException,
+    EmbedlyException,
+    AccessDeniedEmbedlyException,
+    MockEmbedly
+)
 
 
 class TestEmbeds(TestCase):
@@ -73,3 +89,82 @@ class TestChooser(TestCase):
         self.assertEqual(r.status_code, 200)
 
         # TODO: Test submitting
+
+
+class TestEmbedly(TestCase):
+    @patch(patch_me)
+    def test_embedly_oembed_called_with_correct_arguments(self, oembed):
+        oembed.return_value = {'type': 'photo',
+                               'url': 'http://www.example.com'}
+
+        embedly('http://www.example.com', key='foo')
+        oembed.assert_called_with('http://www.example.com', better=False)
+
+        embedly('http://www.example.com', max_width=100, key='foo')
+        oembed.assert_called_with('http://www.example.com', maxwidth=100, better=False)
+
+    @patch(patch_me)
+    def test_embedly_errors(self, oembed):
+        oembed.return_value = {'type': 'photo',
+                               'url': 'http://www.example.com',
+                               'error': True,
+                               'error_code': 401}
+        self.assertRaises(AccessDeniedEmbedlyException,
+                          embedly, 'http://www.example.com', key='foo')
+
+        oembed.return_value['error_code'] = 403
+        self.assertRaises(AccessDeniedEmbedlyException,
+                          embedly, 'http://www.example.com', key='foo')
+
+        oembed.return_value['error_code'] = 404
+        self.assertRaises(EmbedNotFoundException,
+                          embedly, 'http://www.example.com', key='foo')
+
+        oembed.return_value['error_code'] = 999
+        self.assertRaises(EmbedlyException, embedly,
+                          'http://www.example.com', key='foo')
+
+    @patch(patch_me)
+    def test_embedly_html_conversion(self, oembed):
+        oembed.return_value = {'type': 'photo',
+                               'url': 'http://www.example.com'}
+        result = embedly('http://www.example.com', key='foo')
+        self.assertEqual(result['html'], '<img src="http://www.example.com" />')
+
+        oembed.return_value = {'type': 'something else',
+                               'html': '<foo>bar</foo>'}
+        result = embedly('http://www.example.com', key='foo')
+        self.assertEqual(result['html'], '<foo>bar</foo>')
+
+    @patch(patch_me)
+    def test_embedly_return_value(self, oembed):
+        oembed.return_value = {'type': 'something else',
+                               'html': '<foo>bar</foo>'}
+        result = embedly('http://www.example.com', key='foo')
+        self.assertEqual(result, {
+            'title': '',
+            'author_name': '',
+            'provider_name': '',
+            'type': 'something else',
+            'thumbnail_url': None,
+            'width': None,
+            'height': None,
+            'html': '<foo>bar</foo>'})
+
+        oembed.return_value = {'type': 'something else',
+                               'author_name': 'Alice',
+                               'provider_name': 'Bob',
+                               'title': 'foo',
+                               'thumbnail_url': 'http://www.example.com',
+                               'width': 100,
+                               'height': 100,
+                               'html': '<foo>bar</foo>'}
+        result = embedly('http://www.example.com', key='foo')
+        self.assertEqual(result, {'type': 'something else',
+                                  'author_name': 'Alice',
+                                  'provider_name': 'Bob',
+                                  'title': 'foo',
+                                  'thumbnail_url': 'http://www.example.com',
+                                  'width': 100,
+                                  'height': 100,
+                                  'html': '<foo>bar</foo>'})

From 3b372ccbac4343f46d4cade8459045788bcf47b4 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 4 Jun 2014 17:08:12 +0100
Subject: [PATCH 21/60] Splitup wagtailcore tests

wagtailcore/tests.py is getting a bit big so this commit splits them up into separate files

test_management_commands.py
test_page_model.py
test_page_permissions.py
test_page_queryset.py
tests.py
---
 wagtail/wagtailcore/tests.py                  | 860 ------------------
 wagtail/wagtailcore/tests/__init__.py         |   0
 .../tests/test_management_commands.py         |  89 ++
 wagtail/wagtailcore/tests/test_page_model.py  | 226 +++++
 .../tests/test_page_permissions.py            | 226 +++++
 .../wagtailcore/tests/test_page_queryset.py   | 256 ++++++
 wagtail/wagtailcore/tests/tests.py            |  99 ++
 7 files changed, 896 insertions(+), 860 deletions(-)
 delete mode 100644 wagtail/wagtailcore/tests.py
 create mode 100644 wagtail/wagtailcore/tests/__init__.py
 create mode 100644 wagtail/wagtailcore/tests/test_management_commands.py
 create mode 100644 wagtail/wagtailcore/tests/test_page_model.py
 create mode 100644 wagtail/wagtailcore/tests/test_page_permissions.py
 create mode 100644 wagtail/wagtailcore/tests/test_page_queryset.py
 create mode 100644 wagtail/wagtailcore/tests/tests.py

diff --git a/wagtail/wagtailcore/tests.py b/wagtail/wagtailcore/tests.py
deleted file mode 100644
index df66c6b93..000000000
--- a/wagtail/wagtailcore/tests.py
+++ /dev/null
@@ -1,860 +0,0 @@
-from django.test import TestCase, Client
-from django.http import HttpRequest, Http404
-from django.core import management
-from StringIO import StringIO
-
-from django.contrib.auth.models import User
-
-from wagtail.wagtailcore.models import Page, Site, UserPagePermissionsProxy
-from wagtail.tests.models import EventPage, EventIndex, SimplePage
-
-
-class TestRouting(TestCase):
-    fixtures = ['test.json']
-
-    def test_find_site_for_request(self):
-        default_site = Site.objects.get(is_default_site=True)
-        events_page = Page.objects.get(url_path='/home/events/')
-        events_site = Site.objects.create(hostname='events.example.com', root_page=events_page)
-
-        # requests without a Host: header should be directed to the default site
-        request = HttpRequest()
-        request.path = '/'
-        self.assertEqual(Site.find_for_request(request), default_site)
-
-        # requests with a known Host: header should be directed to the specific site
-        request = HttpRequest()
-        request.path = '/'
-        request.META['HTTP_HOST'] = 'events.example.com'
-        self.assertEqual(Site.find_for_request(request), events_site)
-
-        # requests with an unrecognised Host: header should be directed to the default site
-        request = HttpRequest()
-        request.path = '/'
-        request.META['HTTP_HOST'] = 'unknown.example.com'
-        self.assertEqual(Site.find_for_request(request), default_site)
-
-    def test_urls(self):
-        default_site = Site.objects.get(is_default_site=True)
-        homepage = Page.objects.get(url_path='/home/')
-        christmas_page = Page.objects.get(url_path='/home/events/christmas/')
-
-        # Basic installation only has one site configured, so page.url will return local URLs
-        self.assertEqual(homepage.full_url, 'http://localhost/')
-        self.assertEqual(homepage.url, '/')
-        self.assertEqual(homepage.relative_url(default_site), '/')
-
-        self.assertEqual(christmas_page.full_url, 'http://localhost/events/christmas/')
-        self.assertEqual(christmas_page.url, '/events/christmas/')
-        self.assertEqual(christmas_page.relative_url(default_site), '/events/christmas/')
-
-    def test_urls_with_multiple_sites(self):
-        events_page = Page.objects.get(url_path='/home/events/')
-        events_site = Site.objects.create(hostname='events.example.com', root_page=events_page)
-
-        default_site = Site.objects.get(is_default_site=True)
-        homepage = Page.objects.get(url_path='/home/')
-        christmas_page = Page.objects.get(url_path='/home/events/christmas/')
-
-        # with multiple sites, page.url will return full URLs to ensure that
-        # they work across sites
-        self.assertEqual(homepage.full_url, 'http://localhost/')
-        self.assertEqual(homepage.url, 'http://localhost/')
-        self.assertEqual(homepage.relative_url(default_site), '/')
-        self.assertEqual(homepage.relative_url(events_site), 'http://localhost/')
-
-        self.assertEqual(christmas_page.full_url, 'http://events.example.com/christmas/')
-        self.assertEqual(christmas_page.url, 'http://events.example.com/christmas/')
-        self.assertEqual(christmas_page.relative_url(default_site), 'http://events.example.com/christmas/')
-        self.assertEqual(christmas_page.relative_url(events_site), '/christmas/')
-
-    def test_request_routing(self):
-        homepage = Page.objects.get(url_path='/home/')
-        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
-
-        request = HttpRequest()
-        request.path = '/events/christmas/'
-        response = homepage.route(request, ['events', 'christmas'])
-
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.context_data['self'], christmas_page)
-        used_template = response.resolve_template(response.template_name)
-        self.assertEqual(used_template.name, 'tests/event_page.html')
-
-    def test_route_to_unknown_page_returns_404(self):
-        homepage = Page.objects.get(url_path='/home/')
-
-        request = HttpRequest()
-        request.path = '/events/quinquagesima/'
-        with self.assertRaises(Http404):
-            homepage.route(request, ['events', 'quinquagesima'])
-
-    def test_route_to_unpublished_page_returns_404(self):
-        homepage = Page.objects.get(url_path='/home/')
-
-        request = HttpRequest()
-        request.path = '/events/tentative-unpublished-event/'
-        with self.assertRaises(Http404):
-            homepage.route(request, ['events', 'tentative-unpublished-event'])
-
-
-class TestServeView(TestCase):
-    fixtures = ['test.json']
-
-    def setUp(self):
-        # Explicitly clear the cache of site root paths. Normally this would be kept
-        # in sync by the Site.save logic, but this is bypassed when the database is
-        # rolled back between tests using transactions.
-        from django.core.cache import cache
-        cache.delete('wagtail_site_root_paths')
-
-    def test_serve(self):
-        response = self.client.get('/events/christmas/')
-
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.templates[0].name, 'tests/event_page.html')
-        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
-        self.assertEqual(response.context['self'], christmas_page)
-
-        self.assertContains(response, '<h1>Christmas</h1>')
-        self.assertContains(response, '<h2>Event</h2>')
-
-    def test_serve_unknown_page_returns_404(self):
-        response = self.client.get('/events/quinquagesima/')
-        self.assertEqual(response.status_code, 404)
-
-    def test_serve_unpublished_page_returns_404(self):
-        response = self.client.get('/events/tentative-unpublished-event/')
-        self.assertEqual(response.status_code, 404)
-
-    def test_serve_with_multiple_sites(self):
-        events_page = Page.objects.get(url_path='/home/events/')
-        Site.objects.create(hostname='events.example.com', root_page=events_page)
-
-        response = self.client.get('/christmas/', HTTP_HOST='events.example.com')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.templates[0].name, 'tests/event_page.html')
-        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
-        self.assertEqual(response.context['self'], christmas_page)
-
-        self.assertContains(response, '<h1>Christmas</h1>')
-        self.assertContains(response, '<h2>Event</h2>')
-
-        # same request to the default host should return a 404
-        c = Client()
-        response = c.get('/christmas/', HTTP_HOST='localhost')
-        self.assertEqual(response.status_code, 404)
-
-    def test_serve_with_custom_context(self):
-        response = self.client.get('/events/')
-        self.assertEqual(response.status_code, 200)
-
-        # should render the whole page
-        self.assertContains(response, '<h1>Events</h1>')
-
-        # response should contain data from the custom 'events' context variable
-        self.assertContains(response, '<a href="/events/christmas/">Christmas</a>')
-
-    def test_ajax_response(self):
-        response = self.client.get('/events/', HTTP_X_REQUESTED_WITH='XMLHttpRequest')
-        self.assertEqual(response.status_code, 200)
-
-        # should only render the content of includes/event_listing.html, not the whole page
-        self.assertNotContains(response, '<h1>Events</h1>')
-        self.assertContains(response, '<a href="/events/christmas/">Christmas</a>')
-
-
-class TestStaticSitePaths(TestCase):
-    def setUp(self):
-        self.root_page = Page.objects.get(id=1)
-
-        # For simple tests
-        self.home_page = self.root_page.add_child(instance=SimplePage(title="Homepage", slug="home"))
-        self.about_page = self.home_page.add_child(instance=SimplePage(title="About us", slug="about"))
-        self.contact_page = self.home_page.add_child(instance=SimplePage(title="Contact", slug="contact"))
-
-        # For custom tests
-        self.event_index = self.root_page.add_child(instance=EventIndex(title="Events", slug="events"))
-        for i in range(20):
-            self.event_index.add_child(instance=EventPage(title="Event " + str(i), slug="event" + str(i)))
-
-    def test_local_static_site_paths(self):
-        paths = list(self.about_page.get_static_site_paths())
-
-        self.assertEqual(paths, ['/'])
-
-    def test_child_static_site_paths(self):
-        paths = list(self.home_page.get_static_site_paths())
-
-        self.assertEqual(paths, ['/', '/about/', '/contact/'])
-
-    def test_custom_static_site_paths(self):
-        paths = list(self.event_index.get_static_site_paths())
-
-        # Event index path
-        expected_paths = ['/']
-
-        # One path for each page of results
-        expected_paths.extend(['/' + str(i + 1) + '/' for i in range(5)])
-
-        # One path for each event page
-        expected_paths.extend(['/event' + str(i) + '/' for i in range(20)])
-
-        paths.sort()
-        expected_paths.sort()
-        self.assertEqual(paths, expected_paths)
-
-
-class TestPageUrlTags(TestCase):
-    fixtures = ['test.json']
-
-    def test_pageurl_tag(self):
-        response = self.client.get('/events/')
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, '<a href="/events/christmas/">Christmas</a>')
-
-    def test_slugurl_tag(self):
-        response = self.client.get('/events/christmas/')
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, '<a href="/events/">Back to events index</a>')
-
-
-class TestPagePermission(TestCase):
-    fixtures = ['test.json']
-
-    def test_nonpublisher_page_permissions(self):
-        event_editor = User.objects.get(username='eventeditor')
-        homepage = Page.objects.get(url_path='/home/')
-        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
-        unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/')
-        someone_elses_event_page = EventPage.objects.get(url_path='/home/events/someone-elses-event/')
-
-        homepage_perms = homepage.permissions_for_user(event_editor)
-        christmas_page_perms = christmas_page.permissions_for_user(event_editor)
-        unpub_perms = unpublished_event_page.permissions_for_user(event_editor)
-        someone_elses_event_perms = someone_elses_event_page.permissions_for_user(event_editor)
-
-        self.assertFalse(homepage_perms.can_add_subpage())
-        self.assertTrue(christmas_page_perms.can_add_subpage())
-        self.assertTrue(unpub_perms.can_add_subpage())
-        self.assertTrue(someone_elses_event_perms.can_add_subpage())
-
-        self.assertFalse(homepage_perms.can_edit())
-        self.assertTrue(christmas_page_perms.can_edit())
-        self.assertTrue(unpub_perms.can_edit())
-        self.assertFalse(someone_elses_event_perms.can_edit())  # basic 'add' permission doesn't allow editing pages owned by someone else
-
-        self.assertFalse(homepage_perms.can_delete())
-        self.assertFalse(christmas_page_perms.can_delete())  # cannot delete because it is published
-        self.assertTrue(unpub_perms.can_delete())
-        self.assertFalse(someone_elses_event_perms.can_delete())
-
-        self.assertFalse(homepage_perms.can_publish())
-        self.assertFalse(christmas_page_perms.can_publish())
-        self.assertFalse(unpub_perms.can_publish())
-
-        self.assertFalse(homepage_perms.can_unpublish())
-        self.assertFalse(christmas_page_perms.can_unpublish())
-        self.assertFalse(unpub_perms.can_unpublish())
-
-        self.assertFalse(homepage_perms.can_publish_subpage())
-        self.assertFalse(christmas_page_perms.can_publish_subpage())
-        self.assertFalse(unpub_perms.can_publish_subpage())
-
-        self.assertFalse(homepage_perms.can_reorder_children())
-        self.assertFalse(christmas_page_perms.can_reorder_children())
-        self.assertFalse(unpub_perms.can_reorder_children())
-
-        self.assertFalse(homepage_perms.can_move())
-        self.assertFalse(christmas_page_perms.can_move())  # cannot move because this would involve unpublishing from its current location
-        self.assertTrue(unpub_perms.can_move())
-        self.assertFalse(someone_elses_event_perms.can_move())
-
-        self.assertFalse(christmas_page_perms.can_move_to(unpublished_event_page))  # cannot move because this would involve unpublishing from its current location
-        self.assertTrue(unpub_perms.can_move_to(christmas_page))
-        self.assertFalse(unpub_perms.can_move_to(homepage))  # no permission to create pages at destination
-        self.assertFalse(unpub_perms.can_move_to(unpublished_event_page))  # cannot make page a child of itself
-
-
-    def test_publisher_page_permissions(self):
-        event_moderator = User.objects.get(username='eventmoderator')
-        homepage = Page.objects.get(url_path='/home/')
-        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
-        unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/')
-
-        homepage_perms = homepage.permissions_for_user(event_moderator)
-        christmas_page_perms = christmas_page.permissions_for_user(event_moderator)
-        unpub_perms = unpublished_event_page.permissions_for_user(event_moderator)
-
-        self.assertFalse(homepage_perms.can_add_subpage())
-        self.assertTrue(christmas_page_perms.can_add_subpage())
-        self.assertTrue(unpub_perms.can_add_subpage())
-
-        self.assertFalse(homepage_perms.can_edit())
-        self.assertTrue(christmas_page_perms.can_edit())
-        self.assertTrue(unpub_perms.can_edit())
-
-        self.assertFalse(homepage_perms.can_delete())
-        self.assertTrue(christmas_page_perms.can_delete())  # cannot delete because it is published
-        self.assertTrue(unpub_perms.can_delete())
-
-        self.assertFalse(homepage_perms.can_publish())
-        self.assertTrue(christmas_page_perms.can_publish())
-        self.assertTrue(unpub_perms.can_publish())
-
-        self.assertFalse(homepage_perms.can_unpublish())
-        self.assertTrue(christmas_page_perms.can_unpublish())
-        self.assertFalse(unpub_perms.can_unpublish())  # cannot unpublish a page that isn't published
-
-        self.assertFalse(homepage_perms.can_publish_subpage())
-        self.assertTrue(christmas_page_perms.can_publish_subpage())
-        self.assertTrue(unpub_perms.can_publish_subpage())
-
-        self.assertFalse(homepage_perms.can_reorder_children())
-        self.assertTrue(christmas_page_perms.can_reorder_children())
-        self.assertTrue(unpub_perms.can_reorder_children())
-
-        self.assertFalse(homepage_perms.can_move())
-        self.assertTrue(christmas_page_perms.can_move())
-        self.assertTrue(unpub_perms.can_move())
-
-        self.assertTrue(christmas_page_perms.can_move_to(unpublished_event_page))
-        self.assertTrue(unpub_perms.can_move_to(christmas_page))
-        self.assertFalse(unpub_perms.can_move_to(homepage))  # no permission to create pages at destination
-        self.assertFalse(unpub_perms.can_move_to(unpublished_event_page))  # cannot make page a child of itself
-
-    def test_inactive_user_has_no_permissions(self):
-        user = User.objects.get(username='inactiveuser')
-        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
-        unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/')
-
-        christmas_page_perms = christmas_page.permissions_for_user(user)
-        unpub_perms = unpublished_event_page.permissions_for_user(user)
-
-        self.assertFalse(unpub_perms.can_add_subpage())
-        self.assertFalse(unpub_perms.can_edit())
-        self.assertFalse(unpub_perms.can_delete())
-        self.assertFalse(unpub_perms.can_publish())
-        self.assertFalse(christmas_page_perms.can_unpublish())
-        self.assertFalse(unpub_perms.can_publish_subpage())
-        self.assertFalse(unpub_perms.can_reorder_children())
-        self.assertFalse(unpub_perms.can_move())
-        self.assertFalse(unpub_perms.can_move_to(christmas_page))
-
-    def test_superuser_has_full_permissions(self):
-        user = User.objects.get(username='superuser')
-        homepage = Page.objects.get(url_path='/home/')
-        root = Page.objects.get(url_path='/')
-        unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/')
-
-        homepage_perms = homepage.permissions_for_user(user)
-        root_perms = root.permissions_for_user(user)
-        unpub_perms = unpublished_event_page.permissions_for_user(user)
-
-        self.assertTrue(homepage_perms.can_add_subpage())
-        self.assertTrue(root_perms.can_add_subpage())
-
-        self.assertTrue(homepage_perms.can_edit())
-        self.assertFalse(root_perms.can_edit())  # root is not a real editable page, even to superusers
-
-        self.assertTrue(homepage_perms.can_delete())
-        self.assertFalse(root_perms.can_delete())
-
-        self.assertTrue(homepage_perms.can_publish())
-        self.assertFalse(root_perms.can_publish())
-
-        self.assertTrue(homepage_perms.can_unpublish())
-        self.assertFalse(root_perms.can_unpublish())
-        self.assertFalse(unpub_perms.can_unpublish())
-
-        self.assertTrue(homepage_perms.can_publish_subpage())
-        self.assertTrue(root_perms.can_publish_subpage())
-
-        self.assertTrue(homepage_perms.can_reorder_children())
-        self.assertTrue(root_perms.can_reorder_children())
-
-        self.assertTrue(homepage_perms.can_move())
-        self.assertFalse(root_perms.can_move())
-
-        self.assertTrue(homepage_perms.can_move_to(root))
-        self.assertFalse(homepage_perms.can_move_to(unpublished_event_page))
-
-    def test_editable_pages_for_user_with_add_permission(self):
-        event_editor = User.objects.get(username='eventeditor')
-        homepage = Page.objects.get(url_path='/home/')
-        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
-        unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/')
-        someone_elses_event_page = EventPage.objects.get(url_path='/home/events/someone-elses-event/')
-
-        editable_pages = UserPagePermissionsProxy(event_editor).editable_pages()
-
-        self.assertFalse(editable_pages.filter(id=homepage.id).exists())
-        self.assertTrue(editable_pages.filter(id=christmas_page.id).exists())
-        self.assertTrue(editable_pages.filter(id=unpublished_event_page.id).exists())
-        self.assertFalse(editable_pages.filter(id=someone_elses_event_page.id).exists())
-
-    def test_editable_pages_for_user_with_edit_permission(self):
-        event_moderator = User.objects.get(username='eventmoderator')
-        homepage = Page.objects.get(url_path='/home/')
-        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
-        unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/')
-        someone_elses_event_page = EventPage.objects.get(url_path='/home/events/someone-elses-event/')
-
-        editable_pages = UserPagePermissionsProxy(event_moderator).editable_pages()
-
-        self.assertFalse(editable_pages.filter(id=homepage.id).exists())
-        self.assertTrue(editable_pages.filter(id=christmas_page.id).exists())
-        self.assertTrue(editable_pages.filter(id=unpublished_event_page.id).exists())
-        self.assertTrue(editable_pages.filter(id=someone_elses_event_page.id).exists())
-
-    def test_editable_pages_for_inactive_user(self):
-        user = User.objects.get(username='inactiveuser')
-        homepage = Page.objects.get(url_path='/home/')
-        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
-        unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/')
-        someone_elses_event_page = EventPage.objects.get(url_path='/home/events/someone-elses-event/')
-
-        editable_pages = UserPagePermissionsProxy(user).editable_pages()
-
-        self.assertFalse(editable_pages.filter(id=homepage.id).exists())
-        self.assertFalse(editable_pages.filter(id=christmas_page.id).exists())
-        self.assertFalse(editable_pages.filter(id=unpublished_event_page.id).exists())
-        self.assertFalse(editable_pages.filter(id=someone_elses_event_page.id).exists())
-
-    def test_editable_pages_for_superuser(self):
-        user = User.objects.get(username='superuser')
-        homepage = Page.objects.get(url_path='/home/')
-        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
-        unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/')
-        someone_elses_event_page = EventPage.objects.get(url_path='/home/events/someone-elses-event/')
-
-        editable_pages = UserPagePermissionsProxy(user).editable_pages()
-
-        self.assertTrue(editable_pages.filter(id=homepage.id).exists())
-        self.assertTrue(editable_pages.filter(id=christmas_page.id).exists())
-        self.assertTrue(editable_pages.filter(id=unpublished_event_page.id).exists())
-        self.assertTrue(editable_pages.filter(id=someone_elses_event_page.id).exists())
-
-
-class TestPageQuerySet(TestCase):
-    fixtures = ['test.json']
-
-    def test_live(self):
-        pages = Page.objects.live()
-
-        # All pages must be live
-        for page in pages:
-            self.assertTrue(page.live)
-
-        # Check that the homepage is in the results
-        homepage = Page.objects.get(url_path='/home/')
-        self.assertTrue(pages.filter(id=homepage.id).exists())
-
-    def test_not_live(self):
-        pages = Page.objects.not_live()
-
-        # All pages must not be live
-        for page in pages:
-            self.assertFalse(page.live)
-
-        # Check that "someone elses event" is in the results
-        event = Page.objects.get(url_path='/home/events/someone-elses-event/')
-        self.assertTrue(pages.filter(id=event.id).exists())
-
-    def test_page(self):
-        homepage = Page.objects.get(url_path='/home/')
-        pages = Page.objects.page(homepage)
-
-        # Should only select the homepage
-        self.assertEqual(pages.count(), 1)
-        self.assertEqual(pages.first(), homepage)
-
-    def test_not_page(self):
-        homepage = Page.objects.get(url_path='/home/')
-        pages = Page.objects.not_page(homepage)
-
-        # Should select everything except for the homepage
-        self.assertEqual(pages.count(), Page.objects.all().count() - 1)
-        for page in pages:
-            self.assertNotEqual(page, homepage)
-
-    def test_descendant_of(self):
-        events_index = Page.objects.get(url_path='/home/events/')
-        pages = Page.objects.descendant_of(events_index)
-
-        # Check that all pages descend from events index
-        for page in pages:
-            self.assertTrue(page.get_ancestors().filter(id=events_index.id).exists())
-
-    def test_descendant_of_inclusive(self):
-        events_index = Page.objects.get(url_path='/home/events/')
-        pages = Page.objects.descendant_of(events_index, inclusive=True)
-
-        # Check that all pages descend from events index, includes event index
-        for page in pages:
-            self.assertTrue(page == events_index or page.get_ancestors().filter(id=events_index.id).exists())
-
-        # Check that event index was included
-        self.assertTrue(pages.filter(id=events_index.id).exists())
-
-    def test_not_descendant_of(self):
-        homepage = Page.objects.get(url_path='/home/')
-        events_index = Page.objects.get(url_path='/home/events/')
-        pages = Page.objects.not_descendant_of(events_index)
-
-        # Check that no pages descend from events_index
-        for page in pages:
-            self.assertFalse(page.get_ancestors().filter(id=events_index.id).exists())
-
-        # As this is not inclusive, events index should be in the results
-        self.assertTrue(pages.filter(id=events_index.id).exists())
-
-    def test_not_descendant_of_inclusive(self):
-        homepage = Page.objects.get(url_path='/home/')
-        events_index = Page.objects.get(url_path='/home/events/')
-        pages = Page.objects.not_descendant_of(events_index, inclusive=True)
-
-        # Check that all pages descend from homepage but not events index
-        for page in pages:
-            self.assertFalse(page.get_ancestors().filter(id=events_index.id).exists())
-
-        # As this is inclusive, events index should not be in the results
-        self.assertFalse(pages.filter(id=events_index.id).exists())
-
-    def test_child_of(self):
-        homepage = Page.objects.get(url_path='/home/')
-        pages = Page.objects.child_of(homepage)
-
-        # Check that all pages are children of homepage
-        for page in pages:
-            self.assertEqual(page.get_parent(), homepage)
-
-    def test_not_child_of(self):
-        events_index = Page.objects.get(url_path='/home/events/')
-        pages = Page.objects.not_child_of(events_index)
-
-        # Check that all pages are not children of events_index
-        for page in pages:
-            self.assertNotEqual(page.get_parent(), events_index)
-
-    def test_ancestor_of(self):
-        root_page = Page.objects.get(id=1)
-        homepage = Page.objects.get(url_path='/home/')
-        events_index = Page.objects.get(url_path='/home/events/')
-        pages = Page.objects.ancestor_of(events_index)
-
-        self.assertEqual(pages.count(), 2)
-        self.assertEqual(pages[0], root_page)
-        self.assertEqual(pages[1], homepage)
-
-    def test_ancestor_of_inclusive(self):
-        root_page = Page.objects.get(id=1)
-        homepage = Page.objects.get(url_path='/home/')
-        events_index = Page.objects.get(url_path='/home/events/')
-        pages = Page.objects.ancestor_of(events_index, inclusive=True)
-
-        self.assertEqual(pages.count(), 3)
-        self.assertEqual(pages[0], root_page)
-        self.assertEqual(pages[1], homepage)
-        self.assertEqual(pages[2], events_index)
-
-    def test_not_ancestor_of(self):
-        root_page = Page.objects.get(id=1)
-        homepage = Page.objects.get(url_path='/home/')
-        events_index = Page.objects.get(url_path='/home/events/')
-        pages = Page.objects.not_ancestor_of(events_index)
-
-        # Test that none of the ancestors are in pages
-        for page in pages:
-            self.assertNotEqual(page, root_page)
-            self.assertNotEqual(page, homepage)
-
-        # Test that events index is in pages
-        self.assertTrue(pages.filter(id=events_index.id).exists())
-
-    def test_not_ancestor_of_inclusive(self):
-        root_page = Page.objects.get(id=1)
-        homepage = Page.objects.get(url_path='/home/')
-        events_index = Page.objects.get(url_path='/home/events/')
-        pages = Page.objects.not_ancestor_of(events_index, inclusive=True)
-
-        # Test that none of the ancestors or the events_index are in pages
-        for page in pages:
-            self.assertNotEqual(page, root_page)
-            self.assertNotEqual(page, homepage)
-            self.assertNotEqual(page, events_index)
-
-    def test_parent_of(self):
-        homepage = Page.objects.get(url_path='/home/')
-        events_index = Page.objects.get(url_path='/home/events/')
-        pages = Page.objects.parent_of(events_index)
-
-        # Pages must only contain homepage
-        self.assertEqual(pages.count(), 1)
-        self.assertEqual(pages[0], homepage)
-
-    def test_not_parent_of(self):
-        homepage = Page.objects.get(url_path='/home/')
-        events_index = Page.objects.get(url_path='/home/events/')
-        pages = Page.objects.not_parent_of(events_index)
-
-        # Pages must not contain homepage
-        for page in pages:
-            self.assertNotEqual(page, homepage)
-
-        # Test that events index is in pages
-        self.assertTrue(pages.filter(id=events_index.id).exists())
-
-    def test_sibling_of(self):
-        events_index = Page.objects.get(url_path='/home/events/')
-        event = Page.objects.get(url_path='/home/events/christmas/')
-        pages = Page.objects.sibling_of(event)
-
-        # Check that all pages are children of events_index
-        for page in pages:
-            self.assertEqual(page.get_parent(), events_index)
-
-        # Check that the event is not included
-        self.assertFalse(pages.filter(id=event.id).exists())
-
-    def test_sibling_of_inclusive(self):
-        events_index = Page.objects.get(url_path='/home/events/')
-        event = Page.objects.get(url_path='/home/events/christmas/')
-        pages = Page.objects.sibling_of(event, inclusive=True)
-
-        # Check that all pages are children of events_index
-        for page in pages:
-            self.assertEqual(page.get_parent(), events_index)
-
-        # Check that the event is included
-        self.assertTrue(pages.filter(id=event.id).exists())
-
-    def test_not_sibling_of(self):
-        events_index = Page.objects.get(url_path='/home/events/')
-        event = Page.objects.get(url_path='/home/events/christmas/')
-        pages = Page.objects.not_sibling_of(event)
-
-        # Check that all pages are not children of events_index
-        for page in pages:
-            if page != event:
-                self.assertNotEqual(page.get_parent(), events_index)
-
-        # Check that the event is included
-        self.assertTrue(pages.filter(id=event.id).exists())
-
-        # Test that events index is in pages
-        self.assertTrue(pages.filter(id=events_index.id).exists())
-
-    def test_not_sibling_of_inclusive(self):
-        events_index = Page.objects.get(url_path='/home/events/')
-        event = Page.objects.get(url_path='/home/events/christmas/')
-        pages = Page.objects.not_sibling_of(event, inclusive=True)
-
-        # Check that all pages are not children of events_index
-        for page in pages:
-            self.assertNotEqual(page.get_parent(), events_index)
-
-        # Check that the event is not included
-        self.assertFalse(pages.filter(id=event.id).exists())
-
-        # Test that events index is in pages
-        self.assertTrue(pages.filter(id=events_index.id).exists())
-
-    def test_type(self):
-        pages = Page.objects.type(EventPage)
-
-        # Check that all objects are EventPages
-        for page in pages:
-            self.assertIsInstance(page.specific, EventPage)
-
-        # Check that "someone elses event" is in the results
-        event = Page.objects.get(url_path='/home/events/someone-elses-event/')
-        self.assertTrue(pages.filter(id=event.id).exists())
-
-    def test_not_type(self):
-        pages = Page.objects.not_type(EventPage)
-
-        # Check that no objects are EventPages
-        for page in pages:
-            self.assertNotIsInstance(page.specific, EventPage)
-
-        # Check that the homepage is in the results
-        homepage = Page.objects.get(url_path='/home/')
-        self.assertTrue(pages.filter(id=homepage.id).exists())
-
-
-class TestMovePage(TestCase):
-    fixtures = ['test.json']
-
-    def test_move_page(self):
-        about_us_page = SimplePage.objects.get(url_path='/home/about-us/')
-        events_index = EventIndex.objects.get(url_path='/home/events/')
-
-        events_index.move(about_us_page, pos='last-child')
-
-        # re-fetch events index to confirm that db fields have been updated
-        events_index = EventIndex.objects.get(id=events_index.id)
-        self.assertEqual(events_index.url_path, '/home/about-us/events/')
-        self.assertEqual(events_index.depth, 4)
-        self.assertEqual(events_index.get_parent().id, about_us_page.id)
-
-        # children of events_index should also have been updated
-        christmas = events_index.get_children().get(slug='christmas')
-        self.assertEqual(christmas.depth, 5)
-        self.assertEqual(christmas.url_path, '/home/about-us/events/christmas/')
-
-
-class TestIssue7(TestCase):
-    """
-    This tests for an issue where if a site root page was moved, all the page 
-    urls in that site would change to None.
-
-    The issue was caused by the 'wagtail_site_root_paths' cache variable not being
-    cleared when a site root page was moved. Which left all the child pages
-    thinking that they are no longer in the site and return None as their url.
-
-    Fix: d6cce69a397d08d5ee81a8cbc1977ab2c9db2682
-    Discussion: https://github.com/torchbox/wagtail/issues/7
-    """
-
-    fixtures = ['test.json']
-
-    def test_issue7(self):
-        # Get homepage, root page and site
-        root_page = Page.objects.get(id=1)
-        homepage = Page.objects.get(url_path='/home/')
-        default_site = Site.objects.get(is_default_site=True)
-
-        # Create a new homepage under current homepage
-        new_homepage = SimplePage(title="New Homepage", slug="new-homepage")
-        homepage.add_child(instance=new_homepage)
-
-        # Set new homepage as the site root page
-        default_site.root_page = new_homepage
-        default_site.save()
-
-        # Warm up the cache by getting the url
-        _ = homepage.url
-
-        # Move new homepage to root
-        new_homepage.move(root_page, pos='last-child')
-
-        # Get fresh instance of new_homepage
-        new_homepage = Page.objects.get(id=new_homepage.id)
-
-        # Check url
-        self.assertEqual(new_homepage.url, '/')
-
-
-class TestIssue157(TestCase):
-    """
-    This tests for an issue where if a site root pages slug was changed, all the page 
-    urls in that site would change to None.
-
-    The issue was caused by the 'wagtail_site_root_paths' cache variable not being
-    cleared when a site root page was changed. Which left all the child pages
-    thinking that they are no longer in the site and return None as their url.
-
-    Fix: d6cce69a397d08d5ee81a8cbc1977ab2c9db2682
-    Discussion: https://github.com/torchbox/wagtail/issues/157
-    """
-
-    fixtures = ['test.json']
-
-    def test_issue157(self):
-        # Get homepage
-        homepage = Page.objects.get(url_path='/home/')
-
-        # Warm up the cache by getting the url
-        _ = homepage.url
-
-        # Change homepage title and slug
-        homepage.title = "New home"
-        homepage.slug = "new-home"
-        homepage.save()
-
-        # Get fresh instance of homepage
-        homepage = Page.objects.get(id=homepage.id)
-
-        # Check url
-        self.assertEqual(homepage.url, '/')
-
-
-class TestFixTreeCommand(TestCase):
-    fixtures = ['test.json']
-
-    def run_command(self):
-        management.call_command('fixtree', interactive=False, stdout=StringIO())
-
-    def test_fixes_numchild(self):
-        # Get homepage and save old value
-        homepage = Page.objects.get(url_path='/home/')
-        old_numchild = homepage.numchild
-
-        # Break it
-        homepage.numchild = 12345
-        homepage.save()
-
-        # Check that its broken
-        self.assertEqual(Page.objects.get(url_path='/home/').numchild, 12345)
-
-        # Call command
-        self.run_command()
-
-        # Check if its fixed
-        self.assertEqual(Page.objects.get(url_path='/home/').numchild, old_numchild)
-
-    def test_fixes_depth(self):
-        # Get homepage and save old value
-        homepage = Page.objects.get(url_path='/home/')
-        old_depth = homepage.depth
-
-        # Break it
-        homepage.depth = 12345
-        homepage.save()
-
-        # Check that its broken
-        self.assertEqual(Page.objects.get(url_path='/home/').depth, 12345)
-
-        # Call command
-        self.run_command()
-
-        # Check if its fixed
-        self.assertEqual(Page.objects.get(url_path='/home/').depth, old_depth)
-
-
-class TestMovePagesCommand(TestCase):
-    fixtures = ['test.json']
-
-    def run_command(self, from_, to):
-        management.call_command('move_pages', str(from_), str(to), interactive=False, stdout=StringIO())
-
-    def test_move_pages(self):
-        # Get pages
-        events_index = Page.objects.get(url_path='/home/events/')
-        about_us = Page.objects.get(url_path='/home/about-us/')
-        page_ids = events_index.get_children().values_list('id', flat=True)
-
-        # Move all events into "about us"
-        self.run_command(events_index.id, about_us.id)
-
-        # Check that all pages moved
-        for page_id in page_ids:
-            self.assertEqual(Page.objects.get(id=page_id).get_parent(), about_us)
-
-
-class TestReplaceTextCommand(TestCase):
-    fixtures = ['test.json']
-
-    def run_command(self, from_text, to_text):
-        management.call_command('replace_text', from_text, to_text, interactive=False, stdout=StringIO())
-
-    def test_replace_text(self):
-        # Check that the christmas page is definitely about christmas
-        self.assertEqual(Page.objects.get(url_path='/home/events/christmas/').title, "Christmas")
-
-        # Make it about easter
-        self.run_command("Christmas", "Easter")
-
-        # Check that its now about easter
-        self.assertEqual(Page.objects.get(url_path='/home/events/christmas/').title, "Easter")
diff --git a/wagtail/wagtailcore/tests/__init__.py b/wagtail/wagtailcore/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/wagtail/wagtailcore/tests/test_management_commands.py b/wagtail/wagtailcore/tests/test_management_commands.py
new file mode 100644
index 000000000..787b808b5
--- /dev/null
+++ b/wagtail/wagtailcore/tests/test_management_commands.py
@@ -0,0 +1,89 @@
+from StringIO import StringIO
+
+from django.test import TestCase, Client
+from django.http import HttpRequest, Http404
+from django.core import management
+from django.contrib.auth.models import User
+
+from wagtail.wagtailcore.models import Page, Site, UserPagePermissionsProxy
+from wagtail.tests.models import EventPage, EventIndex, SimplePage
+
+
+class TestFixTreeCommand(TestCase):
+    fixtures = ['test.json']
+
+    def run_command(self):
+        management.call_command('fixtree', interactive=False, stdout=StringIO())
+
+    def test_fixes_numchild(self):
+        # Get homepage and save old value
+        homepage = Page.objects.get(url_path='/home/')
+        old_numchild = homepage.numchild
+
+        # Break it
+        homepage.numchild = 12345
+        homepage.save()
+
+        # Check that its broken
+        self.assertEqual(Page.objects.get(url_path='/home/').numchild, 12345)
+
+        # Call command
+        self.run_command()
+
+        # Check if its fixed
+        self.assertEqual(Page.objects.get(url_path='/home/').numchild, old_numchild)
+
+    def test_fixes_depth(self):
+        # Get homepage and save old value
+        homepage = Page.objects.get(url_path='/home/')
+        old_depth = homepage.depth
+
+        # Break it
+        homepage.depth = 12345
+        homepage.save()
+
+        # Check that its broken
+        self.assertEqual(Page.objects.get(url_path='/home/').depth, 12345)
+
+        # Call command
+        self.run_command()
+
+        # Check if its fixed
+        self.assertEqual(Page.objects.get(url_path='/home/').depth, old_depth)
+
+
+class TestMovePagesCommand(TestCase):
+    fixtures = ['test.json']
+
+    def run_command(self, from_, to):
+        management.call_command('move_pages', str(from_), str(to), interactive=False, stdout=StringIO())
+
+    def test_move_pages(self):
+        # Get pages
+        events_index = Page.objects.get(url_path='/home/events/')
+        about_us = Page.objects.get(url_path='/home/about-us/')
+        page_ids = events_index.get_children().values_list('id', flat=True)
+
+        # Move all events into "about us"
+        self.run_command(events_index.id, about_us.id)
+
+        # Check that all pages moved
+        for page_id in page_ids:
+            self.assertEqual(Page.objects.get(id=page_id).get_parent(), about_us)
+
+
+class TestReplaceTextCommand(TestCase):
+    fixtures = ['test.json']
+
+    def run_command(self, from_text, to_text):
+        management.call_command('replace_text', from_text, to_text, interactive=False, stdout=StringIO())
+
+    def test_replace_text(self):
+        # Check that the christmas page is definitely about christmas
+        self.assertEqual(Page.objects.get(url_path='/home/events/christmas/').title, "Christmas")
+
+        # Make it about easter
+        self.run_command("Christmas", "Easter")
+
+        # Check that its now about easter
+        self.assertEqual(Page.objects.get(url_path='/home/events/christmas/').title, "Easter")
diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py
new file mode 100644
index 000000000..1bae57952
--- /dev/null
+++ b/wagtail/wagtailcore/tests/test_page_model.py
@@ -0,0 +1,226 @@
+from StringIO import StringIO
+
+from django.test import TestCase, Client
+from django.http import HttpRequest, Http404
+from django.core import management
+from django.contrib.auth.models import User
+
+from wagtail.wagtailcore.models import Page, Site, UserPagePermissionsProxy
+from wagtail.tests.models import EventPage, EventIndex, SimplePage
+
+
+class TestRouting(TestCase):
+    fixtures = ['test.json']
+
+    def test_find_site_for_request(self):
+        default_site = Site.objects.get(is_default_site=True)
+        events_page = Page.objects.get(url_path='/home/events/')
+        events_site = Site.objects.create(hostname='events.example.com', root_page=events_page)
+
+        # requests without a Host: header should be directed to the default site
+        request = HttpRequest()
+        request.path = '/'
+        self.assertEqual(Site.find_for_request(request), default_site)
+
+        # requests with a known Host: header should be directed to the specific site
+        request = HttpRequest()
+        request.path = '/'
+        request.META['HTTP_HOST'] = 'events.example.com'
+        self.assertEqual(Site.find_for_request(request), events_site)
+
+        # requests with an unrecognised Host: header should be directed to the default site
+        request = HttpRequest()
+        request.path = '/'
+        request.META['HTTP_HOST'] = 'unknown.example.com'
+        self.assertEqual(Site.find_for_request(request), default_site)
+
+    def test_urls(self):
+        default_site = Site.objects.get(is_default_site=True)
+        homepage = Page.objects.get(url_path='/home/')
+        christmas_page = Page.objects.get(url_path='/home/events/christmas/')
+
+        # Basic installation only has one site configured, so page.url will return local URLs
+        self.assertEqual(homepage.full_url, 'http://localhost/')
+        self.assertEqual(homepage.url, '/')
+        self.assertEqual(homepage.relative_url(default_site), '/')
+
+        self.assertEqual(christmas_page.full_url, 'http://localhost/events/christmas/')
+        self.assertEqual(christmas_page.url, '/events/christmas/')
+        self.assertEqual(christmas_page.relative_url(default_site), '/events/christmas/')
+
+    def test_urls_with_multiple_sites(self):
+        events_page = Page.objects.get(url_path='/home/events/')
+        events_site = Site.objects.create(hostname='events.example.com', root_page=events_page)
+
+        default_site = Site.objects.get(is_default_site=True)
+        homepage = Page.objects.get(url_path='/home/')
+        christmas_page = Page.objects.get(url_path='/home/events/christmas/')
+
+        # with multiple sites, page.url will return full URLs to ensure that
+        # they work across sites
+        self.assertEqual(homepage.full_url, 'http://localhost/')
+        self.assertEqual(homepage.url, 'http://localhost/')
+        self.assertEqual(homepage.relative_url(default_site), '/')
+        self.assertEqual(homepage.relative_url(events_site), 'http://localhost/')
+
+        self.assertEqual(christmas_page.full_url, 'http://events.example.com/christmas/')
+        self.assertEqual(christmas_page.url, 'http://events.example.com/christmas/')
+        self.assertEqual(christmas_page.relative_url(default_site), 'http://events.example.com/christmas/')
+        self.assertEqual(christmas_page.relative_url(events_site), '/christmas/')
+
+    def test_request_routing(self):
+        homepage = Page.objects.get(url_path='/home/')
+        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
+
+        request = HttpRequest()
+        request.path = '/events/christmas/'
+        response = homepage.route(request, ['events', 'christmas'])
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context_data['self'], christmas_page)
+        used_template = response.resolve_template(response.template_name)
+        self.assertEqual(used_template.name, 'tests/event_page.html')
+
+    def test_route_to_unknown_page_returns_404(self):
+        homepage = Page.objects.get(url_path='/home/')
+
+        request = HttpRequest()
+        request.path = '/events/quinquagesima/'
+        with self.assertRaises(Http404):
+            homepage.route(request, ['events', 'quinquagesima'])
+
+    def test_route_to_unpublished_page_returns_404(self):
+        homepage = Page.objects.get(url_path='/home/')
+
+        request = HttpRequest()
+        request.path = '/events/tentative-unpublished-event/'
+        with self.assertRaises(Http404):
+            homepage.route(request, ['events', 'tentative-unpublished-event'])
+
+
+class TestServeView(TestCase):
+    fixtures = ['test.json']
+
+    def setUp(self):
+        # Explicitly clear the cache of site root paths. Normally this would be kept
+        # in sync by the Site.save logic, but this is bypassed when the database is
+        # rolled back between tests using transactions.
+        from django.core.cache import cache
+        cache.delete('wagtail_site_root_paths')
+
+    def test_serve(self):
+        response = self.client.get('/events/christmas/')
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.templates[0].name, 'tests/event_page.html')
+        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
+        self.assertEqual(response.context['self'], christmas_page)
+
+        self.assertContains(response, '<h1>Christmas</h1>')
+        self.assertContains(response, '<h2>Event</h2>')
+
+    def test_serve_unknown_page_returns_404(self):
+        response = self.client.get('/events/quinquagesima/')
+        self.assertEqual(response.status_code, 404)
+
+    def test_serve_unpublished_page_returns_404(self):
+        response = self.client.get('/events/tentative-unpublished-event/')
+        self.assertEqual(response.status_code, 404)
+
+    def test_serve_with_multiple_sites(self):
+        events_page = Page.objects.get(url_path='/home/events/')
+        Site.objects.create(hostname='events.example.com', root_page=events_page)
+
+        response = self.client.get('/christmas/', HTTP_HOST='events.example.com')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.templates[0].name, 'tests/event_page.html')
+        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
+        self.assertEqual(response.context['self'], christmas_page)
+
+        self.assertContains(response, '<h1>Christmas</h1>')
+        self.assertContains(response, '<h2>Event</h2>')
+
+        # same request to the default host should return a 404
+        c = Client()
+        response = c.get('/christmas/', HTTP_HOST='localhost')
+        self.assertEqual(response.status_code, 404)
+
+    def test_serve_with_custom_context(self):
+        response = self.client.get('/events/')
+        self.assertEqual(response.status_code, 200)
+
+        # should render the whole page
+        self.assertContains(response, '<h1>Events</h1>')
+
+        # response should contain data from the custom 'events' context variable
+        self.assertContains(response, '<a href="/events/christmas/">Christmas</a>')
+
+    def test_ajax_response(self):
+        response = self.client.get('/events/', HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        self.assertEqual(response.status_code, 200)
+
+        # should only render the content of includes/event_listing.html, not the whole page
+        self.assertNotContains(response, '<h1>Events</h1>')
+        self.assertContains(response, '<a href="/events/christmas/">Christmas</a>')
+
+
+class TestStaticSitePaths(TestCase):
+    def setUp(self):
+        self.root_page = Page.objects.get(id=1)
+
+        # For simple tests
+        self.home_page = self.root_page.add_child(instance=SimplePage(title="Homepage", slug="home"))
+        self.about_page = self.home_page.add_child(instance=SimplePage(title="About us", slug="about"))
+        self.contact_page = self.home_page.add_child(instance=SimplePage(title="Contact", slug="contact"))
+
+        # For custom tests
+        self.event_index = self.root_page.add_child(instance=EventIndex(title="Events", slug="events"))
+        for i in range(20):
+            self.event_index.add_child(instance=EventPage(title="Event " + str(i), slug="event" + str(i)))
+
+    def test_local_static_site_paths(self):
+        paths = list(self.about_page.get_static_site_paths())
+
+        self.assertEqual(paths, ['/'])
+
+    def test_child_static_site_paths(self):
+        paths = list(self.home_page.get_static_site_paths())
+
+        self.assertEqual(paths, ['/', '/about/', '/contact/'])
+
+    def test_custom_static_site_paths(self):
+        paths = list(self.event_index.get_static_site_paths())
+
+        # Event index path
+        expected_paths = ['/']
+
+        # One path for each page of results
+        expected_paths.extend(['/' + str(i + 1) + '/' for i in range(5)])
+
+        # One path for each event page
+        expected_paths.extend(['/event' + str(i) + '/' for i in range(20)])
+
+        paths.sort()
+        expected_paths.sort()
+        self.assertEqual(paths, expected_paths)
+
+
+class TestMovePage(TestCase):
+    fixtures = ['test.json']
+
+    def test_move_page(self):
+        about_us_page = SimplePage.objects.get(url_path='/home/about-us/')
+        events_index = EventIndex.objects.get(url_path='/home/events/')
+
+        events_index.move(about_us_page, pos='last-child')
+
+        # re-fetch events index to confirm that db fields have been updated
+        events_index = EventIndex.objects.get(id=events_index.id)
+        self.assertEqual(events_index.url_path, '/home/about-us/events/')
+        self.assertEqual(events_index.depth, 4)
+        self.assertEqual(events_index.get_parent().id, about_us_page.id)
+
+        # children of events_index should also have been updated
+        christmas = events_index.get_children().get(slug='christmas')
+        self.assertEqual(christmas.depth, 5)
+        self.assertEqual(christmas.url_path, '/home/about-us/events/christmas/')
diff --git a/wagtail/wagtailcore/tests/test_page_permissions.py b/wagtail/wagtailcore/tests/test_page_permissions.py
new file mode 100644
index 000000000..dbe35e39b
--- /dev/null
+++ b/wagtail/wagtailcore/tests/test_page_permissions.py
@@ -0,0 +1,226 @@
+from StringIO import StringIO
+
+from django.test import TestCase, Client
+from django.http import HttpRequest, Http404
+from django.core import management
+from django.contrib.auth.models import User
+
+from wagtail.wagtailcore.models import Page, Site, UserPagePermissionsProxy
+from wagtail.tests.models import EventPage, EventIndex, SimplePage
+
+
+class TestPagePermission(TestCase):
+    fixtures = ['test.json']
+
+    def test_nonpublisher_page_permissions(self):
+        event_editor = User.objects.get(username='eventeditor')
+        homepage = Page.objects.get(url_path='/home/')
+        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
+        unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/')
+        someone_elses_event_page = EventPage.objects.get(url_path='/home/events/someone-elses-event/')
+
+        homepage_perms = homepage.permissions_for_user(event_editor)
+        christmas_page_perms = christmas_page.permissions_for_user(event_editor)
+        unpub_perms = unpublished_event_page.permissions_for_user(event_editor)
+        someone_elses_event_perms = someone_elses_event_page.permissions_for_user(event_editor)
+
+        self.assertFalse(homepage_perms.can_add_subpage())
+        self.assertTrue(christmas_page_perms.can_add_subpage())
+        self.assertTrue(unpub_perms.can_add_subpage())
+        self.assertTrue(someone_elses_event_perms.can_add_subpage())
+
+        self.assertFalse(homepage_perms.can_edit())
+        self.assertTrue(christmas_page_perms.can_edit())
+        self.assertTrue(unpub_perms.can_edit())
+        self.assertFalse(someone_elses_event_perms.can_edit())  # basic 'add' permission doesn't allow editing pages owned by someone else
+
+        self.assertFalse(homepage_perms.can_delete())
+        self.assertFalse(christmas_page_perms.can_delete())  # cannot delete because it is published
+        self.assertTrue(unpub_perms.can_delete())
+        self.assertFalse(someone_elses_event_perms.can_delete())
+
+        self.assertFalse(homepage_perms.can_publish())
+        self.assertFalse(christmas_page_perms.can_publish())
+        self.assertFalse(unpub_perms.can_publish())
+
+        self.assertFalse(homepage_perms.can_unpublish())
+        self.assertFalse(christmas_page_perms.can_unpublish())
+        self.assertFalse(unpub_perms.can_unpublish())
+
+        self.assertFalse(homepage_perms.can_publish_subpage())
+        self.assertFalse(christmas_page_perms.can_publish_subpage())
+        self.assertFalse(unpub_perms.can_publish_subpage())
+
+        self.assertFalse(homepage_perms.can_reorder_children())
+        self.assertFalse(christmas_page_perms.can_reorder_children())
+        self.assertFalse(unpub_perms.can_reorder_children())
+
+        self.assertFalse(homepage_perms.can_move())
+        self.assertFalse(christmas_page_perms.can_move())  # cannot move because this would involve unpublishing from its current location
+        self.assertTrue(unpub_perms.can_move())
+        self.assertFalse(someone_elses_event_perms.can_move())
+
+        self.assertFalse(christmas_page_perms.can_move_to(unpublished_event_page))  # cannot move because this would involve unpublishing from its current location
+        self.assertTrue(unpub_perms.can_move_to(christmas_page))
+        self.assertFalse(unpub_perms.can_move_to(homepage))  # no permission to create pages at destination
+        self.assertFalse(unpub_perms.can_move_to(unpublished_event_page))  # cannot make page a child of itself
+
+
+    def test_publisher_page_permissions(self):
+        event_moderator = User.objects.get(username='eventmoderator')
+        homepage = Page.objects.get(url_path='/home/')
+        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
+        unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/')
+
+        homepage_perms = homepage.permissions_for_user(event_moderator)
+        christmas_page_perms = christmas_page.permissions_for_user(event_moderator)
+        unpub_perms = unpublished_event_page.permissions_for_user(event_moderator)
+
+        self.assertFalse(homepage_perms.can_add_subpage())
+        self.assertTrue(christmas_page_perms.can_add_subpage())
+        self.assertTrue(unpub_perms.can_add_subpage())
+
+        self.assertFalse(homepage_perms.can_edit())
+        self.assertTrue(christmas_page_perms.can_edit())
+        self.assertTrue(unpub_perms.can_edit())
+
+        self.assertFalse(homepage_perms.can_delete())
+        self.assertTrue(christmas_page_perms.can_delete())  # cannot delete because it is published
+        self.assertTrue(unpub_perms.can_delete())
+
+        self.assertFalse(homepage_perms.can_publish())
+        self.assertTrue(christmas_page_perms.can_publish())
+        self.assertTrue(unpub_perms.can_publish())
+
+        self.assertFalse(homepage_perms.can_unpublish())
+        self.assertTrue(christmas_page_perms.can_unpublish())
+        self.assertFalse(unpub_perms.can_unpublish())  # cannot unpublish a page that isn't published
+
+        self.assertFalse(homepage_perms.can_publish_subpage())
+        self.assertTrue(christmas_page_perms.can_publish_subpage())
+        self.assertTrue(unpub_perms.can_publish_subpage())
+
+        self.assertFalse(homepage_perms.can_reorder_children())
+        self.assertTrue(christmas_page_perms.can_reorder_children())
+        self.assertTrue(unpub_perms.can_reorder_children())
+
+        self.assertFalse(homepage_perms.can_move())
+        self.assertTrue(christmas_page_perms.can_move())
+        self.assertTrue(unpub_perms.can_move())
+
+        self.assertTrue(christmas_page_perms.can_move_to(unpublished_event_page))
+        self.assertTrue(unpub_perms.can_move_to(christmas_page))
+        self.assertFalse(unpub_perms.can_move_to(homepage))  # no permission to create pages at destination
+        self.assertFalse(unpub_perms.can_move_to(unpublished_event_page))  # cannot make page a child of itself
+
+    def test_inactive_user_has_no_permissions(self):
+        user = User.objects.get(username='inactiveuser')
+        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
+        unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/')
+
+        christmas_page_perms = christmas_page.permissions_for_user(user)
+        unpub_perms = unpublished_event_page.permissions_for_user(user)
+
+        self.assertFalse(unpub_perms.can_add_subpage())
+        self.assertFalse(unpub_perms.can_edit())
+        self.assertFalse(unpub_perms.can_delete())
+        self.assertFalse(unpub_perms.can_publish())
+        self.assertFalse(christmas_page_perms.can_unpublish())
+        self.assertFalse(unpub_perms.can_publish_subpage())
+        self.assertFalse(unpub_perms.can_reorder_children())
+        self.assertFalse(unpub_perms.can_move())
+        self.assertFalse(unpub_perms.can_move_to(christmas_page))
+
+    def test_superuser_has_full_permissions(self):
+        user = User.objects.get(username='superuser')
+        homepage = Page.objects.get(url_path='/home/')
+        root = Page.objects.get(url_path='/')
+        unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/')
+
+        homepage_perms = homepage.permissions_for_user(user)
+        root_perms = root.permissions_for_user(user)
+        unpub_perms = unpublished_event_page.permissions_for_user(user)
+
+        self.assertTrue(homepage_perms.can_add_subpage())
+        self.assertTrue(root_perms.can_add_subpage())
+
+        self.assertTrue(homepage_perms.can_edit())
+        self.assertFalse(root_perms.can_edit())  # root is not a real editable page, even to superusers
+
+        self.assertTrue(homepage_perms.can_delete())
+        self.assertFalse(root_perms.can_delete())
+
+        self.assertTrue(homepage_perms.can_publish())
+        self.assertFalse(root_perms.can_publish())
+
+        self.assertTrue(homepage_perms.can_unpublish())
+        self.assertFalse(root_perms.can_unpublish())
+        self.assertFalse(unpub_perms.can_unpublish())
+
+        self.assertTrue(homepage_perms.can_publish_subpage())
+        self.assertTrue(root_perms.can_publish_subpage())
+
+        self.assertTrue(homepage_perms.can_reorder_children())
+        self.assertTrue(root_perms.can_reorder_children())
+
+        self.assertTrue(homepage_perms.can_move())
+        self.assertFalse(root_perms.can_move())
+
+        self.assertTrue(homepage_perms.can_move_to(root))
+        self.assertFalse(homepage_perms.can_move_to(unpublished_event_page))
+
+    def test_editable_pages_for_user_with_add_permission(self):
+        event_editor = User.objects.get(username='eventeditor')
+        homepage = Page.objects.get(url_path='/home/')
+        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
+        unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/')
+        someone_elses_event_page = EventPage.objects.get(url_path='/home/events/someone-elses-event/')
+
+        editable_pages = UserPagePermissionsProxy(event_editor).editable_pages()
+
+        self.assertFalse(editable_pages.filter(id=homepage.id).exists())
+        self.assertTrue(editable_pages.filter(id=christmas_page.id).exists())
+        self.assertTrue(editable_pages.filter(id=unpublished_event_page.id).exists())
+        self.assertFalse(editable_pages.filter(id=someone_elses_event_page.id).exists())
+
+    def test_editable_pages_for_user_with_edit_permission(self):
+        event_moderator = User.objects.get(username='eventmoderator')
+        homepage = Page.objects.get(url_path='/home/')
+        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
+        unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/')
+        someone_elses_event_page = EventPage.objects.get(url_path='/home/events/someone-elses-event/')
+
+        editable_pages = UserPagePermissionsProxy(event_moderator).editable_pages()
+
+        self.assertFalse(editable_pages.filter(id=homepage.id).exists())
+        self.assertTrue(editable_pages.filter(id=christmas_page.id).exists())
+        self.assertTrue(editable_pages.filter(id=unpublished_event_page.id).exists())
+        self.assertTrue(editable_pages.filter(id=someone_elses_event_page.id).exists())
+
+    def test_editable_pages_for_inactive_user(self):
+        user = User.objects.get(username='inactiveuser')
+        homepage = Page.objects.get(url_path='/home/')
+        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
+        unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/')
+        someone_elses_event_page = EventPage.objects.get(url_path='/home/events/someone-elses-event/')
+
+        editable_pages = UserPagePermissionsProxy(user).editable_pages()
+
+        self.assertFalse(editable_pages.filter(id=homepage.id).exists())
+        self.assertFalse(editable_pages.filter(id=christmas_page.id).exists())
+        self.assertFalse(editable_pages.filter(id=unpublished_event_page.id).exists())
+        self.assertFalse(editable_pages.filter(id=someone_elses_event_page.id).exists())
+
+    def test_editable_pages_for_superuser(self):
+        user = User.objects.get(username='superuser')
+        homepage = Page.objects.get(url_path='/home/')
+        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
+        unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/')
+        someone_elses_event_page = EventPage.objects.get(url_path='/home/events/someone-elses-event/')
+
+        editable_pages = UserPagePermissionsProxy(user).editable_pages()
+
+        self.assertTrue(editable_pages.filter(id=homepage.id).exists())
+        self.assertTrue(editable_pages.filter(id=christmas_page.id).exists())
+        self.assertTrue(editable_pages.filter(id=unpublished_event_page.id).exists())
+        self.assertTrue(editable_pages.filter(id=someone_elses_event_page.id).exists())
diff --git a/wagtail/wagtailcore/tests/test_page_queryset.py b/wagtail/wagtailcore/tests/test_page_queryset.py
new file mode 100644
index 000000000..06f2c3e21
--- /dev/null
+++ b/wagtail/wagtailcore/tests/test_page_queryset.py
@@ -0,0 +1,256 @@
+from StringIO import StringIO
+
+from django.test import TestCase, Client
+from django.http import HttpRequest, Http404
+from django.core import management
+from django.contrib.auth.models import User
+
+from wagtail.wagtailcore.models import Page, Site, UserPagePermissionsProxy
+from wagtail.tests.models import EventPage, EventIndex, SimplePage
+
+
+class TestPageQuerySet(TestCase):
+    fixtures = ['test.json']
+
+    def test_live(self):
+        pages = Page.objects.live()
+
+        # All pages must be live
+        for page in pages:
+            self.assertTrue(page.live)
+
+        # Check that the homepage is in the results
+        homepage = Page.objects.get(url_path='/home/')
+        self.assertTrue(pages.filter(id=homepage.id).exists())
+
+    def test_not_live(self):
+        pages = Page.objects.not_live()
+
+        # All pages must not be live
+        for page in pages:
+            self.assertFalse(page.live)
+
+        # Check that "someone elses event" is in the results
+        event = Page.objects.get(url_path='/home/events/someone-elses-event/')
+        self.assertTrue(pages.filter(id=event.id).exists())
+
+    def test_page(self):
+        homepage = Page.objects.get(url_path='/home/')
+        pages = Page.objects.page(homepage)
+
+        # Should only select the homepage
+        self.assertEqual(pages.count(), 1)
+        self.assertEqual(pages.first(), homepage)
+
+    def test_not_page(self):
+        homepage = Page.objects.get(url_path='/home/')
+        pages = Page.objects.not_page(homepage)
+
+        # Should select everything except for the homepage
+        self.assertEqual(pages.count(), Page.objects.all().count() - 1)
+        for page in pages:
+            self.assertNotEqual(page, homepage)
+
+    def test_descendant_of(self):
+        events_index = Page.objects.get(url_path='/home/events/')
+        pages = Page.objects.descendant_of(events_index)
+
+        # Check that all pages descend from events index
+        for page in pages:
+            self.assertTrue(page.get_ancestors().filter(id=events_index.id).exists())
+
+    def test_descendant_of_inclusive(self):
+        events_index = Page.objects.get(url_path='/home/events/')
+        pages = Page.objects.descendant_of(events_index, inclusive=True)
+
+        # Check that all pages descend from events index, includes event index
+        for page in pages:
+            self.assertTrue(page == events_index or page.get_ancestors().filter(id=events_index.id).exists())
+
+        # Check that event index was included
+        self.assertTrue(pages.filter(id=events_index.id).exists())
+
+    def test_not_descendant_of(self):
+        homepage = Page.objects.get(url_path='/home/')
+        events_index = Page.objects.get(url_path='/home/events/')
+        pages = Page.objects.not_descendant_of(events_index)
+
+        # Check that no pages descend from events_index
+        for page in pages:
+            self.assertFalse(page.get_ancestors().filter(id=events_index.id).exists())
+
+        # As this is not inclusive, events index should be in the results
+        self.assertTrue(pages.filter(id=events_index.id).exists())
+
+    def test_not_descendant_of_inclusive(self):
+        homepage = Page.objects.get(url_path='/home/')
+        events_index = Page.objects.get(url_path='/home/events/')
+        pages = Page.objects.not_descendant_of(events_index, inclusive=True)
+
+        # Check that all pages descend from homepage but not events index
+        for page in pages:
+            self.assertFalse(page.get_ancestors().filter(id=events_index.id).exists())
+
+        # As this is inclusive, events index should not be in the results
+        self.assertFalse(pages.filter(id=events_index.id).exists())
+
+    def test_child_of(self):
+        homepage = Page.objects.get(url_path='/home/')
+        pages = Page.objects.child_of(homepage)
+
+        # Check that all pages are children of homepage
+        for page in pages:
+            self.assertEqual(page.get_parent(), homepage)
+
+    def test_not_child_of(self):
+        events_index = Page.objects.get(url_path='/home/events/')
+        pages = Page.objects.not_child_of(events_index)
+
+        # Check that all pages are not children of events_index
+        for page in pages:
+            self.assertNotEqual(page.get_parent(), events_index)
+
+    def test_ancestor_of(self):
+        root_page = Page.objects.get(id=1)
+        homepage = Page.objects.get(url_path='/home/')
+        events_index = Page.objects.get(url_path='/home/events/')
+        pages = Page.objects.ancestor_of(events_index)
+
+        self.assertEqual(pages.count(), 2)
+        self.assertEqual(pages[0], root_page)
+        self.assertEqual(pages[1], homepage)
+
+    def test_ancestor_of_inclusive(self):
+        root_page = Page.objects.get(id=1)
+        homepage = Page.objects.get(url_path='/home/')
+        events_index = Page.objects.get(url_path='/home/events/')
+        pages = Page.objects.ancestor_of(events_index, inclusive=True)
+
+        self.assertEqual(pages.count(), 3)
+        self.assertEqual(pages[0], root_page)
+        self.assertEqual(pages[1], homepage)
+        self.assertEqual(pages[2], events_index)
+
+    def test_not_ancestor_of(self):
+        root_page = Page.objects.get(id=1)
+        homepage = Page.objects.get(url_path='/home/')
+        events_index = Page.objects.get(url_path='/home/events/')
+        pages = Page.objects.not_ancestor_of(events_index)
+
+        # Test that none of the ancestors are in pages
+        for page in pages:
+            self.assertNotEqual(page, root_page)
+            self.assertNotEqual(page, homepage)
+
+        # Test that events index is in pages
+        self.assertTrue(pages.filter(id=events_index.id).exists())
+
+    def test_not_ancestor_of_inclusive(self):
+        root_page = Page.objects.get(id=1)
+        homepage = Page.objects.get(url_path='/home/')
+        events_index = Page.objects.get(url_path='/home/events/')
+        pages = Page.objects.not_ancestor_of(events_index, inclusive=True)
+
+        # Test that none of the ancestors or the events_index are in pages
+        for page in pages:
+            self.assertNotEqual(page, root_page)
+            self.assertNotEqual(page, homepage)
+            self.assertNotEqual(page, events_index)
+
+    def test_parent_of(self):
+        homepage = Page.objects.get(url_path='/home/')
+        events_index = Page.objects.get(url_path='/home/events/')
+        pages = Page.objects.parent_of(events_index)
+
+        # Pages must only contain homepage
+        self.assertEqual(pages.count(), 1)
+        self.assertEqual(pages[0], homepage)
+
+    def test_not_parent_of(self):
+        homepage = Page.objects.get(url_path='/home/')
+        events_index = Page.objects.get(url_path='/home/events/')
+        pages = Page.objects.not_parent_of(events_index)
+
+        # Pages must not contain homepage
+        for page in pages:
+            self.assertNotEqual(page, homepage)
+
+        # Test that events index is in pages
+        self.assertTrue(pages.filter(id=events_index.id).exists())
+
+    def test_sibling_of(self):
+        events_index = Page.objects.get(url_path='/home/events/')
+        event = Page.objects.get(url_path='/home/events/christmas/')
+        pages = Page.objects.sibling_of(event)
+
+        # Check that all pages are children of events_index
+        for page in pages:
+            self.assertEqual(page.get_parent(), events_index)
+
+        # Check that the event is not included
+        self.assertFalse(pages.filter(id=event.id).exists())
+
+    def test_sibling_of_inclusive(self):
+        events_index = Page.objects.get(url_path='/home/events/')
+        event = Page.objects.get(url_path='/home/events/christmas/')
+        pages = Page.objects.sibling_of(event, inclusive=True)
+
+        # Check that all pages are children of events_index
+        for page in pages:
+            self.assertEqual(page.get_parent(), events_index)
+
+        # Check that the event is included
+        self.assertTrue(pages.filter(id=event.id).exists())
+
+    def test_not_sibling_of(self):
+        events_index = Page.objects.get(url_path='/home/events/')
+        event = Page.objects.get(url_path='/home/events/christmas/')
+        pages = Page.objects.not_sibling_of(event)
+
+        # Check that all pages are not children of events_index
+        for page in pages:
+            if page != event:
+                self.assertNotEqual(page.get_parent(), events_index)
+
+        # Check that the event is included
+        self.assertTrue(pages.filter(id=event.id).exists())
+
+        # Test that events index is in pages
+        self.assertTrue(pages.filter(id=events_index.id).exists())
+
+    def test_not_sibling_of_inclusive(self):
+        events_index = Page.objects.get(url_path='/home/events/')
+        event = Page.objects.get(url_path='/home/events/christmas/')
+        pages = Page.objects.not_sibling_of(event, inclusive=True)
+
+        # Check that all pages are not children of events_index
+        for page in pages:
+            self.assertNotEqual(page.get_parent(), events_index)
+
+        # Check that the event is not included
+        self.assertFalse(pages.filter(id=event.id).exists())
+
+        # Test that events index is in pages
+        self.assertTrue(pages.filter(id=events_index.id).exists())
+
+    def test_type(self):
+        pages = Page.objects.type(EventPage)
+
+        # Check that all objects are EventPages
+        for page in pages:
+            self.assertIsInstance(page.specific, EventPage)
+
+        # Check that "someone elses event" is in the results
+        event = Page.objects.get(url_path='/home/events/someone-elses-event/')
+        self.assertTrue(pages.filter(id=event.id).exists())
+
+    def test_not_type(self):
+        pages = Page.objects.not_type(EventPage)
+
+        # Check that no objects are EventPages
+        for page in pages:
+            self.assertNotIsInstance(page.specific, EventPage)
+
+        # Check that the homepage is in the results
+        homepage = Page.objects.get(url_path='/home/')
+        self.assertTrue(pages.filter(id=homepage.id).exists())
diff --git a/wagtail/wagtailcore/tests/tests.py b/wagtail/wagtailcore/tests/tests.py
new file mode 100644
index 000000000..d10474bba
--- /dev/null
+++ b/wagtail/wagtailcore/tests/tests.py
@@ -0,0 +1,99 @@
+from StringIO import StringIO
+
+from django.test import TestCase, Client
+from django.http import HttpRequest, Http404
+from django.core import management
+from django.contrib.auth.models import User
+
+from wagtail.wagtailcore.models import Page, Site, UserPagePermissionsProxy
+from wagtail.tests.models import EventPage, EventIndex, SimplePage
+
+
+class TestPageUrlTags(TestCase):
+    fixtures = ['test.json']
+
+    def test_pageurl_tag(self):
+        response = self.client.get('/events/')
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, '<a href="/events/christmas/">Christmas</a>')
+
+    def test_slugurl_tag(self):
+        response = self.client.get('/events/christmas/')
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, '<a href="/events/">Back to events index</a>')
+
+
+class TestIssue7(TestCase):
+    """
+    This tests for an issue where if a site root page was moved, all the page 
+    urls in that site would change to None.
+
+    The issue was caused by the 'wagtail_site_root_paths' cache variable not being
+    cleared when a site root page was moved. Which left all the child pages
+    thinking that they are no longer in the site and return None as their url.
+
+    Fix: d6cce69a397d08d5ee81a8cbc1977ab2c9db2682
+    Discussion: https://github.com/torchbox/wagtail/issues/7
+    """
+
+    fixtures = ['test.json']
+
+    def test_issue7(self):
+        # Get homepage, root page and site
+        root_page = Page.objects.get(id=1)
+        homepage = Page.objects.get(url_path='/home/')
+        default_site = Site.objects.get(is_default_site=True)
+
+        # Create a new homepage under current homepage
+        new_homepage = SimplePage(title="New Homepage", slug="new-homepage")
+        homepage.add_child(instance=new_homepage)
+
+        # Set new homepage as the site root page
+        default_site.root_page = new_homepage
+        default_site.save()
+
+        # Warm up the cache by getting the url
+        _ = homepage.url
+
+        # Move new homepage to root
+        new_homepage.move(root_page, pos='last-child')
+
+        # Get fresh instance of new_homepage
+        new_homepage = Page.objects.get(id=new_homepage.id)
+
+        # Check url
+        self.assertEqual(new_homepage.url, '/')
+
+
+class TestIssue157(TestCase):
+    """
+    This tests for an issue where if a site root pages slug was changed, all the page 
+    urls in that site would change to None.
+
+    The issue was caused by the 'wagtail_site_root_paths' cache variable not being
+    cleared when a site root page was changed. Which left all the child pages
+    thinking that they are no longer in the site and return None as their url.
+
+    Fix: d6cce69a397d08d5ee81a8cbc1977ab2c9db2682
+    Discussion: https://github.com/torchbox/wagtail/issues/157
+    """
+
+    fixtures = ['test.json']
+
+    def test_issue157(self):
+        # Get homepage
+        homepage = Page.objects.get(url_path='/home/')
+
+        # Warm up the cache by getting the url
+        _ = homepage.url
+
+        # Change homepage title and slug
+        homepage.title = "New home"
+        homepage.slug = "new-home"
+        homepage.save()
+
+        # Get fresh instance of homepage
+        homepage = Page.objects.get(id=homepage.id)
+
+        # Check url
+        self.assertEqual(homepage.url, '/')

From d0914e804366e0a4026ecf901ffd41b797e460cd Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Thu, 5 Jun 2014 10:20:34 +0100
Subject: [PATCH 22/60] Fix unit test failure when embedly is not installed

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

diff --git a/wagtail/wagtailembeds/embeds.py b/wagtail/wagtailembeds/embeds.py
index abe993d1d..9b3a8c0cf 100644
--- a/wagtail/wagtailembeds/embeds.py
+++ b/wagtail/wagtailembeds/embeds.py
@@ -58,7 +58,7 @@ def embedly(url, max_width=None, key=None):
         # Get embedly client
         client = Embedly(key)
     except ImportError:
-        client = MockEmbedly(key)
+        client = MockEmbedly()
 
     # Call embedly
     if max_width is not None:

From 371e415857c53b91739ccfdcc10d6c2cf746fc3b Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Thu, 5 Jun 2014 14:26:09 +0100
Subject: [PATCH 23/60] Add tests for wagtailembeds.embeds.oembed()

---
 wagtail/wagtailembeds/tests.py | 61 ++++++++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py
index ff03fba42..c942b158d 100644
--- a/wagtail/wagtailembeds/tests.py
+++ b/wagtail/wagtailembeds/tests.py
@@ -1,3 +1,6 @@
+from mock import patch
+import urllib2
+
 try:
     from embedly import Embedly
     patch_me = 'embedly.Embedly.oembed'
@@ -7,8 +10,6 @@ except ImportError:
 from django.test import TestCase
 from django.test.client import Client
 
-from mock import patch
-
 from wagtail.tests.utils import login
 from wagtail.wagtailembeds import get_embed
 from wagtail.wagtailembeds.embeds import (
@@ -18,6 +19,7 @@ from wagtail.wagtailembeds.embeds import (
     AccessDeniedEmbedlyException,
     MockEmbedly
 )
+from wagtail.wagtailembeds.embeds import oembed as wagtail_oembed
 
 
 class TestEmbeds(TestCase):
@@ -168,3 +170,58 @@ class TestEmbedly(TestCase):
                                   'width': 100,
                                   'height': 100,
                                   'html': '<foo>bar</foo>'})
+
+
+class TestOembed(TestCase):
+    def setUp(self):
+        class DummyResponse(object):
+            def read(self):
+                return "foo"
+        self.dummy_response = DummyResponse()
+
+    def test_oembed_invalid_provider(self):
+        self.assertRaises(EmbedNotFoundException, wagtail_oembed, "foo")
+
+    def test_oembed_invalid_request(self):
+        config = {'side_effect': urllib2.URLError('foo')}
+        with patch.object(urllib2, 'urlopen', **config) as urlopen:
+            self.assertRaises(EmbedNotFoundException, wagtail_oembed,
+                              "http://www.youtube.com/watch/")
+
+    @patch('urllib2.urlopen')
+    @patch('json.loads')
+    def test_oembed_photo_request(self, loads, urlopen) :
+        urlopen.return_value = self.dummy_response
+        loads.return_value = {'type': 'photo',
+                              'url': 'http://www.example.com'}
+        result = wagtail_oembed("http://www.youtube.com/watch/")
+        self.assertEqual(result['type'], 'photo')
+        self.assertEqual(result['html'], '<img src="http://www.example.com" />')
+        loads.assert_called_with("foo")
+
+    @patch('urllib2.urlopen')
+    @patch('json.loads')
+    def test_oembed_return_values(self, loads, urlopen):
+        urlopen.return_value = self.dummy_response
+        loads.return_value = {
+            'type': 'something',
+            'url': 'http://www.example.com',
+            'title': 'test_title',
+            'author_name': 'test_author',
+            'provider_name': 'test_provider_name',
+            'thumbnail_url': 'test_thumbail_url',
+            'width': 'test_width',
+            'height': 'test_height',
+            'html': 'test_html'
+        }
+        result = wagtail_oembed("http://www.youtube.com/watch/")
+        self.assertEqual(result, {
+            'type': 'something',
+            'title': 'test_title',
+            'author_name': 'test_author',
+            'provider_name': 'test_provider_name',
+            'thumbnail_url': 'test_thumbail_url',
+            'width': 'test_width',
+            'height': 'test_height',
+            'html': 'test_html'
+        })

From ebf1360c0fe0c2d7eddd4a642526ed321449299a Mon Sep 17 00:00:00 2001
From: Ben Delevingne <rockingskier@gmail.com>
Date: Thu, 5 Jun 2014 15:19:17 +0100
Subject: [PATCH 24/60] Fix indendation of Advert test model

---
 wagtail/tests/models.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py
index bbf91d278..5598e88f8 100644
--- a/wagtail/tests/models.py
+++ b/wagtail/tests/models.py
@@ -255,18 +255,21 @@ FormPage.content_panels = [
 ]
 
 
+# Snippets
+
 # Snippets
 
 class Advert(models.Model):
-  url = models.URLField(null=True, blank=True)
-  text = models.CharField(max_length=255)
+    url = models.URLField(null=True, blank=True)
+    text = models.CharField(max_length=255)
 
-  panels = [
-    FieldPanel('url'),
-    FieldPanel('text'),
-  ]
+    panels = [
+        FieldPanel('url'),
+        FieldPanel('text'),
+    ]
+
+    def __unicode__(self):
+        return self.text
 
-  def __unicode__(self):
-    return self.text
 
 register_snippet(Advert)

From 1f9fe4bfc1455a0e05cde4384555db315f873ce9 Mon Sep 17 00:00:00 2001
From: Ben Delevingne <rockingskier@gmail.com>
Date: Thu, 5 Jun 2014 15:21:56 +0100
Subject: [PATCH 25/60] Added two test snippet models definitions

---
 wagtail/tests/models.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py
index 5598e88f8..efbce2718 100644
--- a/wagtail/tests/models.py
+++ b/wagtail/tests/models.py
@@ -273,3 +273,21 @@ class Advert(models.Model):
 
 
 register_snippet(Advert)
+
+
+# AlphaSnippet is not registered here as this is done
+# during the tests it are needed for
+class AlphaSnippet(models.Model):
+    text = models.CharField(max_length=255)
+
+    def __unicode__(self):
+        return self.text
+
+
+# ZuluSnippet is not registered here as this is done
+# during the tests it are needed for
+class ZuluSnippet(models.Model):
+    text = models.CharField(max_length=255)
+
+    def __unicode__(self):
+        return self.text

From c200ad50c4363240da14e2d750cba1e59c94b7f1 Mon Sep 17 00:00:00 2001
From: Ben Delevingne <rockingskier@gmail.com>
Date: Thu, 5 Jun 2014 15:24:29 +0100
Subject: [PATCH 26/60] Test ordering of snippet

---
 wagtail/wagtailsnippets/tests.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailsnippets/tests.py b/wagtail/wagtailsnippets/tests.py
index 727e5e52d..ac5bfa509 100644
--- a/wagtail/wagtailsnippets/tests.py
+++ b/wagtail/wagtailsnippets/tests.py
@@ -3,7 +3,8 @@ from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
 
 from wagtail.tests.utils import login, unittest
-from wagtail.tests.models import Advert
+from wagtail.tests.models import Advert, AlphaSnippet, ZuluSnippet
+from wagtail.wagtailsnippets.models import register_snippet, SNIPPET_MODELS
 
 from wagtail.wagtailsnippets.views.snippets import get_content_type_from_url_params, get_snippet_edit_handler
 from wagtail.wagtailsnippets.edit_handlers import SnippetChooserPanel
@@ -168,3 +169,16 @@ class TestSnippetChooserPanel(TestCase):
     def test_render_js(self):
         self.assertTrue("createSnippetChooser(fixPrefix('id_text'), 'contenttypes/contenttype');"
                         in self.snippet_chooser_panel.render_js())
+
+
+class TestSnippetOrdering(TestCase):
+    def setUp(self):
+        register_snippet(ZuluSnippet)
+        register_snippet(AlphaSnippet)
+
+    def test_snippets_ordering(self):
+        # Ensure AlphaSnippet is before Zulu Snippet
+        # Cannot check first and last position as other snippets
+        # may get registered elsewhere during test
+        self.assertLess(SNIPPET_MODELS.index(AlphaSnippet),
+                        SNIPPET_MODELS.index(ZuluSnippet))

From ea82f1293544b94903ecd8d046bd4a636f68283d Mon Sep 17 00:00:00 2001
From: Ben Delevingne <rockingskier@gmail.com>
Date: Thu, 5 Jun 2014 15:25:17 +0100
Subject: [PATCH 27/60] Order snippet models during snippet registration

---
 wagtail/wagtailsnippets/models.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wagtail/wagtailsnippets/models.py b/wagtail/wagtailsnippets/models.py
index b929f06aa..8af626655 100644
--- a/wagtail/wagtailsnippets/models.py
+++ b/wagtail/wagtailsnippets/models.py
@@ -19,3 +19,4 @@ def get_snippet_content_types():
 def register_snippet(model):
     if model not in SNIPPET_MODELS:
         SNIPPET_MODELS.append(model)
+        SNIPPET_MODELS.sort(key=lambda x: x._meta.verbose_name)

From 1a19819a193cc70bb7c44b880054013375732a32 Mon Sep 17 00:00:00 2001
From: Ben Delevingne <rockingskier@gmail.com>
Date: Thu, 5 Jun 2014 15:46:37 +0100
Subject: [PATCH 28/60] Comment changes so they are real in English

---
 wagtail/tests/models.py          | 4 ++--
 wagtail/wagtailsnippets/tests.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py
index efbce2718..f06c41ef9 100644
--- a/wagtail/tests/models.py
+++ b/wagtail/tests/models.py
@@ -276,7 +276,7 @@ register_snippet(Advert)
 
 
 # AlphaSnippet is not registered here as this is done
-# during the tests it are needed for
+# during the tests it is needed for
 class AlphaSnippet(models.Model):
     text = models.CharField(max_length=255)
 
@@ -285,7 +285,7 @@ class AlphaSnippet(models.Model):
 
 
 # ZuluSnippet is not registered here as this is done
-# during the tests it are needed for
+# during the tests it is needed for
 class ZuluSnippet(models.Model):
     text = models.CharField(max_length=255)
 
diff --git a/wagtail/wagtailsnippets/tests.py b/wagtail/wagtailsnippets/tests.py
index ac5bfa509..de5e60b9b 100644
--- a/wagtail/wagtailsnippets/tests.py
+++ b/wagtail/wagtailsnippets/tests.py
@@ -177,7 +177,7 @@ class TestSnippetOrdering(TestCase):
         register_snippet(AlphaSnippet)
 
     def test_snippets_ordering(self):
-        # Ensure AlphaSnippet is before Zulu Snippet
+        # Ensure AlphaSnippet is before ZuluSnippet
         # Cannot check first and last position as other snippets
         # may get registered elsewhere during test
         self.assertLess(SNIPPET_MODELS.index(AlphaSnippet),

From b35f6d9409e4327d955f0d4b3569f25accdc4a8a Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 6 Jun 2014 12:52:00 +0100
Subject: [PATCH 29/60] Added test to check that wagtailadmin behaves correctly
 when LOGIN_URL is not set

---
 runtests.py                                   |  1 +
 .../tests/test_account_management.py          | 37 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/runtests.py b/runtests.py
index 346729653..cc9c6e658 100755
--- a/runtests.py
+++ b/runtests.py
@@ -103,6 +103,7 @@ if not settings.configured:
         WAGTAILSEARCH_BACKENDS=WAGTAILSEARCH_BACKENDS,
         WAGTAIL_SITE_NAME='Test Site',
         LOGIN_REDIRECT_URL = 'wagtailadmin_home',
+        LOGIN_URL='wagtailadmin_login',
     )
 
 
diff --git a/wagtail/wagtailadmin/tests/test_account_management.py b/wagtail/wagtailadmin/tests/test_account_management.py
index 0a864aacc..932ac71a8 100644
--- a/wagtail/wagtailadmin/tests/test_account_management.py
+++ b/wagtail/wagtailadmin/tests/test_account_management.py
@@ -67,7 +67,7 @@ class TestAuthentication(TestCase, WagtailTestUtils):
         """
         This tests that the user can logout
         """
-        # Get logout page page
+        # Get logout page
         response = self.client.get(reverse('wagtailadmin_logout'))
 
         # Check that the user was redirected to the login page
@@ -77,6 +77,41 @@ class TestAuthentication(TestCase, WagtailTestUtils):
         # Check that the user was logged out
         self.assertFalse('_auth_user_id' in self.client.session)
 
+    def test_not_logged_in_redirect(self):
+        """
+        This tests that a not logged in user is redirected to the
+        login page
+        """
+        # Logout
+        self.client.logout()
+
+        # Get dashboard
+        response = self.client.get(reverse('wagtailadmin_home'))
+
+        # Check that the user was redirected to the login page and that next was set correctly
+        self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailadmin_login') + '?next=' + reverse('wagtailadmin_home'))
+
+    @unittest.expectedFailure
+    def test_not_logged_in_redirect_default_settings(self):
+        """
+        This does the same as the above test but checks that it
+        redirects to the correct place when the user has not set
+        the LOGIN_URL setting correctly
+        """
+        # Logout
+        self.client.logout()
+
+        # Get dashboard with default LOGIN_URL setting
+        with self.settings(LOGIN_URL='django.contrib.auth.views.login'):
+            response = self.client.get(reverse('wagtailadmin_home'))
+
+        # Check that the user was redirected to the login page and that next was set correctly
+        # Note: The user will be redirected to 'django.contrib.auth.views.login' but
+        # this must be the same URL as 'wagtailadmin_login'
+        self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailadmin_login') + '?next=' + reverse('wagtailadmin_home'))
+
 
 class TestAccountSection(TestCase, WagtailTestUtils):
     """

From 45a10979c67dc35c7e64222192b8c0c9496993e5 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 6 Jun 2014 12:59:07 +0100
Subject: [PATCH 30/60] Fixed issue with 'django.contrib.auth.views.login' not
 being reversed properly

---
 wagtail/wagtailadmin/tests/test_account_management.py | 1 -
 wagtail/wagtailadmin/urls.py                          | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/tests/test_account_management.py b/wagtail/wagtailadmin/tests/test_account_management.py
index 932ac71a8..3553b8fba 100644
--- a/wagtail/wagtailadmin/tests/test_account_management.py
+++ b/wagtail/wagtailadmin/tests/test_account_management.py
@@ -92,7 +92,6 @@ class TestAuthentication(TestCase, WagtailTestUtils):
         self.assertEqual(response.status_code, 302)
         self.assertURLEqual(response.url, reverse('wagtailadmin_login') + '?next=' + reverse('wagtailadmin_home'))
 
-    @unittest.expectedFailure
     def test_not_logged_in_redirect_default_settings(self):
         """
         This does the same as the above test but checks that it
diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py
index 806240c5c..819caa92c 100644
--- a/wagtail/wagtailadmin/urls.py
+++ b/wagtail/wagtailadmin/urls.py
@@ -84,6 +84,13 @@ urlpatterns += [
 ]
 
 
+# This is here to make sure that 'django.contrib.auth.views.login' is reversed correctly
+# It must be placed after 'wagtailadmin_login' to prevent this from being used
+urlpatterns += [
+    url(r'^login/$', 'django.contrib.auth.views.login'),
+]
+
+
 # Import additional urlpatterns from any apps that define a register_admin_urls hook
 for fn in hooks.get_hooks('register_admin_urls'):
     urls = fn()

From eb05073e59e416f974d0b6d952ca47bd6886893b Mon Sep 17 00:00:00 2001
From: Ben <rockingskier@gmail.com>
Date: Fri, 6 Jun 2014 16:54:06 +0100
Subject: [PATCH 31/60] Add comments to test models for clarity

---
 wagtail/tests/models.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py
index f06c41ef9..739e462e1 100644
--- a/wagtail/tests/models.py
+++ b/wagtail/tests/models.py
@@ -275,8 +275,12 @@ class Advert(models.Model):
 register_snippet(Advert)
 
 
-# AlphaSnippet is not registered here as this is done
-# during the tests it is needed for
+# AlphaSnippet and ZuluSnippet are for testing ordering of
+# snippets when registering.  They are named as such to ensure
+# thier orderign is clear.  They are registered during testing
+# to ensure specific [in]correct register ordering
+
+# AlphaSnippet is registered during TestSnippetOrdering
 class AlphaSnippet(models.Model):
     text = models.CharField(max_length=255)
 
@@ -284,8 +288,7 @@ class AlphaSnippet(models.Model):
         return self.text
 
 
-# ZuluSnippet is not registered here as this is done
-# during the tests it is needed for
+# ZuluSnippet is registered during TestSnippetOrdering
 class ZuluSnippet(models.Model):
     text = models.CharField(max_length=255)
 

From 06677ac4448c2f02e185f0fe476010cda397bab6 Mon Sep 17 00:00:00 2001
From: Ben <rockingskier@gmail.com>
Date: Fri, 6 Jun 2014 16:54:36 +0100
Subject: [PATCH 32/60] Typo

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

diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py
index 739e462e1..e061a4bfe 100644
--- a/wagtail/tests/models.py
+++ b/wagtail/tests/models.py
@@ -277,7 +277,7 @@ register_snippet(Advert)
 
 # AlphaSnippet and ZuluSnippet are for testing ordering of
 # snippets when registering.  They are named as such to ensure
-# thier orderign is clear.  They are registered during testing
+# thier ordering is clear.  They are registered during testing
 # to ensure specific [in]correct register ordering
 
 # AlphaSnippet is registered during TestSnippetOrdering

From 090b0ef3da1298dc6edec32c126c9178ddb3aa63 Mon Sep 17 00:00:00 2001
From: Jeffrey Hearn <cowbellemoo@gmail.com>
Date: Sun, 8 Jun 2014 01:06:11 -0400
Subject: [PATCH 33/60] Responsive embeds and images CSS suggestion

---
 .../building_your_site/frontenddevelopers.rst | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/docs/building_your_site/frontenddevelopers.rst b/docs/building_your_site/frontenddevelopers.rst
index e5f583397..537e1e80b 100644
--- a/docs/building_your_site/frontenddevelopers.rst
+++ b/docs/building_your_site/frontenddevelopers.rst
@@ -190,6 +190,32 @@ Only fields using ``RichTextField`` need this applied in the template.
 .. Note::
     Note that the template tag loaded differs from the name of the filter.
 
+Responsive Embeds
+-----------------
+
+Wagtail embeds and images are included at their full width, which may overflow the bounds of the content container you've defined in your templates. To make images and embeds responsive -- meaning they'll resize to fit their container -- include the following CSS.
+
+.. code-block:: css
+
+    .rich-text img {
+        max-width: 100%;
+        height: auto;
+    }
+
+    .responsive-object {
+        position: relative;
+    }
+        .responsive-object iframe,
+        .responsive-object object,
+        .responsive-object embed {
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+        }
+
+
 Internal links (tag)
 ~~~~~~~~~~~~~~~~~~~~
 

From e3fb485a8761160cf1908e3f2ab499d2c81b1f84 Mon Sep 17 00:00:00 2001
From: Jeffrey Hearn <cowbellemoo@gmail.com>
Date: Sun, 8 Jun 2014 01:30:35 -0400
Subject: [PATCH 34/60] Cleanup of embedly settings load

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

diff --git a/wagtail/wagtailembeds/embeds.py b/wagtail/wagtailembeds/embeds.py
index f8ab35f16..42f396df9 100644
--- a/wagtail/wagtailembeds/embeds.py
+++ b/wagtail/wagtailembeds/embeds.py
@@ -52,7 +52,7 @@ def embedly(url, max_width=None, key=None):
         key = settings.EMBEDLY_KEY
 
     # Get embedly client
-    client = Embedly(key=settings.EMBEDLY_KEY)
+    client = Embedly(key=key)
 
     # Call embedly
     if max_width is not None:

From da361bbd01fb64c6d854777da6a70ead72eda7f8 Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Tue, 10 Jun 2014 11:13:48 +0100
Subject: [PATCH 35/60] Skip embedly tests if embedly not installed. Split up
 tests.

---
 .../wagtailadmin/tests/test_page_chooser.py   |  39 +++++
 wagtail/wagtailadmin/tests/tests.py           |  34 ----
 wagtail/wagtailembeds/embeds.py               |  16 +-
 wagtail/wagtailembeds/tests.py                | 157 ++++++++++--------
 4 files changed, 128 insertions(+), 118 deletions(-)
 create mode 100644 wagtail/wagtailadmin/tests/test_page_chooser.py

diff --git a/wagtail/wagtailadmin/tests/test_page_chooser.py b/wagtail/wagtailadmin/tests/test_page_chooser.py
new file mode 100644
index 000000000..036619e2c
--- /dev/null
+++ b/wagtail/wagtailadmin/tests/test_page_chooser.py
@@ -0,0 +1,39 @@
+from django.test import TestCase
+from django.core.urlresolvers import reverse
+
+from wagtail.wagtailcore.models import Page
+from wagtail.tests.models import SimplePage
+from wagtail.tests.utils import login
+
+class TestChooserBrowse(TestCase):
+    def setUp(self):
+        self.root_page = Page.objects.get(id=2)
+
+        # Add child page
+        self.child_page = SimplePage()
+        self.child_page.title = "foobarbaz"
+        self.child_page.slug = "foobarbaz"
+        self.root_page.add_child(instance=self.child_page)
+
+        login(self.client)
+
+    def get(self, params={}):
+        return self.client.get(reverse('wagtailadmin_choose_page'), params)
+
+    def test_status_code(self):
+        self.assertEqual(self.get().status_code, 200)
+
+    def test_search(self):
+        response = self.get({'q': "foobarbaz"})
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "There is one match")
+        self.assertContains(response, "foobarbaz")
+
+    def test_search_no_results(self):
+        response = self.get({'q': "quux"})
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "There are 0 matches")
+
+    def test_get_invalid(self):
+        response = self.get({'page_type': 'foo.bar'})
+        self.assertEqual(response.status_code, 404)
diff --git a/wagtail/wagtailadmin/tests/tests.py b/wagtail/wagtailadmin/tests/tests.py
index 2a0c5e886..cb8e0ec29 100644
--- a/wagtail/wagtailadmin/tests/tests.py
+++ b/wagtail/wagtailadmin/tests/tests.py
@@ -46,40 +46,6 @@ class TestSendEmailTask(TestCase):
         self.assertEqual(mail.outbox[0].to, ["nobody@email.com"])
 
 
-class TestChooserBrowse(TestCase):
-    def setUp(self):
-        self.root_page = Page.objects.get(id=2)
-
-        # Add child page
-        self.child_page = SimplePage()
-        self.child_page.title = "foobarbaz"
-        self.child_page.slug = "foobarbaz"
-        self.root_page.add_child(instance=self.child_page)
-
-        login(self.client)
-
-    def get(self, params={}):
-        return self.client.get(reverse('wagtailadmin_choose_page'), params)
-
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
-
-    def test_search(self):
-        response = self.get({'q': "foobarbaz"})
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, "There is one match")
-        self.assertContains(response, "foobarbaz")
-
-    def test_search_no_results(self):
-        response = self.get({'q': "quux"})
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, "There are 0 matches")
-
-    def test_get_invalid(self):
-        response = self.get({'page_type': 'foo.bar'})
-        self.assertEqual(response.status_code, 404)
-
-
 class TestChooserBrowseChild(TestCase):
     def setUp(self):
         self.root_page = Page.objects.get(id=2)
diff --git a/wagtail/wagtailembeds/embeds.py b/wagtail/wagtailembeds/embeds.py
index 312f22f2e..38c8ee50a 100644
--- a/wagtail/wagtailembeds/embeds.py
+++ b/wagtail/wagtailembeds/embeds.py
@@ -19,11 +19,6 @@ class EmbedNotFoundException(Exception): pass
 class EmbedlyException(Exception): pass
 class AccessDeniedEmbedlyException(EmbedlyException): pass
 
-# This is here for unit testing. It is used if Embedly is not installed.
-class MockEmbedly():
-    def oembed():
-        pass
-
 
 # Pinched from django 1.7 source code.
 # TODO: Replace this with "from django.utils.module_loading import import_string" when django 1.7 is released
@@ -49,17 +44,14 @@ def import_string(dotted_path):
 
 
 def embedly(url, max_width=None, key=None):
+    from embedly import Embedly
+    # Get embedly client
+    client = Embedly(key=key)
+
     # Get embedly key
     if key is None:
         key = settings.EMBEDLY_KEY
 
-    try:
-        from embedly import Embedly
-        # Get embedly client
-        client = Embedly(key=key)
-    except ImportError:
-        client = MockEmbedly()
-
     # Call embedly
     if max_width is not None:
         oembed = client.oembed(url, maxwidth=max_width, better=False)
diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py
index c942b158d..abb7bb049 100644
--- a/wagtail/wagtailembeds/tests.py
+++ b/wagtail/wagtailembeds/tests.py
@@ -2,23 +2,24 @@ from mock import patch
 import urllib2
 
 try:
-    from embedly import Embedly
-    patch_me = 'embedly.Embedly.oembed'
+    import embedly
+    no_embedly = False
 except ImportError:
-    patch_me = 'wagtail.wagtailembeds.embeds.MockEmbedly.oembed'
+    no_embedly = True
 
 from django.test import TestCase
 from django.test.client import Client
 
 from wagtail.tests.utils import login
+from wagtail.tests.utils import unittest
+
 from wagtail.wagtailembeds import get_embed
 from wagtail.wagtailembeds.embeds import (
-    embedly,
     EmbedNotFoundException,
     EmbedlyException,
     AccessDeniedEmbedlyException,
-    MockEmbedly
 )
+from wagtail.wagtailembeds.embeds import embedly as wagtail_embedly
 from wagtail.wagtailembeds.embeds import oembed as wagtail_oembed
 
 
@@ -92,84 +93,96 @@ class TestChooser(TestCase):
 
         # TODO: Test submitting
 
-
 class TestEmbedly(TestCase):
-    @patch(patch_me)
-    def test_embedly_oembed_called_with_correct_arguments(self, oembed):
-        oembed.return_value = {'type': 'photo',
-                               'url': 'http://www.example.com'}
+    @unittest.skipIf(no_embedly, "Embedly is not installed")
+    def test_embedly_oembed_called_with_correct_arguments(self):
+        with patch('embedly.Embedly.oembed') as oembed:
+            oembed.return_value = {'type': 'photo',
+                                   'url': 'http://www.example.com'}
 
-        embedly('http://www.example.com', key='foo')
-        oembed.assert_called_with('http://www.example.com', better=False)
+            wagtail_embedly('http://www.example.com', key='foo')
+            oembed.assert_called_with('http://www.example.com', better=False)
 
-        embedly('http://www.example.com', max_width=100, key='foo')
-        oembed.assert_called_with('http://www.example.com', maxwidth=100, better=False)
+            wagtail_embedly('http://www.example.com', max_width=100, key='foo')
+            oembed.assert_called_with('http://www.example.com', maxwidth=100, better=False)
 
-    @patch(patch_me)
-    def test_embedly_errors(self, oembed):
-        oembed.return_value = {'type': 'photo',
-                               'url': 'http://www.example.com',
-                               'error': True,
-                               'error_code': 401}
-        self.assertRaises(AccessDeniedEmbedlyException,
-                          embedly, 'http://www.example.com', key='foo')
+    @unittest.skipIf(no_embedly, "Embedly is not installed")
+    def test_embedly_401(self):
+        with patch('embedly.Embedly.oembed') as oembed:
+            oembed.return_value = {'type': 'photo',
+                                   'url': 'http://www.example.com',
+                                   'error': True,
+                                   'error_code': 401}
+            self.assertRaises(AccessDeniedEmbedlyException,
+                              wagtail_embedly, 'http://www.example.com', key='foo')
 
-        oembed.return_value['error_code'] = 403
-        self.assertRaises(AccessDeniedEmbedlyException,
-                          embedly, 'http://www.example.com', key='foo')
+    @unittest.skipIf(no_embedly, "Embedly is not installed")
+    def test_embedly_403(self):
+        with patch('embedly.Embedly.oembed') as oembed:
+            oembed.return_value['error_code'] = 403
+            self.assertRaises(AccessDeniedEmbedlyException,
+                              wagtail_embedly, 'http://www.example.com', key='foo')
 
-        oembed.return_value['error_code'] = 404
-        self.assertRaises(EmbedNotFoundException,
-                          embedly, 'http://www.example.com', key='foo')
+    @unittest.skipIf(no_embedly, "Embedly is not installed")
+    def test_embedly_404(self):
+        with patch('embedly.Embedly.oembed') as oembed:
+            oembed.return_value['error_code'] = 404
+            self.assertRaises(EmbedNotFoundException,
+                              wagtail_embedly, 'http://www.example.com', key='foo')
 
-        oembed.return_value['error_code'] = 999
-        self.assertRaises(EmbedlyException, embedly,
-                          'http://www.example.com', key='foo')
+    @unittest.skipIf(no_embedly, "Embedly is not installed")
+    def test_embedly_other_error(self):
+        with patch('embedly.Embedly.oembed') as oembed:
+            oembed.return_value['error_code'] = 999
+            self.assertRaises(EmbedlyException, wagtail_embedly,
+                              'http://www.example.com', key='foo')
 
-    @patch(patch_me)
-    def test_embedly_html_conversion(self, oembed):
-        oembed.return_value = {'type': 'photo',
-                               'url': 'http://www.example.com'}
-        result = embedly('http://www.example.com', key='foo')
-        self.assertEqual(result['html'], '<img src="http://www.example.com" />')
+    @unittest.skipIf(no_embedly, "Embedly is not installed")
+    def test_embedly_html_conversion(self):
+        with patch('embedly.Embedly.oembed') as oembed:
+            oembed.return_value = {'type': 'photo',
+                                   'url': 'http://www.example.com'}
+            result = wagtail_embedly('http://www.example.com', key='foo')
+            self.assertEqual(result['html'], '<img src="http://www.example.com" />')
 
-        oembed.return_value = {'type': 'something else',
-                               'html': '<foo>bar</foo>'}
-        result = embedly('http://www.example.com', key='foo')
-        self.assertEqual(result['html'], '<foo>bar</foo>')
+            oembed.return_value = {'type': 'something else',
+                                   'html': '<foo>bar</foo>'}
+            result = wagtail_embedly('http://www.example.com', key='foo')
+            self.assertEqual(result['html'], '<foo>bar</foo>')
 
-    @patch(patch_me)
-    def test_embedly_return_value(self, oembed):
-        oembed.return_value = {'type': 'something else',
-                               'html': '<foo>bar</foo>'}
-        result = embedly('http://www.example.com', key='foo')
-        self.assertEqual(result, {
-            'title': '',
-            'author_name': '',
-            'provider_name': '',
-            'type': 'something else',
-            'thumbnail_url': None,
-            'width': None,
-            'height': None,
-            'html': '<foo>bar</foo>'})
+    @unittest.skipIf(no_embedly, "Embedly is not installed")
+    def test_embedly_return_value(self):
+        with patch('embedly.Embedly.oembed') as oembed:
+            oembed.return_value = {'type': 'something else',
+                                   'html': '<foo>bar</foo>'}
+            result = wagtail_embedly('http://www.example.com', key='foo')
+            self.assertEqual(result, {
+                'title': '',
+                'author_name': '',
+                'provider_name': '',
+                'type': 'something else',
+                'thumbnail_url': None,
+                'width': None,
+                'height': None,
+                'html': '<foo>bar</foo>'})
 
-        oembed.return_value = {'type': 'something else',
-                               'author_name': 'Alice',
-                               'provider_name': 'Bob',
-                               'title': 'foo',
-                               'thumbnail_url': 'http://www.example.com',
-                               'width': 100,
-                               'height': 100,
-                               'html': '<foo>bar</foo>'}
-        result = embedly('http://www.example.com', key='foo')
-        self.assertEqual(result, {'type': 'something else',
-                                  'author_name': 'Alice',
-                                  'provider_name': 'Bob',
-                                  'title': 'foo',
-                                  'thumbnail_url': 'http://www.example.com',
-                                  'width': 100,
-                                  'height': 100,
-                                  'html': '<foo>bar</foo>'})
+            oembed.return_value = {'type': 'something else',
+                                   'author_name': 'Alice',
+                                   'provider_name': 'Bob',
+                                   'title': 'foo',
+                                   'thumbnail_url': 'http://www.example.com',
+                                   'width': 100,
+                                   'height': 100,
+                                   'html': '<foo>bar</foo>'}
+            result = wagtail_embedly('http://www.example.com', key='foo')
+            self.assertEqual(result, {'type': 'something else',
+                                      'author_name': 'Alice',
+                                      'provider_name': 'Bob',
+                                      'title': 'foo',
+                                      'thumbnail_url': 'http://www.example.com',
+                                      'width': 100,
+                                      'height': 100,
+                                      'html': '<foo>bar</foo>'})
 
 
 class TestOembed(TestCase):

From 77c75efcf2cd3a4000a824c3a783bd9d212847c7 Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Tue, 10 Jun 2014 11:22:17 +0100
Subject: [PATCH 36/60] Fix embedly error tests

---
 wagtail/wagtailembeds/tests.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py
index abb7bb049..0fbaf5baf 100644
--- a/wagtail/wagtailembeds/tests.py
+++ b/wagtail/wagtailembeds/tests.py
@@ -119,21 +119,30 @@ class TestEmbedly(TestCase):
     @unittest.skipIf(no_embedly, "Embedly is not installed")
     def test_embedly_403(self):
         with patch('embedly.Embedly.oembed') as oembed:
-            oembed.return_value['error_code'] = 403
+            oembed.return_value = {'type': 'photo',
+                                   'url': 'http://www.example.com',
+                                   'error': True,
+                                   'error_code': 403}
             self.assertRaises(AccessDeniedEmbedlyException,
                               wagtail_embedly, 'http://www.example.com', key='foo')
 
     @unittest.skipIf(no_embedly, "Embedly is not installed")
     def test_embedly_404(self):
         with patch('embedly.Embedly.oembed') as oembed:
-            oembed.return_value['error_code'] = 404
+            oembed.return_value = {'type': 'photo',
+                                   'url': 'http://www.example.com',
+                                   'error': True,
+                                   'error_code': 404}
             self.assertRaises(EmbedNotFoundException,
                               wagtail_embedly, 'http://www.example.com', key='foo')
 
     @unittest.skipIf(no_embedly, "Embedly is not installed")
     def test_embedly_other_error(self):
         with patch('embedly.Embedly.oembed') as oembed:
-            oembed.return_value['error_code'] = 999
+            oembed.return_value = {'type': 'photo',
+                                   'url': 'http://www.example.com',
+                                   'error': True,
+                                   'error_code': 999}
             self.assertRaises(EmbedlyException, wagtail_embedly,
                               'http://www.example.com', key='foo')
 

From b1d8268b28baf7f9b89c99470c5a15b6be5abd7a Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 10 Jun 2014 12:50:42 +0100
Subject: [PATCH 37/60] Add 'original' as an image filter to return the image
 un-resized - fixes #128

---
 wagtail/wagtailimages/backends/base.py |  5 +++
 wagtail/wagtailimages/models.py        | 42 +++++++++++++++++---------
 wagtail/wagtailimages/tests.py         | 14 +++++++++
 3 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/wagtail/wagtailimages/backends/base.py b/wagtail/wagtailimages/backends/base.py
index 25b7e882d..0c6d34951 100644
--- a/wagtail/wagtailimages/backends/base.py
+++ b/wagtail/wagtailimages/backends/base.py
@@ -130,3 +130,8 @@ class BaseImageBackend(object):
         """
         resized_image = self.resize_to_min(image, size)
         return self.crop_to_centre(resized_image, size)
+
+
+    def no_operation(self, image, param):
+        """Return the image unchanged"""
+        return image
diff --git a/wagtail/wagtailimages/models.py b/wagtail/wagtailimages/models.py
index 24fd1f0bf..781b5cd67 100644
--- a/wagtail/wagtailimages/models.py
+++ b/wagtail/wagtailimages/models.py
@@ -1,5 +1,6 @@
 import StringIO
 import os.path
+import re
 
 from taggit.managers import TaggableManager
 
@@ -150,6 +151,7 @@ class Filter(models.Model):
         'width': 'resize_to_width',
         'height': 'resize_to_height',
         'fill': 'resize_to_fill',
+        'original': 'no_operation',
     }
 
     def __init__(self, *args, **kwargs):
@@ -157,22 +159,34 @@ class Filter(models.Model):
         self.method = None  # will be populated when needed, by parsing the spec string
 
     def _parse_spec_string(self):
-        # parse the spec string, which is formatted as (method)-(arg),
-        # and save the results to self.method_name and self.method_arg
-        try:
-            (method_name_simple, method_arg_string) = self.spec.split('-')
-            self.method_name = Filter.OPERATION_NAMES[method_name_simple]
+        # parse the spec string and save the results to
+        # self.method_name and self.method_arg. There are various possible
+        # formats to match against:
+        # 'original'
+        # 'width-200'
+        # 'max-320x200'
 
-            if method_name_simple in ('max', 'min', 'fill'):
-                # method_arg_string is in the form 640x480
-                (width, height) = [int(i) for i in method_arg_string.split('x')]
-                self.method_arg = (width, height)
-            else:
-                # method_arg_string is a single number
-                self.method_arg = int(method_arg_string)
+        if self.spec == 'original':
+            self.method_name = Filter.OPERATION_NAMES['original']
+            self.method_arg = None
+            return
 
-        except (ValueError, KeyError):
-            raise ValueError("Invalid image filter spec: %r" % self.spec)
+        match = re.match(r'(width|height)-(\d+)$', self.spec)
+        if match:
+            self.method_name = Filter.OPERATION_NAMES[match.group(1)]
+            self.method_arg = int(match.group(2))
+            return
+
+        match = re.match(r'(max|min|fill)-(\d+)x(\d+)$', self.spec)
+        if match:
+            self.method_name = Filter.OPERATION_NAMES[match.group(1)]
+            width = int(match.group(2))
+            height = int(match.group(3))
+            self.method_arg = (width, height)
+            return
+
+        # Spec is not one of our recognised patterns
+        raise ValueError("Invalid image filter spec: %r" % self.spec)
 
     def process_image(self, input_file, backend_name='default'):
         """
diff --git a/wagtail/wagtailimages/tests.py b/wagtail/wagtailimages/tests.py
index 00d1245e6..a2dae86b2 100644
--- a/wagtail/wagtailimages/tests.py
+++ b/wagtail/wagtailimages/tests.py
@@ -107,6 +107,13 @@ class TestRenditions(TestCase):
         self.assertEqual(rendition.width, 160)
         self.assertEqual(rendition.height, 120)
 
+    def test_resize_to_original(self):
+        rendition = self.image.get_rendition('original')
+
+        # Check size
+        self.assertEqual(rendition.width, 640)
+        self.assertEqual(rendition.height, 480)
+
     def test_cache(self):
         # Get two renditions with the same filter
         first_rendition = self.image.get_rendition('width-400')
@@ -153,6 +160,13 @@ class TestRenditionsWand(TestCase):
         self.assertEqual(rendition.width, 160)
         self.assertEqual(rendition.height, 120)
 
+    def test_resize_to_original(self):
+        rendition = self.image.get_rendition('original')
+
+        # Check size
+        self.assertEqual(rendition.width, 640)
+        self.assertEqual(rendition.height, 480)
+
     def test_cache(self):
         # Get two renditions with the same filter
         first_rendition = self.image.get_rendition('width-400')

From 0092151d29b6eebe67cbe60f210d4480baeb85ac Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 10 Jun 2014 13:17:45 +0100
Subject: [PATCH 38/60] Update image tag documentation to cover the 'original'
 resize rule

---
 .../building_your_site/frontenddevelopers.rst | 40 +++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/docs/building_your_site/frontenddevelopers.rst b/docs/building_your_site/frontenddevelopers.rst
index 537e1e80b..f0054eaab 100644
--- a/docs/building_your_site/frontenddevelopers.rst
+++ b/docs/building_your_site/frontenddevelopers.rst
@@ -94,7 +94,7 @@ The ``image`` tag inserts an XHTML-compatible ``img`` element into the page, set
 
 The syntax for the tag is thus::
 
-    {% image [image] [method]-[dimension(s)] %}
+    {% image [image] [resize-rule] %}
 
 For example:
 
@@ -108,16 +108,20 @@ For example:
     <!-- or a square thumbnail: -->
     {% image self.photo fill-80x80 %}
 
-In the above syntax ``[image]`` is the Django object refering to the image. If your page model defined a field called "photo" then ``[image]`` would probably be ``self.photo``. The ``[method]`` defines which resizing algorithm to use and ``[dimension(s)]`` provides height and/or width values (as ``[width|height]`` or ``[width]x[height]``) to refine that algorithm.
+In the above syntax ``[image]`` is the Django object refering to the image. If your page model defined a field called "photo" then ``[image]`` would probably be ``self.photo``. The ``[resize-rule]`` defines how the image is to be resized when inserted into the page; various resizing methods are supported, to cater for different usage cases (e.g. lead images that span the whole width of the page, or thumbnails to be cropped to a fixed size).
 
-Note that a space separates ``[image]`` and ``[method]``, but not ``[method]`` and ``[dimensions]``: a hyphen between ``[method]`` and ``[dimensions]`` is mandatory. Multiple dimensions must be separated by an ``x``.
+Note that a space separates ``[image]`` and ``[resize-rule]``, but the resize rule must not contain spaces.
 
-The available ``method`` s are:
+The available resizing methods are:
 
 .. glossary::
     ``max`` 
         (takes two dimensions)
 
+        .. code-block:: django
+
+            {% image self.photo max-1000x500 %}
+
         Fit **within** the given dimensions. 
 
         The longest edge will be reduced to the equivalent dimension size defined. e.g A portrait image of width 1000, height 2000, treated with the ``max`` dimensions ``1000x500`` (landscape) would result in the image shrunk so the *height* was 500 pixels and the width 250.
@@ -125,6 +129,10 @@ The available ``method`` s are:
     ``min`` 
         (takes two dimensions)
 
+        .. code-block:: django
+
+            {% image self.photo min-500x200 %}
+
         **Cover** the given dimensions.
 
         This may result in an image slightly **larger** than the dimensions you specify. e.g A square image of width 2000, height 2000, treated with the ``min`` dimensions ``500x200`` (landscape) would have it's height and width changed to 500, i.e matching the width required, but greater than the height.
@@ -132,27 +140,45 @@ The available ``method`` s are:
     ``width`` 
         (takes one dimension)
 
+        .. code-block:: django
+
+            {% image self.photo width-640 %}
+
         Reduces the width of the image to the dimension specified.
 
     ``height`` 
         (takes one dimension)
 
+        .. code-block:: django
+
+            {% image self.photo height-480 %}
+
         Resize the height of the image to the dimension specified.. 
 
     ``fill`` 
         (takes two dimensions)
 
+        .. code-block:: django
+
+            {% image self.photo fill-200x200 %}
+
         Resize and **crop** to fill the **exact** dimensions. 
 
         This can be particularly useful for websites requiring square thumbnails of arbitrary images. For example, a landscape image of width 2000, height 1000, treated with ``fill`` dimensions ``200x200`` would have its height reduced to 200, then its width (ordinarily 400) cropped to 200. 
 
         **The crop always aligns on the centre of the image.**
 
-.. Note::
-    Wagtail does not allow deforming or stretching images. Image dimension ratios will always be kept. Wagtail also *does not support upscaling*. Small images forced to appear at larger sizes will "max out" at their their native dimensions.
+    ``original`` 
+        (takes no dimensions)
+
+        .. code-block:: django
+
+            {% image self.photo original %}
+
+        Leaves the image at its original size - no resizing is performed.
 
 .. Note::
-    Wagtail does not make the "original" version of an image explicitly available. To request it, you could rely on the lack of upscaling by requesting an image larger than its maximum dimensions. e.g to insert an image whose dimensions are unknown at its maximum size, try: ``{% image self.image width-10000 %}``. This assumes the image is unlikely to be larger than 10000px wide.
+    Wagtail does not allow deforming or stretching images. Image dimension ratios will always be kept. Wagtail also *does not support upscaling*. Small images forced to appear at larger sizes will "max out" at their their native dimensions.
 
 
 .. _image_tag_alt:

From 843b490cefe4bab584daaf592abd5a8ac21410e7 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 10 Jun 2014 13:19:06 +0100
Subject: [PATCH 39/60] add changelog entry for 'original' resize rule

---
 CHANGELOG.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b708cfd21..22f417d3d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,7 +2,8 @@ Changelog
 =========
 
 0.4 (xx.xx.20xx)
-~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~
+ * Added 'original' as a resizing rule supported by the 'image' tag
 
 0.3.1 (03.06.2014)
 ~~~~~~~~~~~~~~~~~~

From a6df4699979988bed0098c128490ddf24c4a91f7 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 10 Jun 2014 15:31:03 +0100
Subject: [PATCH 40/60] Coalesce animated gifs before resizing them. Fixes #264

In an animated gif, each frame is only the size it needs to be to cover the changed part of the image.
This is often much lower than the actual image size and the Wand image backend was using this incorrect size in its resizing calculations, causing all animated gifs to be resized incorrectly or not at all.

This commit calls ImageMagicks "MagickCoalesceImages" on the wand image. This resizes every frame to the full size of the image so the resizing calculations will work properly.
---
 wagtail/wagtailimages/backends/wand.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/wagtail/wagtailimages/backends/wand.py b/wagtail/wagtailimages/backends/wand.py
index d1a877436..91f2d255a 100644
--- a/wagtail/wagtailimages/backends/wand.py
+++ b/wagtail/wagtailimages/backends/wand.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import
 
 from .base import BaseImageBackend
 from wand.image import Image
+from wand.api import library
 
 
 class WandBackend(BaseImageBackend):
@@ -10,6 +11,7 @@ class WandBackend(BaseImageBackend):
 
     def open_image(self, input_file):
         image = Image(file=input_file)
+        image.wand = library.MagickCoalesceImages(image.wand)
         return image
 
     def save_image(self, image, output, format):

From a26c0bcfa0c3d4994dc72ea206a34c029cbbd185 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 10 Jun 2014 15:39:28 +0100
Subject: [PATCH 41/60] Revert "Cleanup Filter.process_image a bit"

This reverts commit b5586102ed5ae4bb3f56c33f2dc9de56628fdd2b.
---
 wagtail/wagtailimages/models.py | 37 +++++++++++++++++----------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/wagtail/wagtailimages/models.py b/wagtail/wagtailimages/models.py
index ddde18d29..a2be29486 100644
--- a/wagtail/wagtailimages/models.py
+++ b/wagtail/wagtailimages/models.py
@@ -161,17 +161,15 @@ class Filter(models.Model):
         # and save the results to self.method_name and self.method_arg
         try:
             (method_name_simple, method_arg_string) = self.spec.split('-')
-            method_name = Filter.OPERATION_NAMES[method_name_simple]
+            self.method_name = Filter.OPERATION_NAMES[method_name_simple]
 
             if method_name_simple in ('max', 'min', 'fill'):
                 # method_arg_string is in the form 640x480
                 (width, height) = [int(i) for i in method_arg_string.split('x')]
-                method_arg = (width, height)
+                self.method_arg = (width, height)
             else:
                 # method_arg_string is a single number
-                method_arg = int(method_arg_string)
-
-            return method_name, method_arg
+                self.method_arg = int(method_arg_string)
 
         except (ValueError, KeyError):
             raise ValueError("Invalid image filter spec: %r" % self.spec)
@@ -182,33 +180,36 @@ class Filter(models.Model):
         generate an output image with this filter applied, returning it
         as another django.core.files.File object
         """
-        # Get image backend
         backend = get_image_backend(backend_name)
 
-        # Open image file
+        if not self.method:
+            self._parse_spec_string()
+
+        # If file is closed, open it
         input_file.open('rb')
         image = backend.open_image(input_file)
         file_format = image.format
 
-        # Parse filter spec string
-        method_name, method_arg = self._parse_spec_string()
+        method = getattr(backend, self.method_name)
 
-        # Run filter
-        method_f = getattr(backend, method_name)
-        image = method_f(image, method_arg)
+        image = method(image, self.method_arg)
 
-        # Save
         output = StringIO.StringIO()
         backend.save_image(image, output, file_format)
 
-        # Close input file
+        # and then close the input file
         input_file.close()
 
-        # Generate new filename derived from old one, inserting the filter spec string before the extension
-        filename_noext, ext = os.path.splitext(input_file.name)
-        output_filename = '.'.join([filename_noext[:60], self.spec]) + ext
+        # generate new filename derived from old one, inserting the filter spec string before the extension
+        input_filename_parts = os.path.basename(input_file.name).split('.')
+        filename_without_extension = '.'.join(input_filename_parts[:-1])
+        filename_without_extension = filename_without_extension[:60]  # trim filename base so that we're well under 100 chars
+        output_filename_parts = [filename_without_extension, self.spec] + input_filename_parts[-1:]
+        output_filename = '.'.join(output_filename_parts)
 
-        return File(output, name=output_filename)
+        output_file = File(output, name=output_filename)
+
+        return output_file
 
 
 class AbstractRendition(models.Model):

From 4ee43f79a0ada78d877b9d38f4498fb39e3b4dee Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Tue, 10 Jun 2014 15:42:34 +0100
Subject: [PATCH 42/60] fixing breadcrumb position on mobile

---
 .../wagtailadmin/scss/components/header.scss  |  2 +-
 .../static/wagtailadmin/scss/core.scss        | 19 ++++++++++++++++---
 .../scss/layouts/page-editor.scss             |  8 ++++----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss
index 849420ae0..d93eaa270 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss
@@ -66,7 +66,7 @@ header{
 
     /* necessary on mobile only to make way for hamburger menu */
     &.nice-padding{
-        padding-left:4em;
+        padding-left:$desktop-nice-padding;
     }
 
     label{
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
index 60200de20..8298f214a 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
@@ -430,13 +430,13 @@ footer{
 .breadcrumb{
     @include unlist();
 }
+
 .breadcrumb{
     @include clearfix();
     overflow:hidden;
-    background:$color-teal-darker;
+    padding-top:1.4em;
     font-size:0.85em;
 
-
     li {
         display: block;
         float: left;
@@ -468,7 +468,7 @@ footer{
                 content:"n";
                 padding-left:20px;
                 font-size:2em;
-                color:$color-teal;
+                color:$color-teal-darker;
                 line-height:0.9em;
             }
         }
@@ -739,6 +739,19 @@ footer, .logo{
         margin-left:50px;
     }
 
+    .breadcrumb{
+        padding-top:0;
+        background:$color-teal-darker;
+
+        li {
+            a, span{
+                &:after{
+                    color:$color-teal;
+                }
+            }
+        }
+    }
+
     /* Z-indexes */
     .nav-main{
         li{
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
index c9a22b3ac..5e3120c82 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
@@ -6,11 +6,8 @@
     margin-bottom:10em;
 }
 
-.page-editor header {
-
-}
 .page-editor .breadcrumb{
-    margin-top:-1.8em;
+    margin-top:-1.2em;
     margin-bottom:2em;
 }
 .page-editor .modal .breadcrumb{
@@ -336,6 +333,9 @@ footer .preview{
 }
 
 @media screen and (min-width: $breakpoint-mobile){
+    .page-editor .breadcrumb{
+        margin-top:-1.8em;
+    }
     .object{
         fieldset{
             max-width:1024px;

From da8ee99a3eb00114b886f7c7212281b96d8e9b6e Mon Sep 17 00:00:00 2001
From: jonny <jonny@takeflight.com.au>
Date: Wed, 11 Jun 2014 09:40:30 +1000
Subject: [PATCH 43/60] Removed _blank from recently edited items screen

---
 .../templates/wagtailadmin/home/recent_edits.html           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html b/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html
index e1b2eb4b5..3538ba8d9 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html
@@ -20,12 +20,12 @@
                             <td class="title" valign="top">
                                 <h2><a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" title="{% trans 'Edit this page' %}">{{ revision.page.title }}</a></h2>
                                 <ul class="actions">
-                                    <li><a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" class="button button-small" target="_blank">{% trans "Edit" %}</a></li>
+                                    <li><a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" class="button button-small">{% trans "Edit" %}</a></li>
                                     {% if revision.page.has_unpublished_changes %}
-                                        <li><a href="{% url 'wagtailadmin_pages_view_draft' revision.page.id %}" class="button button-small" target="_blank">{% trans 'Draft' %}</a></li>
+                                        <li><a href="{% url 'wagtailadmin_pages_view_draft' revision.page.id %}" class="button button-small">{% trans 'Draft' %}</a></li>
                                     {% endif %}
                                     {% if revision.page.live %}
-                                        <li><a href="{{ revision.page.url }}" class="button button-small" target="_blank">{% trans 'Live' %}</a></li>
+                                        <li><a href="{{ revision.page.url }}" class="button button-small">{% trans 'Live' %}</a></li>
                                     {% endif %}
                                 </ul>
                             </td>

From 546f18cbb565750eee5747bdf24a1777dd97c2f0 Mon Sep 17 00:00:00 2001
From: Ben Margolis <ben@sixpearls.com>
Date: Tue, 10 Jun 2014 18:53:43 -0700
Subject: [PATCH 44/60] Adding basic documentation for the image_formats
 feature.

---
 docs/editing_api.rst | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/docs/editing_api.rst b/docs/editing_api.rst
index c06370026..88fc9458f 100644
--- a/docs/editing_api.rst
+++ b/docs/editing_api.rst
@@ -371,8 +371,8 @@ Edit Handler API
 ~~~~~~~~~~~~~~~~
 
 
-Hooks
------
+Admin Hooks
+-----------
 
 On loading, Wagtail will search for any app with the file ``wagtail_hooks.py`` and execute the contents. This provides a way to register your own functions to execute at certain points in Wagtail's execution, such as when a ``Page`` object is saved or when the main menu is constructed.
 
@@ -547,6 +547,38 @@ Where ``'hook'`` is one of the following hook strings and ``function`` is a func
     hooks.register('insert_editor_css', editor_css)
 
 
+Image Formats in the Rich Text Editor
+-------------------------------------
+
+On loading, Wagtail will search for any app with the file ``image_formats.py`` and execute the contents. This provides a way to customize the formatting options shown to the editor when inserting images in the ``RichTextField`` editor.
+
+As an example, add a "thumbnail" format:
+
+.. code-block:: python
+  # image_formats.py
+  from wagtail.wagtailimages.formats import Format, register_image_format
+
+  register_image_format(Format('thumbnail', 'Thumbnail', 'richtext-image thumbnail', 'max-120x120'))
+
+
+To begin, import the the ``Format`` class, ``register_image_format`` function, and optionally ``unregister_image_format`` function. To register a new ``Format``, call the ``register_image_format`` with the ``Format`` object as the argument. The ``Format`` takes the following init arguments:
+
+``name``
+  The unique key used to identify the format. To unregister this format, call ``unregister_image_format`` with this string as the only argument.
+
+``label``
+  The label used in the chooser form when inserting the image into the ``RichTextField``.
+
+``classnames``
+  The string to assign to the ``class`` attribute of the generated ``<img>`` tag.
+
+``filter_spec``
+  The string specification to create the image rendition. For more, see the :ref:`image_tag`.
+
+
+To unregister, call ``unregister_image_format`` with the string of the ``name`` of the ``Format`` as the only argument.
+
+
 Content Index Pages (CRUD)
 --------------------------
 

From f5487e807633d510b58bc1e54ddb2f2334732272 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 11 Jun 2014 09:23:09 +0100
Subject: [PATCH 45/60] Added some missing changelog entries

---
 CHANGELOG.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 22f417d3d..6c28594a9 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,13 @@ Changelog
 0.4 (xx.xx.20xx)
 ~~~~~~~~~~~~~~~~
  * Added 'original' as a resizing rule supported by the 'image' tag
+ * Hallo.js updated to version 1.0.4
+ * Snippets are now ordered alphabetically
+ * Removed the "More" section from the admin menu
+ * Added pagination to page listings in admin
+ * Fix: Animated GIFs are now coalesced before resizing
+ * Fix: Wand backend clones images before modifying them
+ * Fix: Admin breadcrumb now positioned correctly on mobile
 
 0.3.1 (03.06.2014)
 ~~~~~~~~~~~~~~~~~~

From 9d98eeefb8cb8a8f9e31cbf352326222dc2c2911 Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Wed, 11 Jun 2014 10:46:29 +0100
Subject: [PATCH 46/60] Fix embedly key referenced before assignment

---
 wagtail/wagtailembeds/embeds.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailembeds/embeds.py b/wagtail/wagtailembeds/embeds.py
index 38c8ee50a..03029a23b 100644
--- a/wagtail/wagtailembeds/embeds.py
+++ b/wagtail/wagtailembeds/embeds.py
@@ -45,13 +45,14 @@ def import_string(dotted_path):
 
 def embedly(url, max_width=None, key=None):
     from embedly import Embedly
-    # Get embedly client
-    client = Embedly(key=key)
 
     # Get embedly key
     if key is None:
         key = settings.EMBEDLY_KEY
 
+    # Get embedly client
+    client = Embedly(key=key)
+
     # Call embedly
     if max_width is not None:
         oembed = client.oembed(url, maxwidth=max_width, better=False)

From 200854b705f3e30ebfc00642c7359187c91f2a16 Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Wed, 11 Jun 2014 10:59:27 +0100
Subject: [PATCH 47/60] Move chooser tests from tests.py to
 test_page_chooser.py

---
 .../wagtailadmin/tests/test_page_chooser.py   | 82 +++++++++++++++++++
 wagtail/wagtailadmin/tests/tests.py           | 82 -------------------
 2 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_page_chooser.py b/wagtail/wagtailadmin/tests/test_page_chooser.py
index 036619e2c..b5add3f15 100644
--- a/wagtail/wagtailadmin/tests/test_page_chooser.py
+++ b/wagtail/wagtailadmin/tests/test_page_chooser.py
@@ -37,3 +37,85 @@ class TestChooserBrowse(TestCase):
     def test_get_invalid(self):
         response = self.get({'page_type': 'foo.bar'})
         self.assertEqual(response.status_code, 404)
+
+
+class TestChooserBrowseChild(TestCase):
+    def setUp(self):
+        self.root_page = Page.objects.get(id=2)
+
+        # Add child page
+        self.child_page = SimplePage()
+        self.child_page.title = "foobarbaz"
+        self.child_page.slug = "foobarbaz"
+        self.root_page.add_child(instance=self.child_page)
+
+        login(self.client)
+
+    def get(self, params={}):
+        return self.client.get(reverse('wagtailadmin_choose_page_child',
+                                       args=(self.root_page.id,)), params)
+
+    def get_invalid(self, params={}):
+        return self.client.get(reverse('wagtailadmin_choose_page_child',
+                                       args=(9999999,)), params)
+
+    def test_status_code(self):
+        self.assertEqual(self.get().status_code, 200)
+
+    def test_search(self):
+        response = self.get({'q': "foobarbaz"})
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "There is one match")
+        self.assertContains(response, "foobarbaz")
+
+    def test_search_no_results(self):
+        response = self.get({'q': "quux"})
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "There are 0 matches")
+
+    def test_get_invalid(self):
+        self.assertEqual(self.get_invalid().status_code, 404)
+
+
+class TestChooserExternalLink(TestCase):
+    def setUp(self):
+        login(self.client)
+
+    def get(self, params={}):
+        return self.client.get(reverse('wagtailadmin_choose_page_external_link'), params)
+
+    def post(self, post_data={}):
+        return self.client.post(reverse('wagtailadmin_choose_page_external_link'), post_data)
+
+    def test_status_code(self):
+        self.assertEqual(self.get().status_code, 200)
+
+    def test_get_with_param(self):
+        self.assertEqual(self.get({'prompt_for_link_text': 'foo'}).status_code, 200)
+
+    def test_create_link(self):
+        request = self.post({'url': 'http://www.example.com'})
+        self.assertContains(request, "'url': 'http://www.example.com/',")
+        self.assertContains(request, "'title': 'http://www.example.com/'")
+
+
+class TestChooserEmailLink(TestCase):
+    def setUp(self):
+        login(self.client)
+
+    def get(self, params={}):
+        return self.client.get(reverse('wagtailadmin_choose_page_email_link'), params)
+
+    def post(self, post_data={}):
+        return self.client.post(reverse('wagtailadmin_choose_page_email_link'), post_data)
+
+    def test_status_code(self):
+        self.assertEqual(self.get().status_code, 200)
+
+    def test_get_with_param(self):
+        self.assertEqual(self.get({'prompt_for_link_text': 'foo'}).status_code, 200)
+
+    def test_create_link(self):
+        request = self.post({'email_address': 'example@example.com'})
+        self.assertContains(request, "'url': 'mailto:example@example.com',")
+        self.assertContains(request, "'title': 'example@example.com'")
diff --git a/wagtail/wagtailadmin/tests/tests.py b/wagtail/wagtailadmin/tests/tests.py
index cb8e0ec29..12aa28a0b 100644
--- a/wagtail/wagtailadmin/tests/tests.py
+++ b/wagtail/wagtailadmin/tests/tests.py
@@ -44,85 +44,3 @@ class TestSendEmailTask(TestCase):
         self.assertEqual(mail.outbox[0].subject, "Test subject")
         self.assertEqual(mail.outbox[0].body, "Test content")
         self.assertEqual(mail.outbox[0].to, ["nobody@email.com"])
-
-
-class TestChooserBrowseChild(TestCase):
-    def setUp(self):
-        self.root_page = Page.objects.get(id=2)
-
-        # Add child page
-        self.child_page = SimplePage()
-        self.child_page.title = "foobarbaz"
-        self.child_page.slug = "foobarbaz"
-        self.root_page.add_child(instance=self.child_page)
-
-        login(self.client)
-
-    def get(self, params={}):
-        return self.client.get(reverse('wagtailadmin_choose_page_child',
-                                       args=(self.root_page.id,)), params)
-
-    def get_invalid(self, params={}):
-        return self.client.get(reverse('wagtailadmin_choose_page_child',
-                                       args=(9999999,)), params)
-
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
-
-    def test_search(self):
-        response = self.get({'q': "foobarbaz"})
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, "There is one match")
-        self.assertContains(response, "foobarbaz")
-
-    def test_search_no_results(self):
-        response = self.get({'q': "quux"})
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, "There are 0 matches")
-
-    def test_get_invalid(self):
-        self.assertEqual(self.get_invalid().status_code, 404)
-
-
-class TestChooserExternalLink(TestCase):
-    def setUp(self):
-        login(self.client)
-
-    def get(self, params={}):
-        return self.client.get(reverse('wagtailadmin_choose_page_external_link'), params)
-
-    def post(self, post_data={}):
-        return self.client.post(reverse('wagtailadmin_choose_page_external_link'), post_data)
-
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
-
-    def test_get_with_param(self):
-        self.assertEqual(self.get({'prompt_for_link_text': 'foo'}).status_code, 200)
-
-    def test_create_link(self):
-        request = self.post({'url': 'http://www.example.com'})
-        self.assertContains(request, "'url': 'http://www.example.com/',")
-        self.assertContains(request, "'title': 'http://www.example.com/'")
-
-
-class TestChooserEmailLink(TestCase):
-    def setUp(self):
-        login(self.client)
-
-    def get(self, params={}):
-        return self.client.get(reverse('wagtailadmin_choose_page_email_link'), params)
-
-    def post(self, post_data={}):
-        return self.client.post(reverse('wagtailadmin_choose_page_email_link'), post_data)
-
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
-
-    def test_get_with_param(self):
-        self.assertEqual(self.get({'prompt_for_link_text': 'foo'}).status_code, 200)
-
-    def test_create_link(self):
-        request = self.post({'email_address': 'example@example.com'})
-        self.assertContains(request, "'url': 'mailto:example@example.com',")
-        self.assertContains(request, "'title': 'example@example.com'")

From 6eec08dfbe1ea0718618bef2b8c51ab7e14628f8 Mon Sep 17 00:00:00 2001
From: Helen Warren <helen@torchbox.com>
Date: Wed, 11 Jun 2014 11:51:33 +0100
Subject: [PATCH 48/60] Fix behaviour described in issue 77. Specifically
 validate that for an editors pick a search term/phrase must be defined and at
 least one valid page recommendation specified.

---
 wagtail/wagtailsearch/forms.py                | 19 ++++++++++++++
 .../wagtailsearch/editorspicks/add.html       |  2 +-
 wagtail/wagtailsearch/views/editorspicks.py   | 25 +++++++++++++------
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/wagtail/wagtailsearch/forms.py b/wagtail/wagtailsearch/forms.py
index 03e4ecd45..9485e4619 100644
--- a/wagtail/wagtailsearch/forms.py
+++ b/wagtail/wagtailsearch/forms.py
@@ -31,6 +31,8 @@ EditorsPickFormSetBase = inlineformset_factory(models.Query, models.EditorsPick,
 
 
 class EditorsPickFormSet(EditorsPickFormSetBase):
+    minimum_forms = 1
+    minimum_forms_message = _("Please specify at least one recommendation for this search term.")
     def add_fields(self, form, *args, **kwargs):
         super(EditorsPickFormSet, self).add_fields(form, *args, **kwargs)
 
@@ -40,3 +42,20 @@ class EditorsPickFormSet(EditorsPickFormSetBase):
 
         # Remove query field
         del form.fields['query']
+
+    def clean(self):
+        # Editors pick must have at least one recommended page to be valid
+        # Check there is at least one non-deleted form.
+        non_deleted_forms = self.total_form_count()
+        non_empty_forms = 0
+        for i in xrange(0, self.total_form_count()):
+            form = self.forms[i]
+            if self.can_delete and self._should_delete_form(form):
+                non_deleted_forms -= 1
+            if not (form.instance.id is None and not form.has_changed()):
+                non_empty_forms += 1
+        if (
+            non_deleted_forms < self.minimum_forms
+            or non_empty_forms < self.minimum_forms
+        ):
+            raise forms.ValidationError(self.minimum_forms_message)
diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/add.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/add.html
index 3c927d96c..f443d1a6a 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/add.html
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/add.html
@@ -6,7 +6,7 @@
     {% include "wagtailadmin/shared/header.html" with title=add_str icon="pick" %}
 
     <div class="nice-padding">
-        {% blocktrans %}s
+        {% blocktrans %}
         <p>Editors picks are a means of recommending specific pages that might not organically come high up in search results. E.g recommending your primary donation page to a user searching with a less common term like "<em>giving</em>".</p>
         {% endblocktrans %}
         {% blocktrans %}
diff --git a/wagtail/wagtailsearch/views/editorspicks.py b/wagtail/wagtailsearch/views/editorspicks.py
index 97332818e..bb39c02ba 100644
--- a/wagtail/wagtailsearch/views/editorspicks.py
+++ b/wagtail/wagtailsearch/views/editorspicks.py
@@ -45,12 +45,12 @@ def index(request):
 
 
 def save_editorspicks(query, new_query, editors_pick_formset):
-    # Set sort_order
-    for i, form in enumerate(editors_pick_formset.ordered_forms):
-        form.instance.sort_order = i
-
     # Save
     if editors_pick_formset.is_valid():
+        # Set sort_order
+        for i, form in enumerate(editors_pick_formset.ordered_forms):
+            form.instance.sort_order = i
+
         editors_pick_formset.save()
 
         # If query was changed, move all editors picks to the new query
@@ -72,10 +72,14 @@ def add(request):
 
             # Save editors picks
             editors_pick_formset = forms.EditorsPickFormSet(request.POST, instance=query)
-
             if save_editorspicks(query, query, editors_pick_formset):
                 messages.success(request, _("Editor's picks for '{0}' created.").format(query))
                 return redirect('wagtailsearch_editorspicks_index')
+            else:
+                if len(editors_pick_formset.non_form_errors()):
+                    messages.error(request, " ".join(error for error in editors_pick_formset.non_form_errors()))  # formset level error (e.g. no forms submitted)
+                else:
+                    messages.error(request, _("Recommendations have not been created due to errors"))  # specific errors will be displayed within form fields
         else:
             editors_pick_formset = forms.EditorsPickFormSet()
     else:
@@ -95,15 +99,22 @@ def edit(request, query_id):
     if request.POST:
         # Get query
         query_form = forms.QueryForm(request.POST)
+        # and the recommendations
+        editors_pick_formset = forms.EditorsPickFormSet(request.POST, instance=query)
+
         if query_form.is_valid():
             new_query = models.Query.get(query_form['query_string'].value())
 
             # Save editors picks
-            editors_pick_formset = forms.EditorsPickFormSet(request.POST, instance=query)
-
             if save_editorspicks(query, new_query, editors_pick_formset):
                 messages.success(request, _("Editor's picks for '{0}' updated.").format(new_query))
                 return redirect('wagtailsearch_editorspicks_index')
+            else:
+                if len(editors_pick_formset.non_form_errors()):
+                    messages.error(request, " ".join(error for error in editors_pick_formset.non_form_errors()))  # formset level error (e.g. no forms submitted)
+                else:
+                    messages.error(request, _("Recommendations have not been saved due to errors"))  # specific errors will be displayed within form fields
+
     else:
         query_form = forms.QueryForm(initial=dict(query_string=query.query_string))
         editors_pick_formset = forms.EditorsPickFormSet(instance=query)

From 7a290ead906867917da9595f324087b1d86c5fac Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 12 Jun 2014 14:09:47 +0100
Subject: [PATCH 49/60] margin causing problems in login screen solved

---
 wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss
index 3e158e51f..13845ce53 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss
@@ -25,6 +25,7 @@ body{
 .wrapper{
     padding-left:$mobile-nice-padding;
     padding-right:$mobile-nice-padding;
+    margin-left:0;
     max-width:none;
 }
 

From 8368837e2c06c4a160e3e8731f8d91793d66a204 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 12 Jun 2014 16:52:52 +0100
Subject: [PATCH 50/60] fix styling of preview button on create page when there
 are multiple preview modes

---
 wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
index 237219940..b87af8fae 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
@@ -40,7 +40,7 @@
                 <li class="actions preview">
                     {% trans 'Preview' as preview_label %}
                     {% if display_modes|length > 1 %}
-                        <div class="dropdown dropup button match-width">
+                        <div class="dropdown dropup dropdown-button match-width">
                             {% include "wagtailadmin/pages/_preview_button_on_create.html" with label=preview_label icon=1 %}
                             <div class="dropdown-toggle icon icon-arrow-up"></div>
                             <ul role="menu">

From ff5879def9f465def8adc425f96d9dcdaf74a30b Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Fri, 13 Jun 2014 10:24:32 +0100
Subject: [PATCH 51/60] Add unit tests for wagtailcore/whitelist.py

---
 wagtail/wagtailcore/tests/test_whitelist.py | 136 ++++++++++++++++++++
 wagtail/wagtailcore/whitelist.py            |   5 +-
 2 files changed, 140 insertions(+), 1 deletion(-)
 create mode 100644 wagtail/wagtailcore/tests/test_whitelist.py

diff --git a/wagtail/wagtailcore/tests/test_whitelist.py b/wagtail/wagtailcore/tests/test_whitelist.py
new file mode 100644
index 000000000..28b63d9fb
--- /dev/null
+++ b/wagtail/wagtailcore/tests/test_whitelist.py
@@ -0,0 +1,136 @@
+from bs4 import BeautifulSoup, NavigableString
+
+from django.test import TestCase
+from wagtail.wagtailcore.whitelist import (
+    check_url,
+    attribute_rule,
+    allow_without_attributes,
+    Whitelister
+)
+
+class TestCheckUrl(TestCase):
+    def test_allowed_url_schemes(self):
+        for url_scheme in ['', 'http', 'https', 'ftp', 'mailto', 'tel']:
+            url = url_scheme + "://www.example.com"
+            self.assertTrue(bool(check_url(url)))
+
+    def test_disallowed_url_scheme(self):
+        self.assertFalse(bool(check_url("invalid://url")))
+
+
+class TestAttributeRule(TestCase):
+    def setUp(self):
+        self.soup = BeautifulSoup('<b foo="bar">baz</b>')
+
+    def test_no_rule_for_attr(self):
+        """
+        Test that attribute_rule() drops attributes for
+        which no rule has been defined.
+        """
+        tag = self.soup.b
+        fn = attribute_rule({'snowman': 'barbecue'})
+        fn(tag)
+        self.assertEqual(str(tag), '<b>baz</b>')
+
+    def test_rule_true_for_attr(self):
+        """
+        Test that attribute_rule() does not change atrributes
+        when the corresponding rule returns True
+        """
+        tag = self.soup.b
+        fn = attribute_rule({'foo': True})
+        fn(tag)
+        self.assertEqual(str(tag), '<b foo="bar">baz</b>')
+
+    def test_rule_false_for_attr(self):
+        """
+        Test that attribute_rule() drops atrributes
+        when the corresponding rule returns False
+        """
+        tag = self.soup.b
+        fn = attribute_rule({'foo': False})
+        fn(tag)
+        self.assertEqual(str(tag), '<b>baz</b>')
+
+    def test_callable_called_on_attr(self):
+        """
+        Test that when the rule returns a callable,
+        attribute_rule() replaces the attribute with
+        the result of calling the callable on the attribute.
+        """
+        tag = self.soup.b
+        fn = attribute_rule({'foo': len})
+        fn(tag)
+        self.assertEqual(str(tag), '<b foo="3">baz</b>')
+
+    def test_callable_returns_None(self):
+        """
+        Test that when the rule returns a callable,
+        attribute_rule() replaces the attribute with
+        the result of calling the callable on the attribute.
+        """
+        tag = self.soup.b
+        fn = attribute_rule({'foo': lambda x: None})
+        fn(tag)
+        self.assertEqual(str(tag), '<b>baz</b>')
+
+    def test_allow_without_attributes(self):
+        """
+        Test that attribute_rule() with will drop all
+        attributes.
+        """
+        soup = BeautifulSoup('<b foo="bar" baz="quux" snowman="barbecue"></b>')
+        tag = soup.b
+        allow_without_attributes(tag)
+        self.assertEqual(str(tag), '<b></b>')
+
+
+class TestWhitelister(TestCase):
+    def test_clean_unknown_node(self):
+        """
+        Unknown node should remove a node from the parent document
+        """
+        soup = BeautifulSoup('<foo><bar>baz</bar>quux</foo>')
+        tag = soup.foo
+        Whitelister.clean_unknown_node('', soup.bar)
+        self.assertEqual(str(tag), '<foo>quux</foo>')
+
+    def test_clean_tag_node_cleans_nested_recognised_node(self):
+        """
+        <b> tags are allowed without attributes. This remains true
+        when tags are nested.
+        """
+        soup = BeautifulSoup('<b><b class="delete me">foo</b></b>')
+        tag = soup.b
+        Whitelister.clean_tag_node(tag, tag)
+        self.assertEqual(str(tag), '<b><b>foo</b></b>')
+
+    def test_clean_tag_node_disallows_nested_unrecognised_node(self):
+        """
+        <foo> tags should be removed, even when nested.
+        """
+        soup = BeautifulSoup('<b><foo>bar</foo></b>')
+        tag = soup.b
+        Whitelister.clean_tag_node(tag, tag)
+        self.assertEqual(str(tag), '<b>bar</b>')
+
+    def test_clean_string_node_does_nothing(self):
+        soup = BeautifulSoup('<b>bar</b>')
+        string = soup.b.string
+        Whitelister.clean_string_node(string, string)
+        self.assertEqual(str(string), 'bar')
+
+    def test_clean_node_does_not_change_navigable_strings(self):
+        soup = BeautifulSoup('<b>bar</b>')
+        string = soup.b.string
+        Whitelister.clean_node(string, string)
+        self.assertEqual(str(string), 'bar')
+
+    def test_clean(self):
+        """
+        Whitelister.clean should remove disallowed tags and attributes from
+        a string
+        """
+        string = '<b foo="bar">snowman <barbecue>Yorkshire</barbecue></b>'
+        cleaned_string = Whitelister.clean(string)
+        self.assertEqual(cleaned_string, '<b>snowman Yorkshire</b>')
diff --git a/wagtail/wagtailcore/whitelist.py b/wagtail/wagtailcore/whitelist.py
index 508682cda..a3d377bd6 100644
--- a/wagtail/wagtailcore/whitelist.py
+++ b/wagtail/wagtailcore/whitelist.py
@@ -89,7 +89,10 @@ class Whitelister(object):
             cls.clean_string_node(doc, node)
         elif isinstance(node, Tag):
             cls.clean_tag_node(doc, node)
-        else:
+        # This branch is here in case node is a BeautifulSoup object that does
+        # not inherit from NavigableString or Tag. I can't find any examples
+        # of such a thing at the moment, so this branch is untested.
+        else:  # pragma: no cover
             cls.clean_unknown_node(doc, node)
 
     @classmethod

From cc2d8b68730dc90d8241f3b83f7a076dbadada91 Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Fri, 13 Jun 2014 14:18:16 +0100
Subject: [PATCH 52/60] Truncate long search strings

Search query strings must not exceed 255 characters; they will be
truncated if they do. Also added embedly library for Travis.
---
 .travis.yml                                 |  2 +-
 wagtail/wagtailsearch/models.py             |  6 +++++-
 wagtail/wagtailsearch/tests/test_queries.py | 10 ++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e23794d4f..3e0a4bb98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ services:
 # Package installation
 install:
   - python setup.py install
-  - pip install psycopg2 pyelasticsearch elasticutils==0.8.2 wand
+  - pip install psycopg2 pyelasticsearch elasticutils==0.8.2 wand embedly
   - pip install coveralls
 # Pre-test configuration
 before_script:
diff --git a/wagtail/wagtailsearch/models.py b/wagtail/wagtailsearch/models.py
index 809e139ed..6b07872f5 100644
--- a/wagtail/wagtailsearch/models.py
+++ b/wagtail/wagtailsearch/models.py
@@ -5,9 +5,10 @@ from indexed import Indexed
 import datetime
 import string
 
+MAX_QUERY_STRING_LENGTH = 255
 
 class Query(models.Model):
-    query_string = models.CharField(max_length=255, unique=True)
+    query_string = models.CharField(max_length=MAX_QUERY_STRING_LENGTH, unique=True)
 
     def save(self, *args, **kwargs):
         # Normalise query string
@@ -48,6 +49,9 @@ class Query(models.Model):
 
     @staticmethod
     def normalise_query_string(query_string):
+        # Truncate query string
+        if len(query_string) > MAX_QUERY_STRING_LENGTH:
+            query_string = query_string[:MAX_QUERY_STRING_LENGTH]
         # Convert query_string to lowercase
         query_string = query_string.lower()
 
diff --git a/wagtail/wagtailsearch/tests/test_queries.py b/wagtail/wagtailsearch/tests/test_queries.py
index 7086d46f4..7c65af6bf 100644
--- a/wagtail/wagtailsearch/tests/test_queries.py
+++ b/wagtail/wagtailsearch/tests/test_queries.py
@@ -53,6 +53,16 @@ class TestQueryStringNormalisation(TestCase):
         for query in queries:
             self.assertNotEqual(self.query, models.Query.get(query))
 
+    def test_truncation(self):
+        test_querystring = 'a' * 1000
+        result = models.Query.normalise_query_string(test_querystring)
+        self.assertEqual(len(result), 255)
+
+    def test_no_truncation(self):
+        test_querystring = 'a' * 10
+        result = models.Query.normalise_query_string(test_querystring)
+        self.assertEqual(len(result), 10)
+
 
 class TestQueryPopularity(TestCase):
     def test_query_popularity(self):

From d6aa265666c4670bf0126a234e743d6ae95eb5f2 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 13 Jun 2014 17:08:56 +0100
Subject: [PATCH 53/60] all fields now display required asterisk when necessary

---
 .../static/wagtailadmin/scss/components/forms.scss         | 7 +++++++
 .../templates/wagtailadmin/shared/field_as_li.html         | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index 29c44b4f3..8a0d4f977 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -648,6 +648,13 @@ ul.tagit li.tagit-choice-editable{
     }
 }
 
+/* search-bars */
+.search-bar{
+    .required label:after{
+        display:none;
+    }
+}
+
 /* Transitions */
 fieldset, input, textarea, select{
     @include transition(background-color 0.2s ease);
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html
index 678dd67fd..a1f51174a 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html
@@ -1,5 +1,5 @@
 {% load wagtailadmin_tags %}
-<li class="{{ field.css_classes }} {{ field|fieldtype }} {{ li_classes }} {% if field.errors %}error{% endif %}">
+<li class="{% if field.field.required %}required{% endif %} {{ field.css_classes }} {{ field|fieldtype }} {{ li_classes }} {% if field.errors %}error{% endif %}">
     <div class="field">
         {{ field.label_tag }}
         <div class="field-content">

From 7a709709e9af733138f3395a97434005bfbb8aca Mon Sep 17 00:00:00 2001
From: Neal Todd <neal.todd@torchbox.com>
Date: Mon, 16 Jun 2014 09:39:06 +0100
Subject: [PATCH 54/60] Doc fix - use https rather than ssh for wagtaildemo
 clone

---
 docs/gettingstarted.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/gettingstarted.rst b/docs/gettingstarted.rst
index 458de387b..de635256c 100644
--- a/docs/gettingstarted.rst
+++ b/docs/gettingstarted.rst
@@ -65,7 +65,7 @@ Wagtail instance available as the basis for your new site:
 -  Install `Vagrant <http://www.vagrantup.com/>`_ 1.1+
 -  Clone the demonstration site, create the Vagrant box and initialise Wagtail::
 
-	git clone git@github.com:torchbox/wagtaildemo.git
+	git clone https://github.com/torchbox/wagtaildemo.git
 	cd wagtaildemo
 	vagrant up
 	vagrant ssh

From a60af70dfe5fcb64bc0190dbaeed07fe1e200d42 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 16 Jun 2014 09:47:48 +0100
Subject: [PATCH 55/60] Docs fix: Elasticutils 0.9+ is not supported

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

diff --git a/docs/wagtail_search.rst b/docs/wagtail_search.rst
index 642a5e741..3d8ea26b2 100644
--- a/docs/wagtail_search.rst
+++ b/docs/wagtail_search.rst
@@ -224,10 +224,13 @@ Prerequisites are the Elasticsearch service itself and, via pip, the `elasticuti
 
 .. code-block:: guess
 
-  pip install elasticutils pyelasticsearch
+  pip install elasticutils==0.8.2 pyelasticsearch
 
 .. note::
-    The dependency on pyelasticsearch is scheduled to be replaced by a dependency on `elasticsearch-py`_.
+    ElasticUtils 0.9+ is not supported.
+
+.. note::
+    The dependency on elasticutils and pyelasticsearch is scheduled to be replaced by a dependency on `elasticsearch-py`_.
 
 The backend is configured in settings:
 

From 02b4223e41e8a25921521bf566cd7a736866b80c Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 16 Jun 2014 10:28:59 +0100
Subject: [PATCH 56/60] Improvements to page chooser tests

---
 .../wagtailadmin/tests/test_page_chooser.py   | 43 +++++++++++--------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_page_chooser.py b/wagtail/wagtailadmin/tests/test_page_chooser.py
index b5add3f15..475e4f7b1 100644
--- a/wagtail/wagtailadmin/tests/test_page_chooser.py
+++ b/wagtail/wagtailadmin/tests/test_page_chooser.py
@@ -3,9 +3,10 @@ from django.core.urlresolvers import reverse
 
 from wagtail.wagtailcore.models import Page
 from wagtail.tests.models import SimplePage
-from wagtail.tests.utils import login
+from wagtail.tests.utils import WagtailTestUtils
 
-class TestChooserBrowse(TestCase):
+
+class TestChooserBrowse(TestCase, WagtailTestUtils):
     def setUp(self):
         self.root_page = Page.objects.get(id=2)
 
@@ -15,13 +16,15 @@ class TestChooserBrowse(TestCase):
         self.child_page.slug = "foobarbaz"
         self.root_page.add_child(instance=self.child_page)
 
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtailadmin_choose_page'), params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailadmin/chooser/browse.html')
 
     def test_search(self):
         response = self.get({'q': "foobarbaz"})
@@ -39,7 +42,7 @@ class TestChooserBrowse(TestCase):
         self.assertEqual(response.status_code, 404)
 
 
-class TestChooserBrowseChild(TestCase):
+class TestChooserBrowseChild(TestCase, WagtailTestUtils):
     def setUp(self):
         self.root_page = Page.objects.get(id=2)
 
@@ -49,7 +52,7 @@ class TestChooserBrowseChild(TestCase):
         self.child_page.slug = "foobarbaz"
         self.root_page.add_child(instance=self.child_page)
 
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtailadmin_choose_page_child',
@@ -59,8 +62,10 @@ class TestChooserBrowseChild(TestCase):
         return self.client.get(reverse('wagtailadmin_choose_page_child',
                                        args=(9999999,)), params)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailadmin/chooser/browse.html')
 
     def test_search(self):
         response = self.get({'q': "foobarbaz"})
@@ -77,9 +82,9 @@ class TestChooserBrowseChild(TestCase):
         self.assertEqual(self.get_invalid().status_code, 404)
 
 
-class TestChooserExternalLink(TestCase):
+class TestChooserExternalLink(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtailadmin_choose_page_external_link'), params)
@@ -87,8 +92,10 @@ class TestChooserExternalLink(TestCase):
     def post(self, post_data={}):
         return self.client.post(reverse('wagtailadmin_choose_page_external_link'), post_data)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailadmin/chooser/external_link.html')
 
     def test_get_with_param(self):
         self.assertEqual(self.get({'prompt_for_link_text': 'foo'}).status_code, 200)
@@ -99,9 +106,9 @@ class TestChooserExternalLink(TestCase):
         self.assertContains(request, "'title': 'http://www.example.com/'")
 
 
-class TestChooserEmailLink(TestCase):
+class TestChooserEmailLink(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login()
 
     def get(self, params={}):
         return self.client.get(reverse('wagtailadmin_choose_page_email_link'), params)
@@ -109,8 +116,10 @@ class TestChooserEmailLink(TestCase):
     def post(self, post_data={}):
         return self.client.post(reverse('wagtailadmin_choose_page_email_link'), post_data)
 
-    def test_status_code(self):
-        self.assertEqual(self.get().status_code, 200)
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailadmin/chooser/email_link.html')
 
     def test_get_with_param(self):
         self.assertEqual(self.get({'prompt_for_link_text': 'foo'}).status_code, 200)

From 4235450f5e5f3c21e5dfc592f99351e12ec74910 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 16 Jun 2014 10:31:05 +0100
Subject: [PATCH 57/60] Minor PEP8 fix

---
 runtests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtests.py b/runtests.py
index 346729653..6fd98d084 100755
--- a/runtests.py
+++ b/runtests.py
@@ -102,7 +102,7 @@ if not settings.configured:
         COMPRESS_ENABLED=False,  # disable compression so that we can run tests on the content of the compress tag
         WAGTAILSEARCH_BACKENDS=WAGTAILSEARCH_BACKENDS,
         WAGTAIL_SITE_NAME='Test Site',
-        LOGIN_REDIRECT_URL = 'wagtailadmin_home',
+        LOGIN_REDIRECT_URL='wagtailadmin_home',
     )
 
 

From b5dc5a951628af41ce4427be53705edd4a049865 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Mon, 16 Jun 2014 12:59:43 +0100
Subject: [PATCH 58/60] tweaks to make modals fade better

---
 .../static/wagtailadmin/js/modal-workflow.js  |  4 +-
 .../js/vendor/bootstrap-transition.js         | 65 +++++++++++++++++++
 .../wagtailadmin/scss/components/modals.scss  | 10 +++
 .../templates/wagtailadmin/admin_base.html    |  1 +
 4 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/bootstrap-transition.js

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/modal-workflow.js b/wagtail/wagtailadmin/static/wagtailadmin/js/modal-workflow.js
index 9aa90f857..6a3cd317e 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/modal-workflow.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/modal-workflow.js
@@ -18,7 +18,7 @@ function ModalWorkflow(opts) {
 
     var container = $('<div class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">\n    <div class="modal-dialog">\n        <div class="modal-content">\n            <button type="button" class="close icon text-replace icon-cross" data-dismiss="modal" aria-hidden="true">&times;</button>\n            <div class="modal-body"></div>\n        </div><!-- /.modal-content -->\n    </div><!-- /.modal-dialog -->\n</div>');
     $('body').append(container);
-    container.modal();
+    container.modal('hide');
 
     self.body = container.find('.modal-body');
 
@@ -49,7 +49,9 @@ function ModalWorkflow(opts) {
 
     self.loadResponseText = function(responseText) {
         var response = eval('(' + responseText + ')');
+
         self.loadBody(response);
+        container.modal('show');
     };
 
     self.loadBody = function(body) {
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/bootstrap-transition.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/bootstrap-transition.js
new file mode 100644
index 000000000..36141c4fc
--- /dev/null
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/bootstrap-transition.js
@@ -0,0 +1,65 @@
+/* ========================================================================
+ * Bootstrap: transition.js v3.1.1
+ * http://getbootstrap.com/javascript/#transitions
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function () { 'use strict';
+
+  (function (o_o) {
+    typeof define  == 'function' && define.amd ? define(['jquery'], o_o) :
+    typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
+  })(function ($) {
+
+    // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
+    // ============================================================
+
+    function transitionEnd() {
+      var el = document.createElement('bootstrap')
+
+      var transEndEventNames = {
+        WebkitTransition : 'webkitTransitionEnd',
+        MozTransition    : 'transitionend',
+        OTransition      : 'oTransitionEnd otransitionend',
+        transition       : 'transitionend'
+      }
+
+      for (var name in transEndEventNames) {
+        if (el.style[name] !== undefined) {
+          return { end: transEndEventNames[name] }
+        }
+      }
+
+      return false // explicit for ie8 (  ._.)
+    }
+
+    // http://blog.alexmaccaw.com/css-transitions
+    $.fn.emulateTransitionEnd = function (duration) {
+      var called = false
+      var $el = this
+      $(this).one('bsTransitionEnd', function () { called = true })
+      var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
+      setTimeout(callback, duration)
+      return this
+    }
+
+    $(function () {
+      $.support.transition = transitionEnd()
+
+      if (!$.support.transition) return
+
+      $.event.special.bsTransitionEnd = {
+        bindType: $.support.transition.end,
+        delegateType: $.support.transition.end,
+        handle: function (e) {
+          if ($(e.target).is(this)) return e.handleObj.handler.apply(this, arguments)
+        }
+      }
+    })
+
+  })
+
+}();
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/modals.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/modals.scss
index 3ca060f49..6a3293552 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/modals.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/modals.scss
@@ -1,5 +1,15 @@
 $zindex-modal-background: 500;
 
+.fade {
+    opacity: 0;
+    @include transition(opacity .15s linear);
+    
+    &.in {
+        opacity: 1;
+    }
+}
+
+
 // Kill the scroll on the body
 .modal-open {
     overflow: hidden;
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
index 30256781e..bb514f2aa 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
@@ -18,6 +18,7 @@
         <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/jquery-ui-1.10.3.js"></script>
         <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/jquery.timepicker.min.js"></script>
         <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/jquery.autosize.js"></script>
+        <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/bootstrap-transition.js"></script>
         <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/bootstrap-modal.js"></script>
         <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/bootstrap-tab.js"></script>
         <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/jquery.dlmenu.js"></script>

From ba15fbead1b72ea7232db794f0bedd2fbaa97e1b Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Mon, 16 Jun 2014 13:06:02 +0100
Subject: [PATCH 59/60] added better comments. tweaked when modal is shown

---
 .../static/wagtailadmin/js/modal-workflow.js    | 17 +++++++++++------
 .../wagtailadmin/scss/components/modals.scss    |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/modal-workflow.js b/wagtail/wagtailadmin/static/wagtailadmin/js/modal-workflow.js
index 6a3cd317e..bba601468 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/modal-workflow.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/modal-workflow.js
@@ -16,7 +16,10 @@ function ModalWorkflow(opts) {
     /* remove any previous modals before continuing (closing doesn't remove them from the dom) */
     $('body > .modal').remove();
 
+    // set default contents of container
     var container = $('<div class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">\n    <div class="modal-dialog">\n        <div class="modal-content">\n            <button type="button" class="close icon text-replace icon-cross" data-dismiss="modal" aria-hidden="true">&times;</button>\n            <div class="modal-body"></div>\n        </div><!-- /.modal-content -->\n    </div><!-- /.modal-dialog -->\n</div>');
+    
+    // add container to body and hide it, so content can be added to it before display
     $('body').append(container);
     container.modal('hide');
 
@@ -51,15 +54,17 @@ function ModalWorkflow(opts) {
         var response = eval('(' + responseText + ')');
 
         self.loadBody(response);
-        container.modal('show');
     };
 
-    self.loadBody = function(body) {
-        if (body.html) {
-            self.body.html(body.html);
+    self.loadBody = function(response) {
+        if (response.html) {
+            // if the response is html
+            self.body.html(response.html);
+            container.modal('show');
         }
-        if (body.onload) {
-            body.onload(self);
+        if (response.onload) {
+            // if the response is a function
+            response.onload(self);
         }
     };
 
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/modals.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/modals.scss
index 6a3293552..053e0d2c8 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/modals.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/modals.scss
@@ -80,7 +80,7 @@ $zindex-modal-background: 500;
     background-color: black;
     // Fade for backdrop
     &.fade { opacity:0; }
-    &.in { opacity:0.7; }
+    &.in { opacity:0.5; }
 }
 
 .modal .close{

From bd0a18dc133ff09bab1385cdf7ca6c05579b7e4d Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Mon, 16 Jun 2014 13:18:27 +0100
Subject: [PATCH 60/60] tidied image chooser.js

---
 .../wagtailimages/templates/wagtailimages/chooser/chooser.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.js b/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.js
index 18ff4c5c2..237b960f6 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.js
+++ b/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.js
@@ -1,4 +1,6 @@
 function(modal) {
+    var searchUrl = $('form.image-search', modal.body).attr('action');
+
     function ajaxifyLinks (context) {
         $('.listing a', context).click(function() {
             modal.loadUrl(this.href);
@@ -12,7 +14,6 @@ function(modal) {
         });
     }
 
-    var searchUrl = $('form.image-search', modal.body).attr('action');
     function search() {
         $.ajax({
             url: searchUrl,
@@ -24,8 +25,8 @@ function(modal) {
         });
         return false;
     }
-    function setPage(page) {
 
+    function setPage(page) {
         if($('#id_q').val().length){
             dataObj = {q: $('#id_q').val(), p: page};
         }else{