From e4c38302e08e24e4c0abd1f6acb0e33fa5dcb3dd Mon Sep 17 00:00:00 2001
From: Serafeim Papastefanos <spapas@gmail.com>
Date: Tue, 15 Apr 2014 21:55:24 +0300
Subject: [PATCH 001/293] Add fields for scheduled publishing

Also add a clean method to Page to check that expiry date is in the
future and that go live date is before expiry date. In order to display
the correct error message the views/pages.py view has to be changed to
display the error message from clean.

Finally add the migration for the new fields.
---
 wagtail/wagtailadmin/views/pages.py           |   7 +-
 .../0003_fields_for_scheduled_publishing.py   | 130 ++++++++++++++++++
 wagtail/wagtailcore/models.py                 |  24 +++-
 3 files changed, 156 insertions(+), 5 deletions(-)
 create mode 100644 wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py

diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 3fb90571517..9e71a612f02 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -7,7 +7,7 @@
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.decorators import permission_required
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
-from django.utils.translation import ugettext as _ 
+from django.utils.translation import ugettext as _
 from django.views.decorators.vary import vary_on_headers
 
 from wagtail.wagtailadmin.edit_handlers import TabbedInterface, ObjectList
@@ -199,7 +199,10 @@ def clean_slug(slug):
 
             return redirect('wagtailadmin_explore', page.get_parent().id)
         else:
-            messages.error(request, _("The page could not be created due to errors."))
+            if form.errors and form.errors.get('__all__'):
+                messages.error(request, _("The page could not be created: ") + ', '.join(form.errors['__all__']))
+            else:
+                messages.error(request, _("The page could not be created due to errors."))
             edit_handler = edit_handler_class(instance=page, form=form)
     else:
         form = form_class(instance=page)
diff --git a/wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py b/wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py
new file mode 100644
index 00000000000..5e682aa596b
--- /dev/null
+++ b/wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py
@@ -0,0 +1,130 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'PageRevision.approved_go_live_datetime'
+        db.add_column(u'wagtailcore_pagerevision', 'approved_go_live_datetime',
+                      self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True),
+                      keep_default=False)
+
+        # Adding field 'Page.go_live_datetime'
+        db.add_column(u'wagtailcore_page', 'go_live_datetime',
+                      self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True),
+                      keep_default=False)
+
+        # Adding field 'Page.expiry_datetime'
+        db.add_column(u'wagtailcore_page', 'expiry_datetime',
+                      self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True),
+                      keep_default=False)
+
+        # Adding field 'Page.expired'
+        db.add_column(u'wagtailcore_page', 'expired',
+                      self.gf('django.db.models.fields.BooleanField')(default=False),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'PageRevision.approved_go_live_datetime'
+        db.delete_column(u'wagtailcore_pagerevision', 'approved_go_live_datetime')
+
+        # Deleting field 'Page.go_live_datetime'
+        db.delete_column(u'wagtailcore_page', 'go_live_datetime')
+
+        # Deleting field 'Page.expiry_datetime'
+        db.delete_column(u'wagtailcore_page', 'expiry_datetime')
+
+        # Deleting field 'Page.expired'
+        db.delete_column(u'wagtailcore_page', 'expired')
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'wagtailcore.grouppagepermission': {
+            'Meta': {'object_name': 'GroupPagePermission'},
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_permissions'", 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_permissions'", 'to': u"orm['wagtailcore.Page']"}),
+            'permission_type': ('django.db.models.fields.CharField', [], {'max_length': '20'})
+        },
+        u'wagtailcore.page': {
+            'Meta': {'object_name': 'Page'},
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}),
+            'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'expired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'expiry_datetime': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'go_live_datetime': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': u"orm['auth.User']"}),
+            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'show_in_menus': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
+        },
+        u'wagtailcore.pagerevision': {
+            'Meta': {'object_name': 'PageRevision'},
+            'approved_go_live_datetime': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'content_json': ('django.db.models.fields.TextField', [], {}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'revisions'", 'to': u"orm['wagtailcore.Page']"}),
+            'submitted_for_moderation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'wagtailcore.site': {
+            'Meta': {'object_name': 'Site'},
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_default_site': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'port': ('django.db.models.fields.IntegerField', [], {'default': '80'}),
+            'root_page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sites_rooted_here'", 'to': u"orm['wagtailcore.Page']"})
+        }
+    }
+
+    complete_apps = ['wagtailcore']
\ No newline at end of file
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index d322ab69b5b..96e670ef928 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -7,10 +7,13 @@
 from django.db.models import get_model, Q
 from django.http import Http404
 from django.core.cache import cache
+from django.core.exceptions import ValidationError
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.models import Group
 from django.conf import settings
 from django.template.response import TemplateResponse
+from django.utils import timezone
+from django.utils.translation import ugettext
 from django.utils.translation import ugettext_lazy as _
 
 from wagtail.wagtailcore.util import camelcase_to_underscore
@@ -234,6 +237,10 @@ class Page(MP_Node, ClusterableModel, Indexed):
     show_in_menus = models.BooleanField(default=False, help_text=_("Whether a link to this page will appear in automatically generated menus"))
     search_description = models.TextField(blank=True)
 
+    go_live_datetime = models.DateTimeField(verbose_name=_("Go live date/time"), blank=True, null=True)
+    expiry_datetime = models.DateTimeField(verbose_name=_("Expiry date/time"), blank=True, null=True)
+    expired = models.BooleanField(default=False, editable=False)
+
     indexed_fields = {
         'title': {
             'type': 'string',
@@ -320,7 +327,7 @@ def _update_descendant_url_paths(self, old_url_path, new_url_path):
                 SET url_path = %s || substring(url_path from %s)
                 WHERE path LIKE %s AND id <> %s
             """
-        cursor.execute(update_statement, 
+        cursor.execute(update_statement,
             [new_url_path, len(old_url_path) + 1, self.path + '%', self.id])
 
     @property
@@ -399,8 +406,8 @@ def get_template(self, request):
 
     def serve(self, request):
         return TemplateResponse(
-            request, 
-            self.get_template(request), 
+            request,
+            self.get_template(request),
             self.get_context(request)
         )
 
@@ -448,6 +455,16 @@ def relative_url(self, current_site):
             if self.url_path.startswith(root_path):
                 return ('' if current_site.id == id else root_url) + self.url_path[len(root_path) - 1:]
 
+    def clean(self):
+        super(Page, self).clean()
+
+        if self.go_live_datetime and self.expiry_datetime:
+            if self.go_live_datetime > self.expiry_datetime:
+                raise ValidationError(ugettext('Go live date/time should be before expiry datetime.'))
+
+        if self.expiry_datetime and self.expiry_datetime < timezone.now():
+            raise ValidationError(ugettext('Expiry date/time should be in the future'))
+
     @classmethod
     def search(cls, query_string, show_unpublished=False, search_title_only=False, extra_filters={}, prefetch_related=[], path=None):
         # Filters
@@ -642,6 +659,7 @@ class PageRevision(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True)
     content_json = models.TextField()
+    approved_go_live_datetime = models.DateTimeField(null=True, blank=True)
 
     objects = models.Manager()
     submitted_revisions = SubmittedRevisionsManager()

From a40c71687de01c6ccf2d8c983a14dc41eec82bea Mon Sep 17 00:00:00 2001
From: Serafeim Papastefanos <spapas@gmail.com>
Date: Wed, 16 Apr 2014 10:27:07 +0300
Subject: [PATCH 002/293] Show clean model errors on edit also

---
 wagtail/wagtailadmin/views/pages.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 9e71a612f02..703d9f8ddb4 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -279,7 +279,11 @@ def clean_slug(slug):
 
             return redirect('wagtailadmin_explore', page.get_parent().id)
         else:
-            messages.error(request, _("The page could not be saved due to validation errors"))
+            if form.errors and form.errors.get('__all__'):
+                messages.error(request, _("The page could not be saved: ") + ', '.join(form.errors['__all__']))
+            else:
+                messages.error(request, _("The page could not be saved due to validation errors"))
+
             edit_handler = edit_handler_class(instance=page, form=form)
             errors_debug = (
                 repr(edit_handler.form.errors)

From 1ebe234a7eebe761fdbf7bbbb1bc32480e840a85 Mon Sep 17 00:00:00 2001
From: Serafeim Papastefanos <spapas@gmail.com>
Date: Wed, 16 Apr 2014 01:05:15 +0300
Subject: [PATCH 003/293] Add go_live_datetime handling on views/models

The logic for publishing a page exists in the create and edit views of
wagtailadmin.views.pages and in the publish methodd of hte PageRevision
model.

When a page is created and published (create view), if it has a go_live
in the future then it will not be live but the revision that will be
created will have the approved_go_live set to the corresponding datetime.
If the page is just saved or submitted for moderation the normal flow
will be followed.

When a page is edited and published (edit view):
* The approved_go_live_datetime will be cleared for all older revisions of
that page.
* If the edit has a go_live in the future then the new revision that will
be crated will have the approved_go_live set to that datetime. Also the
live attribute of the page will be set to False.
If the page is edited and not published the normal flow will be followed.

When a submitted for moderation page is published (publish method):
* If it has a go_live in the future then the live attribute will be set to
False, the approved_go_live_datetime of the revision will be set to the
go_live_datetime of the page and the approved_go_live_datetime of all
other revisions will be cleared.
* If it does not have a go_live in the future then the page will be live
and the approved_go_live_dattime of all other revisions will be cleard

Finally, if a page is unpublished then then approved_go_live_datetime of
all revisions of that page will be cleared.
---
 wagtail/wagtailadmin/views/pages.py | 44 +++++++++++++++++++++++++----
 wagtail/wagtailcore/models.py       | 32 ++++++++++++++++++---
 2 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 703d9f8ddb4..8193bdfc444 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -7,6 +7,7 @@
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.decorators import permission_required
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
+from django.utils import timezone
 from django.utils.translation import ugettext as _
 from django.views.decorators.vary import vary_on_headers
 
@@ -173,16 +174,31 @@ def clean_slug(slug):
 
             is_publishing = bool(request.POST.get('action-publish')) and parent_page_perms.can_publish_subpage()
             is_submitting = bool(request.POST.get('action-submit'))
+            go_live_datetime = form.cleaned_data.get('go_live_datetime')
+            future_go_live = go_live_datetime and go_live_datetime > timezone.now()
+            approved_go_live_datetime = None
 
-            if is_publishing:
+            if is_publishing and not future_go_live:
                 page.live = True
                 page.has_unpublished_changes = False
+            elif is_publishing and future_go_live:
+                page.live = False
+                # Set approved_go_live_datetime only if is publishing
+                # and the future_go_live is actually in future
+                approved_go_live_datetime = go_live_datetime
+                page.has_unpublished_changes = False
             else:
                 page.live = False
                 page.has_unpublished_changes = True
 
             parent_page.add_child(page)  # assign tree parameters - will cause page to be saved
-            page.save_revision(user=request.user, submitted_for_moderation=is_submitting)
+
+            # Pass approved_go_live_datetime to save_revision
+            page.save_revision(
+                user=request.user,
+                submitted_for_moderation=is_submitting,
+                approved_go_live_datetime = approved_go_live_datetime
+            )
 
             if is_publishing:
                 messages.success(request, _("Page '{0}' published.").format(page.title))
@@ -245,12 +261,24 @@ def clean_slug(slug):
         if form.is_valid():
             is_publishing = bool(request.POST.get('action-publish')) and page_perms.can_publish()
             is_submitting = bool(request.POST.get('action-submit'))
+            go_live_datetime = form.cleaned_data.get('go_live_datetime')
+            future_go_live = go_live_datetime and go_live_datetime > timezone.now()
+            approved_go_live_datetime = None
 
             if is_publishing:
-                page.live = True
                 page.has_unpublished_changes = False
+                if future_go_live:
+                    page.live = False
+                    # Set approved_go_live_datetime only if publishing
+                    approved_go_live_datetime = go_live_datetime
+                else:
+                    page.live = True
                 form.save()
-                page.revisions.update(submitted_for_moderation=False)
+                # Clear approved_go_live_datetime for older revisions
+                page.revisions.update(
+                    submitted_for_moderation=False,
+                    approved_go_live_datetime=None,
+                )
             else:
                 # not publishing the page
                 if page.live:
@@ -262,7 +290,11 @@ def clean_slug(slug):
                     page.has_unpublished_changes = True
                     form.save()
 
-            page.save_revision(user=request.user, submitted_for_moderation=is_submitting)
+            page.save_revision(
+                user=request.user,
+                submitted_for_moderation=is_submitting,
+                approved_go_live_datetime = approved_go_live_datetime
+            )
 
             if is_publishing:
                 messages.success(request, _("Page '{0}' published.").format(page.title))
@@ -443,6 +475,8 @@ def unpublish(request, page_id):
         parent_id = page.get_parent().id
         page.live = False
         page.save()
+        # Since page is unpublished clear the approved_go_live_datetime of all revisions
+        page.revisions.update(approved_go_live_datetime=None)
         messages.success(request, _("Page '{0}' unpublished.").format(page.title))
         return redirect('wagtailadmin_explore', parent_id)
 
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 96e670ef928..1ecdd1eb000 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -373,8 +373,13 @@ def route(self, request, path_components):
             else:
                 raise Http404
 
-    def save_revision(self, user=None, submitted_for_moderation=False):
-        self.revisions.create(content_json=self.to_json(), user=user, submitted_for_moderation=submitted_for_moderation)
+    def save_revision(self, user=None, submitted_for_moderation=False, approved_go_live_datetime=None):
+        self.revisions.create(
+            content_json=self.to_json(),
+            user=user,
+            submitted_for_moderation=submitted_for_moderation,
+            approved_go_live_datetime=approved_go_live_datetime,
+        )
 
     def get_latest_revision(self):
         try:
@@ -539,13 +544,20 @@ def get_verbose_name(cls):
     @property
     def status_string(self):
         if not self.live:
-            return "draft"
+            if self.approved_schedule:
+                return "scheduled"
+            else:
+                return "draft"
         else:
             if self.has_unpublished_changes:
                 return "live + draft"
             else:
                 return "live"
 
+    @property
+    def approved_schedule(self):
+        return self.revisions.exclude(approved_go_live_datetime__isnull=True).exists()
+
     def has_unpublished_subtree(self):
         """
         An awkwardly-defined flag used in determining whether unprivileged editors have
@@ -693,11 +705,23 @@ def as_page_object(self):
 
     def publish(self):
         page = self.as_page_object()
-        page.live = True
+        if page.go_live_datetime and page.go_live_datetime > timezone.now():
+            # if we have a go_live in the future don't make the page live
+            page.live = False
+            # Instead set the approved_go_live_datetime of this revision
+            self.approved_go_live_datetime = page.go_live_datetime
+            self.save()
+            # And clear the the approved_go_live_datetime of any other revisions
+            page.revisions.exclude(id=self.id).update(approved_go_live_datetime=None)
+        else:
+            page.live = True
+            # If page goes live clear the approved_go_live_datetime of all revisions
+            page.revisions.update(approved_go_live_datetime=None)
         page.save()
         self.submitted_for_moderation = False
         page.revisions.update(submitted_for_moderation=False)
 
+
 PAGE_PERMISSION_TYPE_CHOICES = [
     ('add', 'Add'),
     ('edit', 'Edit'),

From 2ebf9ba931895f32d7657847fbb7f0bf4a728219 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 17 Apr 2014 17:54:54 +0100
Subject: [PATCH 004/293] first commit of new styleguide

---
 .../wagtailadmin/scss/layouts/styleguide.scss |  77 +++++++
 .../wagtailadmin/styleguide/base.html         | 213 ++++++++++++++++++
 wagtail/wagtailadmin/urls.py                  |   2 +
 wagtail/wagtailadmin/views/styleguide.py      |   9 +
 4 files changed, 301 insertions(+)
 create mode 100644 wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
 create mode 100644 wagtail/wagtailadmin/views/styleguide.py

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss
new file mode 100644
index 00000000000..8e0894baad6
--- /dev/null
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss
@@ -0,0 +1,77 @@
+@import "../variables.scss";
+@import "../mixins.scss";
+@import "../grid.scss";
+
+section{
+	border-top:1px solid $color-grey-3;
+	padding:0 0 2em 0;
+
+	> h2:first-child{
+		margin:0;
+		font-size:1em;
+		background:$color-grey-4;
+		padding:1em;
+		margin-bottom:1em;
+	}
+}
+
+#palette{
+	@include clearfix();
+
+	ul{
+		@include clearfix();
+		@include unlist();
+	}
+
+	li{
+		float:left;
+		width:100px;
+		height:100px;
+		padding:10px;
+		color:black;
+	}
+
+	.color-teal{
+		background-color:$color-teal;
+	}
+	.color-teal-darker{
+		background-color:$color-teal-darker;
+	}
+	.color-teal-dark{
+		background-color:$color-teal-dark;
+	}
+	.color-red{
+		background-color:$color-red;
+	}
+	.color-orange{
+		background-color:$color-orange;
+	}
+	.color-green{
+		background-color:$color-green;
+	}
+	.color-grey-1{
+		background-color:$color-grey-1;
+	}
+	.color-grey-1-1{
+		background-color:$color-grey-1-1;
+	}
+	.color-grey-2{
+		background-color:$color-grey-2;
+	}
+	.color-grey-3{
+		background-color:$color-grey-3;
+	}
+	.color-grey-4{
+		background-color:$color-grey-4;
+	}
+	.color-grey-5{
+		background-color:$color-grey-5;
+	}
+}
+
+
+#icons{
+	ul{
+		@include unlist();
+	}
+}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
new file mode 100644
index 00000000000..9f9eea9228c
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
@@ -0,0 +1,213 @@
+{% extends "wagtailadmin/base.html" %}
+{% load wagtailadmin_tags %}
+{% load compress i18n %}
+
+{% block extra_css %}
+    {% compress css %}
+        <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/layouts/styleguide.scss" type="text/x-scss" />
+    {% endcompress %}
+{% endblock %}
+
+{% block titletag %}{% trans 'Styleguide' %}{% endblock %}
+{% block bodyclass %}styleguide{% endblock %}
+
+{% block content %}
+    {% trans "Styleguide" as title_trans %}
+    {% include "wagtailadmin/shared/header.html" with title=title_trans %}
+
+    <div class="nice-padding">
+        <h1>Styleguide</h1>
+        <nav>
+            <ul>
+                <li><a href="#palette">Colour palette</a></li>
+                <li><a href="#typography">Typography</a></li>
+                <li><a href="#listings">Listings</a></li>
+                <li><a href="#buttons">Buttons</a></li>
+                <li><a href="#dropdowns">Dropdowns</a></li>
+                <li><a href="#header">Header</a></li>
+                <li><a href="#messages">Messages</a></li>
+                <li><a href="#forms">Forms</a></li>
+                <li><a href="#editor">Page editor</a></li>
+                <li><a href="#tabs">Tabs</a></li>
+                <li><a href="#breadcrumbs">Breadcrumbs</a></li>
+                <li><a href="#misc">Misc formatters</a></li>
+                <li><a href="#icons">Icons</a></li>
+            </ul>
+        </nav>
+
+        <section id="palette">
+            <h2>Colour palette</h2>
+
+            <ul>
+                <li class="color-teal">color-teal</li>
+                <li class="color-teal-darker">color-teal-darker</li>
+                <li class="color-teal-dark">color-teal-dark</li>
+                <li class="color-red">color-red</li>
+                <li class="color-orange">color-orange</li>
+                <li class="color-green">color-green</li>
+            </ul>
+            <ul>
+                <li class="color-grey-1">color-grey-1</li>
+                <li class="color-grey-1-1">color-grey-1-1</li>
+                <li class="color-grey-2">color-grey-2</li>
+                <li class="color-grey-3">color-grey-3</li>
+                <li class="color-grey-4">color-grey-4</li>
+                <li class="color-grey-5">color-grey-5</li>
+            </ul>
+        </section>
+
+        <section id="typography">
+            <h2>Typography</h2>
+            <h1>This is an h1</h1>
+            <h2>This is an h2</h2>
+            <h3>This is an h3</h3>
+            <h4>This is an h4</h4>
+            <h5>This is an h5</h5>
+            <p>This is a paragraph</p>
+
+            <ul>
+                <li>These are</li>
+                <li>items in an</li>
+                <li>unordered list</li>
+            </ul>
+
+            <ol>
+                <li>These are</li>
+                <li>items in an</li>
+                <li>ordered list</li>
+            </ol>
+
+        </section>
+
+        <section id="listings">
+            <h2>Listings</h2>
+        </section>
+
+        <section id="buttons">
+            <h2>Buttons</h2>
+
+            <div href="" class="button">button</div>
+
+            <div href="" class="button button-secondary">button-secondary</div>
+
+            <div href="" class="button yes">yes</div>
+
+            <div href="" class="button no">no / serious</div>
+
+            <div href="" class="button bicolor icon icon-plus">bicolor with icon</div>
+
+            <div href="" class="button button-small">button-small</div>
+
+            <div href="" class="button bicolor button-small icon icon-plus">bicolo button-small</div>
+
+            <div href="" class="button no bicolor icon icon-cog">mixed</div>
+
+        </section>
+
+        <section id="dropdowns">
+            <h2>Dropdowns</h2>
+        </section>
+
+        <section id="header">
+            <h2>Header</h2>
+        </section>
+
+        <section id="messages">
+            <h2>Messages</h2>
+        </section>
+
+        <section id="forms">
+            <h2>Forms</h2>
+        </section>
+
+        <section id="editor">
+            <h2>Page editor</h2>
+        </section>
+
+        <section id="tabs">
+            <h2>Tabs</h2>
+        </section>
+
+        <section id="breadcrumbs">
+            <h2>Breadcrumbs</h2>
+        </section>
+
+        <section id="misc">
+            <h2>Misc formatters</h2>
+            <h3>Avatar icons</h3>
+            <h3>Status tags</h3>
+        </section>
+
+        <section id="icons">
+            <h2>Icons</h2>
+
+            <ul>
+                <li class="icon icon-wagtail">wagtail</li>
+                <li class="icon icon-wagtail-inverse">wagtail-inverse</li>
+                <li class="icon icon-cogs">cogs</li>
+                <li class="icon icon-doc-empty-inverse">doc-empty-inverse</li>
+                <li class="icon icon-doc-empty">doc-empty</li>
+                <li class="icon icon-edit">edit</li>
+                <li class="icon icon-arrow-up">arrow-up</li>
+                <li class="icon icon-arrow-down">arrow-down</li>
+                <li class="icon icon-search">search</li>
+                <li class="icon icon-cross">cross</li>
+                <li class="icon icon-folder-open-1">folder-open-1</li>
+                <li class="icon icon-folder-inverse">folder-inverse</li>
+                <li class="icon icon-mail">mail</li>
+                <li class="icon icon-arrows-up-down">arrows-up-down</li>
+                <li class="icon icon-locked">locked</li>
+                <li class="icon icon-unlocked">unlocked</li>
+                <li class="icon icon-arrow-right">arrow-right</li>
+                <li class="icon icon-doc-full">doc-full / file-text-alt</li>
+                <li class="icon icon-image">image / picture</li>
+                <li class="icon icon-doc-full-inverse">doc-full-inverse</li>
+                <li class="icon icon-folder">folder</li>
+                <li class="icon icon-plus">plus</li>
+                <li class="icon icon-tag">tag</li>
+                <li class="icon icon-folder-open-inverse">folder-open-inverse</li>
+                <li class="icon icon-cog">cog</li>
+                <li class="icon icon-tick">tick</li>
+                <li class="icon icon-user">user</li>
+                <li class="icon icon-arrow-left">arrow-left</li>
+                <li class="icon icon-tick-inverse">tick-inverse</li>
+                <li class="icon icon-plus-inverse">plus-inverse</li>
+                <li class="icon icon-snippet">snippet</li>
+                <li class="icon icon-bold">bold</li>
+                <li class="icon icon-italic">italic</li>
+                <li class="icon icon-undo">undo</li>
+                <li class="icon icon-repeat">repeat</li>
+                <li class="icon icon-list-ol">list-ol</li>
+                <li class="icon icon-list-ul">list-ul</li>
+                <li class="icon icon-link">link</li>
+                <li class="icon icon-radio-full">radio-full</li>
+                <li class="icon icon-radio-empty">radio-empty</li>
+                <li class="icon icon-arrow-up-big">arrow-up-big</li>
+                <li class="icon icon-arrow-down-big">arrow-down-big</li>
+                <li class="icon icon-group">group</li>
+                <li class="icon icon-media">media</li>
+                <li class="icon icon-horizontalrule">horizontalrule</li>
+                <li class="icon icon-password">password</li>
+                <li class="icon icon-download">download</li>
+                <li class="icon icon-order">order</li>
+                <li class="icon icon-grip">grip</li>
+                <li class="icon icon-home">home</li>
+                <li class="icon icon-order-down">order-down</li>
+                <li class="icon icon-order-up">order-up</li>
+                <li class="icon icon-bin">bin</li>
+                <li class="icon icon-spinner">spinner</li>
+                <li class="icon icon-pick">pick</li>
+                <li class="icon icon-redirect">redirect</li>
+                <li class="icon icon-view">view</li>
+                <li class="icon icon-collapse-up">collapse-up</li>
+                <li class="icon icon-collapse-down">collapse-down</li>
+                <li class="icon icon-help">help</li>
+                <li class="icon icon-warning">warning</li>
+                <li class="icon icon-success">success</li>
+            </ul>
+
+        </section>
+
+
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py
index 3b1a9853572..1241004a2d8 100644
--- a/wagtail/wagtailadmin/urls.py
+++ b/wagtail/wagtailadmin/urls.py
@@ -82,4 +82,6 @@
 
     url(r'^userbar/(\d+)/$', 'userbar.for_frontend', name='wagtailadmin_userbar_frontend'),
     url(r'^userbar/moderation/(\d+)/$', 'userbar.for_moderation', name='wagtailadmin_userbar_moderation'),
+
+    url(r'^styleguide/$', 'styleguide.index', name='wagtailadmin_styleguide'),
 )
diff --git a/wagtail/wagtailadmin/views/styleguide.py b/wagtail/wagtailadmin/views/styleguide.py
new file mode 100644
index 00000000000..33c87034c9e
--- /dev/null
+++ b/wagtail/wagtailadmin/views/styleguide.py
@@ -0,0 +1,9 @@
+from django.shortcuts import render
+
+from wagtail.wagtailadmin.userbar import EditPageItem, AddPageItem, ApproveModerationEditPageItem, RejectModerationEditPageItem
+from wagtail.wagtailadmin import hooks
+from wagtail.wagtailcore.models import Page, PageRevision
+
+def index(request):
+    # Render the edit bird
+    return render(request, 'wagtailadmin/styleguide/base.html', {})

From 89f2d76bfdcd49cb9c132342b83e29fc29a8ac44 Mon Sep 17 00:00:00 2001
From: Serafeim Papastefanos <spapas@gmail.com>
Date: Mon, 21 Apr 2014 18:03:57 +0300
Subject: [PATCH 005/293] Set expired = False when publishing pages both ...

in views and models and refactor code a bit.
---
 wagtail/wagtailadmin/views/pages.py | 18 ++++++++++--------
 wagtail/wagtailcore/models.py       |  1 +
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 8193bdfc444..7b181b5fde1 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -178,15 +178,16 @@ def clean_slug(slug):
             future_go_live = go_live_datetime and go_live_datetime > timezone.now()
             approved_go_live_datetime = None
 
-            if is_publishing and not future_go_live:
-                page.live = True
-                page.has_unpublished_changes = False
-            elif is_publishing and future_go_live:
-                page.live = False
-                # Set approved_go_live_datetime only if is publishing
-                # and the future_go_live is actually in future
-                approved_go_live_datetime = go_live_datetime
+            if is_publishing:
                 page.has_unpublished_changes = False
+                page.expired = False
+                if future_go_live:
+                    page.live = False
+                    # Set approved_go_live_datetime only if is publishing
+                    # and the future_go_live is actually in future
+                    approved_go_live_datetime = go_live_datetime
+                else:
+                    page.live = True
             else:
                 page.live = False
                 page.has_unpublished_changes = True
@@ -267,6 +268,7 @@ def clean_slug(slug):
 
             if is_publishing:
                 page.has_unpublished_changes = False
+                page.expired = False
                 if future_go_live:
                     page.live = False
                     # Set approved_go_live_datetime only if publishing
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 1ecdd1eb000..eda1a91ec57 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -717,6 +717,7 @@ def publish(self):
             page.live = True
             # If page goes live clear the approved_go_live_datetime of all revisions
             page.revisions.update(approved_go_live_datetime=None)
+        page.expired = False # When a page is published it can't be expired
         page.save()
         self.submitted_for_moderation = False
         page.revisions.update(submitted_for_moderation=False)

From 792b37d9564e3ae32f0acccda9427740a6b4541f Mon Sep 17 00:00:00 2001
From: Serafeim Papastefanos <spapas@gmail.com>
Date: Mon, 21 Apr 2014 18:08:47 +0300
Subject: [PATCH 006/293] Add "expired" status to pages

---
 wagtail/wagtailcore/models.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index eda1a91ec57..5348acf8412 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -544,7 +544,9 @@ def get_verbose_name(cls):
     @property
     def status_string(self):
         if not self.live:
-            if self.approved_schedule:
+            if self.expired:
+                return "expired"
+            elif self.approved_schedule:
                 return "scheduled"
             else:
                 return "draft"

From 6839a7474ab32873bfffb2b48237d500538ca7c7 Mon Sep 17 00:00:00 2001
From: Serafeim Papastefanos <spapas@gmail.com>
Date: Mon, 21 Apr 2014 21:48:23 +0300
Subject: [PATCH 007/293] Add management command for scheduled pages

The publish_scheduled_pages management command does three actions:

* Gets live pages which have an expiry_datetime that has passed and set
expired = True and live = False

* Gets all revisions on the moderation queue which have an expiry_datetime
that has passed and remove them from the moderation queue

* Gets all revisions that have an approved_go_live_datetime that has
passed. For each one of them the publish() method of the revision is
called which will perform the required actions for making live this
version of the page.

Finally, a dryrun parameter has been added to the management command. If
this parameter is used then the pages that pass the tests for each of the
above lists will be printed.
---
 .../commands/publish_scheduled_pages.py       | 109 ++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 wagtail/wagtailcore/management/commands/publish_scheduled_pages.py

diff --git a/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py b/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py
new file mode 100644
index 00000000000..0abf3c744e5
--- /dev/null
+++ b/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py
@@ -0,0 +1,109 @@
+import datetime
+import json
+from optparse import make_option
+
+from django.core.management.base import BaseCommand
+from django.utils import dateparse, timezone
+from wagtail.wagtailcore.models import Page, PageRevision
+
+
+def revision_date_expired(r):
+    expiry_str = json.loads(r.content_json).get('expiry_datetime')
+    if not expiry_str:
+        return False
+    expiry_datetime = dateparse.parse_datetime(expiry_str)
+    if expiry_datetime < timezone.now():
+        return True
+    else:
+        return False
+
+
+class Command(BaseCommand):
+    option_list = BaseCommand.option_list + (
+        make_option(
+            '--dryrun',
+            action='store_true',
+            dest='dryrun',
+            default=False,
+            help='Dry run -- don\'t change anything.'),
+        )
+
+    def handle(self, *args, **options):
+        dryrun = False
+        if options['dryrun']:
+            print "Will do a dry run."
+            dryrun = True
+
+        # 1. get all expired pages with live = True
+        expired_pages = Page.objects.filter(
+            live=True,
+            expiry_datetime__lt=timezone.now()
+        )
+        if dryrun:
+            if expired_pages:
+                print "Expired pages to be deactivated:"
+                print "Expiry datetime\t\tSlug\t\tName"
+                print "---------------\t\t----\t\t----"
+                for ep in expired_pages:
+                    print "{0}\t{1}\t{2}".format(
+                        ep.expiry_datetime.strftime("%Y-%m-%d %H:%M"),
+                        ep.slug,
+                        ep.title
+                    )
+            else:
+                print "No expired pages to be deactivated found."
+        else:
+            expired_pages.update(expired=True, live=False)
+
+        # 2. get all page revisions for moderation that have been expired
+        expired_revs = [
+            r for r in PageRevision.objects.filter(
+                submitted_for_moderation=True
+            ) if revision_date_expired(r)
+        ]
+        if dryrun:
+            print "---------------------------------"
+            if expired_revs:
+                print "Expired revisions to be dropped from moderation queue:"
+                print "Expiry datetime\t\tSlug\t\tName"
+                print "---------------\t\t----\t\t----"
+                for er in expired_revs:
+                    rev_data = json.loads(er.content_json)
+                    print "{0}\t{1}\t{2}".format(
+                        dateparse.parse_datetime(
+                            rev_data.get('expiry_datetime')
+                        ).strftime("%Y-%m-%d %H:%M"),
+                        rev_data.get('slug'),
+                        rev_data.get('title')
+                    )
+            else:
+                print "No expired revision to be dropped from moderation."
+        else:
+            for er in expired_revs:
+                er.submitted_for_moderation = False
+                er.save()
+
+        # 3. get all revisions that need to be published
+        revs_for_publishing = PageRevision.objects.filter(
+            approved_go_live_datetime__lt=timezone.now()
+        )
+        if dryrun:
+            print "---------------------------------"
+            if revs_for_publishing:
+                print "Revisions to be published:"
+                print "Go live datetime\t\tSlug\t\tName"
+                print "---------------\t\t\t----\t\t----"
+                for rp in revs_for_publishing:
+                    rev_data = json.loads(rp.content_json)
+                    print "{0}\t\t{1}\t{2}".format(
+                        rp.approved_go_live_datetime.strftime("%Y-%m-%d %H:%M"),
+                        rev_data.get('slug'),
+                        rev_data.get('title')
+                    )
+            else:
+                print "No pages to go live."
+        else:
+            for rp in revs_for_publishing:
+                # just run publish for the revision -- since the approved go
+                # live datetime is before now it will make the page live
+                rp.publish()

From 686a9beaa9099ac8f4cca20004f35321e6bdd09e Mon Sep 17 00:00:00 2001
From: Serafeim Papastefanos <spapas@gmail.com>
Date: Tue, 22 Apr 2014 20:12:20 +0300
Subject: [PATCH 008/293] Add tests for scheduled publishing

This does not actually test the management command for scheduled pages.
---
 wagtail/wagtailadmin/tests.py | 140 ++++++++++++++++++++++++++++++++--
 1 file changed, 134 insertions(+), 6 deletions(-)

diff --git a/wagtail/wagtailadmin/tests.py b/wagtail/wagtailadmin/tests.py
index 84b00b3355d..3df92ec2247 100644
--- a/wagtail/wagtailadmin/tests.py
+++ b/wagtail/wagtailadmin/tests.py
@@ -1,8 +1,10 @@
+from datetime import datetime, timedelta
+from django.utils import timezone
 from django.test import TestCase
 import unittest
 from wagtail.tests.models import SimplePage, EventPage
 from wagtail.tests.utils import login
-from wagtail.wagtailcore.models import Page
+from wagtail.wagtailcore.models import Page, PageRevision
 from django.core.urlresolvers import reverse
 
 
@@ -49,7 +51,7 @@ def test_select_type(self):
         response = self.client.get(reverse('wagtailadmin_pages_select_type'))
         self.assertEqual(response.status_code, 200)
 
-    @unittest.expectedFailure # For some reason, this returns a 302...
+    @unittest.expectedFailure  # For some reason, this returns a 302...
     def test_select_location_testpage(self):
         response = self.client.get(reverse('wagtailadmin_pages_select_location', args=('tests', 'eventpage')))
         self.assertEqual(response.status_code, 200)
@@ -100,6 +102,57 @@ def test_create_simplepage_post(self):
         self.assertIsInstance(page, SimplePage)
         self.assertFalse(page.live)
 
+    def test_create_simplepage_scheduled(self):
+        go_live_datetime = timezone.now() + timedelta(days=1)
+        expiry_datetime = timezone.now() + timedelta(days=2)
+        post_data = {
+            'title': "New page!",
+            'content': "Some content",
+            'slug': 'hello-world',
+            'go_live_datetime': str(go_live_datetime),
+            'expiry_datetime': str(expiry_datetime),
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
+
+        # Should be redirected to explorer page
+        self.assertEqual(response.status_code, 302)
+
+        # Find the page and check the scheduled times
+        page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific
+        self.assertEquals(page.go_live_datetime.date(), go_live_datetime.date())
+        self.assertEquals(page.expiry_datetime.date(), expiry_datetime.date())
+        self.assertEquals(page.expired, False)
+        self.assertTrue(page.status_string, "draft")
+
+        # No revisions with approved_go_live_datetime
+        self.assertFalse(PageRevision.objects.filter(page=page).exclude(approved_go_live_datetime__isnull=True).exists())
+
+    def test_create_simplepage_scheduled_errored(self):
+        post_data = {
+            'title': "New page!",
+            'content': "Some content",
+            'slug': 'hello-world',
+            'go_live_datetime': str(timezone.now() + timedelta(days=2)),
+            'expiry_datetime': str(timezone.now() + timedelta(days=1)),
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
+
+        # Should be redirected to explorer page
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue(response.context['edit_handler'].form.errors)
+
+        post_data = {
+            'title': "New page!",
+            'content': "Some content",
+            'slug': 'hello-world',
+            'expiry_datetime': str(timezone.now() + timedelta(days=-1)),
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
+
+        # Should be redirected to explorer page
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue(response.context['edit_handler'].form.errors)
+
     def test_create_simplepage_post_publish(self):
         post_data = {
             'title': "New page!",
@@ -118,6 +171,34 @@ def test_create_simplepage_post_publish(self):
         self.assertIsInstance(page, SimplePage)
         self.assertTrue(page.live)
 
+    def test_create_simplepage_post_publish_scheduled(self):
+        go_live_datetime = timezone.now() + timedelta(days=1)
+        expiry_datetime = timezone.now() + timedelta(days=2)
+        post_data = {
+            'title': "New page!",
+            'content': "Some content",
+            'slug': 'hello-world',
+            'action-publish': "Publish",
+            'go_live_datetime': str(go_live_datetime),
+            'expiry_datetime': str(expiry_datetime),
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
+
+        # Should be redirected to explorer page
+        self.assertEqual(response.status_code, 302)
+
+        # Find the page and check it
+        page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific
+        self.assertEquals(page.go_live_datetime.date(), go_live_datetime.date())
+        self.assertEquals(page.expiry_datetime.date(), expiry_datetime.date())
+        self.assertEquals(page.expired, False)
+
+        # A revision with approved_go_live_datetime should exist now
+        self.assertTrue(PageRevision.objects.filter(page=page).exclude(approved_go_live_datetime__isnull=True).exists())
+        # But Page won't be live
+        self.assertFalse(page.live)
+        self.assertTrue(page.status_string, "scheduled")
+
     def test_create_simplepage_post_existingslug(self):
         # This tests the existing slug checking on page save
 
@@ -143,7 +224,7 @@ def test_create_nonexistantparent(self):
         response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', 100000)))
         self.assertEqual(response.status_code, 404)
 
-    @unittest.expectedFailure # FIXME: Crashes!
+    @unittest.expectedFailure  # FIXME: Crashes!
     def test_create_nonpagetype(self):
         response = self.client.get(reverse('wagtailadmin_pages_create', args=('wagtailimages', 'image', self.root_page.id)))
         self.assertEqual(response.status_code, 404)
@@ -184,7 +265,7 @@ def test_edit_post(self):
             'slug': 'hello-world',
         }
         response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
-    
+
         # Should be redirected to explorer page
         self.assertEqual(response.status_code, 302)
 
@@ -192,6 +273,31 @@ def test_edit_post(self):
         child_page_new = SimplePage.objects.get(id=self.child_page.id)
         self.assertTrue(child_page_new.has_unpublished_changes)
 
+    def test_edit_post_scheduled(self):
+        go_live_datetime = timezone.now() + timedelta(days=1)
+        expiry_datetime = timezone.now() + timedelta(days=2)
+        post_data = {
+            'title': "I've been edited!",
+            'content': "Some content",
+            'slug': 'hello-world',
+            'go_live_datetime': str(go_live_datetime),
+            'expiry_datetime': str(expiry_datetime),
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
+
+        # Should be redirected to explorer page
+        self.assertEqual(response.status_code, 302)
+
+        child_page_new = SimplePage.objects.get(id=self.child_page.id)
+
+        # The page will still be live
+        self.assertTrue(child_page_new.live)
+        # A revision with approved_go_live_datetime should not exist
+        self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_datetime__isnull=True).exists())
+        # But a revision with go_live_datetime and expiry_datetime in their content json *should* exist
+        self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(go_live_datetime.date())).exists())
+        self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(expiry_datetime.date())).exists())
+
     def test_edit_post_publish(self):
         # Tests publish from edit page
         post_data = {
@@ -201,7 +307,7 @@ def test_edit_post_publish(self):
             'action-publish': "Publish",
         }
         response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
-    
+
         # Should be redirected to explorer page
         self.assertEqual(response.status_code, 302)
 
@@ -212,6 +318,28 @@ def test_edit_post_publish(self):
         # The page shouldn't have "has_unpublished_changes" flag set
         self.assertFalse(child_page_new.has_unpublished_changes)
 
+    def test_edit_post_publish_scheduled(self):
+        go_live_datetime = timezone.now() + timedelta(days=1)
+        expiry_datetime = timezone.now() + timedelta(days=2)
+        post_data = {
+            'title': "I've been edited!",
+            'content': "Some content",
+            'slug': 'hello-world',
+            'action-publish': "Publish",
+            'go_live_datetime': str(go_live_datetime),
+            'expiry_datetime': str(expiry_datetime),
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
+
+        # Should be redirected to explorer page
+        self.assertEqual(response.status_code, 302)
+
+        child_page_new = SimplePage.objects.get(id=self.child_page.id)
+        # The page should not be live anymore
+        self.assertFalse(child_page_new.live)
+        # Instead a revision with approved_go_live_datetime should not exist
+        self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_datetime__isnull=True).exists())
+
 
 class TestPageDelete(TestCase):
     def setUp(self):
@@ -232,7 +360,7 @@ def test_delete(self):
         self.assertEqual(response.status_code, 200)
 
     def test_delete_post(self):
-        post_data = {'hello': 'world'} # For some reason, this test doesn't work without a bit of POST data
+        post_data = {'hello': 'world'}  # For some reason, this test doesn't work without a bit of POST data
         response = self.client.post(reverse('wagtailadmin_pages_delete', args=(self.child_page.id, )), post_data)
 
         # Should be redirected to explorer page

From 65f093061dc53abf24f9bb30b0be1d6160a4c0f6 Mon Sep 17 00:00:00 2001
From: Serafeim Papastefanos <spapas@gmail.com>
Date: Wed, 23 Apr 2014 11:56:13 +0300
Subject: [PATCH 009/293] Use the plain DateTimeInput widget for ...

go_live_datetime and expiry_datetime. This should probably be improved in
order to use a javascript datetime picker.
---
 wagtail/wagtailadmin/edit_handlers.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py
index 245f7ad60d1..370f2f5bbdf 100644
--- a/wagtail/wagtailadmin/edit_handlers.py
+++ b/wagtail/wagtailadmin/edit_handlers.py
@@ -133,15 +133,18 @@ def to_python(self, time_string):
         else:
             raise ValidationError(_("Please type a valid time") )
 
-
+# For some reason we need to explicitly override the DateTimeField and set
+# it to use the DateTimeInput or else it will use the LocalizedDateInput/FriendlyDateInput
 if hasattr(settings, 'USE_L10N') and settings.USE_L10N==True:
     FORM_FIELD_OVERRIDES = {
         models.DateField: {'widget': LocalizedDateInput},
+        models.DateTimeField: {'widget': forms.DateTimeInput},
         models.TimeField: {'widget': LocalizedTimeInput, 'form_class': LocalizedTimeField},
     }
 else: # Fall back to friendly date/time
     FORM_FIELD_OVERRIDES = {
         models.DateField: {'widget': FriendlyDateInput},
+        models.DateTimeField: {'widget': forms.DateTimeInput},
         models.TimeField: {'widget': FriendlyTimeInput, 'form_class': FriendlyTimeField},
     }
 

From f9f07f4a83eee89fd740393b364b5744d62e9562 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 30 Apr 2014 11:37:38 +0100
Subject: [PATCH 010/293] altered buttons

---
 .../wagtailadmin/templates/wagtailadmin/styleguide/base.html  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
index 9f9eea9228c..75f5bcc176e 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
@@ -100,7 +100,9 @@ <h2>Buttons</h2>
 
             <div href="" class="button bicolor button-small icon icon-plus">bicolo button-small</div>
 
-            <div href="" class="button no bicolor icon icon-cog">mixed</div>
+            <div href="" class="button button-secondary no">mixed 1</div>
+
+            <div href="" class="button no bicolor icon icon-cog">mixed 2</div>
 
         </section>
 

From 0f3b74817f7c1fa741c2e5fad18de51f12c323d9 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 8 May 2014 14:26:32 +0100
Subject: [PATCH 011/293] updates to styleguide

---
 .../scss/components/dropdowns.scss            |  53 ++---
 .../scss/components/formatters.scss           |   4 +
 .../wagtailadmin/scss/components/listing.scss |   2 +
 .../wagtailadmin/scss/layouts/styleguide.scss |  13 +-
 .../wagtailadmin/styleguide/base.html         | 186 +++++++++++++++++-
 wagtail/wagtailadmin/urls.py                  |   4 +-
 wagtail/wagtailadmin/views/styleguide.py      |  44 ++++-
 7 files changed, 269 insertions(+), 37 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/dropdowns.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/dropdowns.scss
index ee618f3771e..1428f0fd9b6 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/dropdowns.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/dropdowns.scss
@@ -3,7 +3,18 @@
     @include clearfix();
 
     .dropdown-toggle{
+        color:white;
+        text-transform:uppercase;
+        background-color:$color-teal;
+        line-height:3em;
+        padding-left:1em;
+        padding-right:1em;
         cursor:pointer;
+
+        &:before,
+        &:after{
+            margin:0;
+        }   
     }
 
     input[type=button], input[type=submit], button, .button{
@@ -27,10 +38,9 @@
 
         li{
             float:none;
-            border-top:1px solid rgba(255,255,255,0.2);
-        }
-        li:first-child{
-            border-top:0;
+            border-color: rgba(255,255,255,0.2);
+            border-style: solid;
+            border-width:1px 0 0 0;
         }
 
         a{
@@ -101,6 +111,10 @@
         @include box-shadow(0px -3px 3px 0 rgba(0,0,0,0.2));
         top:auto;
         bottom:100%;
+
+        li{ 
+            border-width:0 0 1px 0;
+        }
     }
 
    
@@ -134,10 +148,22 @@
     }
 
     /* Styles for dropdowns which are also buttons e.g page editor */
+    
     &.dropdown-button{
         .dropdown-toggle{
             @include border-radius(0 3px 3px 0);
         }
+        &.open{
+            > input[type=button], > input[type=submit], > button, > .button{
+                @include border-radius(3px 3px 0px 0px);
+            }
+            .dropdown-toggle{
+                @include border-radius(0 3px 0 0);
+            }
+        }
+    }
+
+    &.dropup.dropdown-button{
         &.open{
             > input[type=button], > input[type=submit], > button, > .button{
                 @include border-radius(0 0 3px 3px);
@@ -215,25 +241,6 @@ h2 .dropdown{
 
 }
 
-footer .actions .dropdown-toggle{
-    text-transform:uppercase;
-    background-color:$color-teal;
-    line-height:3em;
-    color:white;
-    padding-left:1em;
-    padding-right:1em;
-
-    &:before,
-    &:after{
-        margin:0;
-    }
-}
-
-footer .actions .dropdown ul li{
-    border-bottom:1px solid rgba(255,255,255,0.2);
-    border-top:0;
-}
-
 
 /* Transitions */
 .dropdown ul{
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss
index 569821e107c..150611f8f78 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss
@@ -177,4 +177,8 @@ a.tag:hover{
 /* make a block-level element inline */
 .inline{
     display:inline;
+}
+
+.unlist{
+    @include unlist();
 }
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
index edf5e65f8d6..e79d8b28dd1 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
@@ -52,6 +52,7 @@ ul.listing{
             }
         }
 
+        /*
         .dropdown{
             padding:0;
         }
@@ -65,6 +66,7 @@ ul.listing{
             background-color:white;
             margin-left:-$grid-gutter-width * 2;
         }
+        */
     }
 
     &.full-width td:first-child,
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss
index 8e0894baad6..18c40d2d86f 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss
@@ -2,8 +2,11 @@
 @import "../mixins.scss";
 @import "../grid.scss";
 
+
+
 section{
 	border-top:1px solid $color-grey-3;
+	margin-top:2em;
 	padding:0 0 2em 0;
 
 	> h2:first-child{
@@ -71,7 +74,15 @@ section{
 
 
 #icons{
+	:before, :after{
+		font-size:2em;
+	}
 	ul{
-		@include unlist();
+		-webkit-column-count:3; /* Chrome, Safari, Opera */
+		-moz-column-count:3; /* Firefox */
+		column-count:3;
+	}
+	li{
+		margin-bottom:1em;
 	}
 }
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
index 75f5bcc176e..acb90f138a7 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
@@ -1,6 +1,7 @@
 {% extends "wagtailadmin/base.html" %}
 {% load wagtailadmin_tags %}
 {% load compress i18n %}
+{% load gravatar %}
 
 {% block extra_css %}
     {% compress css %}
@@ -16,16 +17,15 @@
     {% include "wagtailadmin/shared/header.html" with title=title_trans %}
 
     <div class="nice-padding">
-        <h1>Styleguide</h1>
+        <h2>Contents</h2>
         <nav>
-            <ul>
+            <ul class="unlist">
                 <li><a href="#palette">Colour palette</a></li>
                 <li><a href="#typography">Typography</a></li>
                 <li><a href="#listings">Listings</a></li>
                 <li><a href="#buttons">Buttons</a></li>
-                <li><a href="#dropdowns">Dropdowns</a></li>
+                <li><a href="#dropdowns">Dropdown buttons</a></li>
                 <li><a href="#header">Header</a></li>
-                <li><a href="#messages">Messages</a></li>
                 <li><a href="#forms">Forms</a></li>
                 <li><a href="#editor">Page editor</a></li>
                 <li><a href="#tabs">Tabs</a></li>
@@ -77,10 +77,73 @@ <h5>This is an h5</h5>
                 <li>ordered list</li>
             </ol>
 
+            <code>This is an example of code</code>
+
         </section>
 
         <section id="listings">
             <h2>Listings</h2>
+
+            <h3><code>table</code> listing</h3>
+            <table class="listing">
+                <thead>
+                    <tr>
+                        <th>Heading 1</th>
+                        <th>Heading 2</th>
+                        <th>Heading 3</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td class="title">
+                            <h2>TD with title class</h2>
+                        </td>
+                        <td>Regular listing TD</td>
+                        <td>Regular listing TD</td>
+                    </li>
+                    <tr>
+                        <td class="title">
+                            <h2>TD with title class</h2>
+                        </td>
+                        <td>Regular listing TD</td>
+                        <td>Regular listing TD</td>
+                    </li>
+                </tbody>
+            </table>
+
+            <h3><code>ul</code> listing</h3>
+            <ul class="listing">
+                <li>List item</li>
+                <li>List item</li>
+                <li>List item</li>
+            </ul>
+
+            <h3>Listings used for choosing a list item</h3>
+            <table class="listing chooser">
+                <thead>
+                    <tr>
+                        <th>Heading 1</th>
+                        <th>Heading 2</th>
+                        <th>Heading 3</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr class="can-choose">
+                        <td class="title">
+                            <h2><a href="#">TD with title class</a></h2>
+                        </td>
+                        <td>Regular listing TD</td>
+                        <td>Regular listing TD</td>
+                    </li>
+                    <tr class="can-choose">
+                        <td class="title">
+                            <h2>TD with title class</h2>
+                        </td>
+                        <td>Regular listing TD</td>
+                        <td>Regular listing TD</td>
+                    </li>
+                </tbody>
+            </table>
         </section>
 
         <section id="buttons">
@@ -104,22 +167,91 @@ <h2>Buttons</h2>
 
             <div href="" class="button no bicolor icon icon-cog">mixed 2</div>
 
+            <p>Buttons must have interaction possible (i.e be an input or button element) to get a suitable hover cursor</p>
+
+            <button>button</button>
+
+            <button class="bicolor icon icon-plus">bicolor with icon</button>
         </section>
 
         <section id="dropdowns">
-            <h2>Dropdowns</h2>
+            <h2>Dropdown buttons</h2>
+
+            <div class="row">
+                <div class="col3">
+                    <div class="dropdown dropdown-button match-width">
+                        <input type="button" value="drop down" class="button" />
+                        <div class="dropdown-toggle icon icon-arrow-down"></div>
+                        <ul role="menu">
+                            <li><a href="#">items should not exceed button width</a></li>
+                            <li><a href="#">item 2</a></li>
+                        </ul>
+                    </div>
+                </div>
+
+                <div class="col3">
+                    <div class="dropdown dropdown-button">
+                        <div class="button">drop down</div>
+                        <div class="dropdown-toggle icon icon-arrow-down"></div>
+                        <ul role="menu">
+                            <li><a href="#">Items in this list do not match button width</a></li>
+                            <li><a href="#">item 2</a></li>
+                        </ul>
+                    </div>
+                </div>
+
+                <div class="col3">
+                    <div class="dropdown dropup dropdown-button match-width">
+                        <input type="button" value="drop up" class="button" />
+                        <div class="dropdown-toggle icon icon-arrow-up"></div>
+                        <ul role="menu">
+                            <li><a href="#">item 1</a></li>
+                            <li><a href="#">item 2</a></li>
+                        </ul>
+                    </div>
+                </div>
+
+                <div class="col3">
+                    <div class="dropdown dropup dropdown-button match-width">
+                        <button value="drop up" class="button icon icon-view">icon dropup</button>
+                        <div class="dropdown-toggle icon icon-arrow-up"></div>
+                        <ul role="menu">
+                            <li><a href="#">item 1</a></li>
+                            <li><a href="#">item 2</a></li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
         </section>
 
         <section id="header">
             <h2>Header</h2>
-        </section>
 
-        <section id="messages">
-            <h2>Messages</h2>
+            {% include "wagtailadmin/shared/header.html" with title=title_trans %}
+
+            {% include "wagtailadmin/shared/header.html" with title=title_trans add_link="wagtailimages_add_image" icon="image" add_text="button" search_url="wagtailimages_index" %}
         </section>
 
         <section id="forms">
             <h2>Forms</h2>
+
+            <form>
+                <ul class="fields">
+                    {% for field in example_form %}
+                        {% if field.name == 'file' %}
+                            {% include "wagtailimages/images/_file_field.html" %}
+                        {% else %}
+                            {% include "wagtailadmin/shared/field_as_li.html" %}
+                        {% endif %}
+                    {% endfor %}
+                    <li><input type="submit" value="{% trans 'Save' %}" /><a href="#" class="button button-secondary no">{% trans "Delete image" %}</a></li>
+                </ul>
+            </form>
+            
+            <p>TODO: page chooser</p>
+            <p>TODO: image chooser</p>
+            <p>TODO: document chooser</p>
+            <p>TODO: snippet chooser</p>
         </section>
 
         <section id="editor">
@@ -128,22 +260,58 @@ <h2>Page editor</h2>
 
         <section id="tabs">
             <h2>Tabs</h2>
+
+            <ul class="tab-nav">
+                <li class="active"><a href="#tab1">Tab 1</a></li>
+                <li><a href="#tab2">Tab 2</a></li>
+            </ul>
+
+            <p>Tabs are currently only used following headers, where they often appear merged with the bottom of the header:</p>
+
+            {% include "wagtailadmin/shared/header.html" with title=title_trans merged=1 %}
+            <ul class="tab-nav merged">
+                <li class="active"><a href="#">Tab1</a></li>
+                <li><a href="#">Tab2</a></li>
+            </ul>
+
+            <p>Tabs can also indicate errors:</p>
+
+            {% include "wagtailadmin/shared/header.html" with title=title_trans merged=1 %}
+            <ul class="tab-nav merged">
+                <li class="active"><a href="#" class="errors" data-count="123">Tab1</a></li>
+                <li><a href="#" class="errors" data-count="1">Tab2</a></li>
+            </ul>
         </section>
 
         <section id="breadcrumbs">
             <h2>Breadcrumbs</h2>
+
+            <ul class="breadcrumb">
+                <li class="home"><a href="#" class="icon icon-home text-replace">Home</a></li>
+                <li><a href="#">Various</a></li>
+                <li><a href="#">Subpages</a></li>
+                <li><a href="#">There is a max length of this many</a></li>
+            </ul>
+
         </section>
 
         <section id="misc">
             <h2>Misc formatters</h2>
             <h3>Avatar icons</h3>
+
+            <p><span class="avatar small icon icon-user"><img src="{% gravatar_url "david@torchbox.com" 25 %}" /></span> Gravatar set</p>
+            <p><span class="avatar small icon icon-user"><img src="{% gravatar_url "aeon@torchbox.com" 25 %}" /></span> Gravatar not set</p>
+
             <h3>Status tags</h3>
+            <div class="status-tag primary">Primary tag</div>
+
+            <div class="status-tag">Secondary tag</div>
         </section>
 
         <section id="icons">
             <h2>Icons</h2>
 
-            <ul>
+            <ul class="unlist">
                 <li class="icon icon-wagtail">wagtail</li>
                 <li class="icon icon-wagtail-inverse">wagtail-inverse</li>
                 <li class="icon icon-cogs">cogs</li>
diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py
index 574a1601b9d..cafae0c03d8 100644
--- a/wagtail/wagtailadmin/urls.py
+++ b/wagtail/wagtailadmin/urls.py
@@ -2,7 +2,7 @@
 from django.conf import settings
 
 from wagtail.wagtailadmin.forms import LoginForm, PasswordResetForm
-from wagtail.wagtailadmin.views import account, chooser, home, pages, tags, userbar
+from wagtail.wagtailadmin.views import account, chooser, home, pages, tags, userbar, styleguide
 from wagtail.wagtailadmin import hooks
 
 urlpatterns = [
@@ -90,7 +90,7 @@
     url(r'^userbar/(\d+)/$', userbar.for_frontend, name='wagtailadmin_userbar_frontend'),
     url(r'^userbar/moderation/(\d+)/$', userbar.for_moderation, name='wagtailadmin_userbar_moderation'),
 
-    url(r'^styleguide/$', 'styleguide.index', name='wagtailadmin_styleguide'),
+    url(r'^styleguide/$', styleguide.index, name='wagtailadmin_styleguide'),
 ]
 
 # Import additional urlpatterns from any apps that define a register_admin_urls hook
diff --git a/wagtail/wagtailadmin/views/styleguide.py b/wagtail/wagtailadmin/views/styleguide.py
index 33c87034c9e..a53d884ef9e 100644
--- a/wagtail/wagtailadmin/views/styleguide.py
+++ b/wagtail/wagtailadmin/views/styleguide.py
@@ -1,9 +1,49 @@
+from django import forms
+from django.db import models
 from django.shortcuts import render
+from django.utils.translation import ugettext as _
+from django.contrib import messages
+from django.contrib.auth.decorators import permission_required
 
 from wagtail.wagtailadmin.userbar import EditPageItem, AddPageItem, ApproveModerationEditPageItem, RejectModerationEditPageItem
 from wagtail.wagtailadmin import hooks
 from wagtail.wagtailcore.models import Page, PageRevision
 
+from wagtail.wagtailadmin.edit_handlers import PageChooserPanel
+from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
+from wagtail.wagtaildocs.edit_handlers import DocumentChooserPanel
+
+from wagtail.wagtailadmin.forms import SearchForm
+from wagtail.wagtailcore.fields import RichTextField
+
+
+CHOICES = (
+    ('choice1', 'choice 1'),
+    ('choice2', 'choice 2'),
+)
+
+class ExampleForm(forms.Form):
+    text = forms.CharField(required=True, help_text="help text")
+    url = forms.URLField(required=True)
+    email = forms.EmailField(max_length=254)
+    date = forms.DateField()
+    rich_text = RichTextField()
+    select = forms.ChoiceField(choices=CHOICES)
+    boolean = forms.BooleanField(required=False)
+    page_chooser = forms.CharField(required=True, help_text="help text")
+
+@permission_required('wagtailadmin.access_admin')
 def index(request):
-    # Render the edit bird
-    return render(request, 'wagtailadmin/styleguide/base.html', {})
+
+    form = SearchForm(placeholder=_("Search something"))
+
+    example_form = ExampleForm()
+
+    messages.success(request, _("Success message"))
+    messages.warning(request, _("Warning message"))
+    messages.error(request, _("Error message"))
+
+    return render(request, 'wagtailadmin/styleguide/base.html', {
+        'search_form': form,
+        'example_form': example_form,
+    })

From 27889478d234df521143f29093bcd3ccfb58a606 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 8 May 2014 15:13:19 +0100
Subject: [PATCH 012/293] tweaks and change to space indenting

---
 .../wagtailadmin/scss/layouts/styleguide.scss | 148 +++++++++---------
 .../wagtailadmin/styleguide/base.html         |   2 +-
 2 files changed, 78 insertions(+), 72 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss
index 18c40d2d86f..3d4cf5e5f11 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss
@@ -2,87 +2,93 @@
 @import "../mixins.scss";
 @import "../grid.scss";
 
-
-
 section{
-	border-top:1px solid $color-grey-3;
-	margin-top:2em;
-	padding:0 0 2em 0;
+    border-top:1px solid $color-grey-3;
+    margin-top:2em;
+    padding:0 0 2em 0;
 
-	> h2:first-child{
-		margin:0;
-		font-size:1em;
-		background:$color-grey-4;
-		padding:1em;
-		margin-bottom:1em;
-	}
+    > h2:first-child{
+        margin:0;
+        font-size:1em;
+        background:$color-grey-4;
+        padding:1em;
+        margin-bottom:1em;
+    }
 }
 
 #palette{
-	@include clearfix();
+    @include clearfix();
 
-	ul{
-		@include clearfix();
-		@include unlist();
-	}
+    ul{
+        @include clearfix();
+        @include unlist();
+    }
 
-	li{
-		float:left;
-		width:100px;
-		height:100px;
-		padding:10px;
-		color:black;
-	}
+    li{
+        float:left;
+        width:100px;
+        height:100px;
+        padding:10px;
+        color:black;
+    }
 
-	.color-teal{
-		background-color:$color-teal;
-	}
-	.color-teal-darker{
-		background-color:$color-teal-darker;
-	}
-	.color-teal-dark{
-		background-color:$color-teal-dark;
-	}
-	.color-red{
-		background-color:$color-red;
-	}
-	.color-orange{
-		background-color:$color-orange;
-	}
-	.color-green{
-		background-color:$color-green;
-	}
-	.color-grey-1{
-		background-color:$color-grey-1;
-	}
-	.color-grey-1-1{
-		background-color:$color-grey-1-1;
-	}
-	.color-grey-2{
-		background-color:$color-grey-2;
-	}
-	.color-grey-3{
-		background-color:$color-grey-3;
-	}
-	.color-grey-4{
-		background-color:$color-grey-4;
-	}
-	.color-grey-5{
-		background-color:$color-grey-5;
-	}
+    .color-teal{
+        background-color:$color-teal;
+    }
+    .color-teal-darker{
+        background-color:$color-teal-darker;
+    }
+    .color-teal-dark{
+        background-color:$color-teal-dark;
+    }
+    .color-red{
+        background-color:$color-red;
+    }
+    .color-orange{
+        background-color:$color-orange;
+    }
+    .color-green{
+        background-color:$color-green;
+    }
+    .color-grey-1{
+        background-color:$color-grey-1;
+    }
+    .color-grey-1-1{
+        background-color:$color-grey-1-1;
+    }
+    .color-grey-2{
+        background-color:$color-grey-2;
+    }
+    .color-grey-3{
+        background-color:$color-grey-3;
+    }
+    .color-grey-4{
+        background-color:$color-grey-4;
+    }
+    .color-grey-5{
+        background-color:$color-grey-5;
+    }
 }
 
 
 #icons{
-	:before, :after{
-		font-size:2em;
-	}
-	ul{
-		-webkit-column-count:3; /* Chrome, Safari, Opera */
-		-moz-column-count:3; /* Firefox */
-		column-count:3;
-	}
-	li{
-		margin-bottom:1em;
-	}
+    :before, :after{
+        font-size:2em;
+    }
+    ul{
+        -webkit-column-count:3; /* Chrome, Safari, Opera */
+        -moz-column-count:3; /* Firefox */
+        column-count:3;
+    }
+    li{
+        margin-bottom:1em;
+    }
+    .spinner{
+        position:relative;
+    }
+    .icon-spinner:after{
+        color:red;
+        position:absolute;
+       
+    }
 }
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
index acb90f138a7..9de469d3f83 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
@@ -365,7 +365,7 @@ <h2>Icons</h2>
                 <li class="icon icon-order-down">order-down</li>
                 <li class="icon icon-order-up">order-up</li>
                 <li class="icon icon-bin">bin</li>
-                <li class="icon icon-spinner">spinner</li>
+                <li class="spinner"><div class="icon icon-spinner">spinner</div> spinner</li>
                 <li class="icon icon-pick">pick</li>
                 <li class="icon icon-redirect">redirect</li>
                 <li class="icon icon-view">view</li>

From fff332a196341906ddd8f7fb36dcca33572efea1 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 8 May 2014 15:29:12 +0100
Subject: [PATCH 013/293] updates to tabs

---
 .../static/wagtailadmin/scss/components/tabs.scss           | 6 +++---
 .../templates/wagtailadmin/styleguide/base.html             | 2 +-
 wagtail/wagtailadmin/views/styleguide.py                    | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
index b0dec687d98..7cd9a939743 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
@@ -39,16 +39,16 @@
         color:$color-red !important;
 
         &:after{
-            @include border-radius(50%);
+            @include border-radius(50px);
             @include box-shadow(1px 1px 2px rgba(0, 0, 0, 0.2));
             position:absolute;
             right:-0.5em;
             top:-0.5em;
             z-index:5;
-            min-width:1em;
+            min-width:0.9em;
             color:white;
             background:$color-red;
-            border:2px solid darken($color-red,20%);
+            
             content:attr(data-count);
             padding:0 0.3em;
             line-height:1.4em;
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
index 9de469d3f83..a7ad158d6a2 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
@@ -247,7 +247,7 @@ <h2>Forms</h2>
                     <li><input type="submit" value="{% trans 'Save' %}" /><a href="#" class="button button-secondary no">{% trans "Delete image" %}</a></li>
                 </ul>
             </form>
-            
+            <p>TODO: Rich text</p>            
             <p>TODO: page chooser</p>
             <p>TODO: image chooser</p>
             <p>TODO: document chooser</p>
diff --git a/wagtail/wagtailadmin/views/styleguide.py b/wagtail/wagtailadmin/views/styleguide.py
index a53d884ef9e..68b1941569b 100644
--- a/wagtail/wagtailadmin/views/styleguide.py
+++ b/wagtail/wagtailadmin/views/styleguide.py
@@ -27,10 +27,8 @@ class ExampleForm(forms.Form):
     url = forms.URLField(required=True)
     email = forms.EmailField(max_length=254)
     date = forms.DateField()
-    rich_text = RichTextField()
     select = forms.ChoiceField(choices=CHOICES)
     boolean = forms.BooleanField(required=False)
-    page_chooser = forms.CharField(required=True, help_text="help text")
 
 @permission_required('wagtailadmin.access_admin')
 def index(request):

From 72b1050e18696b2dc9b360e5165b034b56d7f764 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 8 May 2014 15:51:30 +0100
Subject: [PATCH 014/293] added icomoon json file to allow edits to font by
 anyone importing the json to icomoon

---
 .../scss/fonts/wagtail-icomoon.json           | 1240 +++++++++++++++++
 .../wagtailadmin/scss/fonts/wagtail.eot       |  Bin 12996 -> 25964 bytes
 .../wagtailadmin/scss/fonts/wagtail.svg       |  135 +-
 .../wagtailadmin/scss/fonts/wagtail.ttf       |  Bin 12832 -> 25800 bytes
 .../wagtailadmin/scss/fonts/wagtail.woff      |  Bin 9164 -> 15000 bytes
 .../wagtailadmin/scss/layouts/styleguide.scss |    2 -
 6 files changed, 1308 insertions(+), 69 deletions(-)
 create mode 100755 wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
 mode change 100644 => 100755 wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot
 mode change 100644 => 100755 wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
 mode change 100644 => 100755 wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf
 mode change 100644 => 100755 wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
new file mode 100755
index 00000000000..d0ffefb1e24
--- /dev/null
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
@@ -0,0 +1,1240 @@
+{
+	"IcoMoonType": "selection",
+	"icons": [
+		{
+			"icon": {
+				"paths": [
+					"M478 512c0-38-14-70-40-96-26-28-58-40-96-40-38 0-70 12-98 40-26 26-40 58-40 96 0 38 14 70 40 96 28 28 60 40 98 40 38 0 70-12 96-40 26-26 40-58 40-96zM888 786c0-20-8-36-20-48-14-14-30-22-48-22-20 0-36 8-48 22-14 12-22 28-22 48 0 18 8 34 20 48 14 12 30 20 50 20 18 0 34-8 48-20 12-14 20-30 20-48zM888 238c0-18-8-34-20-48-14-12-30-20-48-20-20 0-36 8-48 20-14 14-22 30-22 48 0 20 8 36 20 50 14 12 30 20 50 20 18 0 34-8 48-20 12-14 20-30 20-50zM682 464v98c0 4 0 8-4 10-2 4-4 6-8 6l-82 12c-4 14-10 26-18 42 12 16 28 36 48 60 4 4 4 8 4 12 0 4 0 8-4 10-8 10-22 26-44 48-20 20-34 32-42 32-4 0-6-2-10-4l-62-48c-12 6-26 12-40 16-4 38-8 66-14 82-2 10-6 14-16 14h-98c-4 0-8-2-10-4-4-4-6-6-6-10l-12-82c-12-4-26-8-40-16l-64 48c-2 2-6 4-10 4s-8-2-12-6c-50-46-76-74-76-84 0-4 2-8 4-10 4-6 10-16 22-28 10-14 18-26 24-34-8-16-14-30-18-44l-82-12c-2 0-6-2-8-6-2-2-4-6-4-10v-98c0-4 2-8 4-10 2-4 6-6 8-6l82-12c4-14 10-26 18-42-12-16-28-36-48-60-2-4-4-8-4-12 0-4 2-8 4-10 8-10 22-26 44-48 22-20 36-32 42-32 4 0 8 2 12 4l60 48c12-6 26-12 42-16 4-38 8-66 12-82 2-10 8-14 16-14h98c4 0 8 2 12 4 2 4 4 6 4 10l14 82c12 4 24 8 40 16l62-48c2-2 6-4 10-4s8 2 12 6c52 46 76 74 76 84 0 4 0 8-2 10-6 6-12 16-24 30-10 12-18 24-24 32 8 16 14 32 18 44l82 12c4 0 6 2 8 6 4 2 4 6 4 10zM1024 748v74c0 6-26 12-80 16-4 10-10 20-16 28 18 40 28 66 28 74 0 2 0 2-2 4-44 26-66 38-66 38-4 0-12-8-26-26-12-16-22-28-26-36-8 2-14 2-16 2-4 0-10 0-16-2-6 8-16 20-28 36-14 18-22 26-26 26 0 0-22-12-66-38 0-2-2-2-2-4 0-8 10-34 28-74-6-8-12-18-16-28-54-4-80-10-80-16v-74c0-6 26-12 80-16 4-12 10-20 16-28-18-40-28-66-28-74 0-2 2-2 2-4 2 0 8-4 20-10 10-6 20-12 30-18 10-6 16-10 16-10 4 0 12 10 26 26 12 16 22 28 28 36 6-2 12-2 16-2 2 0 8 0 16 2 18-26 34-46 48-60l4-2c0 0 22 14 66 38 2 2 2 2 2 4 0 8-10 34-28 74 6 8 12 16 16 28 54 4 80 10 80 16zM1024 202v74c0 6-26 12-80 16-4 10-10 20-16 28 18 40 28 66 28 74 0 2 0 2-2 4-44 26-66 38-66 38-4 0-12-8-26-26-12-16-22-28-26-36-8 2-14 2-16 2-4 0-10 0-16-2-6 8-16 20-28 36-14 18-22 26-26 26 0 0-22-12-66-38 0-2-2-2-2-4 0-8 10-34 28-74-6-8-12-18-16-28-54-4-80-10-80-16v-74c0-6 26-12 80-16 4-12 10-20 16-28-18-40-28-66-28-74 0-2 2-2 2-4 2 0 8-4 20-10 10-8 20-14 30-18 10-6 16-10 16-10 4 0 12 8 26 26 12 16 22 28 28 36 6-2 12-2 16-2 2 0 8 0 16 2 18-26 34-46 48-60l4-2c0 0 22 14 66 38 2 2 2 2 2 4 0 8-10 34-28 74 6 8 12 16 16 28 54 4 80 10 80 16z"
+				],
+				"defaultCode": 97,
+				"grid": 0
+			},
+			"properties": {
+				"id": 0,
+				"order": 29,
+				"prevSize": 32,
+				"code": 97,
+				"name": "uni61",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 0
+		},
+		{
+			"icon": {
+				"paths": [
+					"M878 438v458c0 16-6 28-16 38-10 12-24 16-40 16h-620c-16 0-30-4-40-16-10-10-16-22-16-38v-768c0-16 6-28 16-38 10-12 24-16 40-16h310v310c0 16 6 28 16 38 10 12 24 16 38 16zM876 366h-290v-292c30 6 56 18 74 38l178 178c20 20 32 44 38 76z"
+				],
+				"defaultCode": 98,
+				"grid": 0
+			},
+			"properties": {
+				"id": 1,
+				"order": 30,
+				"prevSize": 32,
+				"code": 98,
+				"name": "uni62",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 1
+		},
+		{
+			"icon": {
+				"paths": [
+					"M220 878h584v-440h-238c-14 0-28-4-38-16-10-10-16-22-16-38v-238h-292zM586 366h214c-4-12-8-20-12-24l-180-178c-4-6-12-10-22-14zM878 384v512c0 16-6 28-16 38-10 12-24 16-40 16h-620c-16 0-30-4-40-16-10-10-16-22-16-38v-768c0-16 6-28 16-38 10-12 24-16 40-16h364c16 0 32 2 52 10 18 8 32 18 42 28l178 178c12 10 20 26 28 44s12 34 12 50z"
+				],
+				"defaultCode": 99,
+				"grid": 0
+			},
+			"properties": {
+				"id": 2,
+				"order": 31,
+				"prevSize": 32,
+				"code": 99,
+				"name": "uni63",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 2
+		},
+		{
+			"icon": {
+				"paths": [
+					"M280 878l52-52-134-134-52 52v60h74v74zM580 348c0-8-4-14-14-14-2 0-6 2-8 4l-310 310c-4 4-4 6-4 10 0 8 4 12 12 12 4 0 8 0 10-4l310-308c2-4 4-6 4-10zM548 238l238 238-476 474h-236v-236zM938 292c0 20-6 38-20 52l-96 94-236-236 94-96c14-14 30-20 52-20 20 0 36 6 52 20l134 134c14 16 20 32 20 52z"
+				],
+				"defaultCode": 100,
+				"grid": 0
+			},
+			"properties": {
+				"id": 3,
+				"order": 32,
+				"prevSize": 32,
+				"code": 100,
+				"name": "uni64",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 3
+		},
+		{
+			"icon": {
+				"paths": [
+					"M798 676c0 6-2 10-6 14l-30 28c-2 4-8 6-12 6-6 0-10-2-14-6l-224-224-224 224c-4 4-8 6-14 6-4 0-10-2-12-6l-30-28c-4-4-6-8-6-14 0-4 2-8 6-12l266-266c4-4 10-6 14-6s10 2 14 6l266 266c4 4 6 8 6 12z"
+				],
+				"defaultCode": 101,
+				"grid": 0
+			},
+			"properties": {
+				"id": 4,
+				"order": 33,
+				"prevSize": 32,
+				"code": 101,
+				"name": "uni65",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 4
+		},
+		{
+			"icon": {
+				"paths": [
+					"M694 476c0-72-24-132-74-182s-110-74-182-74c-70 0-130 24-180 74-50 50-76 110-76 182 0 70 26 130 76 180 50 50 110 76 180 76 72 0 132-26 182-76 50-50 74-110 74-180zM988 950c0 20-8 38-22 52s-32 22-52 22c-20 0-38-8-52-22l-196-196c-68 48-144 72-228 72-54 0-106-10-156-32-50-22-92-50-128-86-36-36-64-78-86-128-20-50-32-102-32-156 0-56 12-108 32-156 22-50 50-94 86-130 36-36 78-64 128-86 50-20 102-30 156-30 56 0 108 10 158 30 48 22 92 50 128 86 36 36 64 80 86 130 20 48 32 100 32 156 0 84-24 160-72 228l196 196c14 14 22 30 22 50z"
+				],
+				"defaultCode": 102,
+				"grid": 0
+			},
+			"properties": {
+				"id": 5,
+				"order": 34,
+				"prevSize": 32,
+				"code": 102,
+				"name": "uni66",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 5
+		},
+		{
+			"icon": {
+				"paths": [
+					"M852 756c0 14-6 28-16 38l-78 78c-10 10-24 16-40 16-14 0-28-6-38-16l-168-168-168 168c-10 10-24 16-38 16-16 0-30-6-40-16l-78-78c-10-10-16-24-16-38 0-16 6-28 16-40l168-168-168-168c-10-10-16-24-16-38 0-16 6-28 16-40l78-76c10-12 24-16 40-16 14 0 28 4 38 16l168 168 168-168c10-12 24-16 38-16 16 0 30 4 40 16l78 76c10 12 16 24 16 40 0 14-6 28-16 38l-168 168 168 168c10 12 16 24 16 40z"
+				],
+				"defaultCode": 103,
+				"grid": 0
+			},
+			"properties": {
+				"id": 6,
+				"order": 35,
+				"prevSize": 32,
+				"code": 103,
+				"name": "uni67",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 6
+		},
+		{
+			"icon": {
+				"paths": [
+					"M950 530c0-12-10-18-28-18h-580c-14 0-30 4-46 12s-30 16-38 28l-158 194c-6 8-8 14-8 20 0 12 8 20 28 20h580c14 0 30-4 46-12s28-18 38-28l156-194c6-8 10-16 10-22zM342 444h408v-86c0-14-4-26-14-36s-22-14-36-14h-308c-14 0-26-6-36-16s-14-22-14-36v-34c0-14-6-26-16-36s-22-16-36-16h-170c-14 0-26 6-36 16s-16 22-16 36v454l136-168c16-18 38-34 62-46 26-12 52-18 76-18zM1018 530c0 22-8 44-24 64l-158 194c-16 20-36 34-62 46-26 14-50 20-74 20h-580c-34 0-62-12-84-36-24-24-36-52-36-84v-512c0-32 12-60 36-84 22-24 50-36 84-36h170c32 0 60 12 84 36s36 52 36 84v16h290c32 0 60 12 84 36s36 52 36 84v86h102c18 0 36 4 52 12 16 10 28 22 36 38 6 12 8 24 8 36z"
+				],
+				"defaultCode": 105,
+				"grid": 0
+			},
+			"properties": {
+				"id": 7,
+				"order": 36,
+				"prevSize": 32,
+				"code": 105,
+				"name": "uni69",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 7
+		},
+		{
+			"icon": {
+				"paths": [
+					"M988 348v402c0 34-14 64-38 90-26 26-56 38-90 38h-696c-34 0-64-12-90-38-24-26-38-56-38-90v-548c0-36 14-66 38-92 26-24 56-36 90-36h184c34 0 64 12 90 36 24 26 38 56 38 92v18h384c34 0 64 12 90 38 24 24 38 54 38 90z"
+				],
+				"defaultCode": 106,
+				"grid": 0
+			},
+			"properties": {
+				"id": 8,
+				"order": 37,
+				"prevSize": 32,
+				"code": 106,
+				"name": "uni6A",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 8
+		},
+		{
+			"icon": {
+				"paths": [
+					"M1024 406v454c0 24-8 46-26 64s-40 26-66 26h-840c-26 0-48-8-66-26s-26-40-26-64v-454c16 18 36 34 58 50 138 94 232 158 284 196 22 16 40 30 52 38 14 8 32 18 54 28 24 8 44 14 64 14v0c20 0 40-6 64-14 22-10 40-20 54-28 12-8 30-22 52-38 66-46 160-112 284-196 22-16 42-32 58-50zM1024 238c0 30-10 58-28 86s-42 50-70 70c-142 100-232 162-268 186-2 2-12 8-24 18-12 8-22 16-30 22-8 4-18 10-30 18-12 6-22 12-32 16-12 2-20 4-30 4v0c-10 0-18-2-30-4-10-4-20-10-32-16-12-8-22-14-30-18-8-6-18-14-30-22-12-10-22-16-24-18-36-24-86-60-150-104-66-46-104-72-118-82-24-16-46-38-66-66-22-28-32-54-32-78 0-30 8-54 24-74 16-20 38-30 68-30h840c26 0 46 10 64 28s28 38 28 64z"
+				],
+				"defaultCode": 107,
+				"grid": 0
+			},
+			"properties": {
+				"id": 9,
+				"order": 38,
+				"prevSize": 32,
+				"code": 107,
+				"name": "uni6B",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 9
+		},
+		{
+			"icon": {
+				"paths": [
+					"M694 182c0 10-2 20-10 26-8 8-16 12-26 12h-72v584h72c10 0 18 4 26 12 8 6 10 16 10 26 0 10-2 18-10 24l-146 148c-8 6-16 10-26 10s-18-4-26-10l-146-148c-8-6-10-14-10-24s2-20 10-26c8-8 16-12 26-12h72v-584h-72c-10 0-18-4-26-12-8-6-10-16-10-26 0-10 2-18 10-24l146-148c8-6 16-10 26-10s18 4 26 10l146 148c8 6 10 14 10 24z"
+				],
+				"defaultCode": 108,
+				"grid": 0
+			},
+			"properties": {
+				"id": 10,
+				"order": 39,
+				"prevSize": 32,
+				"code": 108,
+				"name": "uni6C",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 10
+		},
+		{
+			"icon": {
+				"paths": [
+					"M366 438h292v-108c0-42-14-76-42-104-30-28-64-44-104-44-40 0-74 16-104 44-28 28-42 62-42 104zM842 494v328c0 16-6 30-16 40-12 10-24 16-40 16h-548c-16 0-28-6-40-16-10-10-16-24-16-40v-328c0-16 6-28 16-40 12-10 24-16 40-16h18v-108c0-70 26-132 76-182s110-74 180-74c70 0 130 24 180 74 50 50 76 112 76 182v108h18c16 0 28 6 40 16 10 12 16 24 16 40z"
+				],
+				"defaultCode": 109,
+				"grid": 0
+			},
+			"properties": {
+				"id": 11,
+				"order": 40,
+				"prevSize": 32,
+				"code": 109,
+				"name": "uni6D",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 11
+		},
+		{
+			"icon": {
+				"paths": [
+					"M670 548c0 6-2 10-6 14l-266 266c-4 4-10 6-14 6s-10-2-14-6l-28-28c-4-4-6-8-6-14 0-4 2-10 6-12l224-226-224-224c-4-4-6-8-6-14 0-4 2-8 6-12l28-28c4-4 10-6 14-6s10 2 14 6l266 266c4 4 6 8 6 12z"
+				],
+				"defaultCode": 110,
+				"grid": 0
+			},
+			"properties": {
+				"id": 12,
+				"order": 41,
+				"prevSize": 32,
+				"code": 110,
+				"name": "uni6E",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 12
+		},
+		{
+			"icon": {
+				"paths": [
+					"M732 676v38c0 4-2 8-6 12s-8 6-12 6h-404c-4 0-8-2-12-6s-6-8-6-12v-38c0-4 2-10 6-12 4-4 8-6 12-6h404c4 0 8 2 12 6 4 2 6 8 6 12zM732 530v36c0 6-2 10-6 14s-8 6-12 6h-404c-4 0-8-2-12-6s-6-8-6-14v-36c0-6 2-10 6-12 4-4 8-6 12-6h404c4 0 8 2 12 6 4 2 6 6 6 12zM220 878h584v-440h-238c-14 0-28-4-38-16-10-10-16-22-16-38v-238h-292zM586 366h214c-4-12-8-20-12-24l-180-178c-4-6-12-10-22-14zM878 384v512c0 16-6 28-16 38-10 12-24 16-40 16h-620c-16 0-30-4-40-16-10-10-16-22-16-38v-768c0-16 6-28 16-38 10-12 24-16 40-16h364c16 0 32 2 52 10 18 8 32 18 42 28l178 178c12 10 20 26 28 44s12 34 12 50z"
+				],
+				"defaultCode": 104,
+				"grid": 0
+			},
+			"properties": {
+				"id": 13,
+				"order": 42,
+				"prevSize": 32,
+				"code": 104,
+				"name": "uni68",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 13
+		},
+		{
+			"icon": {
+				"paths": [
+					"M342 342c0 28-10 52-30 72s-44 30-74 30c-28 0-52-10-72-30-20-20-30-44-30-72 0-30 10-54 30-74 20-20 44-30 72-30 30 0 54 10 74 30 20 20 30 44 30 74zM888 546v240h-752v-104l172-170 84 86 274-274zM938 170h-852c-6 0-10 2-12 6-4 4-6 8-6 12v648c0 4 2 8 6 12 2 4 6 6 12 6h852c6 0 10-2 12-6 4-4 6-8 6-12v-648c0-4-2-8-6-12-2-4-6-6-12-6zM1024 188v648c0 24-8 44-26 60-16 18-36 26-60 26h-852c-24 0-44-8-60-26-18-16-26-36-26-60v-648c0-24 8-44 26-60 16-18 36-26 60-26h852c24 0 44 8 60 26 18 16 26 36 26 60z"
+				],
+				"defaultCode": 111,
+				"grid": 0
+			},
+			"properties": {
+				"id": 14,
+				"order": 43,
+				"prevSize": 32,
+				"code": 111,
+				"name": "uni6F",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 14
+		},
+		{
+			"icon": {
+				"paths": [
+					"M988 330v146c0 10-4 18-12 26-6 6-16 10-26 10h-36c-10 0-18-4-26-10-6-8-10-16-10-26v-146c0-42-14-76-44-104-28-28-62-44-102-44-40 0-76 16-104 44-28 28-42 62-42 104v108h54c16 0 28 6 38 16 12 12 16 24 16 40v328c0 16-4 30-16 40-10 10-22 16-38 16h-548c-16 0-28-6-40-16-10-10-16-24-16-40v-328c0-16 6-28 16-40 12-10 24-16 40-16h384v-108c0-72 24-132 74-182s110-74 182-74c70 0 130 24 180 74 50 50 76 110 76 182z"
+				],
+				"defaultCode": 112,
+				"grid": 0
+			},
+			"properties": {
+				"id": 15,
+				"order": 44,
+				"prevSize": 32,
+				"code": 112,
+				"name": "uni70",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 15
+		},
+		{
+			"icon": {
+				"paths": [
+					"M798 420c0 6-2 10-6 14l-266 266c-4 4-10 6-14 6s-10-2-14-6l-266-266c-4-4-6-8-6-14 0-4 2-8 6-12l30-30c2-2 8-4 12-4 6 0 10 2 14 4l224 226 224-226c4-2 8-4 14-4 4 0 10 2 12 4l30 30c4 4 6 8 6 12z"
+				],
+				"defaultCode": 113,
+				"grid": 0
+			},
+			"properties": {
+				"id": 16,
+				"order": 45,
+				"prevSize": 32,
+				"code": 113,
+				"name": "uni71",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 16
+		},
+		{
+			"icon": {
+				"paths": [
+					"M732 786v-36c0-6-2-10-6-14-4-2-8-4-12-4h-404c-4 0-8 2-12 4-4 4-6 8-6 14v36c0 6 2 10 6 14 4 2 8 4 12 4h404c4 0 8-2 12-4 4-4 6-8 6-14zM732 640v-36c0-6-2-10-6-14s-8-4-12-4h-404c-4 0-8 0-12 4s-6 8-6 14v36c0 6 2 10 6 14 4 2 8 4 12 4h404c4 0 8-2 12-4 4-4 6-8 6-14zM878 438v458c0 16-6 28-16 38-10 12-24 16-40 16h-620c-16 0-30-4-40-16-10-10-16-22-16-38v-768c0-16 6-28 16-38 10-12 24-16 40-16h310v310c0 16 6 28 16 38 10 12 24 16 38 16zM876 366h-290v-292c30 6 56 18 74 38l178 178c20 20 32 44 38 76z"
+				],
+				"defaultCode": 114,
+				"grid": 0
+			},
+			"properties": {
+				"id": 17,
+				"order": 46,
+				"prevSize": 32,
+				"code": 114,
+				"name": "uni72",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 17
+		},
+		{
+			"icon": {
+				"paths": [
+					"M914 750v-402c0-16-6-28-16-40-10-10-24-16-38-16h-402c-16 0-30-4-40-16-10-10-16-24-16-38v-36c0-16-6-30-16-40s-24-16-38-16h-184c-14 0-28 6-38 16s-16 24-16 40v548c0 14 6 28 16 38 10 12 24 16 38 16h696c14 0 28-4 38-16 10-10 16-24 16-38zM988 348v402c0 34-14 64-38 90-26 26-56 38-90 38h-696c-34 0-64-12-90-38-24-26-38-56-38-90v-548c0-36 14-66 38-92 26-24 56-36 90-36h184c34 0 64 12 90 36 24 26 38 56 38 92v18h384c34 0 64 12 90 38 24 24 38 54 38 90z"
+				],
+				"defaultCode": 115,
+				"grid": 0
+			},
+			"properties": {
+				"id": 18,
+				"order": 47,
+				"prevSize": 32,
+				"code": 115,
+				"name": "uni73",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 18
+		},
+		{
+			"icon": {
+				"paths": [
+					"M914 420v110c0 16-6 28-16 40-10 10-24 16-38 16h-238v236c0 16-6 30-16 40s-24 16-40 16h-108c-16 0-30-6-40-16s-16-24-16-40v-236h-238c-14 0-28-6-38-16-10-12-16-24-16-40v-110c0-14 6-28 16-38s24-16 38-16h238v-238c0-16 6-28 16-38 10-12 24-16 40-16h108c16 0 30 4 40 16 10 10 16 22 16 38v238h238c14 0 28 6 38 16s16 24 16 38z"
+				],
+				"defaultCode": 116,
+				"grid": 0
+			},
+			"properties": {
+				"id": 19,
+				"order": 48,
+				"prevSize": 32,
+				"code": 116,
+				"name": "uni74",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 19
+		},
+		{
+			"icon": {
+				"paths": [
+					"M330 256c0-20-8-38-22-52s-32-22-52-22c-20 0-38 8-52 22-14 14-22 32-22 52 0 20 8 38 22 52 14 14 32 22 52 22 20 0 38-8 52-22 14-14 22-32 22-52zM938 586c0 20-6 36-20 50l-280 282c-16 14-34 20-52 20-22 0-38-6-52-20l-408-410c-16-14-28-32-38-58-10-24-14-46-14-66v-238c0-20 6-36 20-52 16-14 32-20 52-20h238c20 0 42 4 66 14 26 10 44 22 60 38l408 408c14 14 20 32 20 52z"
+				],
+				"defaultCode": 117,
+				"grid": 0
+			},
+			"properties": {
+				"id": 20,
+				"order": 49,
+				"prevSize": 32,
+				"code": 117,
+				"name": "uni75",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 20
+		},
+		{
+			"icon": {
+				"paths": [
+					"M1002 542c0 10-6 22-16 36l-180 210c-14 18-36 34-64 46-28 14-52 20-76 20h-580c-12 0-24-2-32-8-10-4-16-12-16-22 0-12 6-24 18-36l178-210c16-20 38-34 64-48 28-12 54-18 78-18h580c12 0 22 2 32 6 10 6 14 14 14 24zM820 358v86h-444c-34 0-68 8-106 26-36 16-66 38-88 62l-178 212-4 4c0-2 0-4 0-8 0-2 0-4 0-6v-512c0-32 12-60 36-84 22-24 50-36 84-36h170c32 0 60 12 84 36s36 52 36 84v16h290c32 0 60 12 84 36s36 52 36 84z"
+				],
+				"defaultCode": 118,
+				"grid": 0
+			},
+			"properties": {
+				"id": 21,
+				"order": 50,
+				"prevSize": 32,
+				"code": 118,
+				"name": "uni76",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 21
+		},
+		{
+			"icon": {
+				"paths": [
+					"M658 512c0-40-14-74-42-104-30-28-64-42-104-42-40 0-74 14-104 42-28 30-42 64-42 104 0 40 14 74 42 104 30 28 64 42 104 42 40 0 74-14 104-42 28-30 42-64 42-104zM950 450v126c0 6 0 10-4 14-2 4-6 6-12 8l-104 16c-8 20-16 38-24 52 14 18 34 44 62 78 4 4 6 10 6 14 0 6-2 10-6 14-10 14-28 34-56 62-28 26-46 40-54 40-4 0-10-2-14-6l-80-62c-16 10-34 16-52 22-6 52-12 88-16 106-2 12-10 16-20 16h-128c-4 0-10 0-14-4s-6-8-6-12l-16-106c-18-6-36-12-52-20l-80 60c-4 4-8 6-14 6s-10-2-14-6c-48-44-80-76-94-96-4-4-4-8-4-14 0-4 0-8 4-12 6-8 16-22 28-38 14-18 24-32 32-42-10-18-18-38-24-56l-104-16c-6 0-10-2-12-6-4-4-4-8-4-14v-126c0-6 0-10 4-14 2-4 6-6 10-8l106-16c6-16 14-34 24-52-16-22-36-48-62-78-4-6-6-10-6-14 0-4 2-8 6-14 10-14 28-34 56-60 28-28 46-42 54-42 4 0 10 2 14 6l80 62c16-10 34-16 52-22 6-52 12-88 16-106 2-12 10-16 20-16h128c4 0 10 0 14 4s6 8 6 12l16 106c18 6 36 12 52 20l80-60c4-4 8-6 14-6s10 2 14 6c50 46 82 78 94 98 4 2 4 6 4 12 0 4 0 8-4 12-6 8-16 22-28 38-14 18-24 32-32 42 10 18 18 36 24 56l104 16c6 0 10 2 12 6 4 4 4 8 4 14z"
+				],
+				"defaultCode": 119,
+				"grid": 0
+			},
+			"properties": {
+				"id": 22,
+				"order": 51,
+				"prevSize": 32,
+				"code": 119,
+				"name": "uni77",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 22
+		},
+		{
+			"icon": {
+				"paths": [
+					"M954 324c0 14-4 28-16 38l-490 492c-12 10-24 16-40 16-14 0-28-6-38-16l-284-284c-12-12-16-24-16-40 0-14 4-28 16-38l76-78c12-10 24-16 40-16 14 0 28 6 38 16l168 168 376-376c10-10 24-16 38-16 16 0 28 6 40 16l76 78c12 12 16 24 16 40z"
+				],
+				"defaultCode": 120,
+				"grid": 0
+			},
+			"properties": {
+				"id": 23,
+				"order": 52,
+				"prevSize": 32,
+				"code": 120,
+				"name": "uni78",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 23
+		},
+		{
+			"icon": {
+				"paths": [
+					"M688 310c0 6-2 10-6 14l-224 224 224 226c4 2 6 8 6 12 0 6-2 10-6 14l-28 28c-4 4-10 6-14 6s-10-2-14-6l-266-266c-4-4-6-8-6-14 0-4 2-8 6-12l266-266c4-4 10-6 14-6s10 2 14 6l28 28c4 4 6 8 6 12z"
+				],
+				"defaultCode": 122,
+				"grid": 0
+			},
+			"properties": {
+				"id": 24,
+				"order": 53,
+				"prevSize": 32,
+				"code": 122,
+				"name": "uni7A",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 24
+		},
+		{
+			"icon": {
+				"paths": [
+					"M464 742l352-350c6-8 10-16 10-26s-4-18-10-26l-58-58c-8-8-16-12-26-12s-20 4-26 12l-268 266-120-120c-6-8-16-10-26-10s-18 2-26 10l-58 58c-6 8-10 16-10 26s4 18 10 26l206 204c6 8 14 12 24 12s20-4 26-12zM950 238v548c0 46-16 84-48 116s-70 48-116 48h-548c-46 0-84-16-116-48s-48-70-48-116v-548c0-46 16-84 48-116s70-48 116-48h548c46 0 84 16 116 48s48 70 48 116z"
+				],
+				"defaultCode": 65,
+				"grid": 0
+			},
+			"properties": {
+				"id": 25,
+				"order": 54,
+				"prevSize": 32,
+				"code": 65,
+				"name": "uni41",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 25
+		},
+		{
+			"icon": {
+				"paths": [
+					"M768 548v-72c0-10-4-20-10-26-8-8-16-12-26-12h-146v-146c0-10-4-18-12-26-6-6-16-10-26-10h-72c-10 0-20 4-26 10-8 8-12 16-12 26v146h-146c-10 0-18 4-26 12-6 6-10 16-10 26v72c0 10 4 20 10 26 8 8 16 12 26 12h146v146c0 10 4 18 12 26 6 6 16 10 26 10h72c10 0 20-4 26-10 8-8 12-16 12-26v-146h146c10 0 18-4 26-12 6-6 10-16 10-26zM950 512c0 80-18 154-58 220-40 68-92 120-160 160-66 40-140 58-220 58-80 0-154-18-220-58-68-40-120-92-160-160-40-66-58-140-58-220 0-80 18-154 58-220 40-68 92-120 160-160 66-40 140-58 220-58 80 0 154 18 220 58 68 40 120 92 160 160 40 66 58 140 58 220z"
+				],
+				"defaultCode": 66,
+				"grid": 0
+			},
+			"properties": {
+				"id": 26,
+				"order": 55,
+				"prevSize": 32,
+				"code": 66,
+				"name": "uni42",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 26
+		},
+		{
+			"icon": {
+				"paths": [
+					"M346 916c-160-46-618-248-98-916 280 190 388 358 408 496-134 48-226 142-214 312-74-174-132-416-156-566-12 176 14 488 60 674zM524 958c-38-106-118-456 482-438 18 550-274 530-404 492 54-106 124-202 212-282-108 60-206 136-290 228z"
+				],
+				"defaultCode": 68,
+				"grid": 0
+			},
+			"properties": {
+				"id": 27,
+				"order": 56,
+				"prevSize": 32,
+				"code": 68,
+				"name": "uni44",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 27
+		},
+		{
+			"icon": {
+				"paths": [
+					"M426 870c30 12 56 18 80 18 50 0 92-8 124-24 32-16 56-38 70-64 14-28 22-62 22-104 0-44-8-78-24-102-22-36-48-60-80-72-30-14-78-20-142-20-28 0-46 2-58 6v182l2 154c0 6 2 14 6 26zM418 442c18 4 38 4 64 4 66 0 116-12 150-36 34-26 50-68 50-128 0-42-16-78-48-108-32-28-80-42-146-42-20 0-44 2-74 8 0 16 0 30 2 44 2 46 4 100 2 158v56c0 18 0 32 0 44zM110 950v-52c18-4 30-6 40-8 30-4 52-10 70-18 6-10 10-20 12-28 4-26 6-62 6-112l-2-284c-2-96-4-174-6-230 0-34-2-54-6-62 0-2-2-4-6-8-8-4-20-6-40-8-12 0-32-4-64-8l-4-46 150-4 216-8h26c2 0 4 0 8 0s6 0 8 0c0 0 4 0 12 0s16 0 24 0h42c34 0 70 4 110 16 16 4 34 12 54 22 22 10 42 24 58 42 18 18 30 38 38 60 8 22 12 46 12 70 0 26-6 52-18 74-14 22-32 42-56 60-10 6-38 22-84 44 66 14 118 42 152 82 34 40 52 86 52 136 0 28-6 60-16 92-8 24-22 46-40 66-26 28-52 48-80 62-28 14-68 26-116 34-32 6-70 8-114 6l-112-2c-32 0-90 2-170 6-14 2-66 4-156 6z"
+				],
+				"defaultCode": 67,
+				"grid": 0
+			},
+			"properties": {
+				"id": 28,
+				"order": 57,
+				"prevSize": 32,
+				"code": 67,
+				"name": "uni43",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 28
+		},
+		{
+			"icon": {
+				"paths": [
+					"M220 950l10-48c0-2 16-6 44-12 28-8 50-14 66-22 10-14 18-34 22-58l16-80 40-190c2-16 6-32 8-48 4-16 8-28 10-38 2-10 6-18 8-26 2-8 2-14 4-18 2-4 2-6 2-6l16-90 10-36 12-78 6-28v-22c-16-8-44-14-84-16-10 0-18-2-20-2l10-58 182 8c14 0 28 0 40 0 26 0 66-2 124-4 12-2 24-2 38-4 14 0 20 0 20 0 0 6-2 14-2 20-4 12-6 22-8 30-22 8-42 14-62 18-24 6-44 12-58 18-4 12-10 28-14 50-4 16-6 32-8 46-16 76-28 134-38 176l-34 178-22 90-24 134-8 26c0 2 0 8 2 14 24 6 46 10 68 12 14 2 26 4 38 6-2 12-2 22-4 34-4 12-6 20-6 24-6 0-12 0-14 0-8 0-16 0-24 0-2 0-8 0-16 0-6-2-34-6-82-10l-114-2c-14 0-48 2-98 6-28 4-48 4-56 6z"
+				],
+				"defaultCode": 69,
+				"grid": 0
+			},
+			"properties": {
+				"id": 29,
+				"order": 58,
+				"prevSize": 32,
+				"code": 69,
+				"name": "uni45",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 29
+		},
+		{
+			"icon": {
+				"paths": [
+					"M220 804c0 32-12 56-32 78-22 22-48 32-78 32-30 0-56-10-78-32-22-22-32-46-32-78 0-30 10-56 32-78 22-20 48-32 78-32 30 0 56 12 78 32 20 22 32 48 32 78zM220 512c0 30-12 56-32 78-22 22-48 32-78 32-30 0-56-10-78-32-22-22-32-48-32-78 0-30 10-56 32-78 22-22 48-32 78-32 30 0 56 10 78 32 20 22 32 48 32 78zM1024 750v110c0 4-2 8-6 12s-8 6-12 6h-696c-4 0-8-2-12-6s-6-8-6-12v-110c0-6 2-10 6-14 4-2 8-4 12-4h696c4 0 8 2 12 4 4 4 6 8 6 14zM220 220c0 30-12 56-32 78-22 20-48 32-78 32-30 0-56-12-78-32-22-22-32-48-32-78 0-32 10-56 32-78 22-22 48-32 78-32 30 0 56 10 78 32 20 22 32 46 32 78zM1024 458v108c0 6-2 10-6 14s-8 6-12 6h-696c-4 0-8-2-12-6s-6-8-6-14v-108c0-6 2-10 6-14s8-6 12-6h696c4 0 8 2 12 6s6 8 6 14zM1024 164v110c0 6-2 10-6 14-4 2-8 4-12 4h-696c-4 0-8-2-12-4-4-4-6-8-6-14v-110c0-4 2-8 6-12s8-6 12-6h696c4 0 8 2 12 6s6 8 6 12z"
+				],
+				"defaultCode": 70,
+				"grid": 0
+			},
+			"properties": {
+				"id": 30,
+				"order": 59,
+				"prevSize": 32,
+				"code": 70,
+				"name": "uni46",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 30
+		},
+		{
+			"icon": {
+				"paths": [
+					"M218 926c0 30-10 54-32 72-20 18-46 26-76 26-42 0-74-12-100-38l34-50c18 18 38 26 60 26 12 0 20-4 28-8 10-6 14-14 14-24 0-26-20-36-60-32l-16-32c4-4 10-12 18-26 10-12 18-22 26-30 6-8 14-16 20-22v-2c-6 0-16 2-28 2s-22 0-28 0v30h-60v-86h190v50l-54 66c20 4 36 14 46 28 12 14 18 30 18 50zM218 568v90h-206c-2-14-4-24-4-30 0-20 6-38 14-54 8-16 20-28 32-38 12-10 26-20 38-28 12-8 24-16 32-24 10-8 14-18 14-26 0-10-4-18-8-22-6-6-14-8-24-8-16 0-32 12-46 34l-48-34c10-20 22-36 40-46s40-16 62-16c26 0 50 8 70 24 18 16 28 36 28 64 0 18-6 36-20 52-12 16-26 28-42 36-16 10-30 20-44 30-12 10-20 20-20 30h72v-34zM1024 750v110c0 4-2 8-6 12s-8 6-12 6h-696c-4 0-8-2-12-6s-6-8-6-12v-110c0-6 2-10 6-14 4-2 8-4 12-4h696c4 0 8 2 12 4 4 4 6 8 6 14zM220 236v56h-192v-56h62c0-16 0-38 0-70 0-30 0-54 0-68v-8h-2c-2 6-12 18-28 32l-40-44 78-72h60v230zM1024 458v108c0 6-2 10-6 14s-8 6-12 6h-696c-4 0-8-2-12-6s-6-8-6-14v-108c0-6 2-10 6-14s8-6 12-6h696c4 0 8 2 12 6s6 8 6 14zM1024 164v110c0 6-2 10-6 14-4 2-8 4-12 4h-696c-4 0-8-2-12-4-4-4-6-8-6-14v-110c0-4 2-8 6-12s8-6 12-6h696c4 0 8 2 12 6s6 8 6 12z"
+				],
+				"defaultCode": 71,
+				"grid": 0
+			},
+			"properties": {
+				"id": 31,
+				"order": 60,
+				"prevSize": 32,
+				"code": 71,
+				"name": "uni47",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 31
+		},
+		{
+			"icon": {
+				"paths": [
+					"M950 512c0 60-10 116-34 170s-54 102-94 140c-38 40-86 70-140 94-54 24-110 34-170 34-66 0-128-12-186-40-60-28-110-68-152-118-2-4-4-8-4-12 0-6 2-8 6-12l78-78c4-4 8-6 14-6s10 4 14 6c26 38 62 66 102 84 40 20 82 30 128 30 40 0 78-8 114-22 36-16 66-36 92-64 28-26 48-56 64-92 14-36 22-74 22-114 0-40-8-78-22-114-16-36-36-66-64-92-26-28-56-48-92-64-36-14-74-22-114-22-38 0-74 6-108 20-34 14-64 32-90 58l78 78c12 12 14 26 8 40-8 16-18 22-34 22h-256c-10 0-18-2-26-10s-10-16-10-26v-256c0-16 6-26 22-34 14-6 28-4 40 8l74 74c40-38 88-68 140-90 52-20 106-30 162-30 60 0 116 10 170 34 54 24 102 54 140 94 40 38 70 86 94 140 24 54 34 110 34 170z"
+				],
+				"defaultCode": 72,
+				"grid": 0
+			},
+			"properties": {
+				"id": 32,
+				"order": 61,
+				"prevSize": 32,
+				"code": 72,
+				"name": "uni48",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 32
+		},
+		{
+			"icon": {
+				"paths": [
+					"M950 146v256c0 10-2 18-10 26s-16 10-26 10h-256c-16 0-26-6-34-22-6-14-4-28 8-40l80-78c-56-52-124-78-200-78-40 0-78 8-114 22-36 16-66 36-92 64-28 26-48 56-64 92-14 36-22 74-22 114 0 40 8 78 22 114 16 36 36 66 64 92 26 28 56 48 92 64 36 14 74 22 114 22 46 0 88-10 128-30 40-18 76-46 102-84 4-2 8-6 14-6 6 0 10 2 14 6l78 78c4 4 6 6 6 12 0 4-2 8-4 12-42 50-92 90-152 118-58 28-120 40-186 40-60 0-116-10-170-34-54-24-102-54-140-94-40-38-70-86-94-140-24-54-34-110-34-170 0-60 10-116 34-170 24-54 54-102 94-140 38-40 86-70 140-94 54-24 110-34 170-34 56 0 110 10 162 30 52 22 100 52 140 90l74-74c12-12 24-14 40-8 16 8 22 18 22 34z"
+				],
+				"defaultCode": 73,
+				"grid": 0
+			},
+			"properties": {
+				"id": 33,
+				"order": 62,
+				"prevSize": 32,
+				"code": 73,
+				"name": "uni49",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 33
+		},
+		{
+			"icon": {
+				"paths": [
+					"M868 694c0-14-4-28-16-38l-118-118c-10-12-24-16-40-16s-28 6-40 18c0 0 4 4 10 10 6 6 10 10 12 12 2 2 6 6 10 12 4 4 6 8 6 14 2 4 2 10 2 16 0 14-4 28-16 38-10 10-22 16-38 16-6 0-10 0-16-2-4-2-10-4-14-8-6-2-8-6-12-8-2-2-6-6-12-12-6-6-8-10-10-10-12 10-18 24-18 40 0 16 4 30 16 40l116 118c12 10 24 16 40 16 14 0 28-6 38-16l84-82c12-12 16-24 16-40zM466 292c0-16-4-28-16-38l-116-120c-12-10-24-16-40-16-14 0-28 6-38 16l-84 84c-12 10-16 24-16 38 0 16 4 28 16 38l118 120c10 10 24 16 40 16s28-6 40-18c0-2-4-6-10-12-6-6-10-10-12-12-2-2-6-6-10-10-4-6-6-10-6-14-2-6-2-10-2-16 0-16 4-28 16-40 10-10 22-16 38-16 6 0 10 2 16 2 4 2 10 4 14 8 6 4 8 6 12 8 2 2 6 6 12 12 6 6 8 10 10 12 12-12 18-26 18-42zM978 694c0 46-16 86-48 116l-84 84c-32 32-70 48-116 48s-86-16-116-48l-118-120c-32-30-48-70-48-116s16-86 50-118l-50-50c-32 32-72 50-118 50s-86-16-118-48l-118-120c-32-32-48-70-48-116s16-84 48-116l84-84c32-32 70-46 116-46s86 16 116 48l118 118c32 32 48 70 48 116s-16 86-50 120l50 50c32-34 72-50 118-50s86 16 118 48l118 118c32 32 48 72 48 116z"
+				],
+				"defaultCode": 74,
+				"grid": 0
+			},
+			"properties": {
+				"id": 34,
+				"order": 63,
+				"prevSize": 32,
+				"code": 74,
+				"name": "uni4A",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 34
+		},
+		{
+			"icon": {
+				"paths": [
+					"M950 512c0 80-18 154-58 220-40 68-92 120-160 160-66 40-140 58-220 58-80 0-154-18-220-58-68-40-120-92-160-160-40-66-58-140-58-220 0-80 18-154 58-220 40-68 92-120 160-160 66-40 140-58 220-58 80 0 154 18 220 58 68 40 120 92 160 160 40 66 58 140 58 220z"
+				],
+				"defaultCode": 75,
+				"grid": 0
+			},
+			"properties": {
+				"id": 35,
+				"order": 64,
+				"prevSize": 32,
+				"code": 75,
+				"name": "uni4B",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 35
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 202c-56 0-108 14-156 40-48 28-86 66-114 114-26 48-40 100-40 156 0 56 14 108 40 156 28 48 66 86 114 114 48 26 100 40 156 40 56 0 108-14 156-40 48-28 86-66 114-114 26-48 40-100 40-156 0-56-14-108-40-156-28-48-66-86-114-114-48-26-100-40-156-40zM950 512c0 80-18 154-58 220-40 68-92 120-160 160-66 40-140 58-220 58-80 0-154-18-220-58-68-40-120-92-160-160-40-66-58-140-58-220 0-80 18-154 58-220 40-68 92-120 160-160 66-40 140-58 220-58 80 0 154 18 220 58 68 40 120 92 160 160 40 66 58 140 58 220z"
+				],
+				"defaultCode": 76,
+				"grid": 0
+			},
+			"properties": {
+				"id": 36,
+				"order": 65,
+				"prevSize": 32,
+				"code": 76,
+				"name": "uni4C",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 36
+		},
+		{
+			"icon": {
+				"paths": [
+					"M958 694c0 22-8 38-22 52l-42 44c-16 14-32 20-52 20-22 0-38-6-52-20l-278-278-278 278c-14 14-30 20-52 20-20 0-36-6-50-20l-44-44c-14-14-22-30-22-52 0-20 8-36 22-52l372-372c14-14 32-20 52-20s38 6 52 20l372 372c14 16 22 32 22 52z"
+				],
+				"defaultCode": 77,
+				"grid": 0
+			},
+			"properties": {
+				"id": 37,
+				"order": 66,
+				"prevSize": 32,
+				"code": 77,
+				"name": "uni4D",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 37
+		},
+		{
+			"icon": {
+				"paths": [
+					"M958 402c0 20-8 38-22 52l-372 372c-14 14-32 22-52 22s-38-8-52-22l-372-372c-14-14-22-32-22-52s8-38 22-52l42-42c16-14 34-22 52-22 22 0 38 8 52 22l278 278 278-278c14-14 30-22 52-22 18 0 36 8 52 22l42 42c14 16 22 32 22 52z"
+				],
+				"defaultCode": 78,
+				"grid": 0
+			},
+			"properties": {
+				"id": 38,
+				"order": 67,
+				"prevSize": 32,
+				"code": 78,
+				"name": "uni4E",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 38
+		},
+		{
+			"icon": {
+				"paths": [
+					"M316 512c-58 2-104 24-142 68h-70c-30 0-54-6-74-22-20-14-30-34-30-62 0-126 22-188 66-188 2 0 10 2 24 10 12 8 30 16 52 24 20 6 42 10 62 10 24 0 48-4 72-12-2 14-2 26-2 36 0 48 14 94 42 136zM888 852c0 42-14 76-40 100-26 26-60 38-102 38h-468c-42 0-76-12-102-38-26-24-40-58-40-100 0-20 2-38 2-56 2-18 4-36 8-58 4-20 8-40 14-58 6-18 14-34 22-52 10-16 22-30 34-42 12-12 28-22 46-30 18-6 38-10 60-10 2 0 10 4 22 12 12 8 24 16 38 26 16 8 34 18 58 24 24 8 48 12 72 12 24 0 48-4 72-12 24-6 42-16 58-24 14-10 26-18 38-26 12-8 20-12 22-12 22 0 42 4 60 10 18 8 34 18 46 30 12 12 24 26 34 42 8 18 16 34 22 52 6 18 10 38 14 58 4 22 6 40 8 58 0 18 2 36 2 56zM342 170c0 38-14 70-40 98-28 26-60 40-98 40-36 0-70-14-96-40-26-28-40-60-40-98 0-38 14-70 40-96 26-26 60-40 96-40 38 0 70 14 98 40 26 26 40 58 40 96zM716 376c0 56-20 104-60 144s-88 60-144 60c-56 0-104-20-144-60-40-40-60-88-60-144 0-58 20-106 60-146 40-40 88-60 144-60 56 0 104 20 144 60 40 40 60 88 60 146zM1024 496c0 28-10 48-30 62-20 16-44 22-74 22h-70c-38-44-84-66-142-68 28-42 42-88 42-136 0-10 0-22-2-36 24 8 48 12 72 12 20 0 42-4 62-10 22-8 40-16 52-24 14-8 22-10 24-10 44 0 66 62 66 188zM956 170c0 38-14 70-40 98-26 26-60 40-96 40-38 0-70-14-98-40-26-28-40-60-40-98 0-38 14-70 40-96 28-26 60-40 98-40 36 0 70 14 96 40 26 26 40 58 40 96z"
+				],
+				"defaultCode": 79,
+				"grid": 0
+			},
+			"properties": {
+				"id": 39,
+				"order": 68,
+				"prevSize": 32,
+				"code": 79,
+				"name": "uni4F",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 39
+		},
+		{
+			"icon": {
+				"paths": [
+					"M750 512c0 14-6 24-18 32l-312 182c-6 4-12 6-18 6s-12-2-18-6-18-18-18-32v-364c0-14 6-26 18-32 12-8 24-8 36 0l312 182c12 8 18 18 18 32zM822 512c0-56-14-108-40-156-28-48-66-86-114-114-48-26-100-40-156-40-56 0-108 14-156 40-48 28-86 66-114 114-26 48-40 100-40 156 0 56 14 108 40 156 28 48 66 86 114 114 48 26 100 40 156 40 56 0 108-14 156-40 48-28 86-66 114-114 26-48 40-100 40-156zM950 512c0 80-18 154-58 220-40 68-92 120-160 160-66 40-140 58-220 58-80 0-154-18-220-58-68-40-120-92-160-160-40-66-58-140-58-220 0-80 18-154 58-220 40-68 92-120 160-160 66-40 140-58 220-58 80 0 154 18 220 58 68 40 120 92 160 160 40 66 58 140 58 220z"
+				],
+				"defaultCode": 80,
+				"grid": 0
+			},
+			"properties": {
+				"id": 40,
+				"order": 69,
+				"prevSize": 32,
+				"code": 80,
+				"name": "uni50",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 40
+		},
+		{
+			"icon": {
+				"paths": [
+					"M476 292c0-30-12-56-32-78-22-20-48-32-78-32-30 0-56 12-78 32-22 22-32 48-32 78 0 16 4 32 10 48-14-8-30-10-46-10-32 0-56 10-78 32-22 20-32 46-32 76 0 32 10 58 32 78 22 22 46 32 78 32 30 0 56-10 78-32 20-20 32-46 32-78 0-16-4-30-12-46 16 6 32 10 48 10 30 0 56-10 78-32 20-22 32-46 32-78zM962 694c0 8-10 20-28 38-18 20-32 28-38 28-4 0-8-2-16-8-8-6-14-12-22-20-6-6-12-14-22-22-8-10-12-14-14-16l-54 56 126 126c10 10 16 24 16 38 0 16-8 32-22 46-16 16-30 22-46 22-16 0-30-4-40-16l-384-382c-66 50-136 74-208 74-62 0-112-20-152-58-38-40-58-90-58-152 0-60 18-120 54-178 36-60 84-106 142-142 58-36 118-54 178-54 62 0 114 18 152 58 40 38 60 90 60 152 0 72-26 140-76 208l204 202 54-54c-2-2-6-6-14-14-10-8-18-16-24-22-6-6-12-14-18-20-6-8-10-14-10-18 0-6 10-18 28-36 18-20 32-28 38-28 4 0 10 2 14 4 2 4 10 12 26 26 14 14 30 30 46 46 16 16 32 32 50 48 16 18 30 32 42 46 10 12 16 20 16 22z"
+				],
+				"defaultCode": 81,
+				"grid": 0
+			},
+			"properties": {
+				"id": 41,
+				"order": 70,
+				"prevSize": 32,
+				"code": 81,
+				"name": "uni51",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 41
+		},
+		{
+			"icon": {
+				"paths": [
+					"M784 740c140 48 210 90 210 124 0 0 0 108 0 108 0 0-482 0-482 0 0 0-482 0-482 0 0 0 0-108 0-108 0-34 70-76 210-124 64-24 108-48 130-72 24-24 36-56 36-96 0-16-8-32-24-50-14-20-24-44-32-76-2-8-4-14-10-18-4-4-8-6-14-8-4-2-8-8-14-18-4-10-8-24-8-44 0-10 0-20 4-26 4-8 6-12 10-12 0 0 4-4 4-4-6-34-10-64-12-90-4-38 10-76 42-116 30-38 84-58 160-58 76 0 130 20 162 58 32 40 44 78 40 116 0 0-12 90-12 90 12 4 18 20 18 42 0 20-4 34-8 44-6 10-10 16-14 18-6 2-10 4-14 8-6 4-8 10-10 18-6 34-16 58-32 76-16 18-24 34-24 50 0 40 12 72 36 96 24 24 68 48 130 72z"
+				],
+				"defaultCode": 121,
+				"grid": 0
+			},
+			"properties": {
+				"id": 42,
+				"order": 71,
+				"prevSize": 32,
+				"code": 121,
+				"name": "uni79",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 42
+		},
+		{
+			"icon": {
+				"paths": [
+					"M880 246h-376c-20-24-40-50-46-56-4-12-16-20-28-20h-150c-10 0-18 6-26 12l-50 64h-60c-32 0-56 26-56 56v496c0 30 24 56 56 56h736c32 0 56-26 56-56v-496c0-30-24-56-56-56z"
+				],
+				"defaultCode": 82,
+				"grid": 0
+			},
+			"properties": {
+				"id": 43,
+				"order": 72,
+				"prevSize": 32,
+				"code": 82,
+				"name": "uni52",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 43
+		},
+		{
+			"icon": {
+				"paths": [
+					"M842 750c0-24-8-46-24-66-18-20-38-30-60-30-20 0-36 6-48 20-10 14-16 32-16 54 0 22 6 40 20 54 14 16 34 22 60 22 18 0 34-4 48-14 14-12 20-24 20-40zM494 822c0 6-2 10-6 14l-182 182c-4 4-8 6-14 6-4 0-8-2-12-6l-184-182c-6-6-6-12-4-20 4-8 10-12 18-12h110v-786c0-6 2-10 4-12 4-4 8-6 14-6h110c4 0 10 2 12 6 4 2 6 6 6 12v786h110c4 0 10 2 12 6 4 4 6 8 6 12zM922 784c0 24-2 46-8 68-4 24-12 46-22 66-12 20-24 38-40 54-14 16-34 28-56 38-22 10-46 14-72 14-24 0-44-4-62-10-10-2-18-6-24-8l22-64c6 2 12 4 18 6 14 4 28 8 42 8 32 0 58-12 78-34 18-22 32-50 38-84h-2c-8 10-20 16-34 22-16 6-32 8-50 8-40 0-72-14-98-40-26-28-38-60-38-100 0-40 14-74 40-102 28-26 62-40 104-40 48 0 86 18 118 54 30 36 46 84 46 144zM906 374v64h-268v-64h94v-248c0-2 0-6 0-10 2-4 2-8 2-10v-8h-2l-4 6c-4 4-8 10-14 18l-36 32-48-48 110-106h70v374z"
+				],
+				"defaultCode": 84,
+				"grid": 0
+			},
+			"properties": {
+				"id": 44,
+				"order": 73,
+				"prevSize": 32,
+				"code": 84,
+				"name": "uni54",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 44
+		},
+		{
+			"icon": {
+				"paths": [
+					"M842 566v276c0 10-4 18-12 24-6 8-16 12-26 12h-218v-220h-148v220h-218c-10 0-20-4-26-12-8-6-12-14-12-24v-276c0 0 0 0 2 0 0-2 0-2 0-2l328-272 328 272c0 0 2 2 2 2zM968 528l-34 42c-4 4-8 6-12 6h-2c-6 0-10-2-12-4l-396-330-396 330c-4 4-8 4-14 4-4 0-8-2-12-6l-34-42c-4-4-4-8-4-14s2-10 6-12l410-342c12-10 28-16 44-16s32 6 44 16l138 116v-112c0-4 2-10 6-12 4-4 8-6 14-6h108c6 0 10 2 14 6 4 2 6 8 6 12v234l124 104c4 2 6 6 6 12s0 10-4 14z"
+				],
+				"defaultCode": 87,
+				"grid": 0
+			},
+			"properties": {
+				"id": 45,
+				"order": 74,
+				"prevSize": 32,
+				"code": 87,
+				"name": "uni57",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 45
+		},
+		{
+			"icon": {
+				"paths": [
+					"M730 742c2 8 2 14-4 20l-200 220c-2 4-8 6-12 6-6 0-10-2-14-6l-202-220c-6-6-6-12-4-20 4-6 10-10 16-10h128v-714c0-6 2-10 6-12 4-4 8-6 14-6h108c6 0 10 2 14 6 4 2 6 6 6 12v714h128c8 0 12 4 16 10z"
+				],
+				"defaultCode": 88,
+				"grid": 0
+			},
+			"properties": {
+				"id": 46,
+				"order": 75,
+				"prevSize": 32,
+				"code": 88,
+				"name": "uni58",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 46
+		},
+		{
+			"icon": {
+				"paths": [
+					"M730 282c-4 6-10 10-16 10h-128v714c0 6-2 10-6 12-4 4-8 6-14 6h-108c-6 0-10-2-14-6-4-2-6-6-6-12v-714h-128c-8 0-12-4-16-10-2-8-2-14 4-20l200-220c2-4 8-6 12-6 6 0 10 2 14 6l202 220c6 6 6 12 4 20z"
+				],
+				"defaultCode": 89,
+				"grid": 0
+			},
+			"properties": {
+				"id": 47,
+				"order": 76,
+				"prevSize": 32,
+				"code": 89,
+				"name": "uni59",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 47
+		},
+		{
+			"icon": {
+				"paths": [
+					"M402 420v330c0 6-2 10-4 12-4 4-8 6-14 6h-36c-6 0-10-2-14-6-4-2-4-6-4-12v-330c0-4 0-10 4-12 4-4 8-6 14-6h36c6 0 10 2 14 6 2 2 4 8 4 12zM548 420v330c0 6-2 10-4 12-4 4-8 6-14 6h-36c-6 0-10-2-14-6-2-2-4-6-4-12v-330c0-4 2-10 4-12 4-4 8-6 14-6h36c6 0 10 2 14 6 2 2 4 8 4 12zM694 420v330c0 6 0 10-4 12-4 4-8 6-14 6h-36c-6 0-10-2-14-6-2-2-4-6-4-12v-330c0-4 2-10 4-12 4-4 8-6 14-6h36c6 0 10 2 14 6 4 2 4 8 4 12zM768 834v-542h-512v542c0 8 2 16 4 24 2 6 6 12 8 14 4 4 6 6 6 6h476c0 0 2-2 6-6 2-2 6-8 8-14 2-8 4-16 4-24zM384 220h256l-28-68c-2-2-6-4-10-6h-180c-4 2-8 4-10 6zM914 238v36c0 6-2 10-4 14-4 2-8 4-14 4h-54v542c0 32-10 60-28 82-18 24-40 34-64 34h-476c-24 0-46-10-64-32s-28-50-28-82v-544h-54c-6 0-10-2-14-4-2-4-4-8-4-14v-36c0-6 2-10 4-14 4-2 8-4 14-4h176l40-96c6-14 16-26 32-36 14-10 30-14 44-14h184c14 0 30 4 44 14 16 10 26 22 32 36l40 96h176c6 0 10 2 14 4 2 4 4 8 4 14z"
+				],
+				"defaultCode": 90,
+				"grid": 0
+			},
+			"properties": {
+				"id": 48,
+				"order": 77,
+				"prevSize": 32,
+				"code": 90,
+				"name": "uni5A",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 48
+		},
+		{
+			"icon": {
+				"paths": [
+					"M740 224c0 8-6 16-16 16-8 0-16-8-16-16 0-10 8-16 16-16 10 0 16 6 16 16zM746 376c0 0-22-100-154-74-12-46-10-80 18-110 40-42 104-20 104-20v-34c-22-10-44-12-66-12-86 0-134 64-154 108l-238 438 68-12-124 238 86-16 66-186c186 0 426-68 394-320zM826 292l-52-52-42 52zM382 642c0 0 8-2 18-4 10-4 26-6 44-12 10-2 20-6 30-8 10-4 22-8 32-12 12-6 22-10 32-16 12-6 22-14 32-20 2-2 6-4 8-6l6-6c6-6 10-10 14-14s8-10 12-14c2-2 4-4 6-8l2-4 2-2c2-4 4-6 4-8 2-2 4-6 4-8 2-2 2-2 2-4 2 0 2-2 2-4 2-2 2-4 4-6 2-6 4-10 6-16 0-4 2-8 4-14 0-4 2-8 2-12 0-4 2-8 2-12 0-4 2-8 2-12 0-2 0-6 0-8 0-10 2-18 2-18l10 2c0 0-2 6-2 16 0 4-2 6-2 10 0 4 0 8-2 10 0 4 0 8-2 14 0 4-2 8-2 12-2 6-4 10-6 16-2 4-4 10-6 14 0 2-2 6-4 8 0 2 0 2-2 4 0 2 0 2-2 4 0 2-2 4-4 8-2 2-2 4-4 6-2 2-2 4-2 4l-4 4c-2 2-4 6-6 8-4 4-8 10-12 14-4 4-8 8-14 14l-6 6c-4 2-6 2-8 4-12 8-22 16-34 22-10 4-22 10-32 14-12 4-22 8-34 12-10 2-20 6-30 8-18 4-34 8-44 10-10 2-18 4-18 4z"
+				],
+				"defaultCode": 86,
+				"grid": 0
+			},
+			"properties": {
+				"id": 49,
+				"order": 78,
+				"prevSize": 32,
+				"code": 86,
+				"name": "uni56",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 49
+		},
+		{
+			"icon": {
+				"paths": [
+					"M150 874c-96-96-150-226-150-362 0-282 230-512 512-512l64 64-64 64c-212 0-384 172-384 384 0 102 40 200 112 272l-78 10zM512 1024l-64-64 64-64c212 0 384-172 384-384 0-102-40-200-112-272l78-10 12-80c96 96 150 226 150 362 0 282-230 512-512 512z"
+				],
+				"defaultCode": 49,
+				"grid": 0
+			},
+			"properties": {
+				"id": 50,
+				"order": 79,
+				"prevSize": 32,
+				"code": 49,
+				"name": "uni31",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 50
+		},
+		{
+			"icon": {
+				"paths": [
+					"M436 898c0 70-58 126-128 126s-128-56-128-126c0-72 58-128 128-128 70 0 128 56 128 128zM436 512c0 70-58 128-128 128s-128-58-128-128c0-70 58-128 128-128 70 0 128 58 128 128zM436 126c0 72-58 128-128 128s-128-56-128-128c0-70 58-126 128-126 70 0 128 56 128 126zM844 898c0 70-58 126-128 126s-128-56-128-126c0-72 58-128 128-128 70 0 128 56 128 128zM844 512c0 70-58 128-128 128s-128-58-128-128c0-70 58-128 128-128 70 0 128 58 128 128zM844 126c0 72-58 128-128 128s-128-56-128-128c0-70 58-126 128-126 70 0 128 56 128 126z"
+				],
+				"defaultCode": 85,
+				"grid": 0
+			},
+			"properties": {
+				"id": 51,
+				"order": 80,
+				"prevSize": 32,
+				"code": 85,
+				"name": "uni55",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 51
+		},
+		{
+			"icon": {
+				"paths": [
+					"M664 172v188h98v196h-384v-110l-304 204 304 202v-108h572v-572z"
+				],
+				"defaultCode": 51,
+				"grid": 0
+			},
+			"properties": {
+				"id": 52,
+				"order": 81,
+				"prevSize": 32,
+				"code": 51,
+				"name": "uni33",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 52
+		},
+		{
+			"icon": {
+				"paths": [
+					"M384 384h-384l298 218-108 358 306-214 336 214-138-358 330-218h-384l-144-368z"
+				],
+				"defaultCode": 50,
+				"grid": 0
+			},
+			"properties": {
+				"id": 53,
+				"order": 82,
+				"prevSize": 32,
+				"code": 50,
+				"name": "uni32",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 53
+		},
+		{
+			"icon": {
+				"paths": [
+					"M270 112h482v46h-482zM810 466l-254 248v-444h-90v440l-250-244-66 64 362 362 362-362z"
+				],
+				"defaultCode": 53,
+				"grid": 0
+			},
+			"properties": {
+				"id": 54,
+				"order": 83,
+				"prevSize": 32,
+				"code": 53,
+				"name": "uni35",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 54
+		},
+		{
+			"icon": {
+				"paths": [
+					"M272 112h482v46h-482zM216 716l252-248v444h90v-440l252 244 64-64-362-362-362 362z"
+				],
+				"defaultCode": 54,
+				"grid": 0
+			},
+			"properties": {
+				"id": 55,
+				"order": 84,
+				"prevSize": 32,
+				"code": 54,
+				"name": "uni36",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 55
+		},
+		{
+			"icon": {
+				"paths": [
+					"M692 382c0 4 0 8 0 12s-2 8-2 14c0 4-2 10-2 14-2 6-4 12-4 18-2 6-4 12-6 18-2 6-4 12-6 20-2 2-4 6-4 8-2 2-2 4-2 6-2 2-2 2-4 4-2 4-2 6-4 10-2 4-4 6-6 10l-4 4-2 6c-2 2-4 6-8 8-4 6-8 14-14 18-6 6-12 12-18 18l-8 8c-4 2-6 4-10 8-12 10-26 18-40 26-14 8-28 14-42 20-14 6-28 12-42 16-12 4-24 8-36 12-24 6-44 10-58 14-14 4-22 4-22 4 0 0 8 0 22-4 14-2 34-6 58-12 12-4 24-6 38-10 14-4 28-10 42-16 14-6 28-12 42-20 14-6 28-16 42-26 4-2 6-4 10-6l10-8c6-6 12-12 16-18 6-6 12-12 16-18 4-4 6-6 8-10l4-4c0-2 2-4 2-6 2-2 4-6 8-10 0-2 2-6 4-10 2 0 2-2 4-4 0-2 0-4 2-6 2-2 2-6 4-10 4-6 6-12 8-18 2-8 4-14 6-20 2-6 2-12 4-16 2-6 2-12 4-16 0-6 0-10 2-14 0-6 0-10 0-12 2-16 2-24 2-24h-12c0 0 0 8-2 22zM916 222l-68-66c-2-66-44-110-64-122-20-18-66-32-118-26-50 8-122 34-172 128-98 184-308 578-310 582-2 0-2 2 0 2 0 2 2 2 2 2l80-14-156 302c0 2 0 2 2 4 0 0 0 0 2 0 0 0 0 0 0 0l112-20c0 0 2 0 2-2l82-240c210-2 356-52 436-154 84-108 72-244 58-308l-10-62h120c0 0 2 0 2-2 2 0 0-2 0-4zM806 138c0 10-10 20-20 20-12 0-20-10-20-20 0-12 8-22 20-22 10 0 20 10 20 22zM740 594c-80 100-224 150-432 150-2 0-2 2-2 4l-84 240-102 18 156-302c0-2 0-2 0-4-2 0-2-2-4-2l-80 16c28-52 218-404 308-574 50-92 118-118 166-124 50-6 92 6 112 20v44c-4 0-32-10-58-10s-56 10-74 30c-32 36-40 72-24 132 108-20 156 26 174 54 14 60 30 198-56 308zM798 222l46-60 60 60z"
+				],
+				"defaultCode": 48,
+				"grid": 0
+			},
+			"properties": {
+				"id": 56,
+				"order": 85,
+				"prevSize": 32,
+				"code": 48,
+				"name": "uni30",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 56
+		},
+		{
+			"icon": {
+				"paths": [
+					"M506 40c130 0 240 44 334 134 92 90 140 200 144 330 0 130-44 242-136 334-90 94-200 142-330 146-130 0-242-44-334-136-94-90-142-200-144-330-2-130 42-242 134-334 92-94 202-142 332-144zM504 798c20 0 38-6 50-18 12-14 20-30 20-48 0-22-4-38-18-52-12-12-30-18-50-18 0 0-2 0-2 0-20 0-36 6-48 18-14 12-20 28-22 48 0 20 6 36 20 50 12 12 28 20 48 20 0 0 2 0 2 0zM674 462c18-22 26-48 26-80 0-52-18-92-54-118-36-26-82-38-138-38-44 0-80 8-106 26-48 28-72 78-74 150 0 0 0 4 0 4 0 0 112 0 112 0 0 0 0-4 0-4 0-18 6-36 16-56 12-16 30-24 56-24 28 0 46 6 54 20 10 14 16 28 16 46 0 12-6 26-16 40-6 8-14 16-22 20 0 0-6 4-6 4-4 4-8 8-16 12-6 4-14 10-20 16-8 4-14 10-22 16-8 6-14 12-18 18-8 14-14 40-18 80 0 0 0 8 0 8 0 0 112 0 112 0 0 0 0-4 0-4 0-8 0-18 4-28 4-14 12-26 28-38 0 0 28-18 28-18 32-24 50-40 58-52z"
+				],
+				"defaultCode": 63,
+				"grid": 0
+			},
+			"properties": {
+				"id": 57,
+				"order": 86,
+				"prevSize": 32,
+				"code": 63,
+				"name": "uni3F",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 57
+		},
+		{
+			"icon": {
+				"paths": [
+					"M998 894c8 12 8 24 0 36-6 10-16 16-30 16 0 0-914 0-914 0-12 0-22-6-28-16-8-12-8-24-2-36 0 0 456-800 456-800 6-12 16-18 32-18 14 0 24 6 30 18 0 0 456 800 456 800zM568 844c0 0 0-102 0-102s-112 0-112 0c0 0 0 102 0 102 0 0 112 0 112 0zM568 666c0 0 0-308 0-308s-112 0-112 0c0 0 0 308 0 308 0 0 112 0 112 0z"
+				],
+				"defaultCode": 33,
+				"grid": 0
+			},
+			"properties": {
+				"id": 58,
+				"order": 87,
+				"prevSize": 32,
+				"code": 33,
+				"name": "uni21",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 58
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 0c-282 0-512 230-512 512s230 512 512 512c282 0 512-230 512-512 0-282-230-512-512-512zM432 748l-234-236 90-90 144 146 308-308 90 90z"
+				],
+				"defaultCode": 57,
+				"grid": 0
+			},
+			"properties": {
+				"id": 59,
+				"order": 88,
+				"prevSize": 32,
+				"code": 57,
+				"name": "uni39",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 59
+		},
+		{
+			"icon": {
+				"paths": [
+					"M870 652v234h-716v-234h-136v302c0 38 30 70 68 70h852c38 0 68-32 68-70v-302zM500 628l-198-236c0 0-30-30 4-30 32 0 110 0 110 0 0 0 0-18 0-48 0-82 0-236 0-298 0 0-4-16 22-16 24 0 136 0 156 0 18 0 16 14 16 14 0 60 0 218 0 298 0 26 0 44 0 44 0 0 64 0 104 0 38 0 10 30 10 30 0 0-168 222-192 244-16 18-32-2-32-2z"
+				],
+				"defaultCode": 83,
+				"grid": 0
+			},
+			"properties": {
+				"id": 60,
+				"order": 89,
+				"prevSize": 32,
+				"code": 83,
+				"name": "uni53",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 60
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 406c16 0 30 2 44 8s26 12 36 22c10 10 18 22 22 34 6 14 10 28 10 42 0 14-4 28-10 42-4 12-12 24-22 34-10 10-22 16-36 22-14 6-28 8-44 8-16 0-30-2-44-8-14-6-26-12-36-22-10-10-18-22-22-34-6-14-10-28-10-42 0-14 4-28 10-42 4-12 12-24 22-34 10-10 22-16 36-22 14-6 28-8 44-8zM512 678c24 0 46-4 68-12s40-20 56-36c16-14 28-32 38-52 8-22 12-42 12-66 0-24-4-44-12-66-10-20-22-38-38-52-16-16-34-28-56-36-22-8-44-12-68-12-24 0-46 4-68 12-22 8-40 20-56 36-16 14-28 32-38 52-8 22-12 42-12 66 0 24 4 44 12 66 10 20 22 38 38 52 16 16 34 28 56 36 22 8 44 12 68 12zM512 290c36 0 70 4 102 12s62 20 90 34c28 12 52 28 74 44 22 18 42 34 58 50 14 16 26 32 34 46 10 16 14 28 14 36 0 8-4 20-14 36-8 14-20 30-34 46-16 16-36 32-58 50-22 16-46 32-74 44-28 14-58 26-90 34-32 8-66 12-102 12-36 0-70-4-102-12-34-8-62-20-90-34-28-12-52-28-74-44-22-18-42-34-58-50-14-16-26-32-34-46-10-16-14-28-14-36 0-8 4-20 14-36 8-14 20-30 34-46 16-16 36-32 58-50 22-16 46-32 74-44 28-14 56-26 90-34 32-8 66-12 102-12z"
+				],
+				"defaultCode": 52,
+				"grid": 0
+			},
+			"properties": {
+				"id": 61,
+				"order": 90,
+				"prevSize": 32,
+				"code": 52,
+				"name": "uni34",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 61
+		},
+		{
+			"icon": {
+				"paths": [
+					"M832 1024h-640c-106 0-192-86-192-192v-640c0-84 54-154 128-180v84c0 54 44 96 96 96s96-42 96-96v-96h384v96c0 54 44 96 96 96s96-42 96-96v-84c74 26 128 96 128 180v640c0 106-86 192-192 192zM896 320h-768v512c0 36 28 64 64 64h640c36 0 64-28 64-64zM640 640h128v128h-128zM640 448h128v128h-128zM448 640h128v128h-128zM448 448h128v128h-128zM256 640h128v128h-128zM256 448h128v128h-128zM800 128c-18 0-32-14-32-32v-96h64v96c0 18-14 32-32 32zM224 128c-18 0-32-14-32-32v-96h64v96c0 18-14 32-32 32z"
+				],
+				"defaultCode": 55,
+				"grid": 0
+			},
+			"properties": {
+				"id": 62,
+				"order": 91,
+				"prevSize": 32,
+				"code": 55,
+				"name": "uni37",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 62
+		}
+	],
+	"height": 1024,
+	"metadata": {
+		"name": "wagtail",
+		"url": "http://wagtail.io",
+		"designer": "",
+		"designerURL": "",
+		"license": "",
+		"licenseURL": ""
+	},
+	"preferences": {
+		"showGlyphs": true,
+		"showQuickUse": true,
+		"fontPref": {
+			"prefix": "icon-",
+			"metadata": {
+				"fontFamily": "wagtail",
+				"majorVersion": 1,
+				"minorVersion": 0,
+				"fontURL": "http://wagtail.io",
+				"designer": "",
+				"designerURL": "",
+				"license": "",
+				"licenseURL": ""
+			},
+			"metrics": {
+				"emSize": 512,
+				"baseline": 6.25,
+				"whitespace": 50
+			},
+			"showVersion": true,
+			"showMetadata": true
+		},
+		"imagePref": {},
+		"historySize": 100,
+		"showCodes": true,
+		"search": "",
+		"gridSize": 16
+	}
+}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot
old mode 100644
new mode 100755
index f55be6906a2bfcc05ed4e43273c1ebe331ee1914..4de34cd4cc2c09dd87c64645cf56e85148197e11
GIT binary patch
literal 25964
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
Pm;MhEo0Yzw_VfP$gaF)m

literal 12996
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
M{x20+{{IpG4{pyskN^Mx

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
old mode 100644
new mode 100755
index 188de85f284..5cdb8e193e4
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
@@ -1,72 +1,73 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Generated by Fontastic.me</metadata>
+<metadata>Generated by IcoMoon</metadata>
 <defs>
 <font id="wagtail" horiz-adv-x="512">
-<font-face font-family="wagtail" units-per-em="512" ascent="480" descent="-32"/>
+<font-face units-per-em="512" ascent="480" descent="-32" />
 <missing-glyph horiz-adv-x="512" />
-
-<glyph unicode="&#97;" d="M239 256c0 19-7 35-20 48-13 14-29 20-48 20-19 0-35-6-49-20-13-13-20-29-20-48 0-19 7-35 20-48 14-14 30-20 49-20 19 0 35 6 48 20 13 13 20 29 20 48z m205-137c0 10-4 18-10 24-7 7-15 11-24 11-10 0-18-4-24-11-7-6-11-14-11-24 0-9 4-17 10-24 7-6 15-10 25-10 9 0 17 4 24 10 6 7 10 15 10 24z m0 274c0 9-4 17-10 24-7 6-15 10-24 10-10 0-18-4-24-10-7-7-11-15-11-24 0-10 4-18 10-25 7-6 15-10 25-10 9 0 17 4 24 10 6 7 10 15 10 25z m-103-113l0-49c0-2 0-4-2-5-1-2-2-3-4-3l-41-6c-2-7-5-13-9-21 6-8 14-18 24-30 2-2 2-4 2-6 0-2 0-4-2-5-4-5-11-13-22-24-10-10-17-16-21-16-2 0-3 1-5 2l-31 24c-6-3-13-6-20-8-2-19-4-33-7-41-1-5-3-7-8-7l-49 0c-2 0-4 1-5 2-2 2-3 3-3 5l-6 41c-6 2-13 4-20 8l-32-24c-1-1-3-2-5-2-2 0-4 1-6 3-25 23-38 37-38 42 0 2 1 4 2 5 2 3 5 8 11 14 5 7 9 13 12 17-4 8-7 15-9 22l-41 6c-1 0-3 1-4 3-1 1-2 3-2 5l0 49c0 2 1 4 2 5 1 2 3 3 4 3l41 6c2 7 5 13 9 21-6 8-14 18-24 30-1 2-2 4-2 6 0 2 1 4 2 5 4 5 11 13 22 24 11 10 18 16 21 16 2 0 4-1 6-2l30-24c6 3 13 6 21 8 2 19 4 33 6 41 1 5 4 7 8 7l49 0c2 0 4-1 6-2 1-2 2-3 2-5l7-41c6-2 12-4 20-8l31 24c1 1 3 2 5 2 2 0 4-1 6-3 26-23 38-37 38-42 0-2 0-4-1-5-3-3-6-8-12-15-5-6-9-12-12-16 4-8 7-16 9-22l41-6c2 0 3-1 4-3 2-1 2-3 2-5z m171-142l0-37c0-3-13-6-40-8-2-5-5-10-8-14 9-20 14-33 14-37 0-1 0-1-1-2-22-13-33-19-33-19-2 0-6 4-13 13-6 8-11 14-13 18-4-1-7-1-8-1-2 0-5 0-8 1-3-4-8-10-14-18-7-9-11-13-13-13 0 0-11 6-33 19 0 1-1 1-1 2 0 4 5 17 14 37-3 4-6 9-8 14-27 2-40 5-40 8l0 37c0 3 13 6 40 8 2 6 5 10 8 14-9 20-14 33-14 37 0 1 1 1 1 2 1 0 4 2 10 5 5 3 10 6 15 9 5 3 8 5 8 5 2 0 6-5 13-13 6-8 11-14 14-18 3 1 6 1 8 1 1 0 4 0 8-1 9 13 17 23 24 30l2 1c0 0 11-7 33-19 1-1 1-1 1-2 0-4-5-17-14-37 3-4 6-8 8-14 27-2 40-5 40-8z m0 273l0-37c0-3-13-6-40-8-2-5-5-10-8-14 9-20 14-33 14-37 0-1 0-1-1-2-22-13-33-19-33-19-2 0-6 4-13 13-6 8-11 14-13 18-4-1-7-1-8-1-2 0-5 0-8 1-3-4-8-10-14-18-7-9-11-13-13-13 0 0-11 6-33 19 0 1-1 1-1 2 0 4 5 17 14 37-3 4-6 9-8 14-27 2-40 5-40 8l0 37c0 3 13 6 40 8 2 6 5 10 8 14-9 20-14 33-14 37 0 1 1 1 1 2 1 0 4 2 10 5 5 4 10 7 15 9 5 3 8 5 8 5 2 0 6-4 13-13 6-8 11-14 14-18 3 1 6 1 8 1 1 0 4 0 8-1 9 13 17 23 24 30l2 1c0 0 11-7 33-19 1-1 1-1 1-2 0-4-5-17-14-37 3-4 6-8 8-14 27-2 40-5 40-8z"/>
-<glyph unicode="&#98;" d="M439 293l0-229c0-8-3-14-8-19-5-6-12-8-20-8l-310 0c-8 0-15 2-20 8-5 5-8 11-8 19l0 384c0 8 3 14 8 19 5 6 12 8 20 8l155 0 0-155c0-8 3-14 8-19 5-6 12-8 19-8z m-1 36l-145 0 0 146c15-3 28-9 37-19l89-89c10-10 16-22 19-38z"/>
-<glyph unicode="&#99;" d="M110 73l292 0 0 220-119 0c-7 0-14 2-19 8-5 5-8 11-8 19l0 119-146 0z m183 256l107 0c-2 6-4 10-6 12l-90 89c-2 3-6 5-11 7z m146-9l0-256c0-8-3-14-8-19-5-6-12-8-20-8l-310 0c-8 0-15 2-20 8-5 5-8 11-8 19l0 384c0 8 3 14 8 19 5 6 12 8 20 8l182 0c8 0 16-1 26-5 9-4 16-9 21-14l89-89c6-5 10-13 14-22 4-9 6-17 6-25z"/>
-<glyph unicode="&#100;" d="M140 73l26 26-67 67-26-26 0-30 37 0 0-37z m150 265c0 4-2 7-7 7-1 0-3-1-4-2l-155-155c-2-2-2-3-2-5 0-4 2-6 6-6 2 0 4 0 5 2l155 154c1 2 2 3 2 5z m-16 55l119-119-238-237-118 0 0 118z m195-27c0-10-3-19-10-26l-48-47-118 118 47 48c7 7 15 10 26 10 10 0 18-3 26-10l67-67c7-8 10-16 10-26z"/>
-<glyph unicode="&#101;" d="M399 174c0-3-1-5-3-7l-15-14c-1-2-4-3-6-3-3 0-5 1-7 3l-112 112-112-112c-2-2-4-3-7-3-2 0-5 1-6 3l-15 14c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3 2 0 5-1 7-3l133-133c2-2 3-4 3-6z"/>
-<glyph unicode="&#102;" d="M347 274c0 36-12 66-37 91-25 25-55 37-91 37-35 0-65-12-90-37-25-25-38-55-38-91 0-35 13-65 38-90 25-25 55-38 90-38 36 0 66 13 91 38 25 25 37 55 37 90z m147-237c0-10-4-19-11-26-7-7-16-11-26-11-10 0-19 4-26 11l-98 98c-34-24-72-36-114-36-27 0-53 5-78 16-25 11-46 25-64 43-18 18-32 39-43 64-10 25-16 51-16 78 0 28 6 54 16 78 11 25 25 47 43 65 18 18 39 32 64 43 25 10 51 15 78 15 28 0 54-5 79-15 24-11 46-25 64-43 18-18 32-40 43-65 10-24 16-50 16-78 0-42-12-80-36-114l98-98c7-7 11-15 11-25z"/>
-<glyph unicode="&#103;" d="M426 134c0-7-3-14-8-19l-39-39c-5-5-12-8-20-8-7 0-14 3-19 8l-84 84-84-84c-5-5-12-8-19-8-8 0-15 3-20 8l-39 39c-5 5-8 12-8 19 0 8 3 14 8 20l84 84-84 84c-5 5-8 12-8 19 0 8 3 14 8 20l39 38c5 6 12 8 20 8 7 0 14-2 19-8l84-84 84 84c5 6 12 8 19 8 8 0 15-2 20-8l39-38c5-6 8-12 8-20 0-7-3-14-8-19l-84-84 84-84c5-6 8-12 8-20z"/>
-<glyph unicode="&#105;" d="M475 247c0 6-5 9-14 9l-290 0c-7 0-15-2-23-6-8-4-15-8-19-14l-79-97c-3-4-4-7-4-10 0-6 4-10 14-10l290 0c7 0 15 2 23 6 8 4 14 9 19 14l78 97c3 4 5 8 5 11z m-304 43l204 0 0 43c0 7-2 13-7 18-5 5-11 7-18 7l-154 0c-7 0-13 3-18 8-5 5-7 11-7 18l0 17c0 7-3 13-8 18-5 5-11 8-18 8l-85 0c-7 0-13-3-18-8-5-5-8-11-8-18l0-227 68 84c8 9 19 17 31 23 13 6 26 9 38 9z m338-43c0-11-4-22-12-32l-79-97c-8-10-18-17-31-23-13-7-25-10-37-10l-290 0c-17 0-31 6-42 18-12 12-18 26-18 42l0 256c0 16 6 30 18 42 11 12 25 18 42 18l85 0c16 0 30-6 42-18 12-12 18-26 18-42l0-8 145 0c16 0 30-6 42-18 12-12 18-26 18-42l0-43 51 0c9 0 18-2 26-6 8-5 14-11 18-19 3-6 4-12 4-18z"/>
-<glyph unicode="&#106;" d="M494 338l0-201c0-17-7-32-19-45-13-13-28-19-45-19l-348 0c-17 0-32 6-45 19-12 13-19 28-19 45l0 274c0 18 7 33 19 46 13 12 28 18 45 18l92 0c17 0 32-6 45-18 12-13 19-28 19-46l0-9 192 0c17 0 32-6 45-19 12-12 19-27 19-45z"/>
-<glyph unicode="&#107;" d="M512 309l0-227c0-12-4-23-13-32-9-9-20-13-33-13l-420 0c-13 0-24 4-33 13-9 9-13 20-13 32l0 227c8-9 18-17 29-25 69-47 116-79 142-98 11-8 20-15 26-19 7-4 16-9 27-14 12-4 22-7 32-7l0 0c10 0 20 3 32 7 11 5 20 10 27 14 6 4 15 11 26 19 33 23 80 56 142 98 11 8 21 16 29 25z m0 84c0-15-5-29-14-43-9-14-21-25-35-35-71-50-116-81-134-93-1-1-6-4-12-9-6-4-11-8-15-11-4-2-9-5-15-9-6-3-11-6-16-8-6-1-10-2-15-2l0 0c-5 0-9 1-15 2-5 2-10 5-16 8-6 4-11 7-15 9-4 3-9 7-15 11-6 5-11 8-12 9-18 12-43 30-75 52-33 23-52 36-59 41-12 8-23 19-33 33-11 14-16 27-16 39 0 15 4 27 12 37 8 10 19 15 34 15l420 0c13 0 23-5 32-14 9-9 14-19 14-32z"/>
-<glyph unicode="&#108;" d="M347 421c0-5-1-10-5-13-4-4-8-6-13-6l-36 0 0-292 36 0c5 0 9-2 13-6 4-3 5-8 5-13 0-5-1-9-5-12l-73-74c-4-3-8-5-13-5-5 0-9 2-13 5l-73 74c-4 3-5 7-5 12 0 5 1 10 5 13 4 4 8 6 13 6l36 0 0 292-36 0c-5 0-9 2-13 6-4 3-5 8-5 13 0 5 1 9 5 12l73 74c4 3 8 5 13 5 5 0 9-2 13-5l73-74c4-3 5-7 5-12z"/>
-<glyph unicode="&#109;" d="M183 293l146 0 0 54c0 21-7 38-21 52-15 14-32 22-52 22-20 0-37-8-52-22-14-14-21-31-21-52z m238-28l0-164c0-8-3-15-8-20-6-5-12-8-20-8l-274 0c-8 0-14 3-20 8-5 5-8 12-8 20l0 164c0 8 3 14 8 20 6 5 12 8 20 8l9 0 0 54c0 35 13 66 38 91 25 25 55 37 90 37 35 0 65-12 90-37 25-25 38-56 38-91l0-54 9 0c8 0 14-3 20-8 5-6 8-12 8-20z"/>
-<glyph unicode="&#110;" d="M335 238c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3-2 0-5 1-7 3l-14 14c-2 2-3 4-3 7 0 2 1 5 3 6l112 113-112 112c-2 2-3 4-3 7 0 2 1 4 3 6l14 14c2 2 5 3 7 3 2 0 5-1 7-3l133-133c2-2 3-4 3-6z"/>
-<glyph unicode="&#104;" d="M366 174l0-19c0-2-1-4-3-6-2-2-4-3-6-3l-202 0c-2 0-4 1-6 3-2 2-3 4-3 6l0 19c0 2 1 5 3 6 2 2 4 3 6 3l202 0c2 0 4-1 6-3 2-1 3-4 3-6z m0 73l0-18c0-3-1-5-3-7-2-2-4-3-6-3l-202 0c-2 0-4 1-6 3-2 2-3 4-3 7l0 18c0 3 1 5 3 6 2 2 4 3 6 3l202 0c2 0 4-1 6-3 2-1 3-3 3-6z m-256-174l292 0 0 220-119 0c-7 0-14 2-19 8-5 5-8 11-8 19l0 119-146 0z m183 256l107 0c-2 6-4 10-6 12l-90 89c-2 3-6 5-11 7z m146-9l0-256c0-8-3-14-8-19-5-6-12-8-20-8l-310 0c-8 0-15 2-20 8-5 5-8 11-8 19l0 384c0 8 3 14 8 19 5 6 12 8 20 8l182 0c8 0 16-1 26-5 9-4 16-9 21-14l89-89c6-5 10-13 14-22 4-9 6-17 6-25z"/>
-<glyph unicode="&#111;" d="M171 341c0-14-5-26-15-36-10-10-22-15-37-15-14 0-26 5-36 15-10 10-15 22-15 36 0 15 5 27 15 37 10 10 22 15 36 15 15 0 27-5 37-15 10-10 15-22 15-37z m273-102l0-120-376 0 0 52 86 85 42-43 137 137z m25 188l-426 0c-3 0-5-1-6-3-2-2-3-4-3-6l0-324c0-2 1-4 3-6 1-2 3-3 6-3l426 0c3 0 5 1 6 3 2 2 3 4 3 6l0 324c0 2-1 4-3 6-1 2-3 3-6 3z m43-9l0-324c0-12-4-22-13-30-8-9-18-13-30-13l-426 0c-12 0-22 4-30 13-9 8-13 18-13 30l0 324c0 12 4 22 13 30 8 9 18 13 30 13l426 0c12 0 22-4 30-13 9-8 13-18 13-30z"/>
-<glyph unicode="&#112;" d="M494 347l0-73c0-5-2-9-6-13-3-3-8-5-13-5l-18 0c-5 0-9 2-13 5-3 4-5 8-5 13l0 73c0 21-7 38-22 52-14 14-31 22-51 22-20 0-38-8-52-22-14-14-21-31-21-52l0-54 27 0c8 0 14-3 19-8 6-6 8-12 8-20l0-164c0-8-2-15-8-20-5-5-11-8-19-8l-274 0c-8 0-14 3-20 8-5 5-8 12-8 20l0 164c0 8 3 14 8 20 6 5 12 8 20 8l192 0 0 54c0 36 12 66 37 91 25 25 55 37 91 37 35 0 65-12 90-37 25-25 38-55 38-91z"/>
-<glyph unicode="&#113;" d="M399 302c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3-2 0-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l15 15c1 1 4 2 6 2 3 0 5-1 7-2l112-113 112 113c2 1 4 2 7 2 2 0 5-1 6-2l15-15c2-2 3-4 3-6z"/>
-<glyph unicode="&#114;" d="M366 119l0 18c0 3-1 5-3 7-2 1-4 2-6 2l-202 0c-2 0-4-1-6-2-2-2-3-4-3-7l0-18c0-3 1-5 3-7 2-1 4-2 6-2l202 0c2 0 4 1 6 2 2 2 3 4 3 7z m0 73l0 18c0 3-1 5-3 7-2 2-4 2-6 2l-202 0c-2 0-4 0-6-2-2-2-3-4-3-7l0-18c0-3 1-5 3-7 2-1 4-2 6-2l202 0c2 0 4 1 6 2 2 2 3 4 3 7z m73 101l0-229c0-8-3-14-8-19-5-6-12-8-20-8l-310 0c-8 0-15 2-20 8-5 5-8 11-8 19l0 384c0 8 3 14 8 19 5 6 12 8 20 8l155 0 0-155c0-8 3-14 8-19 5-6 12-8 19-8z m-1 36l-145 0 0 146c15-3 28-9 37-19l89-89c10-10 16-22 19-38z"/>
-<glyph unicode="&#115;" d="M457 137l0 201c0 8-3 14-8 20-5 5-12 8-19 8l-201 0c-8 0-15 2-20 8-5 5-8 12-8 19l0 18c0 8-3 15-8 20-5 5-12 8-19 8l-92 0c-7 0-14-3-19-8-5-5-8-12-8-20l0-274c0-7 3-14 8-19 5-6 12-8 19-8l348 0c7 0 14 2 19 8 5 5 8 12 8 19z m37 201l0-201c0-17-7-32-19-45-13-13-28-19-45-19l-348 0c-17 0-32 6-45 19-12 13-19 28-19 45l0 274c0 18 7 33 19 46 13 12 28 18 45 18l92 0c17 0 32-6 45-18 12-13 19-28 19-46l0-9 192 0c17 0 32-6 45-19 12-12 19-27 19-45z"/>
-<glyph unicode="&#116;" d="M457 302l0-55c0-8-3-14-8-20-5-5-12-8-19-8l-119 0 0-118c0-8-3-15-8-20-5-5-12-8-20-8l-54 0c-8 0-15 3-20 8-5 5-8 12-8 20l0 118-119 0c-7 0-14 3-19 8-5 6-8 12-8 20l0 55c0 7 3 14 8 19 5 5 12 8 19 8l119 0 0 119c0 8 3 14 8 19 5 6 12 8 20 8l54 0c8 0 15-2 20-8 5-5 8-11 8-19l0-119 119 0c7 0 14-3 19-8 5-5 8-12 8-19z"/>
-<glyph unicode="&#117;" d="M165 384c0 10-4 19-11 26-7 7-16 11-26 11-10 0-19-4-26-11-7-7-11-16-11-26 0-10 4-19 11-26 7-7 16-11 26-11 10 0 19 4 26 11 7 7 11 16 11 26z m304-165c0-10-3-18-10-25l-140-141c-8-7-17-10-26-10-11 0-19 3-26 10l-204 205c-8 7-14 16-19 29-5 12-7 23-7 33l0 119c0 10 3 18 10 26 8 7 16 10 26 10l119 0c10 0 21-2 33-7 13-5 22-11 30-19l204-204c7-7 10-16 10-26z"/>
-<glyph unicode="&#118;" d="M501 241c0-5-3-11-8-18l-90-105c-7-9-18-17-32-23-14-7-26-10-38-10l-290 0c-6 0-12 1-16 4-5 2-8 6-8 11 0 6 3 12 9 18l89 105c8 10 19 17 32 24 14 6 27 9 39 9l290 0c6 0 11-1 16-3 5-3 7-7 7-12z m-91 92l0-43-222 0c-17 0-34-4-53-13-18-8-33-19-44-31l-89-106-2-2c0 1 0 2 0 4 0 1 0 2 0 3l0 256c0 16 6 30 18 42 11 12 25 18 42 18l85 0c16 0 30-6 42-18 12-12 18-26 18-42l0-8 145 0c16 0 30-6 42-18 12-12 18-26 18-42z"/>
-<glyph unicode="&#119;" d="M329 256c0 20-7 37-21 52-15 14-32 21-52 21-20 0-37-7-52-21-14-15-21-32-21-52 0-20 7-37 21-52 15-14 32-21 52-21 20 0 37 7 52 21 14 15 21 32 21 52z m146 31l0-63c0-3 0-5-2-7-1-2-3-3-6-4l-52-8c-4-10-8-19-12-26 7-9 17-22 31-39 2-2 3-5 3-7 0-3-1-5-3-7-5-7-14-17-28-31-14-13-23-20-27-20-2 0-5 1-7 3l-40 31c-8-5-17-8-26-11-3-26-6-44-8-53-1-6-5-8-10-8l-64 0c-2 0-5 0-7 2-2 2-3 4-3 6l-8 53c-9 3-18 6-26 10l-40-30c-2-2-4-3-7-3-3 0-5 1-7 3-24 22-40 38-47 48-2 2-2 4-2 7 0 2 0 4 2 6 3 4 8 11 14 19 7 9 12 16 16 21-5 9-9 19-12 28l-52 8c-3 0-5 1-6 3-2 2-2 4-2 7l0 63c0 3 0 5 2 7 1 2 3 3 5 4l53 8c3 8 7 17 12 26-8 11-18 24-31 39-2 3-3 5-3 7 0 2 1 4 3 7 5 7 14 17 28 30 14 14 23 21 27 21 2 0 5-1 7-3l40-31c8 5 17 8 26 11 3 26 6 44 8 53 1 6 5 8 10 8l64 0c2 0 5 0 7-2 2-2 3-4 3-6l8-53c9-3 18-6 26-10l40 30c2 2 4 3 7 3 3 0 5-1 7-3 25-23 41-39 47-49 2-1 2-3 2-6 0-2 0-4-2-6-3-4-8-11-14-19-7-9-12-16-16-21 5-9 9-18 12-28l52-8c3 0 5-1 6-3 2-2 2-4 2-7z"/>
-<glyph unicode="&#120;" d="M477 350c0-7-2-14-8-19l-206-207-39-39c-6-5-12-8-20-8-7 0-14 3-19 8l-142 142c-6 6-8 12-8 20 0 7 2 14 8 19l38 39c6 5 12 8 20 8 7 0 14-3 19-8l84-84 188 188c5 5 12 8 19 8 8 0 14-3 20-8l38-39c6-6 8-12 8-20z"/>
-<glyph unicode="&#122;" d="M344 357c0-3-1-5-3-7l-112-112 112-113c2-1 3-4 3-6 0-3-1-5-3-7l-14-14c-2-2-5-3-7-3-2 0-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3 2 0 5-1 7-3l14-14c2-2 3-4 3-6z"/>
-<glyph unicode="&#65;" d="M232 141l176 175c3 4 5 8 5 13 0 5-2 9-5 13l-29 29c-4 4-8 6-13 6-5 0-10-2-13-6l-134-133-60 60c-3 4-8 5-13 5-5 0-9-1-13-5l-29-29c-3-4-5-8-5-13 0-5 2-9 5-13l103-102c3-4 7-6 12-6 5 0 10 2 13 6z m243 252l0-274c0-23-8-42-24-58-16-16-35-24-58-24l-274 0c-23 0-42 8-58 24-16 16-24 35-24 58l0 274c0 23 8 42 24 58 16 16 35 24 58 24l274 0c23 0 42-8 58-24 16-16 24-35 24-58z"/>
-<glyph unicode="&#66;" d="M384 238l0 36c0 5-2 10-5 13-4 4-8 6-13 6l-73 0 0 73c0 5-2 9-6 13-3 3-8 5-13 5l-36 0c-5 0-10-2-13-5-4-4-6-8-6-13l0-73-73 0c-5 0-9-2-13-6-3-3-5-8-5-13l0-36c0-5 2-10 5-13 4-4 8-6 13-6l73 0 0-73c0-5 2-9 6-13 3-3 8-5 13-5l36 0c5 0 10 2 13 5 4 4 6 8 6 13l0 73 73 0c5 0 9 2 13 6 3 3 5 8 5 13z m91 18c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
-<glyph unicode="&#68;" d="M173 54c-80 23-309 124-49 458 140-95 194-179 204-248-67-24-113-71-107-156-37 87-66 208-78 283-6-88 7-244 30-337m89-21c-19 53-59 228 241 219 9-275-137-265-202-246 27 53 62 101 106 141-54-30-103-68-145-114"/>
-<glyph unicode="&#67;" d="M213 77c15-6 28-9 40-9 25 0 46 4 62 12 16 8 28 19 35 32 7 14 11 31 11 52 0 22-4 39-12 51-11 18-24 30-40 36-15 7-39 10-71 10-14 0-23-1-29-3l0-41 0-50 1-77c0-3 1-7 3-13z m-4 214c9-2 19-2 32-2 33 0 58 6 75 18 17 13 25 34 25 64 0 21-8 39-24 54-16 14-40 21-73 21-10 0-22-1-37-4 0-8 0-15 1-22 1-23 2-50 1-79l0-28c0-9 0-16 0-22z m-154-254l0 26c9 2 15 3 20 4 15 2 26 5 35 9 3 5 5 10 6 14 2 13 3 31 3 56l-1 142c-1 48-2 87-3 115 0 17-1 27-3 31 0 1-1 2-3 4-4 2-10 3-20 4-6 0-16 2-32 4l-2 23 75 2 108 4 13 0c1 0 2 0 4 0 2 0 3 0 4 0 0 0 2 0 6 0 4 0 8 0 12 0l21 0c17 0 35-2 55-8 8-2 17-6 27-11 11-5 21-12 29-21 9-9 15-19 19-30 4-11 6-23 6-35 0-13-3-26-9-37-7-11-16-21-28-30-5-3-19-11-42-22 33-7 59-21 76-41 17-20 26-43 26-68 0-14-3-30-8-46-4-12-11-23-20-33-13-14-26-24-40-31-14-7-34-13-58-17-16-3-35-4-57-3l-56 1c-16 0-45-1-85-3-7-1-33-2-78-3z"/>
-<glyph unicode="&#69;" d="M110 37l5 24c0 1 8 3 22 6 14 4 25 7 33 11 5 7 9 17 11 29l8 40 16 76 4 19c1 8 3 16 4 24 2 8 4 14 5 19 1 5 3 9 4 13 1 4 1 7 2 9 1 2 1 3 1 3l8 45 5 18 6 39 3 14 0 11c-8 4-22 7-42 8-5 0-9 1-10 1l5 29 91-4c7 0 14 0 20 0 13 0 33 1 62 2 6 1 12 1 19 2 7 0 10 0 10 0 0-3-1-7-1-10-2-6-3-11-4-15-11-4-21-7-31-9-12-3-22-6-29-9-2-6-5-14-7-25-2-8-3-16-4-23-8-38-14-67-19-88l-17-89-11-45-12-67-4-13c0-1 0-4 1-7 12-3 23-5 34-6 7-1 13-2 19-3-1-6-1-11-2-17-2-6-3-10-3-12-3 0-6 0-7 0-4 0-8 0-12 0-1 0-4 0-8 0-3 1-17 3-41 5l-57 1c-7 0-24-1-49-3-14-2-24-2-28-3z"/>
-<glyph unicode="&#70;" d="M110 110c0-16-6-28-16-39-11-11-24-16-39-16-15 0-28 5-39 16-11 11-16 23-16 39 0 15 5 28 16 39 11 10 24 16 39 16 15 0 28-6 39-16 10-11 16-24 16-39z m0 146c0-15-6-28-16-39-11-11-24-16-39-16-15 0-28 5-39 16-11 11-16 24-16 39 0 15 5 28 16 39 11 11 24 16 39 16 15 0 28-5 39-16 10-11 16-24 16-39z m402-119l0-55c0-2-1-4-3-6-2-2-4-3-6-3l-348 0c-2 0-4 1-6 3-2 2-3 4-3 6l0 55c0 3 1 5 3 7 2 1 4 2 6 2l348 0c2 0 4-1 6-2 2-2 3-4 3-7z m-402 265c0-15-6-28-16-39-11-10-24-16-39-16-15 0-28 6-39 16-11 11-16 24-16 39 0 16 5 28 16 39 11 11 24 16 39 16 15 0 28-5 39-16 10-11 16-23 16-39z m402-119l0-54c0-3-1-5-3-7-2-2-4-3-6-3l-348 0c-2 0-4 1-6 3-2 2-3 4-3 7l0 54c0 3 1 5 3 7 2 2 4 3 6 3l348 0c2 0 4-1 6-3 2-2 3-4 3-7z m0 147l0-55c0-3-1-5-3-7-2-1-4-2-6-2l-348 0c-2 0-4 1-6 2-2 2-3 4-3 7l0 55c0 2 1 4 3 6 2 2 4 3 6 3l348 0c2 0 4-1 6-3 2-2 3-4 3-6z"/>
-<glyph unicode="&#71;" d="M109 49c0-15-5-27-16-36-10-9-23-13-38-13-21 0-37 6-50 19l17 25c9-9 19-13 30-13 6 0 10 2 14 4 5 3 7 7 7 12 0 13-10 18-30 16l-8 16c2 2 5 6 9 13 5 6 9 11 13 15 3 4 7 8 10 11l0 1c-3 0-8-1-14-1-6 0-11 0-14 0l0-15-30 0 0 43 95 0 0-25-27-33c10-2 18-7 23-14 6-7 9-15 9-25z m0 179l0-45-103 0c-1 7-2 12-2 15 0 10 3 19 7 27 4 8 10 14 16 19 6 5 13 10 19 14 6 4 12 8 16 12 5 4 7 9 7 13 0 5-2 9-4 11-3 3-7 4-12 4-8 0-16-6-23-17l-24 17c5 10 11 18 20 23 9 5 20 8 31 8 13 0 25-4 35-12 9-8 14-18 14-32 0-9-3-18-10-26-6-8-13-14-21-18-8-5-15-10-22-15-6-5-10-10-10-15l36 0 0 17z m403-91l0-55c0-2-1-4-3-6-2-2-4-3-6-3l-348 0c-2 0-4 1-6 3-2 2-3 4-3 6l0 55c0 3 1 5 3 7 2 1 4 2 6 2l348 0c2 0 4-1 6-2 2-2 3-4 3-7z m-402 257l0-28-96 0 0 28 31 0c0 8 0 19 0 35 0 15 0 27 0 34l0 4-1 0c-1-3-6-9-14-16l-20 22 39 36 30 0 0-115z m402-111l0-54c0-3-1-5-3-7-2-2-4-3-6-3l-348 0c-2 0-4 1-6 3-2 2-3 4-3 7l0 54c0 3 1 5 3 7 2 2 4 3 6 3l348 0c2 0 4-1 6-3 2-2 3-4 3-7z m0 147l0-55c0-3-1-5-3-7-2-1-4-2-6-2l-348 0c-2 0-4 1-6 2-2 2-3 4-3 7l0 55c0 2 1 4 3 6 2 2 4 3 6 3l348 0c2 0 4-1 6-3 2-2 3-4 3-6z"/>
-<glyph unicode="&#72;" d="M475 256c0-30-5-58-17-85-12-27-27-51-47-70-19-20-43-35-70-47-27-12-55-17-85-17-33 0-64 6-93 20-30 14-55 34-76 59-1 2-2 4-2 6 0 3 1 4 3 6l39 39c2 2 4 3 7 3 3 0 5-2 7-3 13-19 31-33 51-42 20-10 41-15 64-15 20 0 39 4 57 11 18 8 33 18 46 32 14 13 24 28 32 46 7 18 11 37 11 57 0 20-4 39-11 57-8 18-18 33-32 46-13 14-28 24-46 32-18 7-37 11-57 11-19 0-37-3-54-10-17-7-32-16-45-29l39-39c6-6 7-13 4-20-4-8-9-11-17-11l-128 0c-5 0-9 1-13 5-4 4-5 8-5 13l0 128c0 8 3 13 11 17 7 3 14 2 20-4l37-37c20 19 44 34 70 45 26 10 53 15 81 15 30 0 58-5 85-17 27-12 51-27 70-47 20-19 35-43 47-70 12-27 17-55 17-85z"/>
-<glyph unicode="&#73;" d="M475 439l0-128c0-5-1-9-5-13-4-4-8-5-13-5l-128 0c-8 0-13 3-17 11-3 7-2 14 4 20l40 39c-28 26-62 39-100 39-20 0-39-4-57-11-18-8-33-18-46-32-14-13-24-28-32-46-7-18-11-37-11-57 0-20 4-39 11-57 8-18 18-33 32-46 13-14 28-24 46-32 18-7 37-11 57-11 23 0 44 5 64 15 20 9 38 23 51 42 2 1 4 3 7 3 3 0 5-1 7-3l39-39c2-2 3-3 3-6 0-2-1-4-2-6-21-25-46-45-76-59-29-14-60-20-93-20-30 0-58 5-85 17-27 12-51 27-70 47-20 19-35 43-47 70-12 27-17 55-17 85 0 30 5 58 17 85 12 27 27 51 47 70 19 20 43 35 70 47 27 12 55 17 85 17 28 0 55-5 81-15 26-11 50-26 70-45l37 37c6 6 12 7 20 4 8-4 11-9 11-17z"/>
-<glyph unicode="&#74;" d="M434 165c0 7-2 14-8 19l-59 59c-5 6-12 8-20 8-8 0-14-3-20-9 0 0 2-2 5-5 3-3 5-5 6-6 1-1 3-3 5-6 2-2 3-4 3-7 1-2 1-5 1-8 0-7-2-14-8-19-5-5-11-8-19-8-3 0-5 0-8 1-2 1-5 2-7 4-3 1-4 3-6 4-1 1-3 3-6 6-3 3-4 5-5 5-6-5-9-12-9-20 0-8 2-15 8-20l58-59c6-5 12-8 20-8 7 0 14 3 19 8l42 41c6 6 8 12 8 20z m-201 201c0 8-2 14-8 19l-58 60c-6 5-12 8-20 8-7 0-14-3-19-8l-42-42c-6-5-8-12-8-19 0-8 2-14 8-19l59-60c5-5 12-8 20-8 8 0 14 3 20 9 0 1-2 3-5 6-3 3-5 5-6 6-1 1-3 3-5 5-2 3-3 5-3 7-1 3-1 5-1 8 0 8 2 14 8 20 5 5 11 8 19 8 3 0 5-1 8-1 2-1 5-2 7-4 3-2 4-3 6-4 1-1 3-3 6-6 3-3 4-5 5-6 6 6 9 13 9 21z m256-201c0-23-8-43-24-58l-42-42c-16-16-35-24-58-24-23 0-43 8-58 24l-59 60c-16 15-24 35-24 58 0 23 8 43 25 59l-25 25c-16-16-36-25-59-25-23 0-43 8-59 24l-59 60c-16 16-24 35-24 58 0 23 8 42 24 58l42 42c16 16 35 23 58 23 23 0 43-8 58-24l59-59c16-16 24-35 24-58 0-23-8-43-25-60l25-25c16 17 36 25 59 25 23 0 43-8 59-24l59-59c16-16 24-36 24-58z"/>
-<glyph unicode="&#75;" d="M475 256c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
-<glyph unicode="&#76;" d="M256 411c-28 0-54-7-78-20-24-14-43-33-57-57-13-24-20-50-20-78 0-28 7-54 20-78 14-24 33-43 57-57 24-13 50-20 78-20 28 0 54 7 78 20 24 14 43 33 57 57 13 24 20 50 20 78 0 28-7 54-20 78-14 24-33 43-57 57-24 13-50 20-78 20z m219-155c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
-<glyph unicode="&#77;" d="M479 165c0-11-4-19-11-26l-21-22c-8-7-16-10-26-10-11 0-19 3-26 10l-139 139-139-139c-7-7-15-10-26-10-10 0-18 3-25 10l-22 22c-7 7-11 15-11 26 0 10 4 18 11 26l186 186c7 7 16 10 26 10 10 0 19-3 26-10l186-186c7-8 11-16 11-26z"/>
-<glyph unicode="&#78;" d="M479 311c0-10-4-19-11-26l-186-186c-7-7-16-11-26-11-10 0-19 4-26 11l-186 186c-7 7-11 16-11 26 0 10 4 19 11 26l21 21c8 7 17 11 26 11 11 0 19-4 26-11l139-139 139 139c7 7 15 11 26 11 9 0 18-4 26-11l21-21c7-8 11-16 11-26z"/>
-<glyph unicode="&#79;" d="M158 256c-29-1-52-12-71-34l-35 0c-15 0-27 3-37 11-10 7-15 17-15 31 0 63 11 94 33 94 1 0 5-1 12-5 6-4 15-8 26-12 10-3 21-5 31-5 12 0 24 2 36 6-1-7-1-13-1-18 0-24 7-47 21-68z m286-170c0-21-7-38-20-50-13-13-30-19-51-19l-234 0c-21 0-38 6-51 19-13 12-20 29-20 50 0 10 1 19 1 28 1 9 2 18 4 29 2 10 4 20 7 29 3 9 7 17 11 26 5 8 11 15 17 21 6 6 14 11 23 15 9 3 19 5 30 5 1 0 5-2 11-6 6-4 12-8 19-13 8-4 17-9 29-12 12-4 24-6 36-6 12 0 24 2 36 6 12 3 21 8 29 12 7 5 13 9 19 13 6 4 10 6 11 6 11 0 21-2 30-5 9-4 17-9 23-15 6-6 12-13 17-21 4-9 8-17 11-26 3-9 5-19 7-29 2-11 3-20 4-29 0-9 1-18 1-28z m-273 341c0-19-7-35-20-49-14-13-30-20-49-20-18 0-35 7-48 20-13 14-20 30-20 49 0 19 7 35 20 48 13 13 30 20 48 20 19 0 35-7 49-20 13-13 20-29 20-48z m187-103c0-28-10-52-30-72-20-20-44-30-72-30-28 0-52 10-72 30-20 20-30 44-30 72 0 29 10 53 30 73 20 20 44 30 72 30 28 0 52-10 72-30 20-20 30-44 30-73z m154-60c0-14-5-24-15-31-10-8-22-11-37-11l-35 0c-19 22-42 33-71 34 14 21 21 44 21 68 0 5 0 11-1 18 12-4 24-6 36-6 10 0 21 2 31 5 11 4 20 8 26 12 7 4 11 5 12 5 22 0 33-31 33-94z m-34 163c0-19-7-35-20-49-13-13-30-20-48-20-19 0-35 7-49 20-13 14-20 30-20 49 0 19 7 35 20 48 14 13 30 20 49 20 18 0 35-7 48-20 13-13 20-29 20-48z"/>
-<glyph unicode="&#80;" d="M375 256c0-7-3-12-9-16l-156-91c-3-2-6-3-9-3-3 0-6 1-9 3-6 3-9 9-9 16l0 182c0 7 3 13 9 16 6 4 12 4 18 0l156-91c6-4 9-9 9-16z m36 0c0 28-7 54-20 78-14 24-33 43-57 57-24 13-50 20-78 20-28 0-54-7-78-20-24-14-43-33-57-57-13-24-20-50-20-78 0-28 7-54 20-78 14-24 33-43 57-57 24-13 50-20 78-20 28 0 54 7 78 20 24 14 43 33 57 57 13 24 20 50 20 78z m64 0c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
-<glyph unicode="&#81;" d="M238 366c0 15-6 28-16 39-11 10-24 16-39 16-15 0-28-6-39-16-11-11-16-24-16-39 0-8 2-16 5-24-7 4-15 5-23 5-16 0-28-5-39-16-11-10-16-23-16-38 0-16 5-29 16-39 11-11 23-16 39-16 15 0 28 5 39 16 10 10 16 23 16 39 0 8-2 15-6 23 8-3 16-5 24-5 15 0 28 5 39 16 10 11 16 23 16 39z m243-201c0-4-5-10-14-19-9-10-16-14-19-14-2 0-4 1-8 4-4 3-7 6-11 10-3 3-6 7-11 11-4 5-6 7-7 8l-27-28 63-63c5-5 8-12 8-19 0-8-4-16-11-23-8-8-15-11-23-11-8 0-15 2-20 8l-192 191c-33-25-68-37-104-37-31 0-56 10-76 29-19 20-29 45-29 76 0 30 9 60 27 89 18 30 42 53 71 71 29 18 59 27 89 27 31 0 57-9 76-29 20-19 30-45 30-76 0-36-13-70-38-104l102-101 27 27c-1 1-3 3-7 7-5 4-9 8-12 11-3 3-6 7-9 10-3 4-5 7-5 9 0 3 5 9 14 18 9 10 16 14 19 14 2 0 5-1 7-2 1-2 5-6 13-13 7-7 15-15 23-23 8-8 16-16 25-24 8-9 15-16 21-23 5-6 8-10 8-11z"/>
-<glyph unicode="&#121;" d="M392 142c70-24 105-45 105-62 0 0 0-54 0-54 0 0-241 0-241 0 0 0-241 0-241 0 0 0 0 54 0 54 0 17 35 38 105 62 32 12 54 24 65 36 12 12 18 28 18 48 0 8-4 16-12 25-7 10-12 22-16 38-1 4-2 7-5 9-2 2-4 3-7 4-2 1-4 4-7 9-2 5-4 12-4 22 0 5 0 10 2 13 2 4 3 6 5 6 0 0 2 2 2 2-3 17-5 32-6 45-2 19 5 38 21 58 15 19 42 29 80 29 38 0 65-10 81-29 16-20 22-39 20-58 0 0-6-45-6-45 6-2 9-10 9-21 0-10-2-17-4-22-3-5-5-8-7-9-3-1-5-2-7-4-3-2-4-5-5-9-3-17-8-29-16-38-8-9-12-17-12-25 0-20 6-36 18-48 12-12 34-24 65-36"/>
-<glyph unicode="&#82;" d="M440 389l-188 0c-10 12-20 25-23 28-2 6-8 10-14 10l-75 0c-5 0-9-3-13-6l-25-32-30 0c-16 0-28-13-28-28l0-248c0-15 12-28 28-28l368 0c16 0 28 13 28 28l0 248c0 15-12 28-28 28z"/>
-<glyph unicode="&#84;" d="M421 137c0 12-4 23-12 33-9 10-19 15-30 15-10 0-18-3-24-10-5-7-8-16-8-27 0-11 3-20 10-27 7-8 17-11 30-11 9 0 17 2 24 7 7 6 10 12 10 20z m-174-36c0-3-1-5-3-7l-91-91c-2-2-4-3-7-3-2 0-4 1-6 3l-92 91c-3 3-3 6-2 10 2 4 5 6 9 6l55 0 0 393c0 3 1 5 2 6 2 2 4 3 7 3l55 0c2 0 5-1 6-3 2-1 3-3 3-6l0-393 55 0c2 0 5-1 6-3 2-2 3-4 3-6z m214 19c0-12-1-23-4-34-2-12-6-23-11-33-6-10-12-19-20-27-7-8-17-14-28-19-11-5-23-7-36-7-12 0-22 2-31 5-5 1-9 3-12 4l11 32c3-1 6-2 9-3 7-2 14-4 21-4 16 0 29 6 39 17 9 11 16 25 19 42l-1 0c-4-5-10-8-17-11-8-3-16-4-25-4-20 0-36 7-49 20-13 14-19 30-19 50 0 20 7 37 20 51 14 13 31 20 52 20 24 0 43-9 59-27 15-18 23-42 23-72z m-8 205l0-32-134 0 0 32 47 0 0 124c0 1 0 3 0 5 1 2 1 4 1 5l0 4-1 0-2-3c-2-2-4-5-7-9l-18-16-24 24 55 53 35 0 0-187z"/>
-<glyph unicode="&#87;" d="M421 229l0-138c0-5-2-9-6-12-3-4-8-6-13-6l-109 0 0 110-74 0 0-110-109 0c-5 0-10 2-13 6-4 3-6 7-6 12l0 138c0 0 0 0 1 0 0 1 0 1 0 1l164 136 164-136c0 0 1-1 1-1z m63 19l-17-21c-2-2-4-3-6-3l-1 0c-3 0-5 1-6 2l-198 165-198-165c-2-2-4-2-7-2-2 0-4 1-6 3l-17 21c-2 2-2 4-2 7 0 3 1 5 3 6l205 171c6 5 14 8 22 8 8 0 16-3 22-8l69-58 0 56c0 2 1 5 3 6 2 2 4 3 7 3l54 0c3 0 5-1 7-3 2-1 3-4 3-6l0-117 62-52c2-1 3-3 3-6 0-3 0-5-2-7z"/>
-<glyph unicode="&#88;" d="M365 141c1-4 1-7-2-10l-100-110c-1-2-4-3-6-3-3 0-5 1-7 3l-101 110c-3 3-3 6-2 10 2 3 5 5 8 5l64 0 0 357c0 3 1 5 3 6 2 2 4 3 7 3l54 0c3 0 5-1 7-3 2-1 3-3 3-6l0-357 64 0c4 0 6-2 8-5z"/>
-<glyph unicode="&#89;" d="M365 371c-2-3-5-5-8-5l-64 0 0-357c0-3-1-5-3-6-2-2-4-3-7-3l-54 0c-3 0-5 1-7 3-2 1-3 3-3 6l0 357-64 0c-4 0-6 2-8 5-1 4-1 7 2 10l100 110c1 2 4 3 6 3 3 0 5-1 7-3l101-110c3-3 3-6 2-10z"/>
-<glyph unicode="&#90;" d="M201 302l0-165c0-3-1-5-2-6-2-2-4-3-7-3l-18 0c-3 0-5 1-7 3-2 1-2 3-2 6l0 165c0 2 0 5 2 6 2 2 4 3 7 3l18 0c3 0 5-1 7-3 1-1 2-4 2-6z m73 0l0-165c0-3-1-5-2-6-2-2-4-3-7-3l-18 0c-3 0-5 1-7 3-1 1-2 3-2 6l0 165c0 2 1 5 2 6 2 2 4 3 7 3l18 0c3 0 5-1 7-3 1-1 2-4 2-6z m73 0l0-165c0-3 0-5-2-6-2-2-4-3-7-3l-18 0c-3 0-5 1-7 3-1 1-2 3-2 6l0 165c0 2 1 5 2 6 2 2 4 3 7 3l18 0c3 0 5-1 7-3 2-1 2-4 2-6z m37-207l0 271-256 0 0-271c0-4 1-8 2-12 1-3 3-6 4-7 2-2 3-3 3-3l238 0c0 0 1 1 3 3 1 1 3 4 4 7 1 4 2 8 2 12z m-192 307l128 0-14 34c-1 1-3 2-5 3l-90 0c-2-1-4-2-5-3z m265-9l0-18c0-3-1-5-2-7-2-1-4-2-7-2l-27 0 0-271c0-16-5-30-14-41-9-12-20-17-32-17l-238 0c-12 0-23 5-32 16-9 11-14 25-14 41l0 272-27 0c-3 0-5 1-7 2-1 2-2 4-2 7l0 18c0 3 1 5 2 7 2 1 4 2 7 2l88 0 20 48c3 7 8 13 16 18 7 5 15 7 22 7l92 0c7 0 15-2 22-7 8-5 13-11 16-18l20-48 88 0c3 0 5-1 7-2 1-2 2-4 2-7z"/>
-<glyph unicode="&#86;" d="M370 400c0-4-3-8-8-8-4 0-8 4-8 8 0 5 4 8 8 8 5 0 8-3 8-8m3-76c0 0-11 50-77 37-6 23-5 40 9 55 20 21 52 10 52 10l0 17c-11 5-22 6-33 6-43 0-67-32-77-54l-119-219 34 6-62-119 43 8 33 93c93 0 213 34 197 160m40 42l-26 26-21-26z m-222-175c0 0 4 1 9 2 5 2 13 3 22 6 5 1 10 3 15 4 5 2 11 4 16 6 6 3 11 5 16 8 6 3 11 7 16 10 1 1 3 2 4 3l3 3c3 3 5 5 7 7 2 2 4 5 6 7 1 1 2 2 3 4l1 2 1 1c1 2 2 3 2 4 1 1 2 3 2 4 1 1 1 1 1 2 1 0 1 1 1 2 1 1 1 2 2 3 1 3 2 5 3 8 0 2 1 4 2 7 0 2 1 4 1 6 0 2 1 4 1 6 0 2 1 4 1 6 0 1 0 3 0 4 0 5 1 9 1 9l5-1c0 0-1-3-1-8 0-2-1-3-1-5 0-2 0-4-1-5 0-2 0-4-1-7 0-2-1-4-1-6-1-3-2-5-3-8-1-2-2-5-3-7 0-1-1-3-2-4 0-1 0-1-1-2 0-1 0-1-1-2 0-1-1-2-2-4-1-1-1-2-2-3-1-1-1-2-1-2l-2-2c-1-1-2-3-3-4-2-2-4-5-6-7-2-2-4-4-7-7l-3-3c-2-1-3-1-4-2-6-4-11-8-17-11-5-2-11-5-16-7-6-2-11-4-17-6-5-1-10-3-15-4-9-2-17-4-22-5-5-1-9-2-9-2"/>
-<glyph unicode="&#49;" d="M75 75c-48 48-75 113-75 181 0 141 115 256 256 256l32-32-32-32c-106 0-192-86-192-192 0-51 20-100 56-136l-39-5z m181-75l-32 32 32 32c106 0 192 86 192 192 0 51-20 100-56 136l39 5 6 40c48-48 75-113 75-181 0-141-115-256-256-256z"/>
-<glyph unicode="&#85;" d="M218 63c0-35-29-63-64-63-35 0-64 28-64 63 0 36 29 64 64 64 35 0 64-28 64-64z m0 193c0-35-29-64-64-64-35 0-64 29-64 64 0 35 29 64 64 64 35 0 64-29 64-64z m0 193c0-36-29-64-64-64-35 0-64 28-64 64 0 35 29 63 64 63 35 0 64-28 64-63z m204-386c0-35-29-63-64-63-35 0-64 28-64 63 0 36 29 64 64 64 35 0 64-28 64-64z m0 193c0-35-29-64-64-64-35 0-64 29-64 64 0 35 29 64 64 64 35 0 64-29 64-64z m0 193c0-36-29-64-64-64-35 0-64 28-64 64 0 35 29 63 64 63 35 0 64-28 64-63z"/>
-<glyph unicode="&#51;" d="M332 426l0-94 49 0 0-98-192 0 0 55-152-102 152-101 0 54 286 0 0 286z"/>
-<glyph unicode="&#50;" d="M192 320l-192 0 149-109-54-179 153 107 168-107-69 179 165 109-192 0-72 184z"/>
-<glyph unicode="&#53;" d="M135 456l241 0 0-23-241 0z m270-177l-127-124 0 222-45 0 0-220-125 122-33-32 181-181 181 181z"/>
-<glyph unicode="&#54;" d="M136 456l241 0 0-23-241 0z m-28-302l126 124 0-222 45 0 0 220 126-122 32 32-181 181-181-181z"/>
-<glyph unicode="&#48;" d="M346 321c0-2 0-4 0-6 0-2-1-4-1-7 0-2-1-5-1-7-1-3-2-6-2-9-1-3-2-6-3-9-1-3-2-6-3-10-1-1-2-3-2-4-1-1-1-2-1-3-1-1-1-1-2-2-1-2-1-3-2-5-1-2-2-3-3-5l-2-2-1-3c-1-1-2-3-4-4-2-3-4-7-7-9-3-3-6-6-9-9l-4-4c-2-1-3-2-5-4-6-5-13-9-20-13-7-4-14-7-21-10-7-3-14-6-21-8-6-2-12-4-18-6-12-3-22-5-29-7-7-2-11-2-11-2 0 0 4 0 11 2 7 1 17 3 29 6 6 2 12 3 19 5 7 2 14 5 21 8 7 3 14 6 21 10 7 3 14 8 21 13 2 1 3 2 5 3l5 4c3 3 6 6 8 9 3 3 6 6 8 9 2 2 3 3 4 5l2 2c0 1 1 2 1 3 1 1 2 3 4 5 0 1 1 3 2 5 1 0 1 1 2 2 0 1 0 2 1 3 1 1 1 3 2 5 2 3 3 6 4 9 1 4 2 7 3 10 1 3 1 6 2 8 1 3 1 6 2 8 0 3 0 5 1 7 0 3 0 5 0 6 1 8 1 12 1 12l-6 0c0 0 0-4-1-11m112 80l-34 33c-1 33-22 55-32 61-10 9-33 16-59 13-25-4-61-17-86-64-49-92-154-289-155-291-1 0-1-1 0-1 0-1 1-1 1-1l40 7-78-151c0-1 0-1 1-2 0 0 0 0 1 0 0 0 0 0 0 0l56 10c0 0 1 0 1 1l41 120c105 1 178 26 218 77 42 54 36 122 29 154l-5 31 60 0c0 0 1 0 1 1 1 0 0 1 0 2m-55 42c0-5-5-10-10-10-6 0-10 5-10 10 0 6 4 11 10 11 5 0 10-5 10-11m-33-228c-40-50-112-75-216-75-1 0-1-1-1-2l-42-120-51-9 78 151c0 1 0 1 0 2-1 0-1 1-2 1l-40-8c14 26 109 202 154 287 25 46 59 59 83 62 25 3 46-3 56-10l0-22c-2 0-16 5-29 5-13 0-28-5-37-15-16-18-20-36-12-66 54 10 78-13 87-27 7-30 15-99-28-154m29 186l23 30 30-30z"/>
-<glyph unicode="&#63;" d="M253 492c65 0 120-22 167-67 46-45 70-100 72-165 0-65-22-121-68-167-45-47-100-71-165-73-65 0-121 22-167 68-47 45-71 100-72 165-1 65 21 121 67 167 46 47 101 71 166 72m-1-379c10 0 19 3 25 9 6 7 10 15 10 24 0 11-2 19-9 26-6 6-15 9-25 9 0 0-1 0-1 0-10 0-18-3-24-9-7-6-10-14-11-24 0-10 3-18 10-25 6-6 14-10 24-10 0 0 1 0 1 0m85 168c9 11 13 24 13 40 0 26-9 46-27 59-18 13-41 19-69 19-22 0-40-4-53-13-24-14-36-39-37-75 0 0 0-2 0-2 0 0 56 0 56 0 0 0 0 2 0 2 0 9 3 18 8 28 6 8 15 12 28 12 14 0 23-3 27-10 5-7 8-14 8-23 0-6-3-13-8-20-3-4-7-8-11-10 0 0-3-2-3-2-2-2-4-4-8-6-3-2-7-5-10-8-4-2-7-5-11-8-4-3-7-6-9-9-4-7-7-20-9-40 0 0 0-4 0-4 0 0 56 0 56 0 0 0 0 2 0 2 0 4 0 9 2 14 2 7 6 13 14 19 0 0 14 9 14 9 16 12 25 20 29 26"/>
-<glyph unicode="&#33;" d="M499 65c4-6 4-12 0-18-3-5-8-8-15-8 0 0-457 0-457 0-6 0-11 3-14 8-4 6-4 12-1 18 0 0 228 400 228 400 3 6 8 9 16 9 7 0 12-3 15-9 0 0 228-400 228-400m-215 25c0 0 0 51 0 51 0 0-56 0-56 0 0 0 0-51 0-51 0 0 56 0 56 0m0 89c0 0 0 154 0 154 0 0-56 0-56 0 0 0 0-154 0-154 0 0 56 0 56 0"/>
-<glyph unicode="&#57;" d="M256 512c-141 0-256-115-256-256 0-141 115-256 256-256 141 0 256 115 256 256 0 141-115 256-256 256z m-40-374l-117 118 45 45 72-73 154 154 45-45z"/>
-<glyph unicode="&#52;" d="M256 309c8 0 15-1 22-4 7-3 13-6 18-11 5-5 9-11 11-17 3-7 5-14 5-21 0-7-2-14-5-21-2-6-6-12-11-17-5-5-11-8-18-11-7-3-14-4-22-4-8 0-15 1-22 4-7 3-13 6-18 11-5 5-9 11-11 17-3 7-5 14-5 21 0 7 2 14 5 21 2 6 6 12 11 17 5 5 11 8 18 11 7 3 14 4 22 4z m0-136c12 0 23 2 34 6 11 4 20 10 28 18 8 7 14 16 19 26 4 11 6 21 6 33 0 12-2 22-6 33-5 10-11 19-19 26-8 8-17 14-28 18-11 4-22 6-34 6-12 0-23-2-34-6-11-4-20-10-28-18-8-7-14-16-19-26-4-11-6-21-6-33 0-12 2-22 6-33 5-10 11-19 19-26 8-8 17-14 28-18 11-4 22-6 34-6z m0 194c18 0 35-2 51-6 16-4 31-10 45-17 14-6 26-14 37-22 11-9 21-17 29-25 7-8 13-16 17-23 5-8 7-14 7-18 0-4-2-10-7-18-4-7-10-15-17-23-8-8-18-16-29-25-11-8-23-16-37-22-14-7-29-13-45-17-16-4-33-6-51-6-18 0-35 2-51 6-17 4-31 10-45 17-14 6-26 14-37 22-11 9-21 17-29 25-7 8-13 16-17 23-5 8-7 14-7 18 0 4 2 10 7 18 4 7 10 15 17 23 8 8 18 16 29 25 11 8 23 16 37 22 14 7 28 13 45 17 16 4 33 6 51 6z"/>
-<glyph unicode="&#83;" d="M435 186l0-117-358 0 0 117-68 0 0-151c0-19 15-35 34-35l426 0c19 0 34 16 34 35l0 151z m-185 12l-99 118c0 0-15 15 2 15 16 0 55 0 55 0 0 0 0 9 0 24 0 41 0 118 0 149 0 0-2 8 11 8 12 0 68 0 78 0 9 0 8-7 8-7 0-30 0-109 0-149 0-13 0-22 0-22 0 0 32 0 52 0 19 0 5-15 5-15 0 0-84-111-96-122-8-9-16 1-16 1z"/>
-</font></defs></svg>
+<glyph unicode="&#x20;" d="" horiz-adv-x="256" />
+<glyph unicode="&#x21;" d="M499 33c4-6 4-12 0-18-3-5-8-8-15-8 0 0-457 0-457 0-6 0-11 3-14 8-4 6-4 12-1 18 0 0 228 400 228 400 3 6 8 9 16 9 7 0 12-3 15-9 0 0 228-400 228-400zM284 58c0 0 0 51 0 51s-56 0-56 0c0 0 0-51 0-51 0 0 56 0 56 0zM284 147c0 0 0 154 0 154s-56 0-56 0c0 0 0-154 0-154 0 0 56 0 56 0z" />
+<glyph unicode="&#x30;" d="M346 289c0-2 0-4 0-6s-1-4-1-7c0-2-1-5-1-7-1-3-2-6-2-9-1-3-2-6-3-9-1-3-2-6-3-10-1-1-2-3-2-4-1-1-1-2-1-3-1-1-1-1-2-2-1-2-1-3-2-5-1-2-2-3-3-5l-2-2-1-3c-1-1-2-3-4-4-2-3-4-7-7-9-3-3-6-6-9-9l-4-4c-2-1-3-2-5-4-6-5-13-9-20-13-7-4-14-7-21-10-7-3-14-6-21-8-6-2-12-4-18-6-12-3-22-5-29-7-7-2-11-2-11-2 0 0 4 0 11 2 7 1 17 3 29 6 6 2 12 3 19 5 7 2 14 5 21 8 7 3 14 6 21 10 7 3 14 8 21 13 2 1 3 2 5 3l5 4c3 3 6 6 8 9 3 3 6 6 8 9 2 2 3 3 4 5l2 2c0 1 1 2 1 3 1 1 2 3 4 5 0 1 1 3 2 5 1 0 1 1 2 2 0 1 0 2 1 3 1 1 1 3 2 5 2 3 3 6 4 9 1 4 2 7 3 10 1 3 1 6 2 8 1 3 1 6 2 8 0 3 0 5 1 7 0 3 0 5 0 6 1 8 1 12 1 12h-6c0 0 0-4-1-11zM458 369l-34 33c-1 33-22 55-32 61-10 9-33 16-59 13-25-4-61-17-86-64-49-92-154-289-155-291-1 0-1-1 0-1 0-1 1-1 1-1l40 7-78-151c0-1 0-1 1-2 0 0 0 0 1 0 0 0 0 0 0 0l56 10c0 0 1 0 1 1l41 120c105 1 178 26 218 77 42 54 36 122 29 154l-5 31h60c0 0 1 0 1 1 1 0 0 1 0 2zM403 411c0-5-5-10-10-10-6 0-10 5-10 10 0 6 4 11 10 11 5 0 10-5 10-11zM370 183c-40-50-112-75-216-75-1 0-1-1-1-2l-42-120-51-9 78 151c0 1 0 1 0 2-1 0-1 1-2 1l-40-8c14 26 109 202 154 287 25 46 59 59 83 62 25 3 46-3 56-10v-22c-2 0-16 5-29 5s-28-5-37-15c-16-18-20-36-12-66 54 10 78-13 87-27 7-30 15-99-28-154zM399 369l23 30 30-30z" />
+<glyph unicode="&#x31;" d="M75 43c-48 48-75 113-75 181 0 141 115 256 256 256l32-32-32-32c-106 0-192-86-192-192 0-51 20-100 56-136l-39-5zM256-32l-32 32 32 32c106 0 192 86 192 192 0 51-20 100-56 136l39 5 6 40c48-48 75-113 75-181 0-141-115-256-256-256z" />
+<glyph unicode="&#x32;" d="M192 288h-192l149-109-54-179 153 107 168-107-69 179 165 109h-192l-72 184z" />
+<glyph unicode="&#x33;" d="M332 394v-94h49v-98h-192v55l-152-102 152-101v54h286v286z" />
+<glyph unicode="&#x34;" d="M256 277c8 0 15-1 22-4s13-6 18-11c5-5 9-11 11-17 3-7 5-14 5-21 0-7-2-14-5-21-2-6-6-12-11-17-5-5-11-8-18-11-7-3-14-4-22-4-8 0-15 1-22 4-7 3-13 6-18 11-5 5-9 11-11 17-3 7-5 14-5 21 0 7 2 14 5 21 2 6 6 12 11 17 5 5 11 8 18 11 7 3 14 4 22 4zM256 141c12 0 23 2 34 6s20 10 28 18c8 7 14 16 19 26 4 11 6 21 6 33 0 12-2 22-6 33-5 10-11 19-19 26-8 8-17 14-28 18-11 4-22 6-34 6-12 0-23-2-34-6-11-4-20-10-28-18-8-7-14-16-19-26-4-11-6-21-6-33 0-12 2-22 6-33 5-10 11-19 19-26 8-8 17-14 28-18 11-4 22-6 34-6zM256 335c18 0 35-2 51-6s31-10 45-17c14-6 26-14 37-22 11-9 21-17 29-25 7-8 13-16 17-23 5-8 7-14 7-18 0-4-2-10-7-18-4-7-10-15-17-23-8-8-18-16-29-25-11-8-23-16-37-22-14-7-29-13-45-17-16-4-33-6-51-6-18 0-35 2-51 6-17 4-31 10-45 17-14 6-26 14-37 22-11 9-21 17-29 25-7 8-13 16-17 23-5 8-7 14-7 18 0 4 2 10 7 18 4 7 10 15 17 23 8 8 18 16 29 25 11 8 23 16 37 22 14 7 28 13 45 17 16 4 33 6 51 6z" />
+<glyph unicode="&#x35;" d="M135 424h241v-23h-241zM405 247l-127-124v222h-45v-220l-125 122-33-32 181-181 181 181z" />
+<glyph unicode="&#x36;" d="M136 424h241v-23h-241zM108 122l126 124v-222h45v220l126-122 32 32-181 181-181-181z" />
+<glyph unicode="&#x37;" d="M416-32h-320c-53 0-96 43-96 96v320c0 42 27 77 64 90v-42c0-27 22-48 48-48s48 21 48 48v48h192v-48c0-27 22-48 48-48s48 21 48 48v42c37-13 64-48 64-90v-320c0-53-43-96-96-96zM448 320h-384v-256c0-18 14-32 32-32h320c18 0 32 14 32 32zM320 160h64v-64h-64zM320 256h64v-64h-64zM224 160h64v-64h-64zM224 256h64v-64h-64zM128 160h64v-64h-64zM128 256h64v-64h-64zM400 416c-9 0-16 7-16 16v48h32v-48c0-9-7-16-16-16zM112 416c-9 0-16 7-16 16v48h32v-48c0-9-7-16-16-16z" />
+<glyph unicode="&#x39;" d="M256 480c-141 0-256-115-256-256s115-256 256-256c141 0 256 115 256 256 0 141-115 256-256 256zM216 106l-117 118 45 45 72-73 154 154 45-45z" />
+<glyph unicode="&#x3f;" d="M253 460c65 0 120-22 167-67 46-45 70-100 72-165 0-65-22-121-68-167-45-47-100-71-165-73-65 0-121 22-167 68-47 45-71 100-72 165-1 65 21 121 67 167 46 47 101 71 166 72zM252 81c10 0 19 3 25 9 6 7 10 15 10 24 0 11-2 19-9 26-6 6-15 9-25 9 0 0-1 0-1 0-10 0-18-3-24-9-7-6-10-14-11-24 0-10 3-18 10-25 6-6 14-10 24-10 0 0 1 0 1 0zM337 249c9 11 13 24 13 40 0 26-9 46-27 59-18 13-41 19-69 19-22 0-40-4-53-13-24-14-36-39-37-75 0 0 0-2 0-2 0 0 56 0 56 0 0 0 0 2 0 2 0 9 3 18 8 28 6 8 15 12 28 12 14 0 23-3 27-10 5-7 8-14 8-23 0-6-3-13-8-20-3-4-7-8-11-10 0 0-3-2-3-2-2-2-4-4-8-6-3-2-7-5-10-8-4-2-7-5-11-8-4-3-7-6-9-9-4-7-7-20-9-40 0 0 0-4 0-4 0 0 56 0 56 0 0 0 0 2 0 2 0 4 0 9 2 14 2 7 6 13 14 19 0 0 14 9 14 9 16 12 25 20 29 26z" />
+<glyph unicode="&#x41;" d="M232 109l176 175c3 4 5 8 5 13s-2 9-5 13l-29 29c-4 4-8 6-13 6s-10-2-13-6l-134-133-60 60c-3 4-8 5-13 5s-9-1-13-5l-29-29c-3-4-5-8-5-13s2-9 5-13l103-102c3-4 7-6 12-6s10 2 13 6zM475 361v-274c0-23-8-42-24-58s-35-24-58-24h-274c-23 0-42 8-58 24s-24 35-24 58v274c0 23 8 42 24 58s35 24 58 24h274c23 0 42-8 58-24s24-35 24-58z" />
+<glyph unicode="&#x42;" d="M384 206v36c0 5-2 10-5 13-4 4-8 6-13 6h-73v73c0 5-2 9-6 13-3 3-8 5-13 5h-36c-5 0-10-2-13-5-4-4-6-8-6-13v-73h-73c-5 0-9-2-13-6-3-3-5-8-5-13v-36c0-5 2-10 5-13 4-4 8-6 13-6h73v-73c0-5 2-9 6-13 3-3 8-5 13-5h36c5 0 10 2 13 5 4 4 6 8 6 13v73h73c5 0 9 2 13 6 3 3 5 8 5 13zM475 224c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z" />
+<glyph unicode="&#x43;" d="M213 45c15-6 28-9 40-9 25 0 46 4 62 12 16 8 28 19 35 32 7 14 11 31 11 52 0 22-4 39-12 51-11 18-24 30-40 36-15 7-39 10-71 10-14 0-23-1-29-3v-91l1-77c0-3 1-7 3-13zM209 259c9-2 19-2 32-2 33 0 58 6 75 18 17 13 25 34 25 64 0 21-8 39-24 54-16 14-40 21-73 21-10 0-22-1-37-4 0-8 0-15 1-22 1-23 2-50 1-79v-28c0-9 0-16 0-22zM55 5v26c9 2 15 3 20 4 15 2 26 5 35 9 3 5 5 10 6 14 2 13 3 31 3 56l-1 142c-1 48-2 87-3 115 0 17-1 27-3 31 0 1-1 2-3 4-4 2-10 3-20 4-6 0-16 2-32 4l-2 23 75 2 108 4h13c1 0 2 0 4 0s3 0 4 0c0 0 2 0 6 0s8 0 12 0h21c17 0 35-2 55-8 8-2 17-6 27-11 11-5 21-12 29-21 9-9 15-19 19-30 4-11 6-23 6-35 0-13-3-26-9-37-7-11-16-21-28-30-5-3-19-11-42-22 33-7 59-21 76-41 17-20 26-43 26-68 0-14-3-30-8-46-4-12-11-23-20-33-13-14-26-24-40-31-14-7-34-13-58-17-16-3-35-4-57-3l-56 1c-16 0-45-1-85-3-7-1-33-2-78-3z" />
+<glyph unicode="&#x44;" d="M173 22c-80 23-309 124-49 458 140-95 194-179 204-248-67-24-113-71-107-156-37 87-66 208-78 283-6-88 7-244 30-337zM262 1c-19 53-59 228 241 219 9-275-137-265-202-246 27 53 62 101 106 141-54-30-103-68-145-114z" />
+<glyph unicode="&#x45;" d="M110 5l5 24c0 1 8 3 22 6 14 4 25 7 33 11 5 7 9 17 11 29l8 40 20 95c1 8 3 16 4 24 2 8 4 14 5 19 1 5 3 9 4 13 1 4 1 7 2 9 1 2 1 3 1 3l8 45 5 18 6 39 3 14v11c-8 4-22 7-42 8-5 0-9 1-10 1l5 29 91-4c7 0 14 0 20 0 13 0 33 1 62 2 6 1 12 1 19 2 7 0 10 0 10 0 0-3-1-7-1-10-2-6-3-11-4-15-11-4-21-7-31-9-12-3-22-6-29-9-2-6-5-14-7-25-2-8-3-16-4-23-8-38-14-67-19-88l-17-89-11-45-12-67-4-13c0-1 0-4 1-7 12-3 23-5 34-6 7-1 13-2 19-3-1-6-1-11-2-17-2-6-3-10-3-12-3 0-6 0-7 0-4 0-8 0-12 0-1 0-4 0-8 0-3 1-17 3-41 5l-57 1c-7 0-24-1-49-3-14-2-24-2-28-3z" />
+<glyph unicode="&#x46;" d="M110 78c0-16-6-28-16-39-11-11-24-16-39-16-15 0-28 5-39 16-11 11-16 23-16 39 0 15 5 28 16 39 11 10 24 16 39 16 15 0 28-6 39-16 10-11 16-24 16-39zM110 224c0-15-6-28-16-39-11-11-24-16-39-16-15 0-28 5-39 16-11 11-16 24-16 39 0 15 5 28 16 39 11 11 24 16 39 16 15 0 28-5 39-16 10-11 16-24 16-39zM512 105v-55c0-2-1-4-3-6s-4-3-6-3h-348c-2 0-4 1-6 3s-3 4-3 6v55c0 3 1 5 3 7 2 1 4 2 6 2h348c2 0 4-1 6-2 2-2 3-4 3-7zM110 370c0-15-6-28-16-39-11-10-24-16-39-16-15 0-28 6-39 16-11 11-16 24-16 39 0 16 5 28 16 39 11 11 24 16 39 16 15 0 28-5 39-16 10-11 16-23 16-39zM512 251v-54c0-3-1-5-3-7s-4-3-6-3h-348c-2 0-4 1-6 3s-3 4-3 7v54c0 3 1 5 3 7s4 3 6 3h348c2 0 4-1 6-3s3-4 3-7zM512 398v-55c0-3-1-5-3-7-2-1-4-2-6-2h-348c-2 0-4 1-6 2-2 2-3 4-3 7v55c0 2 1 4 3 6s4 3 6 3h348c2 0 4-1 6-3s3-4 3-6z" />
+<glyph unicode="&#x47;" d="M109 17c0-15-5-27-16-36-10-9-23-13-38-13-21 0-37 6-50 19l17 25c9-9 19-13 30-13 6 0 10 2 14 4 5 3 7 7 7 12 0 13-10 18-30 16l-8 16c2 2 5 6 9 13 5 6 9 11 13 15 3 4 7 8 10 11v1c-3 0-8-1-14-1s-11 0-14 0v-15h-30v43h95v-25l-27-33c10-2 18-7 23-14 6-7 9-15 9-25zM109 196v-45h-103c-1 7-2 12-2 15 0 10 3 19 7 27 4 8 10 14 16 19 6 5 13 10 19 14 6 4 12 8 16 12 5 4 7 9 7 13 0 5-2 9-4 11-3 3-7 4-12 4-8 0-16-6-23-17l-24 17c5 10 11 18 20 23s20 8 31 8c13 0 25-4 35-12 9-8 14-18 14-32 0-9-3-18-10-26-6-8-13-14-21-18-8-5-15-10-22-15-6-5-10-10-10-15h36v17zM512 105v-55c0-2-1-4-3-6s-4-3-6-3h-348c-2 0-4 1-6 3s-3 4-3 6v55c0 3 1 5 3 7 2 1 4 2 6 2h348c2 0 4-1 6-2 2-2 3-4 3-7zM110 362v-28h-96v28h31c0 8 0 19 0 35 0 15 0 27 0 34v4h-1c-1-3-6-9-14-16l-20 22 39 36h30v-115zM512 251v-54c0-3-1-5-3-7s-4-3-6-3h-348c-2 0-4 1-6 3s-3 4-3 7v54c0 3 1 5 3 7s4 3 6 3h348c2 0 4-1 6-3s3-4 3-7zM512 398v-55c0-3-1-5-3-7-2-1-4-2-6-2h-348c-2 0-4 1-6 2-2 2-3 4-3 7v55c0 2 1 4 3 6s4 3 6 3h348c2 0 4-1 6-3s3-4 3-6z" />
+<glyph unicode="&#x48;" d="M475 224c0-30-5-58-17-85s-27-51-47-70c-19-20-43-35-70-47-27-12-55-17-85-17-33 0-64 6-93 20-30 14-55 34-76 59-1 2-2 4-2 6 0 3 1 4 3 6l39 39c2 2 4 3 7 3s5-2 7-3c13-19 31-33 51-42 20-10 41-15 64-15 20 0 39 4 57 11 18 8 33 18 46 32 14 13 24 28 32 46 7 18 11 37 11 57 0 20-4 39-11 57-8 18-18 33-32 46-13 14-28 24-46 32-18 7-37 11-57 11-19 0-37-3-54-10-17-7-32-16-45-29l39-39c6-6 7-13 4-20-4-8-9-11-17-11h-128c-5 0-9 1-13 5s-5 8-5 13v128c0 8 3 13 11 17 7 3 14 2 20-4l37-37c20 19 44 34 70 45 26 10 53 15 81 15 30 0 58-5 85-17 27-12 51-27 70-47 20-19 35-43 47-70 12-27 17-55 17-85z" />
+<glyph unicode="&#x49;" d="M475 407v-128c0-5-1-9-5-13s-8-5-13-5h-128c-8 0-13 3-17 11-3 7-2 14 4 20l40 39c-28 26-62 39-100 39-20 0-39-4-57-11-18-8-33-18-46-32-14-13-24-28-32-46-7-18-11-37-11-57 0-20 4-39 11-57 8-18 18-33 32-46 13-14 28-24 46-32 18-7 37-11 57-11 23 0 44 5 64 15 20 9 38 23 51 42 2 1 4 3 7 3 3 0 5-1 7-3l39-39c2-2 3-3 3-6 0-2-1-4-2-6-21-25-46-45-76-59-29-14-60-20-93-20-30 0-58 5-85 17-27 12-51 27-70 47-20 19-35 43-47 70-12 27-17 55-17 85 0 30 5 58 17 85 12 27 27 51 47 70 19 20 43 35 70 47 27 12 55 17 85 17 28 0 55-5 81-15 26-11 50-26 70-45l37 37c6 6 12 7 20 4 8-4 11-9 11-17z" />
+<glyph unicode="&#x4a;" d="M434 133c0 7-2 14-8 19l-59 59c-5 6-12 8-20 8s-14-3-20-9c0 0 2-2 5-5 3-3 5-5 6-6 1-1 3-3 5-6 2-2 3-4 3-7 1-2 1-5 1-8 0-7-2-14-8-19-5-5-11-8-19-8-3 0-5 0-8 1-2 1-5 2-7 4-3 1-4 3-6 4-1 1-3 3-6 6-3 3-4 5-5 5-6-5-9-12-9-20 0-8 2-15 8-20l58-59c6-5 12-8 20-8 7 0 14 3 19 8l42 41c6 6 8 12 8 20zM233 334c0 8-2 14-8 19l-58 60c-6 5-12 8-20 8-7 0-14-3-19-8l-42-42c-6-5-8-12-8-19 0-8 2-14 8-19l59-60c5-5 12-8 20-8s14 3 20 9c0 1-2 3-5 6-3 3-5 5-6 6-1 1-3 3-5 5-2 3-3 5-3 7-1 3-1 5-1 8 0 8 2 14 8 20 5 5 11 8 19 8 3 0 5-1 8-1 2-1 5-2 7-4 3-2 4-3 6-4 1-1 3-3 6-6 3-3 4-5 5-6 6 6 9 13 9 21zM489 133c0-23-8-43-24-58l-42-42c-16-16-35-24-58-24s-43 8-58 24l-59 60c-16 15-24 35-24 58s8 43 25 59l-25 25c-16-16-36-25-59-25s-43 8-59 24l-59 60c-16 16-24 35-24 58s8 42 24 58l42 42c16 16 35 23 58 23s43-8 58-24l59-59c16-16 24-35 24-58s-8-43-25-60l25-25c16 17 36 25 59 25s43-8 59-24l59-59c16-16 24-36 24-58z" />
+<glyph unicode="&#x4b;" d="M475 224c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z" />
+<glyph unicode="&#x4c;" d="M256 379c-28 0-54-7-78-20-24-14-43-33-57-57-13-24-20-50-20-78 0-28 7-54 20-78 14-24 33-43 57-57 24-13 50-20 78-20 28 0 54 7 78 20 24 14 43 33 57 57 13 24 20 50 20 78 0 28-7 54-20 78-14 24-33 43-57 57-24 13-50 20-78 20zM475 224c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z" />
+<glyph unicode="&#x4d;" d="M479 133c0-11-4-19-11-26l-21-22c-8-7-16-10-26-10-11 0-19 3-26 10l-139 139-139-139c-7-7-15-10-26-10-10 0-18 3-25 10l-22 22c-7 7-11 15-11 26 0 10 4 18 11 26l186 186c7 7 16 10 26 10s19-3 26-10l186-186c7-8 11-16 11-26z" />
+<glyph unicode="&#x4e;" d="M479 279c0-10-4-19-11-26l-186-186c-7-7-16-11-26-11s-19 4-26 11l-186 186c-7 7-11 16-11 26s4 19 11 26l21 21c8 7 17 11 26 11 11 0 19-4 26-11l139-139 139 139c7 7 15 11 26 11 9 0 18-4 26-11l21-21c7-8 11-16 11-26z" />
+<glyph unicode="&#x4f;" d="M158 224c-29-1-52-12-71-34h-35c-15 0-27 3-37 11-10 7-15 17-15 31 0 63 11 94 33 94 1 0 5-1 12-5 6-4 15-8 26-12 10-3 21-5 31-5 12 0 24 2 36 6-1-7-1-13-1-18 0-24 7-47 21-68zM444 54c0-21-7-38-20-50-13-13-30-19-51-19h-234c-21 0-38 6-51 19-13 12-20 29-20 50 0 10 1 19 1 28 1 9 2 18 4 29 2 10 4 20 7 29 3 9 7 17 11 26 5 8 11 15 17 21 6 6 14 11 23 15 9 3 19 5 30 5 1 0 5-2 11-6 6-4 12-8 19-13 8-4 17-9 29-12 12-4 24-6 36-6 12 0 24 2 36 6 12 3 21 8 29 12 7 5 13 9 19 13 6 4 10 6 11 6 11 0 21-2 30-5 9-4 17-9 23-15 6-6 12-13 17-21 4-9 8-17 11-26 3-9 5-19 7-29 2-11 3-20 4-29 0-9 1-18 1-28zM171 395c0-19-7-35-20-49-14-13-30-20-49-20-18 0-35 7-48 20-13 14-20 30-20 49 0 19 7 35 20 48 13 13 30 20 48 20 19 0 35-7 49-20 13-13 20-29 20-48zM358 292c0-28-10-52-30-72s-44-30-72-30c-28 0-52 10-72 30-20 20-30 44-30 72 0 29 10 53 30 73 20 20 44 30 72 30 28 0 52-10 72-30 20-20 30-44 30-73zM512 232c0-14-5-24-15-31-10-8-22-11-37-11h-35c-19 22-42 33-71 34 14 21 21 44 21 68 0 5 0 11-1 18 12-4 24-6 36-6 10 0 21 2 31 5 11 4 20 8 26 12 7 4 11 5 12 5 22 0 33-31 33-94zM478 395c0-19-7-35-20-49-13-13-30-20-48-20-19 0-35 7-49 20-13 14-20 30-20 49 0 19 7 35 20 48 14 13 30 20 49 20 18 0 35-7 48-20 13-13 20-29 20-48z" />
+<glyph unicode="&#x50;" d="M375 224c0-7-3-12-9-16l-156-91c-3-2-6-3-9-3s-6 1-9 3-9 9-9 16v182c0 7 3 13 9 16 6 4 12 4 18 0l156-91c6-4 9-9 9-16zM411 224c0 28-7 54-20 78-14 24-33 43-57 57-24 13-50 20-78 20-28 0-54-7-78-20-24-14-43-33-57-57-13-24-20-50-20-78 0-28 7-54 20-78 14-24 33-43 57-57 24-13 50-20 78-20 28 0 54 7 78 20 24 14 43 33 57 57 13 24 20 50 20 78zM475 224c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z" />
+<glyph unicode="&#x51;" d="M238 334c0 15-6 28-16 39-11 10-24 16-39 16-15 0-28-6-39-16-11-11-16-24-16-39 0-8 2-16 5-24-7 4-15 5-23 5-16 0-28-5-39-16-11-10-16-23-16-38 0-16 5-29 16-39 11-11 23-16 39-16 15 0 28 5 39 16 10 10 16 23 16 39 0 8-2 15-6 23 8-3 16-5 24-5 15 0 28 5 39 16 10 11 16 23 16 39zM481 133c0-4-5-10-14-19-9-10-16-14-19-14-2 0-4 1-8 4-4 3-7 6-11 10-3 3-6 7-11 11-4 5-6 7-7 8l-27-28 63-63c5-5 8-12 8-19 0-8-4-16-11-23-8-8-15-11-23-11-8 0-15 2-20 8l-192 191c-33-25-68-37-104-37-31 0-56 10-76 29-19 20-29 45-29 76 0 30 9 60 27 89 18 30 42 53 71 71 29 18 59 27 89 27 31 0 57-9 76-29 20-19 30-45 30-76 0-36-13-70-38-104l102-101 27 27c-1 1-3 3-7 7-5 4-9 8-12 11-3 3-6 7-9 10-3 4-5 7-5 9 0 3 5 9 14 18 9 10 16 14 19 14 2 0 5-1 7-2 1-2 5-6 13-13 7-7 15-15 23-23 8-8 16-16 25-24 8-9 15-16 21-23 5-6 8-10 8-11z" />
+<glyph unicode="&#x52;" d="M440 357h-188c-10 12-20 25-23 28-2 6-8 10-14 10h-75c-5 0-9-3-13-6l-25-32h-30c-16 0-28-13-28-28v-248c0-15 12-28 28-28h368c16 0 28 13 28 28v248c0 15-12 28-28 28z" />
+<glyph unicode="&#x53;" d="M435 154v-117h-358v117h-68v-151c0-19 15-35 34-35h426c19 0 34 16 34 35v151zM250 166l-99 118c0 0-15 15 2 15 16 0 55 0 55 0 0 0 0 9 0 24 0 41 0 118 0 149 0 0-2 8 11 8 12 0 68 0 78 0 9 0 8-7 8-7 0-30 0-109 0-149 0-13 0-22 0-22 0 0 32 0 52 0 19 0 5-15 5-15 0 0-84-111-96-122-8-9-16 1-16 1z" />
+<glyph unicode="&#x54;" d="M421 105c0 12-4 23-12 33-9 10-19 15-30 15-10 0-18-3-24-10-5-7-8-16-8-27 0-11 3-20 10-27 7-8 17-11 30-11 9 0 17 2 24 7 7 6 10 12 10 20zM247 69c0-3-1-5-3-7l-91-91c-2-2-4-3-7-3-2 0-4 1-6 3l-92 91c-3 3-3 6-2 10 2 4 5 6 9 6h55v393c0 3 1 5 2 6 2 2 4 3 7 3h55c2 0 5-1 6-3 2-1 3-3 3-6v-393h55c2 0 5-1 6-3 2-2 3-4 3-6zM461 88c0-12-1-23-4-34-2-12-6-23-11-33-6-10-12-19-20-27-7-8-17-14-28-19-11-5-23-7-36-7-12 0-22 2-31 5-5 1-9 3-12 4l11 32c3-1 6-2 9-3 7-2 14-4 21-4 16 0 29 6 39 17 9 11 16 25 19 42h-1c-4-5-10-8-17-11-8-3-16-4-25-4-20 0-36 7-49 20-13 14-19 30-19 50 0 20 7 37 20 51 14 13 31 20 52 20 24 0 43-9 59-27 15-18 23-42 23-72zM453 293v-32h-134v32h47v124c0 1 0 3 0 5 1 2 1 4 1 5v4h-1l-2-3c-2-2-4-5-7-9l-18-16-24 24 55 53h35v-187z" />
+<glyph unicode="&#x55;" d="M218 31c0-35-29-63-64-63s-64 28-64 63c0 36 29 64 64 64 35 0 64-28 64-64zM218 224c0-35-29-64-64-64s-64 29-64 64c0 35 29 64 64 64 35 0 64-29 64-64zM218 417c0-36-29-64-64-64s-64 28-64 64c0 35 29 63 64 63 35 0 64-28 64-63zM422 31c0-35-29-63-64-63s-64 28-64 63c0 36 29 64 64 64 35 0 64-28 64-64zM422 224c0-35-29-64-64-64s-64 29-64 64c0 35 29 64 64 64 35 0 64-29 64-64zM422 417c0-36-29-64-64-64s-64 28-64 64c0 35 29 63 64 63 35 0 64-28 64-63z" />
+<glyph unicode="&#x56;" d="M370 368c0-4-3-8-8-8-4 0-8 4-8 8 0 5 4 8 8 8 5 0 8-3 8-8zM373 292c0 0-11 50-77 37-6 23-5 40 9 55 20 21 52 10 52 10v17c-11 5-22 6-33 6-43 0-67-32-77-54l-119-219 34 6-62-119 43 8 33 93c93 0 213 34 197 160zM413 334l-26 26-21-26zM191 159c0 0 4 1 9 2 5 2 13 3 22 6 5 1 10 3 15 4 5 2 11 4 16 6 6 3 11 5 16 8 6 3 11 7 16 10 1 1 3 2 4 3l3 3c3 3 5 5 7 7s4 5 6 7c1 1 2 2 3 4l1 2 1 1c1 2 2 3 2 4 1 1 2 3 2 4 1 1 1 1 1 2 1 0 1 1 1 2 1 1 1 2 2 3 1 3 2 5 3 8 0 2 1 4 2 7 0 2 1 4 1 6 0 2 1 4 1 6 0 2 1 4 1 6 0 1 0 3 0 4 0 5 1 9 1 9l5-1c0 0-1-3-1-8 0-2-1-3-1-5 0-2 0-4-1-5 0-2 0-4-1-7 0-2-1-4-1-6-1-3-2-5-3-8-1-2-2-5-3-7 0-1-1-3-2-4 0-1 0-1-1-2 0-1 0-1-1-2 0-1-1-2-2-4-1-1-1-2-2-3-1-1-1-2-1-2l-2-2c-1-1-2-3-3-4-2-2-4-5-6-7-2-2-4-4-7-7l-3-3c-2-1-3-1-4-2-6-4-11-8-17-11-5-2-11-5-16-7-6-2-11-4-17-6-5-1-10-3-15-4-9-2-17-4-22-5-5-1-9-2-9-2z" />
+<glyph unicode="&#x57;" d="M421 197v-138c0-5-2-9-6-12-3-4-8-6-13-6h-109v110h-74v-110h-109c-5 0-10 2-13 6-4 3-6 7-6 12v138c0 0 0 0 1 0 0 1 0 1 0 1l164 136 164-136c0 0 1-1 1-1zM484 216l-17-21c-2-2-4-3-6-3h-1c-3 0-5 1-6 2l-198 165-198-165c-2-2-4-2-7-2-2 0-4 1-6 3l-17 21c-2 2-2 4-2 7s1 5 3 6l205 171c6 5 14 8 22 8s16-3 22-8l69-58v56c0 2 1 5 3 6 2 2 4 3 7 3h54c3 0 5-1 7-3 2-1 3-4 3-6v-117l62-52c2-1 3-3 3-6s0-5-2-7z" />
+<glyph unicode="&#x58;" d="M365 109c1-4 1-7-2-10l-100-110c-1-2-4-3-6-3-3 0-5 1-7 3l-101 110c-3 3-3 6-2 10 2 3 5 5 8 5h64v357c0 3 1 5 3 6 2 2 4 3 7 3h54c3 0 5-1 7-3 2-1 3-3 3-6v-357h64c4 0 6-2 8-5z" />
+<glyph unicode="&#x59;" d="M365 339c-2-3-5-5-8-5h-64v-357c0-3-1-5-3-6-2-2-4-3-7-3h-54c-3 0-5 1-7 3-2 1-3 3-3 6v357h-64c-4 0-6 2-8 5-1 4-1 7 2 10l100 110c1 2 4 3 6 3 3 0 5-1 7-3l101-110c3-3 3-6 2-10z" />
+<glyph unicode="&#x5a;" d="M201 270v-165c0-3-1-5-2-6-2-2-4-3-7-3h-18c-3 0-5 1-7 3-2 1-2 3-2 6v165c0 2 0 5 2 6 2 2 4 3 7 3h18c3 0 5-1 7-3 1-1 2-4 2-6zM274 270v-165c0-3-1-5-2-6-2-2-4-3-7-3h-18c-3 0-5 1-7 3-1 1-2 3-2 6v165c0 2 1 5 2 6 2 2 4 3 7 3h18c3 0 5-1 7-3 1-1 2-4 2-6zM347 270v-165c0-3 0-5-2-6-2-2-4-3-7-3h-18c-3 0-5 1-7 3-1 1-2 3-2 6v165c0 2 1 5 2 6 2 2 4 3 7 3h18c3 0 5-1 7-3 2-1 2-4 2-6zM384 63v271h-256v-271c0-4 1-8 2-12 1-3 3-6 4-7 2-2 3-3 3-3h238c0 0 1 1 3 3 1 1 3 4 4 7 1 4 2 8 2 12zM192 370h128l-14 34c-1 1-3 2-5 3h-90c-2-1-4-2-5-3zM457 361v-18c0-3-1-5-2-7-2-1-4-2-7-2h-27v-271c0-16-5-30-14-41-9-12-20-17-32-17h-238c-12 0-23 5-32 16s-14 25-14 41v272h-27c-3 0-5 1-7 2-1 2-2 4-2 7v18c0 3 1 5 2 7 2 1 4 2 7 2h88l20 48c3 7 8 13 16 18 7 5 15 7 22 7h92c7 0 15-2 22-7 8-5 13-11 16-18l20-48h88c3 0 5-1 7-2 1-2 2-4 2-7z" />
+<glyph unicode="&#x61;" d="M239 224c0 19-7 35-20 48-13 14-29 20-48 20-19 0-35-6-49-20-13-13-20-29-20-48 0-19 7-35 20-48 14-14 30-20 49-20 19 0 35 6 48 20 13 13 20 29 20 48zM444 87c0 10-4 18-10 24-7 7-15 11-24 11-10 0-18-4-24-11-7-6-11-14-11-24 0-9 4-17 10-24 7-6 15-10 25-10 9 0 17 4 24 10 6 7 10 15 10 24zM444 361c0 9-4 17-10 24-7 6-15 10-24 10-10 0-18-4-24-10-7-7-11-15-11-24 0-10 4-18 10-25 7-6 15-10 25-10 9 0 17 4 24 10 6 7 10 15 10 25zM341 248v-49c0-2 0-4-2-5-1-2-2-3-4-3l-41-6c-2-7-5-13-9-21 6-8 14-18 24-30 2-2 2-4 2-6 0-2 0-4-2-5-4-5-11-13-22-24-10-10-17-16-21-16-2 0-3 1-5 2l-31 24c-6-3-13-6-20-8-2-19-4-33-7-41-1-5-3-7-8-7h-49c-2 0-4 1-5 2-2 2-3 3-3 5l-6 41c-6 2-13 4-20 8l-32-24c-1-1-3-2-5-2s-4 1-6 3c-25 23-38 37-38 42 0 2 1 4 2 5 2 3 5 8 11 14 5 7 9 13 12 17-4 8-7 15-9 22l-41 6c-1 0-3 1-4 3-1 1-2 3-2 5v49c0 2 1 4 2 5 1 2 3 3 4 3l41 6c2 7 5 13 9 21-6 8-14 18-24 30-1 2-2 4-2 6 0 2 1 4 2 5 4 5 11 13 22 24 11 10 18 16 21 16 2 0 4-1 6-2l30-24c6 3 13 6 21 8 2 19 4 33 6 41 1 5 4 7 8 7h49c2 0 4-1 6-2 1-2 2-3 2-5l7-41c6-2 12-4 20-8l31 24c1 1 3 2 5 2s4-1 6-3c26-23 38-37 38-42 0-2 0-4-1-5-3-3-6-8-12-15-5-6-9-12-12-16 4-8 7-16 9-22l41-6c2 0 3-1 4-3 2-1 2-3 2-5zM512 106v-37c0-3-13-6-40-8-2-5-5-10-8-14 9-20 14-33 14-37 0-1 0-1-1-2-22-13-33-19-33-19-2 0-6 4-13 13-6 8-11 14-13 18-4-1-7-1-8-1-2 0-5 0-8 1-3-4-8-10-14-18-7-9-11-13-13-13 0 0-11 6-33 19 0 1-1 1-1 2 0 4 5 17 14 37-3 4-6 9-8 14-27 2-40 5-40 8v37c0 3 13 6 40 8 2 6 5 10 8 14-9 20-14 33-14 37 0 1 1 1 1 2 1 0 4 2 10 5 5 3 10 6 15 9 5 3 8 5 8 5 2 0 6-5 13-13 6-8 11-14 14-18 3 1 6 1 8 1 1 0 4 0 8-1 9 13 17 23 24 30l2 1c0 0 11-7 33-19 1-1 1-1 1-2 0-4-5-17-14-37 3-4 6-8 8-14 27-2 40-5 40-8zM512 379v-37c0-3-13-6-40-8-2-5-5-10-8-14 9-20 14-33 14-37 0-1 0-1-1-2-22-13-33-19-33-19-2 0-6 4-13 13-6 8-11 14-13 18-4-1-7-1-8-1-2 0-5 0-8 1-3-4-8-10-14-18-7-9-11-13-13-13 0 0-11 6-33 19 0 1-1 1-1 2 0 4 5 17 14 37-3 4-6 9-8 14-27 2-40 5-40 8v37c0 3 13 6 40 8 2 6 5 10 8 14-9 20-14 33-14 37 0 1 1 1 1 2 1 0 4 2 10 5 5 4 10 7 15 9 5 3 8 5 8 5 2 0 6-4 13-13 6-8 11-14 14-18 3 1 6 1 8 1 1 0 4 0 8-1 9 13 17 23 24 30l2 1c0 0 11-7 33-19 1-1 1-1 1-2 0-4-5-17-14-37 3-4 6-8 8-14 27-2 40-5 40-8z" />
+<glyph unicode="&#x62;" d="M439 261v-229c0-8-3-14-8-19-5-6-12-8-20-8h-310c-8 0-15 2-20 8-5 5-8 11-8 19v384c0 8 3 14 8 19 5 6 12 8 20 8h155v-155c0-8 3-14 8-19 5-6 12-8 19-8zM438 297h-145v146c15-3 28-9 37-19l89-89c10-10 16-22 19-38z" />
+<glyph unicode="&#x63;" d="M110 41h292v220h-119c-7 0-14 2-19 8-5 5-8 11-8 19v119h-146zM293 297h107c-2 6-4 10-6 12l-90 89c-2 3-6 5-11 7zM439 288v-256c0-8-3-14-8-19-5-6-12-8-20-8h-310c-8 0-15 2-20 8-5 5-8 11-8 19v384c0 8 3 14 8 19 5 6 12 8 20 8h182c8 0 16-1 26-5 9-4 16-9 21-14l89-89c6-5 10-13 14-22s6-17 6-25z" />
+<glyph unicode="&#x64;" d="M140 41l26 26-67 67-26-26v-30h37v-37zM290 306c0 4-2 7-7 7-1 0-3-1-4-2l-155-155c-2-2-2-3-2-5 0-4 2-6 6-6 2 0 4 0 5 2l155 154c1 2 2 3 2 5zM274 361l119-119-238-237h-118v118zM469 334c0-10-3-19-10-26l-48-47-118 118 47 48c7 7 15 10 26 10 10 0 18-3 26-10l67-67c7-8 10-16 10-26z" />
+<glyph unicode="&#x65;" d="M399 142c0-3-1-5-3-7l-15-14c-1-2-4-3-6-3-3 0-5 1-7 3l-112 112-112-112c-2-2-4-3-7-3-2 0-5 1-6 3l-15 14c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3s5-1 7-3l133-133c2-2 3-4 3-6z" />
+<glyph unicode="&#x66;" d="M347 242c0 36-12 66-37 91s-55 37-91 37c-35 0-65-12-90-37-25-25-38-55-38-91 0-35 13-65 38-90 25-25 55-38 90-38 36 0 66 13 91 38 25 25 37 55 37 90zM494 5c0-10-4-19-11-26s-16-11-26-11c-10 0-19 4-26 11l-98 98c-34-24-72-36-114-36-27 0-53 5-78 16-25 11-46 25-64 43-18 18-32 39-43 64-10 25-16 51-16 78 0 28 6 54 16 78 11 25 25 47 43 65 18 18 39 32 64 43 25 10 51 15 78 15 28 0 54-5 79-15 24-11 46-25 64-43 18-18 32-40 43-65 10-24 16-50 16-78 0-42-12-80-36-114l98-98c7-7 11-15 11-25z" />
+<glyph unicode="&#x67;" d="M426 102c0-7-3-14-8-19l-39-39c-5-5-12-8-20-8-7 0-14 3-19 8l-84 84-84-84c-5-5-12-8-19-8-8 0-15 3-20 8l-39 39c-5 5-8 12-8 19 0 8 3 14 8 20l84 84-84 84c-5 5-8 12-8 19 0 8 3 14 8 20l39 38c5 6 12 8 20 8 7 0 14-2 19-8l84-84 84 84c5 6 12 8 19 8 8 0 15-2 20-8l39-38c5-6 8-12 8-20 0-7-3-14-8-19l-84-84 84-84c5-6 8-12 8-20z" />
+<glyph unicode="&#x68;" d="M366 142v-19c0-2-1-4-3-6s-4-3-6-3h-202c-2 0-4 1-6 3s-3 4-3 6v19c0 2 1 5 3 6 2 2 4 3 6 3h202c2 0 4-1 6-3 2-1 3-4 3-6zM366 215v-18c0-3-1-5-3-7s-4-3-6-3h-202c-2 0-4 1-6 3s-3 4-3 7v18c0 3 1 5 3 6 2 2 4 3 6 3h202c2 0 4-1 6-3 2-1 3-3 3-6zM110 41h292v220h-119c-7 0-14 2-19 8-5 5-8 11-8 19v119h-146zM293 297h107c-2 6-4 10-6 12l-90 89c-2 3-6 5-11 7zM439 288v-256c0-8-3-14-8-19-5-6-12-8-20-8h-310c-8 0-15 2-20 8-5 5-8 11-8 19v384c0 8 3 14 8 19 5 6 12 8 20 8h182c8 0 16-1 26-5 9-4 16-9 21-14l89-89c6-5 10-13 14-22s6-17 6-25z" />
+<glyph unicode="&#x69;" d="M475 215c0 6-5 9-14 9h-290c-7 0-15-2-23-6s-15-8-19-14l-79-97c-3-4-4-7-4-10 0-6 4-10 14-10h290c7 0 15 2 23 6s14 9 19 14l78 97c3 4 5 8 5 11zM171 258h204v43c0 7-2 13-7 18s-11 7-18 7h-154c-7 0-13 3-18 8s-7 11-7 18v17c0 7-3 13-8 18s-11 8-18 8h-85c-7 0-13-3-18-8s-8-11-8-18v-227l68 84c8 9 19 17 31 23 13 6 26 9 38 9zM509 215c0-11-4-22-12-32l-79-97c-8-10-18-17-31-23-13-7-25-10-37-10h-290c-17 0-31 6-42 18-12 12-18 26-18 42v256c0 16 6 30 18 42 11 12 25 18 42 18h85c16 0 30-6 42-18s18-26 18-42v-8h145c16 0 30-6 42-18s18-26 18-42v-43h51c9 0 18-2 26-6 8-5 14-11 18-19 3-6 4-12 4-18z" />
+<glyph unicode="&#x6a;" d="M494 306v-201c0-17-7-32-19-45-13-13-28-19-45-19h-348c-17 0-32 6-45 19-12 13-19 28-19 45v274c0 18 7 33 19 46 13 12 28 18 45 18h92c17 0 32-6 45-18 12-13 19-28 19-46v-9h192c17 0 32-6 45-19 12-12 19-27 19-45z" />
+<glyph unicode="&#x6b;" d="M512 277v-227c0-12-4-23-13-32s-20-13-33-13h-420c-13 0-24 4-33 13s-13 20-13 32v227c8-9 18-17 29-25 69-47 116-79 142-98 11-8 20-15 26-19 7-4 16-9 27-14 12-4 22-7 32-7v0c10 0 20 3 32 7 11 5 20 10 27 14 6 4 15 11 26 19 33 23 80 56 142 98 11 8 21 16 29 25zM512 361c0-15-5-29-14-43s-21-25-35-35c-71-50-116-81-134-93-1-1-6-4-12-9-6-4-11-8-15-11-4-2-9-5-15-9-6-3-11-6-16-8-6-1-10-2-15-2v0c-5 0-9 1-15 2-5 2-10 5-16 8-6 4-11 7-15 9-4 3-9 7-15 11-6 5-11 8-12 9-18 12-43 30-75 52-33 23-52 36-59 41-12 8-23 19-33 33-11 14-16 27-16 39 0 15 4 27 12 37 8 10 19 15 34 15h420c13 0 23-5 32-14s14-19 14-32z" />
+<glyph unicode="&#x6c;" d="M347 389c0-5-1-10-5-13-4-4-8-6-13-6h-36v-292h36c5 0 9-2 13-6 4-3 5-8 5-13 0-5-1-9-5-12l-73-74c-4-3-8-5-13-5s-9 2-13 5l-73 74c-4 3-5 7-5 12s1 10 5 13c4 4 8 6 13 6h36v292h-36c-5 0-9 2-13 6-4 3-5 8-5 13 0 5 1 9 5 12l73 74c4 3 8 5 13 5s9-2 13-5l73-74c4-3 5-7 5-12z" />
+<glyph unicode="&#x6d;" d="M183 261h146v54c0 21-7 38-21 52-15 14-32 22-52 22-20 0-37-8-52-22-14-14-21-31-21-52zM421 233v-164c0-8-3-15-8-20-6-5-12-8-20-8h-274c-8 0-14 3-20 8-5 5-8 12-8 20v164c0 8 3 14 8 20 6 5 12 8 20 8h9v54c0 35 13 66 38 91s55 37 90 37c35 0 65-12 90-37 25-25 38-56 38-91v-54h9c8 0 14-3 20-8 5-6 8-12 8-20z" />
+<glyph unicode="&#x6e;" d="M335 206c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3s-5 1-7 3l-14 14c-2 2-3 4-3 7 0 2 1 5 3 6l112 113-112 112c-2 2-3 4-3 7 0 2 1 4 3 6l14 14c2 2 5 3 7 3s5-1 7-3l133-133c2-2 3-4 3-6z" />
+<glyph unicode="&#x6f;" d="M171 309c0-14-5-26-15-36s-22-15-37-15c-14 0-26 5-36 15-10 10-15 22-15 36 0 15 5 27 15 37 10 10 22 15 36 15 15 0 27-5 37-15 10-10 15-22 15-37zM444 207v-120h-376v52l86 85 42-43 137 137zM469 395h-426c-3 0-5-1-6-3-2-2-3-4-3-6v-324c0-2 1-4 3-6 1-2 3-3 6-3h426c3 0 5 1 6 3 2 2 3 4 3 6v324c0 2-1 4-3 6-1 2-3 3-6 3zM512 386v-324c0-12-4-22-13-30-8-9-18-13-30-13h-426c-12 0-22 4-30 13-9 8-13 18-13 30v324c0 12 4 22 13 30 8 9 18 13 30 13h426c12 0 22-4 30-13 9-8 13-18 13-30z" />
+<glyph unicode="&#x70;" d="M494 315v-73c0-5-2-9-6-13-3-3-8-5-13-5h-18c-5 0-9 2-13 5-3 4-5 8-5 13v73c0 21-7 38-22 52-14 14-31 22-51 22-20 0-38-8-52-22-14-14-21-31-21-52v-54h27c8 0 14-3 19-8 6-6 8-12 8-20v-164c0-8-2-15-8-20-5-5-11-8-19-8h-274c-8 0-14 3-20 8-5 5-8 12-8 20v164c0 8 3 14 8 20 6 5 12 8 20 8h192v54c0 36 12 66 37 91s55 37 91 37c35 0 65-12 90-37 25-25 38-55 38-91z" />
+<glyph unicode="&#x71;" d="M399 270c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3s-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l15 15c1 1 4 2 6 2 3 0 5-1 7-2l112-113 112 113c2 1 4 2 7 2 2 0 5-1 6-2l15-15c2-2 3-4 3-6z" />
+<glyph unicode="&#x72;" d="M366 87v18c0 3-1 5-3 7-2 1-4 2-6 2h-202c-2 0-4-1-6-2-2-2-3-4-3-7v-18c0-3 1-5 3-7 2-1 4-2 6-2h202c2 0 4 1 6 2 2 2 3 4 3 7zM366 160v18c0 3-1 5-3 7s-4 2-6 2h-202c-2 0-4 0-6-2s-3-4-3-7v-18c0-3 1-5 3-7 2-1 4-2 6-2h202c2 0 4 1 6 2 2 2 3 4 3 7zM439 261v-229c0-8-3-14-8-19-5-6-12-8-20-8h-310c-8 0-15 2-20 8-5 5-8 11-8 19v384c0 8 3 14 8 19 5 6 12 8 20 8h155v-155c0-8 3-14 8-19 5-6 12-8 19-8zM438 297h-145v146c15-3 28-9 37-19l89-89c10-10 16-22 19-38z" />
+<glyph unicode="&#x73;" d="M457 105v201c0 8-3 14-8 20-5 5-12 8-19 8h-201c-8 0-15 2-20 8-5 5-8 12-8 19v18c0 8-3 15-8 20s-12 8-19 8h-92c-7 0-14-3-19-8s-8-12-8-20v-274c0-7 3-14 8-19 5-6 12-8 19-8h348c7 0 14 2 19 8 5 5 8 12 8 19zM494 306v-201c0-17-7-32-19-45-13-13-28-19-45-19h-348c-17 0-32 6-45 19-12 13-19 28-19 45v274c0 18 7 33 19 46 13 12 28 18 45 18h92c17 0 32-6 45-18 12-13 19-28 19-46v-9h192c17 0 32-6 45-19 12-12 19-27 19-45z" />
+<glyph unicode="&#x74;" d="M457 270v-55c0-8-3-14-8-20-5-5-12-8-19-8h-119v-118c0-8-3-15-8-20s-12-8-20-8h-54c-8 0-15 3-20 8s-8 12-8 20v118h-119c-7 0-14 3-19 8-5 6-8 12-8 20v55c0 7 3 14 8 19s12 8 19 8h119v119c0 8 3 14 8 19 5 6 12 8 20 8h54c8 0 15-2 20-8 5-5 8-11 8-19v-119h119c7 0 14-3 19-8s8-12 8-19z" />
+<glyph unicode="&#x75;" d="M165 352c0 10-4 19-11 26s-16 11-26 11c-10 0-19-4-26-11-7-7-11-16-11-26 0-10 4-19 11-26 7-7 16-11 26-11 10 0 19 4 26 11 7 7 11 16 11 26zM469 187c0-10-3-18-10-25l-140-141c-8-7-17-10-26-10-11 0-19 3-26 10l-204 205c-8 7-14 16-19 29-5 12-7 23-7 33v119c0 10 3 18 10 26 8 7 16 10 26 10h119c10 0 21-2 33-7 13-5 22-11 30-19l204-204c7-7 10-16 10-26z" />
+<glyph unicode="&#x76;" d="M501 209c0-5-3-11-8-18l-90-105c-7-9-18-17-32-23-14-7-26-10-38-10h-290c-6 0-12 1-16 4-5 2-8 6-8 11 0 6 3 12 9 18l89 105c8 10 19 17 32 24 14 6 27 9 39 9h290c6 0 11-1 16-3 5-3 7-7 7-12zM410 301v-43h-222c-17 0-34-4-53-13-18-8-33-19-44-31l-89-106-2-2c0 1 0 2 0 4 0 1 0 2 0 3v256c0 16 6 30 18 42 11 12 25 18 42 18h85c16 0 30-6 42-18s18-26 18-42v-8h145c16 0 30-6 42-18s18-26 18-42z" />
+<glyph unicode="&#x77;" d="M329 224c0 20-7 37-21 52-15 14-32 21-52 21-20 0-37-7-52-21-14-15-21-32-21-52 0-20 7-37 21-52 15-14 32-21 52-21 20 0 37 7 52 21 14 15 21 32 21 52zM475 255v-63c0-3 0-5-2-7-1-2-3-3-6-4l-52-8c-4-10-8-19-12-26 7-9 17-22 31-39 2-2 3-5 3-7 0-3-1-5-3-7-5-7-14-17-28-31-14-13-23-20-27-20-2 0-5 1-7 3l-40 31c-8-5-17-8-26-11-3-26-6-44-8-53-1-6-5-8-10-8h-64c-2 0-5 0-7 2s-3 4-3 6l-8 53c-9 3-18 6-26 10l-40-30c-2-2-4-3-7-3s-5 1-7 3c-24 22-40 38-47 48-2 2-2 4-2 7 0 2 0 4 2 6 3 4 8 11 14 19 7 9 12 16 16 21-5 9-9 19-12 28l-52 8c-3 0-5 1-6 3-2 2-2 4-2 7v63c0 3 0 5 2 7 1 2 3 3 5 4l53 8c3 8 7 17 12 26-8 11-18 24-31 39-2 3-3 5-3 7 0 2 1 4 3 7 5 7 14 17 28 30 14 14 23 21 27 21 2 0 5-1 7-3l40-31c8 5 17 8 26 11 3 26 6 44 8 53 1 6 5 8 10 8h64c2 0 5 0 7-2s3-4 3-6l8-53c9-3 18-6 26-10l40 30c2 2 4 3 7 3s5-1 7-3c25-23 41-39 47-49 2-1 2-3 2-6 0-2 0-4-2-6-3-4-8-11-14-19-7-9-12-16-16-21 5-9 9-18 12-28l52-8c3 0 5-1 6-3 2-2 2-4 2-7z" />
+<glyph unicode="&#x78;" d="M477 318c0-7-2-14-8-19l-245-246c-6-5-12-8-20-8-7 0-14 3-19 8l-142 142c-6 6-8 12-8 20 0 7 2 14 8 19l38 39c6 5 12 8 20 8 7 0 14-3 19-8l84-84 188 188c5 5 12 8 19 8 8 0 14-3 20-8l38-39c6-6 8-12 8-20z" />
+<glyph unicode="&#x79;" d="M392 110c70-24 105-45 105-62 0 0 0-54 0-54 0 0-241 0-241 0 0 0-241 0-241 0 0 0 0 54 0 54 0 17 35 38 105 62 32 12 54 24 65 36 12 12 18 28 18 48 0 8-4 16-12 25-7 10-12 22-16 38-1 4-2 7-5 9-2 2-4 3-7 4-2 1-4 4-7 9-2 5-4 12-4 22 0 5 0 10 2 13 2 4 3 6 5 6 0 0 2 2 2 2-3 17-5 32-6 45-2 19 5 38 21 58 15 19 42 29 80 29 38 0 65-10 81-29 16-20 22-39 20-58 0 0-6-45-6-45 6-2 9-10 9-21 0-10-2-17-4-22-3-5-5-8-7-9-3-1-5-2-7-4-3-2-4-5-5-9-3-17-8-29-16-38-8-9-12-17-12-25 0-20 6-36 18-48 12-12 34-24 65-36z" />
+<glyph unicode="&#x7a;" d="M344 325c0-3-1-5-3-7l-112-112 112-113c2-1 3-4 3-6 0-3-1-5-3-7l-14-14c-2-2-5-3-7-3s-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3s5-1 7-3l14-14c2-2 3-4 3-6z" />
+</font></defs></svg>
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf
old mode 100644
new mode 100755
index a401ae2ddd45ba74cf37715cee04a925d9c13915..761eeeb2f424b4dbfcb696112852ebaadd780b4f
GIT binary patch
literal 25800
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
E1rz<tB>(^b

literal 12832
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

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff
old mode 100644
new mode 100755
index fbefc159a6096afaf3cae10fbf91a86aba458210..0d49fa6c9df3a31001318956eb53ded02e31aedb
GIT binary patch
literal 15000
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
ZzZmMp^-grEJ@i)yTwTyBzW(0h{{r+*hgbjr

literal 9164
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

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss
index 3d4cf5e5f11..591e73d44e7 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss
@@ -87,8 +87,6 @@ section{
         position:relative;
     }
     .icon-spinner:after{
-        color:red;
         position:absolute;
-       
     }
 }
\ No newline at end of file

From 8eac686981352a64bc9d7d77ded4dac162519676 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 8 May 2014 16:00:24 +0100
Subject: [PATCH 015/293] updated font to include new date icon

---
 .../wagtailadmin/scss/components/icons.scss   |   6 +-
 .../scss/fonts/wagtail-icomoon.json           | 146 ++++++++----------
 .../wagtailadmin/scss/fonts/wagtail.eot       | Bin 25964 -> 25940 bytes
 .../wagtailadmin/scss/fonts/wagtail.svg       |   2 +-
 .../wagtailadmin/scss/fonts/wagtail.ttf       | Bin 25800 -> 25776 bytes
 .../wagtailadmin/scss/fonts/wagtail.woff      | Bin 15000 -> 15000 bytes
 .../wagtailadmin/styleguide/base.html         |   1 +
 7 files changed, 74 insertions(+), 81 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
index 9a1351d9a91..9319d7bd12a 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
@@ -223,7 +223,7 @@
 }
 .icon-view:before{
     content:"4"; /* Credit: Icon made by Zurb from Flaticon.com */
-    font-size:1.5rem;
+    font-size:1.3rem;
 }
 .icon-collapse-down:before{
     content:"5";
@@ -240,7 +240,9 @@
 .icon-success:before{
     content:"9";
 }
-
+.icon-date:before{
+    content:"7";
+}
 .icon.text-replace{
     font-size:0em;
     line-height:0;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
index d0ffefb1e24..654e78566a7 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
@@ -11,7 +11,7 @@
 			},
 			"properties": {
 				"id": 0,
-				"order": 29,
+				"order": 1,
 				"prevSize": 32,
 				"code": 97,
 				"name": "uni61",
@@ -30,7 +30,7 @@
 			},
 			"properties": {
 				"id": 1,
-				"order": 30,
+				"order": 2,
 				"prevSize": 32,
 				"code": 98,
 				"name": "uni62",
@@ -49,7 +49,7 @@
 			},
 			"properties": {
 				"id": 2,
-				"order": 31,
+				"order": 3,
 				"prevSize": 32,
 				"code": 99,
 				"name": "uni63",
@@ -68,7 +68,7 @@
 			},
 			"properties": {
 				"id": 3,
-				"order": 32,
+				"order": 4,
 				"prevSize": 32,
 				"code": 100,
 				"name": "uni64",
@@ -87,7 +87,7 @@
 			},
 			"properties": {
 				"id": 4,
-				"order": 33,
+				"order": 5,
 				"prevSize": 32,
 				"code": 101,
 				"name": "uni65",
@@ -106,7 +106,7 @@
 			},
 			"properties": {
 				"id": 5,
-				"order": 34,
+				"order": 6,
 				"prevSize": 32,
 				"code": 102,
 				"name": "uni66",
@@ -125,7 +125,7 @@
 			},
 			"properties": {
 				"id": 6,
-				"order": 35,
+				"order": 7,
 				"prevSize": 32,
 				"code": 103,
 				"name": "uni67",
@@ -144,7 +144,7 @@
 			},
 			"properties": {
 				"id": 7,
-				"order": 36,
+				"order": 8,
 				"prevSize": 32,
 				"code": 105,
 				"name": "uni69",
@@ -163,7 +163,7 @@
 			},
 			"properties": {
 				"id": 8,
-				"order": 37,
+				"order": 9,
 				"prevSize": 32,
 				"code": 106,
 				"name": "uni6A",
@@ -182,7 +182,7 @@
 			},
 			"properties": {
 				"id": 9,
-				"order": 38,
+				"order": 10,
 				"prevSize": 32,
 				"code": 107,
 				"name": "uni6B",
@@ -201,7 +201,7 @@
 			},
 			"properties": {
 				"id": 10,
-				"order": 39,
+				"order": 11,
 				"prevSize": 32,
 				"code": 108,
 				"name": "uni6C",
@@ -220,7 +220,7 @@
 			},
 			"properties": {
 				"id": 11,
-				"order": 40,
+				"order": 12,
 				"prevSize": 32,
 				"code": 109,
 				"name": "uni6D",
@@ -239,7 +239,7 @@
 			},
 			"properties": {
 				"id": 12,
-				"order": 41,
+				"order": 13,
 				"prevSize": 32,
 				"code": 110,
 				"name": "uni6E",
@@ -258,7 +258,7 @@
 			},
 			"properties": {
 				"id": 13,
-				"order": 42,
+				"order": 14,
 				"prevSize": 32,
 				"code": 104,
 				"name": "uni68",
@@ -277,7 +277,7 @@
 			},
 			"properties": {
 				"id": 14,
-				"order": 43,
+				"order": 15,
 				"prevSize": 32,
 				"code": 111,
 				"name": "uni6F",
@@ -296,7 +296,7 @@
 			},
 			"properties": {
 				"id": 15,
-				"order": 44,
+				"order": 16,
 				"prevSize": 32,
 				"code": 112,
 				"name": "uni70",
@@ -315,7 +315,7 @@
 			},
 			"properties": {
 				"id": 16,
-				"order": 45,
+				"order": 17,
 				"prevSize": 32,
 				"code": 113,
 				"name": "uni71",
@@ -334,7 +334,7 @@
 			},
 			"properties": {
 				"id": 17,
-				"order": 46,
+				"order": 18,
 				"prevSize": 32,
 				"code": 114,
 				"name": "uni72",
@@ -353,7 +353,7 @@
 			},
 			"properties": {
 				"id": 18,
-				"order": 47,
+				"order": 19,
 				"prevSize": 32,
 				"code": 115,
 				"name": "uni73",
@@ -372,7 +372,7 @@
 			},
 			"properties": {
 				"id": 19,
-				"order": 48,
+				"order": 20,
 				"prevSize": 32,
 				"code": 116,
 				"name": "uni74",
@@ -391,7 +391,7 @@
 			},
 			"properties": {
 				"id": 20,
-				"order": 49,
+				"order": 21,
 				"prevSize": 32,
 				"code": 117,
 				"name": "uni75",
@@ -410,7 +410,7 @@
 			},
 			"properties": {
 				"id": 21,
-				"order": 50,
+				"order": 22,
 				"prevSize": 32,
 				"code": 118,
 				"name": "uni76",
@@ -429,7 +429,7 @@
 			},
 			"properties": {
 				"id": 22,
-				"order": 51,
+				"order": 23,
 				"prevSize": 32,
 				"code": 119,
 				"name": "uni77",
@@ -448,7 +448,7 @@
 			},
 			"properties": {
 				"id": 23,
-				"order": 52,
+				"order": 24,
 				"prevSize": 32,
 				"code": 120,
 				"name": "uni78",
@@ -467,7 +467,7 @@
 			},
 			"properties": {
 				"id": 24,
-				"order": 53,
+				"order": 25,
 				"prevSize": 32,
 				"code": 122,
 				"name": "uni7A",
@@ -486,7 +486,7 @@
 			},
 			"properties": {
 				"id": 25,
-				"order": 54,
+				"order": 26,
 				"prevSize": 32,
 				"code": 65,
 				"name": "uni41",
@@ -505,7 +505,7 @@
 			},
 			"properties": {
 				"id": 26,
-				"order": 55,
+				"order": 27,
 				"prevSize": 32,
 				"code": 66,
 				"name": "uni42",
@@ -524,7 +524,7 @@
 			},
 			"properties": {
 				"id": 27,
-				"order": 56,
+				"order": 28,
 				"prevSize": 32,
 				"code": 68,
 				"name": "uni44",
@@ -543,7 +543,7 @@
 			},
 			"properties": {
 				"id": 28,
-				"order": 57,
+				"order": 29,
 				"prevSize": 32,
 				"code": 67,
 				"name": "uni43",
@@ -562,7 +562,7 @@
 			},
 			"properties": {
 				"id": 29,
-				"order": 58,
+				"order": 30,
 				"prevSize": 32,
 				"code": 69,
 				"name": "uni45",
@@ -581,7 +581,7 @@
 			},
 			"properties": {
 				"id": 30,
-				"order": 59,
+				"order": 31,
 				"prevSize": 32,
 				"code": 70,
 				"name": "uni46",
@@ -600,7 +600,7 @@
 			},
 			"properties": {
 				"id": 31,
-				"order": 60,
+				"order": 32,
 				"prevSize": 32,
 				"code": 71,
 				"name": "uni47",
@@ -619,7 +619,7 @@
 			},
 			"properties": {
 				"id": 32,
-				"order": 61,
+				"order": 33,
 				"prevSize": 32,
 				"code": 72,
 				"name": "uni48",
@@ -638,7 +638,7 @@
 			},
 			"properties": {
 				"id": 33,
-				"order": 62,
+				"order": 34,
 				"prevSize": 32,
 				"code": 73,
 				"name": "uni49",
@@ -657,7 +657,7 @@
 			},
 			"properties": {
 				"id": 34,
-				"order": 63,
+				"order": 35,
 				"prevSize": 32,
 				"code": 74,
 				"name": "uni4A",
@@ -676,7 +676,7 @@
 			},
 			"properties": {
 				"id": 35,
-				"order": 64,
+				"order": 36,
 				"prevSize": 32,
 				"code": 75,
 				"name": "uni4B",
@@ -695,7 +695,7 @@
 			},
 			"properties": {
 				"id": 36,
-				"order": 65,
+				"order": 37,
 				"prevSize": 32,
 				"code": 76,
 				"name": "uni4C",
@@ -714,7 +714,7 @@
 			},
 			"properties": {
 				"id": 37,
-				"order": 66,
+				"order": 38,
 				"prevSize": 32,
 				"code": 77,
 				"name": "uni4D",
@@ -733,7 +733,7 @@
 			},
 			"properties": {
 				"id": 38,
-				"order": 67,
+				"order": 39,
 				"prevSize": 32,
 				"code": 78,
 				"name": "uni4E",
@@ -752,7 +752,7 @@
 			},
 			"properties": {
 				"id": 39,
-				"order": 68,
+				"order": 40,
 				"prevSize": 32,
 				"code": 79,
 				"name": "uni4F",
@@ -771,7 +771,7 @@
 			},
 			"properties": {
 				"id": 40,
-				"order": 69,
+				"order": 41,
 				"prevSize": 32,
 				"code": 80,
 				"name": "uni50",
@@ -790,7 +790,7 @@
 			},
 			"properties": {
 				"id": 41,
-				"order": 70,
+				"order": 42,
 				"prevSize": 32,
 				"code": 81,
 				"name": "uni51",
@@ -809,7 +809,7 @@
 			},
 			"properties": {
 				"id": 42,
-				"order": 71,
+				"order": 43,
 				"prevSize": 32,
 				"code": 121,
 				"name": "uni79",
@@ -828,7 +828,7 @@
 			},
 			"properties": {
 				"id": 43,
-				"order": 72,
+				"order": 44,
 				"prevSize": 32,
 				"code": 82,
 				"name": "uni52",
@@ -847,7 +847,7 @@
 			},
 			"properties": {
 				"id": 44,
-				"order": 73,
+				"order": 45,
 				"prevSize": 32,
 				"code": 84,
 				"name": "uni54",
@@ -866,7 +866,7 @@
 			},
 			"properties": {
 				"id": 45,
-				"order": 74,
+				"order": 46,
 				"prevSize": 32,
 				"code": 87,
 				"name": "uni57",
@@ -885,7 +885,7 @@
 			},
 			"properties": {
 				"id": 46,
-				"order": 75,
+				"order": 47,
 				"prevSize": 32,
 				"code": 88,
 				"name": "uni58",
@@ -904,7 +904,7 @@
 			},
 			"properties": {
 				"id": 47,
-				"order": 76,
+				"order": 48,
 				"prevSize": 32,
 				"code": 89,
 				"name": "uni59",
@@ -923,7 +923,7 @@
 			},
 			"properties": {
 				"id": 48,
-				"order": 77,
+				"order": 49,
 				"prevSize": 32,
 				"code": 90,
 				"name": "uni5A",
@@ -942,7 +942,7 @@
 			},
 			"properties": {
 				"id": 49,
-				"order": 78,
+				"order": 50,
 				"prevSize": 32,
 				"code": 86,
 				"name": "uni56",
@@ -961,7 +961,7 @@
 			},
 			"properties": {
 				"id": 50,
-				"order": 79,
+				"order": 51,
 				"prevSize": 32,
 				"code": 49,
 				"name": "uni31",
@@ -980,7 +980,7 @@
 			},
 			"properties": {
 				"id": 51,
-				"order": 80,
+				"order": 52,
 				"prevSize": 32,
 				"code": 85,
 				"name": "uni55",
@@ -999,7 +999,7 @@
 			},
 			"properties": {
 				"id": 52,
-				"order": 81,
+				"order": 53,
 				"prevSize": 32,
 				"code": 51,
 				"name": "uni33",
@@ -1018,7 +1018,7 @@
 			},
 			"properties": {
 				"id": 53,
-				"order": 82,
+				"order": 54,
 				"prevSize": 32,
 				"code": 50,
 				"name": "uni32",
@@ -1037,7 +1037,7 @@
 			},
 			"properties": {
 				"id": 54,
-				"order": 83,
+				"order": 55,
 				"prevSize": 32,
 				"code": 53,
 				"name": "uni35",
@@ -1056,7 +1056,7 @@
 			},
 			"properties": {
 				"id": 55,
-				"order": 84,
+				"order": 56,
 				"prevSize": 32,
 				"code": 54,
 				"name": "uni36",
@@ -1075,7 +1075,7 @@
 			},
 			"properties": {
 				"id": 56,
-				"order": 85,
+				"order": 57,
 				"prevSize": 32,
 				"code": 48,
 				"name": "uni30",
@@ -1094,7 +1094,7 @@
 			},
 			"properties": {
 				"id": 57,
-				"order": 86,
+				"order": 58,
 				"prevSize": 32,
 				"code": 63,
 				"name": "uni3F",
@@ -1113,7 +1113,7 @@
 			},
 			"properties": {
 				"id": 58,
-				"order": 87,
+				"order": 59,
 				"prevSize": 32,
 				"code": 33,
 				"name": "uni21",
@@ -1132,7 +1132,7 @@
 			},
 			"properties": {
 				"id": 59,
-				"order": 88,
+				"order": 60,
 				"prevSize": 32,
 				"code": 57,
 				"name": "uni39",
@@ -1151,7 +1151,7 @@
 			},
 			"properties": {
 				"id": 60,
-				"order": 89,
+				"order": 61,
 				"prevSize": 32,
 				"code": 83,
 				"name": "uni53",
@@ -1163,14 +1163,14 @@
 		{
 			"icon": {
 				"paths": [
-					"M512 406c16 0 30 2 44 8s26 12 36 22c10 10 18 22 22 34 6 14 10 28 10 42 0 14-4 28-10 42-4 12-12 24-22 34-10 10-22 16-36 22-14 6-28 8-44 8-16 0-30-2-44-8-14-6-26-12-36-22-10-10-18-22-22-34-6-14-10-28-10-42 0-14 4-28 10-42 4-12 12-24 22-34 10-10 22-16 36-22 14-6 28-8 44-8zM512 678c24 0 46-4 68-12s40-20 56-36c16-14 28-32 38-52 8-22 12-42 12-66 0-24-4-44-12-66-10-20-22-38-38-52-16-16-34-28-56-36-22-8-44-12-68-12-24 0-46 4-68 12-22 8-40 20-56 36-16 14-28 32-38 52-8 22-12 42-12 66 0 24 4 44 12 66 10 20 22 38 38 52 16 16 34 28 56 36 22 8 44 12 68 12zM512 290c36 0 70 4 102 12s62 20 90 34c28 12 52 28 74 44 22 18 42 34 58 50 14 16 26 32 34 46 10 16 14 28 14 36 0 8-4 20-14 36-8 14-20 30-34 46-16 16-36 32-58 50-22 16-46 32-74 44-28 14-58 26-90 34-32 8-66 12-102 12-36 0-70-4-102-12-34-8-62-20-90-34-28-12-52-28-74-44-22-18-42-34-58-50-14-16-26-32-34-46-10-16-14-28-14-36 0-8 4-20 14-36 8-14 20-30 34-46 16-16 36-32 58-50 22-16 46-32 74-44 28-14 56-26 90-34 32-8 66-12 102-12z"
+					"M512 379.619c19.982 0 37.466 2.499 54.95 9.99s32.472 14.987 44.959 27.477c12.489 12.489 22.481 27.477 27.477 42.461 7.494 17.484 12.489 34.967 12.489 52.453 0 17.484-4.994 34.967-12.489 52.453-4.994 14.987-14.987 29.973-27.477 42.461-12.489 12.489-27.477 19.982-44.959 27.477-17.484 7.494-34.967 9.99-54.95 9.99-19.982 0-37.466-2.499-54.95-9.99-17.484-7.494-32.472-14.987-44.959-27.477-12.489-12.489-22.481-27.477-27.477-42.461-7.494-17.484-12.489-34.967-12.489-52.453 0-17.484 4.994-34.967 12.489-52.453 4.994-14.987 14.987-29.973 27.477-42.461 12.489-12.489 27.477-19.982 44.959-27.477 17.484-7.494 34.967-9.99 54.95-9.99zM512 719.314c29.973 0 57.448-4.994 84.924-14.987s49.954-24.978 69.937-44.959c19.982-17.484 34.967-39.964 47.457-64.941 9.99-27.477 14.987-52.453 14.987-82.426 0-29.973-4.994-54.95-14.987-82.426-12.489-24.978-27.477-47.457-47.457-64.941-19.982-19.982-42.461-34.967-69.937-44.959-27.477-9.99-54.95-14.987-84.924-14.987-29.973 0-57.448 4.994-84.924 14.987-27.477 9.99-49.954 24.978-69.937 44.959-19.982 17.484-34.967 39.964-47.457 64.941-9.99 27.477-14.987 52.453-14.987 82.426 0 29.973 4.994 54.95 14.987 82.426 12.489 24.978 27.477 47.457 47.457 64.941 19.982 19.982 42.461 34.967 69.937 44.959 27.477 9.99 54.95 14.987 84.924 14.987zM512 234.751c44.959 0 87.422 4.994 127.384 14.987s77.431 24.978 112.398 42.461c34.967 14.987 64.941 34.967 92.417 54.95 27.477 22.481 52.453 42.461 72.435 62.443 17.484 19.982 32.472 39.964 42.461 57.448 12.489 19.982 17.484 34.967 17.484 44.959 0 9.99-4.994 24.978-17.484 44.959-9.99 17.484-24.978 37.466-42.461 57.448-19.982 19.982-44.959 39.964-72.435 62.443-27.477 19.982-57.448 39.964-92.417 54.95-34.967 17.484-72.435 32.472-112.398 42.461-39.964 9.99-82.426 14.987-127.384 14.987-44.959 0-87.422-4.994-127.384-14.987-42.461-9.99-77.431-24.978-112.398-42.461-34.967-14.987-64.941-34.967-92.417-54.95-27.477-22.481-52.453-42.461-72.435-62.443-17.484-19.982-32.472-39.964-42.461-57.448-12.489-19.982-17.484-34.967-17.484-44.959 0-9.99 4.994-24.978 17.484-44.959 9.99-17.484 24.978-37.466 42.461-57.448 19.982-19.982 44.959-39.964 72.435-62.443 27.477-19.982 57.448-39.964 92.417-54.95 34.967-17.484 69.937-32.472 112.398-42.461 39.964-9.99 82.426-14.987 127.384-14.987z"
 				],
 				"defaultCode": 52,
 				"grid": 0
 			},
 			"properties": {
 				"id": 61,
-				"order": 90,
+				"order": 62,
 				"prevSize": 32,
 				"code": 52,
 				"name": "uni34",
@@ -1189,7 +1189,7 @@
 			},
 			"properties": {
 				"id": 62,
-				"order": 91,
+				"order": 63,
 				"prevSize": 32,
 				"code": 55,
 				"name": "uni37",
@@ -1201,12 +1201,7 @@
 	],
 	"height": 1024,
 	"metadata": {
-		"name": "wagtail",
-		"url": "http://wagtail.io",
-		"designer": "",
-		"designerURL": "",
-		"license": "",
-		"licenseURL": ""
+		"name": "wagtail"
 	},
 	"preferences": {
 		"showGlyphs": true,
@@ -1216,20 +1211,15 @@
 			"metadata": {
 				"fontFamily": "wagtail",
 				"majorVersion": 1,
-				"minorVersion": 0,
-				"fontURL": "http://wagtail.io",
-				"designer": "",
-				"designerURL": "",
-				"license": "",
-				"licenseURL": ""
+				"minorVersion": 1
 			},
 			"metrics": {
 				"emSize": 512,
 				"baseline": 6.25,
 				"whitespace": 50
 			},
-			"showVersion": true,
-			"showMetadata": true
+			"embed": false,
+			"showVersion": true
 		},
 		"imagePref": {},
 		"historySize": 100,
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot
index 4de34cd4cc2c09dd87c64645cf56e85148197e11..901b36d6bb81fddc69a64639aa7e2edfe89186a5 100755
GIT binary patch
delta 1093
zcmb7DOGs2<6h8m^zxO(G9dmTloOEW)C!>z9l8|1sF)YNQg=O<Fq%_4`2t`-Qg%n7`
zRErj2A|cX3&|0>Lf)Xi+RxVsffeSYkEs9z6-x(jhu!3{%<(&WfzVqF4?p<3z?-mg2
z=mwaLvnIO#=;~ww#j@iadr)osm^(gs&}v;AoCH9(0J`RTy2CLz@bNT2_%Hx8_NW3`
z!2y+DQF)-JZ)n(p43Eku6epv%KN^-V3a<i09;x%OzVPq>wBgqP(R!5^T@3ei*O=3<
zRNkTRdk6Y24FORn5L5l22ne2wA}P*#-~?Jl7vMNNK=}&UjJzn<OVZ)ac4FZqslYye
z1q!0lAW26<eG6`CA*sNjI(KL*B@OjKybeqZ?<%w!LSDQn`nz<x0rC4bS$}GhZbj-4
zP$4*>oN<gPB?w`hz6hllt1=~A2)c!`wu5oq&>7b>NvPlqV`7UDj2Rb{NKNBR0r<b6
zq$|^u!gM+WcNhj^x~ADatsiA=dzz**W*81G98Ob6Gt(tgRO$Scx*gLgQ%vNu2S5lV
zm@!U>;9~v88N;eftc?k62eL6UsW+!efC{N8|GNF=x-zRtH4VYld^hIvSJdZqF-|PC
z4@s$18fq!FkTRys+HF#clJ=?EDd9hNuq*$`1i;V=KJ*w(tM5GnU`L&M?y_<7q&M&0
z&ip&iyUcxGz`*vO0B_>0*EgPtK%@(K5~Go?);OJ}&sZlL<5MCesdh$tsE-@Vj=RoL
z^L*wvSGy~j)s{7pJ>u@nxu3I~d&D!C=gprjI8`uHkSvT8C5zjOU;1i%BmPGJlfYET
zM9HV!?@P~>u9St!*2=Gyzpc1k*<3ka)m*g{><vDx9;;pgq<kF0i=YD}lF<*SHn9@B
F@f~okk6-`*

delta 1119
zcmaJ;O=whC6h7zPd(OS@XI?a9W?F3@W)k0MlrfBPhKhvNmT@DERFG1{F!_O@Bx+kJ
zS@mtDNO4HIanm*{DK4azQlyJgTxbwo=&B1Bq86kSL0alYdhQ$DNgwyzch5b4-}l|S
z8~Eo2($XTp^**)Dhey|E`)?n{$^J~azkV>k^Uu|%0C*l?_GWLfy8!Rp{sW+U8~|E9
zxzP93xcF=0kN1|(tmF`P#Q#}p;-ypb-EcJh9boR7#Lq5wS5CwG>K4HKVez+}>@F`(
zCKqprza;r@oj&#18PF1eg^NB8T3wk(XY&qxf>&_{j=*=gMKbqeiq%xhDyM3s$|DKd
zkwn=<+eFpICa{6^hW2YJo66c*YpS(xTDSdD&Aqlct=itipK4{Tx>&YvkYCF<vtm5v
zd+BnbDz=hyMTVrRoa())YE|2nR;5{OrfPuUl`wp@t#OU(oYk@yXa+MH_ySV_XaGxg
zY__Thnu)YFVrZ0Bs1Q|-ax$nj8Kc-(Wr*cOhS1;pv|^J2B+X*hkYXEJ(g91lVQDG3
z5|=uw2_1!sIg(&x{V9-MR<lNpN}(iM<yePgG2$p!iiV=ZxUdvh9oxtk5Fu-lo-$hr
zGE#<}3=CalIE*7pr8r?1C;k-1hJ(;~I8GVO9*8gW;K^uhturPFLZT>&nd4H)V!7b1
zWkPPGyCyG;--Ni4kp*k%;kirF|KyzY5JeOu<A_zrp(f{KqGb`rcYG<19*AQCVHkRG
zSj3^+73xr-&NVNOr>l)6qa69?u*Ji8HvVCFaK|DwF&1<Swi-qLR~Jfvg@W&BNhFev
z1y7V$Lj`bUCi>=B3J`31Z~yGjfxjV=OZjg14}JaezZ%cYVrO+}?pc1p{Ag}bkJk9I
zopzgokAok=3(@1!dUAf~^Ub{Z#IPIwX!z2|xpJ@aedTfWgV(-zePYWmTNk$e^oD!$
z<ft1xF?zRlpmuKT;Mi~Dm$zTq{yck9|Fr(sj_Do$?)+-!y@_vkb$0!_yR-XIW2LdN
aXKl|TK*8~@x(Ok`>Vx@*IJvs9@a2ETS&lRS

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
index 5cdb8e193e4..bae0168286a 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
@@ -12,7 +12,7 @@
 <glyph unicode="&#x31;" d="M75 43c-48 48-75 113-75 181 0 141 115 256 256 256l32-32-32-32c-106 0-192-86-192-192 0-51 20-100 56-136l-39-5zM256-32l-32 32 32 32c106 0 192 86 192 192 0 51-20 100-56 136l39 5 6 40c48-48 75-113 75-181 0-141-115-256-256-256z" />
 <glyph unicode="&#x32;" d="M192 288h-192l149-109-54-179 153 107 168-107-69 179 165 109h-192l-72 184z" />
 <glyph unicode="&#x33;" d="M332 394v-94h49v-98h-192v55l-152-102 152-101v54h286v286z" />
-<glyph unicode="&#x34;" d="M256 277c8 0 15-1 22-4s13-6 18-11c5-5 9-11 11-17 3-7 5-14 5-21 0-7-2-14-5-21-2-6-6-12-11-17-5-5-11-8-18-11-7-3-14-4-22-4-8 0-15 1-22 4-7 3-13 6-18 11-5 5-9 11-11 17-3 7-5 14-5 21 0 7 2 14 5 21 2 6 6 12 11 17 5 5 11 8 18 11 7 3 14 4 22 4zM256 141c12 0 23 2 34 6s20 10 28 18c8 7 14 16 19 26 4 11 6 21 6 33 0 12-2 22-6 33-5 10-11 19-19 26-8 8-17 14-28 18-11 4-22 6-34 6-12 0-23-2-34-6-11-4-20-10-28-18-8-7-14-16-19-26-4-11-6-21-6-33 0-12 2-22 6-33 5-10 11-19 19-26 8-8 17-14 28-18 11-4 22-6 34-6zM256 335c18 0 35-2 51-6s31-10 45-17c14-6 26-14 37-22 11-9 21-17 29-25 7-8 13-16 17-23 5-8 7-14 7-18 0-4-2-10-7-18-4-7-10-15-17-23-8-8-18-16-29-25-11-8-23-16-37-22-14-7-29-13-45-17-16-4-33-6-51-6-18 0-35 2-51 6-17 4-31 10-45 17-14 6-26 14-37 22-11 9-21 17-29 25-7 8-13 16-17 23-5 8-7 14-7 18 0 4 2 10 7 18 4 7 10 15 17 23 8 8 18 16 29 25 11 8 23 16 37 22 14 7 28 13 45 17 16 4 33 6 51 6z" />
+<glyph unicode="&#x34;" d="M256 290.19c9.991 0 18.733-1.25 27.475-4.995s16.236-7.493 22.48-13.738c6.245-6.245 11.24-13.738 13.738-21.231 3.747-8.742 6.245-17.483 6.245-26.226 0-8.742-2.497-17.483-6.245-26.226-2.497-7.493-7.493-14.986-13.738-21.231-6.245-6.245-13.738-9.991-22.48-13.738-8.742-3.747-17.483-4.995-27.475-4.995-9.991 0-18.733 1.25-27.475 4.995-8.742 3.747-16.236 7.493-22.48 13.738-6.244 6.245-11.24 13.738-13.738 21.231-3.747 8.742-6.244 17.483-6.244 26.226 0 8.742 2.497 17.483 6.244 26.226 2.497 7.494 7.494 14.986 13.738 21.231 6.244 6.245 13.738 9.991 22.48 13.738 8.742 3.747 17.483 4.995 27.475 4.995zM256 120.343c14.986 0 28.724 2.497 42.462 7.493s24.977 12.489 34.969 22.48c9.991 8.742 17.483 19.982 23.728 32.471 4.995 13.738 7.493 26.226 7.493 41.213 0 14.987-2.497 27.475-7.493 41.213-6.245 12.489-13.738 23.728-23.728 32.47-9.991 9.991-21.231 17.483-34.969 22.479-13.738 4.995-27.475 7.494-42.462 7.494-14.987 0-28.724-2.497-42.462-7.494-13.738-4.995-24.977-12.489-34.969-22.479-9.991-8.742-17.483-19.982-23.728-32.471-4.995-13.738-7.494-26.226-7.494-41.213 0-14.986 2.497-27.475 7.494-41.213 6.244-12.489 13.738-23.728 23.728-32.471 9.991-9.991 21.231-17.483 34.969-22.479 13.738-4.995 27.475-7.493 42.462-7.493zM256 362.625c22.48 0 43.711-2.497 63.692-7.494s38.716-12.489 56.199-21.231c17.483-7.493 32.471-17.483 46.209-27.475 13.738-11.24 26.226-21.231 36.217-31.221 8.742-9.991 16.236-19.982 21.231-28.724 6.245-9.991 8.742-17.483 8.742-22.48 0-4.995-2.497-12.489-8.742-22.48-4.995-8.742-12.489-18.733-21.231-28.724-9.991-9.991-22.48-19.982-36.217-31.221-13.738-9.991-28.724-19.982-46.209-27.475-17.483-8.742-36.218-16.236-56.199-21.231-19.982-4.995-41.213-7.493-63.692-7.493-22.48 0-43.711 2.497-63.692 7.493-21.231 4.995-38.715 12.489-56.199 21.231-17.483 7.493-32.471 17.483-46.209 27.475-13.739 11.24-26.227 21.231-36.218 31.221-8.742 9.991-16.236 19.982-21.23 28.724-6.245 9.991-8.742 17.483-8.742 22.48 0 4.995 2.497 12.489 8.742 22.48 4.995 8.742 12.489 18.733 21.23 28.724 9.991 9.991 22.48 19.982 36.218 31.221 13.739 9.991 28.724 19.982 46.209 27.475 17.483 8.742 34.969 16.236 56.199 21.231 19.982 4.995 41.213 7.494 63.692 7.494z" />
 <glyph unicode="&#x35;" d="M135 424h241v-23h-241zM405 247l-127-124v222h-45v-220l-125 122-33-32 181-181 181 181z" />
 <glyph unicode="&#x36;" d="M136 424h241v-23h-241zM108 122l126 124v-222h45v220l126-122 32 32-181 181-181-181z" />
 <glyph unicode="&#x37;" d="M416-32h-320c-53 0-96 43-96 96v320c0 42 27 77 64 90v-42c0-27 22-48 48-48s48 21 48 48v48h192v-48c0-27 22-48 48-48s48 21 48 48v42c37-13 64-48 64-90v-320c0-53-43-96-96-96zM448 320h-384v-256c0-18 14-32 32-32h320c18 0 32 14 32 32zM320 160h64v-64h-64zM320 256h64v-64h-64zM224 160h64v-64h-64zM224 256h64v-64h-64zM128 160h64v-64h-64zM128 256h64v-64h-64zM400 416c-9 0-16 7-16 16v48h32v-48c0-9-7-16-16-16zM112 416c-9 0-16 7-16 16v48h32v-48c0-9-7-16-16-16z" />
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf
index 761eeeb2f424b4dbfcb696112852ebaadd780b4f..7e50be989f21b51cc801f25f583b67c6f0d53817 100755
GIT binary patch
delta 1092
zcmb7DO-NKx6h8O=zBkSr#~d9s2YsXY%V;xdBq2r7Mv#yS7nY1aA*Cti!bS9?T38D)
zrdqTJ3ki`HM%J<*3KXQET`nY~phcUC7KMw>d*fe-{lIzea?btE_kH(V?)(CoT_6(&
zo#w@%`v7DDpkuDLC)o{$zMKL`9sz)cUM#Q`T7vmS%u9OvhesU92xC5pJsEuiT}l0_
z@Df1hL);(hPmT;i3w;gHRfl=e`DA}jZD4u<^W%u$KR9q<7#QwAH|jwVF#71ZR!$gB
zkWb_s9D{o#AAyY|LUJQ49ieQCDvNnR?Pw*5k+K*|M}1ur-Pgptpz%Z~zL~Q6x)|L6
zM(s@!7Rrv$4f;fV+}V<D*Gwz3sJ(@5yL#FKOAz2nNyep+lyc4pp)~z5&MCz*XHqG?
z73J&<lcvuU(l9jRN(xGuOU5V_QgNmYLka}Qe?#eDW<aZe<yX@0^9f-ZhU-&MXOq^o
zXBegsKA&GIzZFnAkQvlotG2ec?%Zi<uansB02t$p3LzO&Qmy@5Wh^s-`rd^845DPl
zJ2^)JuC#&vP50y`nl&^|LrI+P`h5P1`nE=fmZYOJ=NdWiQd}Z5hGtzE@1nH3i+9T8
z?+R|^KRW>^G=oi^kZF7e834Nyp{RKL&b)Rql6Pl!{;iiCfdk*cN8L99Z*DYSSzlA5
z$qo`uy-)sd#`!dVA=<^5oKkVkjnl>hbKJM=zinL&oXz|hYz?kvwPa0ZkA~WF?&d7#
z9t{uWMe=70+6rb0Rtr0eR*PGU=j~d1G};h-S~68SS^9O)hq5zeE9LR>&lQ&|-d5hM
lYOI>8ZmeF4^~IjmjMXdwK_7?dBA5WFwyuw4Z>p*L`Y-l{hu{DJ

delta 1095
zcmaJ;O=whC6u#%4d(OS@XI?a9W~|zWnZ!35Wt1^asDz+a#*L`B=%R>Wnh1j=(N>YH
zd|MHbl*Emj{;Z_UB5g%P3Kel-M08<SF1jda!G#oxrEbJ?-{?;IxaYom?)m$^@2;%E
z{Z&}ln?L#Y_CHF&f>M(YyC*x-YTx6(l<FK;O0~Ljfq&{@@t4FO?#`Z@&sE$O|CZFm
zGpDCI;b8hysW0wH{Nik9{){@TA1O6;Nc>H6o!OH+lk2PE&q)3!XHK6zr%)nl`nr!R
z)Ia^^Y~EI1!fiOBj;ilqy(I2|6sjr8DyMp&$^!}5fkfK`ZK7*KBhY|)1N|D!MzgW3
zHQL%efn$E@<}TZu&|}`jA8lo=x>&ZmmtV^`vtm5tdto`z6<f)<B12MLPH|VNTh*~j
ztJ17CQ{BVxK^VT;*0{!X&T82^G`$%Oc!#L~)Pp5EG+R|r$V7-n42(t%8bIeDCj*FN
zjAmoCA(j&v0)Ow*icJcDkj1Pa%{H`z0ZY1JX(_o9mpY3CjzY~GNieeh6i6?NjDVmu
zNV3(AF(eBSN4eJ27bV7prNClrBVRxSj3hl}wiaZh4Lcbay2x-CN0v%)!Y)qyDU1yV
zq4RK@Hpm``FZAHaAX@8;34)L)iel!tRI*SmxT8$SjdVxy!uU;y8yQ)!mL8tFB>hj$
zMGsL#0WywQha4g~Clf7;Fuvn^aj++j34~$j#bFVLa#yHBg*x}VJf1EZOGZ2L&tZ#)
z@ofCVaPN*qYGNqp7Hknj{tp*QfQ5qZXh|fJjs;JUR|BooFF%Ige3mK|tU0h}vTyvA
zisVwh$6p`3`u@Mz?My;@@qXuZe$Cu4kElyaykaNZn&4FMb9gO!QTjev=sUlb*PiHi
z{h#+Q4_q#HD?e0TRFAE@@X^TnUpGu|xVh1NJU8eDPYnKE8?Rj++COx6cxChQ<~P~j
z^{?tLw@hsLZ|jw<e~f&)t-bBe_V)JYjrqod9ZNf&D-ax?>W3;+YH{z>GuXM9O<#Ho
D*y@J~

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff
index 0d49fa6c9df3a31001318956eb53ded02e31aedb..46fcca86df2ac9f18835a9bff332a42c6dd8132e 100755
GIT binary patch
delta 445
zcmXw!zlsz=5XNr~#R0`baPdsc#K6Q$JQ0!074ZdR@gde_m+76U?&;pXt-Id-SF<z2
zF6;UR$AOsm42EXLh8l>0iEUtge0;wzsiN9ZJF<7e#qn+T@Ya>1uk409dA0xZjk6E3
zL-*-^c5v}+c(wdEAdHJJkMp2i?WC=ZFx&{_$hFYPs+LmL3Fl(Y7l1h+KNCy76h?aK
zl-EH=9WY`v!6aMnobw5nVHwW|bNuss&|_y>+u6nwQ4Ebs#jLRGvDYir$yPKFfhy1J
z%raA8ULeym#Z*-T02h@^MVDA$VM@!~EL6k^nz~c1>U5vZ{GJbXxYJv;RhxRl*P@3G
zx@rZKRtK=$!Fi1e)oCq3aRD6O<^UzIia`NWG2xSXtj21jN0?;B_MM&jNt}j)7_p`#
zpq!H+6(yZ|v}n)0BO3$7^wx^HrlX$LVH4N>z1`ZK*<G%$J$`iWZvWx?%ah^3vtN7H
d_xJwI7xzN^&+y}Tm>piee)2iXj>65Si@ytq+Lr(T

delta 445
zcmXw!F>4e-6vuCa;zA&Ta@dGn5W7@H#KJ0eA_T<l@I$1?oy*Sdo7vg9m)V&&Z+AAE
zyEJx|a*d6>UA}>>t&LdNI2QhX#p4f;_xN9)U7q;|ygR-}PwwA3U0r>nm#_D3evp5h
zozR!V?BMhF#qILboH49J8(M08;~S@}>ZFyJG_sXOY1JfDn?ftsfH|PNke%#Qm-f9T
zLv1htlQwk0k|Up>E`=^!Fy{E@;e5nsql>O5W)9T*!9_b@IpSyr9h*V*5P)kEE@?~5
zOB6<Ep=$*IQq@hRg{iQ_(pFCRifWb&y^1<%#`Na*+xaza%|>tZm73(FMu-sW0XUr|
zaMFWSs8Ji$fR+j*yw3qD5Ve333RTDtYNc0tY0mK+mv-fruAm|mRI*^vR}7p>R;)wA
zhR~t2<k<z{kZKJa`^Y0tG=+(_ZsWH0dbhpv^ytxSw)lAZZgKa;ui5_I>>oGuYWP3-
T=kX#t*}Zx8HOr3p;Q9J5gu&XE

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
index a7ad158d6a2..5dd5d61d8cd 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
@@ -374,6 +374,7 @@ <h2>Icons</h2>
                 <li class="icon icon-help">help</li>
                 <li class="icon icon-warning">warning</li>
                 <li class="icon icon-success">success</li>
+                <li class="icon icon-date">date</li>
             </ul>
 
         </section>

From c7ab17eabab61db92fa2854e43cb366d44426a87 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 8 May 2014 16:05:12 +0100
Subject: [PATCH 016/293] updated messages to use icons

---
 .../scss/components/messages.scss             | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss
index 7f58dd869cf..3db0eb14038 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss
@@ -16,14 +16,36 @@
         padding-bottom:1.3em;
         color:white;
     }
+
+    li:before{
+        margin-right:0.5em;
+        font-size:1.5em;
+        vertical-align:middle;
+    }
+
     .error{
         background-color:$color-red;
+
+        &:before{
+            font-family:wagtail;
+            content:"!";
+        }
     }
     .warning{
         background-color:$color-orange;
+
+        &:before{
+            font-family:wagtail;
+            content:"!";
+        }
     }
     .success{
         background-color:$color-teal-dark;
+
+        &:before{
+            font-family:wagtail;
+            content:"9";
+        }
     }
 }
 

From d79e3ec09aad720b183ddad9d101c48f1538e6f6 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 8 May 2014 16:32:41 +0100
Subject: [PATCH 017/293] fixing nice padding not working on header

---
 .../static/wagtailadmin/scss/components/messages.scss         | 1 +
 wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss       | 4 ----
 .../wagtailadmin/templates/wagtailadmin/styleguide/base.html  | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss
index 3db0eb14038..14d737de7bf 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss
@@ -21,6 +21,7 @@
         margin-right:0.5em;
         font-size:1.5em;
         vertical-align:middle;
+        margin-left:-0.75em;
     }
 
     .error{
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
index 8ffaa450ac5..6e35a75ea8a 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
@@ -836,10 +836,6 @@ footer, .logo{
         padding-top:1.5em;
         padding-bottom:1.5em;
 
-        &.nice-padding{
-            @include nice-padding();
-        }
-
         .left{
             float:left;
             margin-right:0;
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
index 5dd5d61d8cd..417be78c16c 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
@@ -100,14 +100,14 @@ <h2>TD with title class</h2>
                         </td>
                         <td>Regular listing TD</td>
                         <td>Regular listing TD</td>
-                    </li>
+                    </tr>
                     <tr>
                         <td class="title">
                             <h2>TD with title class</h2>
                         </td>
                         <td>Regular listing TD</td>
                         <td>Regular listing TD</td>
-                    </li>
+                    </tr>
                 </tbody>
             </table>
 

From acf15a1f1a7c8cd3c1254a2dcdb045a3be4bfc8e Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 8 May 2014 16:34:01 +0100
Subject: [PATCH 018/293] message padding on mobile fixed

---
 .../static/wagtailadmin/scss/components/messages.scss       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss
index 14d737de7bf..e5e2454f694 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss
@@ -21,7 +21,6 @@
         margin-right:0.5em;
         font-size:1.5em;
         vertical-align:middle;
-        margin-left:-0.75em;
     }
 
     .error{
@@ -69,6 +68,11 @@
         li{
             padding-left:$desktop-nice-padding;
             padding-right:$desktop-nice-padding;
+
+            &:before{
+                margin-left:-0.75em;
+            }
+
         }
         &:before{
             content: "";

From cd702d99de4909b4b604074638395296f4128371 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 8 May 2014 16:51:28 +0100
Subject: [PATCH 019/293] fixing position of jquery ui widgets

---
 .../static/wagtailadmin/scss/core.scss        |  4 ++--
 .../wagtailadmin/scss/panels/rich-text.scss   | 20 +++++--------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
index 6e35a75ea8a..2d77d76288e 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
@@ -707,7 +707,7 @@ footer, .logo{
         padding-right:$desktop-nice-padding;
     }
 
-    body{
+    .wrapper{
         margin-left:$menu-width;
     }
 
@@ -726,7 +726,7 @@ footer, .logo{
         left:0;
         height:100%;
         width:$menu-width;
-        margin-left: -$menu-width;
+        margin-left: 0;
 
         .inner{
             height:100%;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss
index 8b26f36ab00..fcc78412eaa 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss
@@ -3,14 +3,13 @@
 
 .hallotoolbar{
     position:absolute;
-    left:50px;
+    left:$mobile-nice-padding;
     z-index:5;
     margin-top:4em;
     margin-left:0em;
 }
 .hallotoolbar.affixed{
     position:fixed;
-    margin-left:140px;
     margin-top:0;
 }
 .hallotoolbar button{
@@ -149,17 +148,8 @@
     }
 }
 
-@media screen and (min-width: $breakpoint-desktop-larger){
-   /* .hallotoolbar{
-        margin:0 auto;
-        position:absolute;
-        left:-$menu-width;
-        right:0;
-        z-index:5;
-        margin-top:3em;
-    }
-    .hallotoolbar.affixed{
-        position:fixed;
-        margin:0 auto;
-    }*/
+@media screen and (min-width: $breakpoint-mobile){
+    .hallotoolbar{
+        left:$menu-width + $desktop-nice-padding;
+    }
 }

From c20b544b31a56c12ce9cf011afdca084fbe72c09 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 8 May 2014 17:38:00 +0100
Subject: [PATCH 020/293] jqui smoothness no longer required. minor updates to
 date picker and added datepicker and timepicker to styleguide

---
 .../static/wagtailadmin/js/page-editor.js     |    1 -
 .../wagtailadmin/scss/layouts/styleguide.scss |    4 +
 .../jquery-ui/jquery-ui-1.10.3.verdant.css    |    8 +-
 .../vendor/jquery-ui/jquery-ui-smoothness.css | 1177 -----------------
 .../wagtailadmin/styleguide/base.html         |   21 +
 5 files changed, 29 insertions(+), 1182 deletions(-)
 delete mode 100755 wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/jquery-ui-smoothness.css

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index f91355961bc..6c58974a29f 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -65,7 +65,6 @@ function initDateChoosers(context) {
             constrainInput: false, /* showOn: 'button', */ firstDay: 1
         });
     }
-
 }
 function initFriendlyDateChooser(id) {
     $('#' + id).datepicker({
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss
index 591e73d44e7..38d4281da9a 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss
@@ -89,4 +89,8 @@ section{
     .icon-spinner:after{
         position:absolute;
     }
+}
+
+.timepicker{
+    height:150px;
 }
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css b/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css
index 871cda747f3..830fbd06027 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css
@@ -1140,25 +1140,25 @@ body .ui-tooltip {
 .ui-corner-top,
 .ui-corner-left,
 .ui-corner-tl {
-	border-top-left-radius: 0;
+	border-top-left-radius: 3px;
 }
 .ui-corner-all,
 .ui-corner-top,
 .ui-corner-right,
 .ui-corner-tr {
-	border-top-right-radius: 0;
+	border-top-right-radius: 3px;
 }
 .ui-corner-all,
 .ui-corner-bottom,
 .ui-corner-left,
 .ui-corner-bl {
-	border-bottom-left-radius: 0;
+	border-bottom-left-radius: 3px;
 }
 .ui-corner-all,
 .ui-corner-bottom,
 .ui-corner-right,
 .ui-corner-br {
-	border-bottom-right-radius: 0;
+	border-bottom-right-radius: 3px;
 }
 
 /* Overlays */
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/jquery-ui-smoothness.css b/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/jquery-ui-smoothness.css
deleted file mode 100755
index 39ec82f20f7..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/jquery-ui-smoothness.css
+++ /dev/null
@@ -1,1177 +0,0 @@
-/*! jQuery UI - v1.10.3 - 2013-09-18
-* http://jqueryui.com
-* Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css, jquery.ui.theme.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
-* Copyright 2013 jQuery Foundation and other contributors; Licensed MIT */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden {
-	display: none;
-}
-.ui-helper-hidden-accessible {
-	border: 0;
-	clip: rect(0 0 0 0);
-	height: 1px;
-	margin: -1px;
-	overflow: hidden;
-	padding: 0;
-	position: absolute;
-	width: 1px;
-}
-.ui-helper-reset {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	outline: 0;
-	line-height: 1.3;
-	text-decoration: none;
-	font-size: 100%;
-	list-style: none;
-}
-.ui-helper-clearfix:before,
-.ui-helper-clearfix:after {
-	content: "";
-	display: table;
-	border-collapse: collapse;
-}
-.ui-helper-clearfix:after {
-	clear: both;
-}
-.ui-helper-clearfix {
-	min-height: 0; /* support: IE7 */
-}
-.ui-helper-zfix {
-	width: 100%;
-	height: 100%;
-	top: 0;
-	left: 0;
-	position: absolute;
-	opacity: 0;
-	filter:Alpha(Opacity=0);
-}
-
-.ui-front {
-	z-index: 100;
-}
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled {
-	cursor: default !important;
-}
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
-	display: block;
-	text-indent: -99999px;
-	overflow: hidden;
-	background-repeat: no-repeat;
-}
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-}
-.ui-resizable {
-	position: relative;
-}
-.ui-resizable-handle {
-	position: absolute;
-	font-size: 0.1px;
-	display: block;
-}
-.ui-resizable-disabled .ui-resizable-handle,
-.ui-resizable-autohide .ui-resizable-handle {
-	display: none;
-}
-.ui-resizable-n {
-	cursor: n-resize;
-	height: 7px;
-	width: 100%;
-	top: -5px;
-	left: 0;
-}
-.ui-resizable-s {
-	cursor: s-resize;
-	height: 7px;
-	width: 100%;
-	bottom: -5px;
-	left: 0;
-}
-.ui-resizable-e {
-	cursor: e-resize;
-	width: 7px;
-	right: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-w {
-	cursor: w-resize;
-	width: 7px;
-	left: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-se {
-	cursor: se-resize;
-	width: 12px;
-	height: 12px;
-	right: 1px;
-	bottom: 1px;
-}
-.ui-resizable-sw {
-	cursor: sw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	bottom: -5px;
-}
-.ui-resizable-nw {
-	cursor: nw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	top: -5px;
-}
-.ui-resizable-ne {
-	cursor: ne-resize;
-	width: 9px;
-	height: 9px;
-	right: -5px;
-	top: -5px;
-}
-.ui-selectable-helper {
-	position: absolute;
-	z-index: 100;
-	border: 1px dotted black;
-}
-.ui-accordion .ui-accordion-header {
-	display: block;
-	cursor: pointer;
-	position: relative;
-	margin-top: 2px;
-	padding: .5em .5em .5em .7em;
-	min-height: 0; /* support: IE7 */
-}
-.ui-accordion .ui-accordion-icons {
-	padding-left: 2.2em;
-}
-.ui-accordion .ui-accordion-noicons {
-	padding-left: .7em;
-}
-.ui-accordion .ui-accordion-icons .ui-accordion-icons {
-	padding-left: 2.2em;
-}
-.ui-accordion .ui-accordion-header .ui-accordion-header-icon {
-	position: absolute;
-	left: .5em;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-accordion .ui-accordion-content {
-	padding: 1em 2.2em;
-	border-top: 0;
-	overflow: auto;
-}
-.ui-autocomplete {
-	position: absolute;
-	top: 0;
-	left: 0;
-	cursor: default;
-}
-.ui-button {
-	display: inline-block;
-	position: relative;
-	padding: 0;
-	line-height: normal;
-	margin-right: .1em;
-	cursor: pointer;
-	vertical-align: middle;
-	text-align: center;
-	overflow: visible; /* removes extra width in IE */
-}
-.ui-button,
-.ui-button:link,
-.ui-button:visited,
-.ui-button:hover,
-.ui-button:active {
-	text-decoration: none;
-}
-/* to make room for the icon, a width needs to be set here */
-.ui-button-icon-only {
-	width: 2.2em;
-}
-/* button elements seem to need a little more width */
-button.ui-button-icon-only {
-	width: 2.4em;
-}
-.ui-button-icons-only {
-	width: 3.4em;
-}
-button.ui-button-icons-only {
-	width: 3.7em;
-}
-
-/* button text element */
-.ui-button .ui-button-text {
-	display: block;
-	line-height: normal;
-}
-.ui-button-text-only .ui-button-text {
-	padding: .4em 1em;
-}
-.ui-button-icon-only .ui-button-text,
-.ui-button-icons-only .ui-button-text {
-	padding: .4em;
-	text-indent: -9999999px;
-}
-.ui-button-text-icon-primary .ui-button-text,
-.ui-button-text-icons .ui-button-text {
-	padding: .4em 1em .4em 2.1em;
-}
-.ui-button-text-icon-secondary .ui-button-text,
-.ui-button-text-icons .ui-button-text {
-	padding: .4em 2.1em .4em 1em;
-}
-.ui-button-text-icons .ui-button-text {
-	padding-left: 2.1em;
-	padding-right: 2.1em;
-}
-/* no icon support for input elements, provide padding by default */
-input.ui-button {
-	padding: .4em 1em;
-}
-
-/* button icon element(s) */
-.ui-button-icon-only .ui-icon,
-.ui-button-text-icon-primary .ui-icon,
-.ui-button-text-icon-secondary .ui-icon,
-.ui-button-text-icons .ui-icon,
-.ui-button-icons-only .ui-icon {
-	position: absolute;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-button-icon-only .ui-icon {
-	left: 50%;
-	margin-left: -8px;
-}
-.ui-button-text-icon-primary .ui-button-icon-primary,
-.ui-button-text-icons .ui-button-icon-primary,
-.ui-button-icons-only .ui-button-icon-primary {
-	left: .5em;
-}
-.ui-button-text-icon-secondary .ui-button-icon-secondary,
-.ui-button-text-icons .ui-button-icon-secondary,
-.ui-button-icons-only .ui-button-icon-secondary {
-	right: .5em;
-}
-
-/* button sets */
-.ui-buttonset {
-	margin-right: 7px;
-}
-.ui-buttonset .ui-button {
-	margin-left: 0;
-	margin-right: -.3em;
-}
-
-/* workarounds */
-/* reset extra padding in Firefox, see h5bp.com/l */
-input.ui-button::-moz-focus-inner,
-button.ui-button::-moz-focus-inner {
-	border: 0;
-	padding: 0;
-}
-.ui-datepicker {
-	width: 17em;
-	padding: .2em .2em 0;
-	display: none;
-}
-.ui-datepicker .ui-datepicker-header {
-	position: relative;
-	padding: .2em 0;
-}
-.ui-datepicker .ui-datepicker-prev,
-.ui-datepicker .ui-datepicker-next {
-	position: absolute;
-	top: 2px;
-	width: 1.8em;
-	height: 1.8em;
-}
-.ui-datepicker .ui-datepicker-prev-hover,
-.ui-datepicker .ui-datepicker-next-hover {
-	top: 1px;
-}
-.ui-datepicker .ui-datepicker-prev {
-	left: 2px;
-}
-.ui-datepicker .ui-datepicker-next {
-	right: 2px;
-}
-.ui-datepicker .ui-datepicker-prev-hover {
-	left: 1px;
-}
-.ui-datepicker .ui-datepicker-next-hover {
-	right: 1px;
-}
-.ui-datepicker .ui-datepicker-prev span,
-.ui-datepicker .ui-datepicker-next span {
-	display: block;
-	position: absolute;
-	left: 50%;
-	margin-left: -8px;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-datepicker .ui-datepicker-title {
-	margin: 0 2.3em;
-	line-height: 1.8em;
-	text-align: center;
-}
-.ui-datepicker .ui-datepicker-title select {
-	font-size: 1em;
-	margin: 1px 0;
-}
-.ui-datepicker select.ui-datepicker-month-year {
-	width: 100%;
-}
-.ui-datepicker select.ui-datepicker-month,
-.ui-datepicker select.ui-datepicker-year {
-	width: 49%;
-}
-.ui-datepicker table {
-	width: 100%;
-	font-size: .9em;
-	border-collapse: collapse;
-	margin: 0 0 .4em;
-}
-.ui-datepicker th {
-	padding: .7em .3em;
-	text-align: center;
-	font-weight: bold;
-	border: 0;
-}
-.ui-datepicker td {
-	border: 0;
-	padding: 1px;
-}
-.ui-datepicker td span,
-.ui-datepicker td a {
-	display: block;
-	padding: .2em;
-	text-align: right;
-	text-decoration: none;
-}
-.ui-datepicker .ui-datepicker-buttonpane {
-	background-image: none;
-	margin: .7em 0 0 0;
-	padding: 0 .2em;
-	border-left: 0;
-	border-right: 0;
-	border-bottom: 0;
-}
-.ui-datepicker .ui-datepicker-buttonpane button {
-	float: right;
-	margin: .5em .2em .4em;
-	cursor: pointer;
-	padding: .2em .6em .3em .6em;
-	width: auto;
-	overflow: visible;
-}
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
-	float: left;
-}
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi {
-	width: auto;
-}
-.ui-datepicker-multi .ui-datepicker-group {
-	float: left;
-}
-.ui-datepicker-multi .ui-datepicker-group table {
-	width: 95%;
-	margin: 0 auto .4em;
-}
-.ui-datepicker-multi-2 .ui-datepicker-group {
-	width: 50%;
-}
-.ui-datepicker-multi-3 .ui-datepicker-group {
-	width: 33.3%;
-}
-.ui-datepicker-multi-4 .ui-datepicker-group {
-	width: 25%;
-}
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
-	border-left-width: 0;
-}
-.ui-datepicker-multi .ui-datepicker-buttonpane {
-	clear: left;
-}
-.ui-datepicker-row-break {
-	clear: both;
-	width: 100%;
-	font-size: 0;
-}
-
-/* RTL support */
-.ui-datepicker-rtl {
-	direction: rtl;
-}
-.ui-datepicker-rtl .ui-datepicker-prev {
-	right: 2px;
-	left: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-next {
-	left: 2px;
-	right: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-prev:hover {
-	right: 1px;
-	left: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-next:hover {
-	left: 1px;
-	right: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane {
-	clear: right;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane button {
-	float: left;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
-.ui-datepicker-rtl .ui-datepicker-group {
-	float: right;
-}
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
-	border-right-width: 0;
-	border-left-width: 1px;
-}
-.ui-dialog {
-	position: absolute;
-	top: 0;
-	left: 0;
-	padding: .2em;
-	outline: 0;
-}
-.ui-dialog .ui-dialog-titlebar {
-	padding: .4em 1em;
-	position: relative;
-}
-.ui-dialog .ui-dialog-title {
-	float: left;
-	margin: .1em 0;
-	white-space: nowrap;
-	width: 90%;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-.ui-dialog .ui-dialog-titlebar-close {
-	position: absolute;
-	right: .3em;
-	top: 50%;
-	width: 21px;
-	margin: -10px 0 0 0;
-	padding: 1px;
-	height: 20px;
-}
-.ui-dialog .ui-dialog-content {
-	position: relative;
-	border: 0;
-	padding: .5em 1em;
-	background: none;
-	overflow: auto;
-}
-.ui-dialog .ui-dialog-buttonpane {
-	text-align: left;
-	border-width: 1px 0 0 0;
-	background-image: none;
-	margin-top: .5em;
-	padding: .3em 1em .5em .4em;
-}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-	float: right;
-}
-.ui-dialog .ui-dialog-buttonpane button {
-	margin: .5em .4em .5em 0;
-	cursor: pointer;
-}
-.ui-dialog .ui-resizable-se {
-	width: 12px;
-	height: 12px;
-	right: -5px;
-	bottom: -5px;
-	background-position: 16px 16px;
-}
-.ui-draggable .ui-dialog-titlebar {
-	cursor: move;
-}
-.ui-menu {
-	list-style: none;
-	padding: 2px;
-	margin: 0;
-	display: block;
-	outline: none;
-}
-.ui-menu .ui-menu {
-	margin-top: -3px;
-	position: absolute;
-}
-.ui-menu .ui-menu-item {
-	margin: 0;
-	padding: 0;
-	width: 100%;
-	/* support: IE10, see #8844 */
-	list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
-}
-.ui-menu .ui-menu-divider {
-	margin: 5px -2px 5px -2px;
-	height: 0;
-	font-size: 0;
-	line-height: 0;
-	border-width: 1px 0 0 0;
-}
-.ui-menu .ui-menu-item a {
-	text-decoration: none;
-	display: block;
-	padding: 2px .4em;
-	line-height: 1.5;
-	min-height: 0; /* support: IE7 */
-	font-weight: normal;
-}
-.ui-menu .ui-menu-item a.ui-state-focus,
-.ui-menu .ui-menu-item a.ui-state-active {
-	font-weight: normal;
-	margin: -1px;
-}
-
-.ui-menu .ui-state-disabled {
-	font-weight: normal;
-	margin: .4em 0 .2em;
-	line-height: 1.5;
-}
-.ui-menu .ui-state-disabled a {
-	cursor: default;
-}
-
-/* icon support */
-.ui-menu-icons {
-	position: relative;
-}
-.ui-menu-icons .ui-menu-item a {
-	position: relative;
-	padding-left: 2em;
-}
-
-/* left-aligned */
-.ui-menu .ui-icon {
-	position: absolute;
-	top: .2em;
-	left: .2em;
-}
-
-/* right-aligned */
-.ui-menu .ui-menu-icon {
-	position: static;
-	float: right;
-}
-.ui-progressbar {
-	height: 2em;
-	text-align: left;
-	overflow: hidden;
-}
-.ui-progressbar .ui-progressbar-value {
-	margin: -1px;
-	height: 100%;
-}
-.ui-progressbar .ui-progressbar-overlay {
-	background: url("images/animated-overlay.gif");
-	height: 100%;
-	filter: alpha(opacity=25);
-	opacity: 0.25;
-}
-.ui-progressbar-indeterminate .ui-progressbar-value {
-	background-image: none;
-}
-.ui-slider {
-	position: relative;
-	text-align: left;
-}
-.ui-slider .ui-slider-handle {
-	position: absolute;
-	z-index: 2;
-	width: 1.2em;
-	height: 1.2em;
-	cursor: default;
-}
-.ui-slider .ui-slider-range {
-	position: absolute;
-	z-index: 1;
-	font-size: .7em;
-	display: block;
-	border: 0;
-	background-position: 0 0;
-}
-
-/* For IE8 - See #6727 */
-.ui-slider.ui-state-disabled .ui-slider-handle,
-.ui-slider.ui-state-disabled .ui-slider-range {
-	filter: inherit;
-}
-
-.ui-slider-horizontal {
-	height: .8em;
-}
-.ui-slider-horizontal .ui-slider-handle {
-	top: -.3em;
-	margin-left: -.6em;
-}
-.ui-slider-horizontal .ui-slider-range {
-	top: 0;
-	height: 100%;
-}
-.ui-slider-horizontal .ui-slider-range-min {
-	left: 0;
-}
-.ui-slider-horizontal .ui-slider-range-max {
-	right: 0;
-}
-
-.ui-slider-vertical {
-	width: .8em;
-	height: 100px;
-}
-.ui-slider-vertical .ui-slider-handle {
-	left: -.3em;
-	margin-left: 0;
-	margin-bottom: -.6em;
-}
-.ui-slider-vertical .ui-slider-range {
-	left: 0;
-	width: 100%;
-}
-.ui-slider-vertical .ui-slider-range-min {
-	bottom: 0;
-}
-.ui-slider-vertical .ui-slider-range-max {
-	top: 0;
-}
-.ui-spinner {
-	position: relative;
-	display: inline-block;
-	overflow: hidden;
-	padding: 0;
-	vertical-align: middle;
-}
-.ui-spinner-input {
-	border: none;
-	background: none;
-	color: inherit;
-	padding: 0;
-	margin: .2em 0;
-	vertical-align: middle;
-	margin-left: .4em;
-	margin-right: 22px;
-}
-.ui-spinner-button {
-	width: 16px;
-	height: 50%;
-	font-size: .5em;
-	padding: 0;
-	margin: 0;
-	text-align: center;
-	position: absolute;
-	cursor: default;
-	display: block;
-	overflow: hidden;
-	right: 0;
-}
-/* more specificity required here to overide default borders */
-.ui-spinner a.ui-spinner-button {
-	border-top: none;
-	border-bottom: none;
-	border-right: none;
-}
-/* vertical centre icon */
-.ui-spinner .ui-icon {
-	position: absolute;
-	margin-top: -8px;
-	top: 50%;
-	left: 0;
-}
-.ui-spinner-up {
-	top: 0;
-}
-.ui-spinner-down {
-	bottom: 0;
-}
-
-/* TR overrides */
-.ui-spinner .ui-icon-triangle-1-s {
-	/* need to fix icons sprite */
-	background-position: -65px -16px;
-}
-.ui-tabs {
-	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-	padding: .2em;
-}
-.ui-tabs .ui-tabs-nav {
-	margin: 0;
-	padding: .2em .2em 0;
-}
-.ui-tabs .ui-tabs-nav li {
-	list-style: none;
-	float: left;
-	position: relative;
-	top: 0;
-	margin: 1px .2em 0 0;
-	border-bottom-width: 0;
-	padding: 0;
-	white-space: nowrap;
-}
-.ui-tabs .ui-tabs-nav li a {
-	float: left;
-	padding: .5em 1em;
-	text-decoration: none;
-}
-.ui-tabs .ui-tabs-nav li.ui-tabs-active {
-	margin-bottom: -1px;
-	padding-bottom: 1px;
-}
-.ui-tabs .ui-tabs-nav li.ui-tabs-active a,
-.ui-tabs .ui-tabs-nav li.ui-state-disabled a,
-.ui-tabs .ui-tabs-nav li.ui-tabs-loading a {
-	cursor: text;
-}
-.ui-tabs .ui-tabs-nav li a, /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a {
-	cursor: pointer;
-}
-.ui-tabs .ui-tabs-panel {
-	display: block;
-	border-width: 0;
-	padding: 1em 1.4em;
-	background: none;
-}
-.ui-tooltip {
-	padding: 8px;
-	position: absolute;
-	z-index: 9999;
-	max-width: 300px;
-	-webkit-box-shadow: 0 0 5px #aaa;
-	box-shadow: 0 0 5px #aaa;
-}
-body .ui-tooltip {
-	border-width: 2px;
-}
-
-/* Component containers
-----------------------------------*/
-.ui-widget {
-	font-family: Verdana,Arial,sans-serif;
-	font-size: 1.1em;
-}
-.ui-widget .ui-widget {
-	font-size: 1em;
-}
-.ui-widget input,
-.ui-widget select,
-.ui-widget textarea,
-.ui-widget button {
-	font-family: Verdana,Arial,sans-serif;
-	font-size: 1em;
-}
-.ui-widget-content {
-	border: 1px solid #aaaaaa;
-	background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
-	color: #222222;
-}
-.ui-widget-content a {
-	color: #222222;
-}
-.ui-widget-header {
-	border: 1px solid #aaaaaa;
-	background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
-	color: #222222;
-	font-weight: bold;
-}
-.ui-widget-header a {
-	color: #222222;
-}
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default,
-.ui-widget-content .ui-state-default,
-.ui-widget-header .ui-state-default {
-	border: 1px solid #d3d3d3;
-	background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x;
-	font-weight: normal;
-	color: #555555;
-}
-.ui-state-default a,
-.ui-state-default a:link,
-.ui-state-default a:visited {
-	color: #555555;
-	text-decoration: none;
-}
-.ui-state-hover,
-.ui-widget-content .ui-state-hover,
-.ui-widget-header .ui-state-hover,
-.ui-state-focus,
-.ui-widget-content .ui-state-focus,
-.ui-widget-header .ui-state-focus {
-	border: 1px solid #999999;
-	background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;
-	font-weight: normal;
-	color: #212121;
-}
-.ui-state-hover a,
-.ui-state-hover a:hover,
-.ui-state-hover a:link,
-.ui-state-hover a:visited {
-	color: #212121;
-	text-decoration: none;
-}
-.ui-state-active,
-.ui-widget-content .ui-state-active,
-.ui-widget-header .ui-state-active {
-	border: 1px solid #aaaaaa;
-	background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;
-	font-weight: normal;
-	color: #212121;
-}
-.ui-state-active a,
-.ui-state-active a:link,
-.ui-state-active a:visited {
-	color: #212121;
-	text-decoration: none;
-}
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight,
-.ui-widget-content .ui-state-highlight,
-.ui-widget-header .ui-state-highlight {
-	border: 1px solid #fcefa1;
-	background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x;
-	color: #363636;
-}
-.ui-state-highlight a,
-.ui-widget-content .ui-state-highlight a,
-.ui-widget-header .ui-state-highlight a {
-	color: #363636;
-}
-.ui-state-error,
-.ui-widget-content .ui-state-error,
-.ui-widget-header .ui-state-error {
-	border: 1px solid #cd0a0a;
-	background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x;
-	color: #cd0a0a;
-}
-.ui-state-error a,
-.ui-widget-content .ui-state-error a,
-.ui-widget-header .ui-state-error a {
-	color: #cd0a0a;
-}
-.ui-state-error-text,
-.ui-widget-content .ui-state-error-text,
-.ui-widget-header .ui-state-error-text {
-	color: #cd0a0a;
-}
-.ui-priority-primary,
-.ui-widget-content .ui-priority-primary,
-.ui-widget-header .ui-priority-primary {
-	font-weight: bold;
-}
-.ui-priority-secondary,
-.ui-widget-content .ui-priority-secondary,
-.ui-widget-header .ui-priority-secondary {
-	opacity: .7;
-	filter:Alpha(Opacity=70);
-	font-weight: normal;
-}
-.ui-state-disabled,
-.ui-widget-content .ui-state-disabled,
-.ui-widget-header .ui-state-disabled {
-	opacity: .35;
-	filter:Alpha(Opacity=35);
-	background-image: none;
-}
-.ui-state-disabled .ui-icon {
-	filter:Alpha(Opacity=35); /* For IE8 - See #6059 */
-}
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
-	width: 16px;
-	height: 16px;
-}
-.ui-icon,
-.ui-widget-content .ui-icon {
-	background-image: url(images/ui-icons_222222_256x240.png);
-}
-.ui-widget-header .ui-icon {
-	background-image: url(images/ui-icons_222222_256x240.png);
-}
-.ui-state-default .ui-icon {
-	background-image: url(images/ui-icons_888888_256x240.png);
-}
-.ui-state-hover .ui-icon,
-.ui-state-focus .ui-icon {
-	background-image: url(images/ui-icons_454545_256x240.png);
-}
-.ui-state-active .ui-icon {
-	background-image: url(images/ui-icons_454545_256x240.png);
-}
-.ui-state-highlight .ui-icon {
-	background-image: url(images/ui-icons_2e83ff_256x240.png);
-}
-.ui-state-error .ui-icon,
-.ui-state-error-text .ui-icon {
-	background-image: url(images/ui-icons_cd0a0a_256x240.png);
-}
-
-/* positioning */
-.ui-icon-blank { background-position: 16px 16px; }
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-on { background-position: -96px -144px; }
-.ui-icon-radio-off { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-left,
-.ui-corner-tl {
-	border-top-left-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-right,
-.ui-corner-tr {
-	border-top-right-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-left,
-.ui-corner-bl {
-	border-bottom-left-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-right,
-.ui-corner-br {
-	border-bottom-right-radius: 4px;
-}
-
-/* Overlays */
-.ui-widget-overlay {
-	background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
-	opacity: .3;
-	filter: Alpha(Opacity=30);
-}
-.ui-widget-shadow {
-	margin: -8px 0 0 -8px;
-	padding: 8px;
-	background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
-	opacity: .3;
-	filter: Alpha(Opacity=30);
-	border-radius: 8px;
-}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
index 417be78c16c..2cdd85df49a 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
@@ -247,6 +247,15 @@ <h2>Forms</h2>
                     <li><input type="submit" value="{% trans 'Save' %}" /><a href="#" class="button button-secondary no">{% trans "Delete image" %}</a></li>
                 </ul>
             </form>
+
+            <h3>Date picker</h3>
+            <div class="datepicker"></div>
+
+            <h3>Time picker</h3>
+            <div class="timepicker"></div>
+
+
+
             <p>TODO: Rich text</p>            
             <p>TODO: page chooser</p>
             <p>TODO: image chooser</p>
@@ -381,4 +390,16 @@ <h2>Icons</h2>
 
 
     </div>
+
+   
+{% endblock %}
+
+{% block extra_js %}
+<script>
+    $(function(){
+        $('.datepicker').datepicker();
+        $('.timepicker').timepicker();
+        $('.timepicker').timepicker('show');
+    })
+</script>
 {% endblock %}
\ No newline at end of file

From 5a840c421bc813c71206aff9d4a6ba5172b6939f Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Tue, 13 May 2014 13:05:46 +0100
Subject: [PATCH 021/293] added form icon to font, font icomoon project and
 styleguide

---
 .../wagtailadmin/scss/components/icons.scss   |   3 +
 .../scss/fonts/wagtail-icomoon.json           | 282 ++++++++++--------
 .../wagtailadmin/scss/fonts/wagtail.eot       | Bin 25940 -> 26032 bytes
 .../wagtailadmin/scss/fonts/wagtail.svg       |   1 +
 .../wagtailadmin/scss/fonts/wagtail.ttf       | Bin 25776 -> 25868 bytes
 .../wagtailadmin/scss/fonts/wagtail.woff      | Bin 15000 -> 15080 bytes
 .../wagtailadmin/styleguide/base.html         |   1 +
 7 files changed, 158 insertions(+), 129 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
index 9319d7bd12a..a1aa3cca046 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
@@ -243,6 +243,9 @@
 .icon-date:before{
     content:"7";
 }
+.icon-form:before{
+    content:"$";
+}
 .icon.text-replace{
     font-size:0em;
     line-height:0;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
index 654e78566a7..fead2733b81 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
@@ -1,6 +1,27 @@
 {
 	"IcoMoonType": "selection",
 	"icons": [
+		{
+			"icon": {
+				"paths": [
+					"M102.030 101.608v819.555h819.555v-819.555h-819.555zM352.717 791.689h-165.288v-85.398h301.65v85.398zM792.109 360.562h-604.678v-128.099h603.303v128.099zM790.731 591.965h-603.303v-128.099h603.303v128.099z"
+				],
+				"grid": 0,
+				"tags": [
+					"form"
+				]
+			},
+			"properties": {
+				"order": 1,
+				"id": 63,
+				"prevSize": 32,
+				"code": 36,
+				"name": "form",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 0
+		},
 		{
 			"icon": {
 				"paths": [
@@ -11,14 +32,14 @@
 			},
 			"properties": {
 				"id": 0,
-				"order": 1,
+				"order": 2,
 				"prevSize": 32,
 				"code": 97,
 				"name": "uni61",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 0
+			"iconIdx": 1
 		},
 		{
 			"icon": {
@@ -30,14 +51,14 @@
 			},
 			"properties": {
 				"id": 1,
-				"order": 2,
+				"order": 3,
 				"prevSize": 32,
 				"code": 98,
 				"name": "uni62",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 1
+			"iconIdx": 2
 		},
 		{
 			"icon": {
@@ -49,14 +70,14 @@
 			},
 			"properties": {
 				"id": 2,
-				"order": 3,
+				"order": 4,
 				"prevSize": 32,
 				"code": 99,
 				"name": "uni63",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 2
+			"iconIdx": 3
 		},
 		{
 			"icon": {
@@ -68,14 +89,14 @@
 			},
 			"properties": {
 				"id": 3,
-				"order": 4,
+				"order": 5,
 				"prevSize": 32,
 				"code": 100,
 				"name": "uni64",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 3
+			"iconIdx": 4
 		},
 		{
 			"icon": {
@@ -87,14 +108,14 @@
 			},
 			"properties": {
 				"id": 4,
-				"order": 5,
+				"order": 6,
 				"prevSize": 32,
 				"code": 101,
 				"name": "uni65",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 4
+			"iconIdx": 5
 		},
 		{
 			"icon": {
@@ -106,14 +127,14 @@
 			},
 			"properties": {
 				"id": 5,
-				"order": 6,
+				"order": 7,
 				"prevSize": 32,
 				"code": 102,
 				"name": "uni66",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 5
+			"iconIdx": 6
 		},
 		{
 			"icon": {
@@ -125,14 +146,14 @@
 			},
 			"properties": {
 				"id": 6,
-				"order": 7,
+				"order": 8,
 				"prevSize": 32,
 				"code": 103,
 				"name": "uni67",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 6
+			"iconIdx": 7
 		},
 		{
 			"icon": {
@@ -144,14 +165,14 @@
 			},
 			"properties": {
 				"id": 7,
-				"order": 8,
+				"order": 9,
 				"prevSize": 32,
 				"code": 105,
 				"name": "uni69",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 7
+			"iconIdx": 8
 		},
 		{
 			"icon": {
@@ -163,14 +184,14 @@
 			},
 			"properties": {
 				"id": 8,
-				"order": 9,
+				"order": 10,
 				"prevSize": 32,
 				"code": 106,
 				"name": "uni6A",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 8
+			"iconIdx": 9
 		},
 		{
 			"icon": {
@@ -182,14 +203,14 @@
 			},
 			"properties": {
 				"id": 9,
-				"order": 10,
+				"order": 11,
 				"prevSize": 32,
 				"code": 107,
 				"name": "uni6B",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 9
+			"iconIdx": 10
 		},
 		{
 			"icon": {
@@ -201,14 +222,14 @@
 			},
 			"properties": {
 				"id": 10,
-				"order": 11,
+				"order": 12,
 				"prevSize": 32,
 				"code": 108,
 				"name": "uni6C",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 10
+			"iconIdx": 11
 		},
 		{
 			"icon": {
@@ -220,14 +241,14 @@
 			},
 			"properties": {
 				"id": 11,
-				"order": 12,
+				"order": 13,
 				"prevSize": 32,
 				"code": 109,
 				"name": "uni6D",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 11
+			"iconIdx": 12
 		},
 		{
 			"icon": {
@@ -239,14 +260,14 @@
 			},
 			"properties": {
 				"id": 12,
-				"order": 13,
+				"order": 14,
 				"prevSize": 32,
 				"code": 110,
 				"name": "uni6E",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 12
+			"iconIdx": 13
 		},
 		{
 			"icon": {
@@ -258,14 +279,14 @@
 			},
 			"properties": {
 				"id": 13,
-				"order": 14,
+				"order": 15,
 				"prevSize": 32,
 				"code": 104,
 				"name": "uni68",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 13
+			"iconIdx": 14
 		},
 		{
 			"icon": {
@@ -277,14 +298,14 @@
 			},
 			"properties": {
 				"id": 14,
-				"order": 15,
+				"order": 16,
 				"prevSize": 32,
 				"code": 111,
 				"name": "uni6F",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 14
+			"iconIdx": 15
 		},
 		{
 			"icon": {
@@ -296,14 +317,14 @@
 			},
 			"properties": {
 				"id": 15,
-				"order": 16,
+				"order": 17,
 				"prevSize": 32,
 				"code": 112,
 				"name": "uni70",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 15
+			"iconIdx": 16
 		},
 		{
 			"icon": {
@@ -315,14 +336,14 @@
 			},
 			"properties": {
 				"id": 16,
-				"order": 17,
+				"order": 18,
 				"prevSize": 32,
 				"code": 113,
 				"name": "uni71",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 16
+			"iconIdx": 17
 		},
 		{
 			"icon": {
@@ -334,14 +355,14 @@
 			},
 			"properties": {
 				"id": 17,
-				"order": 18,
+				"order": 19,
 				"prevSize": 32,
 				"code": 114,
 				"name": "uni72",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 17
+			"iconIdx": 18
 		},
 		{
 			"icon": {
@@ -353,14 +374,14 @@
 			},
 			"properties": {
 				"id": 18,
-				"order": 19,
+				"order": 20,
 				"prevSize": 32,
 				"code": 115,
 				"name": "uni73",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 18
+			"iconIdx": 19
 		},
 		{
 			"icon": {
@@ -372,14 +393,14 @@
 			},
 			"properties": {
 				"id": 19,
-				"order": 20,
+				"order": 21,
 				"prevSize": 32,
 				"code": 116,
 				"name": "uni74",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 19
+			"iconIdx": 20
 		},
 		{
 			"icon": {
@@ -391,14 +412,14 @@
 			},
 			"properties": {
 				"id": 20,
-				"order": 21,
+				"order": 22,
 				"prevSize": 32,
 				"code": 117,
 				"name": "uni75",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 20
+			"iconIdx": 21
 		},
 		{
 			"icon": {
@@ -410,14 +431,14 @@
 			},
 			"properties": {
 				"id": 21,
-				"order": 22,
+				"order": 23,
 				"prevSize": 32,
 				"code": 118,
 				"name": "uni76",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 21
+			"iconIdx": 22
 		},
 		{
 			"icon": {
@@ -429,14 +450,14 @@
 			},
 			"properties": {
 				"id": 22,
-				"order": 23,
+				"order": 24,
 				"prevSize": 32,
 				"code": 119,
 				"name": "uni77",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 22
+			"iconIdx": 23
 		},
 		{
 			"icon": {
@@ -448,14 +469,14 @@
 			},
 			"properties": {
 				"id": 23,
-				"order": 24,
+				"order": 25,
 				"prevSize": 32,
 				"code": 120,
 				"name": "uni78",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 23
+			"iconIdx": 24
 		},
 		{
 			"icon": {
@@ -467,14 +488,14 @@
 			},
 			"properties": {
 				"id": 24,
-				"order": 25,
+				"order": 26,
 				"prevSize": 32,
 				"code": 122,
 				"name": "uni7A",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 24
+			"iconIdx": 25
 		},
 		{
 			"icon": {
@@ -486,14 +507,14 @@
 			},
 			"properties": {
 				"id": 25,
-				"order": 26,
+				"order": 27,
 				"prevSize": 32,
 				"code": 65,
 				"name": "uni41",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 25
+			"iconIdx": 26
 		},
 		{
 			"icon": {
@@ -505,14 +526,14 @@
 			},
 			"properties": {
 				"id": 26,
-				"order": 27,
+				"order": 28,
 				"prevSize": 32,
 				"code": 66,
 				"name": "uni42",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 26
+			"iconIdx": 27
 		},
 		{
 			"icon": {
@@ -524,14 +545,14 @@
 			},
 			"properties": {
 				"id": 27,
-				"order": 28,
+				"order": 29,
 				"prevSize": 32,
 				"code": 68,
 				"name": "uni44",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 27
+			"iconIdx": 28
 		},
 		{
 			"icon": {
@@ -543,14 +564,14 @@
 			},
 			"properties": {
 				"id": 28,
-				"order": 29,
+				"order": 30,
 				"prevSize": 32,
 				"code": 67,
 				"name": "uni43",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 28
+			"iconIdx": 29
 		},
 		{
 			"icon": {
@@ -562,14 +583,14 @@
 			},
 			"properties": {
 				"id": 29,
-				"order": 30,
+				"order": 31,
 				"prevSize": 32,
 				"code": 69,
 				"name": "uni45",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 29
+			"iconIdx": 30
 		},
 		{
 			"icon": {
@@ -581,14 +602,14 @@
 			},
 			"properties": {
 				"id": 30,
-				"order": 31,
+				"order": 32,
 				"prevSize": 32,
 				"code": 70,
 				"name": "uni46",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 30
+			"iconIdx": 31
 		},
 		{
 			"icon": {
@@ -600,14 +621,14 @@
 			},
 			"properties": {
 				"id": 31,
-				"order": 32,
+				"order": 33,
 				"prevSize": 32,
 				"code": 71,
 				"name": "uni47",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 31
+			"iconIdx": 32
 		},
 		{
 			"icon": {
@@ -619,14 +640,14 @@
 			},
 			"properties": {
 				"id": 32,
-				"order": 33,
+				"order": 34,
 				"prevSize": 32,
 				"code": 72,
 				"name": "uni48",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 32
+			"iconIdx": 33
 		},
 		{
 			"icon": {
@@ -638,14 +659,14 @@
 			},
 			"properties": {
 				"id": 33,
-				"order": 34,
+				"order": 35,
 				"prevSize": 32,
 				"code": 73,
 				"name": "uni49",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 33
+			"iconIdx": 34
 		},
 		{
 			"icon": {
@@ -657,14 +678,14 @@
 			},
 			"properties": {
 				"id": 34,
-				"order": 35,
+				"order": 36,
 				"prevSize": 32,
 				"code": 74,
 				"name": "uni4A",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 34
+			"iconIdx": 35
 		},
 		{
 			"icon": {
@@ -676,14 +697,14 @@
 			},
 			"properties": {
 				"id": 35,
-				"order": 36,
+				"order": 37,
 				"prevSize": 32,
 				"code": 75,
 				"name": "uni4B",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 35
+			"iconIdx": 36
 		},
 		{
 			"icon": {
@@ -695,14 +716,14 @@
 			},
 			"properties": {
 				"id": 36,
-				"order": 37,
+				"order": 38,
 				"prevSize": 32,
 				"code": 76,
 				"name": "uni4C",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 36
+			"iconIdx": 37
 		},
 		{
 			"icon": {
@@ -714,14 +735,14 @@
 			},
 			"properties": {
 				"id": 37,
-				"order": 38,
+				"order": 39,
 				"prevSize": 32,
 				"code": 77,
 				"name": "uni4D",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 37
+			"iconIdx": 38
 		},
 		{
 			"icon": {
@@ -733,14 +754,14 @@
 			},
 			"properties": {
 				"id": 38,
-				"order": 39,
+				"order": 40,
 				"prevSize": 32,
 				"code": 78,
 				"name": "uni4E",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 38
+			"iconIdx": 39
 		},
 		{
 			"icon": {
@@ -752,14 +773,14 @@
 			},
 			"properties": {
 				"id": 39,
-				"order": 40,
+				"order": 41,
 				"prevSize": 32,
 				"code": 79,
 				"name": "uni4F",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 39
+			"iconIdx": 40
 		},
 		{
 			"icon": {
@@ -771,14 +792,14 @@
 			},
 			"properties": {
 				"id": 40,
-				"order": 41,
+				"order": 42,
 				"prevSize": 32,
 				"code": 80,
 				"name": "uni50",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 40
+			"iconIdx": 41
 		},
 		{
 			"icon": {
@@ -790,14 +811,14 @@
 			},
 			"properties": {
 				"id": 41,
-				"order": 42,
+				"order": 43,
 				"prevSize": 32,
 				"code": 81,
 				"name": "uni51",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 41
+			"iconIdx": 42
 		},
 		{
 			"icon": {
@@ -809,14 +830,14 @@
 			},
 			"properties": {
 				"id": 42,
-				"order": 43,
+				"order": 44,
 				"prevSize": 32,
 				"code": 121,
 				"name": "uni79",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 42
+			"iconIdx": 43
 		},
 		{
 			"icon": {
@@ -828,14 +849,14 @@
 			},
 			"properties": {
 				"id": 43,
-				"order": 44,
+				"order": 45,
 				"prevSize": 32,
 				"code": 82,
 				"name": "uni52",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 43
+			"iconIdx": 44
 		},
 		{
 			"icon": {
@@ -847,14 +868,14 @@
 			},
 			"properties": {
 				"id": 44,
-				"order": 45,
+				"order": 46,
 				"prevSize": 32,
 				"code": 84,
 				"name": "uni54",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 44
+			"iconIdx": 45
 		},
 		{
 			"icon": {
@@ -866,14 +887,14 @@
 			},
 			"properties": {
 				"id": 45,
-				"order": 46,
+				"order": 47,
 				"prevSize": 32,
 				"code": 87,
 				"name": "uni57",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 45
+			"iconIdx": 46
 		},
 		{
 			"icon": {
@@ -885,14 +906,14 @@
 			},
 			"properties": {
 				"id": 46,
-				"order": 47,
+				"order": 48,
 				"prevSize": 32,
 				"code": 88,
 				"name": "uni58",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 46
+			"iconIdx": 47
 		},
 		{
 			"icon": {
@@ -904,14 +925,14 @@
 			},
 			"properties": {
 				"id": 47,
-				"order": 48,
+				"order": 49,
 				"prevSize": 32,
 				"code": 89,
 				"name": "uni59",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 47
+			"iconIdx": 48
 		},
 		{
 			"icon": {
@@ -923,14 +944,14 @@
 			},
 			"properties": {
 				"id": 48,
-				"order": 49,
+				"order": 50,
 				"prevSize": 32,
 				"code": 90,
 				"name": "uni5A",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 48
+			"iconIdx": 49
 		},
 		{
 			"icon": {
@@ -942,14 +963,14 @@
 			},
 			"properties": {
 				"id": 49,
-				"order": 50,
+				"order": 51,
 				"prevSize": 32,
 				"code": 86,
 				"name": "uni56",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 49
+			"iconIdx": 50
 		},
 		{
 			"icon": {
@@ -961,14 +982,14 @@
 			},
 			"properties": {
 				"id": 50,
-				"order": 51,
+				"order": 52,
 				"prevSize": 32,
 				"code": 49,
 				"name": "uni31",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 50
+			"iconIdx": 51
 		},
 		{
 			"icon": {
@@ -980,14 +1001,14 @@
 			},
 			"properties": {
 				"id": 51,
-				"order": 52,
+				"order": 53,
 				"prevSize": 32,
 				"code": 85,
 				"name": "uni55",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 51
+			"iconIdx": 52
 		},
 		{
 			"icon": {
@@ -999,14 +1020,14 @@
 			},
 			"properties": {
 				"id": 52,
-				"order": 53,
+				"order": 54,
 				"prevSize": 32,
 				"code": 51,
 				"name": "uni33",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 52
+			"iconIdx": 53
 		},
 		{
 			"icon": {
@@ -1018,14 +1039,14 @@
 			},
 			"properties": {
 				"id": 53,
-				"order": 54,
+				"order": 55,
 				"prevSize": 32,
 				"code": 50,
 				"name": "uni32",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 53
+			"iconIdx": 54
 		},
 		{
 			"icon": {
@@ -1037,14 +1058,14 @@
 			},
 			"properties": {
 				"id": 54,
-				"order": 55,
+				"order": 56,
 				"prevSize": 32,
 				"code": 53,
 				"name": "uni35",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 54
+			"iconIdx": 55
 		},
 		{
 			"icon": {
@@ -1056,14 +1077,14 @@
 			},
 			"properties": {
 				"id": 55,
-				"order": 56,
+				"order": 57,
 				"prevSize": 32,
 				"code": 54,
 				"name": "uni36",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 55
+			"iconIdx": 56
 		},
 		{
 			"icon": {
@@ -1075,14 +1096,14 @@
 			},
 			"properties": {
 				"id": 56,
-				"order": 57,
+				"order": 58,
 				"prevSize": 32,
 				"code": 48,
 				"name": "uni30",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 56
+			"iconIdx": 57
 		},
 		{
 			"icon": {
@@ -1094,14 +1115,14 @@
 			},
 			"properties": {
 				"id": 57,
-				"order": 58,
+				"order": 59,
 				"prevSize": 32,
 				"code": 63,
 				"name": "uni3F",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 57
+			"iconIdx": 58
 		},
 		{
 			"icon": {
@@ -1113,14 +1134,14 @@
 			},
 			"properties": {
 				"id": 58,
-				"order": 59,
+				"order": 60,
 				"prevSize": 32,
 				"code": 33,
 				"name": "uni21",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 58
+			"iconIdx": 59
 		},
 		{
 			"icon": {
@@ -1132,14 +1153,14 @@
 			},
 			"properties": {
 				"id": 59,
-				"order": 60,
+				"order": 61,
 				"prevSize": 32,
 				"code": 57,
 				"name": "uni39",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 59
+			"iconIdx": 60
 		},
 		{
 			"icon": {
@@ -1151,14 +1172,14 @@
 			},
 			"properties": {
 				"id": 60,
-				"order": 61,
+				"order": 62,
 				"prevSize": 32,
 				"code": 83,
 				"name": "uni53",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 60
+			"iconIdx": 61
 		},
 		{
 			"icon": {
@@ -1170,14 +1191,14 @@
 			},
 			"properties": {
 				"id": 61,
-				"order": 62,
+				"order": 63,
 				"prevSize": 32,
 				"code": 52,
 				"name": "uni34",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 61
+			"iconIdx": 62
 		},
 		{
 			"icon": {
@@ -1189,14 +1210,14 @@
 			},
 			"properties": {
 				"id": 62,
-				"order": 63,
+				"order": 64,
 				"prevSize": 32,
 				"code": 55,
 				"name": "uni37",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 62
+			"iconIdx": 63
 		}
 	],
 	"height": 1024,
@@ -1211,15 +1232,18 @@
 			"metadata": {
 				"fontFamily": "wagtail",
 				"majorVersion": 1,
-				"minorVersion": 1
+				"minorVersion": 0
 			},
 			"metrics": {
 				"emSize": 512,
 				"baseline": 6.25,
 				"whitespace": 50
 			},
-			"embed": false,
-			"showVersion": true
+			"includeMetadata": false,
+			"showMetrics": false,
+			"showMetadata": false,
+			"showVersion": false,
+			"resetPoint": 33
 		},
 		"imagePref": {},
 		"historySize": 100,
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot
index 901b36d6bb81fddc69a64639aa7e2edfe89186a5..c5d6b5cc58b948ee1c15f5abeb6970cb759b23b8 100755
GIT binary patch
delta 564
zcmca|igCkfMz#&93=BM}6WPpIUM0`dn&{xeXfV-VbmAhVdd5)3ISdSpG7Jn1CFzO9
z1wdK=$e#eDInr|~(^S<LegN`kFfb%AWTYmhF!*gtW?)DJ@)^uBfC9{qm{fuM3qZa~
zMs7((BLj~&kpBg!M<6FZIZ-K;_ZkC3G7C_?D>t#CfWe>X9FPw(Um-6sS2ERrZ^cQV
zzy_cO%Yyvk5(Z|V6hq3J$uW%8o(Vvv2+%>y3@i+c42ldY4CV}$4E79B3|0UC{{IhB
z$)ErfH2{k`G9-dU8UH{2|M35{|5yKC_<#QYNuX}V$&RVQo3)wL7(H1Sj2VO(&oZtB
z8p+AP#~{qWAS|dTs3@##YAkB5XsReG3L=adXZ=g74Vpgv-z7%ff0r3`8Q1<x1Bxxz
z*1qB3P~zagu-T7!L7W@|gQ3RBeewJ@Um3WW!0tIeeb;3W14K{eNivso0SiM3Mj#DT
z#{<O1n<J7~80#6fFr8u+Vb)@HVA;ZQj^zbw6YDy*Q|u8OTAVGMXSlZTu<-8TTg5*?
zP(iRlNJ*$f=$Obd(I&AY;w<7h5;G)Sq^?QVNnemrlI>7bQmjyXrxd2NOgTpRj>;+3
zV`>uWT<Sd<92yatLYgZye`xK}PSC!klc39>H%ae_{yGB&26kY;1Ks2@`CjsCMuW+x
GQn~;*-I}rh

delta 476
zcmdmRn(@jhMz)Yt28InO6WPpI9DH6Zn&{xeXgJYdbmAhVdWI{Ej~EyjWf&M3a?%rv
z3xKo$klz8MInr|~)4b0VEduf<Ffhb#$w*C1VQ~By%fOK60+ct)017ZaVp0L}Yk+)}
zjNFondIlZ|Ab$Z+4^K{haw5l3**XS>q%}bKj@-nG0tP>(a|{g0CP2PIUSh6fssaCs
zlR$wGpa#o={NfS@W}p;9%7n==jMdH&K&BATLCg$H42%ql4CV}$4E79B3|0UC{{IhB
z$DqJq02Xs(NCb;9{(t=c>i;YM&;LL7{{&DU<77o9;mxK@DvX<#GS7{Zlbj_ZHT6h5
zzs*+$ZYHn^=O=nMgBT!sazc{1s54j?N-zRxpgNw-8<JQU>zS4?y<=u!mSX8+S;2CM
zHHNi=Z3(*(2McE$=Q6H7?t8q`_*(e01bzty3H}lC6IvkBAQ~e!Pwbw!n?#YMoYV&C
z2<cVQe`J#s{wM}1o=`GSYEU*)-lnodb%E+9wI}Ln>W?&xG~Q@7X<pKrqHU$UMaN3#
dmR^qDKK%~;TfhJS295J%tCZJ_hLhD&y8w*oh4TOa

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
index bae0168286a..dcfa5a08c60 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
@@ -8,6 +8,7 @@
 <missing-glyph horiz-adv-x="512" />
 <glyph unicode="&#x20;" d="" horiz-adv-x="256" />
 <glyph unicode="&#x21;" d="M499 33c4-6 4-12 0-18-3-5-8-8-15-8 0 0-457 0-457 0-6 0-11 3-14 8-4 6-4 12-1 18 0 0 228 400 228 400 3 6 8 9 16 9 7 0 12-3 15-9 0 0 228-400 228-400zM284 58c0 0 0 51 0 51s-56 0-56 0c0 0 0-51 0-51 0 0 56 0 56 0zM284 147c0 0 0 154 0 154s-56 0-56 0c0 0 0-154 0-154 0 0 56 0 56 0z" />
+<glyph unicode="&#x24;" d="M51.015 429.196v-409.778h409.777v409.777h-409.777zM176.358 84.156h-82.644v42.699h150.825v-42.699zM396.055 299.719h-302.339v64.050h301.651v-64.050zM395.365 184.017h-301.651v64.049h301.651v-64.049z" />
 <glyph unicode="&#x30;" d="M346 289c0-2 0-4 0-6s-1-4-1-7c0-2-1-5-1-7-1-3-2-6-2-9-1-3-2-6-3-9-1-3-2-6-3-10-1-1-2-3-2-4-1-1-1-2-1-3-1-1-1-1-2-2-1-2-1-3-2-5-1-2-2-3-3-5l-2-2-1-3c-1-1-2-3-4-4-2-3-4-7-7-9-3-3-6-6-9-9l-4-4c-2-1-3-2-5-4-6-5-13-9-20-13-7-4-14-7-21-10-7-3-14-6-21-8-6-2-12-4-18-6-12-3-22-5-29-7-7-2-11-2-11-2 0 0 4 0 11 2 7 1 17 3 29 6 6 2 12 3 19 5 7 2 14 5 21 8 7 3 14 6 21 10 7 3 14 8 21 13 2 1 3 2 5 3l5 4c3 3 6 6 8 9 3 3 6 6 8 9 2 2 3 3 4 5l2 2c0 1 1 2 1 3 1 1 2 3 4 5 0 1 1 3 2 5 1 0 1 1 2 2 0 1 0 2 1 3 1 1 1 3 2 5 2 3 3 6 4 9 1 4 2 7 3 10 1 3 1 6 2 8 1 3 1 6 2 8 0 3 0 5 1 7 0 3 0 5 0 6 1 8 1 12 1 12h-6c0 0 0-4-1-11zM458 369l-34 33c-1 33-22 55-32 61-10 9-33 16-59 13-25-4-61-17-86-64-49-92-154-289-155-291-1 0-1-1 0-1 0-1 1-1 1-1l40 7-78-151c0-1 0-1 1-2 0 0 0 0 1 0 0 0 0 0 0 0l56 10c0 0 1 0 1 1l41 120c105 1 178 26 218 77 42 54 36 122 29 154l-5 31h60c0 0 1 0 1 1 1 0 0 1 0 2zM403 411c0-5-5-10-10-10-6 0-10 5-10 10 0 6 4 11 10 11 5 0 10-5 10-11zM370 183c-40-50-112-75-216-75-1 0-1-1-1-2l-42-120-51-9 78 151c0 1 0 1 0 2-1 0-1 1-2 1l-40-8c14 26 109 202 154 287 25 46 59 59 83 62 25 3 46-3 56-10v-22c-2 0-16 5-29 5s-28-5-37-15c-16-18-20-36-12-66 54 10 78-13 87-27 7-30 15-99-28-154zM399 369l23 30 30-30z" />
 <glyph unicode="&#x31;" d="M75 43c-48 48-75 113-75 181 0 141 115 256 256 256l32-32-32-32c-106 0-192-86-192-192 0-51 20-100 56-136l-39-5zM256-32l-32 32 32 32c106 0 192 86 192 192 0 51-20 100-56 136l39 5 6 40c48-48 75-113 75-181 0-141-115-256-256-256z" />
 <glyph unicode="&#x32;" d="M192 288h-192l149-109-54-179 153 107 168-107-69 179 165 109h-192l-72 184z" />
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf
index 7e50be989f21b51cc801f25f583b67c6f0d53817..c4161bea849d4ddb060928acbc08627d98cbaa78 100755
GIT binary patch
delta 519
zcmdmRlCkF$;{=6z#!$vN3=E7i3=9k<>50V!Kw1FEp8%ve(sL@)RMi)L0P<%rFeET!
zq$Z{?_-#vOU`Pb=8O$<(0?dz?RDt{pK)y;wZb?NW1CKY5{{^T=ASXXLQ7M%78UsTz
z3sAl*H?g9C!Jp|IkPk9nAulmkGSz@@#Yv#R2A~GZg8bqV24<iXL&}?pJF2}CfGiQ9
zdzcwm7#JB88B`d|87vv>8KM}f{{Q{|AEb~$0Vrw!7IkDu1dB5MfBgU9|7-uR{=e}5
z{Qr|c-HZ$jo68u@89iATj2VO(&oZtB8pz4O#~{qWAS|dTs3@##YAkB5XsReG3L=ad
zXZ=g74Vpgv-z7%ff0r3`8Q1<x1Bxxz*1qB3P~zaguz3~Jf;c$_21AXL`{Ma+zA|t#
zfn9Tc`mW0$28f=Vk!a57GI>FwIHU3AEr~3Q^$c5>PBDuxYcV^pY+*Ua@`AOAbsgI&
z_6QCw&KAxyTw8cpc=zzF;-4U>AXp)!Bvc}FOk|m8lh_e)7V#X38Imqi*QD#DFUTm#
zb|@+-Rw%wx3R7C99HV?k<&^3%H3@Yt^&SlljR;L4%@vwIw03DHXy4LF&}Gn@r1wOB
ZodE*_J1~raZgZJzmHe8~V6s|D7XaIIlf(c3

delta 465
zcmeA<#kk=l;{=6zhAWJZ7#J937#J9G(i4jdfV2RR-vOjK(sL@)yw4OZ0`ey?FvM@k
zNKH&(aQqm{z>w$ylsC%&3NSxnQUUU7fP9sV+>(lV1|A6@e*sVrPfmVvBF9nLItGTM
zH9+}}+{B6k20x~A3=GL8K)ym=Vy<MW0so4VK!FgT2Frr{;t~dCpcF&Ogo!(<og;uO
zA)tGh8JHLt859}J87vv>8KM}f{{Q{|AEb;yfx!SQ=E#r;7GwPX`2W@aSN@;>fA0SY
zpgzXQA5(-kPh?bK+|0;4H%?A+mW<TYBk}w;Um3WWz$ToZ=-murfauA463s=O!NO32
z5l92o@oeTvVqvUjTEg^>nT1)3rH^F=%OTbn)(*BM>_!|coN=7Xxca#7@lNAw;m;EI
zB^V_5N61fTfk=aBjMzM}d*W^qMUrw-8>AzoS4sboO;Y%y7^HYY$v~+=*-Uwx$`aKD
zs-M)JsHdqv(lF9^quHc+No$I>mG%}LE1g?<IePo_JM?b>1Av!-!I|j{0~gqBOdy|4
O-kf}n(QtB8N*4g@bb^!s

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff
index 46fcca86df2ac9f18835a9bff332a42c6dd8132e..484c0b1279783fdfe4d00cef06b333cf25527b9e 100755
GIT binary patch
delta 640
zcmbPH`l3{%+~3X3KP1GTfx+qp0~Z4jSS^^m!CZ8rCSSb=1B01IcHXLE{=xc23=HNr
zK-mNk=1^icNX|_x0E*24@=HLNF_dvmdSWq9%t8Rj=YV2?jMT&wpqK=ZZwAJG+mbVY
zf<UnVAYTQ9nIAE!X5^Ms0L6f2F#`273N$hp@p$JZRsapOYym1_17nu}hP=ewRG?T7
zP?04F8}O|-S&&~0)M#~L;tNmF0)APbaH$}WWZ(o6X7)l1u9Mvu-59S;?qQT<GBTOG
zgz-SV6N3vA10w?q13S>$ybN6or<gu4yEA7qce8w8m1p&3Gh!=YpUz>!DbAJ0wS#*l
zuN=Ps|1W`iLe)a2g|mcDi|B|kiQSQqkVunwC1oM?LZ(7CKz6+xpZsCvBIVmE1uEZE
z!__#|rmOGNxT<NWrKPo5+g^KtPPMM0Zj)Y#KEJvCS%V})VWUmPg2s1E>?VI;>a^eY
z!%?*RkKPZx?(QFYfAqRpzYG3;D{9%@z3sbpcXtBockS;vqQ4Jycc1=#u)Euvwfi@R
z=x-nk%H3SSTyH%2r&*b60?_Xw3<3<yK>sl^C;~&-oWYX8o*{~%>i^&W|ADd$3<^L|
z1F)zgLn2s|@&Duh5C32LfA#-`|L6aooV?ClTo)LW42(b>{6HGSX3(0K{3@Q`<|_j?
x6WEyZ(|274F+lX>59a2QE?{9O0n!9i#{<O1lWi>iGP+E*vb@Y_FqzM)3jo!evTXnW

delta 567
zcmaD+I-^vg+~3X3KP1GTfx&790~Z4jSOqXJGB8fQXeBaHhr6DMfx(Q)@Omwef3Ut0
zko^OwA_0Usl-LcDa}x^~7|bJp{2Va8!uTjXu^1$F1jy%rVu6g*#1x>|86e*bj2%D5
zW&i~l7%W(Td=(I8e#E4bky}y$6w_c}VB`VedIlpNiQL2rpn;YqKt*g|>>R+5mzbLh
z6te*;vIJoR{uL(+@{3D=uCJK*!c#PdUlu4_C<r7OIDv%ePay`E$!?5plY1E@C$D7O
zU+>7^%mnl&3j;gQ*Sri}OdFWlnYEd{SvIiTXXR!6#Ad=C&i;qvI+q?-1$QRTJ-!S4
zy9DM5SqpUwYYBG?zY#qoHb?x1gqp-E$sbZHWGrL_Wb<Xu$u}z-DbH3hP}!y`u6j}}
zT)k3bs>VmnS6and|FsiztaTphI_a6{eb?vhHBd6RY*b`)(Ri-$zscX2IydiUt}|w2
zm~3NS?hFc0AqD{kW(JTO6&cJKEE((>q8O_F|NZ|TD96B{z+eCtb7V*ai!uIx{Qv6z
zEC0{`KllFxP#-A%gtdY32vpAxGy@nKlCu`Q@NtOexB1Gz4UAPFI6u+58AeaGu`m~P
e1`9(8kS3ryp2<BHe;J)8cUfL$G@Kk~)dc|Pj*jX8

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
index 2cdd85df49a..aa113ede749 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
@@ -384,6 +384,7 @@ <h2>Icons</h2>
                 <li class="icon icon-warning">warning</li>
                 <li class="icon icon-success">success</li>
                 <li class="icon icon-date">date</li>
+                <li class="icon icon-form">form</li>
             </ul>
 
         </section>

From bc99de529be8259e71a334fb4295f775233b10e7 Mon Sep 17 00:00:00 2001
From: Robert Clark <robert@bablmedia.com>
Date: Tue, 13 May 2014 12:46:20 -0400
Subject: [PATCH 022/293] page type business rules

---
 wagtail/tests/models.py                       | 12 +++++++
 .../wagtailadmin/pages/add_subpage.html       |  4 +--
 wagtail/wagtailadmin/tests.py                 | 35 ++++++++++++++++++-
 wagtail/wagtailadmin/views/pages.py           |  4 +--
 wagtail/wagtailcore/models.py                 | 10 ++++--
 5 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py
index 9124cb253de..6c4b45f31c8 100644
--- a/wagtail/tests/models.py
+++ b/wagtail/tests/models.py
@@ -196,3 +196,15 @@ def get_context(self, request):
     FieldPanel('title', classname="full title"),
     FieldPanel('intro', classname="full"),
 ]
+
+class StandardIndex(Page):
+    pass
+
+class StandardChild(Page):
+    pass
+
+class BusinessIndex(Page):
+    subpage_types = ['tests.BusinessChild']
+
+class BusinessChild(Page):
+    pass
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/add_subpage.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/add_subpage.html
index 757c013b5cb..1158cc857ee 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/add_subpage.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/add_subpage.html
@@ -12,9 +12,9 @@
     <div class="nice-padding">
         <p>{% trans "Choose which type of page you'd like to create." %}</p>
 
-        {% if all_page_types %}
+        {% if page_types %}
             <ul class="listing">
-                {% for content_type in all_page_types %}
+                {% for content_type in page_types %}
                     <li>
                         <div class="row row-flush">
                             <div class="col6">
diff --git a/wagtail/wagtailadmin/tests.py b/wagtail/wagtailadmin/tests.py
index 435f29a9c19..59e112b32c6 100644
--- a/wagtail/wagtailadmin/tests.py
+++ b/wagtail/wagtailadmin/tests.py
@@ -1,6 +1,6 @@
 from django.test import TestCase
 import unittest2 as unittest
-from wagtail.tests.models import SimplePage, EventPage
+from wagtail.tests.models import SimplePage, EventPage, StandardIndex, StandardChild, BusinessIndex, BusinessChild
 from wagtail.tests.utils import login
 from wagtail.wagtailcore.models import Page
 from django.core.urlresolvers import reverse
@@ -326,3 +326,36 @@ def test_editor_css_and_js_hooks_on_edit(self):
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, '<link rel="stylesheet" href="/path/to/my/custom.css">')
         self.assertContains(response, '<script src="/path/to/my/custom.js"></script>')
+
+
+class TestSubpageBusinessRules(TestCase):
+    def setUp(self):
+        # Find root page
+        self.root_page = Page.objects.get(id=2)
+
+        # Add standard page
+        self.standard_index = StandardIndex()
+        self.standard_index.title = "Standard Index"
+        self.standard_index.slug = "standard-index"
+        self.root_page.add_child(instance=self.standard_index)
+
+        # Add business page
+        self.business_index = BusinessIndex()
+        self.business_index.title = "Business Index"
+        self.business_index.slug = "business-index"
+        self.root_page.add_child(instance=self.business_index)
+
+        # Login
+        login(self.client)
+
+    def test_standard_subpage(self):
+        response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(self.standard_index.id, )))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, 'Standard Child')
+        self.assertContains(response, 'Business Child')
+
+    def test_business_subpage(self):
+        response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(self.business_index.id, )))
+        self.assertEqual(response.status_code, 200)
+        self.assertNotContains(response, 'Standard Child')
+        self.assertContains(response, 'Business Child')
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 6be731c3b9a..56c1294f9c1 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -68,13 +68,11 @@ def add_subpage(request, parent_page_id):
     if not parent_page.permissions_for_user(request.user).can_add_subpage():
         raise PermissionDenied
 
-    page_types = sorted([ContentType.objects.get_for_model(model_class) for model_class in parent_page.clean_subpage_types()], key=lambda pagetype: pagetype.name.lower())
-    all_page_types = sorted(get_page_types(), key=lambda pagetype: pagetype.name.lower())
+    page_types = sorted(parent_page.clean_subpage_types(), key=lambda pagetype: pagetype.name.lower())
 
     return render(request, 'wagtailadmin/pages/add_subpage.html', {
         'parent_page': parent_page,
         'page_types': page_types,
-        'all_page_types': all_page_types,
     })
 
 
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 441c74a2821..0fc1b3350a7 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -484,7 +484,11 @@ def clean_subpage_types(cls):
             where required
         """
         if cls._clean_subpage_types is None:
-            res = []
+            if len(cls.subpage_types) == 0:
+                res = get_page_types()
+            else:
+                res = []
+            
             for page_type in cls.subpage_types:
                 if isinstance(page_type, basestring):
                     try:
@@ -496,13 +500,13 @@ def clean_subpage_types(cls):
 
                     model = get_model(app_label, model_name)
                     if model:
-                        res.append(model)
+                        res.append(ContentType.objects.get_for_model(model))
                     else:
                         raise NameError(_("name '{0}' (used in subpage_types list) is not defined.").format(page_type))
 
                 else:
                     # assume it's already a model class
-                    res.append(page_type)
+                    res.append(ContentType.objects.get_for_model(page_type))
 
             cls._clean_subpage_types = res
 

From d7c5a06929dbb175482ad92b17e9f87342966c1c Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 23 May 2014 12:02:37 +0100
Subject: [PATCH 023/293] updated icons

---
 .../wagtailadmin/scss/components/icons.scss   |   6 --
 .../wagtailadmin/scss/fonts/wagtail.eot       | Bin 26032 -> 26032 bytes
 .../wagtailadmin/scss/fonts/wagtail.svg       |  71 +-----------------
 .../wagtailadmin/scss/fonts/wagtail.ttf       | Bin 25868 -> 25868 bytes
 .../wagtailadmin/scss/fonts/wagtail.woff      | Bin 15080 -> 15080 bytes
 5 files changed, 1 insertion(+), 76 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
index 7fb3320dd8d..92e83bbe5c3 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
@@ -246,12 +246,6 @@
 .icon-form:before{
     content:"$";
 }
-.icon-date:before{
-    content:"7";
-}
-.icon-form:before{
-    content:"$";
-}
 .icon.text-replace{
     font-size:0em;
     line-height:0;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot
index c5d6b5cc58b948ee1c15f5abeb6970cb759b23b8..7d7860a83289d44e2dc32b0b001995f293d6a15c 100755
GIT binary patch
delta 57
zcmdmRnsLKv#tAme%N}J;wBN>@@tt+!51&LCgD)Oc@%%Pl8Mv7kK;Zn6+bS@6b3#%8
FGXSQ16;=QM

delta 57
zcmdmRnsLKv#tAmeuaf6YwBN?;w=H?&51&LCLyeRB;`wd9GH^37fWZ0byDr1%%?U{X
F%mA%N7Eb^G

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
index f25359ec600..dcfa5a08c60 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
@@ -6,7 +6,6 @@
 <font id="wagtail" horiz-adv-x="512">
 <font-face units-per-em="512" ascent="480" descent="-32" />
 <missing-glyph horiz-adv-x="512" />
-<<<<<<< HEAD
 <glyph unicode="&#x20;" d="" horiz-adv-x="256" />
 <glyph unicode="&#x21;" d="M499 33c4-6 4-12 0-18-3-5-8-8-15-8 0 0-457 0-457 0-6 0-11 3-14 8-4 6-4 12-1 18 0 0 228 400 228 400 3 6 8 9 16 9 7 0 12-3 15-9 0 0 228-400 228-400zM284 58c0 0 0 51 0 51s-56 0-56 0c0 0 0-51 0-51 0 0 56 0 56 0zM284 147c0 0 0 154 0 154s-56 0-56 0c0 0 0-154 0-154 0 0 56 0 56 0z" />
 <glyph unicode="&#x24;" d="M51.015 429.196v-409.778h409.777v409.777h-409.777zM176.358 84.156h-82.644v42.699h150.825v-42.699zM396.055 299.719h-302.339v64.050h301.651v-64.050zM395.365 184.017h-301.651v64.049h301.651v-64.049z" />
@@ -72,72 +71,4 @@
 <glyph unicode="&#x78;" d="M477 318c0-7-2-14-8-19l-245-246c-6-5-12-8-20-8-7 0-14 3-19 8l-142 142c-6 6-8 12-8 20 0 7 2 14 8 19l38 39c6 5 12 8 20 8 7 0 14-3 19-8l84-84 188 188c5 5 12 8 19 8 8 0 14-3 20-8l38-39c6-6 8-12 8-20z" />
 <glyph unicode="&#x79;" d="M392 110c70-24 105-45 105-62 0 0 0-54 0-54 0 0-241 0-241 0 0 0-241 0-241 0 0 0 0 54 0 54 0 17 35 38 105 62 32 12 54 24 65 36 12 12 18 28 18 48 0 8-4 16-12 25-7 10-12 22-16 38-1 4-2 7-5 9-2 2-4 3-7 4-2 1-4 4-7 9-2 5-4 12-4 22 0 5 0 10 2 13 2 4 3 6 5 6 0 0 2 2 2 2-3 17-5 32-6 45-2 19 5 38 21 58 15 19 42 29 80 29 38 0 65-10 81-29 16-20 22-39 20-58 0 0-6-45-6-45 6-2 9-10 9-21 0-10-2-17-4-22-3-5-5-8-7-9-3-1-5-2-7-4-3-2-4-5-5-9-3-17-8-29-16-38-8-9-12-17-12-25 0-20 6-36 18-48 12-12 34-24 65-36z" />
 <glyph unicode="&#x7a;" d="M344 325c0-3-1-5-3-7l-112-112 112-113c2-1 3-4 3-6 0-3-1-5-3-7l-14-14c-2-2-5-3-7-3s-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3s5-1 7-3l14-14c2-2 3-4 3-6z" />
-</font></defs></svg>
-=======
-
-<glyph unicode="&#97;" d="M239 256c0 19-7 35-20 48-13 14-29 20-48 20-19 0-35-6-49-20-13-13-20-29-20-48 0-19 7-35 20-48 14-14 30-20 49-20 19 0 35 6 48 20 13 13 20 29 20 48z m205-137c0 10-4 18-10 24-7 7-15 11-24 11-10 0-18-4-24-11-7-6-11-14-11-24 0-9 4-17 10-24 7-6 15-10 25-10 9 0 17 4 24 10 6 7 10 15 10 24z m0 274c0 9-4 17-10 24-7 6-15 10-24 10-10 0-18-4-24-10-7-7-11-15-11-24 0-10 4-18 10-25 7-6 15-10 25-10 9 0 17 4 24 10 6 7 10 15 10 25z m-103-113l0-49c0-2 0-4-2-5-1-2-2-3-4-3l-41-6c-2-7-5-13-9-21 6-8 14-18 24-30 2-2 2-4 2-6 0-2 0-4-2-5-4-5-11-13-22-24-10-10-17-16-21-16-2 0-3 1-5 2l-31 24c-6-3-13-6-20-8-2-19-4-33-7-41-1-5-3-7-8-7l-49 0c-2 0-4 1-5 2-2 2-3 3-3 5l-6 41c-6 2-13 4-20 8l-32-24c-1-1-3-2-5-2-2 0-4 1-6 3-25 23-38 37-38 42 0 2 1 4 2 5 2 3 5 8 11 14 5 7 9 13 12 17-4 8-7 15-9 22l-41 6c-1 0-3 1-4 3-1 1-2 3-2 5l0 49c0 2 1 4 2 5 1 2 3 3 4 3l41 6c2 7 5 13 9 21-6 8-14 18-24 30-1 2-2 4-2 6 0 2 1 4 2 5 4 5 11 13 22 24 11 10 18 16 21 16 2 0 4-1 6-2l30-24c6 3 13 6 21 8 2 19 4 33 6 41 1 5 4 7 8 7l49 0c2 0 4-1 6-2 1-2 2-3 2-5l7-41c6-2 12-4 20-8l31 24c1 1 3 2 5 2 2 0 4-1 6-3 26-23 38-37 38-42 0-2 0-4-1-5-3-3-6-8-12-15-5-6-9-12-12-16 4-8 7-16 9-22l41-6c2 0 3-1 4-3 2-1 2-3 2-5z m171-142l0-37c0-3-13-6-40-8-2-5-5-10-8-14 9-20 14-33 14-37 0-1 0-1-1-2-22-13-33-19-33-19-2 0-6 4-13 13-6 8-11 14-13 18-4-1-7-1-8-1-2 0-5 0-8 1-3-4-8-10-14-18-7-9-11-13-13-13 0 0-11 6-33 19 0 1-1 1-1 2 0 4 5 17 14 37-3 4-6 9-8 14-27 2-40 5-40 8l0 37c0 3 13 6 40 8 2 6 5 10 8 14-9 20-14 33-14 37 0 1 1 1 1 2 1 0 4 2 10 5 5 3 10 6 15 9 5 3 8 5 8 5 2 0 6-5 13-13 6-8 11-14 14-18 3 1 6 1 8 1 1 0 4 0 8-1 9 13 17 23 24 30l2 1c0 0 11-7 33-19 1-1 1-1 1-2 0-4-5-17-14-37 3-4 6-8 8-14 27-2 40-5 40-8z m0 273l0-37c0-3-13-6-40-8-2-5-5-10-8-14 9-20 14-33 14-37 0-1 0-1-1-2-22-13-33-19-33-19-2 0-6 4-13 13-6 8-11 14-13 18-4-1-7-1-8-1-2 0-5 0-8 1-3-4-8-10-14-18-7-9-11-13-13-13 0 0-11 6-33 19 0 1-1 1-1 2 0 4 5 17 14 37-3 4-6 9-8 14-27 2-40 5-40 8l0 37c0 3 13 6 40 8 2 6 5 10 8 14-9 20-14 33-14 37 0 1 1 1 1 2 1 0 4 2 10 5 5 4 10 7 15 9 5 3 8 5 8 5 2 0 6-4 13-13 6-8 11-14 14-18 3 1 6 1 8 1 1 0 4 0 8-1 9 13 17 23 24 30l2 1c0 0 11-7 33-19 1-1 1-1 1-2 0-4-5-17-14-37 3-4 6-8 8-14 27-2 40-5 40-8z"/>
-<glyph unicode="&#98;" d="M439 293l0-229c0-8-3-14-8-19-5-6-12-8-20-8l-310 0c-8 0-15 2-20 8-5 5-8 11-8 19l0 384c0 8 3 14 8 19 5 6 12 8 20 8l155 0 0-155c0-8 3-14 8-19 5-6 12-8 19-8z m-1 36l-145 0 0 146c15-3 28-9 37-19l89-89c10-10 16-22 19-38z"/>
-<glyph unicode="&#99;" d="M110 73l292 0 0 220-119 0c-7 0-14 2-19 8-5 5-8 11-8 19l0 119-146 0z m183 256l107 0c-2 6-4 10-6 12l-90 89c-2 3-6 5-11 7z m146-9l0-256c0-8-3-14-8-19-5-6-12-8-20-8l-310 0c-8 0-15 2-20 8-5 5-8 11-8 19l0 384c0 8 3 14 8 19 5 6 12 8 20 8l182 0c8 0 16-1 26-5 9-4 16-9 21-14l89-89c6-5 10-13 14-22 4-9 6-17 6-25z"/>
-<glyph unicode="&#100;" d="M140 73l26 26-67 67-26-26 0-30 37 0 0-37z m150 265c0 4-2 7-7 7-1 0-3-1-4-2l-155-155c-2-2-2-3-2-5 0-4 2-6 6-6 2 0 4 0 5 2l155 154c1 2 2 3 2 5z m-16 55l119-119-238-237-118 0 0 118z m195-27c0-10-3-19-10-26l-48-47-118 118 47 48c7 7 15 10 26 10 10 0 18-3 26-10l67-67c7-8 10-16 10-26z"/>
-<glyph unicode="&#101;" d="M399 174c0-3-1-5-3-7l-15-14c-1-2-4-3-6-3-3 0-5 1-7 3l-112 112-112-112c-2-2-4-3-7-3-2 0-5 1-6 3l-15 14c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3 2 0 5-1 7-3l133-133c2-2 3-4 3-6z"/>
-<glyph unicode="&#102;" d="M347 274c0 36-12 66-37 91-25 25-55 37-91 37-35 0-65-12-90-37-25-25-38-55-38-91 0-35 13-65 38-90 25-25 55-38 90-38 36 0 66 13 91 38 25 25 37 55 37 90z m147-237c0-10-4-19-11-26-7-7-16-11-26-11-10 0-19 4-26 11l-98 98c-34-24-72-36-114-36-27 0-53 5-78 16-25 11-46 25-64 43-18 18-32 39-43 64-10 25-16 51-16 78 0 28 6 54 16 78 11 25 25 47 43 65 18 18 39 32 64 43 25 10 51 15 78 15 28 0 54-5 79-15 24-11 46-25 64-43 18-18 32-40 43-65 10-24 16-50 16-78 0-42-12-80-36-114l98-98c7-7 11-15 11-25z"/>
-<glyph unicode="&#103;" d="M426 134c0-7-3-14-8-19l-39-39c-5-5-12-8-20-8-7 0-14 3-19 8l-84 84-84-84c-5-5-12-8-19-8-8 0-15 3-20 8l-39 39c-5 5-8 12-8 19 0 8 3 14 8 20l84 84-84 84c-5 5-8 12-8 19 0 8 3 14 8 20l39 38c5 6 12 8 20 8 7 0 14-2 19-8l84-84 84 84c5 6 12 8 19 8 8 0 15-2 20-8l39-38c5-6 8-12 8-20 0-7-3-14-8-19l-84-84 84-84c5-6 8-12 8-20z"/>
-<glyph unicode="&#105;" d="M475 247c0 6-5 9-14 9l-290 0c-7 0-15-2-23-6-8-4-15-8-19-14l-79-97c-3-4-4-7-4-10 0-6 4-10 14-10l290 0c7 0 15 2 23 6 8 4 14 9 19 14l78 97c3 4 5 8 5 11z m-304 43l204 0 0 43c0 7-2 13-7 18-5 5-11 7-18 7l-154 0c-7 0-13 3-18 8-5 5-7 11-7 18l0 17c0 7-3 13-8 18-5 5-11 8-18 8l-85 0c-7 0-13-3-18-8-5-5-8-11-8-18l0-227 68 84c8 9 19 17 31 23 13 6 26 9 38 9z m338-43c0-11-4-22-12-32l-79-97c-8-10-18-17-31-23-13-7-25-10-37-10l-290 0c-17 0-31 6-42 18-12 12-18 26-18 42l0 256c0 16 6 30 18 42 11 12 25 18 42 18l85 0c16 0 30-6 42-18 12-12 18-26 18-42l0-8 145 0c16 0 30-6 42-18 12-12 18-26 18-42l0-43 51 0c9 0 18-2 26-6 8-5 14-11 18-19 3-6 4-12 4-18z"/>
-<glyph unicode="&#106;" d="M494 338l0-201c0-17-7-32-19-45-13-13-28-19-45-19l-348 0c-17 0-32 6-45 19-12 13-19 28-19 45l0 274c0 18 7 33 19 46 13 12 28 18 45 18l92 0c17 0 32-6 45-18 12-13 19-28 19-46l0-9 192 0c17 0 32-6 45-19 12-12 19-27 19-45z"/>
-<glyph unicode="&#107;" d="M512 309l0-227c0-12-4-23-13-32-9-9-20-13-33-13l-420 0c-13 0-24 4-33 13-9 9-13 20-13 32l0 227c8-9 18-17 29-25 69-47 116-79 142-98 11-8 20-15 26-19 7-4 16-9 27-14 12-4 22-7 32-7l0 0c10 0 20 3 32 7 11 5 20 10 27 14 6 4 15 11 26 19 33 23 80 56 142 98 11 8 21 16 29 25z m0 84c0-15-5-29-14-43-9-14-21-25-35-35-71-50-116-81-134-93-1-1-6-4-12-9-6-4-11-8-15-11-4-2-9-5-15-9-6-3-11-6-16-8-6-1-10-2-15-2l0 0c-5 0-9 1-15 2-5 2-10 5-16 8-6 4-11 7-15 9-4 3-9 7-15 11-6 5-11 8-12 9-18 12-43 30-75 52-33 23-52 36-59 41-12 8-23 19-33 33-11 14-16 27-16 39 0 15 4 27 12 37 8 10 19 15 34 15l420 0c13 0 23-5 32-14 9-9 14-19 14-32z"/>
-<glyph unicode="&#108;" d="M347 421c0-5-1-10-5-13-4-4-8-6-13-6l-36 0 0-292 36 0c5 0 9-2 13-6 4-3 5-8 5-13 0-5-1-9-5-12l-73-74c-4-3-8-5-13-5-5 0-9 2-13 5l-73 74c-4 3-5 7-5 12 0 5 1 10 5 13 4 4 8 6 13 6l36 0 0 292-36 0c-5 0-9 2-13 6-4 3-5 8-5 13 0 5 1 9 5 12l73 74c4 3 8 5 13 5 5 0 9-2 13-5l73-74c4-3 5-7 5-12z"/>
-<glyph unicode="&#109;" d="M183 293l146 0 0 54c0 21-7 38-21 52-15 14-32 22-52 22-20 0-37-8-52-22-14-14-21-31-21-52z m238-28l0-164c0-8-3-15-8-20-6-5-12-8-20-8l-274 0c-8 0-14 3-20 8-5 5-8 12-8 20l0 164c0 8 3 14 8 20 6 5 12 8 20 8l9 0 0 54c0 35 13 66 38 91 25 25 55 37 90 37 35 0 65-12 90-37 25-25 38-56 38-91l0-54 9 0c8 0 14-3 20-8 5-6 8-12 8-20z"/>
-<glyph unicode="&#110;" d="M335 238c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3-2 0-5 1-7 3l-14 14c-2 2-3 4-3 7 0 2 1 5 3 6l112 113-112 112c-2 2-3 4-3 7 0 2 1 4 3 6l14 14c2 2 5 3 7 3 2 0 5-1 7-3l133-133c2-2 3-4 3-6z"/>
-<glyph unicode="&#104;" d="M366 174l0-19c0-2-1-4-3-6-2-2-4-3-6-3l-202 0c-2 0-4 1-6 3-2 2-3 4-3 6l0 19c0 2 1 5 3 6 2 2 4 3 6 3l202 0c2 0 4-1 6-3 2-1 3-4 3-6z m0 73l0-18c0-3-1-5-3-7-2-2-4-3-6-3l-202 0c-2 0-4 1-6 3-2 2-3 4-3 7l0 18c0 3 1 5 3 6 2 2 4 3 6 3l202 0c2 0 4-1 6-3 2-1 3-3 3-6z m-256-174l292 0 0 220-119 0c-7 0-14 2-19 8-5 5-8 11-8 19l0 119-146 0z m183 256l107 0c-2 6-4 10-6 12l-90 89c-2 3-6 5-11 7z m146-9l0-256c0-8-3-14-8-19-5-6-12-8-20-8l-310 0c-8 0-15 2-20 8-5 5-8 11-8 19l0 384c0 8 3 14 8 19 5 6 12 8 20 8l182 0c8 0 16-1 26-5 9-4 16-9 21-14l89-89c6-5 10-13 14-22 4-9 6-17 6-25z"/>
-<glyph unicode="&#111;" d="M171 341c0-14-5-26-15-36-10-10-22-15-37-15-14 0-26 5-36 15-10 10-15 22-15 36 0 15 5 27 15 37 10 10 22 15 36 15 15 0 27-5 37-15 10-10 15-22 15-37z m273-102l0-120-376 0 0 52 86 85 42-43 137 137z m25 188l-426 0c-3 0-5-1-6-3-2-2-3-4-3-6l0-324c0-2 1-4 3-6 1-2 3-3 6-3l426 0c3 0 5 1 6 3 2 2 3 4 3 6l0 324c0 2-1 4-3 6-1 2-3 3-6 3z m43-9l0-324c0-12-4-22-13-30-8-9-18-13-30-13l-426 0c-12 0-22 4-30 13-9 8-13 18-13 30l0 324c0 12 4 22 13 30 8 9 18 13 30 13l426 0c12 0 22-4 30-13 9-8 13-18 13-30z"/>
-<glyph unicode="&#112;" d="M494 347l0-73c0-5-2-9-6-13-3-3-8-5-13-5l-18 0c-5 0-9 2-13 5-3 4-5 8-5 13l0 73c0 21-7 38-22 52-14 14-31 22-51 22-20 0-38-8-52-22-14-14-21-31-21-52l0-54 27 0c8 0 14-3 19-8 6-6 8-12 8-20l0-164c0-8-2-15-8-20-5-5-11-8-19-8l-274 0c-8 0-14 3-20 8-5 5-8 12-8 20l0 164c0 8 3 14 8 20 6 5 12 8 20 8l192 0 0 54c0 36 12 66 37 91 25 25 55 37 91 37 35 0 65-12 90-37 25-25 38-55 38-91z"/>
-<glyph unicode="&#113;" d="M399 302c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3-2 0-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l15 15c1 1 4 2 6 2 3 0 5-1 7-2l112-113 112 113c2 1 4 2 7 2 2 0 5-1 6-2l15-15c2-2 3-4 3-6z"/>
-<glyph unicode="&#114;" d="M366 119l0 18c0 3-1 5-3 7-2 1-4 2-6 2l-202 0c-2 0-4-1-6-2-2-2-3-4-3-7l0-18c0-3 1-5 3-7 2-1 4-2 6-2l202 0c2 0 4 1 6 2 2 2 3 4 3 7z m0 73l0 18c0 3-1 5-3 7-2 2-4 2-6 2l-202 0c-2 0-4 0-6-2-2-2-3-4-3-7l0-18c0-3 1-5 3-7 2-1 4-2 6-2l202 0c2 0 4 1 6 2 2 2 3 4 3 7z m73 101l0-229c0-8-3-14-8-19-5-6-12-8-20-8l-310 0c-8 0-15 2-20 8-5 5-8 11-8 19l0 384c0 8 3 14 8 19 5 6 12 8 20 8l155 0 0-155c0-8 3-14 8-19 5-6 12-8 19-8z m-1 36l-145 0 0 146c15-3 28-9 37-19l89-89c10-10 16-22 19-38z"/>
-<glyph unicode="&#115;" d="M457 137l0 201c0 8-3 14-8 20-5 5-12 8-19 8l-201 0c-8 0-15 2-20 8-5 5-8 12-8 19l0 18c0 8-3 15-8 20-5 5-12 8-19 8l-92 0c-7 0-14-3-19-8-5-5-8-12-8-20l0-274c0-7 3-14 8-19 5-6 12-8 19-8l348 0c7 0 14 2 19 8 5 5 8 12 8 19z m37 201l0-201c0-17-7-32-19-45-13-13-28-19-45-19l-348 0c-17 0-32 6-45 19-12 13-19 28-19 45l0 274c0 18 7 33 19 46 13 12 28 18 45 18l92 0c17 0 32-6 45-18 12-13 19-28 19-46l0-9 192 0c17 0 32-6 45-19 12-12 19-27 19-45z"/>
-<glyph unicode="&#116;" d="M457 302l0-55c0-8-3-14-8-20-5-5-12-8-19-8l-119 0 0-118c0-8-3-15-8-20-5-5-12-8-20-8l-54 0c-8 0-15 3-20 8-5 5-8 12-8 20l0 118-119 0c-7 0-14 3-19 8-5 6-8 12-8 20l0 55c0 7 3 14 8 19 5 5 12 8 19 8l119 0 0 119c0 8 3 14 8 19 5 6 12 8 20 8l54 0c8 0 15-2 20-8 5-5 8-11 8-19l0-119 119 0c7 0 14-3 19-8 5-5 8-12 8-19z"/>
-<glyph unicode="&#117;" d="M165 384c0 10-4 19-11 26-7 7-16 11-26 11-10 0-19-4-26-11-7-7-11-16-11-26 0-10 4-19 11-26 7-7 16-11 26-11 10 0 19 4 26 11 7 7 11 16 11 26z m304-165c0-10-3-18-10-25l-140-141c-8-7-17-10-26-10-11 0-19 3-26 10l-204 205c-8 7-14 16-19 29-5 12-7 23-7 33l0 119c0 10 3 18 10 26 8 7 16 10 26 10l119 0c10 0 21-2 33-7 13-5 22-11 30-19l204-204c7-7 10-16 10-26z"/>
-<glyph unicode="&#118;" d="M501 241c0-5-3-11-8-18l-90-105c-7-9-18-17-32-23-14-7-26-10-38-10l-290 0c-6 0-12 1-16 4-5 2-8 6-8 11 0 6 3 12 9 18l89 105c8 10 19 17 32 24 14 6 27 9 39 9l290 0c6 0 11-1 16-3 5-3 7-7 7-12z m-91 92l0-43-222 0c-17 0-34-4-53-13-18-8-33-19-44-31l-89-106-2-2c0 1 0 2 0 4 0 1 0 2 0 3l0 256c0 16 6 30 18 42 11 12 25 18 42 18l85 0c16 0 30-6 42-18 12-12 18-26 18-42l0-8 145 0c16 0 30-6 42-18 12-12 18-26 18-42z"/>
-<glyph unicode="&#119;" d="M329 256c0 20-7 37-21 52-15 14-32 21-52 21-20 0-37-7-52-21-14-15-21-32-21-52 0-20 7-37 21-52 15-14 32-21 52-21 20 0 37 7 52 21 14 15 21 32 21 52z m146 31l0-63c0-3 0-5-2-7-1-2-3-3-6-4l-52-8c-4-10-8-19-12-26 7-9 17-22 31-39 2-2 3-5 3-7 0-3-1-5-3-7-5-7-14-17-28-31-14-13-23-20-27-20-2 0-5 1-7 3l-40 31c-8-5-17-8-26-11-3-26-6-44-8-53-1-6-5-8-10-8l-64 0c-2 0-5 0-7 2-2 2-3 4-3 6l-8 53c-9 3-18 6-26 10l-40-30c-2-2-4-3-7-3-3 0-5 1-7 3-24 22-40 38-47 48-2 2-2 4-2 7 0 2 0 4 2 6 3 4 8 11 14 19 7 9 12 16 16 21-5 9-9 19-12 28l-52 8c-3 0-5 1-6 3-2 2-2 4-2 7l0 63c0 3 0 5 2 7 1 2 3 3 5 4l53 8c3 8 7 17 12 26-8 11-18 24-31 39-2 3-3 5-3 7 0 2 1 4 3 7 5 7 14 17 28 30 14 14 23 21 27 21 2 0 5-1 7-3l40-31c8 5 17 8 26 11 3 26 6 44 8 53 1 6 5 8 10 8l64 0c2 0 5 0 7-2 2-2 3-4 3-6l8-53c9-3 18-6 26-10l40 30c2 2 4 3 7 3 3 0 5-1 7-3 25-23 41-39 47-49 2-1 2-3 2-6 0-2 0-4-2-6-3-4-8-11-14-19-7-9-12-16-16-21 5-9 9-18 12-28l52-8c3 0 5-1 6-3 2-2 2-4 2-7z"/>
-<glyph unicode="&#120;" d="M477 350c0-7-2-14-8-19l-206-207-39-39c-6-5-12-8-20-8-7 0-14 3-19 8l-142 142c-6 6-8 12-8 20 0 7 2 14 8 19l38 39c6 5 12 8 20 8 7 0 14-3 19-8l84-84 188 188c5 5 12 8 19 8 8 0 14-3 20-8l38-39c6-6 8-12 8-20z"/>
-<glyph unicode="&#122;" d="M344 357c0-3-1-5-3-7l-112-112 112-113c2-1 3-4 3-6 0-3-1-5-3-7l-14-14c-2-2-5-3-7-3-2 0-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3 2 0 5-1 7-3l14-14c2-2 3-4 3-6z"/>
-<glyph unicode="&#65;" d="M232 141l176 175c3 4 5 8 5 13 0 5-2 9-5 13l-29 29c-4 4-8 6-13 6-5 0-10-2-13-6l-134-133-60 60c-3 4-8 5-13 5-5 0-9-1-13-5l-29-29c-3-4-5-8-5-13 0-5 2-9 5-13l103-102c3-4 7-6 12-6 5 0 10 2 13 6z m243 252l0-274c0-23-8-42-24-58-16-16-35-24-58-24l-274 0c-23 0-42 8-58 24-16 16-24 35-24 58l0 274c0 23 8 42 24 58 16 16 35 24 58 24l274 0c23 0 42-8 58-24 16-16 24-35 24-58z"/>
-<glyph unicode="&#66;" d="M384 238l0 36c0 5-2 10-5 13-4 4-8 6-13 6l-73 0 0 73c0 5-2 9-6 13-3 3-8 5-13 5l-36 0c-5 0-10-2-13-5-4-4-6-8-6-13l0-73-73 0c-5 0-9-2-13-6-3-3-5-8-5-13l0-36c0-5 2-10 5-13 4-4 8-6 13-6l73 0 0-73c0-5 2-9 6-13 3-3 8-5 13-5l36 0c5 0 10 2 13 5 4 4 6 8 6 13l0 73 73 0c5 0 9 2 13 6 3 3 5 8 5 13z m91 18c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
-<glyph unicode="&#68;" d="M173 54c-80 23-309 124-49 458 140-95 194-179 204-248-67-24-113-71-107-156-37 87-66 208-78 283-6-88 7-244 30-337m89-21c-19 53-59 228 241 219 9-275-137-265-202-246 27 53 62 101 106 141-54-30-103-68-145-114"/>
-<glyph unicode="&#67;" d="M213 77c15-6 28-9 40-9 25 0 46 4 62 12 16 8 28 19 35 32 7 14 11 31 11 52 0 22-4 39-12 51-11 18-24 30-40 36-15 7-39 10-71 10-14 0-23-1-29-3l0-41 0-50 1-77c0-3 1-7 3-13z m-4 214c9-2 19-2 32-2 33 0 58 6 75 18 17 13 25 34 25 64 0 21-8 39-24 54-16 14-40 21-73 21-10 0-22-1-37-4 0-8 0-15 1-22 1-23 2-50 1-79l0-28c0-9 0-16 0-22z m-154-254l0 26c9 2 15 3 20 4 15 2 26 5 35 9 3 5 5 10 6 14 2 13 3 31 3 56l-1 142c-1 48-2 87-3 115 0 17-1 27-3 31 0 1-1 2-3 4-4 2-10 3-20 4-6 0-16 2-32 4l-2 23 75 2 108 4 13 0c1 0 2 0 4 0 2 0 3 0 4 0 0 0 2 0 6 0 4 0 8 0 12 0l21 0c17 0 35-2 55-8 8-2 17-6 27-11 11-5 21-12 29-21 9-9 15-19 19-30 4-11 6-23 6-35 0-13-3-26-9-37-7-11-16-21-28-30-5-3-19-11-42-22 33-7 59-21 76-41 17-20 26-43 26-68 0-14-3-30-8-46-4-12-11-23-20-33-13-14-26-24-40-31-14-7-34-13-58-17-16-3-35-4-57-3l-56 1c-16 0-45-1-85-3-7-1-33-2-78-3z"/>
-<glyph unicode="&#69;" d="M110 37l5 24c0 1 8 3 22 6 14 4 25 7 33 11 5 7 9 17 11 29l8 40 16 76 4 19c1 8 3 16 4 24 2 8 4 14 5 19 1 5 3 9 4 13 1 4 1 7 2 9 1 2 1 3 1 3l8 45 5 18 6 39 3 14 0 11c-8 4-22 7-42 8-5 0-9 1-10 1l5 29 91-4c7 0 14 0 20 0 13 0 33 1 62 2 6 1 12 1 19 2 7 0 10 0 10 0 0-3-1-7-1-10-2-6-3-11-4-15-11-4-21-7-31-9-12-3-22-6-29-9-2-6-5-14-7-25-2-8-3-16-4-23-8-38-14-67-19-88l-17-89-11-45-12-67-4-13c0-1 0-4 1-7 12-3 23-5 34-6 7-1 13-2 19-3-1-6-1-11-2-17-2-6-3-10-3-12-3 0-6 0-7 0-4 0-8 0-12 0-1 0-4 0-8 0-3 1-17 3-41 5l-57 1c-7 0-24-1-49-3-14-2-24-2-28-3z"/>
-<glyph unicode="&#70;" d="M110 110c0-16-6-28-16-39-11-11-24-16-39-16-15 0-28 5-39 16-11 11-16 23-16 39 0 15 5 28 16 39 11 10 24 16 39 16 15 0 28-6 39-16 10-11 16-24 16-39z m0 146c0-15-6-28-16-39-11-11-24-16-39-16-15 0-28 5-39 16-11 11-16 24-16 39 0 15 5 28 16 39 11 11 24 16 39 16 15 0 28-5 39-16 10-11 16-24 16-39z m402-119l0-55c0-2-1-4-3-6-2-2-4-3-6-3l-348 0c-2 0-4 1-6 3-2 2-3 4-3 6l0 55c0 3 1 5 3 7 2 1 4 2 6 2l348 0c2 0 4-1 6-2 2-2 3-4 3-7z m-402 265c0-15-6-28-16-39-11-10-24-16-39-16-15 0-28 6-39 16-11 11-16 24-16 39 0 16 5 28 16 39 11 11 24 16 39 16 15 0 28-5 39-16 10-11 16-23 16-39z m402-119l0-54c0-3-1-5-3-7-2-2-4-3-6-3l-348 0c-2 0-4 1-6 3-2 2-3 4-3 7l0 54c0 3 1 5 3 7 2 2 4 3 6 3l348 0c2 0 4-1 6-3 2-2 3-4 3-7z m0 147l0-55c0-3-1-5-3-7-2-1-4-2-6-2l-348 0c-2 0-4 1-6 2-2 2-3 4-3 7l0 55c0 2 1 4 3 6 2 2 4 3 6 3l348 0c2 0 4-1 6-3 2-2 3-4 3-6z"/>
-<glyph unicode="&#71;" d="M109 49c0-15-5-27-16-36-10-9-23-13-38-13-21 0-37 6-50 19l17 25c9-9 19-13 30-13 6 0 10 2 14 4 5 3 7 7 7 12 0 13-10 18-30 16l-8 16c2 2 5 6 9 13 5 6 9 11 13 15 3 4 7 8 10 11l0 1c-3 0-8-1-14-1-6 0-11 0-14 0l0-15-30 0 0 43 95 0 0-25-27-33c10-2 18-7 23-14 6-7 9-15 9-25z m0 179l0-45-103 0c-1 7-2 12-2 15 0 10 3 19 7 27 4 8 10 14 16 19 6 5 13 10 19 14 6 4 12 8 16 12 5 4 7 9 7 13 0 5-2 9-4 11-3 3-7 4-12 4-8 0-16-6-23-17l-24 17c5 10 11 18 20 23 9 5 20 8 31 8 13 0 25-4 35-12 9-8 14-18 14-32 0-9-3-18-10-26-6-8-13-14-21-18-8-5-15-10-22-15-6-5-10-10-10-15l36 0 0 17z m403-91l0-55c0-2-1-4-3-6-2-2-4-3-6-3l-348 0c-2 0-4 1-6 3-2 2-3 4-3 6l0 55c0 3 1 5 3 7 2 1 4 2 6 2l348 0c2 0 4-1 6-2 2-2 3-4 3-7z m-402 257l0-28-96 0 0 28 31 0c0 8 0 19 0 35 0 15 0 27 0 34l0 4-1 0c-1-3-6-9-14-16l-20 22 39 36 30 0 0-115z m402-111l0-54c0-3-1-5-3-7-2-2-4-3-6-3l-348 0c-2 0-4 1-6 3-2 2-3 4-3 7l0 54c0 3 1 5 3 7 2 2 4 3 6 3l348 0c2 0 4-1 6-3 2-2 3-4 3-7z m0 147l0-55c0-3-1-5-3-7-2-1-4-2-6-2l-348 0c-2 0-4 1-6 2-2 2-3 4-3 7l0 55c0 2 1 4 3 6 2 2 4 3 6 3l348 0c2 0 4-1 6-3 2-2 3-4 3-6z"/>
-<glyph unicode="&#72;" d="M475 256c0-30-5-58-17-85-12-27-27-51-47-70-19-20-43-35-70-47-27-12-55-17-85-17-33 0-64 6-93 20-30 14-55 34-76 59-1 2-2 4-2 6 0 3 1 4 3 6l39 39c2 2 4 3 7 3 3 0 5-2 7-3 13-19 31-33 51-42 20-10 41-15 64-15 20 0 39 4 57 11 18 8 33 18 46 32 14 13 24 28 32 46 7 18 11 37 11 57 0 20-4 39-11 57-8 18-18 33-32 46-13 14-28 24-46 32-18 7-37 11-57 11-19 0-37-3-54-10-17-7-32-16-45-29l39-39c6-6 7-13 4-20-4-8-9-11-17-11l-128 0c-5 0-9 1-13 5-4 4-5 8-5 13l0 128c0 8 3 13 11 17 7 3 14 2 20-4l37-37c20 19 44 34 70 45 26 10 53 15 81 15 30 0 58-5 85-17 27-12 51-27 70-47 20-19 35-43 47-70 12-27 17-55 17-85z"/>
-<glyph unicode="&#73;" d="M475 439l0-128c0-5-1-9-5-13-4-4-8-5-13-5l-128 0c-8 0-13 3-17 11-3 7-2 14 4 20l40 39c-28 26-62 39-100 39-20 0-39-4-57-11-18-8-33-18-46-32-14-13-24-28-32-46-7-18-11-37-11-57 0-20 4-39 11-57 8-18 18-33 32-46 13-14 28-24 46-32 18-7 37-11 57-11 23 0 44 5 64 15 20 9 38 23 51 42 2 1 4 3 7 3 3 0 5-1 7-3l39-39c2-2 3-3 3-6 0-2-1-4-2-6-21-25-46-45-76-59-29-14-60-20-93-20-30 0-58 5-85 17-27 12-51 27-70 47-20 19-35 43-47 70-12 27-17 55-17 85 0 30 5 58 17 85 12 27 27 51 47 70 19 20 43 35 70 47 27 12 55 17 85 17 28 0 55-5 81-15 26-11 50-26 70-45l37 37c6 6 12 7 20 4 8-4 11-9 11-17z"/>
-<glyph unicode="&#74;" d="M434 165c0 7-2 14-8 19l-59 59c-5 6-12 8-20 8-8 0-14-3-20-9 0 0 2-2 5-5 3-3 5-5 6-6 1-1 3-3 5-6 2-2 3-4 3-7 1-2 1-5 1-8 0-7-2-14-8-19-5-5-11-8-19-8-3 0-5 0-8 1-2 1-5 2-7 4-3 1-4 3-6 4-1 1-3 3-6 6-3 3-4 5-5 5-6-5-9-12-9-20 0-8 2-15 8-20l58-59c6-5 12-8 20-8 7 0 14 3 19 8l42 41c6 6 8 12 8 20z m-201 201c0 8-2 14-8 19l-58 60c-6 5-12 8-20 8-7 0-14-3-19-8l-42-42c-6-5-8-12-8-19 0-8 2-14 8-19l59-60c5-5 12-8 20-8 8 0 14 3 20 9 0 1-2 3-5 6-3 3-5 5-6 6-1 1-3 3-5 5-2 3-3 5-3 7-1 3-1 5-1 8 0 8 2 14 8 20 5 5 11 8 19 8 3 0 5-1 8-1 2-1 5-2 7-4 3-2 4-3 6-4 1-1 3-3 6-6 3-3 4-5 5-6 6 6 9 13 9 21z m256-201c0-23-8-43-24-58l-42-42c-16-16-35-24-58-24-23 0-43 8-58 24l-59 60c-16 15-24 35-24 58 0 23 8 43 25 59l-25 25c-16-16-36-25-59-25-23 0-43 8-59 24l-59 60c-16 16-24 35-24 58 0 23 8 42 24 58l42 42c16 16 35 23 58 23 23 0 43-8 58-24l59-59c16-16 24-35 24-58 0-23-8-43-25-60l25-25c16 17 36 25 59 25 23 0 43-8 59-24l59-59c16-16 24-36 24-58z"/>
-<glyph unicode="&#75;" d="M475 256c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
-<glyph unicode="&#76;" d="M256 411c-28 0-54-7-78-20-24-14-43-33-57-57-13-24-20-50-20-78 0-28 7-54 20-78 14-24 33-43 57-57 24-13 50-20 78-20 28 0 54 7 78 20 24 14 43 33 57 57 13 24 20 50 20 78 0 28-7 54-20 78-14 24-33 43-57 57-24 13-50 20-78 20z m219-155c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
-<glyph unicode="&#77;" d="M479 165c0-11-4-19-11-26l-21-22c-8-7-16-10-26-10-11 0-19 3-26 10l-139 139-139-139c-7-7-15-10-26-10-10 0-18 3-25 10l-22 22c-7 7-11 15-11 26 0 10 4 18 11 26l186 186c7 7 16 10 26 10 10 0 19-3 26-10l186-186c7-8 11-16 11-26z"/>
-<glyph unicode="&#78;" d="M479 311c0-10-4-19-11-26l-186-186c-7-7-16-11-26-11-10 0-19 4-26 11l-186 186c-7 7-11 16-11 26 0 10 4 19 11 26l21 21c8 7 17 11 26 11 11 0 19-4 26-11l139-139 139 139c7 7 15 11 26 11 9 0 18-4 26-11l21-21c7-8 11-16 11-26z"/>
-<glyph unicode="&#79;" d="M158 256c-29-1-52-12-71-34l-35 0c-15 0-27 3-37 11-10 7-15 17-15 31 0 63 11 94 33 94 1 0 5-1 12-5 6-4 15-8 26-12 10-3 21-5 31-5 12 0 24 2 36 6-1-7-1-13-1-18 0-24 7-47 21-68z m286-170c0-21-7-38-20-50-13-13-30-19-51-19l-234 0c-21 0-38 6-51 19-13 12-20 29-20 50 0 10 1 19 1 28 1 9 2 18 4 29 2 10 4 20 7 29 3 9 7 17 11 26 5 8 11 15 17 21 6 6 14 11 23 15 9 3 19 5 30 5 1 0 5-2 11-6 6-4 12-8 19-13 8-4 17-9 29-12 12-4 24-6 36-6 12 0 24 2 36 6 12 3 21 8 29 12 7 5 13 9 19 13 6 4 10 6 11 6 11 0 21-2 30-5 9-4 17-9 23-15 6-6 12-13 17-21 4-9 8-17 11-26 3-9 5-19 7-29 2-11 3-20 4-29 0-9 1-18 1-28z m-273 341c0-19-7-35-20-49-14-13-30-20-49-20-18 0-35 7-48 20-13 14-20 30-20 49 0 19 7 35 20 48 13 13 30 20 48 20 19 0 35-7 49-20 13-13 20-29 20-48z m187-103c0-28-10-52-30-72-20-20-44-30-72-30-28 0-52 10-72 30-20 20-30 44-30 72 0 29 10 53 30 73 20 20 44 30 72 30 28 0 52-10 72-30 20-20 30-44 30-73z m154-60c0-14-5-24-15-31-10-8-22-11-37-11l-35 0c-19 22-42 33-71 34 14 21 21 44 21 68 0 5 0 11-1 18 12-4 24-6 36-6 10 0 21 2 31 5 11 4 20 8 26 12 7 4 11 5 12 5 22 0 33-31 33-94z m-34 163c0-19-7-35-20-49-13-13-30-20-48-20-19 0-35 7-49 20-13 14-20 30-20 49 0 19 7 35 20 48 14 13 30 20 49 20 18 0 35-7 48-20 13-13 20-29 20-48z"/>
-<glyph unicode="&#80;" d="M375 256c0-7-3-12-9-16l-156-91c-3-2-6-3-9-3-3 0-6 1-9 3-6 3-9 9-9 16l0 182c0 7 3 13 9 16 6 4 12 4 18 0l156-91c6-4 9-9 9-16z m36 0c0 28-7 54-20 78-14 24-33 43-57 57-24 13-50 20-78 20-28 0-54-7-78-20-24-14-43-33-57-57-13-24-20-50-20-78 0-28 7-54 20-78 14-24 33-43 57-57 24-13 50-20 78-20 28 0 54 7 78 20 24 14 43 33 57 57 13 24 20 50 20 78z m64 0c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
-<glyph unicode="&#81;" d="M238 366c0 15-6 28-16 39-11 10-24 16-39 16-15 0-28-6-39-16-11-11-16-24-16-39 0-8 2-16 5-24-7 4-15 5-23 5-16 0-28-5-39-16-11-10-16-23-16-38 0-16 5-29 16-39 11-11 23-16 39-16 15 0 28 5 39 16 10 10 16 23 16 39 0 8-2 15-6 23 8-3 16-5 24-5 15 0 28 5 39 16 10 11 16 23 16 39z m243-201c0-4-5-10-14-19-9-10-16-14-19-14-2 0-4 1-8 4-4 3-7 6-11 10-3 3-6 7-11 11-4 5-6 7-7 8l-27-28 63-63c5-5 8-12 8-19 0-8-4-16-11-23-8-8-15-11-23-11-8 0-15 2-20 8l-192 191c-33-25-68-37-104-37-31 0-56 10-76 29-19 20-29 45-29 76 0 30 9 60 27 89 18 30 42 53 71 71 29 18 59 27 89 27 31 0 57-9 76-29 20-19 30-45 30-76 0-36-13-70-38-104l102-101 27 27c-1 1-3 3-7 7-5 4-9 8-12 11-3 3-6 7-9 10-3 4-5 7-5 9 0 3 5 9 14 18 9 10 16 14 19 14 2 0 5-1 7-2 1-2 5-6 13-13 7-7 15-15 23-23 8-8 16-16 25-24 8-9 15-16 21-23 5-6 8-10 8-11z"/>
-<glyph unicode="&#121;" d="M392 142c70-24 105-45 105-62 0 0 0-54 0-54 0 0-241 0-241 0 0 0-241 0-241 0 0 0 0 54 0 54 0 17 35 38 105 62 32 12 54 24 65 36 12 12 18 28 18 48 0 8-4 16-12 25-7 10-12 22-16 38-1 4-2 7-5 9-2 2-4 3-7 4-2 1-4 4-7 9-2 5-4 12-4 22 0 5 0 10 2 13 2 4 3 6 5 6 0 0 2 2 2 2-3 17-5 32-6 45-2 19 5 38 21 58 15 19 42 29 80 29 38 0 65-10 81-29 16-20 22-39 20-58 0 0-6-45-6-45 6-2 9-10 9-21 0-10-2-17-4-22-3-5-5-8-7-9-3-1-5-2-7-4-3-2-4-5-5-9-3-17-8-29-16-38-8-9-12-17-12-25 0-20 6-36 18-48 12-12 34-24 65-36"/>
-<glyph unicode="&#82;" d="M440 389l-188 0c-10 12-20 25-23 28-2 6-8 10-14 10l-75 0c-5 0-9-3-13-6l-25-32-30 0c-16 0-28-13-28-28l0-248c0-15 12-28 28-28l368 0c16 0 28 13 28 28l0 248c0 15-12 28-28 28z"/>
-<glyph unicode="&#84;" d="M421 137c0 12-4 23-12 33-9 10-19 15-30 15-10 0-18-3-24-10-5-7-8-16-8-27 0-11 3-20 10-27 7-8 17-11 30-11 9 0 17 2 24 7 7 6 10 12 10 20z m-174-36c0-3-1-5-3-7l-91-91c-2-2-4-3-7-3-2 0-4 1-6 3l-92 91c-3 3-3 6-2 10 2 4 5 6 9 6l55 0 0 393c0 3 1 5 2 6 2 2 4 3 7 3l55 0c2 0 5-1 6-3 2-1 3-3 3-6l0-393 55 0c2 0 5-1 6-3 2-2 3-4 3-6z m214 19c0-12-1-23-4-34-2-12-6-23-11-33-6-10-12-19-20-27-7-8-17-14-28-19-11-5-23-7-36-7-12 0-22 2-31 5-5 1-9 3-12 4l11 32c3-1 6-2 9-3 7-2 14-4 21-4 16 0 29 6 39 17 9 11 16 25 19 42l-1 0c-4-5-10-8-17-11-8-3-16-4-25-4-20 0-36 7-49 20-13 14-19 30-19 50 0 20 7 37 20 51 14 13 31 20 52 20 24 0 43-9 59-27 15-18 23-42 23-72z m-8 205l0-32-134 0 0 32 47 0 0 124c0 1 0 3 0 5 1 2 1 4 1 5l0 4-1 0-2-3c-2-2-4-5-7-9l-18-16-24 24 55 53 35 0 0-187z"/>
-<glyph unicode="&#87;" d="M421 229l0-138c0-5-2-9-6-12-3-4-8-6-13-6l-109 0 0 110-74 0 0-110-109 0c-5 0-10 2-13 6-4 3-6 7-6 12l0 138c0 0 0 0 1 0 0 1 0 1 0 1l164 136 164-136c0 0 1-1 1-1z m63 19l-17-21c-2-2-4-3-6-3l-1 0c-3 0-5 1-6 2l-198 165-198-165c-2-2-4-2-7-2-2 0-4 1-6 3l-17 21c-2 2-2 4-2 7 0 3 1 5 3 6l205 171c6 5 14 8 22 8 8 0 16-3 22-8l69-58 0 56c0 2 1 5 3 6 2 2 4 3 7 3l54 0c3 0 5-1 7-3 2-1 3-4 3-6l0-117 62-52c2-1 3-3 3-6 0-3 0-5-2-7z"/>
-<glyph unicode="&#88;" d="M365 141c1-4 1-7-2-10l-100-110c-1-2-4-3-6-3-3 0-5 1-7 3l-101 110c-3 3-3 6-2 10 2 3 5 5 8 5l64 0 0 357c0 3 1 5 3 6 2 2 4 3 7 3l54 0c3 0 5-1 7-3 2-1 3-3 3-6l0-357 64 0c4 0 6-2 8-5z"/>
-<glyph unicode="&#89;" d="M365 371c-2-3-5-5-8-5l-64 0 0-357c0-3-1-5-3-6-2-2-4-3-7-3l-54 0c-3 0-5 1-7 3-2 1-3 3-3 6l0 357-64 0c-4 0-6 2-8 5-1 4-1 7 2 10l100 110c1 2 4 3 6 3 3 0 5-1 7-3l101-110c3-3 3-6 2-10z"/>
-<glyph unicode="&#90;" d="M201 302l0-165c0-3-1-5-2-6-2-2-4-3-7-3l-18 0c-3 0-5 1-7 3-2 1-2 3-2 6l0 165c0 2 0 5 2 6 2 2 4 3 7 3l18 0c3 0 5-1 7-3 1-1 2-4 2-6z m73 0l0-165c0-3-1-5-2-6-2-2-4-3-7-3l-18 0c-3 0-5 1-7 3-1 1-2 3-2 6l0 165c0 2 1 5 2 6 2 2 4 3 7 3l18 0c3 0 5-1 7-3 1-1 2-4 2-6z m73 0l0-165c0-3 0-5-2-6-2-2-4-3-7-3l-18 0c-3 0-5 1-7 3-1 1-2 3-2 6l0 165c0 2 1 5 2 6 2 2 4 3 7 3l18 0c3 0 5-1 7-3 2-1 2-4 2-6z m37-207l0 271-256 0 0-271c0-4 1-8 2-12 1-3 3-6 4-7 2-2 3-3 3-3l238 0c0 0 1 1 3 3 1 1 3 4 4 7 1 4 2 8 2 12z m-192 307l128 0-14 34c-1 1-3 2-5 3l-90 0c-2-1-4-2-5-3z m265-9l0-18c0-3-1-5-2-7-2-1-4-2-7-2l-27 0 0-271c0-16-5-30-14-41-9-12-20-17-32-17l-238 0c-12 0-23 5-32 16-9 11-14 25-14 41l0 272-27 0c-3 0-5 1-7 2-1 2-2 4-2 7l0 18c0 3 1 5 2 7 2 1 4 2 7 2l88 0 20 48c3 7 8 13 16 18 7 5 15 7 22 7l92 0c7 0 15-2 22-7 8-5 13-11 16-18l20-48 88 0c3 0 5-1 7-2 1-2 2-4 2-7z"/>
-<glyph unicode="&#86;" d="M370 400c0-4-3-8-8-8-4 0-8 4-8 8 0 5 4 8 8 8 5 0 8-3 8-8m3-76c0 0-11 50-77 37-6 23-5 40 9 55 20 21 52 10 52 10l0 17c-11 5-22 6-33 6-43 0-67-32-77-54l-119-219 34 6-62-119 43 8 33 93c93 0 213 34 197 160m40 42l-26 26-21-26z m-222-175c0 0 4 1 9 2 5 2 13 3 22 6 5 1 10 3 15 4 5 2 11 4 16 6 6 3 11 5 16 8 6 3 11 7 16 10 1 1 3 2 4 3l3 3c3 3 5 5 7 7 2 2 4 5 6 7 1 1 2 2 3 4l1 2 1 1c1 2 2 3 2 4 1 1 2 3 2 4 1 1 1 1 1 2 1 0 1 1 1 2 1 1 1 2 2 3 1 3 2 5 3 8 0 2 1 4 2 7 0 2 1 4 1 6 0 2 1 4 1 6 0 2 1 4 1 6 0 1 0 3 0 4 0 5 1 9 1 9l5-1c0 0-1-3-1-8 0-2-1-3-1-5 0-2 0-4-1-5 0-2 0-4-1-7 0-2-1-4-1-6-1-3-2-5-3-8-1-2-2-5-3-7 0-1-1-3-2-4 0-1 0-1-1-2 0-1 0-1-1-2 0-1-1-2-2-4-1-1-1-2-2-3-1-1-1-2-1-2l-2-2c-1-1-2-3-3-4-2-2-4-5-6-7-2-2-4-4-7-7l-3-3c-2-1-3-1-4-2-6-4-11-8-17-11-5-2-11-5-16-7-6-2-11-4-17-6-5-1-10-3-15-4-9-2-17-4-22-5-5-1-9-2-9-2"/>
-<glyph unicode="&#49;" d="M75 75c-48 48-75 113-75 181 0 141 115 256 256 256l32-32-32-32c-106 0-192-86-192-192 0-51 20-100 56-136l-39-5z m181-75l-32 32 32 32c106 0 192 86 192 192 0 51-20 100-56 136l39 5 6 40c48-48 75-113 75-181 0-141-115-256-256-256z"/>
-<glyph unicode="&#85;" d="M218 63c0-35-29-63-64-63-35 0-64 28-64 63 0 36 29 64 64 64 35 0 64-28 64-64z m0 193c0-35-29-64-64-64-35 0-64 29-64 64 0 35 29 64 64 64 35 0 64-29 64-64z m0 193c0-36-29-64-64-64-35 0-64 28-64 64 0 35 29 63 64 63 35 0 64-28 64-63z m204-386c0-35-29-63-64-63-35 0-64 28-64 63 0 36 29 64 64 64 35 0 64-28 64-64z m0 193c0-35-29-64-64-64-35 0-64 29-64 64 0 35 29 64 64 64 35 0 64-29 64-64z m0 193c0-36-29-64-64-64-35 0-64 28-64 64 0 35 29 63 64 63 35 0 64-28 64-63z"/>
-<glyph unicode="&#51;" d="M332 426l0-94 49 0 0-98-192 0 0 55-152-102 152-101 0 54 286 0 0 286z"/>
-<glyph unicode="&#50;" d="M192 320l-192 0 149-109-54-179 153 107 168-107-69 179 165 109-192 0-72 184z"/>
-<glyph unicode="&#53;" d="M135 456l241 0 0-23-241 0z m270-177l-127-124 0 222-45 0 0-220-125 122-33-32 181-181 181 181z"/>
-<glyph unicode="&#54;" d="M136 456l241 0 0-23-241 0z m-28-302l126 124 0-222 45 0 0 220 126-122 32 32-181 181-181-181z"/>
-<glyph unicode="&#48;" d="M346 321c0-2 0-4 0-6 0-2-1-4-1-7 0-2-1-5-1-7-1-3-2-6-2-9-1-3-2-6-3-9-1-3-2-6-3-10-1-1-2-3-2-4-1-1-1-2-1-3-1-1-1-1-2-2-1-2-1-3-2-5-1-2-2-3-3-5l-2-2-1-3c-1-1-2-3-4-4-2-3-4-7-7-9-3-3-6-6-9-9l-4-4c-2-1-3-2-5-4-6-5-13-9-20-13-7-4-14-7-21-10-7-3-14-6-21-8-6-2-12-4-18-6-12-3-22-5-29-7-7-2-11-2-11-2 0 0 4 0 11 2 7 1 17 3 29 6 6 2 12 3 19 5 7 2 14 5 21 8 7 3 14 6 21 10 7 3 14 8 21 13 2 1 3 2 5 3l5 4c3 3 6 6 8 9 3 3 6 6 8 9 2 2 3 3 4 5l2 2c0 1 1 2 1 3 1 1 2 3 4 5 0 1 1 3 2 5 1 0 1 1 2 2 0 1 0 2 1 3 1 1 1 3 2 5 2 3 3 6 4 9 1 4 2 7 3 10 1 3 1 6 2 8 1 3 1 6 2 8 0 3 0 5 1 7 0 3 0 5 0 6 1 8 1 12 1 12l-6 0c0 0 0-4-1-11m112 80l-34 33c-1 33-22 55-32 61-10 9-33 16-59 13-25-4-61-17-86-64-49-92-154-289-155-291-1 0-1-1 0-1 0-1 1-1 1-1l40 7-78-151c0-1 0-1 1-2 0 0 0 0 1 0 0 0 0 0 0 0l56 10c0 0 1 0 1 1l41 120c105 1 178 26 218 77 42 54 36 122 29 154l-5 31 60 0c0 0 1 0 1 1 1 0 0 1 0 2m-55 42c0-5-5-10-10-10-6 0-10 5-10 10 0 6 4 11 10 11 5 0 10-5 10-11m-33-228c-40-50-112-75-216-75-1 0-1-1-1-2l-42-120-51-9 78 151c0 1 0 1 0 2-1 0-1 1-2 1l-40-8c14 26 109 202 154 287 25 46 59 59 83 62 25 3 46-3 56-10l0-22c-2 0-16 5-29 5-13 0-28-5-37-15-16-18-20-36-12-66 54 10 78-13 87-27 7-30 15-99-28-154m29 186l23 30 30-30z"/>
-<glyph unicode="&#63;" d="M253 492c65 0 120-22 167-67 46-45 70-100 72-165 0-65-22-121-68-167-45-47-100-71-165-73-65 0-121 22-167 68-47 45-71 100-72 165-1 65 21 121 67 167 46 47 101 71 166 72m-1-379c10 0 19 3 25 9 6 7 10 15 10 24 0 11-2 19-9 26-6 6-15 9-25 9 0 0-1 0-1 0-10 0-18-3-24-9-7-6-10-14-11-24 0-10 3-18 10-25 6-6 14-10 24-10 0 0 1 0 1 0m85 168c9 11 13 24 13 40 0 26-9 46-27 59-18 13-41 19-69 19-22 0-40-4-53-13-24-14-36-39-37-75 0 0 0-2 0-2 0 0 56 0 56 0 0 0 0 2 0 2 0 9 3 18 8 28 6 8 15 12 28 12 14 0 23-3 27-10 5-7 8-14 8-23 0-6-3-13-8-20-3-4-7-8-11-10 0 0-3-2-3-2-2-2-4-4-8-6-3-2-7-5-10-8-4-2-7-5-11-8-4-3-7-6-9-9-4-7-7-20-9-40 0 0 0-4 0-4 0 0 56 0 56 0 0 0 0 2 0 2 0 4 0 9 2 14 2 7 6 13 14 19 0 0 14 9 14 9 16 12 25 20 29 26"/>
-<glyph unicode="&#33;" d="M499 65c4-6 4-12 0-18-3-5-8-8-15-8 0 0-457 0-457 0-6 0-11 3-14 8-4 6-4 12-1 18 0 0 228 400 228 400 3 6 8 9 16 9 7 0 12-3 15-9 0 0 228-400 228-400m-215 25c0 0 0 51 0 51 0 0-56 0-56 0 0 0 0-51 0-51 0 0 56 0 56 0m0 89c0 0 0 154 0 154 0 0-56 0-56 0 0 0 0-154 0-154 0 0 56 0 56 0"/>
-<glyph unicode="&#57;" d="M256 512c-141 0-256-115-256-256 0-141 115-256 256-256 141 0 256 115 256 256 0 141-115 256-256 256z m-40-374l-117 118 45 45 72-73 154 154 45-45z"/>
-<glyph unicode="&#83;" d="M435 186l0-117-358 0 0 117-68 0 0-151c0-19 15-35 34-35l426 0c19 0 34 16 34 35l0 151z m-185 12l-99 118c0 0-15 15 2 15 16 0 55 0 55 0 0 0 0 9 0 24 0 41 0 118 0 149 0 0-2 8 11 8 12 0 68 0 78 0 9 0 8-7 8-7 0-30 0-109 0-149 0-13 0-22 0-22 0 0 32 0 52 0 19 0 5-15 5-15 0 0-84-111-96-122-8-9-16 1-16 1z"/>
-<glyph unicode="&#52;" d="M256 309c8 0 15-1 22-4 7-3 13-6 18-11 5-5 9-11 11-17 3-7 5-14 5-21 0-7-2-14-5-21-2-6-6-12-11-17-5-5-11-8-18-11-7-3-14-4-22-4-8 0-15 1-22 4-7 3-13 6-18 11-5 5-9 11-11 17-3 7-5 14-5 21 0 7 2 14 5 21 2 6 6 12 11 17 5 5 11 8 18 11 7 3 14 4 22 4z m0-136c12 0 23 2 34 6 11 4 20 10 28 18 8 7 14 16 19 26 4 11 6 21 6 33 0 12-2 22-6 33-5 10-11 19-19 26-8 8-17 14-28 18-11 4-22 6-34 6-12 0-23-2-34-6-11-4-20-10-28-18-8-7-14-16-19-26-4-11-6-21-6-33 0-12 2-22 6-33 5-10 11-19 19-26 8-8 17-14 28-18 11-4 22-6 34-6z m0 194c18 0 35-2 51-6 16-4 31-10 45-17 14-6 26-14 37-22 11-9 21-17 29-25 7-8 13-16 17-23 5-8 7-14 7-18 0-4-2-10-7-18-4-7-10-15-17-23-8-8-18-16-29-25-11-8-23-16-37-22-14-7-29-13-45-17-16-4-33-6-51-6-18 0-35 2-51 6-17 4-31 10-45 17-14 6-26 14-37 22-11 9-21 17-29 25-7 8-13 16-17 23-5 8-7 14-7 18 0 4 2 10 7 18 4 7 10 15 17 23 8 8 18 16 29 25 11 8 23 16 37 22 14 7 28 13 45 17 16 4 33 6 51 6z"/>
-<glyph unicode="&#55;" d="M416 0l-320 0c-53 0-96 43-96 96l0 320c0 42 27 77 64 90l0-42c0-27 22-48 48-48 26 0 48 21 48 48l0 48 192 0 0-48c0-27 22-48 48-48 26 0 48 21 48 48l0 42c37-13 64-48 64-90l0-320c0-53-43-96-96-96z m32 352l-384 0 0-256c0-18 14-32 32-32l320 0c18 0 32 14 32 32z m-128-160l64 0 0-64-64 0z m0 96l64 0 0-64-64 0z m-96-96l64 0 0-64-64 0z m0 96l64 0 0-64-64 0z m-96-96l64 0 0-64-64 0z m0 96l64 0 0-64-64 0z m272 160c-9 0-16 7-16 16l0 48 32 0 0-48c0-9-7-16-16-16z m-288 0c-9 0-16 7-16 16l0 48 32 0 0-48c0-9-7-16-16-16z"/>
-<glyph unicode="&#36;" d="M0 512l0-512 512 0 0 512z m157-431l-104 0 0 53 189 0 0-53z m274 269l-378 0 0 81 377 0 0-81z m-1-144l-377 0 0 80 377 0z"/>
-</font></defs></svg>
->>>>>>> master
+</font></defs></svg>
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf
index c4161bea849d4ddb060928acbc08627d98cbaa78..38d2e1789c3dbff85017292ac2372a17f1b970bb 100755
GIT binary patch
delta 50
xcmeA<#n^L-aY7(-#&_0@AwG#R246g?;`wd9GH^37fWY}Bw^d;D<~@l4%mB<)5nccQ

delta 50
ycmeA<#n^L-aY7)o-?rq9AwG#Rh8idL#q-;IW#DFF0D<$<cU^|joA)FJFarS8D-vA*

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff
index 484c0b1279783fdfe4d00cef06b333cf25527b9e..6bb696528431c56c3d7eb25a55a2d63879c41315 100755
GIT binary patch
delta 47
vcmaD+`l56~FLTCs){PS;noDOsS{Bc5^Ob>{i2(%8FS)G(qc_`FtYHEG*xM1g

delta 47
vcmaD+`l56~FSFma<c$+1noG}1eihGe^Ob>{i2(%8Pv3PJMsK#USi=MW;jI$5


From c7921f2cda3afeaba695e46e61317e8d7d6d8598 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 23 May 2014 12:07:21 +0100
Subject: [PATCH 024/293] updated green colour for messages

---
 .../static/wagtailadmin/scss/components/messages.scss           | 2 +-
 wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss
index e5e2454f694..ff01dc248e5 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss
@@ -40,7 +40,7 @@
         }
     }
     .success{
-        background-color:$color-teal-dark;
+        background-color:$color-green;
 
         &:before{
             font-family:wagtail;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss
index 4c06efec8bd..0f65679893f 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss
@@ -29,7 +29,7 @@ $color-teal-darker: darken($color-teal, 10%);
 $color-teal-dark: #246060;
 $color-red: #f7474e;
 $color-orange:#e9b04d;
-$color-green: #00FF00;
+$color-green: #189370;
 
 /* darker to lighter */
 $color-grey-1: #333333;

From 9511b21ea73cf86958c8221eec212bd04c18198d Mon Sep 17 00:00:00 2001
From: Serafeim Papastefanos <spapas@gmail.com>
Date: Sun, 25 May 2014 22:07:59 +0300
Subject: [PATCH 025/293] Test publish scheduled pages management command

---
 wagtail/wagtailadmin/tests.py | 154 +++++++++++++++++++++++++++++++++-
 1 file changed, 151 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailadmin/tests.py b/wagtail/wagtailadmin/tests.py
index 3df92ec2247..04bf38f7639 100644
--- a/wagtail/wagtailadmin/tests.py
+++ b/wagtail/wagtailadmin/tests.py
@@ -1,11 +1,13 @@
 from datetime import datetime, timedelta
+from django.core import management
+from django.core.urlresolvers import reverse
 from django.utils import timezone
 from django.test import TestCase
 import unittest
+from StringIO import StringIO
 from wagtail.tests.models import SimplePage, EventPage
 from wagtail.tests.utils import login
 from wagtail.wagtailcore.models import Page, PageRevision
-from django.core.urlresolvers import reverse
 
 
 class TestHome(TestCase):
@@ -127,7 +129,7 @@ def test_create_simplepage_scheduled(self):
         # No revisions with approved_go_live_datetime
         self.assertFalse(PageRevision.objects.filter(page=page).exclude(approved_go_live_datetime__isnull=True).exists())
 
-    def test_create_simplepage_scheduled_errored(self):
+    def test_create_simplepage_scheduled_go_live_before_expiry(self):
         post_data = {
             'title': "New page!",
             'content': "Some content",
@@ -141,6 +143,7 @@ def test_create_simplepage_scheduled_errored(self):
         self.assertEqual(response.status_code, 200)
         self.assertTrue(response.context['edit_handler'].form.errors)
 
+    def test_create_simplepage_scheduled_expire_in_the_past(self):
         post_data = {
             'title': "New page!",
             'content': "Some content",
@@ -337,9 +340,51 @@ def test_edit_post_publish_scheduled(self):
         child_page_new = SimplePage.objects.get(id=self.child_page.id)
         # The page should not be live anymore
         self.assertFalse(child_page_new.live)
-        # Instead a revision with approved_go_live_datetime should not exist
+        # Instead a revision with approved_go_live_datetime should now exist
         self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_datetime__isnull=True).exists())
 
+    def test_edit_post_publish_now_an_already_scheduled(self):
+        # First let's publish a page with a go_live_datetime in the future
+        go_live_datetime = timezone.now() + timedelta(days=1)
+        expiry_datetime = timezone.now() + timedelta(days=2)
+        post_data = {
+            'title': "I've been edited!",
+            'content': "Some content",
+            'slug': 'hello-world',
+            'action-publish': "Publish",
+            'go_live_datetime': str(go_live_datetime),
+            'expiry_datetime': str(expiry_datetime),
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
+
+        # Should be redirected to explorer page
+        self.assertEqual(response.status_code, 302)
+
+        child_page_new = SimplePage.objects.get(id=self.child_page.id)
+        # The page should not be live anymore
+        self.assertFalse(child_page_new.live)
+        # Instead a revision with approved_go_live_datetime should now exist
+        self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_datetime__isnull=True).exists())
+
+        # Now, let's edit it and publish it right now
+        go_live_datetime = timezone.now()
+        post_data = {
+            'title': "I've been edited!",
+            'content': "Some content",
+            'slug': 'hello-world',
+            'action-publish': "Publish",
+            'go_live_datetime': "",
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
+
+        # Should be redirected to explorer page
+        self.assertEqual(response.status_code, 302)
+
+        child_page_new = SimplePage.objects.get(id=self.child_page.id)
+        # The page should be live now
+        self.assertTrue(child_page_new.live)
+        # And a revision with approved_go_live_datetime should not exist
+        self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_datetime__isnull=True).exists())
 
 class TestPageDelete(TestCase):
     def setUp(self):
@@ -454,3 +499,106 @@ def test_editor_css_and_js_hooks_on_edit(self):
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, '<link rel="stylesheet" href="/path/to/my/custom.css">')
         self.assertContains(response, '<script src="/path/to/my/custom.js"></script>')
+
+class TestPublishScheduledPages(TestCase):
+    def setUp(self):
+        # Find root page
+        self.root_page = Page.objects.get(id=2)
+
+    def test_go_live_page_will_be_published(self):
+        page = SimplePage()
+        page.title = "Hello world!"
+        page.slug = "hello-world"
+        page.live = False
+        page.go_live_datetime = timezone.now() - timedelta(days=1)
+        self.root_page.add_child(page)
+
+        page.save_revision(
+            approved_go_live_datetime = timezone.now() - timedelta(days=1)
+        )
+        p = Page.objects.get(slug='hello-world')
+        self.assertFalse(p.live)
+        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists())
+        management.call_command('publish_scheduled_pages', verbosity=3, interactive=False)
+        #management.call_command('publish_scheduled_pages', dryrun=True, verbosity=3, interactive=False)
+        p = Page.objects.get(slug='hello-world')
+        self.assertTrue(p.live)
+        self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists())
+
+    def test_go_live_page_will_be_published(self):
+        page = SimplePage()
+        page.title = "Hello world!"
+        page.slug = "hello-world"
+        page.live = False
+        page.go_live_datetime = timezone.now() - timedelta(days=1)
+        self.root_page.add_child(page)
+
+        page.save_revision(approved_go_live_datetime = timezone.now() - timedelta(days=1))
+        p = Page.objects.get(slug='hello-world')
+        self.assertFalse(p.live)
+        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists())
+        management.call_command('publish_scheduled_pages', )
+        p = Page.objects.get(slug='hello-world')
+        self.assertTrue(p.live)
+        self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists())
+
+    def test_future_go_live_page_will_not_be_published(self):
+        page = SimplePage()
+        page.title = "Hello world!"
+        page.slug = "hello-world"
+        page.live = False
+        page.go_live_datetime = timezone.now() + timedelta(days=1)
+        self.root_page.add_child(page)
+        page.save_revision(approved_go_live_datetime = timezone.now() - timedelta(days=1))
+        p = Page.objects.get(slug='hello-world')
+        self.assertFalse(p.live)
+        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists())
+        management.call_command('publish_scheduled_pages', )
+        p = Page.objects.get(slug='hello-world')
+        self.assertFalse(p.live)
+        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists())
+
+    def test_expired_page_will_be_unpublished(self):
+        page = SimplePage()
+        page.title = "Hello world!"
+        page.slug = "hello-world"
+        page.live = True
+        page.expiry_datetime = timezone.now() - timedelta(days=1)
+        self.root_page.add_child(page)
+        p = Page.objects.get(slug='hello-world')
+        self.assertTrue(p.live)
+        management.call_command('publish_scheduled_pages', )
+        p = Page.objects.get(slug='hello-world')
+        self.assertFalse(p.live)
+        self.assertTrue(p.expired)
+
+    def test_future_expired_page_will_not_be_unpublished(self):
+        page = SimplePage()
+        page.title = "Hello world!"
+        page.slug = "hello-world"
+        page.live = True
+        page.expiry_datetime = timezone.now() + timedelta(days=1)
+        self.root_page.add_child(page)
+        p = Page.objects.get(slug='hello-world')
+        self.assertTrue(p.live)
+        management.call_command('publish_scheduled_pages', )
+        p = Page.objects.get(slug='hello-world')
+        self.assertTrue(p.live)
+        self.assertFalse(p.expired)
+
+    def test_expired_pages_are_dropped_from_mod_queue(self):
+        page = SimplePage()
+        page.title = "Hello world!"
+        page.slug = "hello-world"
+        page.live = False
+        page.expiry_datetime = timezone.now() - timedelta(days=1)
+        self.root_page.add_child(page)
+        page.save_revision(submitted_for_moderation = True)
+        p = Page.objects.get(slug='hello-world')
+        self.assertFalse(p.live)
+        self.assertTrue(PageRevision.objects.filter(page=p, submitted_for_moderation=True).exists())
+        management.call_command('publish_scheduled_pages', )
+        p = Page.objects.get(slug='hello-world')
+        self.assertFalse(PageRevision.objects.filter(page=p, submitted_for_moderation=True).exists())
+
+

From 8dfd0c623f7dfa954e7f5c6307da06213932e4e7 Mon Sep 17 00:00:00 2001
From: Serafeim Papastefanos <spapas@gmail.com>
Date: Thu, 29 May 2014 19:03:19 +0300
Subject: [PATCH 026/293] Add help_text mssage to scheduled publisihing ...

datetime fields (go_live_datetime and expiry_datetime) to help users fill
them since no datetim control is available.
---
 wagtail/wagtailcore/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 5bdf1c37304..434b174b646 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -235,8 +235,8 @@ class Page(MP_Node, ClusterableModel, Indexed):
     show_in_menus = models.BooleanField(default=False, help_text=_("Whether a link to this page will appear in automatically generated menus"))
     search_description = models.TextField(blank=True)
 
-    go_live_datetime = models.DateTimeField(verbose_name=_("Go live date/time"), blank=True, null=True)
-    expiry_datetime = models.DateTimeField(verbose_name=_("Expiry date/time"), blank=True, null=True)
+    go_live_datetime = models.DateTimeField(verbose_name=_("Go live date/time"), help_text=_("Please add a date-time in the form YYYY-MM-DD hh:mm."), blank=True, null=True)
+    expiry_datetime = models.DateTimeField(verbose_name=_("Expiry date/time"), help_text=_("Please add a date-time in the form YYYY-MM-DD hh:mm."), blank=True, null=True)
     expired = models.BooleanField(default=False, editable=False)
 
     indexed_fields = {

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 027/293] 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 6590e6dcc51..8e18c661dc9 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 028/293] 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 6fd37ebeb84..346729653f2 100755
--- a/runtests.py
+++ b/runtests.py
@@ -101,7 +101,8 @@
         ),
         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 029/293] 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 95d54d7d936..0b71d55fbe6 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 @@ def test_login_view_post(self):
 
         # 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 @@ def test_already_logged_in_redirect(self):
 
         # 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 @@ def test_logout(self):
 
         # 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 @@ def test_change_password_view_post(self):
         }
         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 @@ def test_change_password_view_post_password_mismatch(self):
         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 @@ def test_password_reset_view_post(self):
         }
         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 @@ def test_password_reset_confirm_view_post(self):
         }
         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 030/293] 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 8e18c661dc9..44e61255508 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 031/293] 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 ccaa67daeef..f97c2658187 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 @@ def setUp(self):
         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 @@ def test_explore(self):
         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 @@ def test_create_simplepage_post(self):
 
         # 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 @@ def test_create_simplepage_post_publish(self):
 
         # 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 @@ def test_create_simplepage_post_submit(self):
 
         # 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 @@ def test_preview_on_create(self):
         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 @@ def setUp(self):
         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 @@ def test_page_edit_post(self):
     
         # 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 @@ def test_page_edit_post_publish(self):
     
         # 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 @@ def test_page_edit_post_submit(self):
     
         # 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 @@ def test_preview_on_edit(self):
         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 @@ def setUp(self):
         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 @@ def test_page_delete_post(self):
 
         # 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 @@ def test_root_can_appear_in_search_results(self):
         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 @@ def setUp(self):
         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 @@ def test_page_set_page_position(self):
         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 @@ def test_unpublish_view_post(self):
             '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 @@ def setUp(self):
             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 @@ def test_approve_moderation_view(self):
             '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 @@ def test_reject_moderation_view(self):
             '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 @@ def test_preview_for_moderation(self):
         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 032/293] 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 44e61255508..4b22b000c53 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 0b71d55fbe6..499cd9554d6 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 @@ def test_logout(self):
         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 @@ def test_change_password_view_post_password_mismatch(self):
         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 f97c2658187..a34b29fd894 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 @@ def test_explore(self):
         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 @@ def test_preview_on_create(self):
         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 @@ def test_preview_on_edit(self):
         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 @@ def test_page_delete_post(self):
         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 @@ def test_root_can_appear_in_search_results(self):
         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 @@ def test_page_set_page_position(self):
         self.assertEqual(response.status_code, 200)
 
 
-class TestPageUnpublish(WagtailTestCase):
+class TestPageUnpublish(TestCase, WagtailTestUtils):
     def setUp(self):
         self.user = self.login()
 
@@ -516,7 +517,7 @@ def test_unpublish_view_post(self):
         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 @@ def test_preview_for_moderation(self):
         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 033/293] 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 4b22b000c53..0497b239a92 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 034/293] 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 12aa28a0bff..b0c0896e28f 100644
--- a/wagtail/wagtailadmin/tests/tests.py
+++ b/wagtail/wagtailadmin/tests/tests.py
@@ -12,7 +12,7 @@ def setUp(self):
         # 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 d068f9a272f..33da3e33aa1 100644
--- a/wagtail/wagtaildocs/tests.py
+++ b/wagtail/wagtaildocs/tests.py
@@ -46,8 +46,10 @@ def setUp(self):
     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 @@ def setUp(self):
     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 @@ def setUp(self):
     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 @@ def setUp(self):
     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 @@ def setUp(self):
     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 @@ def setUp(self):
     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 @@ def setUp(self):
     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 00d1245e646..fdadc37041b 100644
--- a/wagtail/wagtailimages/tests.py
+++ b/wagtail/wagtailimages/tests.py
@@ -194,8 +194,10 @@ def setUp(self):
     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 @@ def get(self, params={}):
     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 @@ def get(self, params={}):
     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 @@ def get(self, params={}):
     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 @@ def setUp(self):
     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 @@ def setUp(self):
     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 @@ def setUp(self):
     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 a14a853fa70..f23ea63c997 100644
--- a/wagtail/wagtailredirects/tests.py
+++ b/wagtail/wagtailredirects/tests.py
@@ -73,8 +73,10 @@ def setUp(self):
     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 @@ def get(self, params={}):
     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 @@ def get(self, params={}, redirect_id=None):
     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 @@ def get(self, params={}, redirect_id=None):
     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 e0b49153fa1..2af0df625b0 100644
--- a/wagtail/wagtailsearch/tests/test_editorspicks.py
+++ b/wagtail/wagtailsearch/tests/test_editorspicks.py
@@ -52,8 +52,10 @@ def setUp(self):
     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 @@ def setUp(self):
     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 @@ def setUp(self):
     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 @@ def setUp(self):
     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 82189cfc9c3..8081c968dbd 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 7086d46f434..67325104d39 100644
--- a/wagtail/wagtailsearch/tests/test_queries.py
+++ b/wagtail/wagtailsearch/tests/test_queries.py
@@ -146,8 +146,11 @@ def setUp(self):
     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 fd283f7f550..f68062319ce 100644
--- a/wagtail/wagtailsnippets/tests.py
+++ b/wagtail/wagtailsnippets/tests.py
@@ -13,8 +13,10 @@ def setUp(self):
     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 @@ def get(self, params={}):
                                        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 @@ def post(self, post_data={}):
                                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 @@ def post(self, post_data={}):
                                         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 bfe0fe4ef0c..d60d33d4731 100644
--- a/wagtail/wagtailusers/tests.py
+++ b/wagtail/wagtailusers/tests.py
@@ -11,8 +11,10 @@ def setUp(self):
     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 @@ def get(self, params={}):
     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 @@ def get(self, params={}, user_id=None):
     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 035/293] 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 fdadc37041b..c8f0194c0ee 100644
--- a/wagtail/wagtailimages/tests.py
+++ b/wagtail/wagtailimages/tests.py
@@ -4,7 +4,7 @@
 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 @@ def test_ordering(self):
             self.assertEqual(response.status_code, 200)
 
 
-class TestImageAddView(TestCase):
+class TestImageAddView(TestCase, WagtailTestUtils):
     def setUp(self):
         login(self.client)
 
@@ -240,6 +240,7 @@ def test_add(self):
 
         # 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 @@ def test_add(self):
         self.assertEqual(image.height, 480)
 
 
-class TestImageEditView(TestCase):
+class TestImageEditView(TestCase, WagtailTestUtils):
     def setUp(self):
         login(self.client)
 
@@ -279,13 +280,14 @@ def test_edit(self):
 
         # 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 @@ def test_delete(self):
 
         # 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 f23ea63c997..543a8dd7016 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 @@ def test_pagination(self):
             self.assertEqual(response.status_code, 200)
 
 
-class TestRedirectsAddView(TestCase):
+class TestRedirectsAddView(TestCase, WagtailTestUtils):
     def setUp(self):
         login(self.client)
 
@@ -114,6 +114,7 @@ def test_add(self):
 
         # 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 @@ def test_add_validation_error(self):
         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 @@ def test_edit(self):
 
         # 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 @@ def test_edit_validation_error(self):
         # 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 @@ def test_delete(self):
 
         # 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 f68062319ce..3adaf5a3bd3 100644
--- a/wagtail/wagtailsnippets/tests.py
+++ b/wagtail/wagtailsnippets/tests.py
@@ -2,7 +2,7 @@
 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 @@ def test_displays_add_button(self):
         self.assertContains(self.get(), "Add advert")
 
 
-class TestSnippetCreateView(TestCase):
+class TestSnippetCreateView(TestCase, WagtailTestUtils):
     def setUp(self):
         login(self.client)
 
@@ -68,13 +68,14 @@ def test_create(self):
         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 @@ def test_edit(self):
         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 @@ def test_delete_post(self):
 
         # 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 d60d33d4731..c9105e3c092 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 @@ def test_pagination(self):
             self.assertEqual(response.status_code, 200)
 
 
-class TestUserCreateView(TestCase):
+class TestUserCreateView(TestCase, WagtailTestUtils):
     def setUp(self):
         login(self.client)
 
@@ -55,6 +55,7 @@ def test_create(self):
 
         # 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 @@ def test_create(self):
         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 @@ def test_edit(self):
 
         # 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 036/293] 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 0497b239a92..0b13e593203 100644
--- a/wagtail/tests/utils.py
+++ b/wagtail/tests/utils.py
@@ -15,19 +15,15 @@
     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 b0c0896e28f..f014c026df2 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 33da3e33aa1..3353ce39ed9 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 @@ def test_user_cant_edit(self):
 ## ===== 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 @@ def test_ordering(self):
             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 @@ def test_simple(self):
     # 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 @@ def test_simple(self):
     # 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 @@ def test_simple(self):
     # 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 @@ def test_pagination(self):
             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 @@ def test_simple(self):
     # 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 b1eefdb1787..b1268729e28 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 @@ def test_invalid_width(self):
         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 c8f0194c0ee..d01535edacb 100644
--- a/wagtail/wagtailimages/tests.py
+++ b/wagtail/wagtailimages/tests.py
@@ -4,7 +4,7 @@
 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 @@ def test_image_tag(self):
 ## ===== 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 @@ def test_ordering(self):
 
 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 @@ def test_add(self):
 
 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 @@ def test_edit(self):
 
 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 @@ def test_delete(self):
         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 @@ def test_pagination(self):
             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 @@ def test_simple(self):
     # 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 543a8dd7016..29ad7ec0bd2 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 @@ def test_temporary_redirect(self):
         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 @@ def test_pagination(self):
 
 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 @@ def setUp(self):
         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 @@ def setUp(self):
         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 2af0df625b0..7ee974fd0d3 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 @@ def test_editors_pick_ordering(self):
         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 @@ def test_pagination(self):
             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 @@ def test_simple(self):
         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 @@ def test_simple(self):
         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 @@ def test_simple(self):
         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 67325104d39..ee5382db426 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 @@ def test_garbage_collect_command(self):
     # 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 3adaf5a3bd3..bf9d6273169 100644
--- a/wagtail/wagtailsnippets/tests.py
+++ b/wagtail/wagtailsnippets/tests.py
@@ -2,13 +2,13 @@
 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 @@ def test_displays_snippet(self):
         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 @@ def test_displays_add_button(self):
 
 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 @@ def setUp(self):
         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 @@ def setUp(self):
         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 c9105e3c092..6de97f202ec 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 @@ def test_pagination(self):
 
 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 @@ def setUp(self):
         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 3fa98ef82ed60a622943e54994b819da21841fee Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 3 Jun 2014 10:21:21 +0100
Subject: [PATCH 037/293] Renamed scheduled publishing fields

---
 wagtail/wagtailadmin/tests.py                 | 120 +++++++++---------
 wagtail/wagtailadmin/views/pages.py           |  34 ++---
 .../commands/publish_scheduled_pages.py       |  16 +--
 .../0003_fields_for_scheduled_publishing.py   |  30 ++---
 wagtail/wagtailcore/models.py                 |  32 ++---
 5 files changed, 116 insertions(+), 116 deletions(-)

diff --git a/wagtail/wagtailadmin/tests.py b/wagtail/wagtailadmin/tests.py
index 3bddc864c3e..4d6016609f4 100644
--- a/wagtail/wagtailadmin/tests.py
+++ b/wagtail/wagtailadmin/tests.py
@@ -78,14 +78,14 @@ def test_create_simplepage_post(self):
         self.assertFalse(page.live)
 
     def test_create_simplepage_scheduled(self):
-        go_live_datetime = timezone.now() + timedelta(days=1)
-        expiry_datetime = timezone.now() + timedelta(days=2)
+        go_live_at = timezone.now() + timedelta(days=1)
+        expire_at = timezone.now() + timedelta(days=2)
         post_data = {
             'title': "New page!",
             'content': "Some content",
             'slug': 'hello-world',
-            'go_live_datetime': str(go_live_datetime).split('.')[0],
-            'expiry_datetime': str(expiry_datetime).split('.')[0],
+            'go_live_at': str(go_live_at).split('.')[0],
+            'expire_at': str(expire_at).split('.')[0],
         }
         response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
 
@@ -94,21 +94,21 @@ def test_create_simplepage_scheduled(self):
 
         # Find the page and check the scheduled times
         page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific
-        self.assertEquals(page.go_live_datetime.date(), go_live_datetime.date())
-        self.assertEquals(page.expiry_datetime.date(), expiry_datetime.date())
+        self.assertEquals(page.go_live_at.date(), go_live_at.date())
+        self.assertEquals(page.expire_at.date(), expire_at.date())
         self.assertEquals(page.expired, False)
         self.assertTrue(page.status_string, "draft")
 
-        # No revisions with approved_go_live_datetime
-        self.assertFalse(PageRevision.objects.filter(page=page).exclude(approved_go_live_datetime__isnull=True).exists())
+        # No revisions with approved_go_live_at
+        self.assertFalse(PageRevision.objects.filter(page=page).exclude(approved_go_live_at__isnull=True).exists())
 
     def test_create_simplepage_scheduled_go_live_before_expiry(self):
         post_data = {
             'title': "New page!",
             'content': "Some content",
             'slug': 'hello-world',
-            'go_live_datetime': str(timezone.now() + timedelta(days=2)).split('.')[0],
-            'expiry_datetime': str(timezone.now() + timedelta(days=1)).split('.')[0],
+            'go_live_at': str(timezone.now() + timedelta(days=2)).split('.')[0],
+            'expire_at': str(timezone.now() + timedelta(days=1)).split('.')[0],
         }
         response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
 
@@ -121,7 +121,7 @@ def test_create_simplepage_scheduled_expire_in_the_past(self):
             'title': "New page!",
             'content': "Some content",
             'slug': 'hello-world',
-            'expiry_datetime': str(timezone.now() + timedelta(days=-1)).split('.')[0],
+            'expire_at': str(timezone.now() + timedelta(days=-1)).split('.')[0],
         }
         response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
 
@@ -148,15 +148,15 @@ def test_create_simplepage_post_publish(self):
         self.assertTrue(page.live)
 
     def test_create_simplepage_post_publish_scheduled(self):
-        go_live_datetime = timezone.now() + timedelta(days=1)
-        expiry_datetime = timezone.now() + timedelta(days=2)
+        go_live_at = timezone.now() + timedelta(days=1)
+        expire_at = timezone.now() + timedelta(days=2)
         post_data = {
             'title': "New page!",
             'content': "Some content",
             'slug': 'hello-world',
             'action-publish': "Publish",
-            'go_live_datetime': str(go_live_datetime).split('.')[0],
-            'expiry_datetime': str(expiry_datetime).split('.')[0],
+            'go_live_at': str(go_live_at).split('.')[0],
+            'expire_at': str(expire_at).split('.')[0],
         }
         response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
 
@@ -165,12 +165,12 @@ def test_create_simplepage_post_publish_scheduled(self):
 
         # Find the page and check it
         page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific
-        self.assertEquals(page.go_live_datetime.date(), go_live_datetime.date())
-        self.assertEquals(page.expiry_datetime.date(), expiry_datetime.date())
+        self.assertEquals(page.go_live_at.date(), go_live_at.date())
+        self.assertEquals(page.expire_at.date(), expire_at.date())
         self.assertEquals(page.expired, False)
 
-        # A revision with approved_go_live_datetime should exist now
-        self.assertTrue(PageRevision.objects.filter(page=page).exclude(approved_go_live_datetime__isnull=True).exists())
+        # A revision with approved_go_live_at should exist now
+        self.assertTrue(PageRevision.objects.filter(page=page).exclude(approved_go_live_at__isnull=True).exists())
         # But Page won't be live
         self.assertFalse(page.live)
         self.assertTrue(page.status_string, "scheduled")
@@ -250,14 +250,14 @@ def test_edit_post(self):
         self.assertTrue(child_page_new.has_unpublished_changes)
 
     def test_edit_post_scheduled(self):
-        go_live_datetime = timezone.now() + timedelta(days=1)
-        expiry_datetime = timezone.now() + timedelta(days=2)
+        go_live_at = timezone.now() + timedelta(days=1)
+        expire_at = timezone.now() + timedelta(days=2)
         post_data = {
             'title': "I've been edited!",
             'content': "Some content",
             'slug': 'hello-world',
-            'go_live_datetime': str(go_live_datetime).split('.')[0],
-            'expiry_datetime': str(expiry_datetime).split('.')[0],
+            'go_live_at': str(go_live_at).split('.')[0],
+            'expire_at': str(expire_at).split('.')[0],
         }
         response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
 
@@ -268,11 +268,11 @@ def test_edit_post_scheduled(self):
 
         # The page will still be live
         self.assertTrue(child_page_new.live)
-        # A revision with approved_go_live_datetime should not exist
-        self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_datetime__isnull=True).exists())
-        # But a revision with go_live_datetime and expiry_datetime in their content json *should* exist
-        self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(go_live_datetime.date())).exists())
-        self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(expiry_datetime.date())).exists())
+        # A revision with approved_go_live_at should not exist
+        self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists())
+        # But a revision with go_live_at and expire_at in their content json *should* exist
+        self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(go_live_at.date())).exists())
+        self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(expire_at.date())).exists())
 
     def test_edit_post_publish(self):
         # Tests publish from edit page
@@ -295,15 +295,15 @@ def test_edit_post_publish(self):
         self.assertFalse(child_page_new.has_unpublished_changes)
 
     def test_edit_post_publish_scheduled(self):
-        go_live_datetime = timezone.now() + timedelta(days=1)
-        expiry_datetime = timezone.now() + timedelta(days=2)
+        go_live_at = timezone.now() + timedelta(days=1)
+        expire_at = timezone.now() + timedelta(days=2)
         post_data = {
             'title': "I've been edited!",
             'content': "Some content",
             'slug': 'hello-world',
             'action-publish': "Publish",
-            'go_live_datetime': str(go_live_datetime).split('.')[0],
-            'expiry_datetime': str(expiry_datetime).split('.')[0],
+            'go_live_at': str(go_live_at).split('.')[0],
+            'expire_at': str(expire_at).split('.')[0],
         }
         response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
 
@@ -313,20 +313,20 @@ def test_edit_post_publish_scheduled(self):
         child_page_new = SimplePage.objects.get(id=self.child_page.id)
         # The page should not be live anymore
         self.assertFalse(child_page_new.live)
-        # Instead a revision with approved_go_live_datetime should now exist
-        self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_datetime__isnull=True).exists())
+        # Instead a revision with approved_go_live_at should now exist
+        self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists())
 
     def test_edit_post_publish_now_an_already_scheduled(self):
-        # First let's publish a page with a go_live_datetime in the future
-        go_live_datetime = timezone.now() + timedelta(days=1)
-        expiry_datetime = timezone.now() + timedelta(days=2)
+        # First let's publish a page with a go_live_at in the future
+        go_live_at = timezone.now() + timedelta(days=1)
+        expire_at = timezone.now() + timedelta(days=2)
         post_data = {
             'title': "I've been edited!",
             'content': "Some content",
             'slug': 'hello-world',
             'action-publish': "Publish",
-            'go_live_datetime': str(go_live_datetime).split('.')[0],
-            'expiry_datetime': str(expiry_datetime).split('.')[0],
+            'go_live_at': str(go_live_at).split('.')[0],
+            'expire_at': str(expire_at).split('.')[0],
         }
         response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
 
@@ -336,17 +336,17 @@ def test_edit_post_publish_now_an_already_scheduled(self):
         child_page_new = SimplePage.objects.get(id=self.child_page.id)
         # The page should not be live anymore
         self.assertFalse(child_page_new.live)
-        # Instead a revision with approved_go_live_datetime should now exist
-        self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_datetime__isnull=True).exists())
+        # Instead a revision with approved_go_live_at should now exist
+        self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists())
 
         # Now, let's edit it and publish it right now
-        go_live_datetime = timezone.now()
+        go_live_at = timezone.now()
         post_data = {
             'title': "I've been edited!",
             'content': "Some content",
             'slug': 'hello-world',
             'action-publish': "Publish",
-            'go_live_datetime': "",
+            'go_live_at': "",
         }
         response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
 
@@ -356,8 +356,8 @@ def test_edit_post_publish_now_an_already_scheduled(self):
         child_page_new = SimplePage.objects.get(id=self.child_page.id)
         # The page should be live now
         self.assertTrue(child_page_new.live)
-        # And a revision with approved_go_live_datetime should not exist
-        self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_datetime__isnull=True).exists())
+        # And a revision with approved_go_live_at should not exist
+        self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists())
 
 class TestPageDelete(TestCase):
     def setUp(self):
@@ -483,60 +483,60 @@ def test_go_live_page_will_be_published(self):
         page.title = "Hello world!"
         page.slug = "hello-world"
         page.live = False
-        page.go_live_datetime = timezone.now() - timedelta(days=1)
+        page.go_live_at = timezone.now() - timedelta(days=1)
         self.root_page.add_child(instance=page)
 
         page.save_revision(
-            approved_go_live_datetime = timezone.now() - timedelta(days=1)
+            approved_go_live_at = timezone.now() - timedelta(days=1)
         )
         p = Page.objects.get(slug='hello-world')
         self.assertFalse(p.live)
-        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists())
+        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
         management.call_command('publish_scheduled_pages', verbosity=3, interactive=False)
         #management.call_command('publish_scheduled_pages', dryrun=True, verbosity=3, interactive=False)
         p = Page.objects.get(slug='hello-world')
         self.assertTrue(p.live)
-        self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists())
+        self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
 
     def test_go_live_page_will_be_published(self):
         page = SimplePage()
         page.title = "Hello world!"
         page.slug = "hello-world"
         page.live = False
-        page.go_live_datetime = timezone.now() - timedelta(days=1)
+        page.go_live_at = timezone.now() - timedelta(days=1)
         self.root_page.add_child(instance=page)
 
-        page.save_revision(approved_go_live_datetime = timezone.now() - timedelta(days=1))
+        page.save_revision(approved_go_live_at = timezone.now() - timedelta(days=1))
         p = Page.objects.get(slug='hello-world')
         self.assertFalse(p.live)
-        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists())
+        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
         management.call_command('publish_scheduled_pages', )
         p = Page.objects.get(slug='hello-world')
         self.assertTrue(p.live)
-        self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists())
+        self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
 
     def test_future_go_live_page_will_not_be_published(self):
         page = SimplePage()
         page.title = "Hello world!"
         page.slug = "hello-world"
         page.live = False
-        page.go_live_datetime = timezone.now() + timedelta(days=1)
+        page.go_live_at = timezone.now() + timedelta(days=1)
         self.root_page.add_child(instance=page)
-        page.save_revision(approved_go_live_datetime = timezone.now() - timedelta(days=1))
+        page.save_revision(approved_go_live_at = timezone.now() - timedelta(days=1))
         p = Page.objects.get(slug='hello-world')
         self.assertFalse(p.live)
-        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists())
+        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
         management.call_command('publish_scheduled_pages', )
         p = Page.objects.get(slug='hello-world')
         self.assertFalse(p.live)
-        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists())
+        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
 
     def test_expired_page_will_be_unpublished(self):
         page = SimplePage()
         page.title = "Hello world!"
         page.slug = "hello-world"
         page.live = True
-        page.expiry_datetime = timezone.now() - timedelta(days=1)
+        page.expire_at = timezone.now() - timedelta(days=1)
         self.root_page.add_child(instance=page)
         p = Page.objects.get(slug='hello-world')
         self.assertTrue(p.live)
@@ -550,7 +550,7 @@ def test_future_expired_page_will_not_be_unpublished(self):
         page.title = "Hello world!"
         page.slug = "hello-world"
         page.live = True
-        page.expiry_datetime = timezone.now() + timedelta(days=1)
+        page.expire_at = timezone.now() + timedelta(days=1)
         self.root_page.add_child(instance=page)
         p = Page.objects.get(slug='hello-world')
         self.assertTrue(p.live)
@@ -564,7 +564,7 @@ def test_expired_pages_are_dropped_from_mod_queue(self):
         page.title = "Hello world!"
         page.slug = "hello-world"
         page.live = False
-        page.expiry_datetime = timezone.now() - timedelta(days=1)
+        page.expire_at = timezone.now() - timedelta(days=1)
         self.root_page.add_child(instance=page)
         page.save_revision(submitted_for_moderation = True)
         p = Page.objects.get(slug='hello-world')
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 26ab715ec54..f4ea960ffc8 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -133,18 +133,18 @@ def clean_slug(slug):
 
             is_publishing = bool(request.POST.get('action-publish')) and parent_page_perms.can_publish_subpage()
             is_submitting = bool(request.POST.get('action-submit'))
-            go_live_datetime = form.cleaned_data.get('go_live_datetime')
-            future_go_live = go_live_datetime and go_live_datetime > timezone.now()
-            approved_go_live_datetime = None
+            go_live_at = form.cleaned_data.get('go_live_at')
+            future_go_live = go_live_at and go_live_at > timezone.now()
+            approved_go_live_at = None
 
             if is_publishing:
                 page.has_unpublished_changes = False
                 page.expired = False
                 if future_go_live:
                     page.live = False
-                    # Set approved_go_live_datetime only if is publishing
+                    # Set approved_go_live_at only if is publishing
                     # and the future_go_live is actually in future
-                    approved_go_live_datetime = go_live_datetime
+                    approved_go_live_at = go_live_at
                 else:
                     page.live = True
             else:
@@ -153,11 +153,11 @@ def clean_slug(slug):
 
             parent_page.add_child(instance=page)  # assign tree parameters - will cause page to be saved
 
-            # Pass approved_go_live_datetime to save_revision
+            # Pass approved_go_live_at to save_revision
             page.save_revision(
                 user=request.user,
                 submitted_for_moderation=is_submitting,
-                approved_go_live_datetime = approved_go_live_datetime
+                approved_go_live_at = approved_go_live_at
             )
 
             if is_publishing:
@@ -222,24 +222,24 @@ def clean_slug(slug):
         if form.is_valid():
             is_publishing = bool(request.POST.get('action-publish')) and page_perms.can_publish()
             is_submitting = bool(request.POST.get('action-submit'))
-            go_live_datetime = form.cleaned_data.get('go_live_datetime')
-            future_go_live = go_live_datetime and go_live_datetime > timezone.now()
-            approved_go_live_datetime = None
+            go_live_at = form.cleaned_data.get('go_live_at')
+            future_go_live = go_live_at and go_live_at > timezone.now()
+            approved_go_live_at = None
 
             if is_publishing:
                 page.has_unpublished_changes = False
                 page.expired = False
                 if future_go_live:
                     page.live = False
-                    # Set approved_go_live_datetime only if publishing
-                    approved_go_live_datetime = go_live_datetime
+                    # Set approved_go_live_at only if publishing
+                    approved_go_live_at = go_live_at
                 else:
                     page.live = True
                 form.save()
-                # Clear approved_go_live_datetime for older revisions
+                # Clear approved_go_live_at for older revisions
                 page.revisions.update(
                     submitted_for_moderation=False,
-                    approved_go_live_datetime=None,
+                    approved_go_live_at=None,
                 )
             else:
                 # not publishing the page
@@ -255,7 +255,7 @@ def clean_slug(slug):
             page.save_revision(
                 user=request.user,
                 submitted_for_moderation=is_submitting,
-                approved_go_live_datetime = approved_go_live_datetime
+                approved_go_live_at = approved_go_live_at
             )
 
             if is_publishing:
@@ -455,8 +455,8 @@ def unpublish(request, page_id):
         parent_id = page.get_parent().id
         page.live = False
         page.save()
-        # Since page is unpublished clear the approved_go_live_datetime of all revisions
-        page.revisions.update(approved_go_live_datetime=None)
+        # Since page is unpublished clear the approved_go_live_at of all revisions
+        page.revisions.update(approved_go_live_at=None)
         messages.success(request, _("Page '{0}' unpublished.").format(page.title))
         return redirect('wagtailadmin_explore', parent_id)
 
diff --git a/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py b/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py
index 0abf3c744e5..b80ace72811 100644
--- a/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py
+++ b/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py
@@ -8,11 +8,11 @@
 
 
 def revision_date_expired(r):
-    expiry_str = json.loads(r.content_json).get('expiry_datetime')
+    expiry_str = json.loads(r.content_json).get('expire_at')
     if not expiry_str:
         return False
-    expiry_datetime = dateparse.parse_datetime(expiry_str)
-    if expiry_datetime < timezone.now():
+    expire_at = dateparse.parse_datetime(expiry_str)
+    if expire_at < timezone.now():
         return True
     else:
         return False
@@ -37,7 +37,7 @@ def handle(self, *args, **options):
         # 1. get all expired pages with live = True
         expired_pages = Page.objects.filter(
             live=True,
-            expiry_datetime__lt=timezone.now()
+            expire_at__lt=timezone.now()
         )
         if dryrun:
             if expired_pages:
@@ -46,7 +46,7 @@ def handle(self, *args, **options):
                 print "---------------\t\t----\t\t----"
                 for ep in expired_pages:
                     print "{0}\t{1}\t{2}".format(
-                        ep.expiry_datetime.strftime("%Y-%m-%d %H:%M"),
+                        ep.expire_at.strftime("%Y-%m-%d %H:%M"),
                         ep.slug,
                         ep.title
                     )
@@ -71,7 +71,7 @@ def handle(self, *args, **options):
                     rev_data = json.loads(er.content_json)
                     print "{0}\t{1}\t{2}".format(
                         dateparse.parse_datetime(
-                            rev_data.get('expiry_datetime')
+                            rev_data.get('expire_at')
                         ).strftime("%Y-%m-%d %H:%M"),
                         rev_data.get('slug'),
                         rev_data.get('title')
@@ -85,7 +85,7 @@ def handle(self, *args, **options):
 
         # 3. get all revisions that need to be published
         revs_for_publishing = PageRevision.objects.filter(
-            approved_go_live_datetime__lt=timezone.now()
+            approved_go_live_at__lt=timezone.now()
         )
         if dryrun:
             print "---------------------------------"
@@ -96,7 +96,7 @@ def handle(self, *args, **options):
                 for rp in revs_for_publishing:
                     rev_data = json.loads(rp.content_json)
                     print "{0}\t\t{1}\t{2}".format(
-                        rp.approved_go_live_datetime.strftime("%Y-%m-%d %H:%M"),
+                        rp.approved_go_live_at.strftime("%Y-%m-%d %H:%M"),
                         rev_data.get('slug'),
                         rev_data.get('title')
                     )
diff --git a/wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py b/wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py
index 5e682aa596b..639068c2b75 100644
--- a/wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py
+++ b/wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py
@@ -8,18 +8,18 @@
 class Migration(SchemaMigration):
 
     def forwards(self, orm):
-        # Adding field 'PageRevision.approved_go_live_datetime'
-        db.add_column(u'wagtailcore_pagerevision', 'approved_go_live_datetime',
+        # Adding field 'PageRevision.approved_go_live_at'
+        db.add_column(u'wagtailcore_pagerevision', 'approved_go_live_at',
                       self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True),
                       keep_default=False)
 
-        # Adding field 'Page.go_live_datetime'
-        db.add_column(u'wagtailcore_page', 'go_live_datetime',
+        # Adding field 'Page.go_live_at'
+        db.add_column(u'wagtailcore_page', 'go_live_at',
                       self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True),
                       keep_default=False)
 
-        # Adding field 'Page.expiry_datetime'
-        db.add_column(u'wagtailcore_page', 'expiry_datetime',
+        # Adding field 'Page.expire_at'
+        db.add_column(u'wagtailcore_page', 'expire_at',
                       self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True),
                       keep_default=False)
 
@@ -30,14 +30,14 @@ def forwards(self, orm):
 
 
     def backwards(self, orm):
-        # Deleting field 'PageRevision.approved_go_live_datetime'
-        db.delete_column(u'wagtailcore_pagerevision', 'approved_go_live_datetime')
+        # Deleting field 'PageRevision.approved_go_live_at'
+        db.delete_column(u'wagtailcore_pagerevision', 'approved_go_live_at')
 
-        # Deleting field 'Page.go_live_datetime'
-        db.delete_column(u'wagtailcore_page', 'go_live_datetime')
+        # Deleting field 'Page.go_live_at'
+        db.delete_column(u'wagtailcore_page', 'go_live_at')
 
-        # Deleting field 'Page.expiry_datetime'
-        db.delete_column(u'wagtailcore_page', 'expiry_datetime')
+        # Deleting field 'Page.expire_at'
+        db.delete_column(u'wagtailcore_page', 'expire_at')
 
         # Deleting field 'Page.expired'
         db.delete_column(u'wagtailcore_page', 'expired')
@@ -92,8 +92,8 @@ def backwards(self, orm):
             'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}),
             'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
             'expired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'expiry_datetime': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'go_live_datetime': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'expire_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'go_live_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
             'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
@@ -109,7 +109,7 @@ def backwards(self, orm):
         },
         u'wagtailcore.pagerevision': {
             'Meta': {'object_name': 'PageRevision'},
-            'approved_go_live_datetime': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'approved_go_live_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
             'content_json': ('django.db.models.fields.TextField', [], {}),
             'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 434b174b646..3b2b055bd1c 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -235,8 +235,8 @@ class Page(MP_Node, ClusterableModel, Indexed):
     show_in_menus = models.BooleanField(default=False, help_text=_("Whether a link to this page will appear in automatically generated menus"))
     search_description = models.TextField(blank=True)
 
-    go_live_datetime = models.DateTimeField(verbose_name=_("Go live date/time"), help_text=_("Please add a date-time in the form YYYY-MM-DD hh:mm."), blank=True, null=True)
-    expiry_datetime = models.DateTimeField(verbose_name=_("Expiry date/time"), help_text=_("Please add a date-time in the form YYYY-MM-DD hh:mm."), blank=True, null=True)
+    go_live_at = models.DateTimeField(verbose_name=_("Go live date/time"), help_text=_("Please add a date-time in the form YYYY-MM-DD hh:mm."), blank=True, null=True)
+    expire_at = models.DateTimeField(verbose_name=_("Expiry date/time"), help_text=_("Please add a date-time in the form YYYY-MM-DD hh:mm."), blank=True, null=True)
     expired = models.BooleanField(default=False, editable=False)
 
     indexed_fields = {
@@ -382,12 +382,12 @@ def route(self, request, path_components):
             else:
                 raise Http404
 
-    def save_revision(self, user=None, submitted_for_moderation=False, approved_go_live_datetime=None):
+    def save_revision(self, user=None, submitted_for_moderation=False, approved_go_live_at=None):
         self.revisions.create(
             content_json=self.to_json(),
             user=user,
             submitted_for_moderation=submitted_for_moderation,
-            approved_go_live_datetime=approved_go_live_datetime,
+            approved_go_live_at=approved_go_live_at,
         )
 
     def get_latest_revision(self):
@@ -472,11 +472,11 @@ def relative_url(self, current_site):
     def clean(self):
         super(Page, self).clean()
 
-        if self.go_live_datetime and self.expiry_datetime:
-            if self.go_live_datetime > self.expiry_datetime:
+        if self.go_live_at and self.expire_at:
+            if self.go_live_at > self.expire_at:
                 raise ValidationError(ugettext('Go live date/time should be before expiry datetime.'))
 
-        if self.expiry_datetime and self.expiry_datetime < timezone.now():
+        if self.expire_at and self.expire_at < timezone.now():
             raise ValidationError(ugettext('Expiry date/time should be in the future'))
 
     @classmethod
@@ -567,7 +567,7 @@ def status_string(self):
 
     @property
     def approved_schedule(self):
-        return self.revisions.exclude(approved_go_live_datetime__isnull=True).exists()
+        return self.revisions.exclude(approved_go_live_at__isnull=True).exists()
 
     def has_unpublished_subtree(self):
         """
@@ -742,7 +742,7 @@ class PageRevision(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True)
     content_json = models.TextField()
-    approved_go_live_datetime = models.DateTimeField(null=True, blank=True)
+    approved_go_live_at = models.DateTimeField(null=True, blank=True)
 
     objects = models.Manager()
     submitted_revisions = SubmittedRevisionsManager()
@@ -776,18 +776,18 @@ def as_page_object(self):
 
     def publish(self):
         page = self.as_page_object()
-        if page.go_live_datetime and page.go_live_datetime > timezone.now():
+        if page.go_live_at and page.go_live_at > timezone.now():
             # if we have a go_live in the future don't make the page live
             page.live = False
-            # Instead set the approved_go_live_datetime of this revision
-            self.approved_go_live_datetime = page.go_live_datetime
+            # Instead set the approved_go_live_at of this revision
+            self.approved_go_live_at = page.go_live_at
             self.save()
-            # And clear the the approved_go_live_datetime of any other revisions
-            page.revisions.exclude(id=self.id).update(approved_go_live_datetime=None)
+            # And clear the the approved_go_live_at of any other revisions
+            page.revisions.exclude(id=self.id).update(approved_go_live_at=None)
         else:
             page.live = True
-            # If page goes live clear the approved_go_live_datetime of all revisions
-            page.revisions.update(approved_go_live_datetime=None)
+            # If page goes live clear the approved_go_live_at of all revisions
+            page.revisions.update(approved_go_live_at=None)
         page.expired = False # When a page is published it can't be expired
         page.save()
         self.submitted_for_moderation = False

From ad3c62fed520b086ffd6ccf97779bd29af0cbff2 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 3 Jun 2014 10:22:14 +0100
Subject: [PATCH 038/293] Added go_live_at and expire_at to common page
 configuration

---
 wagtail/wagtailadmin/edit_handlers.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py
index 370f2f5bbdf..097b5bb2105 100644
--- a/wagtail/wagtailadmin/edit_handlers.py
+++ b/wagtail/wagtailadmin/edit_handlers.py
@@ -731,5 +731,7 @@ def InlinePanel(base_model, relation_name, panels=None, label='', help_text=''):
         FieldPanel('seo_title'),
         FieldPanel('show_in_menus'),
         FieldPanel('search_description'),
+        FieldPanel('go_live_at'),
+        FieldPanel('expire_at'),
     ], ugettext_lazy('Common page configuration')),
 ]

From 97ab613f88ab742c57400f0985d73b62be341635 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 3 Jun 2014 10:28:00 +0100
Subject: [PATCH 039/293] Moved tests for publish pages command into
 wagtailcore

---
 wagtail/wagtailadmin/tests.py | 107 +--------------------------------
 wagtail/wagtailcore/tests.py  | 109 +++++++++++++++++++++++++++++++++-
 2 files changed, 108 insertions(+), 108 deletions(-)

diff --git a/wagtail/wagtailadmin/tests.py b/wagtail/wagtailadmin/tests.py
index 4d6016609f4..c657c1efbc7 100644
--- a/wagtail/wagtailadmin/tests.py
+++ b/wagtail/wagtailadmin/tests.py
@@ -1,12 +1,10 @@
-from datetime import datetime, timedelta
-from django.core import management
+from datetime import timedelta
 from django.core.urlresolvers import reverse
 from django.utils import timezone
 from django.test import TestCase
 from wagtail.tests.models import SimplePage, EventPage
 from wagtail.tests.utils import login, unittest
 from wagtail.wagtailcore.models import Page, PageRevision
-from django.core.urlresolvers import reverse
 
 
 class TestHome(TestCase):
@@ -472,106 +470,3 @@ def test_editor_css_and_js_hooks_on_edit(self):
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, '<link rel="stylesheet" href="/path/to/my/custom.css">')
         self.assertContains(response, '<script src="/path/to/my/custom.js"></script>')
-
-class TestPublishScheduledPages(TestCase):
-    def setUp(self):
-        # Find root page
-        self.root_page = Page.objects.get(id=2)
-
-    def test_go_live_page_will_be_published(self):
-        page = SimplePage()
-        page.title = "Hello world!"
-        page.slug = "hello-world"
-        page.live = False
-        page.go_live_at = timezone.now() - timedelta(days=1)
-        self.root_page.add_child(instance=page)
-
-        page.save_revision(
-            approved_go_live_at = timezone.now() - timedelta(days=1)
-        )
-        p = Page.objects.get(slug='hello-world')
-        self.assertFalse(p.live)
-        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
-        management.call_command('publish_scheduled_pages', verbosity=3, interactive=False)
-        #management.call_command('publish_scheduled_pages', dryrun=True, verbosity=3, interactive=False)
-        p = Page.objects.get(slug='hello-world')
-        self.assertTrue(p.live)
-        self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
-
-    def test_go_live_page_will_be_published(self):
-        page = SimplePage()
-        page.title = "Hello world!"
-        page.slug = "hello-world"
-        page.live = False
-        page.go_live_at = timezone.now() - timedelta(days=1)
-        self.root_page.add_child(instance=page)
-
-        page.save_revision(approved_go_live_at = timezone.now() - timedelta(days=1))
-        p = Page.objects.get(slug='hello-world')
-        self.assertFalse(p.live)
-        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
-        management.call_command('publish_scheduled_pages', )
-        p = Page.objects.get(slug='hello-world')
-        self.assertTrue(p.live)
-        self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
-
-    def test_future_go_live_page_will_not_be_published(self):
-        page = SimplePage()
-        page.title = "Hello world!"
-        page.slug = "hello-world"
-        page.live = False
-        page.go_live_at = timezone.now() + timedelta(days=1)
-        self.root_page.add_child(instance=page)
-        page.save_revision(approved_go_live_at = timezone.now() - timedelta(days=1))
-        p = Page.objects.get(slug='hello-world')
-        self.assertFalse(p.live)
-        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
-        management.call_command('publish_scheduled_pages', )
-        p = Page.objects.get(slug='hello-world')
-        self.assertFalse(p.live)
-        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
-
-    def test_expired_page_will_be_unpublished(self):
-        page = SimplePage()
-        page.title = "Hello world!"
-        page.slug = "hello-world"
-        page.live = True
-        page.expire_at = timezone.now() - timedelta(days=1)
-        self.root_page.add_child(instance=page)
-        p = Page.objects.get(slug='hello-world')
-        self.assertTrue(p.live)
-        management.call_command('publish_scheduled_pages', )
-        p = Page.objects.get(slug='hello-world')
-        self.assertFalse(p.live)
-        self.assertTrue(p.expired)
-
-    def test_future_expired_page_will_not_be_unpublished(self):
-        page = SimplePage()
-        page.title = "Hello world!"
-        page.slug = "hello-world"
-        page.live = True
-        page.expire_at = timezone.now() + timedelta(days=1)
-        self.root_page.add_child(instance=page)
-        p = Page.objects.get(slug='hello-world')
-        self.assertTrue(p.live)
-        management.call_command('publish_scheduled_pages', )
-        p = Page.objects.get(slug='hello-world')
-        self.assertTrue(p.live)
-        self.assertFalse(p.expired)
-
-    def test_expired_pages_are_dropped_from_mod_queue(self):
-        page = SimplePage()
-        page.title = "Hello world!"
-        page.slug = "hello-world"
-        page.live = False
-        page.expire_at = timezone.now() - timedelta(days=1)
-        self.root_page.add_child(instance=page)
-        page.save_revision(submitted_for_moderation = True)
-        p = Page.objects.get(slug='hello-world')
-        self.assertFalse(p.live)
-        self.assertTrue(PageRevision.objects.filter(page=p, submitted_for_moderation=True).exists())
-        management.call_command('publish_scheduled_pages', )
-        p = Page.objects.get(slug='hello-world')
-        self.assertFalse(PageRevision.objects.filter(page=p, submitted_for_moderation=True).exists())
-
-
diff --git a/wagtail/wagtailcore/tests.py b/wagtail/wagtailcore/tests.py
index 1b12c10251c..3eede0e4a1b 100644
--- a/wagtail/wagtailcore/tests.py
+++ b/wagtail/wagtailcore/tests.py
@@ -1,9 +1,12 @@
+from datetime import timedelta
+
 from django.test import TestCase, Client
 from django.http import HttpRequest, Http404
-
+from django.utils import timezone
 from django.contrib.auth.models import User
+from django.core import management
 
-from wagtail.wagtailcore.models import Page, Site, UserPagePermissionsProxy
+from wagtail.wagtailcore.models import Page, Site, UserPagePermissionsProxy, PageRevision
 from wagtail.tests.models import EventPage, EventIndex, SimplePage
 
 
@@ -776,3 +779,105 @@ def test_issue157(self):
 
         # Check url
         self.assertEqual(homepage.url, '/')
+
+
+class TestPublishScheduledPagesCommand(TestCase):
+    def setUp(self):
+        # Find root page
+        self.root_page = Page.objects.get(id=2)
+
+    def test_go_live_page_will_be_published(self):
+        page = SimplePage()
+        page.title = "Hello world!"
+        page.slug = "hello-world"
+        page.live = False
+        page.go_live_at = timezone.now() - timedelta(days=1)
+        self.root_page.add_child(instance=page)
+
+        page.save_revision(
+            approved_go_live_at = timezone.now() - timedelta(days=1)
+        )
+        p = Page.objects.get(slug='hello-world')
+        self.assertFalse(p.live)
+        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
+        management.call_command('publish_scheduled_pages', verbosity=3, interactive=False)
+        #management.call_command('publish_scheduled_pages', dryrun=True, verbosity=3, interactive=False)
+        p = Page.objects.get(slug='hello-world')
+        self.assertTrue(p.live)
+        self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
+
+    def test_go_live_page_will_be_published(self):
+        page = SimplePage()
+        page.title = "Hello world!"
+        page.slug = "hello-world"
+        page.live = False
+        page.go_live_at = timezone.now() - timedelta(days=1)
+        self.root_page.add_child(instance=page)
+
+        page.save_revision(approved_go_live_at = timezone.now() - timedelta(days=1))
+        p = Page.objects.get(slug='hello-world')
+        self.assertFalse(p.live)
+        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
+        management.call_command('publish_scheduled_pages', )
+        p = Page.objects.get(slug='hello-world')
+        self.assertTrue(p.live)
+        self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
+
+    def test_future_go_live_page_will_not_be_published(self):
+        page = SimplePage()
+        page.title = "Hello world!"
+        page.slug = "hello-world"
+        page.live = False
+        page.go_live_at = timezone.now() + timedelta(days=1)
+        self.root_page.add_child(instance=page)
+        page.save_revision(approved_go_live_at = timezone.now() - timedelta(days=1))
+        p = Page.objects.get(slug='hello-world')
+        self.assertFalse(p.live)
+        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
+        management.call_command('publish_scheduled_pages', )
+        p = Page.objects.get(slug='hello-world')
+        self.assertFalse(p.live)
+        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
+
+    def test_expired_page_will_be_unpublished(self):
+        page = SimplePage()
+        page.title = "Hello world!"
+        page.slug = "hello-world"
+        page.live = True
+        page.expire_at = timezone.now() - timedelta(days=1)
+        self.root_page.add_child(instance=page)
+        p = Page.objects.get(slug='hello-world')
+        self.assertTrue(p.live)
+        management.call_command('publish_scheduled_pages', )
+        p = Page.objects.get(slug='hello-world')
+        self.assertFalse(p.live)
+        self.assertTrue(p.expired)
+
+    def test_future_expired_page_will_not_be_unpublished(self):
+        page = SimplePage()
+        page.title = "Hello world!"
+        page.slug = "hello-world"
+        page.live = True
+        page.expire_at = timezone.now() + timedelta(days=1)
+        self.root_page.add_child(instance=page)
+        p = Page.objects.get(slug='hello-world')
+        self.assertTrue(p.live)
+        management.call_command('publish_scheduled_pages', )
+        p = Page.objects.get(slug='hello-world')
+        self.assertTrue(p.live)
+        self.assertFalse(p.expired)
+
+    def test_expired_pages_are_dropped_from_mod_queue(self):
+        page = SimplePage()
+        page.title = "Hello world!"
+        page.slug = "hello-world"
+        page.live = False
+        page.expire_at = timezone.now() - timedelta(days=1)
+        self.root_page.add_child(instance=page)
+        page.save_revision(submitted_for_moderation = True)
+        p = Page.objects.get(slug='hello-world')
+        self.assertFalse(p.live)
+        self.assertTrue(PageRevision.objects.filter(page=p, submitted_for_moderation=True).exists())
+        management.call_command('publish_scheduled_pages', )
+        p = Page.objects.get(slug='hello-world')
+        self.assertFalse(PageRevision.objects.filter(page=p, submitted_for_moderation=True).exists())

From e530531cb9be2c2b398ce374b73294eca27d1eeb Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 3 Jun 2014 10:37:39 +0100
Subject: [PATCH 040/293] Cleanup of scheduled publishing tests

---
 wagtail/wagtailadmin/tests.py |  11 ++++
 wagtail/wagtailcore/tests.py  | 109 ++++++++++++++++++++--------------
 2 files changed, 77 insertions(+), 43 deletions(-)

diff --git a/wagtail/wagtailadmin/tests.py b/wagtail/wagtailadmin/tests.py
index c657c1efbc7..3e4103137d9 100644
--- a/wagtail/wagtailadmin/tests.py
+++ b/wagtail/wagtailadmin/tests.py
@@ -1,7 +1,9 @@
 from datetime import timedelta
+
 from django.core.urlresolvers import reverse
 from django.utils import timezone
 from django.test import TestCase
+
 from wagtail.tests.models import SimplePage, EventPage
 from wagtail.tests.utils import login, unittest
 from wagtail.wagtailcore.models import Page, PageRevision
@@ -266,8 +268,10 @@ def test_edit_post_scheduled(self):
 
         # The page will still be live
         self.assertTrue(child_page_new.live)
+
         # A revision with approved_go_live_at should not exist
         self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists())
+
         # But a revision with go_live_at and expire_at in their content json *should* exist
         self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(go_live_at.date())).exists())
         self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(expire_at.date())).exists())
@@ -309,8 +313,10 @@ def test_edit_post_publish_scheduled(self):
         self.assertEqual(response.status_code, 302)
 
         child_page_new = SimplePage.objects.get(id=self.child_page.id)
+
         # The page should not be live anymore
         self.assertFalse(child_page_new.live)
+
         # Instead a revision with approved_go_live_at should now exist
         self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists())
 
@@ -332,8 +338,10 @@ def test_edit_post_publish_now_an_already_scheduled(self):
         self.assertEqual(response.status_code, 302)
 
         child_page_new = SimplePage.objects.get(id=self.child_page.id)
+
         # The page should not be live anymore
         self.assertFalse(child_page_new.live)
+
         # Instead a revision with approved_go_live_at should now exist
         self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists())
 
@@ -352,11 +360,14 @@ def test_edit_post_publish_now_an_already_scheduled(self):
         self.assertEqual(response.status_code, 302)
 
         child_page_new = SimplePage.objects.get(id=self.child_page.id)
+
         # The page should be live now
         self.assertTrue(child_page_new.live)
+
         # And a revision with approved_go_live_at should not exist
         self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists())
 
+
 class TestPageDelete(TestCase):
     def setUp(self):
         # Find root page
diff --git a/wagtail/wagtailcore/tests.py b/wagtail/wagtailcore/tests.py
index 3eede0e4a1b..32ec3a826ec 100644
--- a/wagtail/wagtailcore/tests.py
+++ b/wagtail/wagtailcore/tests.py
@@ -787,97 +787,120 @@ def setUp(self):
         self.root_page = Page.objects.get(id=2)
 
     def test_go_live_page_will_be_published(self):
-        page = SimplePage()
-        page.title = "Hello world!"
-        page.slug = "hello-world"
-        page.live = False
-        page.go_live_at = timezone.now() - timedelta(days=1)
+        page = SimplePage(
+            title="Hello world!",
+            slug="hello-world",
+            live=False,
+            go_live_at=timezone.now() - timedelta(days=1),
+        )
         self.root_page.add_child(instance=page)
 
-        page.save_revision(
-            approved_go_live_at = timezone.now() - timedelta(days=1)
-        )
+        page.save_revision(approved_go_live_at=timezone.now() - timedelta(days=1))
+
         p = Page.objects.get(slug='hello-world')
         self.assertFalse(p.live)
         self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
-        management.call_command('publish_scheduled_pages', verbosity=3, interactive=False)
-        #management.call_command('publish_scheduled_pages', dryrun=True, verbosity=3, interactive=False)
+
+        management.call_command('publish_scheduled_pages')
+
         p = Page.objects.get(slug='hello-world')
         self.assertTrue(p.live)
         self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
 
     def test_go_live_page_will_be_published(self):
-        page = SimplePage()
-        page.title = "Hello world!"
-        page.slug = "hello-world"
-        page.live = False
-        page.go_live_at = timezone.now() - timedelta(days=1)
+        page = SimplePage(
+            title="Hello world!",
+            slug="hello-world",
+            live=False,
+            go_live_at=timezone.now() - timedelta(days=1),
+        )
         self.root_page.add_child(instance=page)
 
-        page.save_revision(approved_go_live_at = timezone.now() - timedelta(days=1))
+        page.save_revision(approved_go_live_at=timezone.now() - timedelta(days=1))
+
         p = Page.objects.get(slug='hello-world')
         self.assertFalse(p.live)
         self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
-        management.call_command('publish_scheduled_pages', )
+
+        management.call_command('publish_scheduled_pages')
+
         p = Page.objects.get(slug='hello-world')
         self.assertTrue(p.live)
         self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
 
     def test_future_go_live_page_will_not_be_published(self):
-        page = SimplePage()
-        page.title = "Hello world!"
-        page.slug = "hello-world"
-        page.live = False
-        page.go_live_at = timezone.now() + timedelta(days=1)
+        page = SimplePage(
+            title="Hello world!",
+            slug="hello-world",
+            live=False,
+            go_live_at=timezone.now() + timedelta(days=1),
+        )
         self.root_page.add_child(instance=page)
-        page.save_revision(approved_go_live_at = timezone.now() - timedelta(days=1))
+
+        page.save_revision(approved_go_live_at=timezone.now() - timedelta(days=1))
+
         p = Page.objects.get(slug='hello-world')
         self.assertFalse(p.live)
         self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
-        management.call_command('publish_scheduled_pages', )
+
+        management.call_command('publish_scheduled_pages')
+
         p = Page.objects.get(slug='hello-world')
         self.assertFalse(p.live)
         self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
 
     def test_expired_page_will_be_unpublished(self):
-        page = SimplePage()
-        page.title = "Hello world!"
-        page.slug = "hello-world"
-        page.live = True
-        page.expire_at = timezone.now() - timedelta(days=1)
+        page = SimplePage(
+            title="Hello world!",
+            slug="hello-world",
+            live=True,
+            expire_at=timezone.now() - timedelta(days=1),
+        )
         self.root_page.add_child(instance=page)
+
         p = Page.objects.get(slug='hello-world')
         self.assertTrue(p.live)
-        management.call_command('publish_scheduled_pages', )
+
+        management.call_command('publish_scheduled_pages')
+
         p = Page.objects.get(slug='hello-world')
         self.assertFalse(p.live)
         self.assertTrue(p.expired)
 
     def test_future_expired_page_will_not_be_unpublished(self):
-        page = SimplePage()
-        page.title = "Hello world!"
-        page.slug = "hello-world"
-        page.live = True
-        page.expire_at = timezone.now() + timedelta(days=1)
+        page = SimplePage(
+            title="Hello world!",
+            slug="hello-world",
+            live=True,
+            expire_at=timezone.now() + timedelta(days=1),
+        )
         self.root_page.add_child(instance=page)
+
         p = Page.objects.get(slug='hello-world')
         self.assertTrue(p.live)
-        management.call_command('publish_scheduled_pages', )
+
+        management.call_command('publish_scheduled_pages')
+
         p = Page.objects.get(slug='hello-world')
         self.assertTrue(p.live)
         self.assertFalse(p.expired)
 
     def test_expired_pages_are_dropped_from_mod_queue(self):
-        page = SimplePage()
-        page.title = "Hello world!"
-        page.slug = "hello-world"
-        page.live = False
-        page.expire_at = timezone.now() - timedelta(days=1)
+        page = SimplePage(
+            title="Hello world!",
+            slug="hello-world",
+            live=False,
+            expire_at=timezone.now() - timedelta(days=1),
+        )
         self.root_page.add_child(instance=page)
-        page.save_revision(submitted_for_moderation = True)
+
+        page.save_revision(submitted_for_moderation=True)
+
         p = Page.objects.get(slug='hello-world')
         self.assertFalse(p.live)
         self.assertTrue(PageRevision.objects.filter(page=p, submitted_for_moderation=True).exists())
-        management.call_command('publish_scheduled_pages', )
+
+        management.call_command('publish_scheduled_pages')
+
         p = Page.objects.get(slug='hello-world')
         self.assertFalse(PageRevision.objects.filter(page=p, submitted_for_moderation=True).exists())

From c7e6c429543c883bec025cf41f0f477a0ce5a67e Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 3 Jun 2014 12:56:15 +0100
Subject: [PATCH 041/293] A couple of minor coding style fixes

---
 wagtail/wagtailadmin/views/pages.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index f4ea960ffc8..55040366c20 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -157,7 +157,7 @@ def clean_slug(slug):
             page.save_revision(
                 user=request.user,
                 submitted_for_moderation=is_submitting,
-                approved_go_live_at = approved_go_live_at
+                approved_go_live_at=approved_go_live_at
             )
 
             if is_publishing:
@@ -255,7 +255,7 @@ def clean_slug(slug):
             page.save_revision(
                 user=request.user,
                 submitted_for_moderation=is_submitting,
-                approved_go_live_at = approved_go_live_at
+                approved_go_live_at=approved_go_live_at
             )
 
             if is_publishing:

From 0d7471b94f9f92454aa0c093892b0cd2ccdf1219 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 3 Jun 2014 14:58:49 +0100
Subject: [PATCH 042/293] Installed jQuery.datetimepicker

https://github.com/xdan/datetimepicker/commit/3e320c9046f9c735bbff1c9e39056f
---
 .../js/vendor/jquery.datetimepicker.js        | 1363 +++++++++++++++++
 .../scss/vendor/jquery.datetimepicker.css     |  304 ++++
 .../templates/wagtailadmin/admin_base.html    |    2 +
 3 files changed, 1669 insertions(+)
 create mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery.datetimepicker.js
 create mode 100644 wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery.datetimepicker.css

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery.datetimepicker.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery.datetimepicker.js
new file mode 100644
index 00000000000..cf7b9249597
--- /dev/null
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery.datetimepicker.js
@@ -0,0 +1,1363 @@
+/**
+ * @preserve jQuery DateTimePicker plugin v2.2.8
+ * @homepage http://xdsoft.net/jqplugins/datetimepicker/
+ * (c) 2014, Chupurnov Valeriy.
+ */
+(function( $ ) {
+	'use strict';
+	var default_options  = {
+		i18n:{
+			bg:{ // Bulgarian
+				months:[
+					"Януари", "Февруари", "Март", "Април", "Май", "Юни", "Юли", "Август", "Септември", "Октомври", "Ноември", "Декември"
+				],
+				dayOfWeek:[
+					"Нд", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб"
+				]
+			},
+			fa:{ // Persian/Farsi
+				months:[
+					'فروردین', 'اردیبهشت', 'خرداد', 'تیر', 'مرداد', 'شهریور', 'مهر', 'آبان', 'آذر', 'دی', 'بهمن', 'اسفند'
+				],
+				dayOfWeek:[
+					'یکشنبه', 'دوشنبه', 'سه شنبه', 'چهارشنبه', 'پنجشنبه', 'جمعه', 'شنبه'
+				]
+			},
+			ru:{ // Russian
+				months:[
+					'Январь','Февраль','Март','Апрель','Май','Июнь','Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь'
+				],
+				dayOfWeek:[
+					"Вск", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб"
+				]
+			},
+			en:{ // English
+				months: [
+					"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
+				],
+				dayOfWeek: [
+					"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+				]
+			},
+			el:{ // Ελληνικά
+		                months: [
+		                    "Ιανουάριος", "Φεβρουάριος", "Μάρτιος", "Απρίλιος", "Μάιος", "Ιούνιος", "Ιούλιος", "Αύγουστος", "Σεπτέμβριος", "Οκτώβριος", "Νοέμβριος", "Δεκέμβριος"
+		                ],
+			        dayOfWeek: [
+		                    "Κυρ", "Δευ", "Τρι", "Τετ", "Πεμ", "Παρ", "Σαβ"
+		                ]
+		      },
+			de:{ // German
+				months:[
+					'Januar','Februar','März','April','Mai','Juni','Juli','August','September','Oktober','November','Dezember'
+				],
+				dayOfWeek:[
+					"So", "Mo", "Di", "Mi", "Do", "Fr", "Sa"
+				]
+			},
+			nl:{ // Dutch
+				months:[
+					"januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus", "september", "oktober", "november", "december"
+				],
+				dayOfWeek:[
+					"zo", "ma", "di", "wo", "do", "vr", "za"
+				]
+			},
+			tr:{ // Turkish
+				months:[
+					"Ocak", "Şubat", "Mart", "Nisan", "Mayıs", "Haziran", "Temmuz", "Ağustos", "Eylül", "Ekim", "Kasım", "Aralık"
+				],
+				dayOfWeek:[
+					"Paz", "Pts", "Sal", "Çar", "Per", "Cum", "Cts"
+				]
+			},
+			fr:{ //French
+				months:[
+			    "Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"
+				],
+				dayOfWeek:[
+					"Dim", "Lun", "Mar", "Mer", "Jeu", "Ven", "Sam"
+				]
+			},
+			es:{ // Spanish
+				months: [
+					"Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Septiembre", "Octubre", "Noviembre", "Diciembre"
+				],
+				dayOfWeek: [
+					"Dom", "Lun", "Mar", "Mié", "Jue", "Vie", "Sáb"
+				]
+			},
+			th:{ // Thai
+				months:[
+					'มกราคม','กุมภาพันธ์','มีนาคม','เมษายน','พฤษภาคม','มิถุนายน','กรกฎาคม','สิงหาคม','กันยายน','ตุลาคม','พฤศจิกายน','ธันวาคม'
+				],
+				dayOfWeek:[
+					'อา.','จ.','อ.','พ.','พฤ.','ศ.','ส.'
+				]
+			},
+			pl:{ // Polish
+				months: [
+					"styczeń", "luty", "marzec", "kwiecień", "maj", "czerwiec", "lipiec", "sierpień", "wrzesień", "październik", "listopad", "grudzień"
+				],
+				dayOfWeek: [
+					"nd", "pn", "wt", "śr", "cz", "pt", "sb"
+				]
+			},
+			pt:{ // Portuguese
+				months: [
+					"Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"
+				],
+				dayOfWeek: [
+					"Dom", "Seg", "Ter", "Qua", "Qui", "Sex", "Sab"
+				]
+			},
+			ch:{ // Simplified Chinese
+				months: [
+					"一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"
+				],
+				dayOfWeek: [
+					"日", "一","二","三","四","五","六"
+				]
+			},
+			se:{ // Swedish
+				months: [
+					"Januari", "Februari", "Mars", "April", "Maj", "Juni", "Juli", "Augusti", "September","Oktober", "November", "December"
+				],
+				dayOfWeek: [
+					"Sön", "Mån", "Tis", "Ons", "Tor", "Fre", "Lör"
+				]
+			},
+			kr:{ // Korean
+				months: [
+                    "1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"
+				],
+				dayOfWeek: [
+                    "일", "월", "화", "수", "목", "금", "토"
+				]
+			},
+			it:{ // Italian
+				months: [
+					"Gennaio", "Febbraio", "Marzo", "Aprile", "Maggio", "Giugno", "Luglio", "Agosto", "Settembre", "Ottobre", "Novembre", "Dicembre"
+				],
+				dayOfWeek: [
+					"Dom", "Lun", "Mar", "Mer", "Gio", "Ven", "Sab"
+				]
+			},
+			da:{ // Dansk
+				months: [
+					"January", "Februar", "Marts", "April", "Maj", "Juni", "July", "August", "September", "Oktober", "November", "December"
+				],
+				dayOfWeek: [
+					"Søn", "Man", "Tir", "ons", "Tor", "Fre", "lør"
+				]
+			},
+			ja:{ // Japanese
+				months: [
+					"1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"
+				],
+				dayOfWeek: [
+					"日", "月", "火", "水", "木", "金", "土"
+				]
+			},
+			vi:{ // Vietnamese
+				months: [
+					"Tháng 1", "Tháng 2", "Tháng 3", "Tháng 4", "Tháng 5", "Tháng 6", "Tháng 7", "Tháng 8", "Tháng 9", "Tháng 10", "Tháng 11", "Tháng 12"
+				],
+				dayOfWeek: [
+					"CN", "T2", "T3", "T4", "T5", "T6", "T7"
+				]
+			},
+			sl:{ // Slovenščina
+		            months: [
+		                "Januar", "Februar", "Marec", "April", "Maj", "Junij", "Julij", "Avgust", "September", "Oktober", "November", "December"
+		            ],
+		            dayOfWeek: [
+		                "Ned", "Pon", "Tor", "Sre", "Čet", "Pet", "Sob"
+		            ]
+		        }    
+		},
+		value:'',
+		lang:'en',
+		
+		format:	'Y/m/d H:i',
+		formatTime:	'H:i',
+		formatDate:	'Y/m/d',
+		
+		startDate:	false, // new Date(), '1986/12/08', '-1970/01/05','-1970/01/05', 
+		
+		step:60,
+		monthChangeSpinner:true,
+		closeOnDateSelect:false,
+		closeOnWithoutClick:true,
+		
+		timepicker:true,
+		datepicker:true,
+	
+		minDate:false,
+		maxDate:false,
+		minTime:false,
+		maxTime:false,
+		
+		allowTimes:[],
+		opened:false,
+		initTime:true,
+		inline:false,
+		
+		onSelectDate:function() {},
+		onSelectTime:function() {},
+		onChangeMonth:function() {},
+		onChangeDateTime:function() {},
+		onShow:function() {},
+		onClose:function() {},
+		onGenerate:function() {},
+		
+		withoutCopyright:true,
+		
+		inverseButton:false,
+		hours12:false,
+		next:	'xdsoft_next',
+		prev : 'xdsoft_prev',
+		dayOfWeekStart:0,
+		
+		timeHeightInTimePicker:25,
+		timepickerScrollbar:true,
+		
+		todayButton:true, // 2.1.0
+		defaultSelect:true, // 2.1.0
+		
+		scrollMonth:true,
+		scrollTime:true,
+		scrollInput:true,
+		
+		lazyInit:false,
+		
+		mask:false,
+		validateOnBlur:true,
+		allowBlank:true,
+		
+		yearStart:1950,
+		yearEnd:2050,
+		
+		style:'',
+		id:'',
+		
+		fixed: false,
+		
+		roundTime:'round', // ceil, floor
+		className:'',
+		
+		weekends	: 	[],
+		yearOffset:0
+	};
+	
+	// fix for ie8
+	if ( !Array.prototype.indexOf ) {
+		Array.prototype.indexOf = function(obj, start) {
+			 for (var i = (start || 0), j = this.length; i < j; i++) {
+				 if (this[i] === obj) { return i; }
+			 }
+			 return -1;
+		}
+	};
+	
+	Date.prototype.countDaysInMonth = function(){
+		return new Date(this.getFullYear(), this.getMonth()+1, 0).getDate();
+	};
+	
+	$.fn.xdsoftScroller = function( _percent ) {
+		return this.each(function() {
+			var timeboxparent = $(this);
+			if( !$(this).hasClass('xdsoft_scroller_box') ) {
+				var pointerEventToXY = function( e ) {
+						var out = {x:0, y:0};
+						if( e.type == 'touchstart' || e.type == 'touchmove' || e.type == 'touchend' || e.type == 'touchcancel' ) {
+							var touch = e.originalEvent.touches[0] || e.originalEvent.changedTouches[0];
+							out.x = touch.pageX;
+							out.y = touch.pageY;
+						}else if (e.type == 'mousedown' || e.type == 'mouseup' || e.type == 'mousemove' || e.type == 'mouseover'|| e.type=='mouseout' || e.type=='mouseenter' || e.type=='mouseleave') {
+							out.x = e.pageX;
+							out.y = e.pageY;
+						}
+						return out;
+					},
+					move = 0,
+					timebox = timeboxparent.children().eq(0),
+					parentHeight = timeboxparent[0].clientHeight,
+					height = timebox[0].offsetHeight,
+					scrollbar = $('<div class="xdsoft_scrollbar"></div>'),
+					scroller = $('<div class="xdsoft_scroller"></div>'),
+					maximumOffset = 100,
+					start = false;
+
+				scrollbar.append(scroller);
+
+				timeboxparent.addClass('xdsoft_scroller_box').append(scrollbar);
+				scroller.on('mousedown.xdsoft_scroller',function ( event ) {
+					if( !parentHeight )
+						timeboxparent.trigger('resize_scroll.xdsoft_scroller',[_percent]);
+					var pageY = event.pageY,
+						top = parseInt(scroller.css('margin-top')),
+						h1 = scrollbar[0].offsetHeight;
+					$(document.body).addClass('xdsoft_noselect');
+					$([document.body,window]).on('mouseup.xdsoft_scroller',function arguments_callee() {
+						$([document.body,window]).off('mouseup.xdsoft_scroller',arguments_callee)
+							.off('mousemove.xdsoft_scroller',move)
+							.removeClass('xdsoft_noselect');
+					});
+					$(document.body).on('mousemove.xdsoft_scroller',move = function(event) {
+						var offset = event.pageY-pageY+top;
+						if( offset<0 )
+							offset = 0;
+						if( offset+scroller[0].offsetHeight>h1 )
+							offset = h1-scroller[0].offsetHeight;
+						timeboxparent.trigger('scroll_element.xdsoft_scroller',[maximumOffset?offset/maximumOffset:0]);
+					});
+				});
+
+				timeboxparent
+					.on('scroll_element.xdsoft_scroller',function( event,percent ) {
+						if( !parentHeight )
+							timeboxparent.trigger('resize_scroll.xdsoft_scroller',[percent,true]);
+						percent = percent>1?1:(percent<0||isNaN(percent))?0:percent;
+						scroller.css('margin-top',maximumOffset*percent);
+						timebox.css('marginTop',-parseInt((height-parentHeight)*percent))
+					})
+					.on('resize_scroll.xdsoft_scroller',function( event,_percent,noTriggerScroll ) {
+						parentHeight = timeboxparent[0].clientHeight;
+						height = timebox[0].offsetHeight;
+						var percent = parentHeight/height,
+							sh = percent*scrollbar[0].offsetHeight;
+						if( percent>1 )
+							scroller.hide();
+						else{
+							scroller.show();
+							scroller.css('height',parseInt(sh>10?sh:10));
+							maximumOffset = scrollbar[0].offsetHeight-scroller[0].offsetHeight;
+							if( noTriggerScroll!==true )
+								timeboxparent.trigger('scroll_element.xdsoft_scroller',[_percent?_percent:Math.abs(parseInt(timebox.css('marginTop')))/(height-parentHeight)]);
+						}
+					});
+				timeboxparent.mousewheel&&timeboxparent.mousewheel(function(event, delta, deltaX, deltaY) {
+					var top = Math.abs(parseInt(timebox.css('marginTop')));
+					timeboxparent.trigger('scroll_element.xdsoft_scroller',[(top-delta*20)/(height-parentHeight)]);
+					event.stopPropagation();
+					return false;
+				});
+				timeboxparent.on('touchstart',function( event ) {
+					start = pointerEventToXY(event);
+				});
+				timeboxparent.on('touchmove',function( event ) {
+					if( start ) {
+						var coord = pointerEventToXY(event), top = Math.abs(parseInt(timebox.css('marginTop')));
+						timeboxparent.trigger('scroll_element.xdsoft_scroller',[(top-(coord.y-start.y))/(height-parentHeight)]);
+						event.stopPropagation();
+						event.preventDefault();
+					};
+				});
+				timeboxparent.on('touchend touchcancel',function( event ) {
+					start = false;
+				});
+			}
+			timeboxparent.trigger('resize_scroll.xdsoft_scroller',[_percent]);
+		});
+	};
+	$.fn.datetimepicker = function( opt ) {
+		var KEY0 = 48,
+			KEY9 = 57,
+			_KEY0 = 96,
+			_KEY9 = 105,
+			CTRLKEY = 17,
+			DEL = 46,
+			ENTER = 13,
+			ESC = 27,
+			BACKSPACE = 8,
+			ARROWLEFT = 37,
+			ARROWUP = 38,
+			ARROWRIGHT = 39,
+			ARROWDOWN = 40,
+			TAB = 9,
+			F5 = 116,
+			AKEY = 65,
+			CKEY = 67,
+			VKEY = 86,
+			ZKEY = 90,
+			YKEY = 89,
+			ctrlDown	=	false,
+			options = ($.isPlainObject(opt)||!opt)?$.extend(true,{},default_options,opt):$.extend({},default_options),
+
+			lazyInitTimer = 0,
+
+			lazyInit = function( input ){
+				input
+					.on('open.xdsoft focusin.xdsoft mousedown.xdsoft',function initOnActionCallback(event) {
+						if( input.is(':disabled')||input.is(':hidden')||!input.is(':visible')||input.data( 'xdsoft_datetimepicker') )
+							return;
+				
+						clearTimeout(lazyInitTimer);
+						
+						lazyInitTimer = setTimeout(function() {
+
+							if( !input.data( 'xdsoft_datetimepicker') )
+								createDateTimePicker(input);
+								
+							input
+								.off('open.xdsoft focusin.xdsoft mousedown.xdsoft',initOnActionCallback)
+								.trigger('open.xdsoft');
+						},100);
+						
+					});
+			},
+			
+			createDateTimePicker = function( input ) {
+				
+				var datetimepicker = $('<div '+(options.id?'id="'+options.id+'"':'')+' '+(options.style?'style="'+options.style+'"':'')+' class="xdsoft_datetimepicker xdsoft_noselect '+options.className+'"></div>'),
+					xdsoft_copyright = $('<div class="xdsoft_copyright"><a target="_blank" href="http://xdsoft.net/jqplugins/datetimepicker/">xdsoft.net</a></div>'),
+					datepicker = $('<div class="xdsoft_datepicker active"></div>'),
+					mounth_picker = $('<div class="xdsoft_mounthpicker"><button type="button" class="xdsoft_prev"></button><button type="button" class="xdsoft_today_button"></button><div class="xdsoft_label xdsoft_month"><span></span></div><div class="xdsoft_label xdsoft_year"><span></span></div><button type="button" class="xdsoft_next"></button></div>'),
+					calendar = $('<div class="xdsoft_calendar"></div>'),
+					timepicker = $('<div class="xdsoft_timepicker active"><button type="button" class="xdsoft_prev"></button><div class="xdsoft_time_box"></div><button type="button" class="xdsoft_next"></button></div>'),
+					timeboxparent = timepicker.find('.xdsoft_time_box').eq(0),
+					timebox = $('<div class="xdsoft_time_variant"></div>'),
+					scrollbar = $('<div class="xdsoft_scrollbar"></div>'),
+					scroller = $('<div class="xdsoft_scroller"></div>'),
+					monthselect =$('<div class="xdsoft_select xdsoft_monthselect"><div></div></div>'),
+					yearselect =$('<div class="xdsoft_select xdsoft_yearselect"><div></div></div>');
+
+				//constructor lego
+				mounth_picker
+					.find('.xdsoft_month span')
+						.after(monthselect);
+				mounth_picker
+					.find('.xdsoft_year span')
+						.after(yearselect);
+
+				mounth_picker
+					.find('.xdsoft_month,.xdsoft_year')
+						.on('mousedown.xdsoft',function(event) {
+							mounth_picker
+								.find('.xdsoft_select')
+									.hide();
+									
+							var select = $(this).find('.xdsoft_select').eq(0),
+								val = 0,
+								top = 0;
+
+							if( _xdsoft_datetime.currentTime )
+								val = _xdsoft_datetime.currentTime[$(this).hasClass('xdsoft_month')?'getMonth':'getFullYear']();
+
+							select.show();
+							
+							for(var items = select.find('div.xdsoft_option'),i = 0;i<items.length;i++) {
+								if( items.eq(i).data('value')==val ) {
+									break;
+								}else top+=items[0].offsetHeight;
+							}
+
+							select.xdsoftScroller(top/(select.children()[0].offsetHeight-(select[0].clientHeight)));
+							event.stopPropagation();
+							
+							return false;
+						});
+
+				mounth_picker
+					.find('.xdsoft_select')
+						.xdsoftScroller()
+						.on('mousedown.xdsoft',function( event ) {
+							event.stopPropagation();
+							event.preventDefault();
+						})
+						.on('mousedown.xdsoft','.xdsoft_option',function( event ) {
+							if( _xdsoft_datetime&&_xdsoft_datetime.currentTime )
+								_xdsoft_datetime.currentTime[$(this).parent().parent().hasClass('xdsoft_monthselect')?'setMonth':'setFullYear']($(this).data('value'));
+							
+							$(this).parent().parent().hide();
+							
+							datetimepicker.trigger('xchange.xdsoft');
+							options.onChangeMonth&&options.onChangeMonth.call&&options.onChangeMonth.call(datetimepicker,_xdsoft_datetime.currentTime,datetimepicker.data('input'));
+						});
+
+
+				// set options
+				datetimepicker.setOptions = function( _options ) {
+					options = $.extend(true,{},options,_options);
+					
+					if( _options.allowTimes && $.isArray(_options.allowTimes) && _options.allowTimes.length ){
+						options['allowTimes'] = $.extend(true,[],_options.allowTimes);
+					}
+					
+					if( _options.weekends && $.isArray(_options.weekends) && _options.weekends.length ){
+						options['weekends'] = $.extend(true,[],_options.weekends);
+					}
+					
+					if( (options.open||options.opened)&&(!options.inline) ) {
+						input.trigger('open.xdsoft');
+					}
+
+					if( options.inline ) {
+						triggerAfterOpen = true;
+						datetimepicker.addClass('xdsoft_inline');
+						input.after(datetimepicker).hide();
+					}
+
+					if( options.inverseButton ) {
+						options.next = 'xdsoft_prev';
+						options.prev = 'xdsoft_next';
+					}
+
+					if( options.datepicker )
+						datepicker.addClass('active');
+					else
+						datepicker.removeClass('active');
+						
+					if( options.timepicker )
+						timepicker.addClass('active');
+					else
+						timepicker.removeClass('active');
+
+					if( options.value ){
+						input&&input.val&&input.val(options.value);
+						_xdsoft_datetime.setCurrentTime(options.value);
+					}
+
+					if( isNaN(options.dayOfWeekStart)||parseInt(options.dayOfWeekStart)<0||parseInt(options.dayOfWeekStart)>6 )
+						options.dayOfWeekStart = 0;
+					else
+						options.dayOfWeekStart = parseInt(options.dayOfWeekStart);
+
+					if( !options.timepickerScrollbar )
+						scrollbar.hide();
+					
+					if( options.minDate && /^-(.*)$/.test(options.minDate) ){
+						options.minDate = _xdsoft_datetime.strToDateTime(options.minDate).dateFormat( options.formatDate );
+					}
+					
+					if( options.maxDate &&  /^\+(.*)$/.test(options.maxDate) ) {
+						options.maxDate = _xdsoft_datetime.strToDateTime(options.maxDate).dateFormat( options.formatDate );
+					}
+					
+					mounth_picker
+						.find('.xdsoft_today_button')
+							.css('visibility',!options.todayButton?'hidden':'visible');
+
+					if( options.mask ) {
+						var e,
+							getCaretPos = function ( input ) {
+								try{
+									if ( document.selection && document.selection.createRange ) {
+										var range = document.selection.createRange();
+										return range.getBookmark().charCodeAt(2) - 2;
+									}else
+										if ( input.setSelectionRange )
+											return input.selectionStart;
+								}catch(e) {
+									return 0;
+								}
+							},
+							setCaretPos = function ( node,pos ) {
+								var node = (typeof node == "string" || node instanceof String) ? document.getElementById(node) : node;
+								if(!node) {
+									return false;
+								}else if(node.createTextRange) {
+									var textRange = node.createTextRange();
+									textRange.collapse(true);
+									textRange.moveEnd(pos);
+									textRange.moveStart(pos);
+									textRange.select();
+									return true;
+								}else if(node.setSelectionRange) {
+									node.setSelectionRange(pos,pos);
+									return true;
+								}
+								return false;
+							},
+							isValidValue = function ( mask,value ) {
+								var reg = mask
+									.replace(/([\[\]\/\{\}\(\)\-\.\+]{1})/g,'\\$1')
+									.replace(/_/g,'{digit+}')
+									.replace(/([0-9]{1})/g,'{digit$1}')
+									.replace(/\{digit([0-9]{1})\}/g,'[0-$1_]{1}')
+									.replace(/\{digit[\+]\}/g,'[0-9_]{1}');
+								return RegExp(reg).test(value);
+							};
+						input.off('keydown.xdsoft');
+						switch(true) {
+							case ( options.mask===true ):
+							
+								options.mask = options.format
+									.replace(/Y/g,'9999')
+									.replace(/F/g,'9999')
+									.replace(/m/g,'19')
+									.replace(/d/g,'39')
+									.replace(/H/g,'29')
+									.replace(/i/g,'59')
+									.replace(/s/g,'59');
+									
+							case ( $.type(options.mask) == 'string' ):
+							
+								if( !isValidValue( options.mask,input.val() ) )
+									input.val(options.mask.replace(/[0-9]/g,'_'));
+
+								input.on('keydown.xdsoft',function( event ) {
+									var val = this.value,
+										key = event.which;
+										
+									switch(true) {
+										case (( key>=KEY0&&key<=KEY9 )||( key>=_KEY0&&key<=_KEY9 ))||(key==BACKSPACE||key==DEL):
+											var pos = getCaretPos(this),
+												digit = ( key!=BACKSPACE&&key!=DEL )?String.fromCharCode((_KEY0 <= key && key <= _KEY9)? key-KEY0 : key):'_';
+											
+											if( (key==BACKSPACE||key==DEL)&&pos ) {
+												pos--;
+												digit='_';
+											}
+											
+											while( /[^0-9_]/.test(options.mask.substr(pos,1))&&pos<options.mask.length&&pos>0 )
+												pos+=( key==BACKSPACE||key==DEL )?-1:1;
+
+											val = val.substr(0,pos)+digit+val.substr(pos+1);
+											if( $.trim(val)=='' ){
+												val = options.mask.replace(/[0-9]/g,'_');
+											}else{
+												if( pos==options.mask.length )
+													break;
+											}
+											
+											pos+=(key==BACKSPACE||key==DEL)?0:1;
+											while( /[^0-9_]/.test(options.mask.substr(pos,1))&&pos<options.mask.length&&pos>0 )
+												pos+=(key==BACKSPACE||key==DEL)?-1:1;
+												
+											if( isValidValue( options.mask,val ) ) {
+												this.value = val;
+												setCaretPos(this,pos);
+											}else if( $.trim(val)=='' )
+												this.value = options.mask.replace(/[0-9]/g,'_');
+											else{
+												input.trigger('error_input.xdsoft');
+											}
+										break;
+										case ( !!~([AKEY,CKEY,VKEY,ZKEY,YKEY].indexOf(key))&&ctrlDown ):
+										 case !!~([ESC,ARROWUP,ARROWDOWN,ARROWLEFT,ARROWRIGHT,F5,CTRLKEY,TAB,ENTER].indexOf(key)):
+										return true;
+									}
+									event.preventDefault();
+									return false;
+								});
+							break;
+						}
+					}
+					if( options.validateOnBlur ) {
+						input
+							.off('blur.xdsoft')
+							.on('blur.xdsoft', function() {
+								if( options.allowBlank && !$.trim($(this).val()).length ) {
+									$(this).val(null);
+									datetimepicker.data('xdsoft_datetime').empty();
+								}else if( !Date.parseDate( $(this).val(), options.format ) ) {
+									$(this).val((_xdsoft_datetime.now()).dateFormat( options.format ));
+									datetimepicker.data('xdsoft_datetime').setCurrentTime($(this).val());
+								}
+								else{
+									datetimepicker.data('xdsoft_datetime').setCurrentTime($(this).val());
+ 								}
+								datetimepicker.trigger('changedatetime.xdsoft');
+							});
+					}
+					options.dayOfWeekStartPrev = (options.dayOfWeekStart==0)?6:options.dayOfWeekStart-1;
+					
+					datetimepicker
+						.trigger('xchange.xdsoft')
+						.trigger('afterOpen.xdsoft')
+				};
+
+				datetimepicker
+					.data('options',options)
+					.on('mousedown.xdsoft',function( event ) {
+						event.stopPropagation();
+						event.preventDefault();
+						yearselect.hide();
+						monthselect.hide();
+						return false;
+					});
+
+				var scroll_element = timepicker.find('.xdsoft_time_box');
+				scroll_element.append(timebox);
+				scroll_element.xdsoftScroller();
+				
+				datetimepicker.on('afterOpen.xdsoft',function() {
+					scroll_element.xdsoftScroller();
+				});
+
+				datetimepicker
+					.append(datepicker)
+					.append(timepicker);
+
+				if( options.withoutCopyright!==true )
+					datetimepicker
+						.append(xdsoft_copyright);
+
+				datepicker
+					.append(mounth_picker)
+					.append(calendar);
+
+				$('body').append(datetimepicker);
+
+				var _xdsoft_datetime = new function() {
+					var _this = this;
+					_this.now = function() {
+						var d = new Date();
+						if( options.yearOffset )
+							d.setFullYear(d.getFullYear()+options.yearOffset);
+						return d;
+					};
+
+					_this.currentTime = this.now();
+					_this.isValidDate = function (d) {
+						if ( Object.prototype.toString.call(d) !== "[object Date]" )
+							return false;
+						return !isNaN(d.getTime());
+					};
+
+					_this.setCurrentTime = function( dTime) {
+						_this.currentTime = (typeof dTime == 'string')? _this.strToDateTime(dTime) : _this.isValidDate(dTime) ? dTime: _this.now();
+						datetimepicker.trigger('xchange.xdsoft');
+					};
+
+					_this.empty = function() {
+						_this.currentTime = null;
+					};
+
+					_this.getCurrentTime = function( dTime) {
+						return _this.currentTime;
+					};
+
+					_this.nextMonth = function() {
+						var month = _this.currentTime.getMonth()+1;
+						if( month==12 ) {
+							_this.currentTime.setFullYear(_this.currentTime.getFullYear()+1);
+							month = 0;
+						}
+						_this.currentTime.setDate(
+							Math.min(
+								Date.daysInMonth[month],
+								_this.currentTime.getDate()
+							)
+						);
+						_this.currentTime.setMonth(month);
+						options.onChangeMonth&&options.onChangeMonth.call&&options.onChangeMonth.call(datetimepicker,_xdsoft_datetime.currentTime,datetimepicker.data('input'));
+						datetimepicker.trigger('xchange.xdsoft');
+						return month;
+					};
+
+					_this.prevMonth = function() {
+						var month = _this.currentTime.getMonth()-1;
+						if( month==-1 ) {
+							_this.currentTime.setFullYear(_this.currentTime.getFullYear()-1);
+							month = 11;
+						}
+						_this.currentTime.setDate(
+							Math.min(
+								Date.daysInMonth[month],
+								_this.currentTime.getDate()
+							)
+						);
+						_this.currentTime.setMonth(month);
+						options.onChangeMonth&&options.onChangeMonth.call&&options.onChangeMonth.call(datetimepicker,_xdsoft_datetime.currentTime,datetimepicker.data('input'));
+						datetimepicker.trigger('xchange.xdsoft');
+						return month;
+					};
+
+					_this.strToDateTime = function( sDateTime ) {
+						var tmpDate = [],timeOffset,currentTime;
+					
+						if( ( tmpDate = /^(\+|\-)(.*)$/.exec(sDateTime) )  && ( tmpDate[2]=Date.parseDate(tmpDate[2], options.formatDate) ) ) {
+							timeOffset = tmpDate[2].getTime()-(tmpDate[2].getTimezoneOffset())*60000;
+							currentTime = new Date((_xdsoft_datetime.now()).getTime()+parseInt(tmpDate[1]+'1')*timeOffset);
+						}else
+							currentTime = sDateTime?Date.parseDate(sDateTime, options.format):_this.now();
+							
+						if( !_this.isValidDate(currentTime) )
+							currentTime = _this.now();
+							
+						return currentTime;
+					};
+
+					_this.strtodate = function( sDate ) {
+						var currentTime = sDate?Date.parseDate(sDate, options.formatDate):_this.now();
+						if( !_this.isValidDate(currentTime) )
+							currentTime = _this.now();
+						return currentTime;
+					};
+
+					_this.strtotime = function( sTime ) {
+						var currentTime = sTime?Date.parseDate(sTime, options.formatTime):_this.now();
+						if( !_this.isValidDate(currentTime) )
+							currentTime = _this.now();
+						return currentTime;
+					};
+
+					_this.str = function() {
+						return _this.currentTime.dateFormat(options.format);
+					};
+				};
+				mounth_picker
+					.find('.xdsoft_today_button')
+						.on('mousedown.xdsoft',function() {
+							datetimepicker.data('changed',true);
+							_xdsoft_datetime.setCurrentTime(0);
+							datetimepicker.trigger('afterOpen.xdsoft');
+						}).on('dblclick.xdsoft',function(){
+							input.val( _xdsoft_datetime.str() );
+							datetimepicker.trigger('close.xdsoft');
+						});
+				mounth_picker
+					.find('.xdsoft_prev,.xdsoft_next')
+						.on('mousedown.xdsoft',function() {
+							var $this = $(this),
+								timer = 0,
+								stop = false;
+
+							(function arguments_callee1(v) {
+								var month =  _xdsoft_datetime.currentTime.getMonth();
+								if( $this.hasClass( options.next ) ) {
+									_xdsoft_datetime.nextMonth();
+								}else if( $this.hasClass( options.prev ) ) {
+									_xdsoft_datetime.prevMonth();
+								}
+								if (options.monthChangeSpinner) {
+									!stop&&(timer = setTimeout(arguments_callee1,v?v:100));
+								}
+							})(500);
+
+							$([document.body,window]).on('mouseup.xdsoft',function arguments_callee2() {
+								clearTimeout(timer);
+								stop = true;
+								$([document.body,window]).off('mouseup.xdsoft',arguments_callee2);
+							});
+						});
+
+				timepicker
+					.find('.xdsoft_prev,.xdsoft_next')
+						.on('mousedown.xdsoft',function() {
+							var $this = $(this),
+								timer = 0,
+								stop = false,
+								period = 110;
+							(function arguments_callee4(v) {
+								var pheight = timeboxparent[0].clientHeight,
+									height = timebox[0].offsetHeight,
+									top = Math.abs(parseInt(timebox.css('marginTop')));
+								if( $this.hasClass(options.next) && (height-pheight)- options.timeHeightInTimePicker>=top ) {
+									timebox.css('marginTop','-'+(top+options.timeHeightInTimePicker)+'px')
+								}else if( $this.hasClass(options.prev) && top-options.timeHeightInTimePicker>=0  ) {
+									timebox.css('marginTop','-'+(top-options.timeHeightInTimePicker)+'px')
+								}
+								timeboxparent.trigger('scroll_element.xdsoft_scroller',[Math.abs(parseInt(timebox.css('marginTop'))/(height-pheight))]);
+								period= ( period>10 )?10:period-10;
+								!stop&&(timer = setTimeout(arguments_callee4,v?v:period));
+							})(500);
+							$([document.body,window]).on('mouseup.xdsoft',function arguments_callee5() {
+								clearTimeout(timer);
+								stop = true;
+								$([document.body,window])
+									.off('mouseup.xdsoft',arguments_callee5);
+							});
+						});
+
+				var xchangeTimer = 0;
+				// base handler - generating a calendar and timepicker
+				datetimepicker
+					.on('xchange.xdsoft',function( event ) {
+						clearTimeout(xchangeTimer);
+						xchangeTimer = setTimeout(function(){
+							var table 	=	'',
+									start	= new Date(_xdsoft_datetime.currentTime.getFullYear(),_xdsoft_datetime.currentTime.getMonth(),1, 12, 0, 0),
+									i = 0,
+									today = _xdsoft_datetime.now();
+								
+								while( start.getDay()!=options.dayOfWeekStart )
+									start.setDate(start.getDate()-1);
+
+								//generate calendar
+								table+='<table><thead><tr>';
+
+								// days
+								for(var j = 0; j<7; j++) {
+									table+='<th>'+options.i18n[options.lang].dayOfWeek[(j+options.dayOfWeekStart)>6?0:j+options.dayOfWeekStart]+'</th>';
+								}
+
+								table+='</tr></thead>';
+								table+='<tbody><tr>';
+								var maxDate = false, minDate = false;
+								
+								if( options.maxDate!==false ) {
+									maxDate = _xdsoft_datetime.strtodate(options.maxDate);
+									maxDate = new Date(maxDate.getFullYear(),maxDate.getMonth(),maxDate.getDate(),23,59,59,999);
+								}
+								
+								if( options.minDate!==false ) {
+									minDate = _xdsoft_datetime.strtodate(options.minDate);
+									minDate = new Date(minDate.getFullYear(),minDate.getMonth(),minDate.getDate());
+								}
+								
+								var d,y,m,classes = [];
+								
+								while( i<_xdsoft_datetime.currentTime.countDaysInMonth()||start.getDay()!=options.dayOfWeekStart||_xdsoft_datetime.currentTime.getMonth()==start.getMonth() ) {
+									classes = [];
+									i++;
+
+									d = start.getDate(); y = start.getFullYear(); m = start.getMonth();
+
+									classes.push('xdsoft_date');
+
+									if( ( maxDate!==false && start > maxDate )||(  minDate!==false && start < minDate ) ){
+										classes.push('xdsoft_disabled');
+									}
+
+									if( _xdsoft_datetime.currentTime.getMonth()!=m ){
+										classes.push('xdsoft_other_month');
+									}
+
+									if( (options.defaultSelect||datetimepicker.data('changed')) && _xdsoft_datetime.currentTime.dateFormat( options.formatDate )==start.dateFormat( options.formatDate ) ) {
+										classes.push('xdsoft_current');
+									}
+
+									if( today.dateFormat( options.formatDate )==start.dateFormat( options.formatDate ) ) {
+										classes.push('xdsoft_today');
+									}
+
+									if( start.getDay()==0||start.getDay()==6||~options.weekends.indexOf(start.dateFormat( options.formatDate )) ) {
+										classes.push('xdsoft_weekend');
+									}
+
+									if(options.beforeShowDay && typeof options.beforeShowDay == 'function')
+                                    					{
+                                        					classes.push(options.beforeShowDay(start))
+                                    					}
+
+									table+='<td data-date="'+d+'" data-month="'+m+'" data-year="'+y+'"'+' class="xdsoft_date xdsoft_day_of_week'+start.getDay()+' '+ classes.join(' ')+'">'+
+												'<div>'+d+'</div>'+
+											'</td>';
+
+									if( start.getDay()==options.dayOfWeekStartPrev ) {
+										table+='</tr>';
+									}
+
+									start.setDate(d+1);
+								}
+								table+='</tbody></table>';
+
+								calendar.html(table);
+
+								mounth_picker.find('.xdsoft_label span').eq(0).text(options.i18n[options.lang].months[_xdsoft_datetime.currentTime.getMonth()]);
+								mounth_picker.find('.xdsoft_label span').eq(1).text(_xdsoft_datetime.currentTime.getFullYear());
+
+								// generate timebox
+								var time = '',
+									h = '',
+									m ='',
+									line_time = function line_time( h,m ) {
+										var now = _xdsoft_datetime.now();
+										now.setHours(h);
+										h = parseInt(now.getHours());
+										now.setMinutes(m);
+										m = parseInt(now.getMinutes());
+
+										classes = [];
+										if( (options.maxTime!==false&&_xdsoft_datetime.strtotime(options.maxTime).getTime()<now.getTime())||(options.minTime!==false&&_xdsoft_datetime.strtotime(options.minTime).getTime()>now.getTime()))
+											classes.push('xdsoft_disabled');
+										if( (options.initTime||options.defaultSelect||datetimepicker.data('changed')) && parseInt(_xdsoft_datetime.currentTime.getHours())==parseInt(h)&&(options.step>59||Math[options.roundTime](_xdsoft_datetime.currentTime.getMinutes()/options.step)*options.step==parseInt(m))) {
+											if( options.defaultSelect||datetimepicker.data('changed')) {
+												classes.push('xdsoft_current');
+											} else if( options.initTime ) {
+												classes.push('xdsoft_init_time');
+											}
+										}
+										if( parseInt(today.getHours())==parseInt(h)&&parseInt(today.getMinutes())==parseInt(m))
+											classes.push('xdsoft_today');
+										time+= '<div class="xdsoft_time '+classes.join(' ')+'" data-hour="'+h+'" data-minute="'+m+'">'+now.dateFormat(options.formatTime)+'</div>';
+									};
+
+								if( !options.allowTimes || !$.isArray(options.allowTimes) || !options.allowTimes.length ) {
+									for( var i=0,j=0;i<(options.hours12?12:24);i++ ) {
+										for( j=0;j<60;j+=options.step ) {
+											h = (i<10?'0':'')+i;
+											m = (j<10?'0':'')+j;
+											line_time( h,m );
+										}
+									}
+								}else{
+									for( var i=0;i<options.allowTimes.length;i++ ) {
+										h = _xdsoft_datetime.strtotime(options.allowTimes[i]).getHours();
+										m = _xdsoft_datetime.strtotime(options.allowTimes[i]).getMinutes();
+										line_time( h,m );
+									}
+								}
+
+								timebox.html(time);
+
+								var opt = '',
+									i = 0;
+
+								for( i = parseInt(options.yearStart,10)+options.yearOffset;i<= parseInt(options.yearEnd,10)+options.yearOffset;i++ ) {
+									opt+='<div class="xdsoft_option '+(_xdsoft_datetime.currentTime.getFullYear()==i?'xdsoft_current':'')+'" data-value="'+i+'">'+i+'</div>';
+								}
+								yearselect.children().eq(0)
+														.html(opt);
+
+								for( i = 0,opt = '';i<= 11;i++ ) {
+									opt+='<div class="xdsoft_option '+(_xdsoft_datetime.currentTime.getMonth()==i?'xdsoft_current':'')+'" data-value="'+i+'">'+options.i18n[options.lang].months[i]+'</div>';
+								}
+								monthselect.children().eq(0).html(opt);
+								$(datetimepicker)
+									.trigger('generate.xdsoft');
+						},10);
+						event.stopPropagation();
+					})
+					.on('afterOpen.xdsoft',function() {
+						if( options.timepicker ) {
+							var classType;
+							if( timebox.find('.xdsoft_current').length ) {
+								classType = '.xdsoft_current';
+							} else if( timebox.find('.xdsoft_init_time').length ) {
+								classType = '.xdsoft_init_time';
+							}
+							
+							if( classType ) {
+								var pheight = timeboxparent[0].clientHeight,
+									height = timebox[0].offsetHeight,
+									top = timebox.find(classType).index()*options.timeHeightInTimePicker+1;
+								if( (height-pheight)<top )
+									top = height-pheight;
+								timeboxparent.trigger('scroll_element.xdsoft_scroller',[parseInt(top)/(height-pheight)]);
+							}else{
+								timeboxparent.trigger('scroll_element.xdsoft_scroller',[0]);
+							}
+						}
+					});
+				
+				var timerclick = 0;
+				
+				calendar
+					.on('click.xdsoft', 'td', function (xdevent) {
+					  xdevent.stopPropagation();  // Prevents closing of Pop-ups, Modals and Flyouts in Bootstrap
+						timerclick++;
+						var $this = $(this),
+							currentTime = _xdsoft_datetime.currentTime;
+						if( $this.hasClass('xdsoft_disabled') )
+							return false;
+
+						currentTime.setDate( 1 );
+						currentTime.setFullYear( $this.data('year') );
+						currentTime.setMonth( $this.data('month') );
+						currentTime.setDate( $this.data('date') );
+						
+						datetimepicker.trigger('select.xdsoft',[currentTime]);
+
+						input.val( _xdsoft_datetime.str() );
+						if( (timerclick>1||(options.closeOnDateSelect===true||( options.closeOnDateSelect===0&&!options.timepicker )))&&!options.inline ) {
+							datetimepicker.trigger('close.xdsoft');
+						}
+
+						if( options.onSelectDate &&	options.onSelectDate.call ) {
+							options.onSelectDate.call(datetimepicker,_xdsoft_datetime.currentTime,datetimepicker.data('input'));
+						}
+
+						datetimepicker.data('changed',true);
+						datetimepicker.trigger('xchange.xdsoft');
+						datetimepicker.trigger('changedatetime.xdsoft');
+						setTimeout(function(){
+							timerclick = 0;
+						},200);
+					});
+
+				timebox
+					.on('click.xdsoft', 'div', function (xdevent) {
+					    xdevent.stopPropagation(); // NAJ: Prevents closing of Pop-ups, Modals and Flyouts
+						var $this = $(this),
+							currentTime = _xdsoft_datetime.currentTime;
+						if( $this.hasClass('xdsoft_disabled') )
+							return false;
+						currentTime.setHours($this.data('hour'));
+						currentTime.setMinutes($this.data('minute'));
+						datetimepicker.trigger('select.xdsoft',[currentTime]);
+
+						datetimepicker.data('input').val( _xdsoft_datetime.str() );
+
+						!options.inline&&datetimepicker.trigger('close.xdsoft');
+
+						if( options.onSelectTime&&options.onSelectTime.call ) {
+							options.onSelectTime.call(datetimepicker,_xdsoft_datetime.currentTime,datetimepicker.data('input'));
+						}
+						datetimepicker.data('changed',true);
+						datetimepicker.trigger('xchange.xdsoft');
+						datetimepicker.trigger('changedatetime.xdsoft');
+					});
+
+				datetimepicker.mousewheel&&datepicker.mousewheel(function(event, delta, deltaX, deltaY) {
+					if( !options.scrollMonth )
+						return true;
+					if( delta<0 )
+						_xdsoft_datetime.nextMonth();
+					else
+						_xdsoft_datetime.prevMonth();
+					return false;
+				});
+
+				datetimepicker.mousewheel&&timeboxparent.unmousewheel().mousewheel(function(event, delta, deltaX, deltaY) {
+					if( !options.scrollTime )
+						return true;
+					var pheight = timeboxparent[0].clientHeight,
+						height = timebox[0].offsetHeight,
+						top = Math.abs(parseInt(timebox.css('marginTop'))),
+						fl = true;
+					if( delta<0 && (height-pheight)-options.timeHeightInTimePicker>=top ) {
+						timebox.css('marginTop','-'+(top+options.timeHeightInTimePicker)+'px');
+						fl = false;
+					}else if( delta>0&&top-options.timeHeightInTimePicker>=0 ) {
+						timebox.css('marginTop','-'+(top-options.timeHeightInTimePicker)+'px');
+						fl = false;
+					}
+					timeboxparent.trigger('scroll_element.xdsoft_scroller',[Math.abs(parseInt(timebox.css('marginTop'))/(height-pheight))]);
+					event.stopPropagation();
+					return fl;
+				});
+				
+				var triggerAfterOpen = false;
+				datetimepicker
+					.on('changedatetime.xdsoft',function() {
+						if( options.onChangeDateTime&&options.onChangeDateTime.call ) {
+							var $input = datetimepicker.data('input');
+							options.onChangeDateTime.call(datetimepicker, _xdsoft_datetime.currentTime, $input);
+							$input.trigger('change');
+						}
+					})
+					.on('generate.xdsoft',function() {
+						if( options.onGenerate&&options.onGenerate.call )
+							options.onGenerate.call(datetimepicker,_xdsoft_datetime.currentTime,datetimepicker.data('input'));
+						if( triggerAfterOpen ){
+							datetimepicker.trigger('afterOpen.xdsoft');
+							triggerAfterOpen = false;
+						}
+					})
+					.on( 'click.xdsoft', function( xdevent )
+					{
+						xdevent.stopPropagation();  // Prevents closing of Pop-ups, Modals and Flyouts in Bootstrap
+					});
+
+				var current_time_index = 0;
+				input.mousewheel&&input.mousewheel(function( event, delta, deltaX, deltaY ) {
+					if( !options.scrollInput )
+						return true;
+					if( !options.datepicker && options.timepicker ) {
+						current_time_index = timebox.find('.xdsoft_current').length?timebox.find('.xdsoft_current').eq(0).index():0;
+						if( current_time_index+delta>=0&&current_time_index+delta<timebox.children().length )
+							current_time_index+=delta;
+						timebox.children().eq(current_time_index).length&&timebox.children().eq(current_time_index).trigger('mousedown');
+						return false;
+					}else if( options.datepicker && !options.timepicker ) {
+						datepicker.trigger( event, [delta, deltaX, deltaY]);
+						input.val&&input.val( _xdsoft_datetime.str() );
+						datetimepicker.trigger('changedatetime.xdsoft');
+						return false;
+					}
+				});
+				var setPos = function() {
+					var offset = datetimepicker.data('input').offset(), top = offset.top+datetimepicker.data('input')[0].offsetHeight-1, left = offset.left, position = "absolute";
+					if (options.fixed) {
+						top -= $(window).scrollTop();
+						left -= $(window).scrollLeft();
+						position = "fixed";
+					}else {
+						if( top+datetimepicker[0].offsetHeight>$(window).height()+$(window).scrollTop() )
+							top = offset.top-datetimepicker[0].offsetHeight+1;
+							if (top < 0)
+								top = 0;
+						if( left+datetimepicker[0].offsetWidth>$(window).width() )
+							left = offset.left-datetimepicker[0].offsetWidth+datetimepicker.data('input')[0].offsetWidth;
+					}
+					datetimepicker.css({
+						left:left,
+						top:top,
+						position: position
+					});
+				};
+				datetimepicker
+					.on('open.xdsoft', function() {
+						var onShow = true;
+						if( options.onShow&&options.onShow.call) {
+							onShow = options.onShow.call(datetimepicker,_xdsoft_datetime.currentTime,datetimepicker.data('input'));
+						}
+						if( onShow!==false ) {
+							datetimepicker.show();
+							setPos();
+							$(window)
+								.off('resize.xdsoft',setPos)
+								.on('resize.xdsoft',setPos);
+
+							if( options.closeOnWithoutClick ) {
+								$([document.body,window]).on('mousedown.xdsoft',function arguments_callee6() {
+									datetimepicker.trigger('close.xdsoft');
+									$([document.body,window]).off('mousedown.xdsoft',arguments_callee6);
+								});
+							}
+						}
+					})
+					.on('close.xdsoft', function( event ) {
+						var onClose = true;
+						if( options.onClose&&options.onClose.call ) {
+							onClose=options.onClose.call(datetimepicker,_xdsoft_datetime.currentTime,datetimepicker.data('input'));
+						}
+						if( onClose!==false&&!options.opened&&!options.inline ) {
+							datetimepicker.hide();
+						}
+						event.stopPropagation();
+					})
+					.data('input',input);
+
+				var timer = 0,
+					timer1 = 0;
+
+				datetimepicker.data('xdsoft_datetime',_xdsoft_datetime);
+				datetimepicker.setOptions(options);
+				
+				function getCurrentValue(){
+					var ct = options.value?options.value:(input&&input.val&&input.val())?input.val():'';
+				
+					if( ct && _xdsoft_datetime.isValidDate(ct = Date.parseDate(ct, options.format)) ) {
+						datetimepicker.data('changed',true);
+					}else
+						ct = '';
+					
+					if( !ct && options.startDate!==false ){
+						ct = _xdsoft_datetime.strToDateTime(options.startDate);
+					}
+					
+					return ct?ct:0;
+				}
+				
+				_xdsoft_datetime.setCurrentTime( getCurrentValue() );
+
+				input
+					.data( 'xdsoft_datetimepicker',datetimepicker )
+					.on('open.xdsoft focusin.xdsoft mousedown.xdsoft',function(event) {
+						if( input.is(':disabled')||input.is(':hidden')||!input.is(':visible') )
+							return;
+						clearTimeout(timer);
+						timer = setTimeout(function() {
+							if( input.is(':disabled')||input.is(':hidden')||!input.is(':visible') )
+								return;
+								
+							triggerAfterOpen = true;
+							_xdsoft_datetime.setCurrentTime(getCurrentValue());
+							
+							datetimepicker.trigger('open.xdsoft');
+						},100);
+					})
+					.on('keydown.xdsoft',function( event ) {
+						var val = this.value,
+							key = event.which;
+						switch(true) {
+							case !!~([ENTER].indexOf(key)):
+								var elementSelector = $("input:visible,textarea:visible");
+								datetimepicker.trigger('close.xdsoft');
+								elementSelector.eq(elementSelector.index(this) + 1).focus();
+							return false;
+							case !!~[TAB].indexOf(key):
+								datetimepicker.trigger('close.xdsoft');
+							return true;
+						}
+					});
+			},
+			destroyDateTimePicker = function( input ) {
+				var datetimepicker = input.data('xdsoft_datetimepicker');
+				if( datetimepicker ) {
+					datetimepicker.data('xdsoft_datetime',null);
+					datetimepicker.remove();
+					input
+						.data( 'xdsoft_datetimepicker',null )
+						.off( 'open.xdsoft focusin.xdsoft focusout.xdsoft mousedown.xdsoft blur.xdsoft keydown.xdsoft' );
+					$(window).off('resize.xdsoft');
+					$([window,document.body]).off('mousedown.xdsoft');
+					input.unmousewheel&&input.unmousewheel();
+				}
+			};
+		$(document)
+			.off('keydown.xdsoftctrl keyup.xdsoftctrl')
+			.on('keydown.xdsoftctrl',function(e) {
+				if ( e.keyCode == CTRLKEY )
+					ctrlDown = true;
+			})
+			.on('keyup.xdsoftctrl',function(e) {
+				if ( e.keyCode == CTRLKEY )
+					ctrlDown = false;
+			});
+		return this.each(function() {
+			var datetimepicker;
+			if( datetimepicker = $(this).data('xdsoft_datetimepicker') ) {
+				if( $.type(opt) === 'string' ) {
+					switch(opt) {
+						case 'show':
+							$(this).select().focus();
+							datetimepicker.trigger( 'open.xdsoft' );
+						break;
+						case 'hide':
+							datetimepicker.trigger('close.xdsoft');
+						break;
+						case 'destroy':
+							destroyDateTimePicker($(this));
+						break;
+						case 'reset':
+							this.value = this.defaultValue;
+							if(!this.value || !datetimepicker.data('xdsoft_datetime').isValidDate(Date.parseDate(this.value, options.format)))
+								datetimepicker.data('changed',false);
+							datetimepicker.data('xdsoft_datetime').setCurrentTime(this.value);
+						break;
+					}
+				}else{
+					datetimepicker
+						.setOptions(opt);
+				}
+				return 0;
+			}else
+				if( ($.type(opt) !== 'string') ){
+					if( !options.lazyInit||options.open||options.inline ){
+						createDateTimePicker($(this));
+					}else
+						lazyInit($(this));
+				}
+		});
+	};
+	$.fn.datetimepicker.defaults = default_options;
+})( jQuery );
+
+/*
+ * Copyright (c) 2013 Brandon Aaron (http://brandonaaron.net)
+ *
+ * Licensed under the MIT License (LICENSE.txt).
+ *
+ * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
+ * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
+ * Thanks to: Seamus Leahy for adding deltaX and deltaY
+ *
+ * Version: 3.1.3
+ *
+ * Requires: 1.2.2+
+ */
+(function(factory) {if(typeof define==='function'&&define.amd) {define(['jquery'],factory)}else if(typeof exports==='object') {module.exports=factory}else{factory(jQuery)}}(function($) {var toFix=['wheel','mousewheel','DOMMouseScroll','MozMousePixelScroll'];var toBind='onwheel'in document||document.documentMode>=9?['wheel']:['mousewheel','DomMouseScroll','MozMousePixelScroll'];var lowestDelta,lowestDeltaXY;if($.event.fixHooks) {for(var i=toFix.length;i;) {$.event.fixHooks[toFix[--i]]=$.event.mouseHooks}}$.event.special.mousewheel={setup:function() {if(this.addEventListener) {for(var i=toBind.length;i;) {this.addEventListener(toBind[--i],handler,false)}}else{this.onmousewheel=handler}},teardown:function() {if(this.removeEventListener) {for(var i=toBind.length;i;) {this.removeEventListener(toBind[--i],handler,false)}}else{this.onmousewheel=null}}};$.fn.extend({mousewheel:function(fn) {return fn?this.bind("mousewheel",fn):this.trigger("mousewheel")},unmousewheel:function(fn) {return this.unbind("mousewheel",fn)}});function handler(event) {var orgEvent=event||window.event,args=[].slice.call(arguments,1),delta=0,deltaX=0,deltaY=0,absDelta=0,absDeltaXY=0,fn;event=$.event.fix(orgEvent);event.type="mousewheel";if(orgEvent.wheelDelta) {delta=orgEvent.wheelDelta}if(orgEvent.detail) {delta=orgEvent.detail*-1}if(orgEvent.deltaY) {deltaY=orgEvent.deltaY*-1;delta=deltaY}if(orgEvent.deltaX) {deltaX=orgEvent.deltaX;delta=deltaX*-1}if(orgEvent.wheelDeltaY!==undefined) {deltaY=orgEvent.wheelDeltaY}if(orgEvent.wheelDeltaX!==undefined) {deltaX=orgEvent.wheelDeltaX*-1}absDelta=Math.abs(delta);if(!lowestDelta||absDelta<lowestDelta) {lowestDelta=absDelta}absDeltaXY=Math.max(Math.abs(deltaY),Math.abs(deltaX));if(!lowestDeltaXY||absDeltaXY<lowestDeltaXY) {lowestDeltaXY=absDeltaXY}fn=delta>0?'floor':'ceil';delta=Math[fn](delta/lowestDelta);deltaX=Math[fn](deltaX/lowestDeltaXY);deltaY=Math[fn](deltaY/lowestDeltaXY);args.unshift(event,delta,deltaX,deltaY);return($.event.dispatch||$.event.handle).apply(this,args)}}));
+
+
+// Parse and Format Library
+//http://www.xaprb.com/blog/2005/12/12/javascript-closures-for-runtime-efficiency/
+/*
+ * Copyright (C) 2004 Baron Schwartz <baron at sequent dot org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, version 2.1.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+ * details.
+ */
+Date.parseFunctions={count:0};Date.parseRegexes=[];Date.formatFunctions={count:0};Date.prototype.dateFormat=function(b){if(b=="unixtime"){return parseInt(this.getTime()/1000);}if(Date.formatFunctions[b]==null){Date.createNewFormat(b);}var a=Date.formatFunctions[b];return this[a]();};Date.createNewFormat=function(format){var funcName="format"+Date.formatFunctions.count++;Date.formatFunctions[format]=funcName;var code="Date.prototype."+funcName+" = function() {return ";var special=false;var ch="";for(var i=0;i<format.length;++i){ch=format.charAt(i);if(!special&&ch=="\\"){special=true;}else{if(special){special=false;code+="'"+String.escape(ch)+"' + ";}else{code+=Date.getFormatCode(ch);}}}eval(code.substring(0,code.length-3)+";}");};Date.getFormatCode=function(a){switch(a){case"d":return"String.leftPad(this.getDate(), 2, '0') + ";case"D":return"Date.dayNames[this.getDay()].substring(0, 3) + ";case"j":return"this.getDate() + ";case"l":return"Date.dayNames[this.getDay()] + ";case"S":return"this.getSuffix() + ";case"w":return"this.getDay() + ";case"z":return"this.getDayOfYear() + ";case"W":return"this.getWeekOfYear() + ";case"F":return"Date.monthNames[this.getMonth()] + ";case"m":return"String.leftPad(this.getMonth() + 1, 2, '0') + ";case"M":return"Date.monthNames[this.getMonth()].substring(0, 3) + ";case"n":return"(this.getMonth() + 1) + ";case"t":return"this.getDaysInMonth() + ";case"L":return"(this.isLeapYear() ? 1 : 0) + ";case"Y":return"this.getFullYear() + ";case"y":return"('' + this.getFullYear()).substring(2, 4) + ";case"a":return"(this.getHours() < 12 ? 'am' : 'pm') + ";case"A":return"(this.getHours() < 12 ? 'AM' : 'PM') + ";case"g":return"((this.getHours() %12) ? this.getHours() % 12 : 12) + ";case"G":return"this.getHours() + ";case"h":return"String.leftPad((this.getHours() %12) ? this.getHours() % 12 : 12, 2, '0') + ";case"H":return"String.leftPad(this.getHours(), 2, '0') + ";case"i":return"String.leftPad(this.getMinutes(), 2, '0') + ";case"s":return"String.leftPad(this.getSeconds(), 2, '0') + ";case"O":return"this.getGMTOffset() + ";case"T":return"this.getTimezone() + ";case"Z":return"(this.getTimezoneOffset() * -60) + ";default:return"'"+String.escape(a)+"' + ";}};Date.parseDate=function(a,c){if(c=="unixtime"){return new Date(!isNaN(parseInt(a))?parseInt(a)*1000:0);}if(Date.parseFunctions[c]==null){Date.createParser(c);}var b=Date.parseFunctions[c];return Date[b](a);};Date.createParser=function(format){var funcName="parse"+Date.parseFunctions.count++;var regexNum=Date.parseRegexes.length;var currentGroup=1;Date.parseFunctions[format]=funcName;var code="Date."+funcName+" = function(input) {\nvar y = -1, m = -1, d = -1, h = -1, i = -1, s = -1, z = -1;\nvar d = new Date();\ny = d.getFullYear();\nm = d.getMonth();\nd = d.getDate();\nvar results = input.match(Date.parseRegexes["+regexNum+"]);\nif (results && results.length > 0) {";var regex="";var special=false;var ch="";for(var i=0;i<format.length;++i){ch=format.charAt(i);if(!special&&ch=="\\"){special=true;}else{if(special){special=false;regex+=String.escape(ch);}else{obj=Date.formatCodeToRegex(ch,currentGroup);currentGroup+=obj.g;regex+=obj.s;if(obj.g&&obj.c){code+=obj.c;}}}}code+="if (y > 0 && z > 0){\nvar doyDate = new Date(y,0);\ndoyDate.setDate(z);\nm = doyDate.getMonth();\nd = doyDate.getDate();\n}";code+="if (y > 0 && m >= 0 && d > 0 && h >= 0 && i >= 0 && s >= 0)\n{return new Date(y, m, d, h, i, s);}\nelse if (y > 0 && m >= 0 && d > 0 && h >= 0 && i >= 0)\n{return new Date(y, m, d, h, i);}\nelse if (y > 0 && m >= 0 && d > 0 && h >= 0)\n{return new Date(y, m, d, h);}\nelse if (y > 0 && m >= 0 && d > 0)\n{return new Date(y, m, d);}\nelse if (y > 0 && m >= 0)\n{return new Date(y, m);}\nelse if (y > 0)\n{return new Date(y);}\n}return null;}";Date.parseRegexes[regexNum]=new RegExp("^"+regex+"$");eval(code);};Date.formatCodeToRegex=function(b,a){switch(b){case"D":return{g:0,c:null,s:"(?:Sun|Mon|Tue|Wed|Thu|Fri|Sat)"};case"j":case"d":return{g:1,c:"d = parseInt(results["+a+"], 10);\n",s:"(\\d{1,2})"};case"l":return{g:0,c:null,s:"(?:"+Date.dayNames.join("|")+")"};case"S":return{g:0,c:null,s:"(?:st|nd|rd|th)"};case"w":return{g:0,c:null,s:"\\d"};case"z":return{g:1,c:"z = parseInt(results["+a+"], 10);\n",s:"(\\d{1,3})"};case"W":return{g:0,c:null,s:"(?:\\d{2})"};case"F":return{g:1,c:"m = parseInt(Date.monthNumbers[results["+a+"].substring(0, 3)], 10);\n",s:"("+Date.monthNames.join("|")+")"};case"M":return{g:1,c:"m = parseInt(Date.monthNumbers[results["+a+"]], 10);\n",s:"(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)"};case"n":case"m":return{g:1,c:"m = parseInt(results["+a+"], 10) - 1;\n",s:"(\\d{1,2})"};case"t":return{g:0,c:null,s:"\\d{1,2}"};case"L":return{g:0,c:null,s:"(?:1|0)"};case"Y":return{g:1,c:"y = parseInt(results["+a+"], 10);\n",s:"(\\d{4})"};case"y":return{g:1,c:"var ty = parseInt(results["+a+"], 10);\ny = ty > Date.y2kYear ? 1900 + ty : 2000 + ty;\n",s:"(\\d{1,2})"};case"a":return{g:1,c:"if (results["+a+"] == 'am') {\nif (h == 12) { h = 0; }\n} else { if (h < 12) { h += 12; }}",s:"(am|pm)"};case"A":return{g:1,c:"if (results["+a+"] == 'AM') {\nif (h == 12) { h = 0; }\n} else { if (h < 12) { h += 12; }}",s:"(AM|PM)"};case"g":case"G":case"h":case"H":return{g:1,c:"h = parseInt(results["+a+"], 10);\n",s:"(\\d{1,2})"};case"i":return{g:1,c:"i = parseInt(results["+a+"], 10);\n",s:"(\\d{2})"};case"s":return{g:1,c:"s = parseInt(results["+a+"], 10);\n",s:"(\\d{2})"};case"O":return{g:0,c:null,s:"[+-]\\d{4}"};case"T":return{g:0,c:null,s:"[A-Z]{3}"};case"Z":return{g:0,c:null,s:"[+-]\\d{1,5}"};default:return{g:0,c:null,s:String.escape(b)};}};Date.prototype.getTimezone=function(){return this.toString().replace(/^.*? ([A-Z]{3}) [0-9]{4}.*$/,"$1").replace(/^.*?\(([A-Z])[a-z]+ ([A-Z])[a-z]+ ([A-Z])[a-z]+\)$/,"$1$2$3");};Date.prototype.getGMTOffset=function(){return(this.getTimezoneOffset()>0?"-":"+")+String.leftPad(Math.floor(Math.abs(this.getTimezoneOffset())/60),2,"0")+String.leftPad(Math.abs(this.getTimezoneOffset())%60,2,"0");};Date.prototype.getDayOfYear=function(){var a=0;Date.daysInMonth[1]=this.isLeapYear()?29:28;for(var b=0;b<this.getMonth();++b){a+=Date.daysInMonth[b];}return a+this.getDate();};Date.prototype.getWeekOfYear=function(){var b=this.getDayOfYear()+(4-this.getDay());var a=new Date(this.getFullYear(),0,1);var c=(7-a.getDay()+4);return String.leftPad(Math.ceil((b-c)/7)+1,2,"0");};Date.prototype.isLeapYear=function(){var a=this.getFullYear();return((a&3)==0&&(a%100||(a%400==0&&a)));};Date.prototype.getFirstDayOfMonth=function(){var a=(this.getDay()-(this.getDate()-1))%7;return(a<0)?(a+7):a;};Date.prototype.getLastDayOfMonth=function(){var a=(this.getDay()+(Date.daysInMonth[this.getMonth()]-this.getDate()))%7;return(a<0)?(a+7):a;};Date.prototype.getDaysInMonth=function(){Date.daysInMonth[1]=this.isLeapYear()?29:28;return Date.daysInMonth[this.getMonth()];};Date.prototype.getSuffix=function(){switch(this.getDate()){case 1:case 21:case 31:return"st";case 2:case 22:return"nd";case 3:case 23:return"rd";default:return"th";}};String.escape=function(a){return a.replace(/('|\\)/g,"\\$1");};String.leftPad=function(d,b,c){var a=new String(d);if(c==null){c=" ";}while(a.length<b){a=c+a;}return a;};Date.daysInMonth=[31,28,31,30,31,30,31,31,30,31,30,31];Date.monthNames=["January","February","March","April","May","June","July","August","September","October","November","December"];Date.dayNames=["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"];Date.y2kYear=50;Date.monthNumbers={Jan:0,Feb:1,Mar:2,Apr:3,May:4,Jun:5,Jul:6,Aug:7,Sep:8,Oct:9,Nov:10,Dec:11};Date.patterns={ISO8601LongPattern:"Y-m-d H:i:s",ISO8601ShortPattern:"Y-m-d",ShortDatePattern:"n/j/Y",LongDatePattern:"l, F d, Y",FullDateTimePattern:"l, F d, Y g:i:s A",MonthDayPattern:"F d",ShortTimePattern:"g:i A",LongTimePattern:"g:i:s A",SortableDateTimePattern:"Y-m-d\\TH:i:s",UniversalSortableDateTimePattern:"Y-m-d H:i:sO",YearMonthPattern:"F, Y"};
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery.datetimepicker.css b/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery.datetimepicker.css
new file mode 100644
index 00000000000..dad45ed7e13
--- /dev/null
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery.datetimepicker.css
@@ -0,0 +1,304 @@
+.xdsoft_datetimepicker{
+	box-shadow: 0px 5px 15px -5px rgba(0, 0, 0, 0.506);
+	background: #FFFFFF;
+	border-bottom: 1px solid #BBBBBB;
+	border-left: 1px solid #CCCCCC;
+	border-right: 1px solid #CCCCCC;
+	border-top: 1px solid #CCCCCC;
+	color: #333333;
+	display: block;
+	font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif;
+	padding: 8px;
+	padding-left: 0px;
+	padding-top: 2px;
+	position: absolute;
+	z-index: 9999;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	display:none;
+}
+
+.xdsoft_datetimepicker iframe {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 75px;
+    height: 210px;
+    background: transparent;
+    border:none;
+}
+/*For IE8 or lower*/
+.xdsoft_datetimepicker button {
+    border:none !important;
+}
+
+.xdsoft_noselect{
+	-webkit-touch-callout: none;
+	-webkit-user-select: none;
+	-khtml-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	-o-user-select: none;
+	user-select: none;
+}
+.xdsoft_noselect::selection { background: transparent; }
+.xdsoft_noselect::-moz-selection { background: transparent; }
+.xdsoft_datetimepicker.xdsoft_inline{
+	display: inline-block;
+	position: static;
+	box-shadow: none;
+}
+.xdsoft_datetimepicker *{
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	padding:0px;
+	margin:0px;
+}
+.xdsoft_datetimepicker .xdsoft_datepicker, .xdsoft_datetimepicker  .xdsoft_timepicker{
+	display:none;
+}
+.xdsoft_datetimepicker .xdsoft_datepicker.active, .xdsoft_datetimepicker  .xdsoft_timepicker.active{
+	display:block;
+}
+.xdsoft_datetimepicker .xdsoft_datepicker{
+	width: 224px;
+	float:left;
+	margin-left:8px;
+}
+.xdsoft_datetimepicker  .xdsoft_timepicker{
+	width: 58px;
+	float:left;
+	text-align:center;
+	margin-left:8px;
+	margin-top:0px;
+}
+.xdsoft_datetimepicker  .xdsoft_datepicker.active+.xdsoft_timepicker{
+	margin-top:8px;
+	margin-bottom:3px
+}
+.xdsoft_datetimepicker  .xdsoft_mounthpicker{
+	position: relative;
+	text-align: center;
+}
+
+.xdsoft_datetimepicker  .xdsoft_prev, .xdsoft_datetimepicker  .xdsoft_next,.xdsoft_datetimepicker  .xdsoft_today_button{
+	background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAAAeCAYAAACsYQl4AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDozQjRCQjRGREU4MkNFMzExQjRDQkIyRDJDOTdBRUI1MCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpCQjg0OUYyNTZDODAxMUUzQjMwM0IwMERBNUU0ODQ5NSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpCQjg0OUYyNDZDODAxMUUzQjMwM0IwMERBNUU0ODQ5NSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkI5NzE3MjFBN0E2Q0UzMTFBQjJEQjgzMDk5RTNBNTdBIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjNCNEJCNEZERTgyQ0UzMTFCNENCQjJEMkM5N0FFQjUwIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+aQvATgAAAfVJREFUeNrsmr1OwzAQxzGtkPjYEAuvVGAvfQIGRKADE49gdLwDDwBiZ2RhQUKwICQkWLsgFiRQuIBTucFJ/XFp4+hO+quqnZ4uvzj2nV2RpukCW/22yAgYNINmc7du7DcghCjrkqgOKjF1znpt6rZ0AGWQj7TvCU8d9UM+QAGDrhdyc2Bnc1WVVPBev9V8lBnY+rDwncWZThG4xk4lmxtJy2AHgoY/FySgbSBPwPZ8mEXbQx3aDERb0EbYAYFC7pcAtAvkMWwC0D3NX58S9D/YnoGC7nPWr3Dg9JTbtuHhDShBT8D2CBSK/iIEvVXxpuxSgh7DdgwUTL4iA92zmJb6lKB/YTsECmV+IgK947AGDIqgQ/LojsO135Hn51l2cWlov0JdGNrPUceueXRwilSVgkUyom9Rd6gbLfYTDeO+1v6orn0InTogYDGUkYLO3/wc9BdqqTCKP1Tfi+oTIaCBIL2TES+GTyruT9S61p6BHam+99DFEAgLFklYsIBHwSI9QY80H5ta+1rB/6ovaKihBJeEJbgLbBlQgl+j3lDPqA2tfQV1j3pVn8s+oKHGTSVJ+FqDLeR5bCqJ2E/BCycsoLZETXaKGs7rhKVt+9HZScrZNMi88V8P7LlDbvOZYaJVpMMmBCT4n0o8dTBoNgbdWPsRYACs3r7XyNfbnAAAAABJRU5ErkJggg==');
+}
+.xdsoft_datetimepicker  .xdsoft_prev{
+    float: left;
+	background-position:-20px 0px;
+}
+.xdsoft_datetimepicker  .xdsoft_today_button{
+    float: left;
+	background-position:-70px 0px;
+	margin-left:5px;
+}
+
+.xdsoft_datetimepicker  .xdsoft_next{
+    float: right;
+	background-position:0px 0px;
+}
+.xdsoft_datetimepicker  .xdsoft_next:active,.xdsoft_datetimepicker  .xdsoft_prev:active{
+}
+.xdsoft_datetimepicker  .xdsoft_next,.xdsoft_datetimepicker  .xdsoft_prev ,.xdsoft_datetimepicker  .xdsoft_today_button{
+	background-color: transparent;
+	background-repeat: no-repeat;
+	border: 0px none currentColor;
+	cursor: pointer;
+	display: block;
+	height: 30px;
+	opacity: 0.5;
+	outline: medium none currentColor;
+	overflow: hidden;
+	padding: 0px;
+	position: relative;
+	text-indent: 100%;
+	white-space: nowrap;
+	width: 20px;
+}
+.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_prev,
+.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_next{
+	float:none;
+	background-position:-40px -15px;
+	height: 15px;
+	width: 30px;
+	display: block;
+	margin-left:14px;
+	margin-top:7px;
+}
+.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_prev{
+	background-position:-40px 0px;
+	margin-bottom:7px;
+	margin-top:0px;
+}
+.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_time_box{
+	height:151px;
+	overflow:hidden;
+	border-bottom:1px solid #DDDDDD;
+}
+.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_time_box >div >div{
+	background: #F5F5F5;
+	border-top:1px solid #DDDDDD;
+	color: #666666;
+	font-size: 12px;
+	text-align: center;
+	border-collapse:collapse;
+	cursor:pointer;
+	border-bottom-width:0px;
+	height:25px;
+	line-height:25px;
+}
+
+.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_time_box >div > div:first-child{
+ border-top-width:0px;
+}
+.xdsoft_datetimepicker  .xdsoft_today_button:hover,
+.xdsoft_datetimepicker  .xdsoft_next:hover,
+.xdsoft_datetimepicker  .xdsoft_prev:hover {
+    opacity: 1;
+}
+.xdsoft_datetimepicker  .xdsoft_label{
+	display: inline;
+    position: relative;
+    z-index: 9999;
+    margin: 0;
+    padding: 5px 3px;
+    font-size: 14px;
+    line-height: 20px;
+    font-weight: bold;
+    background-color: #fff;
+	float:left;
+	width:182px;
+	text-align:center;
+	cursor:pointer;
+}
+.xdsoft_datetimepicker  .xdsoft_label:hover{
+	text-decoration:underline;
+}
+.xdsoft_datetimepicker  .xdsoft_label > .xdsoft_select{
+	border:1px solid #ccc;
+	position:absolute;
+	display:block;
+	right:0px;
+	top:30px;
+	z-index:101;
+	display:none;
+	background:#fff;
+	max-height:160px;
+	overflow-y:hidden;
+}
+.xdsoft_datetimepicker  .xdsoft_label > .xdsoft_select.xdsoft_monthselect{right:-7px;}
+.xdsoft_datetimepicker  .xdsoft_label > .xdsoft_select.xdsoft_yearselect{right:2px;}
+.xdsoft_datetimepicker  .xdsoft_label > .xdsoft_select > div > .xdsoft_option:hover{
+	color: #fff;
+    background: #ff8000;
+}
+.xdsoft_datetimepicker  .xdsoft_label > .xdsoft_select > div > .xdsoft_option{
+	padding:2px 10px 2px 5px; 
+}
+.xdsoft_datetimepicker  .xdsoft_label > .xdsoft_select > div > .xdsoft_option.xdsoft_current{
+	background: #33AAFF;
+	box-shadow: #178FE5 0px 1px 3px 0px inset;
+	color:#fff;
+	font-weight: 700;
+}
+.xdsoft_datetimepicker  .xdsoft_month{
+	width:90px;
+	text-align:right;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar{
+	clear:both;
+}
+.xdsoft_datetimepicker  .xdsoft_year{
+	width:56px;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar table{
+	border-collapse:collapse;
+	width:100%;
+	
+}
+.xdsoft_datetimepicker  .xdsoft_calendar td > div{
+	padding-right:5px;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar th{
+	height: 25px;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar td,.xdsoft_datetimepicker  .xdsoft_calendar th{
+	width:14.2857142%;
+	text-align:center;
+	background: #F5F5F5;
+	border:1px solid #DDDDDD;
+	color: #666666;
+	font-size: 12px;
+	text-align: right;
+	padding:0px;
+	border-collapse:collapse;
+	cursor:pointer;
+	height: 25px;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar th{
+	background: #F1F1F1;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_today{
+	color:#33AAFF;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_default,
+.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_current,
+.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_time_box >div >div.xdsoft_current{
+	background: #33AAFF;
+	box-shadow: #178FE5 0px 1px 3px 0px inset;
+	color:#fff;
+	font-weight: 700;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_other_month,
+.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_disabled,
+.xdsoft_datetimepicker  .xdsoft_time_box >div >div.xdsoft_disabled{
+	opacity:0.5;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_other_month.xdsoft_disabled{
+	opacity:0.2;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar td:hover,
+.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_time_box >div >div:hover{
+	color: #fff !important;
+    background: #ff8000 !important;
+    box-shadow: none !important;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_disabled:hover,
+.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_time_box >div >div.xdsoft_disabled:hover{
+	color: inherit	!important;
+    background: inherit !important;
+    box-shadow: inherit !important;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar th{
+	font-weight: 700;
+	text-align: center;
+	color: #999;
+	cursor:default;
+}
+.xdsoft_datetimepicker  .xdsoft_copyright{ color:#ccc !important; font-size:10px;clear:both;float:none;margin-left:8px;}
+.xdsoft_datetimepicker  .xdsoft_copyright a{ color:#eee !important;}
+.xdsoft_datetimepicker  .xdsoft_copyright a:hover{ color:#aaa !important;}
+
+
+.xdsoft_time_box{
+	position:relative;
+	border:1px solid #ccc;
+}
+.xdsoft_scrollbar >.xdsoft_scroller{
+	background:#ccc !important;
+	height:20px;
+	border-radius:3px;
+}
+.xdsoft_scrollbar{
+	position:absolute;
+	width:7px;
+	width:7px;
+	right:0px;
+	top:0px;
+	bottom:0px;
+	cursor:pointer;
+}
+.xdsoft_scroller_box{
+position:relative;
+}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
index 30256781ee5..f6226e0a85a 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
@@ -5,6 +5,7 @@
     {% compress css %}
         <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css" />
         <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/vendor/jquery.timepicker.css" />
+        <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/vendor/jquery.datetimepicker.css" />
         <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/core.scss" type="text/x-scss" />
     {% endcompress %}
 
@@ -17,6 +18,7 @@
         <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/jquery-1.10.3.js"></script>
         <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.datetimepicker.js"></script>
         <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/jquery.autosize.js"></script>
         <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/bootstrap-modal.js"></script>
         <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/bootstrap-tab.js"></script>

From 614b49213dece2fd6a429bf9bea129ceaa96d193 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 3 Jun 2014 15:04:28 +0100
Subject: [PATCH 043/293] Swapped out jQueryUI datetimepicker for xdsoft
 datetimepicker

---
 wagtail/wagtailadmin/edit_handlers.py         | 129 +-----------------
 .../static/wagtailadmin/js/page-editor.js     |  59 ++------
 .../wagtailforms/index_submissions.html       |  27 ++--
 3 files changed, 24 insertions(+), 191 deletions(-)

diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py
index 245f7ad60d1..2b4006610e0 100644
--- a/wagtail/wagtailadmin/edit_handlers.py
+++ b/wagtail/wagtailadmin/edit_handlers.py
@@ -23,133 +23,12 @@
 from wagtail.wagtailcore.fields import RichTextArea
 
 
-class FriendlyDateInput(forms.DateInput):
-    """
-    A custom DateInput widget that formats dates as "05 Oct 2013"
-    and adds class="friendly_date" to be picked up by jquery datepicker.
-    """
-    def __init__(self, attrs=None):
-        default_attrs = {'class': 'friendly_date'}
-        if attrs:
-            default_attrs.update(attrs)
-
-        super(FriendlyDateInput, self).__init__(attrs=default_attrs, format='%d %b %Y')
-
-
-class FriendlyTimeInput(forms.TimeInput):
-    """
-    A custom TimeInput widget that formats dates as "5.30pm"
-    and adds class="friendly_time" to be picked up by jquery timepicker.
-    """
-    def __init__(self, attrs=None):
-        default_attrs = {'class': 'friendly_time'}
-        if attrs:
-            default_attrs.update(attrs)
-
-        super(FriendlyTimeInput, self).__init__(attrs=default_attrs, format='%I.%M%p')
-
-
-class FriendlyTimeField(forms.CharField):
-    def to_python(self, time_string):
-        # Check if the string is blank
-        if not time_string:
-            return None
-
-        # Look for time in the string
-        expr = re.compile("^(?P<hour>\d+)(?:(?:.|:)(?P<minute>\d+))?(?P<am_pm>am|pm)")
-        match = expr.match(time_string.lower())
-        if match:
-            # Pull out values from string
-            hour_string, minute_string, am_pm = match.groups()
-
-            # Convert hours and minutes to integers
-            hour = int(hour_string)
-            if minute_string:
-                minute = int(minute_string)
-            else:
-                minute = 0
-
-            # Create python time
-            if am_pm == "pm" and hour < 12:
-                hour += 12
-
-            if am_pm == "am" and hour >= 12:
-                hour -= 12
-
-            return datetime.time(hour=hour, minute=minute)
-        else:
-            raise ValidationError(_("Please type a valid time"))
-
-
-class LocalizedDateInput(forms.DateInput):
-    """
-    A custom DateInput widget that formats localized dates
-    and adds class="friendly_date" to be picked up by jquery datepicker.
-    """
-    def __init__(self, attrs=None):
-        default_attrs = {'class': 'localized_date', 'localize':True}
-        if attrs:
-            default_attrs.update(attrs)
-
-        super(LocalizedDateInput, self).__init__(attrs=default_attrs)
-
-
-class LocalizedTimeInput(forms.TimeInput):
-    """
-    A custom TimeInput widget that formats dates as "5.30pm"
-    and adds class="friendly_time" to be picked up by jquery timepicker.
-    """
-    def __init__(self, attrs=None):
-        default_attrs = {'class': 'localized_time'}
-        if attrs:
-            default_attrs.update(attrs)
-        # Just use 24-hour format
-        super(LocalizedTimeInput, self).__init__(attrs=default_attrs, format='%H:%M')
-
-
-class LocalizedTimeField(forms.CharField):
-    def to_python(self, time_string):
-        # Check if the string is blank
-        if not time_string:
-            return None
-
-        # Look for time in the string
-        expr = re.compile("^(?P<hour>\d+)(?:(?:.|:)(?P<minute>\d+))?")
-        match = expr.match(time_string.lower())
-        if match:
-            # Pull out values from string
-            hour_string, minute_string= match.groups()
-
-            # Convert hours and minutes to integers
-            hour = int(hour_string)
-            if minute_string:
-                minute = int(minute_string)
-            else:
-                minute = 0
-            if hour>=24 or hour < 0 or minute >=60 or minute < 0:
-                raise ValidationError(_("Please type a valid time"))
-
-            return datetime.time(hour=hour, minute=minute)
-        else:
-            raise ValidationError(_("Please type a valid time") )
-
-
-if hasattr(settings, 'USE_L10N') and settings.USE_L10N==True:
-    FORM_FIELD_OVERRIDES = {
-        models.DateField: {'widget': LocalizedDateInput},
-        models.TimeField: {'widget': LocalizedTimeInput, 'form_class': LocalizedTimeField},
-    }
-else: # Fall back to friendly date/time
-    FORM_FIELD_OVERRIDES = {
-        models.DateField: {'widget': FriendlyDateInput},
-        models.TimeField: {'widget': FriendlyTimeInput, 'form_class': FriendlyTimeField},
-    }
+FORM_FIELD_OVERRIDES = {}
 
 WIDGET_JS = {
-    FriendlyDateInput: (lambda id: "initFriendlyDateChooser(fixPrefix('%s'));" % id),
-    FriendlyTimeInput: (lambda id: "initFriendlyTimeChooser(fixPrefix('%s'));" % id),
-    LocalizedDateInput: (lambda id: "initLocalizedDateChooser(fixPrefix('%s'));" % id),
-    LocalizedTimeInput: (lambda id: "initLocalizedTimeChooser(fixPrefix('%s'));" % id),
+    forms.DateInput: (lambda id: "initDateChooser(fixPrefix('%s'));" % id),
+    forms.TimeInput: (lambda id: "initTimeChooser(fixPrefix('%s'));" % id),
+    forms.DateTimeInput: (lambda id: "initDateTimeChooser(fixPrefix('%s'));" % id),
     RichTextArea: (lambda id: "makeRichTextEditable(fixPrefix('%s'));" % id),
     TagWidget: (
         lambda id: "initTagField(fixPrefix('%s'), '%s');" % (
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index cbff2c8af8a..a8d492ffc52 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -53,56 +53,23 @@ function insertRichTextDeleteControl(elem) {
     });
 }
 
-function initDateChoosers(context) {
-    $('input.friendly_date', context).datepicker({
-        dateFormat: 'd M yy', constrainInput: false, /* showOn: 'button', */ firstDay: 1
+function initDateChooser(id) {
+    $('#' + id).datetimepicker({
+        timepicker: false,
+        format: 'Y-m-d'
     });
-
-    if(window.overrideDateInputFormat && window.overrideDateInputFormat !='') {
-        $('input.localized_date', context).datepicker({
-            dateFormat: window.overrideDateInputFormat, constrainInput: false, /* showOn: 'button', */ firstDay: 1
-        });
-    } else {
-        $('input.localized_date', context).datepicker({
-            constrainInput: false, /* showOn: 'button', */ firstDay: 1
-        });
-    }
-
-}
-function initFriendlyDateChooser(id) {
-    $('#' + id).datepicker({
-        dateFormat: 'd M yy', constrainInput: false, /* showOn: 'button', */ firstDay: 1
-    });
-}
-function initLocalizedDateChooser(id) {
-    if(window.overrideDateInputFormat && window.overrideDateInputFormat !='') {
-        $('#' + id).datepicker({
-            dateFormat: window.overrideDateInputFormat, constrainInput: false, /* showOn: 'button', */ firstDay: 1
-        });
-    } else {
-        $('#' + id).datepicker({
-            constrainInput: false, /* showOn: 'button', */ firstDay: 1
-        });
-    }
-
 }
 
-function initTimeChoosers(context) {
-    $('input.friendly_time', context).timepicker({
-        timeFormat: 'g.ia'
-    });
-    $('input.localized_time', context).timepicker({
-        timeFormat: 'H:i', maxTime: '23:59'
-    });
-}
-function initFriendlyTimeChooser(id) {
-    $('#' + id).timepicker({
-        timeFormat: 'g.ia'
+function initTimeChooser(id) {
+    $('#' + id).datetimepicker({
+        datepicker: false,
+        format: 'H:i'
     });
 }
-function initLocalizedTimeChooser(id) {
-    $('#' + id).timepicker({
-        timeFormat: 'H:i', maxTime: '23:59'
+
+function initDateTimeChooser(id) {
+    $('#' + id).datetimepicker({
+        format: 'Y-m-d H:i'
     });
 }
 
@@ -309,8 +276,6 @@ function initCollapsibleBlocks(){
 }
 
 $(function() {
-    initDateChoosers();
-    initTimeChoosers();
     initSlugAutoPopulate();
     initSlugCleaning();
     initErrorDetection();
diff --git a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
index a1b45f6d0fb..00732ee4187 100644
--- a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
+++ b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
@@ -4,27 +4,16 @@
 {% block titletag %}{% blocktrans with form_title=form_page.title|capfirst %}Submissions of {{ form_title }}{% endblocktrans %}{% endblock %}
 {% block bodyclass %}menu-snippets{% endblock %}
 {% block extra_js %}
-    {% get_localized_datepicker_js %}
-    {% get_date_format_override as format_override %}
-    
     <script>
-        window.overrideDateInputFormat ='{{ format_override }}';
         $(function() {
-            if(window.overrideDateInputFormat && window.overrideDateInputFormat !='') {
-                $('#id_date_from').datepicker({
-                    dateFormat: window.overrideDateInputFormat, constrainInput: false, /* showOn: 'button', */ firstDay: 1
-                });
-                $('#id_date_to').datepicker({
-                    dateFormat: window.overrideDateInputFormat, constrainInput: false, /* showOn: 'button', */ firstDay: 1
-                });
-            } else {
-                $('#id_date_from').datepicker({
-                    constrainInput: false, /* showOn: 'button', */ firstDay: 1
-                });
-                $('#id_date_to').datepicker({
-                    constrainInput: false, /* showOn: 'button', */ firstDay: 1
-                });
-            }
+            $('#id_date_from').datetimepicker({
+                timepicker: false,
+                format: 'Y-m-d'
+            });
+            $('#id_date_to').datetimepicker({
+                timepicker: false,
+                format: 'Y-m-d'
+            });
         });
     </script>
 {% endblock %}

From 99a70b3d9d0df6d5f96a4b2c93aba8cfca4c9a73 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 3 Jun 2014 15:06:41 +0100
Subject: [PATCH 044/293] Removed jQueryUI datetimepicker

---
 .../js/vendor/i18n/jquery.ui.datepicker-af.js | 23 -------
 .../vendor/i18n/jquery.ui.datepicker-ar-DZ.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-ar.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-az.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-be.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-bg.js | 24 -------
 .../js/vendor/i18n/jquery.ui.datepicker-bs.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-ca.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-cs.js | 23 -------
 .../vendor/i18n/jquery.ui.datepicker-cy-GB.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-da.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-de.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-el.js | 23 -------
 .../vendor/i18n/jquery.ui.datepicker-en-AU.js | 23 -------
 .../vendor/i18n/jquery.ui.datepicker-en-GB.js | 23 -------
 .../vendor/i18n/jquery.ui.datepicker-en-NZ.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-eo.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-es.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-et.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-eu.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-fa.js | 59 ----------------
 .../js/vendor/i18n/jquery.ui.datepicker-fi.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-fo.js | 23 -------
 .../vendor/i18n/jquery.ui.datepicker-fr-CA.js | 23 -------
 .../vendor/i18n/jquery.ui.datepicker-fr-CH.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-fr.js | 25 -------
 .../js/vendor/i18n/jquery.ui.datepicker-gl.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-he.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-hi.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-hr.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-hu.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-hy.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-id.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-is.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-it.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-ja.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-ka.js | 21 ------
 .../js/vendor/i18n/jquery.ui.datepicker-kk.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-km.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-ko.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-ky.js | 24 -------
 .../js/vendor/i18n/jquery.ui.datepicker-lb.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-lt.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-lv.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-mk.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-ml.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-ms.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-nb.js | 22 ------
 .../vendor/i18n/jquery.ui.datepicker-nl-BE.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-nl.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-nn.js | 22 ------
 .../js/vendor/i18n/jquery.ui.datepicker-no.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-pl.js | 23 -------
 .../vendor/i18n/jquery.ui.datepicker-pt-BR.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-pt.js | 22 ------
 .../js/vendor/i18n/jquery.ui.datepicker-rm.js | 21 ------
 .../js/vendor/i18n/jquery.ui.datepicker-ro.js | 26 -------
 .../js/vendor/i18n/jquery.ui.datepicker-ru.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-sk.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-sl.js | 24 -------
 .../js/vendor/i18n/jquery.ui.datepicker-sq.js | 23 -------
 .../vendor/i18n/jquery.ui.datepicker-sr-SR.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-sr.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-sv.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-ta.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-th.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-tj.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-tr.js | 23 -------
 .../js/vendor/i18n/jquery.ui.datepicker-uk.js | 24 -------
 .../js/vendor/i18n/jquery.ui.datepicker-vi.js | 23 -------
 .../vendor/i18n/jquery.ui.datepicker-zh-CN.js | 23 -------
 .../vendor/i18n/jquery.ui.datepicker-zh-HK.js | 23 -------
 .../vendor/i18n/jquery.ui.datepicker-zh-TW.js | 23 -------
 .../js/vendor/jquery.timepicker.min.js        |  1 -
 .../scss/vendor/jquery.timepicker.css         | 67 -------------------
 .../templates/wagtailadmin/admin_base.html    |  2 -
 .../wagtailadmin/pages/_editor_js.html        |  8 ---
 wagtail/wagtailadmin/templatetags/localize.py | 62 -----------------
 78 files changed, 1857 deletions(-)
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-af.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ar-DZ.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ar.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-az.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-be.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-bg.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-bs.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ca.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-cs.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-cy-GB.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-da.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-de.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-el.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-en-AU.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-en-GB.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-en-NZ.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-eo.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-es.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-et.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-eu.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fa.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fi.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fo.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fr-CA.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fr-CH.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fr.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-gl.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-he.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-hi.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-hr.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-hu.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-hy.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-id.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-is.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-it.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ja.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ka.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-kk.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-km.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ko.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ky.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-lb.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-lt.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-lv.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-mk.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ml.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ms.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-nb.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-nl-BE.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-nl.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-nn.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-no.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-pl.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-pt-BR.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-pt.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-rm.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ro.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ru.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sk.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sl.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sq.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sr-SR.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sr.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sv.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ta.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-th.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-tj.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-tr.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-uk.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-vi.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-zh-CN.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-zh-HK.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-zh-TW.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery.timepicker.min.js
 delete mode 100755 wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery.timepicker.css
 delete mode 100644 wagtail/wagtailadmin/templatetags/localize.py

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-af.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-af.js
deleted file mode 100644
index 0922ef7a1c0..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-af.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Afrikaans initialisation for the jQuery UI date picker plugin. */
-/* Written by Renier Pretorius. */
-jQuery(function($){
-	$.datepicker.regional['af'] = {
-		closeText: 'Selekteer',
-		prevText: 'Vorige',
-		nextText: 'Volgende',
-		currentText: 'Vandag',
-		monthNames: ['Januarie','Februarie','Maart','April','Mei','Junie',
-		'Julie','Augustus','September','Oktober','November','Desember'],
-		monthNamesShort: ['Jan', 'Feb', 'Mrt', 'Apr', 'Mei', 'Jun',
-		'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Des'],
-		dayNames: ['Sondag', 'Maandag', 'Dinsdag', 'Woensdag', 'Donderdag', 'Vrydag', 'Saterdag'],
-		dayNamesShort: ['Son', 'Maa', 'Din', 'Woe', 'Don', 'Vry', 'Sat'],
-		dayNamesMin: ['So','Ma','Di','Wo','Do','Vr','Sa'],
-		weekHeader: 'Wk',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['af']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ar-DZ.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ar-DZ.js
deleted file mode 100644
index 7b175af40ea..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ar-DZ.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Algerian Arabic Translation for jQuery UI date picker plugin. (can be used for Tunisia)*/
-/* Mohamed Cherif BOUCHELAGHEM -- cherifbouchelaghem@yahoo.fr */
-
-jQuery(function($){
-	$.datepicker.regional['ar-DZ'] = {
-		closeText: 'إغلاق',
-		prevText: '&#x3C;السابق',
-		nextText: 'التالي&#x3E;',
-		currentText: 'اليوم',
-		monthNames: ['جانفي', 'فيفري', 'مارس', 'أفريل', 'ماي', 'جوان',
-		'جويلية', 'أوت', 'سبتمبر','أكتوبر', 'نوفمبر', 'ديسمبر'],
-		monthNamesShort: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-		dayNames: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
-		dayNamesShort: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
-		dayNamesMin: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
-		weekHeader: 'أسبوع',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 6,
-  		isRTL: true,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['ar-DZ']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ar.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ar.js
deleted file mode 100644
index cef0f08fd2d..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ar.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Arabic Translation for jQuery UI date picker plugin. */
-/* Khaled Alhourani -- me@khaledalhourani.com */
-/* NOTE: monthNames are the original months names and they are the Arabic names, not the new months name فبراير - يناير and there isn't any Arabic roots for these months */
-jQuery(function($){
-	$.datepicker.regional['ar'] = {
-		closeText: 'إغلاق',
-		prevText: '&#x3C;السابق',
-		nextText: 'التالي&#x3E;',
-		currentText: 'اليوم',
-		monthNames: ['كانون الثاني', 'شباط', 'آذار', 'نيسان', 'مايو', 'حزيران',
-		'تموز', 'آب', 'أيلول',	'تشرين الأول', 'تشرين الثاني', 'كانون الأول'],
-		monthNamesShort: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-		dayNames: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
-		dayNamesShort: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
-		dayNamesMin: ['ح', 'ن', 'ث', 'ر', 'خ', 'ج', 'س'],
-		weekHeader: 'أسبوع',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 6,
-  		isRTL: true,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['ar']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-az.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-az.js
deleted file mode 100644
index a133a9eb234..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-az.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Azerbaijani (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Jamil Najafov (necefov33@gmail.com). */
-jQuery(function($) {
-	$.datepicker.regional['az'] = {
-		closeText: 'Bağla',
-		prevText: '&#x3C;Geri',
-		nextText: 'İrəli&#x3E;',
-		currentText: 'Bugün',
-		monthNames: ['Yanvar','Fevral','Mart','Aprel','May','İyun',
-		'İyul','Avqust','Sentyabr','Oktyabr','Noyabr','Dekabr'],
-		monthNamesShort: ['Yan','Fev','Mar','Apr','May','İyun',
-		'İyul','Avq','Sen','Okt','Noy','Dek'],
-		dayNames: ['Bazar','Bazar ertəsi','Çərşənbə axşamı','Çərşənbə','Cümə axşamı','Cümə','Şənbə'],
-		dayNamesShort: ['B','Be','Ça','Ç','Ca','C','Ş'],
-		dayNamesMin: ['B','B','Ç','С','Ç','C','Ş'],
-		weekHeader: 'Hf',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['az']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-be.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-be.js
deleted file mode 100644
index 6ea12f72561..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-be.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Belarusian initialisation for the jQuery UI date picker plugin. */
-/* Written by Pavel Selitskas <p.selitskas@gmail.com> */
-jQuery(function($){
-	$.datepicker.regional['be'] = {
-		closeText: 'Зачыніць',
-		prevText: '&larr;Папяр.',
-		nextText: 'Наст.&rarr;',
-		currentText: 'Сёньня',
-		monthNames: ['Студзень','Люты','Сакавік','Красавік','Травень','Чэрвень',
-		'Ліпень','Жнівень','Верасень','Кастрычнік','Лістапад','Сьнежань'],
-		monthNamesShort: ['Сту','Лют','Сак','Кра','Тра','Чэр',
-		'Ліп','Жні','Вер','Кас','Ліс','Сьн'],
-		dayNames: ['нядзеля','панядзелак','аўторак','серада','чацьвер','пятніца','субота'],
-		dayNamesShort: ['ндз','пнд','аўт','срд','чцв','птн','сбт'],
-		dayNamesMin: ['Нд','Пн','Аў','Ср','Чц','Пт','Сб'],
-		weekHeader: 'Тд',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['be']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-bg.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-bg.js
deleted file mode 100644
index 86ab885828b..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-bg.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Bulgarian initialisation for the jQuery UI date picker plugin. */
-/* Written by Stoyan Kyosev (http://svest.org). */
-jQuery(function($){
-	$.datepicker.regional['bg'] = {
-		closeText: 'затвори',
-		prevText: '&#x3C;назад',
-		nextText: 'напред&#x3E;',
-		nextBigText: '&#x3E;&#x3E;',
-		currentText: 'днес',
-		monthNames: ['Януари','Февруари','Март','Април','Май','Юни',
-		'Юли','Август','Септември','Октомври','Ноември','Декември'],
-		monthNamesShort: ['Яну','Фев','Мар','Апр','Май','Юни',
-		'Юли','Авг','Сеп','Окт','Нов','Дек'],
-		dayNames: ['Неделя','Понеделник','Вторник','Сряда','Четвъртък','Петък','Събота'],
-		dayNamesShort: ['Нед','Пон','Вто','Сря','Чет','Пет','Съб'],
-		dayNamesMin: ['Не','По','Вт','Ср','Че','Пе','Съ'],
-		weekHeader: 'Wk',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['bg']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-bs.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-bs.js
deleted file mode 100644
index f08870ffe36..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-bs.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Bosnian i18n for the jQuery UI date picker plugin. */
-/* Written by Kenan Konjo. */
-jQuery(function($){
-	$.datepicker.regional['bs'] = {
-		closeText: 'Zatvori',
-		prevText: '&#x3C;',
-		nextText: '&#x3E;',
-		currentText: 'Danas',
-		monthNames: ['Januar','Februar','Mart','April','Maj','Juni',
-		'Juli','August','Septembar','Oktobar','Novembar','Decembar'],
-		monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
-		'Jul','Aug','Sep','Okt','Nov','Dec'],
-		dayNames: ['Nedelja','Ponedeljak','Utorak','Srijeda','Četvrtak','Petak','Subota'],
-		dayNamesShort: ['Ned','Pon','Uto','Sri','Čet','Pet','Sub'],
-		dayNamesMin: ['Ne','Po','Ut','Sr','Če','Pe','Su'],
-		weekHeader: 'Wk',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['bs']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ca.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ca.js
deleted file mode 100644
index a10b549c28c..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ca.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Inicialització en català per a l'extensió 'UI date picker' per jQuery. */
-/* Writers: (joan.leon@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['ca'] = {
-		closeText: 'Tanca',
-		prevText: 'Anterior',
-		nextText: 'Següent',
-		currentText: 'Avui',
-		monthNames: ['gener','febrer','març','abril','maig','juny',
-		'juliol','agost','setembre','octubre','novembre','desembre'],
-		monthNamesShort: ['gen','feb','març','abr','maig','juny',
-		'jul','ag','set','oct','nov','des'],
-		dayNames: ['diumenge','dilluns','dimarts','dimecres','dijous','divendres','dissabte'],
-		dayNamesShort: ['dg','dl','dt','dc','dj','dv','ds'],
-		dayNamesMin: ['dg','dl','dt','dc','dj','dv','ds'],
-		weekHeader: 'Set',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['ca']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-cs.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-cs.js
deleted file mode 100644
index b96b1a51c2d..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-cs.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Czech initialisation for the jQuery UI date picker plugin. */
-/* Written by Tomas Muller (tomas@tomas-muller.net). */
-jQuery(function($){
-	$.datepicker.regional['cs'] = {
-		closeText: 'Zavřít',
-		prevText: '&#x3C;Dříve',
-		nextText: 'Později&#x3E;',
-		currentText: 'Nyní',
-		monthNames: ['leden','únor','březen','duben','květen','červen',
-		'červenec','srpen','září','říjen','listopad','prosinec'],
-		monthNamesShort: ['led','úno','bře','dub','kvě','čer',
-		'čvc','srp','zář','říj','lis','pro'],
-		dayNames: ['neděle', 'pondělí', 'úterý', 'středa', 'čtvrtek', 'pátek', 'sobota'],
-		dayNamesShort: ['ne', 'po', 'út', 'st', 'čt', 'pá', 'so'],
-		dayNamesMin: ['ne','po','út','st','čt','pá','so'],
-		weekHeader: 'Týd',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['cs']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-cy-GB.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-cy-GB.js
deleted file mode 100644
index cf3a38e6cd3..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-cy-GB.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Welsh/UK initialisation for the jQuery UI date picker plugin. */
-/* Written by William Griffiths. */
-jQuery(function($){
-	$.datepicker.regional['cy-GB'] = {
-		closeText: 'Done',
-		prevText: 'Prev',
-		nextText: 'Next',
-		currentText: 'Today',
-		monthNames: ['Ionawr','Chwefror','Mawrth','Ebrill','Mai','Mehefin',
-		'Gorffennaf','Awst','Medi','Hydref','Tachwedd','Rhagfyr'],
-		monthNamesShort: ['Ion', 'Chw', 'Maw', 'Ebr', 'Mai', 'Meh',
-		'Gor', 'Aws', 'Med', 'Hyd', 'Tac', 'Rha'],
-		dayNames: ['Dydd Sul', 'Dydd Llun', 'Dydd Mawrth', 'Dydd Mercher', 'Dydd Iau', 'Dydd Gwener', 'Dydd Sadwrn'],
-		dayNamesShort: ['Sul', 'Llu', 'Maw', 'Mer', 'Iau', 'Gwe', 'Sad'],
-		dayNamesMin: ['Su','Ll','Ma','Me','Ia','Gw','Sa'],
-		weekHeader: 'Wy',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['cy-GB']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-da.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-da.js
deleted file mode 100644
index 7e42948b344..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-da.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Danish initialisation for the jQuery UI date picker plugin. */
-/* Written by Jan Christensen ( deletestuff@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['da'] = {
-		closeText: 'Luk',
-		prevText: '&#x3C;Forrige',
-		nextText: 'Næste&#x3E;',
-		currentText: 'Idag',
-		monthNames: ['Januar','Februar','Marts','April','Maj','Juni',
-		'Juli','August','September','Oktober','November','December'],
-		monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
-		'Jul','Aug','Sep','Okt','Nov','Dec'],
-		dayNames: ['Søndag','Mandag','Tirsdag','Onsdag','Torsdag','Fredag','Lørdag'],
-		dayNamesShort: ['Søn','Man','Tir','Ons','Tor','Fre','Lør'],
-		dayNamesMin: ['Sø','Ma','Ti','On','To','Fr','Lø'],
-		weekHeader: 'Uge',
-		dateFormat: 'dd-mm-yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['da']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-de.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-de.js
deleted file mode 100644
index abe75c4e429..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-de.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* German initialisation for the jQuery UI date picker plugin. */
-/* Written by Milian Wolff (mail@milianw.de). */
-jQuery(function($){
-	$.datepicker.regional['de'] = {
-		closeText: 'Schließen',
-		prevText: '&#x3C;Zurück',
-		nextText: 'Vor&#x3E;',
-		currentText: 'Heute',
-		monthNames: ['Januar','Februar','März','April','Mai','Juni',
-		'Juli','August','September','Oktober','November','Dezember'],
-		monthNamesShort: ['Jan','Feb','Mär','Apr','Mai','Jun',
-		'Jul','Aug','Sep','Okt','Nov','Dez'],
-		dayNames: ['Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag'],
-		dayNamesShort: ['So','Mo','Di','Mi','Do','Fr','Sa'],
-		dayNamesMin: ['So','Mo','Di','Mi','Do','Fr','Sa'],
-		weekHeader: 'KW',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['de']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-el.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-el.js
deleted file mode 100644
index 1ac47561a41..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-el.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Greek (el) initialisation for the jQuery UI date picker plugin. */
-/* Written by Alex Cicovic (http://www.alexcicovic.com) */
-jQuery(function($){
-	$.datepicker.regional['el'] = {
-		closeText: 'Κλείσιμο',
-		prevText: 'Προηγούμενος',
-		nextText: 'Επόμενος',
-		currentText: 'Τρέχων Μήνας',
-		monthNames: ['Ιανουάριος','Φεβρουάριος','Μάρτιος','Απρίλιος','Μάιος','Ιούνιος',
-		'Ιούλιος','Αύγουστος','Σεπτέμβριος','Οκτώβριος','Νοέμβριος','Δεκέμβριος'],
-		monthNamesShort: ['Ιαν','Φεβ','Μαρ','Απρ','Μαι','Ιουν',
-		'Ιουλ','Αυγ','Σεπ','Οκτ','Νοε','Δεκ'],
-		dayNames: ['Κυριακή','Δευτέρα','Τρίτη','Τετάρτη','Πέμπτη','Παρασκευή','Σάββατο'],
-		dayNamesShort: ['Κυρ','Δευ','Τρι','Τετ','Πεμ','Παρ','Σαβ'],
-		dayNamesMin: ['Κυ','Δε','Τρ','Τε','Πε','Πα','Σα'],
-		weekHeader: 'Εβδ',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['el']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-en-AU.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-en-AU.js
deleted file mode 100644
index c1a1020a140..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-en-AU.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* English/Australia initialisation for the jQuery UI date picker plugin. */
-/* Based on the en-GB initialisation. */
-jQuery(function($){
-	$.datepicker.regional['en-AU'] = {
-		closeText: 'Done',
-		prevText: 'Prev',
-		nextText: 'Next',
-		currentText: 'Today',
-		monthNames: ['January','February','March','April','May','June',
-		'July','August','September','October','November','December'],
-		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-		'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
-		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
-		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
-		dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
-		weekHeader: 'Wk',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['en-AU']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-en-GB.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-en-GB.js
deleted file mode 100644
index 16a096e758a..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-en-GB.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* English/UK initialisation for the jQuery UI date picker plugin. */
-/* Written by Stuart. */
-jQuery(function($){
-	$.datepicker.regional['en-GB'] = {
-		closeText: 'Done',
-		prevText: 'Prev',
-		nextText: 'Next',
-		currentText: 'Today',
-		monthNames: ['January','February','March','April','May','June',
-		'July','August','September','October','November','December'],
-		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-		'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
-		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
-		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
-		dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
-		weekHeader: 'Wk',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['en-GB']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-en-NZ.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-en-NZ.js
deleted file mode 100644
index 7819df05286..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-en-NZ.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* English/New Zealand initialisation for the jQuery UI date picker plugin. */
-/* Based on the en-GB initialisation. */
-jQuery(function($){
-	$.datepicker.regional['en-NZ'] = {
-		closeText: 'Done',
-		prevText: 'Prev',
-		nextText: 'Next',
-		currentText: 'Today',
-		monthNames: ['January','February','March','April','May','June',
-		'July','August','September','October','November','December'],
-		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-		'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
-		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
-		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
-		dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
-		weekHeader: 'Wk',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['en-NZ']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-eo.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-eo.js
deleted file mode 100644
index 39e44fc57c1..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-eo.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Esperanto initialisation for the jQuery UI date picker plugin. */
-/* Written by Olivier M. (olivierweb@ifrance.com). */
-jQuery(function($){
-	$.datepicker.regional['eo'] = {
-		closeText: 'Fermi',
-		prevText: '&#x3C;Anta',
-		nextText: 'Sekv&#x3E;',
-		currentText: 'Nuna',
-		monthNames: ['Januaro','Februaro','Marto','Aprilo','Majo','Junio',
-		'Julio','Aŭgusto','Septembro','Oktobro','Novembro','Decembro'],
-		monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
-		'Jul','Aŭg','Sep','Okt','Nov','Dec'],
-		dayNames: ['Dimanĉo','Lundo','Mardo','Merkredo','Ĵaŭdo','Vendredo','Sabato'],
-		dayNamesShort: ['Dim','Lun','Mar','Mer','Ĵaŭ','Ven','Sab'],
-		dayNamesMin: ['Di','Lu','Ma','Me','Ĵa','Ve','Sa'],
-		weekHeader: 'Sb',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 0,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['eo']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-es.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-es.js
deleted file mode 100644
index 97a2d6ead7d..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-es.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Inicialización en español para la extensión 'UI date picker' para jQuery. */
-/* Traducido por Vester (xvester@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['es'] = {
-		closeText: 'Cerrar',
-		prevText: '&#x3C;Ant',
-		nextText: 'Sig&#x3E;',
-		currentText: 'Hoy',
-		monthNames: ['Enero','Febrero','Marzo','Abril','Mayo','Junio',
-		'Julio','Agosto','Septiembre','Octubre','Noviembre','Diciembre'],
-		monthNamesShort: ['Ene','Feb','Mar','Abr','May','Jun',
-		'Jul','Ago','Sep','Oct','Nov','Dic'],
-		dayNames: ['Domingo','Lunes','Martes','Miércoles','Jueves','Viernes','Sábado'],
-		dayNamesShort: ['Dom','Lun','Mar','Mié','Juv','Vie','Sáb'],
-		dayNamesMin: ['Do','Lu','Ma','Mi','Ju','Vi','Sá'],
-		weekHeader: 'Sm',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['es']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-et.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-et.js
deleted file mode 100644
index 62cbea8fa86..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-et.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Estonian initialisation for the jQuery UI date picker plugin. */
-/* Written by Mart Sõmermaa (mrts.pydev at gmail com). */
-jQuery(function($){
-	$.datepicker.regional['et'] = {
-		closeText: 'Sulge',
-		prevText: 'Eelnev',
-		nextText: 'Järgnev',
-		currentText: 'Täna',
-		monthNames: ['Jaanuar','Veebruar','Märts','Aprill','Mai','Juuni',
-		'Juuli','August','September','Oktoober','November','Detsember'],
-		monthNamesShort: ['Jaan', 'Veebr', 'Märts', 'Apr', 'Mai', 'Juuni',
-		'Juuli', 'Aug', 'Sept', 'Okt', 'Nov', 'Dets'],
-		dayNames: ['Pühapäev', 'Esmaspäev', 'Teisipäev', 'Kolmapäev', 'Neljapäev', 'Reede', 'Laupäev'],
-		dayNamesShort: ['Pühap', 'Esmasp', 'Teisip', 'Kolmap', 'Neljap', 'Reede', 'Laup'],
-		dayNamesMin: ['P','E','T','K','N','R','L'],
-		weekHeader: 'näd',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['et']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-eu.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-eu.js
deleted file mode 100644
index a71db2c721c..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-eu.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Euskarako oinarria 'UI date picker' jquery-ko extentsioarentzat */
-/* Karrikas-ek itzulia (karrikas@karrikas.com) */
-jQuery(function($){
-	$.datepicker.regional['eu'] = {
-		closeText: 'Egina',
-		prevText: '&#x3C;Aur',
-		nextText: 'Hur&#x3E;',
-		currentText: 'Gaur',
-		monthNames: ['urtarrila','otsaila','martxoa','apirila','maiatza','ekaina',
-			'uztaila','abuztua','iraila','urria','azaroa','abendua'],
-		monthNamesShort: ['urt.','ots.','mar.','api.','mai.','eka.',
-			'uzt.','abu.','ira.','urr.','aza.','abe.'],
-		dayNames: ['igandea','astelehena','asteartea','asteazkena','osteguna','ostirala','larunbata'],
-		dayNamesShort: ['ig.','al.','ar.','az.','og.','ol.','lr.'],
-		dayNamesMin: ['ig','al','ar','az','og','ol','lr'],
-		weekHeader: 'As',
-		dateFormat: 'yy-mm-dd',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['eu']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fa.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fa.js
deleted file mode 100644
index bb957f6d8d0..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fa.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Persian (Farsi) Translation for the jQuery UI date picker plugin. */
-/* Javad Mowlanezhad -- jmowla@gmail.com */
-/* Jalali calendar should supported soon! (Its implemented but I have to test it) */
-jQuery(function($) {
-	$.datepicker.regional['fa'] = {
-		closeText: 'بستن',
-		prevText: '&#x3C;قبلی',
-		nextText: 'بعدی&#x3E;',
-		currentText: 'امروز',
-		monthNames: [
-			'فروردين',
-			'ارديبهشت',
-			'خرداد',
-			'تير',
-			'مرداد',
-			'شهريور',
-			'مهر',
-			'آبان',
-			'آذر',
-			'دی',
-			'بهمن',
-			'اسفند'
-		],
-		monthNamesShort: ['1','2','3','4','5','6','7','8','9','10','11','12'],
-		dayNames: [
-			'يکشنبه',
-			'دوشنبه',
-			'سه‌شنبه',
-			'چهارشنبه',
-			'پنجشنبه',
-			'جمعه',
-			'شنبه'
-		],
-		dayNamesShort: [
-			'ی',
-			'د',
-			'س',
-			'چ',
-			'پ',
-			'ج',
-			'ش'
-		],
-		dayNamesMin: [
-			'ی',
-			'د',
-			'س',
-			'چ',
-			'پ',
-			'ج',
-			'ش'
-		],
-		weekHeader: 'هف',
-		dateFormat: 'yy/mm/dd',
-		firstDay: 6,
-		isRTL: true,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['fa']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fi.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fi.js
deleted file mode 100644
index bd6d99498be..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fi.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Finnish initialisation for the jQuery UI date picker plugin. */
-/* Written by Harri Kilpiö (harrikilpio@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['fi'] = {
-		closeText: 'Sulje',
-		prevText: '&#xAB;Edellinen',
-		nextText: 'Seuraava&#xBB;',
-		currentText: 'Tänään',
-		monthNames: ['Tammikuu','Helmikuu','Maaliskuu','Huhtikuu','Toukokuu','Kesäkuu',
-		'Heinäkuu','Elokuu','Syyskuu','Lokakuu','Marraskuu','Joulukuu'],
-		monthNamesShort: ['Tammi','Helmi','Maalis','Huhti','Touko','Kesä',
-		'Heinä','Elo','Syys','Loka','Marras','Joulu'],
-		dayNamesShort: ['Su','Ma','Ti','Ke','To','Pe','La'],
-		dayNames: ['Sunnuntai','Maanantai','Tiistai','Keskiviikko','Torstai','Perjantai','Lauantai'],
-		dayNamesMin: ['Su','Ma','Ti','Ke','To','Pe','La'],
-		weekHeader: 'Vk',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['fi']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fo.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fo.js
deleted file mode 100644
index cb0e3def70f..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fo.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Faroese initialisation for the jQuery UI date picker plugin */
-/* Written by Sverri Mohr Olsen, sverrimo@gmail.com */
-jQuery(function($){
-	$.datepicker.regional['fo'] = {
-		closeText: 'Lat aftur',
-		prevText: '&#x3C;Fyrra',
-		nextText: 'Næsta&#x3E;',
-		currentText: 'Í dag',
-		monthNames: ['Januar','Februar','Mars','Apríl','Mei','Juni',
-		'Juli','August','September','Oktober','November','Desember'],
-		monthNamesShort: ['Jan','Feb','Mar','Apr','Mei','Jun',
-		'Jul','Aug','Sep','Okt','Nov','Des'],
-		dayNames: ['Sunnudagur','Mánadagur','Týsdagur','Mikudagur','Hósdagur','Fríggjadagur','Leyardagur'],
-		dayNamesShort: ['Sun','Mán','Týs','Mik','Hós','Frí','Ley'],
-		dayNamesMin: ['Su','Má','Tý','Mi','Hó','Fr','Le'],
-		weekHeader: 'Vk',
-		dateFormat: 'dd-mm-yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['fo']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fr-CA.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fr-CA.js
deleted file mode 100644
index e2082218540..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fr-CA.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Canadian-French initialisation for the jQuery UI date picker plugin. */
-jQuery(function ($) {
-	$.datepicker.regional['fr-CA'] = {
-		closeText: 'Fermer',
-		prevText: 'Précédent',
-		nextText: 'Suivant',
-		currentText: 'Aujourd\'hui',
-		monthNames: ['janvier', 'février', 'mars', 'avril', 'mai', 'juin',
-			'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'],
-		monthNamesShort: ['janv.', 'févr.', 'mars', 'avril', 'mai', 'juin',
-			'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.'],
-		dayNames: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'],
-		dayNamesShort: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
-		dayNamesMin: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
-		weekHeader: 'Sem.',
-		dateFormat: 'yy-mm-dd',
-		firstDay: 0,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''
-	};
-	$.datepicker.setDefaults($.datepicker.regional['fr-CA']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fr-CH.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fr-CH.js
deleted file mode 100644
index e574537b051..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fr-CH.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Swiss-French initialisation for the jQuery UI date picker plugin. */
-/* Written Martin Voelkle (martin.voelkle@e-tc.ch). */
-jQuery(function($){
-	$.datepicker.regional['fr-CH'] = {
-		closeText: 'Fermer',
-		prevText: '&#x3C;Préc',
-		nextText: 'Suiv&#x3E;',
-		currentText: 'Courant',
-		monthNames: ['Janvier','Février','Mars','Avril','Mai','Juin',
-		'Juillet','Août','Septembre','Octobre','Novembre','Décembre'],
-		monthNamesShort: ['Jan','Fév','Mar','Avr','Mai','Jun',
-		'Jul','Aoû','Sep','Oct','Nov','Déc'],
-		dayNames: ['Dimanche','Lundi','Mardi','Mercredi','Jeudi','Vendredi','Samedi'],
-		dayNamesShort: ['Dim','Lun','Mar','Mer','Jeu','Ven','Sam'],
-		dayNamesMin: ['Di','Lu','Ma','Me','Je','Ve','Sa'],
-		weekHeader: 'Sm',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['fr-CH']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fr.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fr.js
deleted file mode 100644
index 934afd1d023..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-fr.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/* French initialisation for the jQuery UI date picker plugin. */
-/* Written by Keith Wood (kbwood{at}iinet.com.au),
-			  Stéphane Nahmani (sholby@sholby.net),
-			  Stéphane Raimbault <stephane.raimbault@gmail.com> */
-jQuery(function($){
-	$.datepicker.regional['fr'] = {
-		closeText: 'Fermer',
-		prevText: 'Précédent',
-		nextText: 'Suivant',
-		currentText: 'Aujourd\'hui',
-		monthNames: ['Janvier','Février','Mars','Avril','Mai','Juin',
-		'Juillet','Août','Septembre','Octobre','Novembre','Décembre'],
-		monthNamesShort: ['Janv.','Févr.','Mars','Avril','Mai','Juin',
-		'Juil.','Août','Sept.','Oct.','Nov.','Déc.'],
-		dayNames: ['Dimanche','Lundi','Mardi','Mercredi','Jeudi','Vendredi','Samedi'],
-		dayNamesShort: ['Dim.','Lun.','Mar.','Mer.','Jeu.','Ven.','Sam.'],
-		dayNamesMin: ['D','L','M','M','J','V','S'],
-		weekHeader: 'Sem.',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['fr']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-gl.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-gl.js
deleted file mode 100644
index 59b989a6dd4..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-gl.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Galician localization for 'UI date picker' jQuery extension. */
-/* Translated by Jorge Barreiro <yortx.barry@gmail.com>. */
-jQuery(function($){
-	$.datepicker.regional['gl'] = {
-		closeText: 'Pechar',
-		prevText: '&#x3C;Ant',
-		nextText: 'Seg&#x3E;',
-		currentText: 'Hoxe',
-		monthNames: ['Xaneiro','Febreiro','Marzo','Abril','Maio','Xuño',
-		'Xullo','Agosto','Setembro','Outubro','Novembro','Decembro'],
-		monthNamesShort: ['Xan','Feb','Mar','Abr','Mai','Xuñ',
-		'Xul','Ago','Set','Out','Nov','Dec'],
-		dayNames: ['Domingo','Luns','Martes','Mércores','Xoves','Venres','Sábado'],
-		dayNamesShort: ['Dom','Lun','Mar','Mér','Xov','Ven','Sáb'],
-		dayNamesMin: ['Do','Lu','Ma','Mé','Xo','Ve','Sá'],
-		weekHeader: 'Sm',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['gl']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-he.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-he.js
deleted file mode 100644
index b9e8deec5fd..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-he.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Hebrew initialisation for the UI Datepicker extension. */
-/* Written by Amir Hardon (ahardon at gmail dot com). */
-jQuery(function($){
-	$.datepicker.regional['he'] = {
-		closeText: 'סגור',
-		prevText: '&#x3C;הקודם',
-		nextText: 'הבא&#x3E;',
-		currentText: 'היום',
-		monthNames: ['ינואר','פברואר','מרץ','אפריל','מאי','יוני',
-		'יולי','אוגוסט','ספטמבר','אוקטובר','נובמבר','דצמבר'],
-		monthNamesShort: ['ינו','פבר','מרץ','אפר','מאי','יוני',
-		'יולי','אוג','ספט','אוק','נוב','דצמ'],
-		dayNames: ['ראשון','שני','שלישי','רביעי','חמישי','שישי','שבת'],
-		dayNamesShort: ['א\'','ב\'','ג\'','ד\'','ה\'','ו\'','שבת'],
-		dayNamesMin: ['א\'','ב\'','ג\'','ד\'','ה\'','ו\'','שבת'],
-		weekHeader: 'Wk',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 0,
-		isRTL: true,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['he']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-hi.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-hi.js
deleted file mode 100644
index 6c563b99751..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-hi.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Hindi initialisation for the jQuery UI date picker plugin. */
-/* Written by Michael Dawart. */
-jQuery(function($){
-	$.datepicker.regional['hi'] = {
-		closeText: 'बंद',
-		prevText: 'पिछला',
-		nextText: 'अगला',
-		currentText: 'आज',
-		monthNames: ['जनवरी ','फरवरी','मार्च','अप्रेल','मई','जून',
-		'जूलाई','अगस्त ','सितम्बर','अक्टूबर','नवम्बर','दिसम्बर'],
-		monthNamesShort: ['जन', 'फर', 'मार्च', 'अप्रेल', 'मई', 'जून',
-		'जूलाई', 'अग', 'सित', 'अक्ट', 'नव', 'दि'],
-		dayNames: ['रविवार', 'सोमवार', 'मंगलवार', 'बुधवार', 'गुरुवार', 'शुक्रवार', 'शनिवार'],
-		dayNamesShort: ['रवि', 'सोम', 'मंगल', 'बुध', 'गुरु', 'शुक्र', 'शनि'],
-		dayNamesMin: ['रवि', 'सोम', 'मंगल', 'बुध', 'गुरु', 'शुक्र', 'शनि'],
-		weekHeader: 'हफ्ता',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['hi']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-hr.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-hr.js
deleted file mode 100644
index 2fe37b64b70..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-hr.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Croatian i18n for the jQuery UI date picker plugin. */
-/* Written by Vjekoslav Nesek. */
-jQuery(function($){
-	$.datepicker.regional['hr'] = {
-		closeText: 'Zatvori',
-		prevText: '&#x3C;',
-		nextText: '&#x3E;',
-		currentText: 'Danas',
-		monthNames: ['Siječanj','Veljača','Ožujak','Travanj','Svibanj','Lipanj',
-		'Srpanj','Kolovoz','Rujan','Listopad','Studeni','Prosinac'],
-		monthNamesShort: ['Sij','Velj','Ožu','Tra','Svi','Lip',
-		'Srp','Kol','Ruj','Lis','Stu','Pro'],
-		dayNames: ['Nedjelja','Ponedjeljak','Utorak','Srijeda','Četvrtak','Petak','Subota'],
-		dayNamesShort: ['Ned','Pon','Uto','Sri','Čet','Pet','Sub'],
-		dayNamesMin: ['Ne','Po','Ut','Sr','Če','Pe','Su'],
-		weekHeader: 'Tje',
-		dateFormat: 'dd.mm.yy.',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['hr']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-hu.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-hu.js
deleted file mode 100644
index b28c268c1c4..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-hu.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Hungarian initialisation for the jQuery UI date picker plugin. */
-/* Written by Istvan Karaszi (jquery@spam.raszi.hu). */
-jQuery(function($){
-	$.datepicker.regional['hu'] = {
-		closeText: 'bezár',
-		prevText: 'vissza',
-		nextText: 'előre',
-		currentText: 'ma',
-		monthNames: ['Január', 'Február', 'Március', 'Április', 'Május', 'Június',
-		'Július', 'Augusztus', 'Szeptember', 'Október', 'November', 'December'],
-		monthNamesShort: ['Jan', 'Feb', 'Már', 'Ápr', 'Máj', 'Jún',
-		'Júl', 'Aug', 'Szep', 'Okt', 'Nov', 'Dec'],
-		dayNames: ['Vasárnap', 'Hétfő', 'Kedd', 'Szerda', 'Csütörtök', 'Péntek', 'Szombat'],
-		dayNamesShort: ['Vas', 'Hét', 'Ked', 'Sze', 'Csü', 'Pén', 'Szo'],
-		dayNamesMin: ['V', 'H', 'K', 'Sze', 'Cs', 'P', 'Szo'],
-		weekHeader: 'Hét',
-		dateFormat: 'yy.mm.dd.',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: true,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['hu']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-hy.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-hy.js
deleted file mode 100644
index 6d4eca5556b..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-hy.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Armenian(UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Levon Zakaryan (levon.zakaryan@gmail.com)*/
-jQuery(function($){
-	$.datepicker.regional['hy'] = {
-		closeText: 'Փակել',
-		prevText: '&#x3C;Նախ.',
-		nextText: 'Հաջ.&#x3E;',
-		currentText: 'Այսօր',
-		monthNames: ['Հունվար','Փետրվար','Մարտ','Ապրիլ','Մայիս','Հունիս',
-		'Հուլիս','Օգոստոս','Սեպտեմբեր','Հոկտեմբեր','Նոյեմբեր','Դեկտեմբեր'],
-		monthNamesShort: ['Հունվ','Փետր','Մարտ','Ապր','Մայիս','Հունիս',
-		'Հուլ','Օգս','Սեպ','Հոկ','Նոյ','Դեկ'],
-		dayNames: ['կիրակի','եկուշաբթի','երեքշաբթի','չորեքշաբթի','հինգշաբթի','ուրբաթ','շաբաթ'],
-		dayNamesShort: ['կիր','երկ','երք','չրք','հնգ','ուրբ','շբթ'],
-		dayNamesMin: ['կիր','երկ','երք','չրք','հնգ','ուրբ','շբթ'],
-		weekHeader: 'ՇԲՏ',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['hy']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-id.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-id.js
deleted file mode 100644
index 6327fa60c78..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-id.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Indonesian initialisation for the jQuery UI date picker plugin. */
-/* Written by Deden Fathurahman (dedenf@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['id'] = {
-		closeText: 'Tutup',
-		prevText: '&#x3C;mundur',
-		nextText: 'maju&#x3E;',
-		currentText: 'hari ini',
-		monthNames: ['Januari','Februari','Maret','April','Mei','Juni',
-		'Juli','Agustus','September','Oktober','Nopember','Desember'],
-		monthNamesShort: ['Jan','Feb','Mar','Apr','Mei','Jun',
-		'Jul','Agus','Sep','Okt','Nop','Des'],
-		dayNames: ['Minggu','Senin','Selasa','Rabu','Kamis','Jumat','Sabtu'],
-		dayNamesShort: ['Min','Sen','Sel','Rab','kam','Jum','Sab'],
-		dayNamesMin: ['Mg','Sn','Sl','Rb','Km','jm','Sb'],
-		weekHeader: 'Mg',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 0,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['id']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-is.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-is.js
deleted file mode 100644
index 925341a7a5b..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-is.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Icelandic initialisation for the jQuery UI date picker plugin. */
-/* Written by Haukur H. Thorsson (haukur@eskill.is). */
-jQuery(function($){
-	$.datepicker.regional['is'] = {
-		closeText: 'Loka',
-		prevText: '&#x3C; Fyrri',
-		nextText: 'Næsti &#x3E;',
-		currentText: 'Í dag',
-		monthNames: ['Janúar','Febrúar','Mars','Apríl','Maí','Júní',
-		'Júlí','Ágúst','September','Október','Nóvember','Desember'],
-		monthNamesShort: ['Jan','Feb','Mar','Apr','Maí','Jún',
-		'Júl','Ágú','Sep','Okt','Nóv','Des'],
-		dayNames: ['Sunnudagur','Mánudagur','Þriðjudagur','Miðvikudagur','Fimmtudagur','Föstudagur','Laugardagur'],
-		dayNamesShort: ['Sun','Mán','Þri','Mið','Fim','Fös','Lau'],
-		dayNamesMin: ['Su','Má','Þr','Mi','Fi','Fö','La'],
-		weekHeader: 'Vika',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 0,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['is']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-it.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-it.js
deleted file mode 100644
index a01f043f8a7..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-it.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Italian initialisation for the jQuery UI date picker plugin. */
-/* Written by Antonello Pasella (antonello.pasella@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['it'] = {
-		closeText: 'Chiudi',
-		prevText: '&#x3C;Prec',
-		nextText: 'Succ&#x3E;',
-		currentText: 'Oggi',
-		monthNames: ['Gennaio','Febbraio','Marzo','Aprile','Maggio','Giugno',
-			'Luglio','Agosto','Settembre','Ottobre','Novembre','Dicembre'],
-		monthNamesShort: ['Gen','Feb','Mar','Apr','Mag','Giu',
-			'Lug','Ago','Set','Ott','Nov','Dic'],
-		dayNames: ['Domenica','Lunedì','Martedì','Mercoledì','Giovedì','Venerdì','Sabato'],
-		dayNamesShort: ['Dom','Lun','Mar','Mer','Gio','Ven','Sab'],
-		dayNamesMin: ['Do','Lu','Ma','Me','Gi','Ve','Sa'],
-		weekHeader: 'Sm',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['it']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ja.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ja.js
deleted file mode 100644
index 4d0b63c77de..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ja.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Japanese initialisation for the jQuery UI date picker plugin. */
-/* Written by Kentaro SATO (kentaro@ranvis.com). */
-jQuery(function($){
-	$.datepicker.regional['ja'] = {
-		closeText: '閉じる',
-		prevText: '&#x3C;前',
-		nextText: '次&#x3E;',
-		currentText: '今日',
-		monthNames: ['1月','2月','3月','4月','5月','6月',
-		'7月','8月','9月','10月','11月','12月'],
-		monthNamesShort: ['1月','2月','3月','4月','5月','6月',
-		'7月','8月','9月','10月','11月','12月'],
-		dayNames: ['日曜日','月曜日','火曜日','水曜日','木曜日','金曜日','土曜日'],
-		dayNamesShort: ['日','月','火','水','木','金','土'],
-		dayNamesMin: ['日','月','火','水','木','金','土'],
-		weekHeader: '週',
-		dateFormat: 'yy/mm/dd',
-		firstDay: 0,
-		isRTL: false,
-		showMonthAfterYear: true,
-		yearSuffix: '年'};
-	$.datepicker.setDefaults($.datepicker.regional['ja']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ka.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ka.js
deleted file mode 100644
index c10658d79bf..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ka.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Georgian (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Lado Lomidze (lado.lomidze@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['ka'] = {
-		closeText: 'დახურვა',
-		prevText: '&#x3c; წინა',
-		nextText: 'შემდეგი &#x3e;',
-		currentText: 'დღეს',
-		monthNames: ['იანვარი','თებერვალი','მარტი','აპრილი','მაისი','ივნისი', 'ივლისი','აგვისტო','სექტემბერი','ოქტომბერი','ნოემბერი','დეკემბერი'],
-		monthNamesShort: ['იან','თებ','მარ','აპრ','მაი','ივნ', 'ივლ','აგვ','სექ','ოქტ','ნოე','დეკ'],
-		dayNames: ['კვირა','ორშაბათი','სამშაბათი','ოთხშაბათი','ხუთშაბათი','პარასკევი','შაბათი'],
-		dayNamesShort: ['კვ','ორშ','სამ','ოთხ','ხუთ','პარ','შაბ'],
-		dayNamesMin: ['კვ','ორშ','სამ','ოთხ','ხუთ','პარ','შაბ'],
-		weekHeader: 'კვირა',
-		dateFormat: 'dd-mm-yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['ka']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-kk.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-kk.js
deleted file mode 100644
index dcd6a65df72..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-kk.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Kazakh (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Dmitriy Karasyov (dmitriy.karasyov@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['kk'] = {
-		closeText: 'Жабу',
-		prevText: '&#x3C;Алдыңғы',
-		nextText: 'Келесі&#x3E;',
-		currentText: 'Бүгін',
-		monthNames: ['Қаңтар','Ақпан','Наурыз','Сәуір','Мамыр','Маусым',
-		'Шілде','Тамыз','Қыркүйек','Қазан','Қараша','Желтоқсан'],
-		monthNamesShort: ['Қаң','Ақп','Нау','Сәу','Мам','Мау',
-		'Шіл','Там','Қыр','Қаз','Қар','Жел'],
-		dayNames: ['Жексенбі','Дүйсенбі','Сейсенбі','Сәрсенбі','Бейсенбі','Жұма','Сенбі'],
-		dayNamesShort: ['жкс','дсн','ссн','срс','бсн','жма','снб'],
-		dayNamesMin: ['Жк','Дс','Сс','Ср','Бс','Жм','Сн'],
-		weekHeader: 'Не',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['kk']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-km.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-km.js
deleted file mode 100644
index f9c4e3a02d9..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-km.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Khmer initialisation for the jQuery calendar extension. */
-/* Written by Chandara Om (chandara.teacher@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['km'] = {
-		closeText: 'ធ្វើ​រួច',
-		prevText: 'មុន',
-		nextText: 'បន្ទាប់',
-		currentText: 'ថ្ងៃ​នេះ',
-		monthNames: ['មករា','កុម្ភៈ','មីនា','មេសា','ឧសភា','មិថុនា',
-		'កក្កដា','សីហា','កញ្ញា','តុលា','វិច្ឆិកា','ធ្នូ'],
-		monthNamesShort: ['មករា','កុម្ភៈ','មីនា','មេសា','ឧសភា','មិថុនា',
-		'កក្កដា','សីហា','កញ្ញា','តុលា','វិច្ឆិកា','ធ្នូ'],
-		dayNames: ['អាទិត្យ', 'ចន្ទ', 'អង្គារ', 'ពុធ', 'ព្រហស្បតិ៍', 'សុក្រ', 'សៅរ៍'],
-		dayNamesShort: ['អា', 'ច', 'អ', 'ពុ', 'ព្រហ', 'សុ', 'សៅ'],
-		dayNamesMin: ['អា', 'ច', 'អ', 'ពុ', 'ព្រហ', 'សុ', 'សៅ'],
-		weekHeader: 'សប្ដាហ៍',
-		dateFormat: 'dd-mm-yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['km']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ko.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ko.js
deleted file mode 100644
index af36f3d6b94..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ko.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Korean initialisation for the jQuery calendar extension. */
-/* Written by DaeKwon Kang (ncrash.dk@gmail.com), Edited by Genie. */
-jQuery(function($){
-	$.datepicker.regional['ko'] = {
-		closeText: '닫기',
-		prevText: '이전달',
-		nextText: '다음달',
-		currentText: '오늘',
-		monthNames: ['1월','2월','3월','4월','5월','6월',
-		'7월','8월','9월','10월','11월','12월'],
-		monthNamesShort: ['1월','2월','3월','4월','5월','6월',
-		'7월','8월','9월','10월','11월','12월'],
-		dayNames: ['일요일','월요일','화요일','수요일','목요일','금요일','토요일'],
-		dayNamesShort: ['일','월','화','수','목','금','토'],
-		dayNamesMin: ['일','월','화','수','목','금','토'],
-		weekHeader: 'Wk',
-		dateFormat: 'yy-mm-dd',
-		firstDay: 0,
-		isRTL: false,
-		showMonthAfterYear: true,
-		yearSuffix: '년'};
-	$.datepicker.setDefaults($.datepicker.regional['ko']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ky.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ky.js
deleted file mode 100644
index d4466b12e6e..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ky.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Kyrgyz (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Sergey Kartashov (ebishkek@yandex.ru). */
-jQuery(function($){
-	$.datepicker.regional['ky'] = {
-		closeText: 'Жабуу',
-		prevText: '&#x3c;Мур',
-		nextText: 'Кий&#x3e;',
-		currentText: 'Бүгүн',
-		monthNames: ['Январь','Февраль','Март','Апрель','Май','Июнь',
-		'Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь'],
-		monthNamesShort: ['Янв','Фев','Мар','Апр','Май','Июн',
-		'Июл','Авг','Сен','Окт','Ноя','Дек'],
-		dayNames: ['жекшемби', 'дүйшөмбү', 'шейшемби', 'шаршемби', 'бейшемби', 'жума', 'ишемби'],
-		dayNamesShort: ['жек', 'дүй', 'шей', 'шар', 'бей', 'жум', 'ише'],
-		dayNamesMin: ['Жк','Дш','Шш','Шр','Бш','Жм','Иш'],
-		weekHeader: 'Жум',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''
-	};
-	$.datepicker.setDefaults($.datepicker.regional['ky']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-lb.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-lb.js
deleted file mode 100644
index 87c79d594eb..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-lb.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Luxembourgish initialisation for the jQuery UI date picker plugin. */
-/* Written by Michel Weimerskirch <michel@weimerskirch.net> */
-jQuery(function($){
-	$.datepicker.regional['lb'] = {
-		closeText: 'Fäerdeg',
-		prevText: 'Zréck',
-		nextText: 'Weider',
-		currentText: 'Haut',
-		monthNames: ['Januar','Februar','Mäerz','Abrëll','Mee','Juni',
-		'Juli','August','September','Oktober','November','Dezember'],
-		monthNamesShort: ['Jan', 'Feb', 'Mäe', 'Abr', 'Mee', 'Jun',
-		'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'],
-		dayNames: ['Sonndeg', 'Méindeg', 'Dënschdeg', 'Mëttwoch', 'Donneschdeg', 'Freideg', 'Samschdeg'],
-		dayNamesShort: ['Son', 'Méi', 'Dën', 'Mët', 'Don', 'Fre', 'Sam'],
-		dayNamesMin: ['So','Mé','Dë','Më','Do','Fr','Sa'],
-		weekHeader: 'W',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['lb']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-lt.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-lt.js
deleted file mode 100644
index 1afaaac5df7..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-lt.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Lithuanian (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* @author Arturas Paleicikas <arturas@avalon.lt> */
-jQuery(function($){
-	$.datepicker.regional['lt'] = {
-		closeText: 'Uždaryti',
-		prevText: '&#x3C;Atgal',
-		nextText: 'Pirmyn&#x3E;',
-		currentText: 'Šiandien',
-		monthNames: ['Sausis','Vasaris','Kovas','Balandis','Gegužė','Birželis',
-		'Liepa','Rugpjūtis','Rugsėjis','Spalis','Lapkritis','Gruodis'],
-		monthNamesShort: ['Sau','Vas','Kov','Bal','Geg','Bir',
-		'Lie','Rugp','Rugs','Spa','Lap','Gru'],
-		dayNames: ['sekmadienis','pirmadienis','antradienis','trečiadienis','ketvirtadienis','penktadienis','šeštadienis'],
-		dayNamesShort: ['sek','pir','ant','tre','ket','pen','šeš'],
-		dayNamesMin: ['Se','Pr','An','Tr','Ke','Pe','Še'],
-		weekHeader: 'Wk',
-		dateFormat: 'yy-mm-dd',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['lt']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-lv.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-lv.js
deleted file mode 100644
index 28cc102fc84..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-lv.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Latvian (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* @author Arturas Paleicikas <arturas.paleicikas@metasite.net> */
-jQuery(function($){
-	$.datepicker.regional['lv'] = {
-		closeText: 'Aizvērt',
-		prevText: 'Iepr',
-		nextText: 'Nāka',
-		currentText: 'Šodien',
-		monthNames: ['Janvāris','Februāris','Marts','Aprīlis','Maijs','Jūnijs',
-		'Jūlijs','Augusts','Septembris','Oktobris','Novembris','Decembris'],
-		monthNamesShort: ['Jan','Feb','Mar','Apr','Mai','Jūn',
-		'Jūl','Aug','Sep','Okt','Nov','Dec'],
-		dayNames: ['svētdiena','pirmdiena','otrdiena','trešdiena','ceturtdiena','piektdiena','sestdiena'],
-		dayNamesShort: ['svt','prm','otr','tre','ctr','pkt','sst'],
-		dayNamesMin: ['Sv','Pr','Ot','Tr','Ct','Pk','Ss'],
-		weekHeader: 'Nav',
-		dateFormat: 'dd-mm-yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['lv']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-mk.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-mk.js
deleted file mode 100644
index 0285325519f..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-mk.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Macedonian i18n for the jQuery UI date picker plugin. */
-/* Written by Stojce Slavkovski. */
-jQuery(function($){
-	$.datepicker.regional['mk'] = {
-		closeText: 'Затвори',
-		prevText: '&#x3C;',
-		nextText: '&#x3E;',
-		currentText: 'Денес',
-		monthNames: ['Јануари','Февруари','Март','Април','Мај','Јуни',
-		'Јули','Август','Септември','Октомври','Ноември','Декември'],
-		monthNamesShort: ['Јан','Фев','Мар','Апр','Мај','Јун',
-		'Јул','Авг','Сеп','Окт','Ное','Дек'],
-		dayNames: ['Недела','Понеделник','Вторник','Среда','Четврток','Петок','Сабота'],
-		dayNamesShort: ['Нед','Пон','Вто','Сре','Чет','Пет','Саб'],
-		dayNamesMin: ['Не','По','Вт','Ср','Че','Пе','Са'],
-		weekHeader: 'Сед',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['mk']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ml.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ml.js
deleted file mode 100644
index 9b8f460dbcc..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ml.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Malayalam (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Saji Nediyanchath (saji89@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['ml'] = {
-		closeText: 'ശരി',
-		prevText: 'മുന്നത്തെ',
-		nextText: 'അടുത്തത് ',
-		currentText: 'ഇന്ന്',
-		monthNames: ['ജനുവരി','ഫെബ്രുവരി','മാര്‍ച്ച്','ഏപ്രില്‍','മേയ്','ജൂണ്‍',
-		'ജൂലൈ','ആഗസ്റ്റ്','സെപ്റ്റംബര്‍','ഒക്ടോബര്‍','നവംബര്‍','ഡിസംബര്‍'],
-		monthNamesShort: ['ജനു', 'ഫെബ്', 'മാര്‍', 'ഏപ്രി', 'മേയ്', 'ജൂണ്‍',
-		'ജൂലാ', 'ആഗ', 'സെപ്', 'ഒക്ടോ', 'നവം', 'ഡിസ'],
-		dayNames: ['ഞായര്‍', 'തിങ്കള്‍', 'ചൊവ്വ', 'ബുധന്‍', 'വ്യാഴം', 'വെള്ളി', 'ശനി'],
-		dayNamesShort: ['ഞായ', 'തിങ്ക', 'ചൊവ്വ', 'ബുധ', 'വ്യാഴം', 'വെള്ളി', 'ശനി'],
-		dayNamesMin: ['ഞാ','തി','ചൊ','ബു','വ്യാ','വെ','ശ'],
-		weekHeader: 'ആ',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['ml']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ms.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ms.js
deleted file mode 100644
index e70de729959..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ms.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Malaysian initialisation for the jQuery UI date picker plugin. */
-/* Written by Mohd Nawawi Mohamad Jamili (nawawi@ronggeng.net). */
-jQuery(function($){
-	$.datepicker.regional['ms'] = {
-		closeText: 'Tutup',
-		prevText: '&#x3C;Sebelum',
-		nextText: 'Selepas&#x3E;',
-		currentText: 'hari ini',
-		monthNames: ['Januari','Februari','Mac','April','Mei','Jun',
-		'Julai','Ogos','September','Oktober','November','Disember'],
-		monthNamesShort: ['Jan','Feb','Mac','Apr','Mei','Jun',
-		'Jul','Ogo','Sep','Okt','Nov','Dis'],
-		dayNames: ['Ahad','Isnin','Selasa','Rabu','Khamis','Jumaat','Sabtu'],
-		dayNamesShort: ['Aha','Isn','Sel','Rab','kha','Jum','Sab'],
-		dayNamesMin: ['Ah','Is','Se','Ra','Kh','Ju','Sa'],
-		weekHeader: 'Mg',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 0,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['ms']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-nb.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-nb.js
deleted file mode 100644
index 845a5052da0..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-nb.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Norwegian Bokmål initialisation for the jQuery UI date picker plugin. */
-/* Written by Bjørn Johansen (post@bjornjohansen.no). */
-jQuery(function($){
-	$.datepicker.regional['nb'] = {
-		closeText: 'Lukk',
-		prevText: '&#xAB;Forrige',
-		nextText: 'Neste&#xBB;',
-		currentText: 'I dag',
-		monthNames: ['januar','februar','mars','april','mai','juni','juli','august','september','oktober','november','desember'],
-		monthNamesShort: ['jan','feb','mar','apr','mai','jun','jul','aug','sep','okt','nov','des'],
-		dayNamesShort: ['søn','man','tir','ons','tor','fre','lør'],
-		dayNames: ['søndag','mandag','tirsdag','onsdag','torsdag','fredag','lørdag'],
-		dayNamesMin: ['sø','ma','ti','on','to','fr','lø'],
-		weekHeader: 'Uke',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''
-	};
-	$.datepicker.setDefaults($.datepicker.regional['nb']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-nl-BE.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-nl-BE.js
deleted file mode 100644
index 7b3cdf425b3..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-nl-BE.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Dutch (Belgium) initialisation for the jQuery UI date picker plugin. */
-/* David De Sloovere @DavidDeSloovere */
-jQuery(function($){
-	$.datepicker.regional['nl-BE'] = {
-		closeText: 'Sluiten',
-		prevText: '←',
-		nextText: '→',
-		currentText: 'Vandaag',
-		monthNames: ['januari', 'februari', 'maart', 'april', 'mei', 'juni',
-		'juli', 'augustus', 'september', 'oktober', 'november', 'december'],
-		monthNamesShort: ['jan', 'feb', 'mrt', 'apr', 'mei', 'jun',
-		'jul', 'aug', 'sep', 'okt', 'nov', 'dec'],
-		dayNames: ['zondag', 'maandag', 'dinsdag', 'woensdag', 'donderdag', 'vrijdag', 'zaterdag'],
-		dayNamesShort: ['zon', 'maa', 'din', 'woe', 'don', 'vri', 'zat'],
-		dayNamesMin: ['zo', 'ma', 'di', 'wo', 'do', 'vr', 'za'],
-		weekHeader: 'Wk',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['nl-BE']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-nl.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-nl.js
deleted file mode 100644
index 203f16069d6..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-nl.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Dutch (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Mathias Bynens <http://mathiasbynens.be/> */
-jQuery(function($){
-	$.datepicker.regional.nl = {
-		closeText: 'Sluiten',
-		prevText: '←',
-		nextText: '→',
-		currentText: 'Vandaag',
-		monthNames: ['januari', 'februari', 'maart', 'april', 'mei', 'juni',
-		'juli', 'augustus', 'september', 'oktober', 'november', 'december'],
-		monthNamesShort: ['jan', 'feb', 'mrt', 'apr', 'mei', 'jun',
-		'jul', 'aug', 'sep', 'okt', 'nov', 'dec'],
-		dayNames: ['zondag', 'maandag', 'dinsdag', 'woensdag', 'donderdag', 'vrijdag', 'zaterdag'],
-		dayNamesShort: ['zon', 'maa', 'din', 'woe', 'don', 'vri', 'zat'],
-		dayNamesMin: ['zo', 'ma', 'di', 'wo', 'do', 'vr', 'za'],
-		weekHeader: 'Wk',
-		dateFormat: 'dd-mm-yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional.nl);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-nn.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-nn.js
deleted file mode 100644
index b55245ee6b0..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-nn.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Norwegian Nynorsk initialisation for the jQuery UI date picker plugin. */
-/* Written by Bjørn Johansen (post@bjornjohansen.no). */
-jQuery(function($){
-	$.datepicker.regional['nn'] = {
-		closeText: 'Lukk',
-		prevText: '&#xAB;Førre',
-		nextText: 'Neste&#xBB;',
-		currentText: 'I dag',
-		monthNames: ['januar','februar','mars','april','mai','juni','juli','august','september','oktober','november','desember'],
-		monthNamesShort: ['jan','feb','mar','apr','mai','jun','jul','aug','sep','okt','nov','des'],
-		dayNamesShort: ['sun','mån','tys','ons','tor','fre','lau'],
-		dayNames: ['sundag','måndag','tysdag','onsdag','torsdag','fredag','laurdag'],
-		dayNamesMin: ['su','må','ty','on','to','fr','la'],
-		weekHeader: 'Veke',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''
-	};
-	$.datepicker.setDefaults($.datepicker.regional['nn']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-no.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-no.js
deleted file mode 100644
index d36e430be6d..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-no.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Norwegian initialisation for the jQuery UI date picker plugin. */
-/* Written by Naimdjon Takhirov (naimdjon@gmail.com). */
-
-jQuery(function($){
-	$.datepicker.regional['no'] = {
-		closeText: 'Lukk',
-		prevText: '&#xAB;Forrige',
-		nextText: 'Neste&#xBB;',
-		currentText: 'I dag',
-		monthNames: ['januar','februar','mars','april','mai','juni','juli','august','september','oktober','november','desember'],
-		monthNamesShort: ['jan','feb','mar','apr','mai','jun','jul','aug','sep','okt','nov','des'],
-		dayNamesShort: ['søn','man','tir','ons','tor','fre','lør'],
-		dayNames: ['søndag','mandag','tirsdag','onsdag','torsdag','fredag','lørdag'],
-		dayNamesMin: ['sø','ma','ti','on','to','fr','lø'],
-		weekHeader: 'Uke',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''
-	};
-	$.datepicker.setDefaults($.datepicker.regional['no']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-pl.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-pl.js
deleted file mode 100644
index 0ffc515b95b..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-pl.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Polish initialisation for the jQuery UI date picker plugin. */
-/* Written by Jacek Wysocki (jacek.wysocki@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['pl'] = {
-		closeText: 'Zamknij',
-		prevText: '&#x3C;Poprzedni',
-		nextText: 'Następny&#x3E;',
-		currentText: 'Dziś',
-		monthNames: ['Styczeń','Luty','Marzec','Kwiecień','Maj','Czerwiec',
-		'Lipiec','Sierpień','Wrzesień','Październik','Listopad','Grudzień'],
-		monthNamesShort: ['Sty','Lu','Mar','Kw','Maj','Cze',
-		'Lip','Sie','Wrz','Pa','Lis','Gru'],
-		dayNames: ['Niedziela','Poniedziałek','Wtorek','Środa','Czwartek','Piątek','Sobota'],
-		dayNamesShort: ['Nie','Pn','Wt','Śr','Czw','Pt','So'],
-		dayNamesMin: ['N','Pn','Wt','Śr','Cz','Pt','So'],
-		weekHeader: 'Tydz',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['pl']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-pt-BR.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-pt-BR.js
deleted file mode 100644
index 521967ec39a..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-pt-BR.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Brazilian initialisation for the jQuery UI date picker plugin. */
-/* Written by Leonildo Costa Silva (leocsilva@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['pt-BR'] = {
-		closeText: 'Fechar',
-		prevText: '&#x3C;Anterior',
-		nextText: 'Próximo&#x3E;',
-		currentText: 'Hoje',
-		monthNames: ['Janeiro','Fevereiro','Março','Abril','Maio','Junho',
-		'Julho','Agosto','Setembro','Outubro','Novembro','Dezembro'],
-		monthNamesShort: ['Jan','Fev','Mar','Abr','Mai','Jun',
-		'Jul','Ago','Set','Out','Nov','Dez'],
-		dayNames: ['Domingo','Segunda-feira','Terça-feira','Quarta-feira','Quinta-feira','Sexta-feira','Sábado'],
-		dayNamesShort: ['Dom','Seg','Ter','Qua','Qui','Sex','Sáb'],
-		dayNamesMin: ['Dom','Seg','Ter','Qua','Qui','Sex','Sáb'],
-		weekHeader: 'Sm',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 0,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['pt-BR']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-pt.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-pt.js
deleted file mode 100644
index 999f20e3e96..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-pt.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Portuguese initialisation for the jQuery UI date picker plugin. */
-jQuery(function($){
-	$.datepicker.regional['pt'] = {
-		closeText: 'Fechar',
-		prevText: '&#x3C;Anterior',
-		nextText: 'Seguinte',
-		currentText: 'Hoje',
-		monthNames: ['Janeiro','Fevereiro','Março','Abril','Maio','Junho',
-		'Julho','Agosto','Setembro','Outubro','Novembro','Dezembro'],
-		monthNamesShort: ['Jan','Fev','Mar','Abr','Mai','Jun',
-		'Jul','Ago','Set','Out','Nov','Dez'],
-		dayNames: ['Domingo','Segunda-feira','Terça-feira','Quarta-feira','Quinta-feira','Sexta-feira','Sábado'],
-		dayNamesShort: ['Dom','Seg','Ter','Qua','Qui','Sex','Sáb'],
-		dayNamesMin: ['Dom','Seg','Ter','Qua','Qui','Sex','Sáb'],
-		weekHeader: 'Sem',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 0,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['pt']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-rm.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-rm.js
deleted file mode 100644
index 22ed21685dd..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-rm.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Romansh initialisation for the jQuery UI date picker plugin. */
-/* Written by Yvonne Gienal (yvonne.gienal@educa.ch). */
-jQuery(function($){
-	$.datepicker.regional['rm'] = {
-		closeText: 'Serrar',
-		prevText: '&#x3C;Suandant',
-		nextText: 'Precedent&#x3E;',
-		currentText: 'Actual',
-		monthNames: ['Schaner','Favrer','Mars','Avrigl','Matg','Zercladur', 'Fanadur','Avust','Settember','October','November','December'],
-		monthNamesShort: ['Scha','Fev','Mar','Avr','Matg','Zer', 'Fan','Avu','Sett','Oct','Nov','Dec'],
-		dayNames: ['Dumengia','Glindesdi','Mardi','Mesemna','Gievgia','Venderdi','Sonda'],
-		dayNamesShort: ['Dum','Gli','Mar','Mes','Gie','Ven','Som'],
-		dayNamesMin: ['Du','Gl','Ma','Me','Gi','Ve','So'],
-		weekHeader: 'emna',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['rm']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ro.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ro.js
deleted file mode 100644
index a988270d750..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ro.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Romanian initialisation for the jQuery UI date picker plugin.
- *
- * Written by Edmond L. (ll_edmond@walla.com)
- * and Ionut G. Stan (ionut.g.stan@gmail.com)
- */
-jQuery(function($){
-	$.datepicker.regional['ro'] = {
-		closeText: 'Închide',
-		prevText: '&#xAB; Luna precedentă',
-		nextText: 'Luna următoare &#xBB;',
-		currentText: 'Azi',
-		monthNames: ['Ianuarie','Februarie','Martie','Aprilie','Mai','Iunie',
-		'Iulie','August','Septembrie','Octombrie','Noiembrie','Decembrie'],
-		monthNamesShort: ['Ian', 'Feb', 'Mar', 'Apr', 'Mai', 'Iun',
-		'Iul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
-		dayNames: ['Duminică', 'Luni', 'Marţi', 'Miercuri', 'Joi', 'Vineri', 'Sâmbătă'],
-		dayNamesShort: ['Dum', 'Lun', 'Mar', 'Mie', 'Joi', 'Vin', 'Sâm'],
-		dayNamesMin: ['Du','Lu','Ma','Mi','Jo','Vi','Sâ'],
-		weekHeader: 'Săpt',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['ro']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ru.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ru.js
deleted file mode 100644
index a519714055d..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ru.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Russian (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Andrew Stromnov (stromnov@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['ru'] = {
-		closeText: 'Закрыть',
-		prevText: '&#x3C;Пред',
-		nextText: 'След&#x3E;',
-		currentText: 'Сегодня',
-		monthNames: ['Январь','Февраль','Март','Апрель','Май','Июнь',
-		'Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь'],
-		monthNamesShort: ['Янв','Фев','Мар','Апр','Май','Июн',
-		'Июл','Авг','Сен','Окт','Ноя','Дек'],
-		dayNames: ['воскресенье','понедельник','вторник','среда','четверг','пятница','суббота'],
-		dayNamesShort: ['вск','пнд','втр','срд','чтв','птн','сбт'],
-		dayNamesMin: ['Вс','Пн','Вт','Ср','Чт','Пт','Сб'],
-		weekHeader: 'Нед',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['ru']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sk.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sk.js
deleted file mode 100644
index 0cb76c4e800..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sk.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Slovak initialisation for the jQuery UI date picker plugin. */
-/* Written by Vojtech Rinik (vojto@hmm.sk). */
-jQuery(function($){
-	$.datepicker.regional['sk'] = {
-		closeText: 'Zavrieť',
-		prevText: '&#x3C;Predchádzajúci',
-		nextText: 'Nasledujúci&#x3E;',
-		currentText: 'Dnes',
-		monthNames: ['január','február','marec','apríl','máj','jún',
-		'júl','august','september','október','november','december'],
-		monthNamesShort: ['Jan','Feb','Mar','Apr','Máj','Jún',
-		'Júl','Aug','Sep','Okt','Nov','Dec'],
-		dayNames: ['nedeľa','pondelok','utorok','streda','štvrtok','piatok','sobota'],
-		dayNamesShort: ['Ned','Pon','Uto','Str','Štv','Pia','Sob'],
-		dayNamesMin: ['Ne','Po','Ut','St','Št','Pia','So'],
-		weekHeader: 'Ty',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['sk']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sl.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sl.js
deleted file mode 100644
index 048a47af71f..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sl.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Slovenian initialisation for the jQuery UI date picker plugin. */
-/* Written by Jaka Jancar (jaka@kubje.org). */
-/* c = č, s = š z = ž C = Č S = Š Z = Ž */
-jQuery(function($){
-	$.datepicker.regional['sl'] = {
-		closeText: 'Zapri',
-		prevText: '&#x3C;Prejšnji',
-		nextText: 'Naslednji&#x3E;',
-		currentText: 'Trenutni',
-		monthNames: ['Januar','Februar','Marec','April','Maj','Junij',
-		'Julij','Avgust','September','Oktober','November','December'],
-		monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
-		'Jul','Avg','Sep','Okt','Nov','Dec'],
-		dayNames: ['Nedelja','Ponedeljek','Torek','Sreda','Četrtek','Petek','Sobota'],
-		dayNamesShort: ['Ned','Pon','Tor','Sre','Čet','Pet','Sob'],
-		dayNamesMin: ['Ne','Po','To','Sr','Če','Pe','So'],
-		weekHeader: 'Teden',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['sl']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sq.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sq.js
deleted file mode 100644
index d6086a78960..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sq.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Albanian initialisation for the jQuery UI date picker plugin. */
-/* Written by Flakron Bytyqi (flakron@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['sq'] = {
-		closeText: 'mbylle',
-		prevText: '&#x3C;mbrapa',
-		nextText: 'Përpara&#x3E;',
-		currentText: 'sot',
-		monthNames: ['Janar','Shkurt','Mars','Prill','Maj','Qershor',
-		'Korrik','Gusht','Shtator','Tetor','Nëntor','Dhjetor'],
-		monthNamesShort: ['Jan','Shk','Mar','Pri','Maj','Qer',
-		'Kor','Gus','Sht','Tet','Nën','Dhj'],
-		dayNames: ['E Diel','E Hënë','E Martë','E Mërkurë','E Enjte','E Premte','E Shtune'],
-		dayNamesShort: ['Di','Hë','Ma','Më','En','Pr','Sh'],
-		dayNamesMin: ['Di','Hë','Ma','Më','En','Pr','Sh'],
-		weekHeader: 'Ja',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['sq']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sr-SR.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sr-SR.js
deleted file mode 100644
index 810d21daaa4..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sr-SR.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Serbian i18n for the jQuery UI date picker plugin. */
-/* Written by Dejan Dimić. */
-jQuery(function($){
-	$.datepicker.regional['sr-SR'] = {
-		closeText: 'Zatvori',
-		prevText: '&#x3C;',
-		nextText: '&#x3E;',
-		currentText: 'Danas',
-		monthNames: ['Januar','Februar','Mart','April','Maj','Jun',
-		'Jul','Avgust','Septembar','Oktobar','Novembar','Decembar'],
-		monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
-		'Jul','Avg','Sep','Okt','Nov','Dec'],
-		dayNames: ['Nedelja','Ponedeljak','Utorak','Sreda','Četvrtak','Petak','Subota'],
-		dayNamesShort: ['Ned','Pon','Uto','Sre','Čet','Pet','Sub'],
-		dayNamesMin: ['Ne','Po','Ut','Sr','Če','Pe','Su'],
-		weekHeader: 'Sed',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['sr-SR']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sr.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sr.js
deleted file mode 100644
index 1349a26cfd7..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sr.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Serbian i18n for the jQuery UI date picker plugin. */
-/* Written by Dejan Dimić. */
-jQuery(function($){
-	$.datepicker.regional['sr'] = {
-		closeText: 'Затвори',
-		prevText: '&#x3C;',
-		nextText: '&#x3E;',
-		currentText: 'Данас',
-		monthNames: ['Јануар','Фебруар','Март','Април','Мај','Јун',
-		'Јул','Август','Септембар','Октобар','Новембар','Децембар'],
-		monthNamesShort: ['Јан','Феб','Мар','Апр','Мај','Јун',
-		'Јул','Авг','Сеп','Окт','Нов','Дец'],
-		dayNames: ['Недеља','Понедељак','Уторак','Среда','Четвртак','Петак','Субота'],
-		dayNamesShort: ['Нед','Пон','Уто','Сре','Чет','Пет','Суб'],
-		dayNamesMin: ['Не','По','Ут','Ср','Че','Пе','Су'],
-		weekHeader: 'Сед',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['sr']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sv.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sv.js
deleted file mode 100644
index cbb5ad135c5..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-sv.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Swedish initialisation for the jQuery UI date picker plugin. */
-/* Written by Anders Ekdahl ( anders@nomadiz.se). */
-jQuery(function($){
-	$.datepicker.regional['sv'] = {
-		closeText: 'Stäng',
-		prevText: '&#xAB;Förra',
-		nextText: 'Nästa&#xBB;',
-		currentText: 'Idag',
-		monthNames: ['Januari','Februari','Mars','April','Maj','Juni',
-		'Juli','Augusti','September','Oktober','November','December'],
-		monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
-		'Jul','Aug','Sep','Okt','Nov','Dec'],
-		dayNamesShort: ['Sön','Mån','Tis','Ons','Tor','Fre','Lör'],
-		dayNames: ['Söndag','Måndag','Tisdag','Onsdag','Torsdag','Fredag','Lördag'],
-		dayNamesMin: ['Sö','Må','Ti','On','To','Fr','Lö'],
-		weekHeader: 'Ve',
-		dateFormat: 'yy-mm-dd',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['sv']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ta.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ta.js
deleted file mode 100644
index 40431ed8ec7..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-ta.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Tamil (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by S A Sureshkumar (saskumar@live.com). */
-jQuery(function($){
-	$.datepicker.regional['ta'] = {
-		closeText: 'மூடு',
-		prevText: 'முன்னையது',
-		nextText: 'அடுத்தது',
-		currentText: 'இன்று',
-		monthNames: ['தை','மாசி','பங்குனி','சித்திரை','வைகாசி','ஆனி',
-		'ஆடி','ஆவணி','புரட்டாசி','ஐப்பசி','கார்த்திகை','மார்கழி'],
-		monthNamesShort: ['தை','மாசி','பங்','சித்','வைகா','ஆனி',
-		'ஆடி','ஆவ','புர','ஐப்','கார்','மார்'],
-		dayNames: ['ஞாயிற்றுக்கிழமை','திங்கட்கிழமை','செவ்வாய்க்கிழமை','புதன்கிழமை','வியாழக்கிழமை','வெள்ளிக்கிழமை','சனிக்கிழமை'],
-		dayNamesShort: ['ஞாயிறு','திங்கள்','செவ்வாய்','புதன்','வியாழன்','வெள்ளி','சனி'],
-		dayNamesMin: ['ஞா','தி','செ','பு','வி','வெ','ச'],
-		weekHeader: 'Не',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['ta']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-th.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-th.js
deleted file mode 100644
index aecfd27cc06..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-th.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Thai initialisation for the jQuery UI date picker plugin. */
-/* Written by pipo (pipo@sixhead.com). */
-jQuery(function($){
-	$.datepicker.regional['th'] = {
-		closeText: 'ปิด',
-		prevText: '&#xAB;&#xA0;ย้อน',
-		nextText: 'ถัดไป&#xA0;&#xBB;',
-		currentText: 'วันนี้',
-		monthNames: ['มกราคม','กุมภาพันธ์','มีนาคม','เมษายน','พฤษภาคม','มิถุนายน',
-		'กรกฎาคม','สิงหาคม','กันยายน','ตุลาคม','พฤศจิกายน','ธันวาคม'],
-		monthNamesShort: ['ม.ค.','ก.พ.','มี.ค.','เม.ย.','พ.ค.','มิ.ย.',
-		'ก.ค.','ส.ค.','ก.ย.','ต.ค.','พ.ย.','ธ.ค.'],
-		dayNames: ['อาทิตย์','จันทร์','อังคาร','พุธ','พฤหัสบดี','ศุกร์','เสาร์'],
-		dayNamesShort: ['อา.','จ.','อ.','พ.','พฤ.','ศ.','ส.'],
-		dayNamesMin: ['อา.','จ.','อ.','พ.','พฤ.','ศ.','ส.'],
-		weekHeader: 'Wk',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 0,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['th']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-tj.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-tj.js
deleted file mode 100644
index 9a20e4d3794..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-tj.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Tajiki (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Abdurahmon Saidov (saidovab@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['tj'] = {
-		closeText: 'Идома',
-		prevText: '&#x3c;Қафо',
-		nextText: 'Пеш&#x3e;',
-		currentText: 'Имрӯз',
-		monthNames: ['Январ','Феврал','Март','Апрел','Май','Июн',
-		'Июл','Август','Сентябр','Октябр','Ноябр','Декабр'],
-		monthNamesShort: ['Янв','Фев','Мар','Апр','Май','Июн',
-		'Июл','Авг','Сен','Окт','Ноя','Дек'],
-		dayNames: ['якшанбе','душанбе','сешанбе','чоршанбе','панҷшанбе','ҷумъа','шанбе'],
-		dayNamesShort: ['якш','душ','сеш','чор','пан','ҷум','шан'],
-		dayNamesMin: ['Як','Дш','Сш','Чш','Пш','Ҷм','Шн'],
-		weekHeader: 'Хф',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['tj']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-tr.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-tr.js
deleted file mode 100644
index 75b583a778d..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-tr.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Turkish initialisation for the jQuery UI date picker plugin. */
-/* Written by Izzet Emre Erkan (kara@karalamalar.net). */
-jQuery(function($){
-	$.datepicker.regional['tr'] = {
-		closeText: 'kapat',
-		prevText: '&#x3C;geri',
-		nextText: 'ileri&#x3e',
-		currentText: 'bugün',
-		monthNames: ['Ocak','Şubat','Mart','Nisan','Mayıs','Haziran',
-		'Temmuz','Ağustos','Eylül','Ekim','Kasım','Aralık'],
-		monthNamesShort: ['Oca','Şub','Mar','Nis','May','Haz',
-		'Tem','Ağu','Eyl','Eki','Kas','Ara'],
-		dayNames: ['Pazar','Pazartesi','Salı','Çarşamba','Perşembe','Cuma','Cumartesi'],
-		dayNamesShort: ['Pz','Pt','Sa','Ça','Pe','Cu','Ct'],
-		dayNamesMin: ['Pz','Pt','Sa','Ça','Pe','Cu','Ct'],
-		weekHeader: 'Hf',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['tr']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-uk.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-uk.js
deleted file mode 100644
index 2bdc82ff701..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-uk.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Ukrainian (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Maxim Drogobitskiy (maxdao@gmail.com). */
-/* Corrected by Igor Milla (igor.fsp.milla@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['uk'] = {
-		closeText: 'Закрити',
-		prevText: '&#x3C;',
-		nextText: '&#x3E;',
-		currentText: 'Сьогодні',
-		monthNames: ['Січень','Лютий','Березень','Квітень','Травень','Червень',
-		'Липень','Серпень','Вересень','Жовтень','Листопад','Грудень'],
-		monthNamesShort: ['Січ','Лют','Бер','Кві','Тра','Чер',
-		'Лип','Сер','Вер','Жов','Лис','Гру'],
-		dayNames: ['неділя','понеділок','вівторок','середа','четвер','п’ятниця','субота'],
-		dayNamesShort: ['нед','пнд','вів','срд','чтв','птн','сбт'],
-		dayNamesMin: ['Нд','Пн','Вт','Ср','Чт','Пт','Сб'],
-		weekHeader: 'Тиж',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['uk']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-vi.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-vi.js
deleted file mode 100644
index b49e7eb130e..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-vi.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Vietnamese initialisation for the jQuery UI date picker plugin. */
-/* Translated by Le Thanh Huy (lthanhhuy@cit.ctu.edu.vn). */
-jQuery(function($){
-	$.datepicker.regional['vi'] = {
-		closeText: 'Đóng',
-		prevText: '&#x3C;Trước',
-		nextText: 'Tiếp&#x3E;',
-		currentText: 'Hôm nay',
-		monthNames: ['Tháng Một', 'Tháng Hai', 'Tháng Ba', 'Tháng Tư', 'Tháng Năm', 'Tháng Sáu',
-		'Tháng Bảy', 'Tháng Tám', 'Tháng Chín', 'Tháng Mười', 'Tháng Mười Một', 'Tháng Mười Hai'],
-		monthNamesShort: ['Tháng 1', 'Tháng 2', 'Tháng 3', 'Tháng 4', 'Tháng 5', 'Tháng 6',
-		'Tháng 7', 'Tháng 8', 'Tháng 9', 'Tháng 10', 'Tháng 11', 'Tháng 12'],
-		dayNames: ['Chủ Nhật', 'Thứ Hai', 'Thứ Ba', 'Thứ Tư', 'Thứ Năm', 'Thứ Sáu', 'Thứ Bảy'],
-		dayNamesShort: ['CN', 'T2', 'T3', 'T4', 'T5', 'T6', 'T7'],
-		dayNamesMin: ['CN', 'T2', 'T3', 'T4', 'T5', 'T6', 'T7'],
-		weekHeader: 'Tu',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 0,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['vi']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-zh-CN.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-zh-CN.js
deleted file mode 100644
index d337e4a99ef..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-zh-CN.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Chinese initialisation for the jQuery UI date picker plugin. */
-/* Written by Cloudream (cloudream@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['zh-CN'] = {
-		closeText: '关闭',
-		prevText: '&#x3C;上月',
-		nextText: '下月&#x3E;',
-		currentText: '今天',
-		monthNames: ['一月','二月','三月','四月','五月','六月',
-		'七月','八月','九月','十月','十一月','十二月'],
-		monthNamesShort: ['一月','二月','三月','四月','五月','六月',
-		'七月','八月','九月','十月','十一月','十二月'],
-		dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
-		dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
-		dayNamesMin: ['日','一','二','三','四','五','六'],
-		weekHeader: '周',
-		dateFormat: 'yy-mm-dd',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: true,
-		yearSuffix: '年'};
-	$.datepicker.setDefaults($.datepicker.regional['zh-CN']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-zh-HK.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-zh-HK.js
deleted file mode 100644
index ef6f4e715c2..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-zh-HK.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Chinese initialisation for the jQuery UI date picker plugin. */
-/* Written by SCCY (samuelcychan@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['zh-HK'] = {
-		closeText: '關閉',
-		prevText: '&#x3C;上月',
-		nextText: '下月&#x3E;',
-		currentText: '今天',
-		monthNames: ['一月','二月','三月','四月','五月','六月',
-		'七月','八月','九月','十月','十一月','十二月'],
-		monthNamesShort: ['一月','二月','三月','四月','五月','六月',
-		'七月','八月','九月','十月','十一月','十二月'],
-		dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
-		dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
-		dayNamesMin: ['日','一','二','三','四','五','六'],
-		weekHeader: '周',
-		dateFormat: 'dd-mm-yy',
-		firstDay: 0,
-		isRTL: false,
-		showMonthAfterYear: true,
-		yearSuffix: '年'};
-	$.datepicker.setDefaults($.datepicker.regional['zh-HK']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-zh-TW.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-zh-TW.js
deleted file mode 100644
index b9105ea507b..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-zh-TW.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Chinese initialisation for the jQuery UI date picker plugin. */
-/* Written by Ressol (ressol@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['zh-TW'] = {
-		closeText: '關閉',
-		prevText: '&#x3C;上月',
-		nextText: '下月&#x3E;',
-		currentText: '今天',
-		monthNames: ['一月','二月','三月','四月','五月','六月',
-		'七月','八月','九月','十月','十一月','十二月'],
-		monthNamesShort: ['一月','二月','三月','四月','五月','六月',
-		'七月','八月','九月','十月','十一月','十二月'],
-		dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
-		dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
-		dayNamesMin: ['日','一','二','三','四','五','六'],
-		weekHeader: '周',
-		dateFormat: 'yy/mm/dd',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: true,
-		yearSuffix: '年'};
-	$.datepicker.setDefaults($.datepicker.regional['zh-TW']);
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery.timepicker.min.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery.timepicker.min.js
deleted file mode 100644
index 61731f64652..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery.timepicker.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a(jQuery)}(function(a){function b(a){if(a.minTime&&(a.minTime=r(a.minTime)),a.maxTime&&(a.maxTime=r(a.maxTime)),a.durationTime&&"function"!=typeof a.durationTime&&(a.durationTime=r(a.durationTime)),a.disableTimeRanges.length>0){for(var b in a.disableTimeRanges)a.disableTimeRanges[b]=[r(a.disableTimeRanges[b][0]),r(a.disableTimeRanges[b][1])];a.disableTimeRanges=a.disableTimeRanges.sort(function(a,b){return a[0]-b[0]})}return a}function c(b){var c=b.data("timepicker-settings"),d=b.data("timepicker-list");d&&d.length&&(d.remove(),b.data("timepicker-list",!1)),d=a("<ul />",{"class":"ui-timepicker-list"});var e=a("<div />",{"class":"ui-timepicker-wrapper",tabindex:-1});e.css({display:"none",position:"absolute"}).append(d),c.className&&e.addClass(c.className),null===c.minTime&&null===c.durationTime||!c.showDuration||e.addClass("ui-timepicker-with-duration");var g=c.minTime;"function"==typeof c.durationTime?g=r(c.durationTime()):null!==c.durationTime&&(g=c.durationTime);var i=null!==c.minTime?c.minTime:0,j=null!==c.maxTime?c.maxTime:i+u-1;i>=j&&(j+=u),j===u-1&&-1!==c.timeFormat.indexOf("H")&&(j=u);for(var k=c.disableTimeRanges,l=0,m=k.length,n=i;j>=n;n+=60*c.step){var s=n,t=a("<li />");if(t.data("time",s),t.text(q(s,c.timeFormat)),(null!==c.minTime||null!==c.durationTime)&&c.showDuration){var v=a("<span />");v.addClass("ui-timepicker-duration"),v.text(" ("+p(n-g)+")"),t.append(v)}m>l&&(s>=k[l][1]&&(l+=1),k[l]&&s>=k[l][0]&&s<k[l][1]&&t.addClass("ui-timepicker-disabled")),d.append(t)}e.data("timepicker-input",b),b.data("timepicker-list",e);var w=c.appendTo;"string"==typeof w?w=a(w):"function"==typeof w&&(w=w(b)),w.append(e),h(b,d),d.on("click","li",function(){b.off("focus.timepicker"),b.on("focus.timepicker-ie-hack",function(){b.off("focus.timepicker-ie-hack"),b.on("focus.timepicker",x.show)}),f(b)||b[0].focus(),d.find("li").removeClass("ui-timepicker-selected"),a(this).addClass("ui-timepicker-selected"),o(b)&&(b.trigger("hideTimepicker"),e.hide())})}function d(){return new Date(1970,1,1,0,0,0)}function e(b){var c=a(b.target),d=c.closest(".ui-timepicker-input");0===d.length&&0===c.closest(".ui-timepicker-wrapper").length&&(x.hide(),a("body").unbind(".ui-timepicker"),a(window).unbind(".ui-timepicker"))}function f(a){var b=a.data("timepicker-settings");return(window.navigator.msMaxTouchPoints||"ontouchstart"in document)&&b.disableTouchKeyboard}function g(b,c,d){if(!d&&0!==d)return!1;var e=b.data("timepicker-settings"),f=!1,g=30*e.step;return c.find("li").each(function(b,c){var e=a(c),h=e.data("time")-d;return Math.abs(h)<g||h==g?(f=e,!1):void 0}),f}function h(a,b){b.find("li").removeClass("ui-timepicker-selected");var c=r(j(a));if(null!==c){var d=g(a,b,c);if(d){var e=d.offset().top-b.offset().top;(e+d.outerHeight()>b.outerHeight()||0>e)&&b.scrollTop(b.scrollTop()+d.position().top-d.outerHeight()),d.addClass("ui-timepicker-selected")}}}function i(){if(""!==this.value){var b=a(this),c=b.data("timepicker-list");if(!c||!c.is(":visible")){var d=r(this.value);if(null===d)return b.trigger("timeFormatError"),void 0;var e=b.data("timepicker-settings"),f=!1;if(null!==e.minTime&&d<e.minTime?f=!0:null!==e.maxTime&&d>e.maxTime&&(f=!0),a.each(e.disableTimeRanges,function(){return d>=this[0]&&d<this[1]?(f=!0,!1):void 0}),e.forceRoundTime){var g=d%(60*e.step);g>=30*e.step?d+=60*e.step-g:d-=g}var h=q(d,e.timeFormat);f?k(b,h,"error")&&b.trigger("timeRangeError"):k(b,h)}}}function j(a){return a.is("input")?a.val():a.data("ui-timepicker-value")}function k(a,b,c){return a.is("input")&&a.val(b),a.data("ui-timepicker-value")!=b?(a.data("ui-timepicker-value",b),"select"==c?a.trigger("selectTime").trigger("changeTime").trigger("change"):"error"!=c&&a.trigger("changeTime"),!0):(a.trigger("selectTime"),!1)}function l(b){var c=a(this),d=c.data("timepicker-list");if(!d||!d.is(":visible")){if(40!=b.keyCode)return m(b,c);f(c)||c.focus()}switch(b.keyCode){case 13:return o(c)&&x.hide.apply(this),b.preventDefault(),!1;case 38:var e=d.find(".ui-timepicker-selected");return e.length?e.is(":first-child")||(e.removeClass("ui-timepicker-selected"),e.prev().addClass("ui-timepicker-selected"),e.prev().position().top<e.outerHeight()&&d.scrollTop(d.scrollTop()-e.outerHeight())):(d.find("li").each(function(b,c){return a(c).position().top>0?(e=a(c),!1):void 0}),e.addClass("ui-timepicker-selected")),!1;case 40:return e=d.find(".ui-timepicker-selected"),0===e.length?(d.find("li").each(function(b,c){return a(c).position().top>0?(e=a(c),!1):void 0}),e.addClass("ui-timepicker-selected")):e.is(":last-child")||(e.removeClass("ui-timepicker-selected"),e.next().addClass("ui-timepicker-selected"),e.next().position().top+2*e.outerHeight()>d.outerHeight()&&d.scrollTop(d.scrollTop()+e.outerHeight())),!1;case 27:d.find("li").removeClass("ui-timepicker-selected"),x.hide();break;case 9:x.hide();break;default:return m(b,c)}}function m(a,b){return!b.data("timepicker-settings").disableTextInput||a.ctrlKey||a.altKey||a.metaKey||2!=a.keyCode&&8!=a.keyCode&&a.keyCode<46}function n(b){var c=a(this),d=c.data("timepicker-list");if(!d||!d.is(":visible"))return!0;switch(b.keyCode){case 96:case 97:case 98:case 99:case 100:case 101:case 102:case 103:case 104:case 105:case 48:case 49:case 50:case 51:case 52:case 53:case 54:case 55:case 56:case 57:case 65:case 77:case 80:case 186:case 8:case 46:h(c,d);break;default:return}}function o(a){var b=a.data("timepicker-settings"),c=a.data("timepicker-list"),d=null,e=c.find(".ui-timepicker-selected");if(e.hasClass("ui-timepicker-disabled"))return!1;if(e.length?d=e.data("time"):j(a)&&(d=r(j(a)),h(a,c)),null!==d){var f=q(d,b.timeFormat);k(a,f,"select")}return!0}function p(a){var b,c=Math.round(a/60);if(Math.abs(c)<60)b=[c,w.mins];else if(60==c)b=["1",w.hr];else{var d=(c/60).toFixed(1);"."!=w.decimal&&(d=d.replace(".",w.decimal)),b=[d,w.hrs]}return b.join(" ")}function q(a,b){if(null!==a){for(var c,d,e=new Date(t.valueOf()+1e3*a),f="",g=0;g<b.length;g++)switch(d=b.charAt(g)){case"a":f+=e.getHours()>11?"pm":"am";break;case"A":f+=e.getHours()>11?"PM":"AM";break;case"g":c=e.getHours()%12,f+=0===c?"12":c;break;case"G":f+=e.getHours();break;case"h":c=e.getHours()%12,0!==c&&10>c&&(c="0"+c),f+=0===c?"12":c;break;case"H":c=e.getHours(),a===u&&(c=24),f+=c>9?c:"0"+c;break;case"i":var h=e.getMinutes();f+=h>9?h:"0"+h;break;case"s":a=e.getSeconds(),f+=a>9?a:"0"+a;break;default:f+=d}return f}}function r(a){if(""===a)return null;if(!a||a+0==a)return a;"object"==typeof a&&(a=a.getHours()+":"+s(a.getMinutes())+":"+s(a.getSeconds())),a=a.toLowerCase(),new Date(0);var b;if(-1===a.indexOf(":")?(b=a.match(/^([0-9]):?([0-5][0-9])?:?([0-5][0-9])?\s*([pa]?)m?$/),b||(b=a.match(/^([0-2][0-9]):?([0-5][0-9])?:?([0-5][0-9])?\s*([pa]?)m?$/))):b=a.match(/^(\d{1,2})(?::([0-5][0-9]))?(?::([0-5][0-9]))?\s*([pa]?)m?$/),!b)return null;var c,d=parseInt(1*b[1],10);c=b[4]?12==d?"p"==b[4]?12:0:d+("p"==b[4]?12:0):d;var e=1*b[2]||0,f=1*b[3]||0;return 3600*c+60*e+f}function s(a){return("0"+a).slice(-2)}var t=d(),u=86400,v={className:null,minTime:null,maxTime:null,durationTime:null,step:30,showDuration:!1,timeFormat:"g:ia",scrollDefaultNow:!1,scrollDefaultTime:!1,selectOnBlur:!1,disableTouchKeyboard:!0,forceRoundTime:!1,appendTo:"body",disableTimeRanges:[],closeOnWindowScroll:!1,disableTextInput:!1},w={decimal:".",mins:"mins",hr:"hr",hrs:"hrs"},x={init:function(c){return this.each(function(){var d=a(this);if("SELECT"==d[0].tagName){for(var e={type:"text",value:d.val()},f=d[0].attributes,g=0;g<f.length;g++)e[f[g].nodeName]=f[g].nodeValue;var h=a("<input />",e);d.replaceWith(h),d=h}var j=a.extend({},v);c&&(j=a.extend(j,c)),j.lang&&(w=a.extend(w,j.lang)),j=b(j),d.data("timepicker-settings",j),d.prop("autocomplete","off"),d.on("click.timepicker focus.timepicker",x.show),d.on("change.timepicker",i),d.on("keydown.timepicker",l),d.on("keyup.timepicker",n),d.addClass("ui-timepicker-input"),i.call(d.get(0))})},show:function(){var b=a(this),d=b.data("timepicker-settings");f(b)&&b.blur();var h=b.data("timepicker-list");if(!b.prop("readonly")&&(h&&0!==h.length&&"function"!=typeof d.durationTime||(c(b),h=b.data("timepicker-list")),!h.is(":visible"))){x.hide(),h.show(),b.offset().top+b.outerHeight(!0)+h.outerHeight()>a(window).height()+a(window).scrollTop()?h.offset({left:b.offset().left+parseInt(h.css("marginLeft").replace("px",""),10),top:b.offset().top-h.outerHeight()+parseInt(h.css("marginTop").replace("px",""),10)}):h.offset({left:b.offset().left+parseInt(h.css("marginLeft").replace("px",""),10),top:b.offset().top+b.outerHeight()+parseInt(h.css("marginTop").replace("px",""),10)});var i=h.find(".ui-timepicker-selected");if(i.length||(j(b)?i=g(b,h,r(j(b))):d.scrollDefaultNow?i=g(b,h,r(new Date)):d.scrollDefaultTime!==!1&&(i=g(b,h,r(d.scrollDefaultTime)))),i&&i.length){var k=h.scrollTop()+i.position().top-i.outerHeight();h.scrollTop(k)}else h.scrollTop(0);a("body").on("touchstart.ui-timepicker mousedown.ui-timepicker",e),d.closeOnWindowScroll&&a(window).on("scroll.ui-timepicker",e),b.trigger("showTimepicker")}},hide:function(){a(".ui-timepicker-wrapper:visible").each(function(){var b=a(this),c=b.data("timepicker-input"),d=c.data("timepicker-settings");d&&d.selectOnBlur&&o(c),b.hide(),c.trigger("hideTimepicker")})},option:function(c,d){var e=this,f=e.data("timepicker-settings"),g=e.data("timepicker-list");if("object"==typeof c)f=a.extend(f,c);else if("string"==typeof c&&"undefined"!=typeof d)f[c]=d;else if("string"==typeof c)return f[c];return f=b(f),e.data("timepicker-settings",f),g&&(g.remove(),e.data("timepicker-list",!1)),e},getSecondsFromMidnight:function(){return r(j(this))},getTime:function(a){var b=this;return a||(a=new Date),a.setHours(0,0,0,0),new Date(a.valueOf()+1e3*r(j(b)))},setTime:function(a){var b=this,c=q(r(a),b.data("timepicker-settings").timeFormat);k(b,c),b.data("timepicker-list")&&h(b,b.data("timepicker-list"))},remove:function(){var a=this;a.hasClass("ui-timepicker-input")&&(a.removeAttr("autocomplete","off"),a.removeClass("ui-timepicker-input"),a.removeData("timepicker-settings"),a.off(".timepicker"),a.data("timepicker-list")&&a.data("timepicker-list").remove(),a.removeData("timepicker-list"))}};a.fn.timepicker=function(b){return x[b]?x[b].apply(this,Array.prototype.slice.call(arguments,1)):"object"!=typeof b&&b?(a.error("Method "+b+" does not exist on jQuery.timepicker"),void 0):x.init.apply(this,arguments)}});
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery.timepicker.css b/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery.timepicker.css
deleted file mode 100755
index 87c7987c08a..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery.timepicker.css
+++ /dev/null
@@ -1,67 +0,0 @@
-.ui-timepicker-wrapper {
-	overflow-y: auto;
-	height: 150px;
-	width: 6.5em;
-	background: #fff;
-	border: 1px solid #ddd;
-	-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);
-	-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);
-	box-shadow:0 5px 10px rgba(0,0,0,0.2);
-	outline: none;
-	z-index: 10001;
-	margin: 0;
-}
-
-.ui-timepicker-wrapper.ui-timepicker-with-duration {
-	width: 11em;
-}
-
-.ui-timepicker-list {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-
-.ui-timepicker-duration {
-	margin-left: 5px; color: #888;
-}
-
-.ui-timepicker-list:hover .ui-timepicker-duration {
-	color: #888;
-}
-
-.ui-timepicker-list li {
-	padding: 3px 0 3px 5px;
-	cursor: pointer;
-	white-space: nowrap;
-	color: #000;
-	list-style: none;
-	margin: 0;
-}
-
-.ui-timepicker-list:hover .ui-timepicker-selected {
-	background: #fff; color: #000;
-}
-
-li.ui-timepicker-selected,
-.ui-timepicker-list li:hover,
-.ui-timepicker-list .ui-timepicker-selected:hover {
-	background: #1980EC; color: #fff;
-}
-
-li.ui-timepicker-selected .ui-timepicker-duration,
-.ui-timepicker-list li:hover .ui-timepicker-duration {
-	color: #ccc;
-}
-
-.ui-timepicker-list li.ui-timepicker-disabled,
-.ui-timepicker-list li.ui-timepicker-disabled:hover,
-.ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {
-	color: #888;
-	cursor: default;
-}
-
-.ui-timepicker-list li.ui-timepicker-disabled:hover,
-.ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {
-	background: #f2f2f2;
-}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
index f6226e0a85a..160853aca44 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
@@ -4,7 +4,6 @@
 {% block css %}
     {% compress css %}
         <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css" />
-        <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/vendor/jquery.timepicker.css" />
         <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/vendor/jquery.datetimepicker.css" />
         <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/core.scss" type="text/x-scss" />
     {% endcompress %}
@@ -17,7 +16,6 @@
     {% compress js %}
         <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/jquery-1.10.3.js"></script>
         <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.datetimepicker.js"></script>
         <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/jquery.autosize.js"></script>
         <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/bootstrap-modal.js"></script>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
index 37d600f07d7..7554cd120e1 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
@@ -27,20 +27,12 @@
     {% hook_output 'insert_editor_js' %}
 {% endcompress %}
 
-{% comment %}
-    Put it outside compress to be sure that offline compression also works fine.
-{% endcomment %}
-{% get_localized_datepicker_js %}
-
 {% comment %}
     Additional js from widgets media. Allows for custom widgets in admin panel.
 {% endcomment %}
 {{ edit_handler.form.media.js }}
 
 <script>
-    {% get_date_format_override as format_override %}
-    window.overrideDateInputFormat ='{{ format_override }}';
-
     (function() {
         function fixPrefix(str) {return str;}
 
diff --git a/wagtail/wagtailadmin/templatetags/localize.py b/wagtail/wagtailadmin/templatetags/localize.py
deleted file mode 100644
index 026dbe8782d..00000000000
--- a/wagtail/wagtailadmin/templatetags/localize.py
+++ /dev/null
@@ -1,62 +0,0 @@
-from django import template
-from django.conf import settings
-from django.templatetags.static import static
-from django.utils import formats
-from django.utils.translation import get_language
-
-register = template.Library()
-
-# For reasons unkown, the el (greek) locale in django/conf/locale/el/formats.py 
-# *did not* contain a DATE_INPUT_FORMATS -- so it fell back to using the US 
-# date format (mm/dd/yy) which is not the correct one for Greece (dd/mm/yy). 
-# This means that if we used a localized datepicker django *won't* be able to
-# parse the dates! So a test here checks if DATE_INPUT_FORMATS is actually 
-# defined in a format module. If yes then it will just return an empty string 
-# so that the normal, localized date format from datepicker will be used.
-# If DATE_INPUT_FORMATS is not defined then it will return
-@register.assignment_tag
-def get_date_format_override():
-    if hasattr(settings, 'USE_I18N') and settings.USE_I18N==True:
-        
-        for m in formats.get_format_modules():
-            if hasattr(m, 'DATE_INPUT_FORMATS'):
-                return ''
-            else: # fall back to the ISO to be sure date will be parsed
-                return 'yy-mm-dd'
-    else: # Fall back to ISO if I18N is *not* used
-        return 'yy-mm-dd'
-
-# This is a list of all supported langs for jquery-ui datepicker which exist in
-# wagtailadmin/js/venor/i18n/. In case any new translations are added there the
-# language code should also be added in this list.
-SUPPORTED_DATEPICKER_LANGS = ['af', 'ar-DZ', 'ar', 'az', 'be', 'bg', 'bs', 'ca', 'cs', 'cy-GB', 'da', 'de',
-    'el', 'en-AU', 'en-GB', 'en-NZ', 'eo', 'es', 'et', 'eu', 'fa', 'fi', 'fo', 'fr-CA', 'fr-CH', 'fr', 'gl',
-    'he', 'hi', 'hr', 'hu', 'hy', 'id', 'is', 'it', 'ja', 'ka', 'kk', 'km', 'ko', 'ky', 'lb', 'lt', 'lv',
-    'mk', 'ml', 'ms', 'nb', 'nl-BE', 'nl', 'nn', 'no', 'pl', 'pt-BR', 'pt', 'rm', 'ro', 'ru', 'sk', 'sl', 'sq',
-    'sr-SR', 'sr', 'sv', 'ta', 'th', 'tj', 'tr', 'uk', 'vi', 'zh-CN', 'zh-HK', 'zh-TW'
-]
-# Get the correct i18n + l10n settings for datepicker depending on current 
-# thread language  
-@register.simple_tag
-def get_localized_datepicker_js():
-    if hasattr(settings, 'USE_I18N') and settings.USE_I18N==True and \
-        hasattr(settings, 'USE_L10N') and settings.USE_L10N==True:
-        
-        lang  = get_language()
-        
-        if '-' in lang:
-            lang_parts = lang.split('-')
-            lang = lang_parts[0].lower() +'-'+ lang_parts[1].upper()
-        else:
-            lang=lang.lower()
-        if lang in SUPPORTED_DATEPICKER_LANGS:
-            translation_file = static("wagtailadmin/js/vendor/i18n/jquery.ui.datepicker-{0}.js".format(
-                lang
-            ))
-            return '<script src="{0}"></script>'.format(translation_file)
-        else: # Don't return anything if language is not supported
-            return ''
-        
-    else: # Don't return anything if we don't use I18N and L10N
-        return ''        
-        
\ No newline at end of file

From eea06567085dd3a155f20bf408c046e9a5a3aba1 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 3 Jun 2014 15:37:55 +0100
Subject: [PATCH 045/293] Added seconds to timepicker. Added masks to all
 datetime pickers

---
 .../wagtailadmin/static/wagtailadmin/js/page-editor.js   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index a8d492ffc52..af624572e6e 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -56,20 +56,23 @@ function insertRichTextDeleteControl(elem) {
 function initDateChooser(id) {
     $('#' + id).datetimepicker({
         timepicker: false,
-        format: 'Y-m-d'
+        format: 'Y-m-d',
+        mask: '9999-19-39'
     });
 }
 
 function initTimeChooser(id) {
     $('#' + id).datetimepicker({
         datepicker: false,
-        format: 'H:i'
+        format: 'H:i:s',
+        mask: '29:59:59'
     });
 }
 
 function initDateTimeChooser(id) {
     $('#' + id).datetimepicker({
-        format: 'Y-m-d H:i'
+        format: 'Y-m-d H:i:s',
+        mask: '9999-19-39 29:59:59'
     });
 }
 

From fe71932a49c82028741b3a8d0b4064d06bfafb0b Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 3 Jun 2014 15:56:14 +0100
Subject: [PATCH 046/293] Fixed a couple of references to "localize"
 templatetags library This was removed in 99a70b3

---
 .../wagtailadmin/templates/wagtailadmin/pages/_editor_js.html   | 2 +-
 .../wagtailforms/templates/wagtailforms/index_submissions.html  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
index 7554cd120e1..b8334eae27c 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
@@ -1,4 +1,4 @@
-{% load wagtailadmin_tags compress localize %}
+{% load wagtailadmin_tags compress %}
 
 {% comment %}
     Javascript declarations to be included on the 'create page' and 'edit page' views
diff --git a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
index 00732ee4187..9b5ca941f2c 100644
--- a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
+++ b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
@@ -1,6 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
 {% load i18n %}
-{% load localize %}
 {% block titletag %}{% blocktrans with form_title=form_page.title|capfirst %}Submissions of {{ form_title }}{% endblocktrans %}{% endblock %}
 {% block bodyclass %}menu-snippets{% endblock %}
 {% block extra_js %}

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 047/293] 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 c0cf872e25b..3dc8272b07f 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 012dd32f895..22682500f7d 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 95d54d7d936..63c70779b23 100644
--- a/wagtail/wagtailadmin/tests/test_account_management.py
+++ b/wagtail/wagtailadmin/tests/test_account_management.py
@@ -49,7 +49,6 @@ def test_login_view_post(self):
         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 8fbf2f6e770..806240c5c59 100644
--- a/wagtail/wagtailadmin/urls.py
+++ b/wagtail/wagtailadmin/urls.py
@@ -5,15 +5,8 @@
 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 @@
 
     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 8479ea6b0e1..c5e461f55cb 100644
--- a/wagtail/wagtailadmin/views/account.py
+++ b/wagtail/wagtailadmin/views/account.py
@@ -3,8 +3,13 @@
 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 2a84d7ef1dbbc1bb7b93c0bc49b214598c2d8f1d Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 3 Jun 2014 11:57:48 +0100
Subject: [PATCH 048/293] A few improvements to the wagtailforms submission
 tests

---
 wagtail/tests/fixtures/test.json |  3 +++
 wagtail/wagtailforms/tests.py    | 28 +++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/wagtail/tests/fixtures/test.json b/wagtail/tests/fixtures/test.json
index 11b82d9f169..541450211c0 100644
--- a/wagtail/tests/fixtures/test.json
+++ b/wagtail/tests/fixtures/test.json
@@ -183,6 +183,9 @@
     "pk": 8,
     "model": "tests.formpage",
     "fields": {
+        "to_address": "to@email.com",
+        "from_address": "from@email.com",
+        "subject": "The subject"
     }
 },
 
diff --git a/wagtail/wagtailforms/tests.py b/wagtail/wagtailforms/tests.py
index 8ec2ee5c38d..459dbbea4a9 100644
--- a/wagtail/wagtailforms/tests.py
+++ b/wagtail/wagtailforms/tests.py
@@ -1,32 +1,50 @@
 from django.test import TestCase
+from django.core import mail
 
 from wagtail.wagtailcore.models import Page
 from wagtail.wagtailforms.models import FormSubmission
 
+
 class TestFormSubmission(TestCase):
     fixtures = ['test.json']
 
     def test_get_form(self):
         response = self.client.get('/contact-us/')
+
+        # Check response
         self.assertContains(response, """<label for="id_your-email">Your email</label>""")
-        self.assertNotContains(response, "Thank you for your feedback")
+        self.assertTemplateUsed(response, 'tests/form_page.html')
+        self.assertTemplateNotUsed(response, 'tests/form_page_landing.html')
 
     def test_post_invalid_form(self):
         response = self.client.post('/contact-us/', {
             'your-email': 'bob', 'your-message': 'hello world'
         })
-        self.assertNotContains(response, "Thank you for your feedback")
+
+        # Check response
         self.assertContains(response, "Enter a valid email address.")
+        self.assertTemplateUsed(response, 'tests/form_page.html')
+        self.assertTemplateNotUsed(response, 'tests/form_page_landing.html')
 
     def test_post_valid_form(self):
         response = self.client.post('/contact-us/', {
             'your-email': 'bob@example.com', 'your-message': 'hello world'
         })
-        self.assertNotContains(response, "Your email")
-        self.assertContains(response, "Thank you for your feedback")
 
-        form_page = Page.objects.get(url_path='/home/contact-us/')
+        # Check response
+        self.assertContains(response, "Thank you for your feedback.")
+        self.assertTemplateNotUsed(response, 'tests/form_page.html')
+        self.assertTemplateUsed(response, 'tests/form_page_landing.html')
+
+        # Check that an email was sent
+        self.assertEqual(len(mail.outbox), 1)
+        self.assertEqual(mail.outbox[0].subject, "The subject")
+        self.assertTrue("Your message: hello world" in mail.outbox[0].body)
+        self.assertEqual(mail.outbox[0].to, ['to@email.com'])
+        self.assertEqual(mail.outbox[0].from_email, 'from@email.com')
 
+        # Check that form submission was saved correctly
+        form_page = Page.objects.get(url_path='/home/contact-us/')
         self.assertTrue(FormSubmission.objects.filter(page=form_page, form_data__contains='hello world').exists())
 
 

From 7cf899bdbc8835a05a7896fd4eaaa2452d0ddbd8 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 3 Jun 2014 17:03:33 +0100
Subject: [PATCH 049/293] Added test for FormBuilder class

---
 wagtail/wagtailforms/tests.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/wagtail/wagtailforms/tests.py b/wagtail/wagtailforms/tests.py
index 459dbbea4a9..ac18c7fa71e 100644
--- a/wagtail/wagtailforms/tests.py
+++ b/wagtail/wagtailforms/tests.py
@@ -1,8 +1,10 @@
 from django.test import TestCase
 from django.core import mail
+from django import forms
 
 from wagtail.wagtailcore.models import Page
 from wagtail.wagtailforms.models import FormSubmission
+from wagtail.wagtailforms.forms import FormBuilder
 
 
 class TestFormSubmission(TestCase):
@@ -48,6 +50,26 @@ def test_post_valid_form(self):
         self.assertTrue(FormSubmission.objects.filter(page=form_page, form_data__contains='hello world').exists())
 
 
+class TestFormBuilder(TestCase):
+    fixtures = ['test.json']
+
+    def setUp(self):
+        self.form_page = Page.objects.get(url_path='/home/contact-us/').specific
+        self.fb = FormBuilder(self.form_page.form_fields.all())
+
+    def test_fields(self):
+        """
+        This tests that all fields were added to the form with the correct types
+        """
+        form_class = self.fb.get_form_class()
+        
+        self.assertTrue('your-email' in form_class.base_fields.keys())
+        self.assertTrue('your-message' in form_class.base_fields.keys())
+
+        self.assertIsInstance(form_class.base_fields['your-email'], forms.EmailField)
+        self.assertIsInstance(form_class.base_fields['your-message'], forms.CharField)
+
+
 class TestFormsBackend(TestCase):
     fixtures = ['test.json']
 

From 97a981a7660154027df1da4f8a2cc314e701d037 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 3 Jun 2014 17:12:08 +0100
Subject: [PATCH 050/293] Cleaned up FormBuilder class

---
 wagtail/wagtailforms/forms.py | 53 +++++++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/wagtail/wagtailforms/forms.py b/wagtail/wagtailforms/forms.py
index f17023a773e..aaf16eb7925 100644
--- a/wagtail/wagtailforms/forms.py
+++ b/wagtail/wagtailforms/forms.py
@@ -8,22 +8,9 @@ def __init__(self, *args, **kwargs):
         return super(BaseForm, self).__init__(*args, **kwargs)
 
 
-class FormBuilder():
-    formfields = SortedDict()
-
+class FormBuilder(object):
     def __init__(self, fields):
-        for field in fields:
-            options = self.get_options(field)
-            f = getattr(self, "create_"+field.field_type+"_field")(field, options)
-            self.formfields[field.clean_name] = f
-
-    def get_options(self, field):
-        options = {}
-        options['label'] = field.label
-        options['help_text'] = field.help_text
-        options['required'] = field.required
-        options['initial'] = field.default_value
-        return options
+        self.fields = fields
 
     def create_singleline_field(self, field, options):
         # TODO: This is a default value - it may need to be changed
@@ -72,6 +59,42 @@ def create_checkboxes_field(self, field, options):
     def create_checkbox_field(self, field, options):
         return django.forms.BooleanField(**options)
 
+    FIELD_TYPES = {
+        'singleline': create_singleline_field,
+        'multiline': create_multiline_field,
+        'date': create_date_field,
+        'datetime': create_datetime_field,
+        'email': create_email_field,
+        'url': create_url_field,
+        'number': create_number_field,
+        'dropdown': create_dropdown_field,
+        'radio': create_radio_field,
+        'checkboxes': create_checkboxes_field,
+        'checkbox': create_checkbox_field,
+    }
+
+    @property
+    def formfields(self):
+        formfields = SortedDict()
+
+        for field in self.fields:
+            options = self.get_field_options(field)
+
+            if field.field_type in self.FIELD_TYPES:
+                formfields[field.clean_name] = self.FIELD_TYPES[field.field_type](self, field, options)
+            else:
+                raise Exception("Unrecognised field type: " + form.field_type)
+
+        return formfields
+
+    def get_field_options(self, field):
+        options = {}
+        options['label'] = field.label
+        options['help_text'] = field.help_text
+        options['required'] = field.required
+        options['initial'] = field.default_value
+        return options
+
     def get_form_class(self):
         return type('WagtailForm', (BaseForm,), self.formfields)
 

From 21ac2e3ab8bb3c52b45b7ae005a5c87a83785def Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 3 Jun 2014 17:27:48 +0100
Subject: [PATCH 051/293] Split wagtailforms landing page into separate view

---
 wagtail/wagtailforms/models.py | 26 +++++++++++++++++---------
 wagtail/wagtailforms/tests.py  | 12 +++++++++---
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/wagtail/wagtailforms/models.py b/wagtail/wagtailforms/models.py
index 75f0eceee07..59941c6abd3 100644
--- a/wagtail/wagtailforms/models.py
+++ b/wagtail/wagtailforms/models.py
@@ -1,5 +1,5 @@
 from django.db import models
-from django.shortcuts import render
+from django.shortcuts import render, redirect
 from django.utils.translation import ugettext_lazy as _
 from django.utils.text import slugify
 
@@ -111,6 +111,7 @@ class AbstractForm(Page):
     """A Form Page. Pages implementing a form should inhert from it"""
 
     form_builder = FormBuilder
+    landing_page_path = 'done'
     is_abstract = True  # Don't display me in "Add"
 
     def __init__(self, *args, **kwargs):
@@ -152,11 +153,8 @@ def serve(self, request):
                     form_processor = self.form_processing_backend()
                     form_processor.process(self, form)
 
-                # render the landing_page
-                # TODO: It is much better to redirect to it
-                return render(request, self.landing_page_template, {
-                    'self': self,
-                })
+                # Redirect to the landing page
+                return redirect(self.url + self.landing_page_path + '/')
         else:
             form = form_class(**form_params)
 
@@ -165,6 +163,18 @@ def serve(self, request):
             'form': form,
         })
 
+    def serve_landing(self, request):
+        return render(request, self.landing_page_template, {
+            'self': self,
+        })
+
+    def route(self, request, path_components):
+        # Check if this request is for the landing page
+        if self.live and path_components == [self.landing_page_path]:
+            return self.serve_landing(request)
+
+        return super(AbstractForm, self).route(request, path_components)
+
     def get_page_modes(self):
         return [
             ('form', 'Form'),
@@ -173,9 +183,7 @@ def get_page_modes(self):
 
     def show_as_mode(self, mode):
         if mode == 'landing':
-            return render(self.dummy_request(), self.landing_page_template, {
-                'self': self,
-            })
+            return self.serve_landing(self.dummy_request())
         else:
             return super(AbstractForm, self).show_as_mode(mode)
 
diff --git a/wagtail/wagtailforms/tests.py b/wagtail/wagtailforms/tests.py
index ac18c7fa71e..2276d10d97e 100644
--- a/wagtail/wagtailforms/tests.py
+++ b/wagtail/wagtailforms/tests.py
@@ -34,9 +34,7 @@ def test_post_valid_form(self):
         })
 
         # Check response
-        self.assertContains(response, "Thank you for your feedback.")
-        self.assertTemplateNotUsed(response, 'tests/form_page.html')
-        self.assertTemplateUsed(response, 'tests/form_page_landing.html')
+        self.assertEqual(response.status_code, 302)
 
         # Check that an email was sent
         self.assertEqual(len(mail.outbox), 1)
@@ -49,6 +47,14 @@ def test_post_valid_form(self):
         form_page = Page.objects.get(url_path='/home/contact-us/')
         self.assertTrue(FormSubmission.objects.filter(page=form_page, form_data__contains='hello world').exists())
 
+    def test_get_landing_page(self):
+        response = self.client.get('/contact-us/done/')
+
+        # Check response
+        self.assertContains(response, "Thank you for your feedback.")
+        self.assertTemplateNotUsed(response, 'tests/form_page.html')
+        self.assertTemplateUsed(response, 'tests/form_page_landing.html')
+
 
 class TestFormBuilder(TestCase):
     fixtures = ['test.json']

From 6d67749f5a084b22a8ac9eac5894bfdf2e9dbd66 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 4 Jun 2014 15:48:48 +0100
Subject: [PATCH 052/293] Cleanup of TestFormsBackend TestcAse

---
 wagtail/wagtailforms/tests.py | 38 +++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/wagtail/wagtailforms/tests.py b/wagtail/wagtailforms/tests.py
index 2276d10d97e..019f992d86a 100644
--- a/wagtail/wagtailforms/tests.py
+++ b/wagtail/wagtailforms/tests.py
@@ -79,31 +79,43 @@ def test_fields(self):
 class TestFormsBackend(TestCase):
     fixtures = ['test.json']
 
-    def test_cannot_see_forms_without_permission(self):
-        form_page = Page.objects.get(url_path='/home/contact-us/')
+    def setUp(self):
+        self.client.login(username='siteeditor', password='password')
+        self.form_page = Page.objects.get(url_path='/home/contact-us/')
 
+    def test_cannot_see_forms_without_permission(self):
+        # Login with as a user without permission to see forms
         self.client.login(username='eventeditor', password='password')
+
         response = self.client.get('/admin/forms/')
-        self.assertFalse(form_page in response.context['form_pages'])
 
-    def test_can_see_forms_with_permission(self):
-        form_page = Page.objects.get(url_path='/home/contact-us/')
+        # Check that the user cannot see the form page
+        self.assertFalse(self.form_page in response.context['form_pages'])
 
-        self.client.login(username='siteeditor', password='password')
+    def test_can_see_forms_with_permission(self):
         response = self.client.get('/admin/forms/')
-        self.assertTrue(form_page in response.context['form_pages'])
 
-    def test_can_get_submissions(self):
-        form_page = Page.objects.get(url_path='/home/contact-us/')
+        # Check that the user can see the form page
+        self.assertTrue(self.form_page in response.context['form_pages'])
 
-        self.client.login(username='siteeditor', password='password')
+    def test_list_submissions(self):
+        response = self.client.get('/admin/forms/submissions/%d/' % self.form_page.id)
 
-        response = self.client.get('/admin/forms/submissions/%d/' % form_page.id)
+        # Check response
+        self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.context['data_rows']), 2)
 
-        response = self.client.get('/admin/forms/submissions/%d/?date_from=01%%2F01%%2F2014' % form_page.id)
+    def test_list_submissions_filtered(self):
+        response = self.client.get('/admin/forms/submissions/%d/?date_from=01%%2F01%%2F2014' % self.form_page.id)
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.context['data_rows']), 1)
 
-        response = self.client.get('/admin/forms/submissions/%d/?date_from=01%%2F01%%2F2014&action=CSV' % form_page.id)
+    def test_list_submissions_csv_export(self):
+        response = self.client.get('/admin/forms/submissions/%d/?date_from=01%%2F01%%2F2014&action=CSV' % self.form_page.id)
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
         data_line = response.content.split("\n")[1]
         self.assertTrue('new@example.com' in data_line)

From 7e7885b2b514856de0b53c513f2450201be573a6 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 4 Jun 2014 15:55:25 +0100
Subject: [PATCH 053/293] Added tests for wagtailforms page modes

---
 wagtail/wagtailforms/tests.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/wagtail/wagtailforms/tests.py b/wagtail/wagtailforms/tests.py
index 019f992d86a..ab65f909b6d 100644
--- a/wagtail/wagtailforms/tests.py
+++ b/wagtail/wagtailforms/tests.py
@@ -56,6 +56,29 @@ def test_get_landing_page(self):
         self.assertTemplateUsed(response, 'tests/form_page_landing.html')
 
 
+class TestPageModes(TestCase):
+    fixtures = ['test.json']
+
+    def setUp(self):
+        self.form_page = Page.objects.get(url_path='/home/contact-us/').specific
+
+    def test_form(self):
+        response = self.form_page.show_as_mode('form')
+
+        # Check response
+        self.assertContains(response, """<label for="id_your-email">Your email</label>""")
+        self.assertTemplateUsed(response, 'tests/form_page.html')
+        self.assertTemplateNotUsed(response, 'tests/form_page_landing.html')
+
+    def test_landing(self):
+        response = self.form_page.show_as_mode('landing')
+
+        # Check response
+        self.assertContains(response, "Thank you for your feedback.")
+        self.assertTemplateNotUsed(response, 'tests/form_page.html')
+        self.assertTemplateUsed(response, 'tests/form_page_landing.html')
+
+
 class TestFormBuilder(TestCase):
     fixtures = ['test.json']
 

From 24df26c8c338562e64dad8440709175d99f488fe Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 4 Jun 2014 16:25:05 +0100
Subject: [PATCH 054/293] More wagtailforms tests

---
 wagtail/wagtailforms/tests.py | 127 +++++++++++++++++++++++++++++++++-
 1 file changed, 125 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailforms/tests.py b/wagtail/wagtailforms/tests.py
index ab65f909b6d..5145eae3f86 100644
--- a/wagtail/wagtailforms/tests.py
+++ b/wagtail/wagtailforms/tests.py
@@ -1,3 +1,5 @@
+import json
+
 from django.test import TestCase
 from django.core import mail
 from django import forms
@@ -5,6 +7,7 @@
 from wagtail.wagtailcore.models import Page
 from wagtail.wagtailforms.models import FormSubmission
 from wagtail.wagtailforms.forms import FormBuilder
+from wagtail.tests.models import FormPage
 
 
 class TestFormSubmission(TestCase):
@@ -99,13 +102,74 @@ def test_fields(self):
         self.assertIsInstance(form_class.base_fields['your-message'], forms.CharField)
 
 
-class TestFormsBackend(TestCase):
+class TestFormsIndex(TestCase):
     fixtures = ['test.json']
 
     def setUp(self):
         self.client.login(username='siteeditor', password='password')
         self.form_page = Page.objects.get(url_path='/home/contact-us/')
 
+    def make_form_pages(self):
+        """
+        This makes 100 form pages and adds them as children to 'contact-us'
+        This is used to test pagination on the forms index
+        """
+        for i in range(100):
+            self.form_page.add_child(instance=FormPage(
+                title="Form " + str(i),
+                slug='form-' + str(i),
+                live=True
+            ))
+
+    def test_forms_index(self):
+        response = self.client.get('/admin/forms/')
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailforms/index.html')
+
+    def test_forms_index_pagination(self):
+        # Create some more form pages to make pagination kick in
+        self.make_form_pages()
+
+        # Get page two
+        response = self.client.get('/admin/forms/', {'p': 2})
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailforms/index.html')
+
+        # Check that we got the correct page
+        self.assertEqual(response.context['form_pages'].number, 2)
+
+    def test_forms_index_pagination_invalid(self):
+        # Create some more form pages to make pagination kick in
+        self.make_form_pages()
+
+        # Get page two
+        response = self.client.get('/admin/forms/', {'p': 'Hello world!'})
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailforms/index.html')
+
+        # Check that it got page one
+        self.assertEqual(response.context['form_pages'].number, 1)
+
+    def test_forms_index_pagination_out_of_range(self):
+        # Create some more form pages to make pagination kick in
+        self.make_form_pages()
+
+        # Get page two
+        response = self.client.get('/admin/forms/', {'p': 99999})
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailforms/index.html')
+
+        # Check that it got the last page
+        self.assertEqual(response.context['form_pages'].number, response.context['form_pages'].paginator.num_pages)
+
     def test_cannot_see_forms_without_permission(self):
         # Login with as a user without permission to see forms
         self.client.login(username='eventeditor', password='password')
@@ -121,20 +185,79 @@ def test_can_see_forms_with_permission(self):
         # Check that the user can see the form page
         self.assertTrue(self.form_page in response.context['form_pages'])
 
+
+class TestFormsSubmissions(TestCase):
+    fixtures = ['test.json']
+
+    def setUp(self):
+        self.client.login(username='siteeditor', password='password')
+        self.form_page = Page.objects.get(url_path='/home/contact-us/')
+
+    def make_list_submissions(self):
+        """
+        This makes 100 submissions to test pagination on the forms submissions page
+        """
+        for i in range(100):
+            submission = FormSubmission(
+                page=self.form_page,
+                form_data=json.dumps({
+                    'hello': 'world'
+                })
+            )
+            submission.save()
+
     def test_list_submissions(self):
         response = self.client.get('/admin/forms/submissions/%d/' % self.form_page.id)
 
         # Check response
         self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailforms/index_submissions.html')
         self.assertEqual(len(response.context['data_rows']), 2)
 
-    def test_list_submissions_filtered(self):
+    def test_list_submissions_filtering(self):
         response = self.client.get('/admin/forms/submissions/%d/?date_from=01%%2F01%%2F2014' % self.form_page.id)
 
         # Check response
         self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailforms/index_submissions.html')
         self.assertEqual(len(response.context['data_rows']), 1)
 
+    def test_list_submissions_pagination(self):
+        self.make_list_submissions()
+
+        response = self.client.get('/admin/forms/submissions/%d/' % self.form_page.id, {'p': 2})
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailforms/index_submissions.html')
+
+        # Check that we got the correct page
+        self.assertEqual(response.context['submissions'].number, 2)
+
+    def test_list_submissions_pagination_invalid(self):
+        self.make_list_submissions()
+
+        response = self.client.get('/admin/forms/submissions/%d/' % self.form_page.id, {'p': 'Hello World!'})
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailforms/index_submissions.html')
+
+        # Check that we got page one
+        self.assertEqual(response.context['submissions'].number, 1)
+
+    def test_list_submissions_pagination_out_of_range(self):
+        self.make_list_submissions()
+
+        response = self.client.get('/admin/forms/submissions/%d/' % self.form_page.id, {'p': 99999})
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailforms/index_submissions.html')
+
+        # Check that we got the last page
+        self.assertEqual(response.context['submissions'].number, response.context['submissions'].paginator.num_pages)
+
     def test_list_submissions_csv_export(self):
         response = self.client.get('/admin/forms/submissions/%d/?date_from=01%%2F01%%2F2014&action=CSV' % self.form_page.id)
 

From 2b4b19a6414d2a20654baf540fb89df907622de0 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 4 Jun 2014 16:38:44 +0100
Subject: [PATCH 055/293] Use reversed URLs in wagtailforms tests

---
 wagtail/wagtailforms/tests.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/wagtail/wagtailforms/tests.py b/wagtail/wagtailforms/tests.py
index 5145eae3f86..24bace8c521 100644
--- a/wagtail/wagtailforms/tests.py
+++ b/wagtail/wagtailforms/tests.py
@@ -3,6 +3,7 @@
 from django.test import TestCase
 from django.core import mail
 from django import forms
+from django.core.urlresolvers import reverse
 
 from wagtail.wagtailcore.models import Page
 from wagtail.wagtailforms.models import FormSubmission
@@ -122,7 +123,7 @@ def make_form_pages(self):
             ))
 
     def test_forms_index(self):
-        response = self.client.get('/admin/forms/')
+        response = self.client.get(reverse('wagtailforms_index'))
 
         # Check response
         self.assertEqual(response.status_code, 200)
@@ -133,7 +134,7 @@ def test_forms_index_pagination(self):
         self.make_form_pages()
 
         # Get page two
-        response = self.client.get('/admin/forms/', {'p': 2})
+        response = self.client.get(reverse('wagtailforms_index'), {'p': 2})
 
         # Check response
         self.assertEqual(response.status_code, 200)
@@ -147,7 +148,7 @@ def test_forms_index_pagination_invalid(self):
         self.make_form_pages()
 
         # Get page two
-        response = self.client.get('/admin/forms/', {'p': 'Hello world!'})
+        response = self.client.get(reverse('wagtailforms_index'), {'p': 'Hello world!'})
 
         # Check response
         self.assertEqual(response.status_code, 200)
@@ -161,7 +162,7 @@ def test_forms_index_pagination_out_of_range(self):
         self.make_form_pages()
 
         # Get page two
-        response = self.client.get('/admin/forms/', {'p': 99999})
+        response = self.client.get(reverse('wagtailforms_index'), {'p': 99999})
 
         # Check response
         self.assertEqual(response.status_code, 200)
@@ -174,13 +175,13 @@ def test_cannot_see_forms_without_permission(self):
         # Login with as a user without permission to see forms
         self.client.login(username='eventeditor', password='password')
 
-        response = self.client.get('/admin/forms/')
+        response = self.client.get(reverse('wagtailforms_index'))
 
         # Check that the user cannot see the form page
         self.assertFalse(self.form_page in response.context['form_pages'])
 
     def test_can_see_forms_with_permission(self):
-        response = self.client.get('/admin/forms/')
+        response = self.client.get(reverse('wagtailforms_index'))
 
         # Check that the user can see the form page
         self.assertTrue(self.form_page in response.context['form_pages'])
@@ -207,7 +208,7 @@ def make_list_submissions(self):
             submission.save()
 
     def test_list_submissions(self):
-        response = self.client.get('/admin/forms/submissions/%d/' % self.form_page.id)
+        response = self.client.get(reverse('wagtailforms_list_submissions', args=(self.form_page.id, )))
 
         # Check response
         self.assertEqual(response.status_code, 200)
@@ -215,7 +216,7 @@ def test_list_submissions(self):
         self.assertEqual(len(response.context['data_rows']), 2)
 
     def test_list_submissions_filtering(self):
-        response = self.client.get('/admin/forms/submissions/%d/?date_from=01%%2F01%%2F2014' % self.form_page.id)
+        response = self.client.get(reverse('wagtailforms_list_submissions', args=(self.form_page.id, )), {'date_from': '01/01/2014'})
 
         # Check response
         self.assertEqual(response.status_code, 200)
@@ -225,7 +226,7 @@ def test_list_submissions_filtering(self):
     def test_list_submissions_pagination(self):
         self.make_list_submissions()
 
-        response = self.client.get('/admin/forms/submissions/%d/' % self.form_page.id, {'p': 2})
+        response = self.client.get(reverse('wagtailforms_list_submissions', args=(self.form_page.id, )), {'p': 2})
 
         # Check response
         self.assertEqual(response.status_code, 200)
@@ -237,7 +238,7 @@ def test_list_submissions_pagination(self):
     def test_list_submissions_pagination_invalid(self):
         self.make_list_submissions()
 
-        response = self.client.get('/admin/forms/submissions/%d/' % self.form_page.id, {'p': 'Hello World!'})
+        response = self.client.get(reverse('wagtailforms_list_submissions', args=(self.form_page.id, )), {'p': 'Hello World!'})
 
         # Check response
         self.assertEqual(response.status_code, 200)
@@ -249,7 +250,7 @@ def test_list_submissions_pagination_invalid(self):
     def test_list_submissions_pagination_out_of_range(self):
         self.make_list_submissions()
 
-        response = self.client.get('/admin/forms/submissions/%d/' % self.form_page.id, {'p': 99999})
+        response = self.client.get(reverse('wagtailforms_list_submissions', args=(self.form_page.id, )), {'p': 99999})
 
         # Check response
         self.assertEqual(response.status_code, 200)
@@ -259,7 +260,7 @@ def test_list_submissions_pagination_out_of_range(self):
         self.assertEqual(response.context['submissions'].number, response.context['submissions'].paginator.num_pages)
 
     def test_list_submissions_csv_export(self):
-        response = self.client.get('/admin/forms/submissions/%d/?date_from=01%%2F01%%2F2014&action=CSV' % self.form_page.id)
+        response = self.client.get(reverse('wagtailforms_list_submissions', args=(self.form_page.id, )), {'date_from': '01/01/2014', 'action': 'CSV'})
 
         # Check response
         self.assertEqual(response.status_code, 200)

From 2f029fc336510ab40fc9cb29c3eaf74e3f252134 Mon Sep 17 00:00:00 2001
From: Ben Margolis <ben@sixpearls.com>
Date: Wed, 4 Jun 2014 11:28:14 -0700
Subject: [PATCH 056/293] adding custom img attrs to image_tags, but no custom
 TestCasecreated for it

---
 wagtail/wagtailimages/models.py               |  5 ++-
 .../templates/wagtailimages/imagetag.html     |  1 +
 .../wagtailimages/templatetags/image_tags.py  | 41 +++++++++++++------
 3 files changed, 33 insertions(+), 14 deletions(-)
 create mode 100644 wagtail/wagtailimages/templates/wagtailimages/imagetag.html

diff --git a/wagtail/wagtailimages/models.py b/wagtail/wagtailimages/models.py
index 24fd1f0bf18..bd2fc875178 100644
--- a/wagtail/wagtailimages/models.py
+++ b/wagtail/wagtailimages/models.py
@@ -12,6 +12,7 @@
 from django.utils.html import escape
 from django.conf import settings
 from django.utils.translation import ugettext_lazy  as _
+from django.template.loader import render_to_string
 
 from unidecode import unidecode
 
@@ -225,9 +226,9 @@ class AbstractRendition(models.Model):
     def url(self):
         return self.file.url
 
-    def img_tag(self):
+    def img_tag(self, attrs={}):
         return mark_safe(
-            '<img src="%s" width="%d" height="%d" alt="%s">' % (escape(self.url), self.width, self.height, escape(self.image.title))
+            render_to_string('wagtailimages/imagetag.html',{'self' : self, 'attrs' : attrs, })
         )
 
     class Meta:
diff --git a/wagtail/wagtailimages/templates/wagtailimages/imagetag.html b/wagtail/wagtailimages/templates/wagtailimages/imagetag.html
new file mode 100644
index 00000000000..d1049673927
--- /dev/null
+++ b/wagtail/wagtailimages/templates/wagtailimages/imagetag.html
@@ -0,0 +1 @@
+<img src="{{ self.url }}" width="{{ self.width }}" height="{{ self.height }}" alt="{{ self.image.title }}" {% for attr,value in attrs.items %}{{ attr }}="{{ value }}" {% endfor %}>
\ No newline at end of file
diff --git a/wagtail/wagtailimages/templatetags/image_tags.py b/wagtail/wagtailimages/templatetags/image_tags.py
index e59d9cd1486..48800d92078 100644
--- a/wagtail/wagtailimages/templatetags/image_tags.py
+++ b/wagtail/wagtailimages/templatetags/image_tags.py
@@ -7,32 +7,46 @@
 # Local cache of filters, avoid hitting the DB
 filters = {}
 
+
 @register.tag(name="image")
 def image(parser, token):
-    args = token.split_contents()
+    bits = token.split_contents()[1:]
+    image_var = bits[0]
+    filter_spec = bits[1]
+    bits = bits[2:]
 
-    if len(args) == 3:
+    if len(bits) == 0:
         # token is of the form {% image self.photo max-320x200 %}
-        tag_name, image_var, filter_spec = args
         return ImageNode(image_var, filter_spec)
 
-    elif len(args) == 5:
+    elif len(bits) == 2:
         # token is of the form {% image self.photo max-320x200 as img %}
-        tag_name, image_var, filter_spec, as_token, out_var = args
 
-        if as_token != 'as':
-            raise template.TemplateSyntaxError("'image' tag should be of the form {%% image self.photo max-320x200 %%} or {%% image self.photo max-320x200 as img %%}")
+        if bits[0] == 'as':
+            return ImageNode(image_var, filter_spec, output_var_name=bits[1])
+
+    if len(bits) > 0:
+        # customized <img> attrs
+        attrs = {}
+        for bit in bits:
+            try:
+                name,value = bit.split('=')
+            except:
+                raise template.TemplateSyntaxError("'image' tag should be of the form {%% image self.photo max-320x200 [ custom-attr=\"value\" [ ... ] ] %%} or {%% image self.photo max-320x200 as img %%}")
+            if name
+            attrs[name] = parser.compile_filter(value) # setup to resolve context variables as value
 
-        return ImageNode(image_var, filter_spec, out_var)
+        return ImageNode(image_var, filter_spec, attrs=attrs)
 
-    else:
-        raise template.TemplateSyntaxError("'image' tag should be of the form {%% image self.photo max-320x200 %%} or {%% image self.photo max-320x200 as img %%}")
+    # something is wrong if we made it this far
+    raise template.TemplateSyntaxError("'image' tag should be of the form {%% image self.photo max-320x200 [ custom-attr=\"value\" [ ... ] ] %%} or {%% image self.photo max-320x200 as img %%}")
 
 
 class ImageNode(template.Node):
-    def __init__(self, image_var_name, filter_spec, output_var_name=None):
+    def __init__(self, image_var_name, filter_spec, output_var_name=None, attrs={}):
         self.image_var = template.Variable(image_var_name)
         self.output_var_name = output_var_name
+        self.attrs = attrs
 
         if filter_spec not in filters:
             filters[filter_spec], _ = Filter.objects.get_or_create(spec=filter_spec)
@@ -66,4 +80,7 @@ def render(self, context):
             return ''
         else:
             # render the rendition's image tag now
-            return rendition.img_tag()
+            resolved_attrs = {}
+            for key in self.attrs:
+                resolved_attrs[key] = self.attrs[key].resolve(context)
+            return rendition.img_tag(resolved_attrs)

From f70768cc4e65dd07bf51629a07387f9dd6c959e0 Mon Sep 17 00:00:00 2001
From: Ben Margolis <ben@sixpearls.com>
Date: Wed, 4 Jun 2014 12:52:17 -0700
Subject: [PATCH 057/293] typo

---
 wagtail/wagtailimages/templatetags/image_tags.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/wagtail/wagtailimages/templatetags/image_tags.py b/wagtail/wagtailimages/templatetags/image_tags.py
index 48800d92078..e8a4c2191ba 100644
--- a/wagtail/wagtailimages/templatetags/image_tags.py
+++ b/wagtail/wagtailimages/templatetags/image_tags.py
@@ -33,7 +33,6 @@ def image(parser, token):
                 name,value = bit.split('=')
             except:
                 raise template.TemplateSyntaxError("'image' tag should be of the form {%% image self.photo max-320x200 [ custom-attr=\"value\" [ ... ] ] %%} or {%% image self.photo max-320x200 as img %%}")
-            if name
             attrs[name] = parser.compile_filter(value) # setup to resolve context variables as value
 
         return ImageNode(image_var, filter_spec, attrs=attrs)

From 0adab4f58d69c86b5ff6aab17efc7ede8c3f3823 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 5 Jun 2014 15:42:26 +0100
Subject: [PATCH 058/293] updates to tabs and forms

---
 .../wagtailadmin/static/wagtailadmin/scss/components/forms.scss | 1 +
 .../wagtailadmin/static/wagtailadmin/scss/components/tabs.scss  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index 29c44b4f3b8..3a6fc0d21ce 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -68,6 +68,7 @@ input, textarea, select, .richtext, .tagit{
 }
 
 /* select boxes */
+.choice_field .input,
 .typed_choice_field .input{
     position:relative;
 
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
index 7cd9a939743..984766b04f3 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
@@ -40,7 +40,7 @@
 
         &:after{
             @include border-radius(50px);
-            @include box-shadow(1px 1px 2px rgba(0, 0, 0, 0.2));
+            @include box-shadow(1px 2px 2px rgba(0, 0, 0, 0.1));
             position:absolute;
             right:-0.5em;
             top:-0.5em;

From b177c9fab40f1083ddb97227f6bbe16dc0596497 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 5 Jun 2014 17:05:21 +0100
Subject: [PATCH 059/293] styled datepicker nicer

---
 .../static/wagtailadmin/js/page-editor.js     |   7 +-
 .../scss/components/datetimepicker.scss       | 304 ++++++++++++++++++
 .../static/wagtailadmin/scss/core.scss        |   1 +
 .../scss/vendor/jquery.datetimepicker.css     | 304 ------------------
 .../templates/wagtailadmin/admin_base.html    |   1 -
 5 files changed, 307 insertions(+), 310 deletions(-)
 create mode 100644 wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery.datetimepicker.css

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index 7f27c4a3705..0d6c4d51f1b 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -57,22 +57,19 @@ function initDateChooser(id) {
     $('#' + id).datetimepicker({
         timepicker: false,
         format: 'Y-m-d',
-        mask: '9999-19-39'
     });
 }
 
 function initTimeChooser(id) {
     $('#' + id).datetimepicker({
         datepicker: false,
-        format: 'H:i:s',
-        mask: '29:59:59'
+        format: 'H:i',
     });
 }
 
 function initDateTimeChooser(id) {
     $('#' + id).datetimepicker({
-        format: 'Y-m-d H:i:s',
-        mask: '9999-19-39 29:59:59'
+        format: 'Y-m-d H:i',
     });
 }
 
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss
new file mode 100644
index 00000000000..078c9346999
--- /dev/null
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss
@@ -0,0 +1,304 @@
+.xdsoft_datetimepicker{
+	box-shadow: 0px 5px 10px -5px rgba(0, 0, 0, 0.4);
+	background: #FFFFFF;
+	border:1px solid darken($color-input-focus, 40%);
+	display: block;
+	padding: 8px;
+	padding-left: 0px;
+	padding-top: 2px;
+	position: absolute;
+	z-index: 9999;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	display:none;
+
+	*{
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+		padding:0px;
+		margin:0px;
+	}
+
+	iframe {
+	    position: absolute;
+	    left: 0;
+	    top: 0;
+	    width: 75px;
+	    height: 210px;
+	    background: transparent;
+	    border:none;
+	}
+
+	.xdsoft_datepicker, .xdsoft_timepicker{
+		display:none;
+
+		&.active{
+			display:block;
+		}
+	}
+	.xdsoft_datepicker{
+		float:left;
+		margin-left:8px;
+	}
+	.xdsoft_datepicker.active + .xdsoft_timepicker{
+		margin-top:8px;
+		margin-bottom:3px
+	}
+	.xdsoft_mounthpicker{
+		position: relative;
+		text-align: center;
+	}
+
+	.xdsoft_next, .xdsoft_prev, .xdsoft_today_button{
+		background-color: transparent;
+		cursor: pointer;
+		display: block;
+		border:0;
+		overflow: hidden;
+		padding: 5px 0px;
+		position: relative;
+		white-space: nowrap;
+		width: 2em;
+		color:$color-teal;
+		text-transform:none;
+		text-align:center;
+
+		&:before{
+			font-size:1.5em;
+			font-family:wagtail;
+			width:1em;
+			line-height:1.3em;
+			text-align:center;
+			margin:0;
+		}
+		&:hover{
+			color:$color-teal-darker;
+		}
+	}
+	.xdsoft_prev{
+		float: left;
+
+		&:before{
+			content:"z";
+		}
+	}
+	.xdsoft_today_button{
+		float: left;
+		margin-left:5px;
+
+		&:before{
+			content:"W";
+		}
+	}
+
+	.xdsoft_next{
+		float: right;
+
+		&:before{
+			content:"n";
+		}
+	}
+	
+	.xdsoft_timepicker{
+		width: 70px;
+		float:left;
+		text-align:center;
+		margin-left:8px;
+		margin-top:0px;
+
+		.xdsoft_prev,
+		.xdsoft_next{
+			float:none;
+			height: 1.5em;
+			display: block;
+			text-align:center;
+			width:100%;
+			padding:0;
+
+			&:before{
+				width:100%;
+			}
+		}
+
+		.xdsoft_prev:before{
+			content:"e";
+		}
+
+		.xdsoft_next:before{
+			content:"q";
+		}
+
+		.xdsoft_time_box{
+			position:relative;
+			border:1px solid #ccc;
+			height:170px;
+			overflow:hidden;
+			border-bottom:1px solid #DDDDDD;
+
+			> div > div{
+				background: #F5F5F5;
+				border-top:1px solid #DDDDDD;
+				color: #666666;
+				font-size: 1em;
+				text-align: center;
+				border-collapse:collapse;
+				cursor:pointer;
+				border-bottom-width:0px;
+				height:2.3em;
+				line-height:2.3em;
+
+				&:first-child{
+					border-top-width:0px;
+				}
+			}
+		}
+	}
+		
+	.xdsoft_label{
+		display: inline;
+	    position: relative;
+	    z-index: 9999;
+	    margin: 0;
+	    padding: 5px 3px;
+	    font-size: 14px;
+	    line-height: 20px;
+	    font-weight: bold;
+	    background-color: #fff;
+		float:left;
+		width:182px;
+		text-align:center;
+		cursor:pointer;
+
+		&:hover{
+			text-decoration:underline;
+		}
+
+		> .xdsoft_select{
+			border:1px solid #ccc;
+			position:absolute;
+			display:block;
+			right:0px;
+			top:30px;
+			z-index:101;
+			display:none;
+			background:#fff;
+			max-height:160px;
+			overflow-y:hidden;
+			
+			&.xdsoft_monthselect{right:-7px;}
+			&.xdsoft_yearselect{right:2px;}
+			
+			> div > .xdsoft_option:hover{
+				color: #fff;
+			    background: #ff8000;
+			}
+			> div > .xdsoft_option{
+				padding:2px 15px 2px 5px; 
+			}
+			> div > .xdsoft_option.xdsoft_current{
+				background: #33AAFF;
+				color:#fff;
+				font-weight: 700;
+			}
+		}
+
+	}
+
+	.xdsoft_month{
+		width:90px;
+		text-align:right;
+	}
+	.xdsoft_year{
+		width:56px;
+	}
+	.xdsoft_calendar{
+		clear:both;
+		
+		table{
+			border-collapse:collapse;
+		}
+		td > div{
+			padding-right:5px;
+		}
+		td, th{
+			width:14.285%;
+			border:1px solid #DDDDDD;
+			color: #666666;
+			font-size: 12px;
+			text-align: right;
+			padding:5px 7px;
+			border-collapse:collapse;
+			cursor:pointer;
+			height: 25px;
+		}
+		td{
+			background-color:white;
+		}
+		th{
+			background: #F1F1F1;
+			font-weight: 700;
+			font-size:0.85em;
+			text-align: center;
+			cursor:default;
+		}
+	}
+
+	.xdsoft_calendar td.xdsoft_default,
+	.xdsoft_calendar td.xdsoft_current,
+	.xdsoft_timepicker .xdsoft_time_box > div > div.xdsoft_current{
+		background: $color-orange;
+		color:#fff;
+		font-weight: 700;
+	}
+	.xdsoft_calendar td.xdsoft_other_month,
+	.xdsoft_calendar td.xdsoft_disabled,
+	.xdsoft_time_box > div > div.xdsoft_disabled{
+		opacity:0.5;
+		background:$color-grey-3;
+	}
+	
+	.xdsoft_calendar td.xdsoft_other_month.xdsoft_disabled{
+		opacity:0.2;
+	}
+	.xdsoft_calendar td:hover,
+	.xdsoft_timepicker .xdsoft_time_box > div > div:hover{
+		color: #fff;
+	    background: $color-teal;
+	}
+}
+
+.xdsoft_noselect{
+	-webkit-touch-callout: none;
+	-webkit-user-select: none;
+	-khtml-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	-o-user-select: none;
+	user-select: none;
+}
+.xdsoft_noselect::selection { background: transparent; }
+.xdsoft_noselect::-moz-selection { background: transparent; }
+.xdsoft_datetimepicker.xdsoft_inline{
+	display: inline-block;
+	position: static;
+	box-shadow: none;
+}
+
+.xdsoft_scroller_box{
+	position:relative;
+}
+.xdsoft_scrollbar{
+	position:absolute;
+	width:7px;
+	width:7px;
+	right:0px;
+	top:0px;
+	bottom:0px;
+	cursor:pointer;
+
+	> .xdsoft_scroller{
+		background:#ccc !important;
+		height:20px;
+		border-radius:3px;
+	}
+}
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
index 60200de208f..bfeb9b62504 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
@@ -12,6 +12,7 @@
 @import "components/messages.scss";
 @import "components/formatters.scss";
 @import "components/header.scss";
+@import "components/datetimepicker.scss";
 
 @import "fonts.scss";
 
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery.datetimepicker.css b/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery.datetimepicker.css
deleted file mode 100644
index dad45ed7e13..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery.datetimepicker.css
+++ /dev/null
@@ -1,304 +0,0 @@
-.xdsoft_datetimepicker{
-	box-shadow: 0px 5px 15px -5px rgba(0, 0, 0, 0.506);
-	background: #FFFFFF;
-	border-bottom: 1px solid #BBBBBB;
-	border-left: 1px solid #CCCCCC;
-	border-right: 1px solid #CCCCCC;
-	border-top: 1px solid #CCCCCC;
-	color: #333333;
-	display: block;
-	font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif;
-	padding: 8px;
-	padding-left: 0px;
-	padding-top: 2px;
-	position: absolute;
-	z-index: 9999;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
-	display:none;
-}
-
-.xdsoft_datetimepicker iframe {
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 75px;
-    height: 210px;
-    background: transparent;
-    border:none;
-}
-/*For IE8 or lower*/
-.xdsoft_datetimepicker button {
-    border:none !important;
-}
-
-.xdsoft_noselect{
-	-webkit-touch-callout: none;
-	-webkit-user-select: none;
-	-khtml-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	-o-user-select: none;
-	user-select: none;
-}
-.xdsoft_noselect::selection { background: transparent; }
-.xdsoft_noselect::-moz-selection { background: transparent; }
-.xdsoft_datetimepicker.xdsoft_inline{
-	display: inline-block;
-	position: static;
-	box-shadow: none;
-}
-.xdsoft_datetimepicker *{
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
-	padding:0px;
-	margin:0px;
-}
-.xdsoft_datetimepicker .xdsoft_datepicker, .xdsoft_datetimepicker  .xdsoft_timepicker{
-	display:none;
-}
-.xdsoft_datetimepicker .xdsoft_datepicker.active, .xdsoft_datetimepicker  .xdsoft_timepicker.active{
-	display:block;
-}
-.xdsoft_datetimepicker .xdsoft_datepicker{
-	width: 224px;
-	float:left;
-	margin-left:8px;
-}
-.xdsoft_datetimepicker  .xdsoft_timepicker{
-	width: 58px;
-	float:left;
-	text-align:center;
-	margin-left:8px;
-	margin-top:0px;
-}
-.xdsoft_datetimepicker  .xdsoft_datepicker.active+.xdsoft_timepicker{
-	margin-top:8px;
-	margin-bottom:3px
-}
-.xdsoft_datetimepicker  .xdsoft_mounthpicker{
-	position: relative;
-	text-align: center;
-}
-
-.xdsoft_datetimepicker  .xdsoft_prev, .xdsoft_datetimepicker  .xdsoft_next,.xdsoft_datetimepicker  .xdsoft_today_button{
-	background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAAAeCAYAAACsYQl4AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDozQjRCQjRGREU4MkNFMzExQjRDQkIyRDJDOTdBRUI1MCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpCQjg0OUYyNTZDODAxMUUzQjMwM0IwMERBNUU0ODQ5NSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpCQjg0OUYyNDZDODAxMUUzQjMwM0IwMERBNUU0ODQ5NSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkI5NzE3MjFBN0E2Q0UzMTFBQjJEQjgzMDk5RTNBNTdBIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjNCNEJCNEZERTgyQ0UzMTFCNENCQjJEMkM5N0FFQjUwIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+aQvATgAAAfVJREFUeNrsmr1OwzAQxzGtkPjYEAuvVGAvfQIGRKADE49gdLwDDwBiZ2RhQUKwICQkWLsgFiRQuIBTucFJ/XFp4+hO+quqnZ4uvzj2nV2RpukCW/22yAgYNINmc7du7DcghCjrkqgOKjF1znpt6rZ0AGWQj7TvCU8d9UM+QAGDrhdyc2Bnc1WVVPBev9V8lBnY+rDwncWZThG4xk4lmxtJy2AHgoY/FySgbSBPwPZ8mEXbQx3aDERb0EbYAYFC7pcAtAvkMWwC0D3NX58S9D/YnoGC7nPWr3Dg9JTbtuHhDShBT8D2CBSK/iIEvVXxpuxSgh7DdgwUTL4iA92zmJb6lKB/YTsECmV+IgK947AGDIqgQ/LojsO135Hn51l2cWlov0JdGNrPUceueXRwilSVgkUyom9Rd6gbLfYTDeO+1v6orn0InTogYDGUkYLO3/wc9BdqqTCKP1Tfi+oTIaCBIL2TES+GTyruT9S61p6BHam+99DFEAgLFklYsIBHwSI9QY80H5ta+1rB/6ovaKihBJeEJbgLbBlQgl+j3lDPqA2tfQV1j3pVn8s+oKHGTSVJ+FqDLeR5bCqJ2E/BCycsoLZETXaKGs7rhKVt+9HZScrZNMi88V8P7LlDbvOZYaJVpMMmBCT4n0o8dTBoNgbdWPsRYACs3r7XyNfbnAAAAABJRU5ErkJggg==');
-}
-.xdsoft_datetimepicker  .xdsoft_prev{
-    float: left;
-	background-position:-20px 0px;
-}
-.xdsoft_datetimepicker  .xdsoft_today_button{
-    float: left;
-	background-position:-70px 0px;
-	margin-left:5px;
-}
-
-.xdsoft_datetimepicker  .xdsoft_next{
-    float: right;
-	background-position:0px 0px;
-}
-.xdsoft_datetimepicker  .xdsoft_next:active,.xdsoft_datetimepicker  .xdsoft_prev:active{
-}
-.xdsoft_datetimepicker  .xdsoft_next,.xdsoft_datetimepicker  .xdsoft_prev ,.xdsoft_datetimepicker  .xdsoft_today_button{
-	background-color: transparent;
-	background-repeat: no-repeat;
-	border: 0px none currentColor;
-	cursor: pointer;
-	display: block;
-	height: 30px;
-	opacity: 0.5;
-	outline: medium none currentColor;
-	overflow: hidden;
-	padding: 0px;
-	position: relative;
-	text-indent: 100%;
-	white-space: nowrap;
-	width: 20px;
-}
-.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_prev,
-.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_next{
-	float:none;
-	background-position:-40px -15px;
-	height: 15px;
-	width: 30px;
-	display: block;
-	margin-left:14px;
-	margin-top:7px;
-}
-.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_prev{
-	background-position:-40px 0px;
-	margin-bottom:7px;
-	margin-top:0px;
-}
-.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_time_box{
-	height:151px;
-	overflow:hidden;
-	border-bottom:1px solid #DDDDDD;
-}
-.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_time_box >div >div{
-	background: #F5F5F5;
-	border-top:1px solid #DDDDDD;
-	color: #666666;
-	font-size: 12px;
-	text-align: center;
-	border-collapse:collapse;
-	cursor:pointer;
-	border-bottom-width:0px;
-	height:25px;
-	line-height:25px;
-}
-
-.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_time_box >div > div:first-child{
- border-top-width:0px;
-}
-.xdsoft_datetimepicker  .xdsoft_today_button:hover,
-.xdsoft_datetimepicker  .xdsoft_next:hover,
-.xdsoft_datetimepicker  .xdsoft_prev:hover {
-    opacity: 1;
-}
-.xdsoft_datetimepicker  .xdsoft_label{
-	display: inline;
-    position: relative;
-    z-index: 9999;
-    margin: 0;
-    padding: 5px 3px;
-    font-size: 14px;
-    line-height: 20px;
-    font-weight: bold;
-    background-color: #fff;
-	float:left;
-	width:182px;
-	text-align:center;
-	cursor:pointer;
-}
-.xdsoft_datetimepicker  .xdsoft_label:hover{
-	text-decoration:underline;
-}
-.xdsoft_datetimepicker  .xdsoft_label > .xdsoft_select{
-	border:1px solid #ccc;
-	position:absolute;
-	display:block;
-	right:0px;
-	top:30px;
-	z-index:101;
-	display:none;
-	background:#fff;
-	max-height:160px;
-	overflow-y:hidden;
-}
-.xdsoft_datetimepicker  .xdsoft_label > .xdsoft_select.xdsoft_monthselect{right:-7px;}
-.xdsoft_datetimepicker  .xdsoft_label > .xdsoft_select.xdsoft_yearselect{right:2px;}
-.xdsoft_datetimepicker  .xdsoft_label > .xdsoft_select > div > .xdsoft_option:hover{
-	color: #fff;
-    background: #ff8000;
-}
-.xdsoft_datetimepicker  .xdsoft_label > .xdsoft_select > div > .xdsoft_option{
-	padding:2px 10px 2px 5px; 
-}
-.xdsoft_datetimepicker  .xdsoft_label > .xdsoft_select > div > .xdsoft_option.xdsoft_current{
-	background: #33AAFF;
-	box-shadow: #178FE5 0px 1px 3px 0px inset;
-	color:#fff;
-	font-weight: 700;
-}
-.xdsoft_datetimepicker  .xdsoft_month{
-	width:90px;
-	text-align:right;
-}
-.xdsoft_datetimepicker  .xdsoft_calendar{
-	clear:both;
-}
-.xdsoft_datetimepicker  .xdsoft_year{
-	width:56px;
-}
-.xdsoft_datetimepicker  .xdsoft_calendar table{
-	border-collapse:collapse;
-	width:100%;
-	
-}
-.xdsoft_datetimepicker  .xdsoft_calendar td > div{
-	padding-right:5px;
-}
-.xdsoft_datetimepicker  .xdsoft_calendar th{
-	height: 25px;
-}
-.xdsoft_datetimepicker  .xdsoft_calendar td,.xdsoft_datetimepicker  .xdsoft_calendar th{
-	width:14.2857142%;
-	text-align:center;
-	background: #F5F5F5;
-	border:1px solid #DDDDDD;
-	color: #666666;
-	font-size: 12px;
-	text-align: right;
-	padding:0px;
-	border-collapse:collapse;
-	cursor:pointer;
-	height: 25px;
-}
-.xdsoft_datetimepicker  .xdsoft_calendar th{
-	background: #F1F1F1;
-}
-.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_today{
-	color:#33AAFF;
-}
-.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_default,
-.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_current,
-.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_time_box >div >div.xdsoft_current{
-	background: #33AAFF;
-	box-shadow: #178FE5 0px 1px 3px 0px inset;
-	color:#fff;
-	font-weight: 700;
-}
-.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_other_month,
-.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_disabled,
-.xdsoft_datetimepicker  .xdsoft_time_box >div >div.xdsoft_disabled{
-	opacity:0.5;
-}
-.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_other_month.xdsoft_disabled{
-	opacity:0.2;
-}
-.xdsoft_datetimepicker  .xdsoft_calendar td:hover,
-.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_time_box >div >div:hover{
-	color: #fff !important;
-    background: #ff8000 !important;
-    box-shadow: none !important;
-}
-.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_disabled:hover,
-.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_time_box >div >div.xdsoft_disabled:hover{
-	color: inherit	!important;
-    background: inherit !important;
-    box-shadow: inherit !important;
-}
-.xdsoft_datetimepicker  .xdsoft_calendar th{
-	font-weight: 700;
-	text-align: center;
-	color: #999;
-	cursor:default;
-}
-.xdsoft_datetimepicker  .xdsoft_copyright{ color:#ccc !important; font-size:10px;clear:both;float:none;margin-left:8px;}
-.xdsoft_datetimepicker  .xdsoft_copyright a{ color:#eee !important;}
-.xdsoft_datetimepicker  .xdsoft_copyright a:hover{ color:#aaa !important;}
-
-
-.xdsoft_time_box{
-	position:relative;
-	border:1px solid #ccc;
-}
-.xdsoft_scrollbar >.xdsoft_scroller{
-	background:#ccc !important;
-	height:20px;
-	border-radius:3px;
-}
-.xdsoft_scrollbar{
-	position:absolute;
-	width:7px;
-	width:7px;
-	right:0px;
-	top:0px;
-	bottom:0px;
-	cursor:pointer;
-}
-.xdsoft_scroller_box{
-position:relative;
-}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
index 160853aca44..8ec8efa05d8 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
@@ -4,7 +4,6 @@
 {% block css %}
     {% compress css %}
         <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css" />
-        <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/vendor/jquery.datetimepicker.css" />
         <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/core.scss" type="text/x-scss" />
     {% endcompress %}
 

From 1683287ee7b5c0780024ecb055513762f8828c34 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 3 Jun 2014 11:15:12 +0100
Subject: [PATCH 060/293] Change wagtailforms SelectDateForm to use
 DateTimeFields

This is because DateFields are not timezone aware which causes warnings to be raised by django.

The widgets are still set to "DateInput" so the look and behaviour should not change
---
 wagtail/wagtailforms/forms.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailforms/forms.py b/wagtail/wagtailforms/forms.py
index aaf16eb7925..4f874133a3b 100644
--- a/wagtail/wagtailforms/forms.py
+++ b/wagtail/wagtailforms/forms.py
@@ -100,11 +100,11 @@ def get_form_class(self):
 
 
 class SelectDateForm(django.forms.Form):
-    date_from = django.forms.DateField(
+    date_from = django.forms.DateTimeField(
         required=False,
         widget=django.forms.DateInput(attrs={'placeholder': 'Date from'})
     )
-    date_to = django.forms.DateField(
+    date_to = django.forms.DateTimeField(
         required=False,
         widget=django.forms.DateInput(attrs={'placeholder': 'Date to'})
     )

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 061/293] 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 346729653f2..cc9c6e65868 100755
--- a/runtests.py
+++ b/runtests.py
@@ -103,6 +103,7 @@
         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 0a864aacccf..932ac71a8ef 100644
--- a/wagtail/wagtailadmin/tests/test_account_management.py
+++ b/wagtail/wagtailadmin/tests/test_account_management.py
@@ -67,7 +67,7 @@ def test_logout(self):
         """
         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 @@ def test_logout(self):
         # 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 062/293] 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 932ac71a8ef..3553b8fba5b 100644
--- a/wagtail/wagtailadmin/tests/test_account_management.py
+++ b/wagtail/wagtailadmin/tests/test_account_management.py
@@ -92,7 +92,6 @@ def test_not_logged_in_redirect(self):
         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 806240c5c59..819caa92c8f 100644
--- a/wagtail/wagtailadmin/urls.py
+++ b/wagtail/wagtailadmin/urls.py
@@ -84,6 +84,13 @@
 ]
 
 
+# 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 4b39b7138939a75599a32b2a01b93175723e33cc Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 6 Jun 2014 14:21:47 +0100
Subject: [PATCH 063/293] moved styleguide to a contrib module

---
 wagtail/contrib/wagtailstyleguide/__init__.py |  0
 wagtail/contrib/wagtailstyleguide/models.py   |  0
 .../templates/wagtailstyleguide}/base.html    |  0
 .../wagtailstyleguide/views.py}               |  6 +----
 .../wagtailstyleguide/wagtail_hooks.py        | 26 +++++++++++++++++++
 wagtail/wagtailadmin/urls.py                  |  2 --
 6 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 wagtail/contrib/wagtailstyleguide/__init__.py
 create mode 100644 wagtail/contrib/wagtailstyleguide/models.py
 rename wagtail/{wagtailadmin/templates/wagtailadmin/styleguide => contrib/wagtailstyleguide/templates/wagtailstyleguide}/base.html (100%)
 rename wagtail/{wagtailadmin/views/styleguide.py => contrib/wagtailstyleguide/views.py} (81%)
 create mode 100644 wagtail/contrib/wagtailstyleguide/wagtail_hooks.py

diff --git a/wagtail/contrib/wagtailstyleguide/__init__.py b/wagtail/contrib/wagtailstyleguide/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/wagtail/contrib/wagtailstyleguide/models.py b/wagtail/contrib/wagtailstyleguide/models.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
similarity index 100%
rename from wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html
rename to wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
diff --git a/wagtail/wagtailadmin/views/styleguide.py b/wagtail/contrib/wagtailstyleguide/views.py
similarity index 81%
rename from wagtail/wagtailadmin/views/styleguide.py
rename to wagtail/contrib/wagtailstyleguide/views.py
index 68b1941569b..52c5433a1e7 100644
--- a/wagtail/wagtailadmin/views/styleguide.py
+++ b/wagtail/contrib/wagtailstyleguide/views.py
@@ -5,10 +5,6 @@
 from django.contrib import messages
 from django.contrib.auth.decorators import permission_required
 
-from wagtail.wagtailadmin.userbar import EditPageItem, AddPageItem, ApproveModerationEditPageItem, RejectModerationEditPageItem
-from wagtail.wagtailadmin import hooks
-from wagtail.wagtailcore.models import Page, PageRevision
-
 from wagtail.wagtailadmin.edit_handlers import PageChooserPanel
 from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
 from wagtail.wagtaildocs.edit_handlers import DocumentChooserPanel
@@ -41,7 +37,7 @@ def index(request):
     messages.warning(request, _("Warning message"))
     messages.error(request, _("Error message"))
 
-    return render(request, 'wagtailadmin/styleguide/base.html', {
+    return render(request, 'wagtailstyleguide/base.html', {
         'search_form': form,
         'example_form': example_form,
     })
diff --git a/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py b/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py
new file mode 100644
index 00000000000..ae2989be9ca
--- /dev/null
+++ b/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py
@@ -0,0 +1,26 @@
+from django.conf import settings
+from django.conf.urls import include, url
+from django.core import urlresolvers
+from django.utils.html import format_html, format_html_join
+from django.utils.translation import ugettext_lazy as _
+
+from wagtail.wagtailadmin import hooks
+from wagtail.wagtailadmin.menu import MenuItem
+
+from wagtail.wagtailimages import urls
+
+from . import views
+
+
+def register_admin_urls():
+    return [
+        url(r'^styleguide/$', views.index, name='wagtailstyleguide'),
+    ]
+hooks.register('register_admin_urls', register_admin_urls)
+
+
+def construct_main_menu(request, menu_items):
+    menu_items.append(
+        MenuItem(_('Styleguide'), urlresolvers.reverse('wagtailstyleguide'), classnames='icon icon-image', order=1000)
+    )
+hooks.register('construct_main_menu', construct_main_menu)
diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py
index 6eda643f5ef..1c513629249 100644
--- a/wagtail/wagtailadmin/urls.py
+++ b/wagtail/wagtailadmin/urls.py
@@ -87,8 +87,6 @@
 
     url(r'^userbar/(\d+)/$', userbar.for_frontend, name='wagtailadmin_userbar_frontend'),
     url(r'^userbar/moderation/(\d+)/$', userbar.for_moderation, name='wagtailadmin_userbar_moderation'),
-
-    url(r'^styleguide/$', styleguide.index, name='wagtailadmin_styleguide'),
 ]
 
 # Import additional urlpatterns from any apps that define a register_admin_urls hook

From 871f4fe37f7a004dd735ae4d6be5887ea7811bc6 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 6 Jun 2014 14:37:05 +0100
Subject: [PATCH 064/293] updated docs

---
 docs/contributing.rst | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index feb3b96f874..8796fbca8dd 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -17,6 +17,24 @@ Coding guidelines
 * PEP8. We ask that all Python contributions adhere to the `PEP8 <http://www.python.org/dev/peps/pep-0008/>`_ style guide, apart from the restriction on line length (E501). The `pep8 tool <http://pep8.readthedocs.org/en/latest/>`_ makes it easy to check your code, e.g. ``pep8 --ignore=E501 your_file.py``.
 * Tests. Wagtail has a suite of tests, which we are committed to improving and expanding. We run continuous integration at `travis-ci.org/torchbox/wagtail <https://travis-ci.org/torchbox/wagtail>`_ to ensure that no commits or pull requests introduce test failures. If your contributions add functionality to Wagtail, please include the additional tests to cover it; if your contributions alter existing functionality, please update the relevant tests accordingly.
 
+Styleguide
+~~~~~~~~~~
+
+Developers working on the wagtail UI or creating new UI components may wish to test their work against the Styleguide, which is provided as the contrib module "wagtailstyleguide".
+
+To install the styleguide module on your site, add it to the list of ``INSTALLED_APPS`` in your settings:
+
+.. code-block:: python
+
+	INSTALLED_APPS = (
+	   ...
+	   'wagtail.contrib.wagtailstyleguide',
+	   ...
+	)
+
+At present the styleguide is static: new UI components must be added to it manually, and there are no hooks into it for other modules to use. We hope to support hooks in the future.
+
+
 Translations
 ~~~~~~~~~~~~
 

From 7415f07d2a23da0c3ab318f1b0e294dade27426c Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 6 Jun 2014 14:38:36 +0100
Subject: [PATCH 065/293] updated docs

---
 docs/contributing.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index 8796fbca8dd..e8e42f1352c 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -34,6 +34,8 @@ To install the styleguide module on your site, add it to the list of ``INSTALLED
 
 At present the styleguide is static: new UI components must be added to it manually, and there are no hooks into it for other modules to use. We hope to support hooks in the future.
 
+The styleguide doesn't currently provide examples of all the core interface components, notably the Page, Document, Image and Snippet chooser interfaces are not currently represented.
+
 
 Translations
 ~~~~~~~~~~~~

From 38e4e6d361eab61d79c82c760d51173aceac7841 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 6 Jun 2014 14:44:44 +0100
Subject: [PATCH 066/293] added example of iconfield

---
 .../templates/wagtailstyleguide/base.html                  | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
index aa113ede749..0a68ad90c20 100644
--- a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
+++ b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
@@ -240,6 +240,8 @@ <h2>Forms</h2>
                     {% for field in example_form %}
                         {% if field.name == 'file' %}
                             {% include "wagtailimages/images/_file_field.html" %}
+                        {% elif field.name == 'date' %}
+                            {% include "wagtailadmin/shared/field_as_li.html" with input_classes="iconfield icon-date" %}
                         {% else %}
                             {% include "wagtailadmin/shared/field_as_li.html" %}
                         {% endif %}
@@ -254,8 +256,6 @@ <h3>Date picker</h3>
             <h3>Time picker</h3>
             <div class="timepicker"></div>
 
-
-
             <p>TODO: Rich text</p>            
             <p>TODO: page chooser</p>
             <p>TODO: image chooser</p>
@@ -388,10 +388,7 @@ <h2>Icons</h2>
             </ul>
 
         </section>
-
-
     </div>
-
    
 {% endblock %}
 

From 594785d564cec9cc29355707155c9e895739b728 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 6 Jun 2014 14:50:23 +0100
Subject: [PATCH 067/293] removed datepickers, due to be updated in a nearer PR

---
 .../templates/wagtailstyleguide/base.html     | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
index 0a68ad90c20..e7bd8860611 100644
--- a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
+++ b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
@@ -250,17 +250,14 @@ <h2>Forms</h2>
                 </ul>
             </form>
 
-            <h3>Date picker</h3>
-            <div class="datepicker"></div>
-
-            <h3>Time picker</h3>
-            <div class="timepicker"></div>
-
-            <p>TODO: Rich text</p>            
-            <p>TODO: page chooser</p>
-            <p>TODO: image chooser</p>
-            <p>TODO: document chooser</p>
-            <p>TODO: snippet chooser</p>
+            <h3>TODO: Date picker</h3>
+            <h3>TODO: Time picker</h3>
+            <h3>TODO: Datetime picker</h3>
+            <h3>TODO: Rich text input</h3>            
+            <h3>TODO: Page chooser</h3>
+            <h3>TODO: Image chooser</h3>
+            <h3>TODO: Document chooser</h3>
+            <h3>TODO: Snippet chooser</h3>
         </section>
 
         <section id="editor">
@@ -395,9 +392,7 @@ <h2>Icons</h2>
 {% block extra_js %}
 <script>
     $(function(){
-        $('.datepicker').datepicker();
-        $('.timepicker').timepicker();
-        $('.timepicker').timepicker('show');
+        
     })
 </script>
 {% endblock %}
\ No newline at end of file

From b5b4e5dee1926232d2f172008be5ace337735d17 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 6 Jun 2014 15:22:24 +0100
Subject: [PATCH 068/293] removed pre-contrib import

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

diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py
index 1c513629249..e7353420a6f 100644
--- a/wagtail/wagtailadmin/urls.py
+++ b/wagtail/wagtailadmin/urls.py
@@ -2,7 +2,7 @@
 from django.conf import settings
 
 from wagtail.wagtailadmin.forms import LoginForm, PasswordResetForm
-from wagtail.wagtailadmin.views import account, chooser, home, pages, tags, userbar, styleguide
+from wagtail.wagtailadmin.views import account, chooser, home, pages, tags, userbar
 from wagtail.wagtailadmin import hooks
 
 urlpatterns = [

From 81e37bbf7cf69c0d29e9bfd52897e29175788942 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 6 Jun 2014 15:30:24 +0100
Subject: [PATCH 069/293] pep8 space

---
 wagtail/wagtailadmin/urls.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py
index e7353420a6f..8fbf2f6e770 100644
--- a/wagtail/wagtailadmin/urls.py
+++ b/wagtail/wagtailadmin/urls.py
@@ -89,6 +89,7 @@
     url(r'^userbar/moderation/(\d+)/$', userbar.for_moderation, name='wagtailadmin_userbar_moderation'),
 ]
 
+
 # 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 cf3d6a4e66b646bf666b73fa0b16f9f2f5418c5b Mon Sep 17 00:00:00 2001
From: Jeffrey Hearn <jhearn@insidearm.com>
Date: Fri, 6 Jun 2014 10:58:14 -0400
Subject: [PATCH 070/293] Addition of attrs property to image template tag

---
 wagtail/wagtailimages/models.py |  6 ++++++
 wagtail/wagtailimages/tests.py  | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/wagtail/wagtailimages/models.py b/wagtail/wagtailimages/models.py
index 24fd1f0bf18..921f65921bf 100644
--- a/wagtail/wagtailimages/models.py
+++ b/wagtail/wagtailimages/models.py
@@ -225,6 +225,12 @@ class AbstractRendition(models.Model):
     def url(self):
         return self.file.url
 
+    @property
+    def attrs(self):
+        return mark_safe(
+            'src="%s" width="%d" height="%d" alt="%s"' % (escape(self.url), self.width, self.height, escape(self.image.title))
+        )
+
     def img_tag(self):
         return mark_safe(
             '<img src="%s" width="%d" height="%d" alt="%s">' % (escape(self.url), self.width, self.height, escape(self.image.title))
diff --git a/wagtail/wagtailimages/tests.py b/wagtail/wagtailimages/tests.py
index 00d1245e646..f36751650d8 100644
--- a/wagtail/wagtailimages/tests.py
+++ b/wagtail/wagtailimages/tests.py
@@ -183,6 +183,18 @@ def test_image_tag(self):
         self.assertTrue('height="300"' in result)
         self.assertTrue('alt="Test image"' in result)
 
+    def render_image_tag_as(self, image, filter_spec):
+        temp = template.Template('{% load image_tags %}{% image image_obj ' + filter_spec + ' as test_img %}<img {{ test_img.attrs }} />')
+        context = template.Context({'image_obj': image})
+        return temp.render(context)
+
+    def test_image_tag_attrs(self):
+        result = self.render_image_tag_as(self.image, 'width-400')
+
+        # Check that all the required HTML attributes are set
+        self.assertTrue('width="400"' in result)
+        self.assertTrue('height="300"' in result)
+        self.assertTrue('alt="Test image"' in result)
 
 ## ===== ADMIN VIEWS =====
 

From 5936c020d8099e8d3f8a54df1f2ef6520296d938 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 6 Jun 2014 16:28:51 +0100
Subject: [PATCH 071/293] Added I18N to new datetime picker

---
 .../static/wagtailadmin/js/page-editor.js     | 52 +++++++++++++++----
 .../wagtailadmin/pages/_editor_js.html        |  2 +
 .../shared/datetimepicker_translations.html   | 29 +++++++++++
 .../wagtailforms/index_submissions.html       | 14 ++++-
 4 files changed, 85 insertions(+), 12 deletions(-)
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/shared/datetimepicker_translations.html

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index 0d6c4d51f1b..83024b732e8 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -54,23 +54,55 @@ function insertRichTextDeleteControl(elem) {
 }
 
 function initDateChooser(id) {
-    $('#' + id).datetimepicker({
-        timepicker: false,
-        format: 'Y-m-d',
-    });
+    if (window.dateTimePickerTranslations) {
+        $('#' + id).datetimepicker({
+            timepicker: false,
+            format: 'Y-m-d',
+            i18n: {
+                lang: window.dateTimePickerTranslations
+            },
+            lang: 'lang'
+        });
+    } else {
+        $('#' + id).datetimepicker({
+            timepicker: false,
+            format: 'Y-m-d',
+        });
+    }
 }
 
 function initTimeChooser(id) {
-    $('#' + id).datetimepicker({
-        datepicker: false,
-        format: 'H:i',
-    });
+    if (window.dateTimePickerTranslations) {
+        $('#' + id).datetimepicker({
+            datepicker: false,
+            format: 'H:i',
+            i18n: {
+                lang: window.dateTimePickerTranslations
+            },
+            lang: 'lang'
+        });
+    } else {
+        $('#' + id).datetimepicker({
+            datepicker: false,
+            format: 'H:i',
+        });
+    }
 }
 
 function initDateTimeChooser(id) {
+    if (window.dateTimePickerTranslations) {
+        $('#' + id).datetimepicker({
+            format: 'Y-m-d H:i',
+            i18n: {
+                lang: window.dateTimePickerTranslations
+            },
+            language: 'lang'
+        });
+    } else {
     $('#' + id).datetimepicker({
-        format: 'Y-m-d H:i',
-    });
+            format: 'Y-m-d H:i',
+        });
+    }
 }
 
 function initTagField(id, autocompleteUrl) {
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
index b8334eae27c..3ddb8c1f36a 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
@@ -27,6 +27,8 @@
     {% hook_output 'insert_editor_js' %}
 {% endcompress %}
 
+{% include "wagtailadmin/shared/datetimepicker_translations.html" %}
+
 {% comment %}
     Additional js from widgets media. Allows for custom widgets in admin panel.
 {% endcomment %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/datetimepicker_translations.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/datetimepicker_translations.html
new file mode 100644
index 00000000000..cdbc9863883
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/datetimepicker_translations.html
@@ -0,0 +1,29 @@
+{% load i18n %}
+
+<script>
+    window.dateTimePickerTranslations = {
+        months: [
+            '{% trans "January" %}',
+            '{% trans "February" %}',
+            '{% trans "March" %}',
+            '{% trans "April" %}',
+            '{% trans "May" %}',
+            '{% trans "June" %}',
+            '{% trans "July" %}',
+            '{% trans "August" %}',
+            '{% trans "September" %}',
+            '{% trans "October" %}',
+            '{% trans "November" %}',
+            '{% trans "December" %}'
+        ],
+        dayOfWeek: [
+            '{% trans "Sun" %}',
+            '{% trans "Mon" %}',
+            '{% trans "Tue" %}',
+            '{% trans "Wed" %}',
+            '{% trans "Thu" %}',
+            '{% trans "Fri" %}',
+            '{% trans "Sat" %}'
+        ]
+    }
+</script>
diff --git a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
index 9b5ca941f2c..ae957229521 100644
--- a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
+++ b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
@@ -3,15 +3,25 @@
 {% block titletag %}{% blocktrans with form_title=form_page.title|capfirst %}Submissions of {{ form_title }}{% endblocktrans %}{% endblock %}
 {% block bodyclass %}menu-snippets{% endblock %}
 {% block extra_js %}
+    {% include "wagtailadmin/shared/datetimepicker_translations.html" %}
+
     <script>
         $(function() {
             $('#id_date_from').datetimepicker({
                 timepicker: false,
-                format: 'Y-m-d'
+                format: 'Y-m-d',
+                i18n: {
+                    lang: window.dateTimePickerTranslations
+                },
+                lang: 'lang'
             });
             $('#id_date_to').datetimepicker({
                 timepicker: false,
-                format: 'Y-m-d'
+                format: 'Y-m-d',
+                i18n: {
+                    lang: window.dateTimePickerTranslations
+                },
+                lang: 'lang'
             });
         });
     </script>

From 004b90d9cf54532a0f1d30f25001872c790ae814 Mon Sep 17 00:00:00 2001
From: Ben Margolis <ben@sixpearls.com>
Date: Fri, 6 Jun 2014 10:03:32 -0700
Subject: [PATCH 072/293] send init_new_page signal when creating a new page in
 the admin

---
 wagtail/wagtailadmin/signals.py     | 3 +++
 wagtail/wagtailadmin/views/pages.py | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 wagtail/wagtailadmin/signals.py

diff --git a/wagtail/wagtailadmin/signals.py b/wagtail/wagtailadmin/signals.py
new file mode 100644
index 00000000000..53a135584e5
--- /dev/null
+++ b/wagtail/wagtailadmin/signals.py
@@ -0,0 +1,3 @@
+from django.dispatch import Signal
+
+init_new_page = Signal(providing_args=["page","parent"])
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 69e6b7f4f43..f86306ae8c7 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -10,7 +10,7 @@
 
 from wagtail.wagtailadmin.edit_handlers import TabbedInterface, ObjectList
 from wagtail.wagtailadmin.forms import SearchForm
-from wagtail.wagtailadmin import tasks, hooks
+from wagtail.wagtailadmin import tasks, hooks, signals
 
 from wagtail.wagtailcore.models import Page, PageRevision, get_page_types
 
@@ -124,6 +124,7 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_
     #     return redirect('wagtailadmin_pages_select_type')
 
     page = page_class(owner=request.user)
+    signals.init_new_page.send(sender=create,page=page,parent=parent_page)
     edit_handler_class = get_page_edit_handler(page_class)
     form_class = edit_handler_class.get_form_class(page_class)
 

From de678ac8ba5312952ec90a4e89ef57cbf216d196 Mon Sep 17 00:00:00 2001
From: Robert Clark <robert@bablmedia.com>
Date: Fri, 6 Jun 2014 14:40:05 -0400
Subject: [PATCH 073/293] add next and previous published siblings to Page
 model

---
 wagtail/tests/fixtures/test.json              | 30 ++++++++++++++++++-
 wagtail/wagtailcore/models.py                 | 15 ++++++++++
 .../wagtailcore/tests/test_page_queryset.py   | 18 +++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/wagtail/tests/fixtures/test.json b/wagtail/tests/fixtures/test.json
index 11b82d9f169..8e316ffd882 100644
--- a/wagtail/tests/fixtures/test.json
+++ b/wagtail/tests/fixtures/test.json
@@ -39,7 +39,7 @@
     "model": "wagtailcore.page",
     "fields": {
         "title": "Events",
-        "numchild": 3,
+        "numchild": 4,
         "show_in_menus": true,
         "live": true,
         "depth": 3,
@@ -186,6 +186,34 @@
     }
 },
 
+{
+    "pk": 9,
+    "model": "wagtailcore.page",
+    "fields": {
+        "title": "Ameristralia Day",
+        "numchild": 0,
+        "show_in_menus": true,
+        "live": true,
+        "depth": 4,
+        "content_type": ["tests", "eventpage"],
+        "path": "0001000100010004",
+        "url_path": "/home/events/final-event/",
+        "slug": "final-event",
+        "owner": 3
+    }
+},
+{
+    "pk": 9,
+    "model": "tests.eventpage",
+    "fields": {
+        "date_from": "2015-04-22",
+        "audience": "public",
+        "location": "Ameristralia",
+        "body": "<p>come celebrate the independence of Ameristralia</p>",
+        "cost": "Free"
+    }
+},
+
 {
     "pk": 1,
     "model": "tests.formfield",
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 30ffc8a77f4..3b90e9c0e92 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -649,6 +649,21 @@ def get_descendants(self, inclusive=False):
     def get_siblings(self, inclusive=True):
         return Page.objects.sibling_of(self, inclusive)
 
+    def get_next_published_sibling(self):
+        next_sibling = self.get_next_sibling()
+
+        while next_sibling and not next_sibling.live:
+            next_sibling = next_sibling.get_next_sibling()
+
+        return next_sibling
+
+    def get_prev_published_sibling(self):
+        prev_sibling = self.get_prev_sibling()
+
+        while prev_sibling and not prev_sibling.live:
+            prev_sibling = prev_sibling.get_prev_sibling()
+
+        return prev_sibling
 
 def get_navigation_menu_items():
     # Get all pages that appear in the navigation menu: ones which have children,
diff --git a/wagtail/wagtailcore/tests/test_page_queryset.py b/wagtail/wagtailcore/tests/test_page_queryset.py
index 06f2c3e21c3..3db3bd5f8fd 100644
--- a/wagtail/wagtailcore/tests/test_page_queryset.py
+++ b/wagtail/wagtailcore/tests/test_page_queryset.py
@@ -254,3 +254,21 @@ def test_not_type(self):
         # 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_published_next(self):
+        events_index = Page.objects.get(url_path='/home/events/')
+        current_page = Page.objects.descendant_of(events_index).live().first()
+
+        # All pages must be live
+        while current_page:
+            self.assertTrue(current_page.live)
+            current_page = current_page.get_next_published_sibling()
+
+    def test_published_prev(self):
+        events_index = Page.objects.get(url_path='/home/events/')
+        current_page = Page.objects.descendant_of(events_index).live().last()
+
+        # All pages must be live
+        while current_page:
+            self.assertTrue(current_page.live)
+            current_page = current_page.get_prev_published_sibling()

From 9b17154cdf5c3770c7f5c44140952c21f759db27 Mon Sep 17 00:00:00 2001
From: Jeffrey Hearn <cowbellemoo@gmail.com>
Date: Thu, 5 Jun 2014 21:46:24 -0400
Subject: [PATCH 074/293] Added wagtail and django settings doc

more settings stuffs

settings stuff

settings stuff

so many things

omg is it really two AM

More docs
---
 docs/building_your_site/djangodevelopers.rst  |  17 +
 .../building_your_site/frontenddevelopers.rst |   3 +-
 docs/editing_api.rst                          |   4 +-
 .../new_pages/inserting_videos.rst            |   5 +-
 docs/form_builder.rst                         |   3 +
 docs/images/screen_wagtail_redirects.png      | Bin 0 -> 19260 bytes
 docs/index.rst                                |   1 +
 docs/settings.rst                             | 615 ++++++++++++++++++
 docs/wagtail_search.rst                       |   3 +
 9 files changed, 647 insertions(+), 4 deletions(-)
 create mode 100644 docs/images/screen_wagtail_redirects.png
 create mode 100644 docs/settings.rst

diff --git a/docs/building_your_site/djangodevelopers.rst b/docs/building_your_site/djangodevelopers.rst
index b4899d70f3e..46e24b08fec 100644
--- a/docs/building_your_site/djangodevelopers.rst
+++ b/docs/building_your_site/djangodevelopers.rst
@@ -1,9 +1,15 @@
 For Django developers
 =====================
 
+.. contents:: Contents
+    :local:
+
 .. note::
     This documentation is currently being written.
 
+Overview
+~~~~~~~~
+
 Wagtail requires a little careful setup to define the types of content that you want to present through your website. The basic unit of content in Wagtail is the ``Page``, and all of your page-level content will inherit basic webpage-related properties from it. But for the most part, you will be defining content yourself, through the construction of Django models using Wagtail's ``Page`` as a base.
 
 Wagtail organizes content created from your models in a tree, which can have any structure and combination of model objects in it. Wagtail doesn't prescribe ways to organize and interrelate your content, but here we've sketched out some strategies for organizing your models.
@@ -269,6 +275,7 @@ not_type(self, model):
     return self.get_query_set().not_type(model)
 
 
+.. _wagtail_site_admin:
 
 Site
 ~~~~
@@ -278,3 +285,13 @@ Django's built-in admin interface provides the way to map a "site" (hostname or
 Access this by going to ``/django-admin/`` and then "Home › Wagtailcore › Sites." To try out a development site, add a single site with the hostname ``localhost`` at port ``8000`` and map it to one of the pieces of content you have created.
 
 Wagtail's developers plan to move the site settings into the Wagtail admin interface.
+
+
+.. _redirects:
+
+Redirects
+~~~~~~~~~
+
+Wagtail provides a simple interface for creating arbitrary redirects to and from any URL.
+
+.. image:: ../images/screen_wagtail_redirects.png
diff --git a/docs/building_your_site/frontenddevelopers.rst b/docs/building_your_site/frontenddevelopers.rst
index e5f58339799..83dbb9e6cfe 100644
--- a/docs/building_your_site/frontenddevelopers.rst
+++ b/docs/building_your_site/frontenddevelopers.rst
@@ -1,7 +1,8 @@
 For Front End developers
 ========================
 
-.. contents::
+.. contents:: Contents
+    :local:
 
 ========================
 Overview
diff --git a/docs/editing_api.rst b/docs/editing_api.rst
index c0637002600..60698a74ac2 100644
--- a/docs/editing_api.rst
+++ b/docs/editing_api.rst
@@ -346,9 +346,9 @@ The ``RelatedLink`` class is a vanilla Django abstract model. The ``BookPageRela
 
 For another example of using model clusters, see :ref:`tagging`
 
-For more on ``django-modelcluster``, visit `the django-modelcluster github project page`_ ).
+For more on ``django-modelcluster``, visit `the django-modelcluster github project page`_.
 
-.. _the django-modelcluster github page: https://github.com/torchbox/django-modelcluster
+.. _the django-modelcluster github project page: https://github.com/torchbox/django-modelcluster
 
 
 .. _extending_wysiwyg:
diff --git a/docs/editor_manual/new_pages/inserting_videos.rst b/docs/editor_manual/new_pages/inserting_videos.rst
index 038f3e4274b..1b32c0d1c5a 100644
--- a/docs/editor_manual/new_pages/inserting_videos.rst
+++ b/docs/editor_manual/new_pages/inserting_videos.rst
@@ -1,3 +1,6 @@
+
+.. _inserting_videos:
+
 Inserting videos into body content
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -9,4 +12,4 @@ As well as inserting videos into a carousel, Wagtail's rich text fields allow yo
 
 .. image:: ../../images/screen21_video_in_editor.png	
 
-* A placeholder with the name of the video and a screenshot will be inserted into the text area. Clicking the X in the top corner will remove the video.
\ No newline at end of file
+* A placeholder with the name of the video and a screenshot will be inserted into the text area. Clicking the X in the top corner will remove the video.
diff --git a/docs/form_builder.rst b/docs/form_builder.rst
index 9aa220e1970..a141cc3768a 100644
--- a/docs/form_builder.rst
+++ b/docs/form_builder.rst
@@ -1,3 +1,6 @@
+
+.. _form_builder:
+
 Form builder
 ============
 
diff --git a/docs/images/screen_wagtail_redirects.png b/docs/images/screen_wagtail_redirects.png
new file mode 100644
index 0000000000000000000000000000000000000000..516bdd046551da4edeed93935626850ed0899ca8
GIT binary patch
literal 19260
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
Cc;LDK

literal 0
HcmV?d00001

diff --git a/docs/index.rst b/docs/index.rst
index abbb7fdbeaa..a35560f8241 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -9,6 +9,7 @@ It supports Django 1.6.2+ on Python 2.6 and 2.7. Django 1.7 and Python 3 support
    :maxdepth: 3
 
    gettingstarted
+   settings
    building_your_site/index
    editing_api
    snippets
diff --git a/docs/settings.rst b/docs/settings.rst
new file mode 100644
index 00000000000..c6e9a4fc0e5
--- /dev/null
+++ b/docs/settings.rst
@@ -0,0 +1,615 @@
+
+==============================
+Configuring Django for Wagtail
+==============================
+
+To install Wagtail completely from scratch, create a new Django project and an app within that project. For instructions on these tasks, see `Writing your first Django app`_. Your project directory will look like the following::
+
+  myproject/
+      myproject/
+          __init__.py
+          settings.py
+          urls.py
+          wsgi.py
+      myapp/
+          __init__.py
+          models.py
+          tests.py
+          admin.py
+          views.py
+      manage.py
+
+From your app directory, you can safely remove ``admin.py`` and ``views.py``, since Wagtail will provide this functionality for your models. Configuring Django to load Wagtail involves adding modules and variables to ``settings.py`` and urlconfs to ``urls.py``. For a more complete view of what's defined in these files, see `Django Settings`_ and `Django URL Dispatcher`_. 
+
+.. _Writing your first Django app: https://docs.djangoproject.com/en/dev/intro/tutorial01/
+
+.. _Django Settings: https://docs.djangoproject.com/en/dev/topics/settings/
+
+.. _Django URL Dispatcher:https://docs.djangoproject.com/en/dev/topics/http/urls/
+
+What follows is a settings reference which skips many boilerplate Django settings. If you just want to get your Wagtail install up quickly without fussing with settings at the moment, see :ref:`complete_example_config`.
+
+
+Middleware (settings.py)
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: python
+
+  MIDDLEWARE_CLASSES = (
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+
+    'wagtail.wagtailcore.middleware.SiteMiddleware',
+
+    'wagtail.wagtailredirects.middleware.RedirectMiddleware',
+  )
+
+Wagtail requires several common Django middleware modules to work and cover basic security. Wagtail provides its own middleware to cover these tasks:
+
+``SiteMiddleware``
+  Wagtail routes pre-defined hosts to pages within the Wagtail tree using this middleware. For configuring sites, see :ref:`wagtail_site_admin`.
+
+``RedirectMiddleware``
+  Wagtail provides a simple interface for adding arbitrary redirects to your site and this module makes it happen.
+
+
+Apps (settings.py)
+~~~~~~~~~~~~~~~~~~
+
+.. code-block:: python
+
+  INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+
+    'south',
+    'compressor',
+    'taggit',
+    'modelcluster',
+    'django.contrib.admin',
+
+    'wagtail.wagtailcore',
+    'wagtail.wagtailadmin',
+    'wagtail.wagtaildocs',
+    'wagtail.wagtailsnippets',
+    'wagtail.wagtailusers',
+    'wagtail.wagtailimages',
+    'wagtail.wagtailembeds',
+    'wagtail.wagtailsearch',
+    'wagtail.wagtailredirects',
+    'wagtail.wagtailforms',
+
+    'myapp',  # your own app
+  )
+
+Wagtail requires several Django app modules, third-party apps, and defines several apps of its own. Wagtail was built to be modular, so many Wagtail apps can be omitted to suit your needs. Your own app (here ``myapp``) is where you define your models, templates, static assets, template tags, and other custom functionality for your site.
+
+
+Third-Party Apps
+----------------
+
+``south``
+  Used for database migrations. See `South Documentation`_.
+
+.. _South Documentation: http://south.readthedocs.org/en/latest/
+
+``compressor``
+  Static asset combiner and minifier for Django. Compressor also enables for the use of preprocessors. See `Compressor Documentation`_.
+
+.. _Compressor Documentation: http://django-compressor.readthedocs.org/en/latest/
+
+``taggit``
+  Tagging framework for Django. This is used internally within Wagtail for image and document tagging and is available for your own models as well. See :ref:`tagging` for a Wagtail model recipe or the `Taggit Documentation`_.
+
+.. _Taggit Documentation: http://django-taggit.readthedocs.org/en/latest/index.html
+
+``modelcluster``
+  Extension of Django ForeignKey relation functionality, which is used in Wagtail pages for on-the-fly related object creation. For more information, see :ref:`inline_panels` or `the django-modelcluster github project page`_.
+
+.. _the django-modelcluster github project page: https://github.com/torchbox/django-modelcluster
+
+``django.contrib.admin``
+  The Django admin module. While Wagtail will eventually provide a sites-editing interface, the Django admin is included for now to provide that functionality.
+
+
+Wagtail Apps
+------------
+
+``wagtailcore``
+  The core functionality of Wagtail, such as the ``Page`` class, the Wagtail tree, and model fields.
+
+``wagtailadmin``
+  The administration interface for Wagtail, including page edit handlers.
+
+``wagtaildocs``
+  The Wagtail document content type.
+
+``wagtailsnippets``
+  Editing interface for non-Page models and objects. See :ref:`Snippets`.
+
+``wagtailusers``
+  User editing interface.
+
+``wagtailimages``
+  The Wagtail image content type.
+
+``wagtailembeds``
+  Module governing oEmbed and Embedly content in Wagtail rich text fields. See :ref:`inserting_videos`.
+
+``wagtailsearch``
+  Search framework for Page content. See :ref:`search`.
+
+``wagtailredirects``
+  Admin interface for creating arbitrary redirects on your site. See :ref:`redirects`.
+
+``wagtailforms``
+  Models for creating forms on your pages and viewing submissions. See :ref:`form_builder`.
+
+
+Settings Variables (settings.py)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Authentication
+--------------
+
+.. code-block:: python
+
+  LOGIN_URL = 'wagtail.wagtailadmin.views.account.login'
+  LOGIN_REDIRECT_URL = 'wagtailadmin_home'
+
+These settings variables set the Django authentication system to redirect to the Wagtail admin login. If you plan to use the Django authentication module to log in non-privileged users, you should set these variables to your own login views. See `Django User Authentication`_.
+
+.. _Django User Authentication: https://docs.djangoproject.com/en/dev/topics/auth/
+
+
+Site Name
+---------
+
+.. code-block:: python
+
+  WAGTAIL_SITE_NAME = 'Stark Industries Skunkworks'
+
+This is the human-readable name of your Wagtail install which welcomes users upon login to the Wagtail admin.
+
+
+Search
+------
+
+.. code-block:: python
+
+  # Override the search results template for wagtailsearch
+  WAGTAILSEARCH_RESULTS_TEMPLATE = 'myapp/search_results.html'
+  WAGTAILSEARCH_RESULTS_TEMPLATE_AJAX = 'myapp/includes/search_listing.html'
+
+  # Replace the search backend
+  WAGTAILSEARCH_BACKENDS = {
+    'default': {
+      'BACKEND': 'wagtail.wagtailsearch.backends.elasticsearch.ElasticSearch',
+      'INDEX': 'myapp'
+    }
+  }
+
+The search settings customize the search results templates as well as choosing a custom backend for search. For a full explanation, see :ref:`search`.
+
+
+Embeds
+------
+
+Wagtail uses the oEmbed standard with a large but not comprehensive number of "providers" (youtube, vimeo, etc.). You can also use a different embed backend by providing an Embedly key or replacing the embed backend by writing your own embed finder function. 
+
+.. code-block:: python
+
+  WAGTAILEMBEDS_EMBED_FINDER = 'myapp.embeds.my_embed_finder_function'
+
+Use a custom embed finder function, which takes a URL and returns a dict with metadata and embeddable HTML. Refer to the ``wagtail.wagtailemebds.embeds`` module source for more information and examples.
+
+.. code-block:: python
+
+  # not a working key, get your own!
+  EMBEDLY_KEY = '253e433d59dc4d2xa266e9e0de0cb830'
+
+Providing an API key for the Embedly service will use that as a embed backend, with a more extensive list of providers, as well as analytics and other features. For more information, see `Embedly`_.
+
+.. _Embedly: http://embed.ly/
+
+To use Embedly, you must also install their python module:
+
+.. code-block:: bash
+
+  $ pip install embedly
+
+
+Images
+------
+
+.. code-block:: python
+
+  WAGTAILIMAGES_IMAGE_MODEL = 'myapp.MyImage'
+
+This setting lets you provide your own image model for use in Wagtail, which might extend the built-in ``AbstractImage`` class or replace it entirely.
+
+
+Email Notifications
+-------------------
+
+.. code-block:: python
+
+  WAGTAILADMIN_NOTIFICATION_FROM_EMAIL = 'wagtail@myhost.io'
+
+Wagtail sends email notifications when content is submitted for moderation, and when the content is accepted or rejected. This setting lets you pick which email address these automatic notifications will come from.
+
+
+Other Django Settings Used by Wagtail
+-------------------------------------
+
+.. code-block:: python
+
+  ALLOWED_HOSTS
+  APPEND_SLASH
+  AUTH_USER_MODEL
+  BASE_URL
+  CACHES
+  DEFAULT_FROM_EMAIL
+  INSTALLED_APPS
+  MEDIA_ROOT
+  SESSION_COOKIE_DOMAIN
+  SESSION_COOKIE_NAME
+  SESSION_COOKIE_PATH
+  STATIC_URL
+  TEMPLATE_CONTEXT_PROCESSORS
+  USE_I18N
+
+For information on what these settings do, see `Django Settings`_.
+
+.. _Django Settings: https://docs.djangoproject.com/en/dev/ref/settings/
+
+
+URL Configuration (urls.py)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+There's one more setting that must be included in ``settings.py``:
+
+.. code-block:: python
+
+  ROOT_URLCONF = 'myproject.urls'
+
+This setting bootstraps your project's URL patterns and views into the Django server. The root urlconf will include URL patterns for Wagtail and any URLs for your own app functionality (developed external to Wagtail).
+
+
+Search Signal Handlers
+----------------------
+
+.. code-block:: python
+
+  from wagtail.wagtailsearch import register_signal_handlers as wagtailsearch_register_signal_handlers
+  
+  wagtailsearch_register_signal_handlers()
+
+This loads Wagtail's search signal handlers, which need to be loaded very early in the Django life cycle. While not technically a urlconf, this is a convenient place to load them.
+
+
+URL Patterns
+------------
+
+.. code-block:: python
+
+  from django.contrib import admin
+
+  from wagtail.wagtailcore import urls as wagtail_urls
+  from wagtail.wagtailadmin import urls as wagtailadmin_urls
+  from wagtail.wagtaildocs import urls as wagtaildocs_urls
+  from wagtail.wagtailsearch.urls import frontend as wagtailsearch_frontend_urls
+
+  admin.autodiscover()
+
+  urlpatterns = patterns('',
+    url(r'^django-admin/', include(admin.site.urls)),
+
+    url(r'^admin/', include(wagtailadmin_urls)),
+    url(r'^search/', include(wagtailsearch_frontend_urls)),
+    url(r'^documents/', include(wagtaildocs_urls)),
+
+    # Optional urlconf for including your own vanilla Django urls/views
+    url(r'', include('myapp.urls')),
+
+    # For anything not caught by a more specific rule above, hand over to
+    # Wagtail's serving mechanism
+    url(r'', include(wagtail_urls)),
+  )
+
+This block of code for your project's ``urls.py`` does a few things:
+
+* Load the vanilla Django admin interface to ``/django-admin/``
+* Load the Wagtail admin and its various apps
+* Dispatch any vanilla Django apps you're using other than Wagtail which require their own urlconfs (this is optional, since Wagtail might be all you need)
+* Lets Wagtail handle any further URL dispatching.
+
+That's not everything you might want to include in your project's urlconf, but it's what's necessary for Wagtail to flourish.
+
+
+.. _complete_example_config:
+
+Ready to Use Example Config Files
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+These two files should reside in your project directory (``myproject/myproject/``).
+
+
+settings.py
+-----------
+
+.. code-block:: python
+
+  import os
+
+  PROJECT_ROOT = os.path.join(os.path.dirname(__file__), '..', '..')
+
+  DEBUG = True
+  TEMPLATE_DEBUG = DEBUG
+
+  ADMINS = (
+      # ('Your Name', 'your_email@example.com'),
+  )
+
+  MANAGERS = ADMINS
+
+  # Default to dummy email backend. Configure dev/production/local backend
+  # as per https://docs.djangoproject.com/en/dev/topics/email/#email-backends
+  EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
+
+  DATABASES = {
+      'default': {
+          'ENGINE': 'django.db.backends.postgresql_psycopg2',
+          'NAME': 'myprojectdb',
+          'USER': 'postgres',
+          'PASSWORD': '',
+          'HOST': '',  # Set to empty string for localhost.
+          'PORT': '',  # Set to empty string for default.
+          'CONN_MAX_AGE': 600,  # number of seconds database connections should persist for
+      }
+  }
+
+  # Hosts/domain names that are valid for this site; required if DEBUG is False
+  # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
+  ALLOWED_HOSTS = []
+
+  # Local time zone for this installation. Choices can be found here:
+  # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
+  # although not all choices may be available on all operating systems.
+  # On Unix systems, a value of None will cause Django to use the same
+  # timezone as the operating system.
+  # If running in a Windows environment this must be set to the same as your
+  # system time zone.
+  TIME_ZONE = 'Europe/London'
+
+  # Language code for this installation. All choices can be found here:
+  # http://www.i18nguy.com/unicode/language-identifiers.html
+  LANGUAGE_CODE = 'en-gb'
+
+  SITE_ID = 1
+
+  # If you set this to False, Django will make some optimizations so as not
+  # to load the internationalization machinery.
+  USE_I18N = True
+
+  # If you set this to False, Django will not format dates, numbers and
+  # calendars according to the current locale.
+  # Note that with this set to True, Wagtail will fall back on using numeric dates
+  # in date fields, as opposed to 'friendly' dates like "24 Sep 2013", because
+  # Python's strptime doesn't support localised month names: https://code.djangoproject.com/ticket/13339
+  USE_L10N = False
+
+  # If you set this to False, Django will not use timezone-aware datetimes.
+  USE_TZ = True
+
+  # Absolute filesystem path to the directory that will hold user-uploaded files.
+  # Example: "/home/media/media.lawrence.com/media/"
+  MEDIA_ROOT = os.path.join(PROJECT_ROOT, 'media')
+
+  # URL that handles the media served from MEDIA_ROOT. Make sure to use a
+  # trailing slash.
+  # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
+  MEDIA_URL = '/media/'
+
+  # Absolute path to the directory static files should be collected to.
+  # Don't put anything in this directory yourself; store your static files
+  # in apps' "static/" subdirectories and in STATICFILES_DIRS.
+  # Example: "/home/media/media.lawrence.com/static/"
+  STATIC_ROOT = os.path.join(PROJECT_ROOT, 'static')
+
+  # URL prefix for static files.
+  # Example: "http://media.lawrence.com/static/"
+  STATIC_URL = '/static/'
+
+  # List of finder classes that know how to find static files in
+  # various locations.
+  STATICFILES_FINDERS = (
+      'django.contrib.staticfiles.finders.FileSystemFinder',
+      'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+      'compressor.finders.CompressorFinder',
+  )
+
+  # Make this unique, and don't share it with anybody.
+  SECRET_KEY = 'wq21wtjo3@d_qfjvd-#td!%7gfy2updj2z+nev^k$iy%=m4_tr'
+
+  # List of callables that know how to import templates from various sources.
+  TEMPLATE_LOADERS = (
+      'django.template.loaders.filesystem.Loader',
+      'django.template.loaders.app_directories.Loader',
+  )
+
+  MIDDLEWARE_CLASSES = (
+      'django.middleware.common.CommonMiddleware',
+      'django.contrib.sessions.middleware.SessionMiddleware',
+      'django.middleware.csrf.CsrfViewMiddleware',
+      'django.contrib.auth.middleware.AuthenticationMiddleware',
+      'django.contrib.messages.middleware.MessageMiddleware',
+      'django.middleware.clickjacking.XFrameOptionsMiddleware',
+
+      'wagtail.wagtailcore.middleware.SiteMiddleware',
+
+      'wagtail.wagtailredirects.middleware.RedirectMiddleware',
+  )
+
+  from django.conf import global_settings
+  TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
+      'django.core.context_processors.request',
+  )
+
+  ROOT_URLCONF = 'myproject.urls'
+
+  # Python dotted path to the WSGI application used by Django's runserver.
+  WSGI_APPLICATION = 'wagtaildemo.wsgi.application'
+
+  INSTALLED_APPS = (
+      'django.contrib.auth',
+      'django.contrib.contenttypes',
+      'django.contrib.sessions',
+      'django.contrib.messages',
+      'django.contrib.staticfiles',
+
+      'south',
+      'compressor',
+      'taggit',
+      'modelcluster',
+      'django.contrib.admin',
+
+      'wagtail.wagtailcore',
+      'wagtail.wagtailadmin',
+      'wagtail.wagtaildocs',
+      'wagtail.wagtailsnippets',
+      'wagtail.wagtailusers',
+      'wagtail.wagtailimages',
+      'wagtail.wagtailembeds',
+      'wagtail.wagtailsearch',
+      'wagtail.wagtailredirects',
+      'wagtail.wagtailforms',
+
+      'myapp',
+  )
+
+  EMAIL_SUBJECT_PREFIX = '[Wagtail] '
+
+  INTERNAL_IPS = ('127.0.0.1', '10.0.2.2')
+
+  # django-compressor settings
+  COMPRESS_PRECOMPILERS = (
+      ('text/x-scss', 'django_libsass.SassCompiler'),
+  )
+
+  # Auth settings
+  LOGIN_URL = 'django.contrib.auth.views.login'
+  LOGIN_REDIRECT_URL = 'wagtailadmin_home'
+
+  # A sample logging configuration. The only tangible logging
+  # performed by this configuration is to send an email to
+  # the site admins on every HTTP 500 error when DEBUG=False.
+  # See http://docs.djangoproject.com/en/dev/topics/logging for
+  # more details on how to customize your logging configuration.
+  LOGGING = {
+      'version': 1,
+      'disable_existing_loggers': False,
+      'filters': {
+          'require_debug_false': {
+              '()': 'django.utils.log.RequireDebugFalse'
+          }
+      },
+      'handlers': {
+          'mail_admins': {
+              'level': 'ERROR',
+              'filters': ['require_debug_false'],
+              'class': 'django.utils.log.AdminEmailHandler'
+          }
+      },
+      'loggers': {
+          'django.request': {
+              'handlers': ['mail_admins'],
+              'level': 'ERROR',
+              'propagate': True,
+          },
+      }
+  }
+
+
+  # WAGTAIL SETTINGS
+
+  # This is the human-readable name of your Wagtail install
+  # which welcomes users upon login to the Wagtail admin.
+  WAGTAIL_SITE_NAME = 'My Project'
+
+  # Override the search results template for wagtailsearch
+  # WAGTAILSEARCH_RESULTS_TEMPLATE = 'myapp/search_results.html'
+  # WAGTAILSEARCH_RESULTS_TEMPLATE_AJAX = 'myapp/includes/search_listing.html'
+
+  # Replace the search backend
+  #WAGTAILSEARCH_BACKENDS = {
+  #  'default': {
+  #    'BACKEND': 'wagtail.wagtailsearch.backends.elasticsearch.ElasticSearch',
+  #    'INDEX': 'myapp'
+  #  }
+  #}
+
+  # Wagtail email notifications from address
+  # WAGTAILADMIN_NOTIFICATION_FROM_EMAIL = 'wagtail@myhost.io'
+
+  # If you want to use Embedly for embeds, supply a key
+  # (this key doesn't work, get your own!)
+  # EMBEDLY_KEY = '253e433d59dc4d2xa266e9e0de0cb830'
+
+
+urls.py
+-------
+
+.. code-block:: python
+
+  from django.conf.urls import patterns, include, url
+  from django.conf.urls.static import static
+  from django.views.generic.base import RedirectView
+  from django.contrib import admin
+  from django.conf import settings
+  import os.path
+
+  from wagtail.wagtailcore import urls as wagtail_urls
+  from wagtail.wagtailadmin import urls as wagtailadmin_urls
+  from wagtail.wagtaildocs import urls as wagtaildocs_urls
+  from wagtail.wagtailsearch.urls import frontend as wagtailsearch_frontend_urls
+
+  admin.autodiscover()
+
+
+  # Signal handlers
+  from wagtail.wagtailsearch import register_signal_handlers as wagtailsearch_register_signal_handlers
+  wagtailsearch_register_signal_handlers()
+
+
+  urlpatterns = patterns('',
+      url(r'^django-admin/', include(admin.site.urls)),
+
+      url(r'^admin/', include(wagtailadmin_urls)),
+      url(r'^search/', include(wagtailsearch_frontend_urls)),
+      url(r'^documents/', include(wagtaildocs_urls)),
+
+      # For anything not caught by a more specific rule above, hand over to
+      # Wagtail's serving mechanism
+      url(r'', include(wagtail_urls)),
+  )
+
+
+  if settings.DEBUG:
+      from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+
+      urlpatterns += staticfiles_urlpatterns() # tell gunicorn where static files are in dev mode
+      urlpatterns += static(settings.MEDIA_URL + 'images/', document_root=os.path.join(settings.MEDIA_ROOT, 'images'))
+      urlpatterns += patterns('',
+          (r'^favicon\.ico$', RedirectView.as_view(url=settings.STATIC_URL + 'myapp/images/favicon.ico'))
+      )
+
+
+
diff --git a/docs/wagtail_search.rst b/docs/wagtail_search.rst
index 642a5e74148..d8922fa1e37 100644
--- a/docs/wagtail_search.rst
+++ b/docs/wagtail_search.rst
@@ -1,3 +1,6 @@
+
+.. _search:
+
 Search
 ======
 

From 4d6db52f9916e6dc4df11eb80a74b8b6f1c4ff49 Mon Sep 17 00:00:00 2001
From: Robert Clark <robert@bablmedia.com>
Date: Mon, 9 Jun 2014 10:04:33 -0400
Subject: [PATCH 075/293] made published siblings a single query

---
 wagtail/wagtailcore/models.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 3b90e9c0e92..1864f5c88b3 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -650,20 +650,10 @@ def get_siblings(self, inclusive=True):
         return Page.objects.sibling_of(self, inclusive)
 
     def get_next_published_sibling(self):
-        next_sibling = self.get_next_sibling()
-
-        while next_sibling and not next_sibling.live:
-            next_sibling = next_sibling.get_next_sibling()
-
-        return next_sibling
+        return self.get_siblings().live().filter(path__gt=self.path).order_by('path').first()
 
     def get_prev_published_sibling(self):
-        prev_sibling = self.get_prev_sibling()
-
-        while prev_sibling and not prev_sibling.live:
-            prev_sibling = prev_sibling.get_prev_sibling()
-
-        return prev_sibling
+        return self.get_siblings().live().filter(path__lt=self.path).order_by('-path').first()
 
 def get_navigation_menu_items():
     # Get all pages that appear in the navigation menu: ones which have children,

From 85793d3dbb3f5687efe9659ef7d0ced3c0f7e832 Mon Sep 17 00:00:00 2001
From: Jeffrey Hearn <jhearn@insidearm.com>
Date: Mon, 9 Jun 2014 11:47:12 -0400
Subject: [PATCH 076/293] Settings doc changes based on feedback

---
 docs/settings.rst | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index c6e9a4fc0e5..018af5d0154 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -25,7 +25,7 @@ From your app directory, you can safely remove ``admin.py`` and ``views.py``, si
 
 .. _Django Settings: https://docs.djangoproject.com/en/dev/topics/settings/
 
-.. _Django URL Dispatcher:https://docs.djangoproject.com/en/dev/topics/http/urls/
+.. _Django URL Dispatcher: https://docs.djangoproject.com/en/dev/topics/http/urls/
 
 What follows is a settings reference which skips many boilerplate Django settings. If you just want to get your Wagtail install up quickly without fussing with settings at the moment, see :ref:`complete_example_config`.
 
@@ -161,7 +161,7 @@ Authentication
 
 .. code-block:: python
 
-  LOGIN_URL = 'wagtail.wagtailadmin.views.account.login'
+  LOGIN_URL = 'wagtailadmin_login'
   LOGIN_REDIRECT_URL = 'wagtailadmin_home'
 
 These settings variables set the Django authentication system to redirect to the Wagtail admin login. If you plan to use the Django authentication module to log in non-privileged users, you should set these variables to your own login views. See `Django User Authentication`_.
@@ -243,7 +243,7 @@ Email Notifications
 
   WAGTAILADMIN_NOTIFICATION_FROM_EMAIL = 'wagtail@myhost.io'
 
-Wagtail sends email notifications when content is submitted for moderation, and when the content is accepted or rejected. This setting lets you pick which email address these automatic notifications will come from.
+Wagtail sends email notifications when content is submitted for moderation, and when the content is accepted or rejected. This setting lets you pick which email address these automatic notifications will come from. If omitted, Django will fall back to using the ``DEFAULT_FROM_EMAIL`` variable if set, and ``webmaster@localhost`` if not.
 
 
 Other Django Settings Used by Wagtail
@@ -271,18 +271,6 @@ For information on what these settings do, see `Django Settings`_.
 .. _Django Settings: https://docs.djangoproject.com/en/dev/ref/settings/
 
 
-URL Configuration (urls.py)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-There's one more setting that must be included in ``settings.py``:
-
-.. code-block:: python
-
-  ROOT_URLCONF = 'myproject.urls'
-
-This setting bootstraps your project's URL patterns and views into the Django server. The root urlconf will include URL patterns for Wagtail and any URLs for your own app functionality (developed external to Wagtail).
-
-
 Search Signal Handlers
 ----------------------
 
@@ -292,7 +280,7 @@ Search Signal Handlers
   
   wagtailsearch_register_signal_handlers()
 
-This loads Wagtail's search signal handlers, which need to be loaded very early in the Django life cycle. While not technically a urlconf, this is a convenient place to load them.
+This loads Wagtail's search signal handlers, which need to be loaded very early in the Django life cycle. While not technically a urlconf, this is a convenient place to load them. Calling this function registers signal handlers to watch for when indexed models get saved or deleted. This allows wagtailsearch to update ElasticSearch automatically.
 
 
 URL Patterns
@@ -437,7 +425,7 @@ settings.py
   )
 
   # Make this unique, and don't share it with anybody.
-  SECRET_KEY = 'wq21wtjo3@d_qfjvd-#td!%7gfy2updj2z+nev^k$iy%=m4_tr'
+  SECRET_KEY = 'change-me'
 
   # List of callables that know how to import templates from various sources.
   TEMPLATE_LOADERS = (
@@ -505,7 +493,7 @@ settings.py
   )
 
   # Auth settings
-  LOGIN_URL = 'django.contrib.auth.views.login'
+  LOGIN_URL = 'wagtailadmin_login'
   LOGIN_REDIRECT_URL = 'wagtailadmin_home'
 
   # A sample logging configuration. The only tangible logging

From e6008ccaee626d44138c8d58a7ec667af1a5b84b Mon Sep 17 00:00:00 2001
From: Ben Margolis <ben@sixpearls.com>
Date: Mon, 9 Jun 2014 11:24:19 -0700
Subject: [PATCH 077/293] fix kwarg spacing

---
 wagtail/wagtailadmin/views/pages.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index f86306ae8c7..5f0da8d009e 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -124,7 +124,7 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_
     #     return redirect('wagtailadmin_pages_select_type')
 
     page = page_class(owner=request.user)
-    signals.init_new_page.send(sender=create,page=page,parent=parent_page)
+    signals.init_new_page.send(sender=create, page=page, parent=parent_page)
     edit_handler_class = get_page_edit_handler(page_class)
     form_class = edit_handler_class.get_form_class(page_class)
 

From a3b4bcb558df5ec28c343e9cb2eca04c539a7635 Mon Sep 17 00:00:00 2001
From: Ben Margolis <ben@sixpearls.com>
Date: Tue, 10 Jun 2014 04:15:35 -0700
Subject: [PATCH 078/293] only send signal outside if not POSTing new page

---
 wagtail/wagtailadmin/views/pages.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 5f0da8d009e..b7a85dcedc7 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -124,7 +124,6 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_
     #     return redirect('wagtailadmin_pages_select_type')
 
     page = page_class(owner=request.user)
-    signals.init_new_page.send(sender=create, page=page, parent=parent_page)
     edit_handler_class = get_page_edit_handler(page_class)
     form_class = edit_handler_class.get_form_class(page_class)
 
@@ -173,6 +172,7 @@ def clean_slug(slug):
             messages.error(request, _("The page could not be created due to errors."))
             edit_handler = edit_handler_class(instance=page, form=form)
     else:
+        signals.init_new_page.send(sender=create, page=page, parent=parent_page)
         form = form_class(instance=page)
         edit_handler = edit_handler_class(instance=page, form=form)
 

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 079/293] 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 c0637002600..88fc9458f5e 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 eb70c215e94791cd212e5d2e7509a9c0bc0dfb2a Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 11 Jun 2014 09:48:07 +0100
Subject: [PATCH 080/293] Added test for wagtailstyleguide

---
 runtests.py                                |  1 +
 wagtail/contrib/wagtailstyleguide/tests.py | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 wagtail/contrib/wagtailstyleguide/tests.py

diff --git a/runtests.py b/runtests.py
index 6fd37ebeb84..022c1b50365 100755
--- a/runtests.py
+++ b/runtests.py
@@ -84,6 +84,7 @@
             'wagtail.wagtailsearch',
             'wagtail.wagtailredirects',
             'wagtail.wagtailforms',
+            'wagtail.contrib.wagtailstyleguide',
             'wagtail.tests',
         ],
 
diff --git a/wagtail/contrib/wagtailstyleguide/tests.py b/wagtail/contrib/wagtailstyleguide/tests.py
new file mode 100644
index 00000000000..71f8f6e7627
--- /dev/null
+++ b/wagtail/contrib/wagtailstyleguide/tests.py
@@ -0,0 +1,15 @@
+from django.test import TestCase
+from django.core.urlresolvers import reverse
+
+from wagtail.tests.utils import login
+
+
+class TestStyleGuide(TestCase):
+    def setUp(self):
+        login(self.client)
+
+    def test_styleguide(self):
+        response = self.client.get(reverse('wagtailstyleguide'))
+
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailstyleguide/base.html')

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 081/293] 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 03e4ecd45d6..9485e4619e1 100644
--- a/wagtail/wagtailsearch/forms.py
+++ b/wagtail/wagtailsearch/forms.py
@@ -31,6 +31,8 @@ class Meta:
 
 
 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 @@ def add_fields(self, form, *args, **kwargs):
 
         # 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 3c927d96c6c..f443d1a6a77 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 97332818e0e..bb39c02baed 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 0faad897b8d45075b7d3e610f49c72150f68044c Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 12 Jun 2014 16:00:31 +0100
Subject: [PATCH 082/293] updated font to include new padlock symbols

---
 .../wagtailadmin/scss/components/tabs.scss    |  13 +-
 .../scss/fonts/wagtail-icomoon.json           | 226 +++++++++---------
 .../wagtailadmin/scss/fonts/wagtail.eot       | Bin 26032 -> 26120 bytes
 .../wagtailadmin/scss/fonts/wagtail.svg       |   6 +-
 .../wagtailadmin/scss/fonts/wagtail.ttf       | Bin 25868 -> 25956 bytes
 .../wagtailadmin/scss/fonts/wagtail.woff      | Bin 15080 -> 15144 bytes
 6 files changed, 121 insertions(+), 124 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
index 984766b04f3..cd805186288 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
@@ -15,8 +15,7 @@
     }
     a{
         @include transition(border-color 0.2s ease);
-        @include box-shadow(inset 0px -2px 3px 0 rgba(0,0,0,0.1));
-        background-color:$color-grey-4;
+        background-color:lighten($color-teal-darker, 3%);
         outline:none;
         line-height:3em;
         text-transform:uppercase;
@@ -25,19 +24,17 @@
         text-decoration:none;
         display:block;
         padding:0 20px;
-        color:$color-grey-2;
-        border-top:0.3em solid $color-grey-4;
+        color:white;
+        border-top:0.3em solid $color-teal-darker;
         border-bottom:1px solid transparent;
 
         &:hover{
-            color:inherit;
-            border-top-color:$color-grey-2;
+            color:white;
+            border-top-color:$color-teal-dark;
         }
     }
 
     a.errors{
-        color:$color-red !important;
-
         &:after{
             @include border-radius(50px);
             @include box-shadow(1px 2px 2px rgba(0, 0, 0, 0.1));
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
index fead2733b81..12ad185e509 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
@@ -4,13 +4,57 @@
 		{
 			"icon": {
 				"paths": [
-					"M102.030 101.608v819.555h819.555v-819.555h-819.555zM352.717 791.689h-165.288v-85.398h301.65v85.398zM792.109 360.562h-604.678v-128.099h603.303v128.099zM790.731 591.965h-603.303v-128.099h603.303v128.099z"
+					"M516.006 87.25c-130.903 0-237.403 106.496-237.403 237.403v135.587c0 1.54-1.902 4.136-3.396 4.634-12.837 4.283-23.263 7.99-32.808 11.672-11.381 4.388-19.967 17-19.967 29.34v311.543c0 12.255 8.53 24.881 19.841 29.363 87.506 34.676 179.604 52.253 273.734 52.253s186.229-17.582 273.737-52.258c11.306-4.482 19.831-17.103 19.831-29.358v-311.543c0-12.342-8.585-24.953-19.971-29.345-9.548-3.68-19.976-7.391-32.804-11.672-1.49-0.497-3.39-3.095-3.39-4.634v-135.587c-0.001-130.903-106.498-237.399-237.401-237.399zM451.344 600.775c0-35.736 28.951-64.658 64.657-64.658 35.707 0 64.658 28.917 64.658 64.658 0 23.68-13.355 43.507-32.328 54.745v106.901c0 17.869-14.46 32.328-32.33 32.328-17.869 0-32.328-14.46-32.328-32.328v-106.901c-18.974-11.239-32.328-31.065-32.328-54.745zM671.777 324.648v116.988c-51.081-10.989-103.489-16.558-155.749-16.564-52.236 0-104.636 5.568-155.796 16.55v-116.975c0-85.892 69.876-155.771 155.771-155.771s155.777 69.878 155.777 155.772z"
 				],
+				"width": 1044,
 				"grid": 0,
 				"tags": [
-					"form"
+					"lock39 copy"
 				]
 			},
+			"properties": {
+				"order": 3,
+				"id": 67,
+				"prevSize": 32,
+				"code": 109,
+				"name": "lock39copy",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 0
+		},
+		{
+			"icon": {
+				"paths": [
+					"M788.176 475.115c-9.548-3.68-33.476-12.002-33.819-12.278-28.021-6.998-84.009-22.628-84.009-22.628-51.081-10.989-103.489-16.558-155.749-16.563-50.758 0-101.661 5.275-151.442 15.65l-77.844-77.846c-60.737-60.735-60.737-159.555 0-220.292s159.558-60.739 220.296-0.003l80.945 80.942c27.277-6.612 57.773-20.055 77.184-41.624-1.559 0.162-3.675-0.317-4.527-1.165l-95.875-95.875c-92.566-92.559-243.175-92.559-335.738 0.003-92.562 92.562-92.565 243.174 0 335.739l44.75 44.753c-12.177 4.076-22.199 7.649-31.381 11.191-11.381 4.388-19.967 17-19.967 29.34v311.543c0 12.255 8.53 24.881 19.841 29.363 87.506 34.676 179.604 52.253 273.734 52.253s186.229-17.582 273.737-52.258c11.306-4.482 19.831-17.103 19.831-29.358v-311.546c0.001-12.342-8.584-24.953-19.97-29.345zM546.904 654.092v106.901c0 17.869-14.46 32.328-32.33 32.328-17.869 0-32.328-14.46-32.328-32.328v-106.901c-18.974-11.238-32.328-31.064-32.328-54.745 0-35.736 28.951-64.658 64.657-64.658 35.707 0 64.658 28.917 64.658 64.658 0 23.682-13.356 43.507-32.328 54.745z"
+				],
+				"width": 1044,
+				"grid": 0,
+				"tags": [
+					"lock39-open"
+				]
+			},
+			"properties": {
+				"order": 4,
+				"id": 66,
+				"prevSize": 32,
+				"code": 112,
+				"name": "lock39-open",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 1
+		},
+		{
+			"icon": {
+				"paths": [
+					"M102.030 101.608v819.555h819.555v-819.555h-819.555zM352.717 791.689h-165.288v-85.398h301.65v85.398zM792.109 360.562h-604.678v-128.099h603.303v128.099zM790.731 591.965h-603.303v-128.099h603.303v128.099z"
+				],
+				"tags": [
+					"form"
+				],
+				"grid": 0
+			},
 			"properties": {
 				"order": 1,
 				"id": 63,
@@ -20,7 +64,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 0
+			"iconIdx": 4
 		},
 		{
 			"icon": {
@@ -39,7 +83,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 1
+			"iconIdx": 5
 		},
 		{
 			"icon": {
@@ -58,7 +102,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 2
+			"iconIdx": 6
 		},
 		{
 			"icon": {
@@ -77,7 +121,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 3
+			"iconIdx": 7
 		},
 		{
 			"icon": {
@@ -96,7 +140,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 4
+			"iconIdx": 8
 		},
 		{
 			"icon": {
@@ -115,7 +159,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 5
+			"iconIdx": 9
 		},
 		{
 			"icon": {
@@ -134,7 +178,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 6
+			"iconIdx": 10
 		},
 		{
 			"icon": {
@@ -153,7 +197,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 7
+			"iconIdx": 11
 		},
 		{
 			"icon": {
@@ -172,7 +216,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 8
+			"iconIdx": 12
 		},
 		{
 			"icon": {
@@ -191,7 +235,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 9
+			"iconIdx": 13
 		},
 		{
 			"icon": {
@@ -210,7 +254,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 10
+			"iconIdx": 14
 		},
 		{
 			"icon": {
@@ -229,26 +273,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 11
-		},
-		{
-			"icon": {
-				"paths": [
-					"M366 438h292v-108c0-42-14-76-42-104-30-28-64-44-104-44-40 0-74 16-104 44-28 28-42 62-42 104zM842 494v328c0 16-6 30-16 40-12 10-24 16-40 16h-548c-16 0-28-6-40-16-10-10-16-24-16-40v-328c0-16 6-28 16-40 12-10 24-16 40-16h18v-108c0-70 26-132 76-182s110-74 180-74c70 0 130 24 180 74 50 50 76 112 76 182v108h18c16 0 28 6 40 16 10 12 16 24 16 40z"
-				],
-				"defaultCode": 109,
-				"grid": 0
-			},
-			"properties": {
-				"id": 11,
-				"order": 13,
-				"prevSize": 32,
-				"code": 109,
-				"name": "uni6D",
-				"ligatures": ""
-			},
-			"setIdx": 0,
-			"iconIdx": 12
+			"iconIdx": 15
 		},
 		{
 			"icon": {
@@ -267,7 +292,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 13
+			"iconIdx": 17
 		},
 		{
 			"icon": {
@@ -286,7 +311,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 14
+			"iconIdx": 18
 		},
 		{
 			"icon": {
@@ -305,26 +330,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 15
-		},
-		{
-			"icon": {
-				"paths": [
-					"M988 330v146c0 10-4 18-12 26-6 6-16 10-26 10h-36c-10 0-18-4-26-10-6-8-10-16-10-26v-146c0-42-14-76-44-104-28-28-62-44-102-44-40 0-76 16-104 44-28 28-42 62-42 104v108h54c16 0 28 6 38 16 12 12 16 24 16 40v328c0 16-4 30-16 40-10 10-22 16-38 16h-548c-16 0-28-6-40-16-10-10-16-24-16-40v-328c0-16 6-28 16-40 12-10 24-16 40-16h384v-108c0-72 24-132 74-182s110-74 182-74c70 0 130 24 180 74 50 50 76 110 76 182z"
-				],
-				"defaultCode": 112,
-				"grid": 0
-			},
-			"properties": {
-				"id": 15,
-				"order": 17,
-				"prevSize": 32,
-				"code": 112,
-				"name": "uni70",
-				"ligatures": ""
-			},
-			"setIdx": 0,
-			"iconIdx": 16
+			"iconIdx": 19
 		},
 		{
 			"icon": {
@@ -343,7 +349,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 17
+			"iconIdx": 21
 		},
 		{
 			"icon": {
@@ -362,7 +368,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 18
+			"iconIdx": 22
 		},
 		{
 			"icon": {
@@ -381,7 +387,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 19
+			"iconIdx": 23
 		},
 		{
 			"icon": {
@@ -400,7 +406,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 20
+			"iconIdx": 24
 		},
 		{
 			"icon": {
@@ -419,7 +425,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 21
+			"iconIdx": 25
 		},
 		{
 			"icon": {
@@ -438,7 +444,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 22
+			"iconIdx": 26
 		},
 		{
 			"icon": {
@@ -457,7 +463,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 23
+			"iconIdx": 27
 		},
 		{
 			"icon": {
@@ -476,7 +482,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 24
+			"iconIdx": 28
 		},
 		{
 			"icon": {
@@ -495,7 +501,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 25
+			"iconIdx": 29
 		},
 		{
 			"icon": {
@@ -514,7 +520,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 26
+			"iconIdx": 30
 		},
 		{
 			"icon": {
@@ -533,7 +539,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 27
+			"iconIdx": 31
 		},
 		{
 			"icon": {
@@ -552,7 +558,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 28
+			"iconIdx": 32
 		},
 		{
 			"icon": {
@@ -571,7 +577,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 29
+			"iconIdx": 33
 		},
 		{
 			"icon": {
@@ -590,7 +596,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 30
+			"iconIdx": 34
 		},
 		{
 			"icon": {
@@ -609,7 +615,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 31
+			"iconIdx": 35
 		},
 		{
 			"icon": {
@@ -628,7 +634,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 32
+			"iconIdx": 36
 		},
 		{
 			"icon": {
@@ -647,7 +653,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 33
+			"iconIdx": 37
 		},
 		{
 			"icon": {
@@ -666,7 +672,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 34
+			"iconIdx": 38
 		},
 		{
 			"icon": {
@@ -685,7 +691,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 35
+			"iconIdx": 39
 		},
 		{
 			"icon": {
@@ -704,7 +710,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 36
+			"iconIdx": 40
 		},
 		{
 			"icon": {
@@ -723,7 +729,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 37
+			"iconIdx": 41
 		},
 		{
 			"icon": {
@@ -742,7 +748,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 38
+			"iconIdx": 42
 		},
 		{
 			"icon": {
@@ -761,7 +767,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 39
+			"iconIdx": 43
 		},
 		{
 			"icon": {
@@ -780,7 +786,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 40
+			"iconIdx": 44
 		},
 		{
 			"icon": {
@@ -799,7 +805,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 41
+			"iconIdx": 45
 		},
 		{
 			"icon": {
@@ -818,7 +824,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 42
+			"iconIdx": 46
 		},
 		{
 			"icon": {
@@ -837,7 +843,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 43
+			"iconIdx": 47
 		},
 		{
 			"icon": {
@@ -856,7 +862,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 44
+			"iconIdx": 48
 		},
 		{
 			"icon": {
@@ -875,7 +881,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 45
+			"iconIdx": 49
 		},
 		{
 			"icon": {
@@ -894,7 +900,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 46
+			"iconIdx": 50
 		},
 		{
 			"icon": {
@@ -913,7 +919,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 47
+			"iconIdx": 51
 		},
 		{
 			"icon": {
@@ -932,7 +938,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 48
+			"iconIdx": 52
 		},
 		{
 			"icon": {
@@ -951,7 +957,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 49
+			"iconIdx": 53
 		},
 		{
 			"icon": {
@@ -970,7 +976,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 50
+			"iconIdx": 54
 		},
 		{
 			"icon": {
@@ -989,7 +995,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 51
+			"iconIdx": 55
 		},
 		{
 			"icon": {
@@ -1008,7 +1014,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 52
+			"iconIdx": 56
 		},
 		{
 			"icon": {
@@ -1027,7 +1033,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 53
+			"iconIdx": 57
 		},
 		{
 			"icon": {
@@ -1046,7 +1052,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 54
+			"iconIdx": 58
 		},
 		{
 			"icon": {
@@ -1065,7 +1071,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 55
+			"iconIdx": 59
 		},
 		{
 			"icon": {
@@ -1084,7 +1090,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 56
+			"iconIdx": 60
 		},
 		{
 			"icon": {
@@ -1103,7 +1109,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 57
+			"iconIdx": 61
 		},
 		{
 			"icon": {
@@ -1122,7 +1128,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 58
+			"iconIdx": 62
 		},
 		{
 			"icon": {
@@ -1141,7 +1147,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 59
+			"iconIdx": 63
 		},
 		{
 			"icon": {
@@ -1160,7 +1166,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 60
+			"iconIdx": 64
 		},
 		{
 			"icon": {
@@ -1179,7 +1185,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 61
+			"iconIdx": 65
 		},
 		{
 			"icon": {
@@ -1198,7 +1204,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 62
+			"iconIdx": 66
 		},
 		{
 			"icon": {
@@ -1217,12 +1223,12 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 63
+			"iconIdx": 67
 		}
 	],
 	"height": 1024,
 	"metadata": {
-		"name": "wagtail"
+		"name": "icomoon"
 	},
 	"preferences": {
 		"showGlyphs": true,
@@ -1230,25 +1236,19 @@
 		"fontPref": {
 			"prefix": "icon-",
 			"metadata": {
-				"fontFamily": "wagtail",
-				"majorVersion": 1,
-				"minorVersion": 0
+				"fontFamily": "icomoon"
 			},
 			"metrics": {
 				"emSize": 512,
 				"baseline": 6.25,
 				"whitespace": 50
-			},
-			"includeMetadata": false,
-			"showMetrics": false,
-			"showMetadata": false,
-			"showVersion": false,
-			"resetPoint": 33
+			}
 		},
 		"imagePref": {},
 		"historySize": 100,
 		"showCodes": true,
 		"search": "",
-		"gridSize": 16
+		"gridSize": 16,
+		"showGrid": false
 	}
 }
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot
index 7d7860a83289d44e2dc32b0b001995f293d6a15c..bdadcd5ef1da44a7f28fd0af283427d32a52d5bd 100755
GIT binary patch
delta 1016
zcmZ9LO=uHA6vy9tGqc-GwrR52#uk&b&DORyG2OIDqf~>3iiZjXK~O5#G>uj;iTFiD
zAqpO(6r@DagW^f>D75HB^yEoV1o7ZS@F1R~7Ch_QXpp!&GrRBq-o7{U+nFb?@#Y&;
z9VY=6*Hm6^K5_$V`|ZxtP=Xp%xYwY%R?Pe-JUmdp_4&sf0Nw+bKe|*dF2aM@D}drA
z08B2iAimHTz`_XIgG-eQ%hzr5IopT$o8XyRspwn@d<Q5UXa7p2xO^67=`Gve*zT_u
zE9L2)jgLI34vyb*ws!sk2=+jE+Vg{;^%8E))&);5j(2ba_CpbtIW`fX7`nFRW&*+q
zh#1;&nuv>u@dD+!@55}Gh7;U(<4`t}W6KfQ0!@s^soM^a?hOw6_hDM(^4)3Sa7I1X
z3PI{k_J>hODT!pA_>vSFNH~_|BnCokG!<gMz;J)Ew_h24UH2P`q$WveLTG<ptG=)u
z_B97H5)B5U5feA8fn?7#A`;(1D!NZfNZqGNsrhs%ngS>G+=$aX+2nxr3pCSE$}lz6
zp=*?rN)ag~bEN4VYGsN9$MP^0jCOZ+c1MHjGlwHoCnnd2xA7^=!Bv1AX_0BR=5mMA
zn4QcQa6Hn71(A10(ao@y(DVS>tObPL<jich{bgGaO|(usz!o--EUxhKrRwT53_D!6
zeMUGOHik{V-}J}gQFBE3eTGDItz<eCvO*y%;!z|L0#OKt>^LEYoCp#VU^;Z!Ln^p=
zNId{LgAlB3A^!wqy|wmXGa8R^9ltq(Qt8sQ4s!lbYFEmNc(7ZnIWcn<f{Fi=j^(^E
zUfw2B=~dxsy7X|buN--1_VJ!{8->9WU3-6mpS*nv?_O4Kw4ROmg+BB(t}XoN@<EOL
zkG&Y;_r|r--R(momv*{4Ka38Jeod~XwAAXZRQknOaO{(tYK$+wZ$EmCV0l}i?R1_l
c)he}G71~5N3}rY47vT(_i*xP1M!7um8^?5+n*aa+

delta 927
zcmZ{jO=uHA6vyAZnc3N;`=M#Fn^0P7+EUYKOurIDEnWma4uwKR?ZIx-&=k@S+DMBB
zgD0gY+Z^;JVk<pKp@)hhcooHuixj;Tk5W`BdJ<n^8;RgyXXpRkn>X|O@6N4PZ0#kJ
zYgqtuQKrSit?`b<Q$cGEd>DfQjpLAC^gI6v+&f)tYrp>mfZYWchFsPkh1?Gb;FE?_
zjskoO+ep79-I|*y%-;a>Jn0=;voAlD@uP#*dw`6f{KAAkKMno(n)Geb&6EB_HfgWE
zAiYNQ$EK%d3&1G@qo2!p;JBV)-}*Zch9JgP*i&%fGC+NIZ%+c-6TBsAqq2F(3k55a
zmV>41m%L(kR}*?oTzQpA&<(n3V~I;$YNloB%C=061m9-J5v7#;*EXjYl4RAGAq~ec
zLT<#gy>NY<+OHI%l3Z~isZOSJ>LaDDajxl7nwG5(EOSi?OjY{`sqy7%>y#DoLWW@*
zQqo|Ayoi;mZU?Y_bHK$Sg8-p!6Y3;cvda}`(F*TL_J_OO=7inI(r#B1Bhp4z;m4?I
z)AkDcFx|(!bZ<{(vTI3*Ix|GZxxfH&P9TI#)@TGk);PrqljIF_YVp?)@gI|(?~;UV
zGvX4PV@P)VY_&1%#h5_B&MC*Vghm!pNGVNNrlZodGjgU04OdVJSypjYUL)v$<m3Y(
zG{H&Hs$M%>YhKu1-x}O74={k_&Y5dhoD<)n4$D6eyjlL(y7w+U9-)%b=EzqEV2JXo
z<r;bdrOnKp2K~^*SRl3<``Pg%J{<pWc=!k;mJ*+iK1xDqVf5Wd%>{uAkcAnTrOPr!
mpQjl*ApuFKshRV~3jTP$HV6Z>a15?Oo^IMqZLahzd;T}+Uy|AY

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
index dcfa5a08c60..96bbb662dcd 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
@@ -3,7 +3,7 @@
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>Generated by IcoMoon</metadata>
 <defs>
-<font id="wagtail" horiz-adv-x="512">
+<font id="icomoon" horiz-adv-x="512">
 <font-face units-per-em="512" ascent="480" descent="-32" />
 <missing-glyph horiz-adv-x="512" />
 <glyph unicode="&#x20;" d="" horiz-adv-x="256" />
@@ -57,10 +57,10 @@
 <glyph unicode="&#x6a;" d="M494 306v-201c0-17-7-32-19-45-13-13-28-19-45-19h-348c-17 0-32 6-45 19-12 13-19 28-19 45v274c0 18 7 33 19 46 13 12 28 18 45 18h92c17 0 32-6 45-18 12-13 19-28 19-46v-9h192c17 0 32-6 45-19 12-12 19-27 19-45z" />
 <glyph unicode="&#x6b;" d="M512 277v-227c0-12-4-23-13-32s-20-13-33-13h-420c-13 0-24 4-33 13s-13 20-13 32v227c8-9 18-17 29-25 69-47 116-79 142-98 11-8 20-15 26-19 7-4 16-9 27-14 12-4 22-7 32-7v0c10 0 20 3 32 7 11 5 20 10 27 14 6 4 15 11 26 19 33 23 80 56 142 98 11 8 21 16 29 25zM512 361c0-15-5-29-14-43s-21-25-35-35c-71-50-116-81-134-93-1-1-6-4-12-9-6-4-11-8-15-11-4-2-9-5-15-9-6-3-11-6-16-8-6-1-10-2-15-2v0c-5 0-9 1-15 2-5 2-10 5-16 8-6 4-11 7-15 9-4 3-9 7-15 11-6 5-11 8-12 9-18 12-43 30-75 52-33 23-52 36-59 41-12 8-23 19-33 33-11 14-16 27-16 39 0 15 4 27 12 37 8 10 19 15 34 15h420c13 0 23-5 32-14s14-19 14-32z" />
 <glyph unicode="&#x6c;" d="M347 389c0-5-1-10-5-13-4-4-8-6-13-6h-36v-292h36c5 0 9-2 13-6 4-3 5-8 5-13 0-5-1-9-5-12l-73-74c-4-3-8-5-13-5s-9 2-13 5l-73 74c-4 3-5 7-5 12s1 10 5 13c4 4 8 6 13 6h36v292h-36c-5 0-9 2-13 6-4 3-5 8-5 13 0 5 1 9 5 12l73 74c4 3 8 5 13 5s9-2 13-5l73-74c4-3 5-7 5-12z" />
-<glyph unicode="&#x6d;" d="M183 261h146v54c0 21-7 38-21 52-15 14-32 22-52 22-20 0-37-8-52-22-14-14-21-31-21-52zM421 233v-164c0-8-3-15-8-20-6-5-12-8-20-8h-274c-8 0-14 3-20 8-5 5-8 12-8 20v164c0 8 3 14 8 20 6 5 12 8 20 8h9v54c0 35 13 66 38 91s55 37 90 37c35 0 65-12 90-37 25-25 38-56 38-91v-54h9c8 0 14-3 20-8 5-6 8-12 8-20z" />
+<glyph unicode="&#x6d;" d="M258.003 436.375c-65.452 0-118.702-53.248-118.702-118.702v-67.793c0-0.77-0.951-2.068-1.698-2.317-6.418-2.142-11.632-3.995-16.404-5.836-5.691-2.194-9.983-8.5-9.983-14.67v-155.772c0-6.127 4.265-12.44 9.921-14.682 43.753-17.338 89.802-26.127 136.867-26.127s93.115 8.791 136.868 26.129c5.653 2.241 9.916 8.551 9.916 14.679v155.772c0 6.171-4.293 12.476-9.986 14.673-4.774 1.84-9.988 3.696-16.402 5.836-0.745 0.249-1.695 1.548-1.695 2.317v67.793c-0 65.452-53.249 118.7-118.7 118.7zM225.672 179.613c0 17.868 14.476 32.329 32.328 32.329 17.853 0 32.329-14.459 32.329-32.329 0-11.84-6.678-21.753-16.164-27.373v-53.45c0-8.935-7.23-16.164-16.165-16.164-8.935 0-16.164 7.23-16.164 16.164v53.45c-9.487 5.62-16.164 15.533-16.164 27.373zM335.889 317.676v-58.494c-25.541 5.494-51.745 8.279-77.875 8.282-26.118 0-52.318-2.784-77.898-8.275v58.488c0 42.946 34.938 77.885 77.886 77.885s77.888-34.939 77.888-77.886z" horiz-adv-x="522" />
 <glyph unicode="&#x6e;" d="M335 206c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3s-5 1-7 3l-14 14c-2 2-3 4-3 7 0 2 1 5 3 6l112 113-112 112c-2 2-3 4-3 7 0 2 1 4 3 6l14 14c2 2 5 3 7 3s5-1 7-3l133-133c2-2 3-4 3-6z" />
 <glyph unicode="&#x6f;" d="M171 309c0-14-5-26-15-36s-22-15-37-15c-14 0-26 5-36 15-10 10-15 22-15 36 0 15 5 27 15 37 10 10 22 15 36 15 15 0 27-5 37-15 10-10 15-22 15-37zM444 207v-120h-376v52l86 85 42-43 137 137zM469 395h-426c-3 0-5-1-6-3-2-2-3-4-3-6v-324c0-2 1-4 3-6 1-2 3-3 6-3h426c3 0 5 1 6 3 2 2 3 4 3 6v324c0 2-1 4-3 6-1 2-3 3-6 3zM512 386v-324c0-12-4-22-13-30-8-9-18-13-30-13h-426c-12 0-22 4-30 13-9 8-13 18-13 30v324c0 12 4 22 13 30 8 9 18 13 30 13h426c12 0 22-4 30-13 9-8 13-18 13-30z" />
-<glyph unicode="&#x70;" d="M494 315v-73c0-5-2-9-6-13-3-3-8-5-13-5h-18c-5 0-9 2-13 5-3 4-5 8-5 13v73c0 21-7 38-22 52-14 14-31 22-51 22-20 0-38-8-52-22-14-14-21-31-21-52v-54h27c8 0 14-3 19-8 6-6 8-12 8-20v-164c0-8-2-15-8-20-5-5-11-8-19-8h-274c-8 0-14 3-20 8-5 5-8 12-8 20v164c0 8 3 14 8 20 6 5 12 8 20 8h192v54c0 36 12 66 37 91s55 37 91 37c35 0 65-12 90-37 25-25 38-55 38-91z" />
+<glyph unicode="&#x70;" d="M394.088 242.442c-4.774 1.84-16.738 6.001-16.909 6.139-14.010 3.499-42.005 11.314-42.005 11.314-25.541 5.495-51.745 8.279-77.875 8.282-25.379 0-50.831-2.638-75.721-7.825l-38.922 38.923c-30.368 30.368-30.368 79.778 0 110.146s79.779 30.37 110.148 0.002l40.473-40.471c13.639 3.306 28.887 10.028 38.592 20.812-0.779-0.081-1.837 0.159-2.264 0.582l-47.938 47.938c-46.283 46.279-121.588 46.279-167.869-0.002-46.281-46.281-46.282-121.587 0-167.869l22.375-22.376c-6.089-2.038-11.1-3.825-15.691-5.595-5.691-2.194-9.984-8.5-9.984-14.67v-155.772c0-6.127 4.265-12.44 9.921-14.682 43.753-17.338 89.802-26.127 136.867-26.127s93.115 8.791 136.869 26.129c5.653 2.241 9.916 8.551 9.916 14.679v155.773c0 6.171-4.292 12.476-9.985 14.672zM273.452 152.954v-53.45c0-8.935-7.23-16.164-16.165-16.164-8.935 0-16.164 7.23-16.164 16.164v53.45c-9.487 5.619-16.164 15.532-16.164 27.373 0 17.868 14.476 32.329 32.329 32.329 17.853 0 32.329-14.459 32.329-32.329 0-11.841-6.678-21.753-16.164-27.373z" horiz-adv-x="522" />
 <glyph unicode="&#x71;" d="M399 270c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3s-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l15 15c1 1 4 2 6 2 3 0 5-1 7-2l112-113 112 113c2 1 4 2 7 2 2 0 5-1 6-2l15-15c2-2 3-4 3-6z" />
 <glyph unicode="&#x72;" d="M366 87v18c0 3-1 5-3 7-2 1-4 2-6 2h-202c-2 0-4-1-6-2-2-2-3-4-3-7v-18c0-3 1-5 3-7 2-1 4-2 6-2h202c2 0 4 1 6 2 2 2 3 4 3 7zM366 160v18c0 3-1 5-3 7s-4 2-6 2h-202c-2 0-4 0-6-2s-3-4-3-7v-18c0-3 1-5 3-7 2-1 4-2 6-2h202c2 0 4 1 6 2 2 2 3 4 3 7zM439 261v-229c0-8-3-14-8-19-5-6-12-8-20-8h-310c-8 0-15 2-20 8-5 5-8 11-8 19v384c0 8 3 14 8 19 5 6 12 8 20 8h155v-155c0-8 3-14 8-19 5-6 12-8 19-8zM438 297h-145v146c15-3 28-9 37-19l89-89c10-10 16-22 19-38z" />
 <glyph unicode="&#x73;" d="M457 105v201c0 8-3 14-8 20-5 5-12 8-19 8h-201c-8 0-15 2-20 8-5 5-8 12-8 19v18c0 8-3 15-8 20s-12 8-19 8h-92c-7 0-14-3-19-8s-8-12-8-20v-274c0-7 3-14 8-19 5-6 12-8 19-8h348c7 0 14 2 19 8 5 5 8 12 8 19zM494 306v-201c0-17-7-32-19-45-13-13-28-19-45-19h-348c-17 0-32 6-45 19-12 13-19 28-19 45v274c0 18 7 33 19 46 13 12 28 18 45 18h92c17 0 32-6 45-18 12-13 19-28 19-46v-9h192c17 0 32-6 45-19 12-12 19-27 19-45z" />
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf
index 38d2e1789c3dbff85017292ac2372a17f1b970bb..d2e09531318e38dd153af3e42274e525d46ddd4d 100755
GIT binary patch
delta 984
zcmY+DO=uHA6vy9tGrQYOwrR3SV~a_eW^2EarkgftmD<ol!Gl6kM3f4ero|STq_kBk
z3PJExiV9Kmpl7{Gi(ZPwgO?r@K|Dx75GkI-7Ch_Q)u7#-nVt84Z{A~mGrP8pU$^nz
zSoQAby-5Ik1aSHM>`Y-Ao<!dO6n+4}&@2n$3-tp`b+g?uTUuVZ6*4y2KE-SN^Oa)3
zy5ai{P`t?g)ly+)0Ve1z+uzuZmkXtt@s^E`0MiW|e{7+$v<!khFf;D>LD2K9{fVl8
z3dHaMZon86V1+{yK8m6pQtgaSSUwTOP>cp+VsIc&!`w$Po2IS=_oLXE&E(j!L^e-@
z12Jk2`ABmHi~XaR7P;Z(w6Hj%maB&#wI<_16jDkeStWiX1=<sqX<CW)02{7C>=zh}
zCtKr+?$tD}u8>qEDXI|apJ~|>3<W*zV1y%ne<W<+hS{EM8An9oS4f2(lOm+%QKeKp
zniQ_Ui5)lMcuO|fZvFz*&=o~DRHZ>vDJK<$NKs^tRINc-9U;N7JdF4w&5e!C5&!zr
z(_yL-lWW8K_yQ*3Ccu%j$hghjZdV$!L&JF-2)AKg4BNeEXIM+9nh!&)`Gn?jX10g^
zvds$@t#uG!9h*ZIS9$wVX=>E<P_P>E=)qu6?=rkz!yAo7jBds2(Iuj7Cex{a83>qR
zha!;>h(a)A%L*{$grArI)1m7QQo+qZ>HyFfgkWtS`4Eux`rf;YNG!^Ayhb-lMU%F9
zg7XJbeJL~Sz^=3A#LQU;CjL*lkaNm7d0nK^slwGX>EK@9J^RvV<11;`@*S6&j{gKN
zIoA~4ZIy4=zqQRm8+vLxg}o*ZRM`K_i6NfXcBUR4?(DwSWA}XM?daW2uBFt}T3;&t
zs^8!L$xhYo6yHzHL6Hxu#JvJ#I0rMZ2um>MT5-rg8f>=yi<v7{N|j3apa^Gp;T5<F
P^ZchQ9`w~-PoMk^op+N7

delta 929
zcmZ9JO-vI(6vyAZnc3M5`=Nz)+YksA2-a$?P}&$2JgOXsBp4$HSxQ4m_=?m(yfj{o
z2SN{eHA2#p(QqKqgI?v}$HjwQh#_7yL=8qy;@i^HtcRU>|M%v-ng4Hhx7odIwtAu5
z-ShAp0DAy10mXth1;t+yz#|RWA|?1I>?Zw|bXRe%v~mZ`Vbc55b7XcQ@5RTg_W*f8
z^}BQ4$|8*5YtpNvJLbK)LfWprBK?HUpIuy7DgmboOnvq1!13veA0uUiaY(QY_8cN`
z9iX|dKa;|q6z`1NsB9i~!!5O-^H{u=KhH9Qm>c8+tp70R>upE3oh!E%v_x7WYHN*4
zU23Lf>B_cDjRfCg$PuNK{Ldbz4M{SF<$BVPhGQ7vNX)d|XmgV~suZG<TyY`kpv>wt
zNJ?GfT+^jAEn6R5=b9AtIW$H{jjuOGXRVkUHVoU4k`^QE#;k1P2|fk}RTyHMU#{3#
zW)LC>djw&g3U$Xx)^J>N-eYqD(#CR;-gZWg+gObZ##Of#K;!0uXu>p^Au`SdhLCge
zL)HnAMm`9UQ?6N)yp>)bF!Ud+I;)p;M^W31MaZLLNH%b(F_`XROrT(wm19~$Ba)O-
zN)wjps2tsloM}SC4OBw<D#`pFK@TLLkA%<!Cq-TTb~FevYHtpXZJ9$1AiaO__6_IU
zPiR6PC%jqz*!6Ee*g;@Bq;)tf`@ku4Kskg;X7alOFixeaU#2fq$>i_1>c_7oLWyeP
z_lal8iR6cq6Q>}xmfAi2I1QE0`FE4c;K4MMXq|ysxC#Zh2}=|&(2whYGmwHb1kNmb
a(<N_aHkgD_YMh2!G{U0+frd(~F#H!c`-^=5

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff
index 6bb696528431c56c3d7eb25a55a2d63879c41315..446f38128f7b9ddf5eb39e67c84c8a093aa3577e 100755
GIT binary patch
delta 886
zcmY*XT}V@L6hC)*^QNW-8-?NrQBavWP1LD@kXRTrGnJr;&M8iGU(S`vWNh6#b;nJw
zcQafr>LF4ed~l*@LOxVag7nf;&=*0E_D~ai>D;NI_wYOa`}>`bd(XM|mt+2s^0BtA
zPTSO^1*p0V$v{`-SLtKrIWa%g<pn77{?sVL+WSQ%0Od}Kw#(oyB&iK1y_K}j#0O+B
z&CFc4-cDLY199#U8OAPsCut9em&Fmues3g^v?<~jWh8u86d6qegQTqhFc~u3%DbtX
zCjB5a)V!mlQ*qQbfLU+qB5j+JG%{+>uY9sv?DP^<@<a3DNT3KLCIZ7ST#vzGvRKSg
zB6BJ8`Q8AVO)+b_>>X#x!)bD5BhpQ#KJ75|@Q6NRYM89v{OxP63)%{{3YUu<>J;^h
z;(H~#*R`ctrOxPI#qw2GC^oZqTUC$EEm+UtEf#$~A0j{I^?Aq1coaC?SF<Qg3gY<M
z(7I;>H*h_;77_iEB8nWwC@6ZTy?(L@K7i<(zzGg_Sln*jsz<JOKd8dF*>D6SIP1h=
zbO~-ZHEm(h!}B*h=s|uOgB)(LZczx~Q!b{6<*2ZMwTU*r4avrBl>dRn)up9XT*W0L
zwsUE*AF&Q8Q=J)YEX-kCp}m}#SLOA)CUIgUV382}r>p@R_EWW8;5wJtzD3+zTv%A#
z#Kk@?YG7vr;pxzf4{2KD9=>698#UOfYi-4vbshK8!3y&DWTV2d6-<q-4gX)koESJ-
zK{@SUR22N&{+SZh!Dvt7lSv1Yc|<;lPcd?^hOiTd(8YV)LR6`~lEi>iUH&bXK4zNw
z)oxpQ^&d!45ChnGYvzwmsk$PUNtSdKztfY!Lh*SyM?v?JPV=Rs2Mk~V6Tt#zXn`*1
m2Rrn{SsoNaA*hKR%Q^f_PKwY-h27wQKG0Kx69rPF^3FdqY%Zh#

delta 814
zcmah{-%C?r7=Az9$y0_u3MGo@2PtGar-u8HXjF(aXkyw;P#tS*lAB{rr?xS2+u0d!
z&aH2tqg{A0WO||C{(^3zF2bAcLJF_E?V^t0P477y#IE`{&-b18d7t;;f$uBMAI-G}
z9mB(p@o@)$?Fh~QE!ze#-h8Ju(^(%G0q7rj?cM(5c--9!U>>0U3k~A+I@3#!<RdOm
zbwC4~V0o7`OPr;NYO#VQw^MpW+y$!pb+}c*O(b!nRNv50dsx%v_5>D)BQHkttm!R0
zI&1ex3uI`Gk?53;2czJXJWk@?k;tmS)KL85o0+9S+h@{T)lo|wFc^R_CI%%}K$@E7
z2G({ldmIohQ_t6^?Q_kv!)e<3hxmQ=u%RNY9HkHJF1s{zYoqf`*R`%?W1!pI{na$t
zbG~=4uetBw_F(Bx&0a@DwX3-nwH@)JfE%%VI2Xz-@gN3qDH;lg!?7it7u98J3!Yd6
zj4Cl%j>~Z+isH#83Q>%w;%PapyhkpgN(!FJq%-uTIEq=_bZ33LKx=Dl2X}BQQt%i2
z>(l5KaUzQXug8p%k<(;@(b6;HAd4I?tNSf@Pe3`DNF)?RPRb}Qq99{pC6Q8AldG5(
z@tdADlnYnVE=DPAIW105GETl}ITK$YU$LA$8H>x5{y*8<D&f^}J^k+5RyqCdzw{n-
zmBvgr>v-7w^9lp#m^$2i-Z=0Z>TBpi0QL*twTGdfJY*pW&s%;q0z9RDQPU94@x1lN
zWDq29(G!$l3Z~%+IKdCI^gjb$dJ8>Z1QS$gDwkVL!Wa#@V2&&#GN>Bh2R8d(Qb!GH


From b0d5b7cf956fd2222c97b78fafb3a52fcf632c60 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 12 Jun 2014 16:04:14 +0100
Subject: [PATCH 083/293] tweaking size of snippet icon

---
 .../wagtailadmin/scss/fonts/wagtail.eot       | Bin 26120 -> 26124 bytes
 .../wagtailadmin/scss/fonts/wagtail.svg       |   4 ++--
 .../wagtailadmin/scss/fonts/wagtail.ttf       | Bin 25956 -> 25960 bytes
 .../wagtailadmin/scss/fonts/wagtail.woff      | Bin 15144 -> 15144 bytes
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot
index bdadcd5ef1da44a7f28fd0af283427d32a52d5bd..b1fad90917fdfbaae391544f6366b12bda0d53c4 100755
GIT binary patch
delta 588
zcmeA;!`O3%k(DQnfgxiet2xVi+0ML)4kEne42cZs3?)D^lObnfq9K~VeAoJ~6}%M;
z42&}v7!qPKQWH}c=Bc<cFeH9qU|=xI017ZaV$x?|NYVlFRWfo*DjG$2&H(uVKs^FE
z`N@gOYx(6E7?Kl!@?E)!6$K3bOy_|7H$c8ZUSe*l0pE&~3=AneK=qad`Nbs+%s?52
zR1c6m12fa+WX31L^*szMjJFsMGDtG$F)*0xF`1dmF^lsti|a9~v&k`ui|aAkF^Y@v
zF{-KCF`M%-vu~FQ)s+s{b<z@N5>=JpW9AhV;$>xI;^5-+W#v|mOJ!2CwiDwLmXH(>
zR#cSb*W=KQnUW`OZEhsaA)%-vBjfCBCn@V2<R>pA=<KM+EEpB9&cr6DBrnU$B_=7u
z&%m(xvgk1%c}50?UO|DBcz&C&4BSj0cQc&dUw8yYPu`K#&e${AA^BzEIj(IyY`pvU
z*6>dfR1&NbQV}W>Iw7(`v_<TgIGcE$#4JfSsT<M_(wAgZWV;kq6sr_JC`Bl(P>xf+
zr*cO1gqoB(k9wbmhDL>^k>)imHLVxgeL5UEeY$#j2lR#X?-=M!?n=3sgc6$!VGOAZ
yMGVEjn9XO%0|urcFz^f*P}Gzsrk5mU=Aa5P1OYXsGn6vq0Fy-#s@&wgsonq@T#K0i

delta 585
zcmeA<!`N|#k(DEjfgxogt2xVur3QSH7p92tW-=r*<TK;~aXv%d#6&|hf%&fW{r5jc
zGcYjDU|>jy$Vg30VVEm>lz}1f0|NttSq4ym`4N*o14EJqkgt-FTT;;|!m|g+_W|k=
z$jMJmRIcWG$H0&r1C;N|O{^$j@Mk&)<i7y&74i~uQ(YvsTm!m_1E}7zAiubTff*>n
zkm>@GXJBU9oXq${xW4B9Gsf?X4;UmF^cWb-^_a}e<(S3!n8o#&)nypv7{$f)80{Fv
zMfe!i)a{tf`Iy<)$|ab{CmH+bNi&J-NC~hAh>7vCb8&Nrv+`<W6>GY<O7n`yNr^}(
zYsiU+aT;f?s8w;cvy|eLRx?si^!9O=Q4EibR2CKS@iJjf&*9Z!Vi!?UR^;cFl2H)c
zd|mXIk37(Q29xbn;`wd9GH^42+{|!(e_jiWp1dciov~)JOY+OaGhADESa|pFt>T{`
zs32G&q$E@#bWCKKXp`6xaTf6$i5ZeEQrD#Gq%X)Q$#y6zDOM=HQwmdBrW~VuN9C02
zF*ONwF7+M_HH|V&1I;U1Dq7F9dvw@zdUSR4_UQ}g-!jmd+?R4O2_+^O!WdE+iWrI+
vGC}bQ3`j#@z!?B}NU@!noS&PYpNA^Q5Cqhi&QQvb!;lCx07b*(gQ?yCy=;+8

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
index 96bbb662dcd..4efa0249c4a 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
@@ -3,7 +3,7 @@
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>Generated by IcoMoon</metadata>
 <defs>
-<font id="icomoon" horiz-adv-x="512">
+<font id="wagtail" horiz-adv-x="512">
 <font-face units-per-em="512" ascent="480" descent="-32" />
 <missing-glyph horiz-adv-x="512" />
 <glyph unicode="&#x20;" d="" horiz-adv-x="256" />
@@ -22,7 +22,7 @@
 <glyph unicode="&#x41;" d="M232 109l176 175c3 4 5 8 5 13s-2 9-5 13l-29 29c-4 4-8 6-13 6s-10-2-13-6l-134-133-60 60c-3 4-8 5-13 5s-9-1-13-5l-29-29c-3-4-5-8-5-13s2-9 5-13l103-102c3-4 7-6 12-6s10 2 13 6zM475 361v-274c0-23-8-42-24-58s-35-24-58-24h-274c-23 0-42 8-58 24s-24 35-24 58v274c0 23 8 42 24 58s35 24 58 24h274c23 0 42-8 58-24s24-35 24-58z" />
 <glyph unicode="&#x42;" d="M384 206v36c0 5-2 10-5 13-4 4-8 6-13 6h-73v73c0 5-2 9-6 13-3 3-8 5-13 5h-36c-5 0-10-2-13-5-4-4-6-8-6-13v-73h-73c-5 0-9-2-13-6-3-3-5-8-5-13v-36c0-5 2-10 5-13 4-4 8-6 13-6h73v-73c0-5 2-9 6-13 3-3 8-5 13-5h36c5 0 10 2 13 5 4 4 6 8 6 13v73h73c5 0 9 2 13 6 3 3 5 8 5 13zM475 224c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z" />
 <glyph unicode="&#x43;" d="M213 45c15-6 28-9 40-9 25 0 46 4 62 12 16 8 28 19 35 32 7 14 11 31 11 52 0 22-4 39-12 51-11 18-24 30-40 36-15 7-39 10-71 10-14 0-23-1-29-3v-91l1-77c0-3 1-7 3-13zM209 259c9-2 19-2 32-2 33 0 58 6 75 18 17 13 25 34 25 64 0 21-8 39-24 54-16 14-40 21-73 21-10 0-22-1-37-4 0-8 0-15 1-22 1-23 2-50 1-79v-28c0-9 0-16 0-22zM55 5v26c9 2 15 3 20 4 15 2 26 5 35 9 3 5 5 10 6 14 2 13 3 31 3 56l-1 142c-1 48-2 87-3 115 0 17-1 27-3 31 0 1-1 2-3 4-4 2-10 3-20 4-6 0-16 2-32 4l-2 23 75 2 108 4h13c1 0 2 0 4 0s3 0 4 0c0 0 2 0 6 0s8 0 12 0h21c17 0 35-2 55-8 8-2 17-6 27-11 11-5 21-12 29-21 9-9 15-19 19-30 4-11 6-23 6-35 0-13-3-26-9-37-7-11-16-21-28-30-5-3-19-11-42-22 33-7 59-21 76-41 17-20 26-43 26-68 0-14-3-30-8-46-4-12-11-23-20-33-13-14-26-24-40-31-14-7-34-13-58-17-16-3-35-4-57-3l-56 1c-16 0-45-1-85-3-7-1-33-2-78-3z" />
-<glyph unicode="&#x44;" d="M173 22c-80 23-309 124-49 458 140-95 194-179 204-248-67-24-113-71-107-156-37 87-66 208-78 283-6-88 7-244 30-337zM262 1c-19 53-59 228 241 219 9-275-137-265-202-246 27 53 62 101 106 141-54-30-103-68-145-114z" />
+<glyph unicode="&#x44;" d="M182.899 46.091c-70.459 20.257-272.149 109.212-43.156 403.378 123.303-83.671 170.863-157.652 179.67-218.423-59.010-21.137-99.524-62.533-94.239-137.396-32.588 76.625-58.129 183.193-68.698 249.249-5.285-77.505 6.165-214.9 26.422-296.809zM261.284 27.595c-16.734 46.679-51.964 200.809 212.258 192.882 7.927-242.204-120.661-233.396-177.909-216.661 23.78 46.679 54.606 88.955 93.358 124.185-47.56-26.422-90.716-59.89-127.707-100.404z" />
 <glyph unicode="&#x45;" d="M110 5l5 24c0 1 8 3 22 6 14 4 25 7 33 11 5 7 9 17 11 29l8 40 20 95c1 8 3 16 4 24 2 8 4 14 5 19 1 5 3 9 4 13 1 4 1 7 2 9 1 2 1 3 1 3l8 45 5 18 6 39 3 14v11c-8 4-22 7-42 8-5 0-9 1-10 1l5 29 91-4c7 0 14 0 20 0 13 0 33 1 62 2 6 1 12 1 19 2 7 0 10 0 10 0 0-3-1-7-1-10-2-6-3-11-4-15-11-4-21-7-31-9-12-3-22-6-29-9-2-6-5-14-7-25-2-8-3-16-4-23-8-38-14-67-19-88l-17-89-11-45-12-67-4-13c0-1 0-4 1-7 12-3 23-5 34-6 7-1 13-2 19-3-1-6-1-11-2-17-2-6-3-10-3-12-3 0-6 0-7 0-4 0-8 0-12 0-1 0-4 0-8 0-3 1-17 3-41 5l-57 1c-7 0-24-1-49-3-14-2-24-2-28-3z" />
 <glyph unicode="&#x46;" d="M110 78c0-16-6-28-16-39-11-11-24-16-39-16-15 0-28 5-39 16-11 11-16 23-16 39 0 15 5 28 16 39 11 10 24 16 39 16 15 0 28-6 39-16 10-11 16-24 16-39zM110 224c0-15-6-28-16-39-11-11-24-16-39-16-15 0-28 5-39 16-11 11-16 24-16 39 0 15 5 28 16 39 11 11 24 16 39 16 15 0 28-5 39-16 10-11 16-24 16-39zM512 105v-55c0-2-1-4-3-6s-4-3-6-3h-348c-2 0-4 1-6 3s-3 4-3 6v55c0 3 1 5 3 7 2 1 4 2 6 2h348c2 0 4-1 6-2 2-2 3-4 3-7zM110 370c0-15-6-28-16-39-11-10-24-16-39-16-15 0-28 6-39 16-11 11-16 24-16 39 0 16 5 28 16 39 11 11 24 16 39 16 15 0 28-5 39-16 10-11 16-23 16-39zM512 251v-54c0-3-1-5-3-7s-4-3-6-3h-348c-2 0-4 1-6 3s-3 4-3 7v54c0 3 1 5 3 7s4 3 6 3h348c2 0 4-1 6-3s3-4 3-7zM512 398v-55c0-3-1-5-3-7-2-1-4-2-6-2h-348c-2 0-4 1-6 2-2 2-3 4-3 7v55c0 2 1 4 3 6s4 3 6 3h348c2 0 4-1 6-3s3-4 3-6z" />
 <glyph unicode="&#x47;" d="M109 17c0-15-5-27-16-36-10-9-23-13-38-13-21 0-37 6-50 19l17 25c9-9 19-13 30-13 6 0 10 2 14 4 5 3 7 7 7 12 0 13-10 18-30 16l-8 16c2 2 5 6 9 13 5 6 9 11 13 15 3 4 7 8 10 11v1c-3 0-8-1-14-1s-11 0-14 0v-15h-30v43h95v-25l-27-33c10-2 18-7 23-14 6-7 9-15 9-25zM109 196v-45h-103c-1 7-2 12-2 15 0 10 3 19 7 27 4 8 10 14 16 19 6 5 13 10 19 14 6 4 12 8 16 12 5 4 7 9 7 13 0 5-2 9-4 11-3 3-7 4-12 4-8 0-16-6-23-17l-24 17c5 10 11 18 20 23s20 8 31 8c13 0 25-4 35-12 9-8 14-18 14-32 0-9-3-18-10-26-6-8-13-14-21-18-8-5-15-10-22-15-6-5-10-10-10-15h36v17zM512 105v-55c0-2-1-4-3-6s-4-3-6-3h-348c-2 0-4 1-6 3s-3 4-3 6v55c0 3 1 5 3 7 2 1 4 2 6 2h348c2 0 4-1 6-2 2-2 3-4 3-7zM110 362v-28h-96v28h31c0 8 0 19 0 35 0 15 0 27 0 34v4h-1c-1-3-6-9-14-16l-20 22 39 36h30v-115zM512 251v-54c0-3-1-5-3-7s-4-3-6-3h-348c-2 0-4 1-6 3s-3 4-3 7v54c0 3 1 5 3 7s4 3 6 3h348c2 0 4-1 6-3s3-4 3-7zM512 398v-55c0-3-1-5-3-7-2-1-4-2-6-2h-348c-2 0-4 1-6 2-2 2-3 4-3 7v55c0 2 1 4 3 6s4 3 6 3h348c2 0 4-1 6-3s3-4 3-6z" />
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf
index d2e09531318e38dd153af3e42274e525d46ddd4d..0fef3a9104b626de878859f4acba311e1127ce0d 100755
GIT binary patch
delta 538
zcmaEIit)uM#t9DfUn_Vk7#J95Ffb&<WTYmhFw9eNWnf7B!oa{_mH`xCe#E5Dz>uT^
z<f~-lmQ*x~@SFki1Aux2a`KZCmDlpiF)$=20Oh-K6DtZB{F%-H`EP)Hg}lVvR0F;h
zCm9%0c!26H3-XIg7?^=F45=O<c?M>tjr*Sn*Y_~6Fy3N3$RNp}$G~8&$7E(M$1Kjr
zEUw3_&L+nsF0RLD$0#nw$Ec=m$865W%)VVJR98A&*GWs9NmNyWkC|6gh?kX-iGz#N
zmz7&NE|p2m+D?p1SVB@jSW!`yUynmKW=fvCwYiZvhlHYzjEu9housU9ke|GeptGYM
zvtU%bIuo0qlDsT0mzbmsKLf*NebHk+@{9}&y@CQM@%%Pl8Mv81&Sp5jzwii*o-C5o
z&e$_~PSVT7b6nea*m(Ext>K>}s3ce=q#{%%bV6i>Xp7h}aW?ThiCL0vQa7X<q%X;+
z$aX2JC{`(cP>N7mp&X}tPvwm22{kEo9`!yA4UGy-Bh71CYFaO}`*b*T`gHa54(JQ%
z-!age{4DumQaM8+LpnnVkj!MrVF+VLWhi1O2D0-R@_=D!2n;*}1{5{riRmSYnK`I}
X3_(DR=?tYnBNBlIplFyZnd%Jy^qhYr

delta 534
zcmaEHit))Q#t9Df{r5jcGcYjDU|>jy$Vg30VVEm>lz}1f0|NttSq4ym`4N*o14EJq
zkgt-FTT;;|!m|g+_W|k=$jMJmRIcWG$H0&r1C;N|O{^$j@Mk&)<i7y&74i~uQ(Yvs
zTw`EJ;Q*?)EXXe|VPFQzFr>PG<QbTmHtv5STwnA58RK`x2Mm%7dJGKadQ4{Ka?Ij<
z%;I{?>N1RSjN;;YjCPFTB7BT$>UPZLe9Y`?<q}NflZ<`zq?yEZqy$(5#Kd^nxwyH*
zS$Q?GiZxwarFli<q(mf?HRMFZIE^z`)T%h!SxRwAs~IUMdi%J`D2B&IDvOHvc$qM#
z=kV$<v5TlFEAn$o$tVbJHWoeRBM)?*!DKs?cz&C&4BSj0Co`PipVtDTCrc!?GuBLA
zkn}R~4A&MO7T!I4tN14fDhO5xDG8Mb9TQn5+9Y;FoJBlGVuqxP)HUfk=?gMSvK@*_
ziWQ3Ql){vjDaR<^Q8}f0Oie<aOT9-!O`}ZHK=X>0iq<pj9vwEF9$g*1efk3Ww+wV9
zze>KCl*y3Hkk60{#Q6+)3}FnZ3`GpZ44Gh_0)rti;0%B~BsH1I`MLS|d8mR6K|qb^
T45bV?42eJkP&7=IP4xx<Qv`%E

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff
index 446f38128f7b9ddf5eb39e67c84c8a093aa3577e..b5abeb1ce2943ca46e90fc01a974eabad5477089 100755
GIT binary patch
delta 414
zcmZ2cwxVo;C?n%!L2I#zI^3MC3=C$iCq?f`Omy&No~PnEae_MInTb18SPb}9oSgVT
zmc2YNy(BR+XEF<;9b?U8XGSkRs0d7AHsi0v?c6JPW%>E}e+t|csuDUSoGE-tL|cqe
z?6!osM5@F~DRZgkGUc-Vvg_n{<qs(rD&JDcSNW<MrpBQ*O?`*P6-@&zO|4DZS=y&{
zmg&an?$_I>Ut+*zFyAo1=)JL@iIhq8=5I`STyEYwMP26qj(zgI^82pu{1&?%C;J7I
zB_~aA$i80qt>J8&?eyQW^DQ}UR*F{dO#iO;eQxul-)+A|rUcDdv~$(AP3xiy6Ef41
zH?QWsq&d09{GmJ}14CY??E83ro39MqObj4!et+Q+7(KbhqMfm4GmB+8V^TRoB11Yu
z36RWW$YBU$NM$HuC<e0g8S)qu7z`Qo7z`Lt)Ifs=RgfVFs4<<P6lg>u&;S$-lkZx2
F0{}cIj!FOk

delta 413
zcmZ2cwxVo;=wu;lv5DF|oNWvYW^GR`MP^NO@MWGWdvxLib;dmtcc`$qNNl+_@qsLR
zW^#URetzC$7DhY9+R4t0UVKmyn8a+xUx_=oSMtj73-JFExF=LCbXqt|__T<Q7?ao?
z2?>cbiC0n<QZHmGWCLW^%kjw{RxVP$tx}-!O*LGNQ*FBXPK~RYhFV%$o3*pG&*&`I
zjn_S(w@JU$fZJe!VW80mV}BEAlbX%nnDV&X9T$pPFZx~i;rop5kG?DD95kQm=209Q
zGtn&VQQmjn`fIJmGkzN^(&KniCR%YI`MdM?15HzYFaNDJ)ob3e1M7Bg-yE77m6{m4
zc@^&^&B?Xq59Apb82Aj9eu(F{`O3h}1mrO=oZp|<0;4C_ShO?NY-X`6XH3duNM^`q
z$OYnjhCGHahE#?khGK?HFi(NOkU@{Z0LVj90}UTkL53ip#&m{Kh8%`OpaCcvCf~L4
F1_1D?k52#q


From f2766921ee9e7def8fe1bf8cd9514635ec3ed2ac Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 12 Jun 2014 16:06:45 +0100
Subject: [PATCH 084/293] tweaking tabs

---
 .../wagtailadmin/static/wagtailadmin/scss/components/tabs.scss  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
index cd805186288..2c85d24e82e 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
@@ -25,7 +25,7 @@
         display:block;
         padding:0 20px;
         color:white;
-        border-top:0.3em solid $color-teal-darker;
+        border-top:0.3em solid lighten($color-teal-darker, 3%);
         border-bottom:1px solid transparent;
 
         &:hover{

From b038b6dbe7a1a91b2759af6b8c77598c0d41c60a Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 12 Jun 2014 16:14:15 +0100
Subject: [PATCH 085/293] fixing positioning of multiple panels relative to
 their controls

---
 .../static/wagtailadmin/scss/components/forms.scss             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index 3a6fc0d21ce..76a0879e3bb 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -297,7 +297,7 @@ button.icon{
     > li{
         position:relative;
         background-color:white;
-        padding:1em 1.5em;
+        padding:1em 10em 1em 1.5em; /* 10em padding leaves room for controls */
         margin-bottom:1em;
         border:1px solid lighten($color-grey-4, 3%); /* really trying to avoid creating more greys, but this one is better than grey 4 or 5 */
         @include border-radius(2px);
@@ -319,6 +319,7 @@ button.icon{
     /* Object controls */
     .controls{
         position:absolute;
+        z-index:1;
         right:1em;
         top:1em;
         color:white;

From b4493af8b9ffa56efa9704f921cf20f716671665 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 12 Jun 2014 16:15:57 +0100
Subject: [PATCH 086/293] icomoon project file updated

---
 .../wagtailadmin/scss/fonts/wagtail-icomoon.json  | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
index 12ad185e509..a7109db173a 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
@@ -544,7 +544,7 @@
 		{
 			"icon": {
 				"paths": [
-					"M346 916c-160-46-618-248-98-916 280 190 388 358 408 496-134 48-226 142-214 312-74-174-132-416-156-566-12 176 14 488 60 674zM524 958c-38-106-118-456 482-438 18 550-274 530-404 492 54-106 124-202 212-282-108 60-206 136-290 228z"
+					"M365.797 867.819c-140.918-40.513-544.297-218.423-86.313-806.757 246.606 167.341 341.727 315.305 359.34 436.846-118.019 42.275-199.047 125.066-188.478 274.791-65.176-153.249-116.258-366.387-137.395-498.498-10.569 155.010 12.33 429.8 52.844 593.618zM522.569 904.81c-33.469-93.358-103.928-401.617 424.516-385.764 15.854 484.407-241.322 466.791-355.819 433.323 47.56-93.358 109.211-177.91 186.717-248.369-95.121 52.844-181.433 119.78-255.415 200.808z"
 				],
 				"defaultCode": 68,
 				"grid": 0
@@ -1228,7 +1228,7 @@
 	],
 	"height": 1024,
 	"metadata": {
-		"name": "icomoon"
+		"name": "wagtail"
 	},
 	"preferences": {
 		"showGlyphs": true,
@@ -1236,19 +1236,24 @@
 		"fontPref": {
 			"prefix": "icon-",
 			"metadata": {
-				"fontFamily": "icomoon"
+				"fontFamily": "wagtail",
+				"majorVersion": 1,
+				"minorVersion": 0
 			},
 			"metrics": {
 				"emSize": 512,
 				"baseline": 6.25,
 				"whitespace": 50
-			}
+			},
+			"resetPoint": 58880,
+			"showMetrics": false,
+			"showMetadata": false
 		},
 		"imagePref": {},
 		"historySize": 100,
 		"showCodes": true,
 		"search": "",
 		"gridSize": 16,
-		"showGrid": false
+		"showGrid": true
 	}
 }
\ No newline at end of file

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 087/293] 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 00000000000..28b63d9fbe4
--- /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 508682cda21..a3d377bd630 100644
--- a/wagtail/wagtailcore/whitelist.py
+++ b/wagtail/wagtailcore/whitelist.py
@@ -89,7 +89,10 @@ def clean_node(cls, doc, node):
             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 cbd47f39419e9661a32d02c94acba17b398c890f Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 13 Jun 2014 13:33:01 +0100
Subject: [PATCH 088/293] Aesthetic improvements to preview experience. Loading
 spinner now uses wagtail's standard glyph.

---
 .../static/wagtailadmin/js/page-editor.js     | 16 ++-
 .../pages/_preview_button_on_create.html      |  2 +-
 .../pages/_preview_button_on_edit.html        |  2 +-
 .../templates/wagtailadmin/pages/preview.html | 99 +++++++++++++++++++
 .../pages/preview_placeholder.html            | 18 ----
 wagtail/wagtailadmin/urls.py                  |  3 +-
 wagtail/wagtailadmin/views/pages.py           |  9 +-
 7 files changed, 122 insertions(+), 27 deletions(-)
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
 delete mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/preview_placeholder.html

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index 4e8e1b02dca..c98ea4c7fb8 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -334,16 +334,24 @@ $(function() {
     /* Set up behaviour of preview button */
     $('.action-preview').click(function() {
         var previewWindow = window.open($(this).data('placeholder'), $(this).data('windowname'));
-
+       
         $.ajax({
             type: "POST",
             url: $(this).data('action'),
             data: $('#page-edit-form').serialize(),
             success: function(data, textStatus, request) {
                 if (request.getResponseHeader('X-Wagtail-Preview') == 'ok') {
-                    previewWindow.document.open();
-                    previewWindow.document.write(data);
-                    previewWindow.document.close();
+                    var pdoc = previewWindow.document;
+                    var frame = pdoc.getElementById('preview-frame');
+                    
+                    frame = (frame.contentWindow) ? frame.contentWindow : (frame.contentDocument.document) ? frame.contentDocument.document : frame.contentDocument;
+                    frame.document.open();
+                    frame.document.write(data);                 
+                    frame.document.close();
+
+                    var removeTimeout = setTimeout(function(){
+                        pdoc.getElementById('loading-spinner-wrapper').className += 'remove';
+                    }, 100) /* just enough to give effect without adding discernible slowness */
                 } else {
                     previewWindow.close();
                     document.open();
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_create.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_create.html
index 7d71ed68b5a..4f60050be3c 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_create.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_create.html
@@ -1,4 +1,4 @@
 <button class="action-preview button {% if icon %}icon icon-view{% endif %}"
     data-action="{% url 'wagtailadmin_pages_preview_on_create' content_type.app_label content_type.model parent_page.id %}{% if mode %}?mode={{ mode|urlencode }}{% endif %}"
-    data-placeholder="{% url 'wagtailadmin_pages_preview_placeholder' %}"
+    data-placeholder="{% url 'wagtailadmin_pages_preview' %}"
     data-windowname="wagtail_preview_{{ parent_page.id }}_child">{{ label }}</button>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_edit.html
index b3478c94858..a5cd5d24aa3 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_edit.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_edit.html
@@ -1,4 +1,4 @@
 <button class="action-preview button {% if icon %}icon icon-view{% endif %}"
     data-action="{% url 'wagtailadmin_pages_preview_on_edit' page.id %}{% if mode %}?mode={{ mode|urlencode }}{% endif %}"
-    data-placeholder="{% url 'wagtailadmin_pages_preview_placeholder' %}"
+    data-placeholder="{% url 'wagtailadmin_pages_preview' %}"
     data-windowname="wagtail_preview_{{ page.id }}">{{ label }}</button>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
new file mode 100644
index 00000000000..51b31acaaae
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
@@ -0,0 +1,99 @@
+<!DOCTYPE HTML>
+{% load static %}
+<html>
+    <head>
+        <title>Preview loading...</title>
+        <script>
+
+        </script>
+        <style>
+            /* This font is just a single spinner glyph */
+            @font-face {
+                font-family: 'wagtail';
+                src: url(data:application/x-font-ttf;charset=utf-8;base64,AAEAAAALAIAAAwAwT1MvMggiBucAAAC8AAAAYGNtYXAAIwC5AAABHAAAAExnYXNwAAAAEAAAAWgAAAAIZ2x5Zu2pTysAAAFwAAAA0GhlYWQAoBqvAAACQAAAADZoaGVhA+IB5gAAAngAAAAkaG10eAMAAAAAAAKcAAAAFGxvY2EAKAB8AAACsAAAAAxtYXhwAAgAMwAAArwAAAAgbmFtZTAOqMkAAALcAAABOXBvc3QAAwAAAAAEGAAAACAAAwIAAZAABQAAAUwBZgAAAEcBTAFmAAAA9QAZAIQAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAABAAAAAMQHg/+D/4AHgACAAAAABAAAAAAAAAAAAAAAgAAAAAAACAAAAAwAAABQAAwABAAAAFAAEADgAAAAKAAgAAgACAAEAIAAx//3//wAAAAAAIAAx//3//wAB/+P/0wADAAEAAAAAAAAAAAAAAAEAAf//AA8AAQAAAAAAAAAAAAIAADc5AQAAAAABAAAAAAAAAAAAAgAANzkBAAAAAAEAAAAAAAAAAAACAAA3OQEAAAAAAgAA/+ACAAHgABcAMAAANy4DNTQ+Ah8BByYOAhUUHgIXBxcnNz4DJzYuAic/AR4DBxYOAiNLEhwTCihGXTUgIChGNB4HDxQOKLAhISdHMx8BAQgOFQ0mBxEdEgsBASlFXjQrEiouMRo0XkUpAR8hAR8zRycUJCQeDwR0IR8BHTVFKRImIiANBSgSKi4xGjVdRigAAAEAAAABAADi0eQAXw889QALAgAAAAAAz8Bs+QAAAADPwGz5AAD/4AIAAeAAAAAIAAIAAAAAAAAAAQAAAeD/4AAAAgAAAAAAAgAAAQAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAABAAAAAgAAAAAAAAAACgAUAB4AaAABAAAABQAxAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAADgCuAAEAAAAAAAEADgAAAAEAAAAAAAIADgBHAAEAAAAAAAMADgAkAAEAAAAAAAQADgBVAAEAAAAAAAUAFgAOAAEAAAAAAAYABwAyAAEAAAAAAAoAKABjAAMAAQQJAAEADgAAAAMAAQQJAAIADgBHAAMAAQQJAAMADgAkAAMAAQQJAAQADgBVAAMAAQQJAAUAFgAOAAMAAQQJAAYADgA5AAMAAQQJAAoAKABjAHcAYQBnAHQAYQBpAGwAVgBlAHIAcwBpAG8AbgAgADEALgAwAHcAYQBnAHQAYQBpAGx3YWd0YWlsAHcAYQBnAHQAYQBpAGwAUgBlAGcAdQBsAGEAcgB3AGEAZwB0AGEAaQBsAEcAZQBuAGUAcgBhAHQAZQBkACAAYgB5ACAASQBjAG8ATQBvAG8AbgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA) format('truetype'),
+                     url(data:application/font-woff;charset=utf-8;base64,d09GRk9UVE8AAARsAAoAAAAABCQAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABDRkYgAAAA9AAAAO4AAADuSyBzg09TLzIAAAHkAAAAYAAAAGAIIgbnY21hcAAAAkQAAABMAAAATAAjALlnYXNwAAACkAAAAAgAAAAIAAAAEGhlYWQAAAKYAAAANgAAADYAoBqvaGhlYQAAAtAAAAAkAAAAJAPiAeZobXR4AAAC9AAAABQAAAAUAwAAAG1heHAAAAMIAAAABgAAAAYABVAAbmFtZQAAAxAAAAE5AAABOTAOqMlwb3N0AAAETAAAACAAAAAgAAMAAAEABAQAAQEBCHdhZ3RhaWwAAQIAAQA6+BwC+BsD+BgEHgoAGVP/i4seCgAZU/+LiwwHi2v4lPh0BR0AAAB0Dx0AAAB5ER0AAAAJHQAAAOUSAAYBAQgPERMWGXdhZ3RhaWx3YWd0YWlsdTB1MXUyMHUzMQAAAgGJAAMABQEBBAcKDWT8lA78lA78lA77lA7WthVbu3DMi8+L9yH3B/cH9yGLCKtra2sFIYs1NYshi1ifWq9nCGSGBfdD+wcVa6urqwX1i+Hhi/WLvne8Z68IspCRswW7W6ZKi0eL+yH7B/sH+yGLCA74lBT4lBWLDAoAAAADAgABkAAFAAABTAFmAAAARwFMAWYAAAD1ABkAhAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAEAAAAAxAeD/4P/gAeAAIAAAAAEAAAAAAAAAAAAAACAAAAAAAAIAAAADAAAAFAADAAEAAAAUAAQAOAAAAAoACAACAAIAAQAgADH//f//AAAAAAAgADH//f//AAH/4//TAAMAAQAAAAAAAAAAAAAAAQAB//8ADwABAAAAAQAAaXw/5l8PPPUACwIAAAAAAM/AbPkAAAAAz8Bs+QAA/+ACAAHgAAAACAACAAAAAAAAAAEAAAHg/+AAAAIAAAAAAAIAAAEAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAQAAAAIAAAAAAFAAAAUAAAAAAA4ArgABAAAAAAABAA4AAAABAAAAAAACAA4ARwABAAAAAAADAA4AJAABAAAAAAAEAA4AVQABAAAAAAAFABYADgABAAAAAAAGAAcAMgABAAAAAAAKACgAYwADAAEECQABAA4AAAADAAEECQACAA4ARwADAAEECQADAA4AJAADAAEECQAEAA4AVQADAAEECQAFABYADgADAAEECQAGAA4AOQADAAEECQAKACgAYwB3AGEAZwB0AGEAaQBsAFYAZQByAHMAaQBvAG4AIAAxAC4AMAB3AGEAZwB0AGEAaQBsd2FndGFpbAB3AGEAZwB0AGEAaQBsAFIAZQBnAHUAbABhAHIAdwBhAGcAdABhAGkAbABHAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAEkAYwBvAE0AbwBvAG4AAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==) format('woff');
+                font-weight: normal;
+                font-style: normal;
+            }
+            html,body {
+                height:100%;
+                padding:0;
+                margin:0;
+            }
+
+            #loading-spinner-wrapper{
+                position:fixed;
+                bottom:0;
+                text-align:center;
+                height:100%;
+                width:100%;
+                font-size:0em;
+                z-index:999999;
+                background:white;
+                -webkit-transition: bottom 0.4s ease;
+                   -moz-transition: bottom 0.4s ease;
+                     -o-transition: bottom 0.4s ease;
+                        transition: bottom 0.4s ease;   
+            }
+                #loading-spinner-wrapper.remove{
+                   bottom:-100%;
+                }
+                #loading-spinner-wrapper:before {
+                    content: '';
+                    width:0px;
+                    display: inline-block;
+                    height: 100%;
+                    vertical-align: middle;
+                    margin-left:-0.4em;
+                }
+                #loading-spinner{
+                    position:relative;
+                    display:inline-block;
+                    width:120px;
+                    height:120px;
+                    vertical-align:middle;
+                }
+                    #loading-spinner:after{
+                        font-size:120px;
+                        line-height:120px;
+                        color:#43b1b0;
+                        position:absolute;
+                        left:0;
+                        top:0;
+                        font-family:wagtail;
+                        content:"1";
+                        width:1em;
+                        animation: spin 0.8s infinite linear;
+                        -webkit-animation: spin 0.8s infinite linear;
+                        -moz-animation: spin 0.8s infinite linear;   
+                    }
+            
+            #preview-frame{
+                height:100%;
+                width:100%;
+                position:absolute;
+                z-index:1;
+                border:0;
+            }
+
+            @keyframes spin {
+                from { transform: rotate(0deg); }
+                to { transform: rotate(360deg); }
+            }
+            @-webkit-keyframes spin {
+                from { -webkit-transform: rotate(0deg); }
+                to { -webkit-transform: rotate(360deg); }
+            }
+            @-moz-keyframes spin {
+                from { -moz-transform: rotate(0deg); }
+                to { -moz-transform: rotate(360deg); }
+            }
+        </style>
+    </head>
+    <body>
+        <div id="loading-spinner-wrapper">
+            <div id="loading-spinner"></div>
+        </div>
+        <iframe id="preview-frame" src="{% url 'wagtailadmin_pages_preview_loading' %}"></iframe>
+    </body>
+</html>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview_placeholder.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview_placeholder.html
deleted file mode 100644
index 1ccfe1ffb9c..00000000000
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview_placeholder.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML>
-{% load static %}
-<html>
-    <head>
-        <title>Preview loading...</title>
-        <style>
-            body {
-                background-color: #ddd;
-                background-image: url('{% static "wagtailadmin/images/spinner.gif" %}');
-                background-repeat: no-repeat;
-                background-attachment: fixed;
-                background-position: center;
-            }
-        </style>
-    </head>
-    <body>
-    </body>
-</html>
diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py
index 8fbf2f6e770..08620a45727 100644
--- a/wagtail/wagtailadmin/urls.py
+++ b/wagtail/wagtailadmin/urls.py
@@ -56,7 +56,8 @@
     url(r'^pages/(\d+)/edit/$', pages.edit, name='wagtailadmin_pages_edit'),
     url(r'^pages/(\d+)/edit/preview/$', pages.preview_on_edit, name='wagtailadmin_pages_preview_on_edit'),
 
-    url(r'^pages/preview_placeholder/$', pages.preview_placeholder, name='wagtailadmin_pages_preview_placeholder'),
+    url(r'^pages/preview/$', pages.preview, name='wagtailadmin_pages_preview'),
+    url(r'^pages/preview_loading/$', pages.preview_loading, name='wagtailadmin_pages_preview_loading'),
 
     url(r'^pages/(\d+)/view_draft/$', pages.view_draft, name='wagtailadmin_pages_view_draft'),
     url(r'^pages/(\d+)/add_subpage/$', pages.add_subpage, name='wagtailadmin_pages_add_subpage'),
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 69e6b7f4f43..b5e87d1c250 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -395,7 +395,7 @@ def preview_on_create(request, content_type_app_name, content_type_model_name, p
         return response
 
 
-def preview_placeholder(request):
+def preview(request):
     """
     The HTML of a previewed page is written to the destination browser window using document.write.
     This overwrites any previous content in the window, while keeping its URL intact. This in turn
@@ -416,8 +416,13 @@ def preview_placeholder(request):
     Since we're going to this trouble, we'll also take the opportunity to display a spinner on the
     placeholder page, providing some much-needed visual feedback.
     """
-    return render(request, 'wagtailadmin/pages/preview_placeholder.html')
+    return render(request, 'wagtailadmin/pages/preview.html')
 
+def preview_loading(request):
+    """
+    This page is blank, but must be real HTML so it's DOM can be written to once the preview of the page has rendered
+    """
+    return HttpResponse("<html><head><title></title></head><body></body></html>")
 
 @permission_required('wagtailadmin.access_admin')
 def unpublish(request, page_id):

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 089/293] 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 e23794d4f37..3e0a4bb986c 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 809e139ed87..6b07872f53f 100644
--- a/wagtail/wagtailsearch/models.py
+++ b/wagtail/wagtailsearch/models.py
@@ -5,9 +5,10 @@
 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 @@ def get_most_popular(cls, date_since=None):
 
     @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 7086d46f434..7c65af6bf30 100644
--- a/wagtail/wagtailsearch/tests/test_queries.py
+++ b/wagtail/wagtailsearch/tests/test_queries.py
@@ -53,6 +53,16 @@ def test_different_queries(self):
         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 438ce4aba5c85fc36a821ce0677035407f5b0ecb Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 13 Jun 2014 15:40:06 +0100
Subject: [PATCH 090/293] improvements from kaedroho feedback

---
 wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index c98ea4c7fb8..b8de0d13176 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -334,7 +334,7 @@ $(function() {
     /* Set up behaviour of preview button */
     $('.action-preview').click(function() {
         var previewWindow = window.open($(this).data('placeholder'), $(this).data('windowname'));
-       
+
         $.ajax({
             type: "POST",
             url: $(this).data('action'),
@@ -343,8 +343,8 @@ $(function() {
                 if (request.getResponseHeader('X-Wagtail-Preview') == 'ok') {
                     var pdoc = previewWindow.document;
                     var frame = pdoc.getElementById('preview-frame');
-                    
-                    frame = (frame.contentWindow) ? frame.contentWindow : (frame.contentDocument.document) ? frame.contentDocument.document : frame.contentDocument;
+
+                    frame = frame.contentWindow || frame.contentDocument.document || frame.contentDocument;
                     frame.document.open();
                     frame.document.write(data);                 
                     frame.document.close();

From 72a43567d25131c142795eae8bb4c51836215379 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 13 Jun 2014 16:15:37 +0100
Subject: [PATCH 091/293] tweaked transition

---
 .../templates/wagtailadmin/pages/preview.html          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
index 51b31acaaae..ead401777e0 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
@@ -30,13 +30,13 @@
                 font-size:0em;
                 z-index:999999;
                 background:white;
-                -webkit-transition: bottom 0.4s ease;
-                   -moz-transition: bottom 0.4s ease;
-                     -o-transition: bottom 0.4s ease;
-                        transition: bottom 0.4s ease;   
+                -webkit-transition: all 0.3s ease;
+                   -moz-transition: all 0.3s ease;
+                     -o-transition: all 0.3s ease;
+                        transition: all 0.3s ease;   
             }
                 #loading-spinner-wrapper.remove{
-                   bottom:-100%;
+                    bottom:-100%;
                 }
                 #loading-spinner-wrapper:before {
                     content: '';

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 092/293] 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 29c44b4f3b8..8a0d4f97760 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 678dd67fdfc..a1f51174a9a 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 dae521aec818054c850564b5d6dbe61c7b59714c Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 13 Jun 2014 17:21:51 +0100
Subject: [PATCH 093/293] removed redundant script block

---
 wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
index ead401777e0..3cacb7d1042 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
@@ -3,9 +3,6 @@
 <html>
     <head>
         <title>Preview loading...</title>
-        <script>
-
-        </script>
         <style>
             /* This font is just a single spinner glyph */
             @font-face {

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 094/293] 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 458de387bc1..de635256c95 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 095/293] 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 642a5e74148..3d8ea26b234 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 096/293] 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 b5add3f15cc..475e4f7b19b 100644
--- a/wagtail/wagtailadmin/tests/test_page_chooser.py
+++ b/wagtail/wagtailadmin/tests/test_page_chooser.py
@@ -3,9 +3,10 @@
 
 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 @@ def setUp(self):
         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 @@ def test_get_invalid(self):
         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 @@ def setUp(self):
         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 @@ 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_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 @@ def test_get_invalid(self):
         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 @@ def get(self, 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_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 @@ def test_create_link(self):
         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 @@ def get(self, 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_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 097/293] Minor PEP8 fix

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

diff --git a/runtests.py b/runtests.py
index 346729653f2..6fd98d08423 100755
--- a/runtests.py
+++ b/runtests.py
@@ -102,7 +102,7 @@
         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 098/293] 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 9aa90f857d4..6a3cd317e46 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 00000000000..36141c4fc35
--- /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 3ca060f4919..6a3293552c4 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 30256781ee5..bb514f2aabb 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 099/293] 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 6a3cd317e46..bba601468d6 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 6a3293552c4..053e0d2c862 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 100/293] 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 18ff4c5c26b..237b960f6fa 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{

From db6bb920fb367540b9d5ac31209336c342624c54 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 16 Jun 2014 14:57:33 +0100
Subject: [PATCH 101/293] Set treebeard attributes in preview on create view.
 Fixes #320

---
 wagtail/wagtailadmin/views/pages.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 69e6b7f4f43..584613deaa5 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -364,6 +364,10 @@ def preview_on_create(request, content_type_app_name, content_type_model_name, p
         parent_page = get_object_or_404(Page, id=parent_page_id).specific
         page.set_url_path(parent_page)
 
+        # Set treebeard attributes
+        page.depth = parent_page.depth + 1
+        page.path = Page._get_children_path_interval(parent_page.path)[1]
+
         # This view will generally be invoked as an AJAX request; as such, in the case of
         # an error Django will return a plaintext response. This isn't what we want, since
         # we will be writing the response back to an HTML page regardless of success or

From 4136bb5053165076bdcb7ac5e19ed71ee18fb5cf Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 16 Jun 2014 15:15:38 +0100
Subject: [PATCH 102/293] Added tests for db6bb92

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

diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py
index 12c42f3e404..31301f70f1d 100644
--- a/wagtail/wagtailadmin/tests/test_pages_views.py
+++ b/wagtail/wagtailadmin/tests/test_pages_views.py
@@ -188,6 +188,11 @@ def test_preview_on_create(self):
         self.assertTemplateUsed(response, 'tests/simple_page.html')
         self.assertContains(response, "New page!")
 
+        # Check that the treebeard attributes were set correctly on the page object
+        self.assertEqual(response.context['self'].depth, self.root_page.depth + 1)
+        self.assertTrue(response.context['self'].path.startswith(self.root_page.path))
+        self.assertEqual(response.context['self'].get_parent(), self.root_page)
+
 
 class TestPageEdit(TestCase, WagtailTestUtils):
     def setUp(self):

From 506d977950db160929ce1c568ac1224174c48488 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Mon, 16 Jun 2014 15:32:32 +0100
Subject: [PATCH 103/293] typo in comment

---
 wagtail/wagtailadmin/views/pages.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index b5e87d1c250..5bddc142ea1 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -420,7 +420,7 @@ def preview(request):
 
 def preview_loading(request):
     """
-    This page is blank, but must be real HTML so it's DOM can be written to once the preview of the page has rendered
+    This page is blank, but must be real HTML so its DOM can be written to once the preview of the page has rendered
     """
     return HttpResponse("<html><head><title></title></head><body></body></html>")
 

From 2bd1e0076b44a0fa871cc6c4cf3bae0b869b9553 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Mon, 16 Jun 2014 17:10:26 +0100
Subject: [PATCH 104/293] tweaks to font metrics

---
 .../static/wagtailadmin/scss/core.scss        |   2 +-
 .../scss/fonts/wagtail-icomoon.json           | 386 +++++++++---------
 .../wagtailadmin/scss/fonts/wagtail.eot       | Bin 26124 -> 25504 bytes
 .../wagtailadmin/scss/fonts/wagtail.svg       | 108 ++---
 .../wagtailadmin/scss/fonts/wagtail.ttf       | Bin 25960 -> 25340 bytes
 .../wagtailadmin/scss/fonts/wagtail.woff      | Bin 15144 -> 15108 bytes
 6 files changed, 249 insertions(+), 247 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
index 60200de208f..38eb40ae2ca 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
@@ -213,7 +213,7 @@ img{
             color: #AAA;
             padding: 0.9em 1.2em;
             position:relative;
-            font-size:0.9em;
+            font-size:0.85em;
             font-weight:400;
             white-space:nowrap;
             text-shadow:-1px -1px 0px rgba(0,0,0,0.3);
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
index a7109db173a..583faf89a9e 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
@@ -4,13 +4,13 @@
 		{
 			"icon": {
 				"paths": [
-					"M516.006 87.25c-130.903 0-237.403 106.496-237.403 237.403v135.587c0 1.54-1.902 4.136-3.396 4.634-12.837 4.283-23.263 7.99-32.808 11.672-11.381 4.388-19.967 17-19.967 29.34v311.543c0 12.255 8.53 24.881 19.841 29.363 87.506 34.676 179.604 52.253 273.734 52.253s186.229-17.582 273.737-52.258c11.306-4.482 19.831-17.103 19.831-29.358v-311.543c0-12.342-8.585-24.953-19.971-29.345-9.548-3.68-19.976-7.391-32.804-11.672-1.49-0.497-3.39-3.095-3.39-4.634v-135.587c-0.001-130.903-106.498-237.399-237.401-237.399zM451.344 600.775c0-35.736 28.951-64.658 64.657-64.658 35.707 0 64.658 28.917 64.658 64.658 0 23.68-13.355 43.507-32.328 54.745v106.901c0 17.869-14.46 32.328-32.33 32.328-17.869 0-32.328-14.46-32.328-32.328v-106.901c-18.974-11.239-32.328-31.065-32.328-54.745zM671.777 324.648v116.988c-51.081-10.989-103.489-16.558-155.749-16.564-52.236 0-104.636 5.568-155.796 16.55v-116.975c0-85.892 69.876-155.771 155.771-155.771s155.777 69.878 155.777 155.772z"
+					"M515.010 48.76c-152.629 0-276.799 124.169-276.799 276.8v158.089c0 1.794-2.218 4.822-3.961 5.403-14.966 4.995-27.124 9.317-38.252 13.61-13.268 5.117-23.279 19.822-23.279 34.207v363.246c0 14.289 9.946 29.011 23.133 34.234 102.029 40.432 209.41 60.925 319.162 60.925s217.133-20.498 319.164-60.928c13.181-5.225 23.122-19.942 23.122-34.231v-363.246c0-14.392-10.010-29.092-23.284-34.214-11.133-4.292-23.292-8.616-38.246-13.61-1.736-0.579-3.952-3.608-3.952-5.403v-158.089c-0.001-152.629-124.17-276.796-276.798-276.796zM439.618 647.508c0-41.667 33.757-75.388 75.388-75.388s75.388 33.715 75.388 75.388c0 27.609-15.572 50.727-37.691 63.83v124.642c0 20.833-16.86 37.691-37.696 37.691-20.834 0-37.691-16.86-37.691-37.691v-124.642c-22.122-13.104-37.691-36.218-37.691-63.83zM696.635 325.555v136.403c-59.559-12.813-120.663-19.305-181.595-19.313-60.902 0-122 6.493-181.65 19.297v-136.386c0-100.146 81.472-181.62 181.62-181.62s181.627 81.473 181.627 181.622z"
 				],
 				"width": 1044,
-				"grid": 0,
 				"tags": [
 					"lock39 copy"
-				]
+				],
+				"grid": 16
 			},
 			"properties": {
 				"order": 3,
@@ -26,16 +26,16 @@
 		{
 			"icon": {
 				"paths": [
-					"M788.176 475.115c-9.548-3.68-33.476-12.002-33.819-12.278-28.021-6.998-84.009-22.628-84.009-22.628-51.081-10.989-103.489-16.558-155.749-16.563-50.758 0-101.661 5.275-151.442 15.65l-77.844-77.846c-60.737-60.735-60.737-159.555 0-220.292s159.558-60.739 220.296-0.003l80.945 80.942c27.277-6.612 57.773-20.055 77.184-41.624-1.559 0.162-3.675-0.317-4.527-1.165l-95.875-95.875c-92.566-92.559-243.175-92.559-335.738 0.003-92.562 92.562-92.565 243.174 0 335.739l44.75 44.753c-12.177 4.076-22.199 7.649-31.381 11.191-11.381 4.388-19.967 17-19.967 29.34v311.543c0 12.255 8.53 24.881 19.841 29.363 87.506 34.676 179.604 52.253 273.734 52.253s186.229-17.582 273.737-52.258c11.306-4.482 19.831-17.103 19.831-29.358v-311.546c0.001-12.342-8.584-24.953-19.97-29.345zM546.904 654.092v106.901c0 17.869-14.46 32.328-32.33 32.328-17.869 0-32.328-14.46-32.328-32.328v-106.901c-18.974-11.238-32.328-31.064-32.328-54.745 0-35.736 28.951-64.658 64.657-64.658 35.707 0 64.658 28.917 64.658 64.658 0 23.682-13.356 43.507-32.328 54.745z"
+					"M805.921 547.056c-10.185-3.925-35.708-12.802-36.074-13.097-29.889-7.465-89.61-24.137-89.61-24.137-54.486-11.722-110.388-17.662-166.132-17.667-54.142 0-108.438 5.627-161.538 16.693l-83.034-83.036c-64.786-64.784-64.786-170.192 0-234.978s170.195-64.788 234.982-0.003l86.341 86.338c29.095-7.053 61.625-21.392 82.33-44.399-1.663 0.173-3.92-0.338-4.829-1.243l-102.267-102.267c-98.737-98.73-259.387-98.73-358.121 0.003s-98.736 259.386 0 358.122l47.733 47.737c-12.989 4.348-23.679 8.159-33.473 11.937-12.14 4.681-21.298 18.133-21.298 31.296v332.313c0 13.072 9.099 26.54 21.164 31.321 93.34 36.988 191.578 55.737 291.983 55.737s198.644-18.754 291.986-55.742c12.060-4.781 21.153-18.243 21.153-31.315v-332.316c0.001-13.165-9.156-26.617-21.301-31.301zM548.564 737.965v114.028c0 19.060-15.424 34.483-34.485 34.483s-34.483-15.424-34.483-34.483v-114.028c-20.239-11.987-34.483-33.135-34.483-58.395 0-38.118 30.881-68.969 68.967-68.969s68.969 30.845 68.969 68.969c0 25.261-14.246 46.407-34.483 58.395z"
 				],
 				"width": 1044,
-				"grid": 0,
 				"tags": [
 					"lock39-open"
-				]
+				],
+				"grid": 16
 			},
 			"properties": {
-				"order": 4,
+				"order": 6,
 				"id": 66,
 				"prevSize": 32,
 				"code": 112,
@@ -48,12 +48,12 @@
 		{
 			"icon": {
 				"paths": [
-					"M102.030 101.608v819.555h819.555v-819.555h-819.555zM352.717 791.689h-165.288v-85.398h301.65v85.398zM792.109 360.562h-604.678v-128.099h603.303v128.099zM790.731 591.965h-603.303v-128.099h603.303v128.099z"
+					"M74.699 74.249v874.192h874.192v-874.192h-874.192zM342.098 810.335h-176.307v-91.091h321.76v91.091zM810.783 350.466h-644.99v-136.639h643.523v136.639zM809.313 597.296h-643.523v-136.639h643.523v136.639z"
 				],
 				"tags": [
 					"form"
 				],
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"order": 1,
@@ -64,7 +64,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 4
+			"iconIdx": 2
 		},
 		{
 			"icon": {
@@ -72,7 +72,7 @@
 					"M478 512c0-38-14-70-40-96-26-28-58-40-96-40-38 0-70 12-98 40-26 26-40 58-40 96 0 38 14 70 40 96 28 28 60 40 98 40 38 0 70-12 96-40 26-26 40-58 40-96zM888 786c0-20-8-36-20-48-14-14-30-22-48-22-20 0-36 8-48 22-14 12-22 28-22 48 0 18 8 34 20 48 14 12 30 20 50 20 18 0 34-8 48-20 12-14 20-30 20-48zM888 238c0-18-8-34-20-48-14-12-30-20-48-20-20 0-36 8-48 20-14 14-22 30-22 48 0 20 8 36 20 50 14 12 30 20 50 20 18 0 34-8 48-20 12-14 20-30 20-50zM682 464v98c0 4 0 8-4 10-2 4-4 6-8 6l-82 12c-4 14-10 26-18 42 12 16 28 36 48 60 4 4 4 8 4 12 0 4 0 8-4 10-8 10-22 26-44 48-20 20-34 32-42 32-4 0-6-2-10-4l-62-48c-12 6-26 12-40 16-4 38-8 66-14 82-2 10-6 14-16 14h-98c-4 0-8-2-10-4-4-4-6-6-6-10l-12-82c-12-4-26-8-40-16l-64 48c-2 2-6 4-10 4s-8-2-12-6c-50-46-76-74-76-84 0-4 2-8 4-10 4-6 10-16 22-28 10-14 18-26 24-34-8-16-14-30-18-44l-82-12c-2 0-6-2-8-6-2-2-4-6-4-10v-98c0-4 2-8 4-10 2-4 6-6 8-6l82-12c4-14 10-26 18-42-12-16-28-36-48-60-2-4-4-8-4-12 0-4 2-8 4-10 8-10 22-26 44-48 22-20 36-32 42-32 4 0 8 2 12 4l60 48c12-6 26-12 42-16 4-38 8-66 12-82 2-10 8-14 16-14h98c4 0 8 2 12 4 2 4 4 6 4 10l14 82c12 4 24 8 40 16l62-48c2-2 6-4 10-4s8 2 12 6c52 46 76 74 76 84 0 4 0 8-2 10-6 6-12 16-24 30-10 12-18 24-24 32 8 16 14 32 18 44l82 12c4 0 6 2 8 6 4 2 4 6 4 10zM1024 748v74c0 6-26 12-80 16-4 10-10 20-16 28 18 40 28 66 28 74 0 2 0 2-2 4-44 26-66 38-66 38-4 0-12-8-26-26-12-16-22-28-26-36-8 2-14 2-16 2-4 0-10 0-16-2-6 8-16 20-28 36-14 18-22 26-26 26 0 0-22-12-66-38 0-2-2-2-2-4 0-8 10-34 28-74-6-8-12-18-16-28-54-4-80-10-80-16v-74c0-6 26-12 80-16 4-12 10-20 16-28-18-40-28-66-28-74 0-2 2-2 2-4 2 0 8-4 20-10 10-6 20-12 30-18 10-6 16-10 16-10 4 0 12 10 26 26 12 16 22 28 28 36 6-2 12-2 16-2 2 0 8 0 16 2 18-26 34-46 48-60l4-2c0 0 22 14 66 38 2 2 2 2 2 4 0 8-10 34-28 74 6 8 12 16 16 28 54 4 80 10 80 16zM1024 202v74c0 6-26 12-80 16-4 10-10 20-16 28 18 40 28 66 28 74 0 2 0 2-2 4-44 26-66 38-66 38-4 0-12-8-26-26-12-16-22-28-26-36-8 2-14 2-16 2-4 0-10 0-16-2-6 8-16 20-28 36-14 18-22 26-26 26 0 0-22-12-66-38 0-2-2-2-2-4 0-8 10-34 28-74-6-8-12-18-16-28-54-4-80-10-80-16v-74c0-6 26-12 80-16 4-12 10-20 16-28-18-40-28-66-28-74 0-2 2-2 2-4 2 0 8-4 20-10 10-8 20-14 30-18 10-6 16-10 16-10 4 0 12 8 26 26 12 16 22 28 28 36 6-2 12-2 16-2 2 0 8 0 16 2 18-26 34-46 48-60l4-2c0 0 22 14 66 38 2 2 2 2 2 4 0 8-10 34-28 74 6 8 12 16 16 28 54 4 80 10 80 16z"
 				],
 				"defaultCode": 97,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 0,
@@ -83,216 +83,216 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 5
+			"iconIdx": 3
 		},
 		{
 			"icon": {
 				"paths": [
-					"M878 438v458c0 16-6 28-16 38-10 12-24 16-40 16h-620c-16 0-30-4-40-16-10-10-16-22-16-38v-768c0-16 6-28 16-38 10-12 24-16 40-16h310v310c0 16 6 28 16 38 10 12 24 16 38 16zM876 366h-290v-292c30 6 56 18 74 38l178 178c20 20 32 44 38 76z"
+					"M902.4 433.067v488.533c0 17.067-6.4 29.867-17.067 40.533-10.667 12.8-25.6 17.067-42.667 17.067h-661.333c-17.067 0-32-4.267-42.667-17.067-10.667-10.667-17.067-23.467-17.067-40.533v-819.2c0-17.067 6.4-29.867 17.067-40.533 10.667-12.8 25.6-17.067 42.667-17.067h330.667v330.667c0 17.067 6.4 29.867 17.067 40.533 10.667 12.8 25.6 17.067 40.533 17.067zM900.267 356.267h-309.333v-311.467c32 6.4 59.733 19.2 78.933 40.533l189.867 189.867c21.333 21.333 34.133 46.933 40.533 81.067z"
 				],
 				"defaultCode": 98,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 1,
-				"order": 3,
+				"order": 4,
 				"prevSize": 32,
 				"code": 98,
 				"name": "uni62",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 6
+			"iconIdx": 4
 		},
 		{
 			"icon": {
 				"paths": [
-					"M220 878h584v-440h-238c-14 0-28-4-38-16-10-10-16-22-16-38v-238h-292zM586 366h214c-4-12-8-20-12-24l-180-178c-4-6-12-10-22-14zM878 384v512c0 16-6 28-16 38-10 12-24 16-40 16h-620c-16 0-30-4-40-16-10-10-16-22-16-38v-768c0-16 6-28 16-38 10-12 24-16 40-16h364c16 0 32 2 52 10 18 8 32 18 42 28l178 178c12 10 20 26 28 44s12 34 12 50z"
+					"M200.533 902.4h622.933v-469.333h-253.867c-14.933 0-29.867-4.267-40.533-17.067-10.667-10.667-17.067-23.467-17.067-40.533v-253.867h-311.467zM590.933 356.267h228.267c-4.267-12.8-8.533-21.333-12.8-25.6l-192-189.867c-4.267-6.4-12.8-10.667-23.467-14.933zM902.4 375.467v546.133c0 17.067-6.4 29.867-17.067 40.533-10.667 12.8-25.6 17.067-42.667 17.067h-661.333c-17.067 0-32-4.267-42.667-17.067-10.667-10.667-17.067-23.467-17.067-40.533v-819.2c0-17.067 6.4-29.867 17.067-40.533 10.667-12.8 25.6-17.067 42.667-17.067h388.267c17.067 0 34.133 2.133 55.467 10.667 19.2 8.533 34.133 19.2 44.8 29.867l189.867 189.867c12.8 10.667 21.333 27.733 29.867 46.933s12.8 36.267 12.8 53.333z"
 				],
 				"defaultCode": 99,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 2,
-				"order": 4,
+				"order": 5,
 				"prevSize": 32,
 				"code": 99,
 				"name": "uni63",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 7
+			"iconIdx": 5
 		},
 		{
 			"icon": {
 				"paths": [
-					"M280 878l52-52-134-134-52 52v60h74v74zM580 348c0-8-4-14-14-14-2 0-6 2-8 4l-310 310c-4 4-4 6-4 10 0 8 4 12 12 12 4 0 8 0 10-4l310-308c2-4 4-6 4-10zM548 238l238 238-476 474h-236v-236zM938 292c0 20-6 38-20 52l-96 94-236-236 94-96c14-14 30-20 52-20 20 0 36 6 52 20l134 134c14 16 20 32 20 52z"
+					"M312 878l52-52-134-134-52 52v60h74v74zM612 348c0-8-4-14-14-14-2 0-6 2-8 4l-310 310c-4 4-4 6-4 10 0 8 4 12 12 12 4 0 8 0 10-4l310-308c2-4 4-6 4-10zM580 238l238 238-476 474h-236v-236zM970 292c0 20-6 38-20 52l-96 94-236-236 94-96c14-14 30-20 52-20 20 0 36 6 52 20l134 134c14 16 20 32 20 52z"
 				],
 				"defaultCode": 100,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 3,
-				"order": 5,
+				"order": 7,
 				"prevSize": 32,
 				"code": 100,
 				"name": "uni64",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 8
+			"iconIdx": 6
 		},
 		{
 			"icon": {
 				"paths": [
-					"M798 676c0 6-2 10-6 14l-30 28c-2 4-8 6-12 6-6 0-10-2-14-6l-224-224-224 224c-4 4-8 6-14 6-4 0-10-2-12-6l-30-28c-4-4-6-8-6-14 0-4 2-8 6-12l266-266c4-4 10-6 14-6s10 2 14 6l266 266c4 4 6 8 6 12z"
+					"M798 644c0 6-2 10-6 14l-30 28c-2 4-8 6-12 6-6 0-10-2-14-6l-224-224-224 224c-4 4-8 6-14 6-4 0-10-2-12-6l-30-28c-4-4-6-8-6-14 0-4 2-8 6-12l266-266c4-4 10-6 14-6s10 2 14 6l266 266c4 4 6 8 6 12z"
 				],
 				"defaultCode": 101,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 4,
-				"order": 6,
+				"order": 8,
 				"prevSize": 32,
 				"code": 101,
 				"name": "uni65",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 9
+			"iconIdx": 7
 		},
 		{
 			"icon": {
 				"paths": [
-					"M694 476c0-72-24-132-74-182s-110-74-182-74c-70 0-130 24-180 74-50 50-76 110-76 182 0 70 26 130 76 180 50 50 110 76 180 76 72 0 132-26 182-76 50-50 74-110 74-180zM988 950c0 20-8 38-22 52s-32 22-52 22c-20 0-38-8-52-22l-196-196c-68 48-144 72-228 72-54 0-106-10-156-32-50-22-92-50-128-86-36-36-64-78-86-128-20-50-32-102-32-156 0-56 12-108 32-156 22-50 50-94 86-130 36-36 78-64 128-86 50-20 102-30 156-30 56 0 108 10 158 30 48 22 92 50 128 86 36 36 64 80 86 130 20 48 32 100 32 156 0 84-24 160-72 228l196 196c14 14 22 30 22 50z"
+					"M682.625 446.25c0-67.5-22.5-123.75-69.375-170.625s-103.125-69.375-170.625-69.375c-65.625 0-121.875 22.5-168.75 69.375s-71.25 103.125-71.25 170.625c0 65.625 24.375 121.875 71.25 168.75s103.125 71.25 168.75 71.25c67.5 0 123.75-24.375 170.625-71.25s69.375-103.125 69.375-168.75zM958.25 890.625c0 18.75-7.5 35.625-20.625 48.75s-30 20.625-48.75 20.625c-18.75 0-35.625-7.5-48.75-20.625l-183.75-183.75c-63.75 45-135 67.5-213.75 67.5-50.625 0-99.375-9.375-146.25-30s-86.25-46.875-120-80.625c-33.75-33.75-60-73.125-80.625-120-18.75-46.875-30-95.625-30-146.25 0-52.5 11.25-101.25 30-146.25 20.625-46.875 46.875-88.125 80.625-121.875s73.125-60 120-80.625c46.875-18.75 95.625-28.125 146.25-28.125 52.5 0 101.25 9.375 148.125 28.125 45 20.625 86.25 46.875 120 80.625s60 75 80.625 121.875c18.75 45 30 93.75 30 146.25 0 78.75-22.5 150-67.5 213.75l183.75 183.75c13.125 13.125 20.625 28.125 20.625 46.875z"
 				],
 				"defaultCode": 102,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 5,
-				"order": 7,
+				"order": 9,
 				"prevSize": 32,
 				"code": 102,
 				"name": "uni66",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 10
+			"iconIdx": 8
 		},
 		{
 			"icon": {
 				"paths": [
-					"M852 756c0 14-6 28-16 38l-78 78c-10 10-24 16-40 16-14 0-28-6-38-16l-168-168-168 168c-10 10-24 16-38 16-16 0-30-6-40-16l-78-78c-10-10-16-24-16-38 0-16 6-28 16-40l168-168-168-168c-10-10-16-24-16-38 0-16 6-28 16-40l78-76c10-12 24-16 40-16 14 0 28 4 38 16l168 168 168-168c10-12 24-16 38-16 16 0 30 4 40 16l78 76c10 12 16 24 16 40 0 14-6 28-16 38l-168 168 168 168c10 12 16 24 16 40z"
+					"M852 724c0 14-6 28-16 38l-78 78c-10 10-24 16-40 16-14 0-28-6-38-16l-168-168-168 168c-10 10-24 16-38 16-16 0-30-6-40-16l-78-78c-10-10-16-24-16-38 0-16 6-28 16-40l168-168-168-168c-10-10-16-24-16-38 0-16 6-28 16-40l78-76c10-12 24-16 40-16 14 0 28 4 38 16l168 168 168-168c10-12 24-16 38-16 16 0 30 4 40 16l78 76c10 12 16 24 16 40 0 14-6 28-16 38l-168 168 168 168c10 12 16 24 16 40z"
 				],
 				"defaultCode": 103,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 6,
-				"order": 8,
+				"order": 10,
 				"prevSize": 32,
 				"code": 103,
 				"name": "uni67",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 11
+			"iconIdx": 9
 		},
 		{
 			"icon": {
 				"paths": [
-					"M950 530c0-12-10-18-28-18h-580c-14 0-30 4-46 12s-30 16-38 28l-158 194c-6 8-8 14-8 20 0 12 8 20 28 20h580c14 0 30-4 46-12s28-18 38-28l156-194c6-8 10-16 10-22zM342 444h408v-86c0-14-4-26-14-36s-22-14-36-14h-308c-14 0-26-6-36-16s-14-22-14-36v-34c0-14-6-26-16-36s-22-16-36-16h-170c-14 0-26 6-36 16s-16 22-16 36v454l136-168c16-18 38-34 62-46 26-12 52-18 76-18zM1018 530c0 22-8 44-24 64l-158 194c-16 20-36 34-62 46-26 14-50 20-74 20h-580c-34 0-62-12-84-36-24-24-36-52-36-84v-512c0-32 12-60 36-84 22-24 50-36 84-36h170c32 0 60 12 84 36s36 52 36 84v16h290c32 0 60 12 84 36s36 52 36 84v86h102c18 0 36 4 52 12 16 10 28 22 36 38 6 12 8 24 8 36z"
+					"M896.961 559.82c0-10.547-8.789-15.82-24.609-15.82h-509.766c-12.305 0-26.367 3.516-40.43 10.547s-26.367 14.063-33.398 24.609l-138.867 170.508c-5.273 7.031-7.031 12.305-7.031 17.578 0 10.547 7.031 17.578 24.609 17.578h509.766c12.305 0 26.367-3.516 40.43-10.547s24.609-15.82 33.398-24.609l137.109-170.508c5.273-7.031 8.789-14.063 8.789-19.336zM362.586 484.234h358.594v-75.586c0-12.305-3.516-22.852-12.305-31.641s-19.336-12.305-31.641-12.305h-270.703c-12.305 0-22.852-5.273-31.641-14.063s-12.305-19.336-12.305-31.641v-29.883c0-12.305-5.273-22.852-14.063-31.641s-19.336-14.063-31.641-14.063h-149.414c-12.305 0-22.852 5.273-31.641 14.063s-14.063 19.336-14.063 31.641v399.023l119.531-147.656c14.063-15.82 33.398-29.883 54.492-40.43 22.852-10.547 45.703-15.82 66.797-15.82zM956.727 559.82c0 19.336-7.031 38.672-21.094 56.25l-138.867 170.508c-14.063 17.578-31.641 29.883-54.492 40.43-22.852 12.305-43.945 17.578-65.039 17.578h-509.766c-29.883 0-54.492-10.547-73.828-31.641-21.094-21.094-31.641-45.703-31.641-73.828v-450c0-28.125 10.547-52.734 31.641-73.828 19.336-21.094 43.945-31.641 73.828-31.641h149.414c28.125 0 52.734 10.547 73.828 31.641s31.641 45.703 31.641 73.828v14.063h254.883c28.125 0 52.734 10.547 73.828 31.641s31.641 45.703 31.641 73.828v75.586h89.648c15.82 0 31.641 3.516 45.703 10.547 14.063 8.789 24.609 19.336 31.641 33.398 5.273 10.547 7.031 21.094 7.031 31.641z"
 				],
 				"defaultCode": 105,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 7,
-				"order": 9,
+				"order": 11,
 				"prevSize": 32,
 				"code": 105,
 				"name": "uni69",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 12
+			"iconIdx": 10
 		},
 		{
 			"icon": {
 				"paths": [
-					"M988 348v402c0 34-14 64-38 90-26 26-56 38-90 38h-696c-34 0-64-12-90-38-24-26-38-56-38-90v-548c0-36 14-66 38-92 26-24 56-36 90-36h184c34 0 64 12 90 36 24 26 38 56 38 92v18h384c34 0 64 12 90 38 24 24 38 54 38 90z"
+					"M958.25 390.25v376.875c0 31.875-13.125 60-35.625 84.375-24.375 24.375-52.5 35.625-84.375 35.625h-652.5c-31.875 0-60-11.25-84.375-35.625-22.5-24.375-35.625-52.5-35.625-84.375v-513.75c0-33.75 13.125-61.875 35.625-86.25 24.375-22.5 52.5-33.75 84.375-33.75h172.5c31.875 0 60 11.25 84.375 33.75 22.5 24.375 35.625 52.5 35.625 86.25v16.875h360c31.875 0 60 11.25 84.375 35.625 22.5 22.5 35.625 50.625 35.625 84.375z"
 				],
 				"defaultCode": 106,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 8,
-				"order": 10,
+				"order": 12,
 				"prevSize": 32,
 				"code": 106,
 				"name": "uni6A",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 13
+			"iconIdx": 11
 		},
 		{
 			"icon": {
 				"paths": [
-					"M1024 406v454c0 24-8 46-26 64s-40 26-66 26h-840c-26 0-48-8-66-26s-26-40-26-64v-454c16 18 36 34 58 50 138 94 232 158 284 196 22 16 40 30 52 38 14 8 32 18 54 28 24 8 44 14 64 14v0c20 0 40-6 64-14 22-10 40-20 54-28 12-8 30-22 52-38 66-46 160-112 284-196 22-16 42-32 58-50zM1024 238c0 30-10 58-28 86s-42 50-70 70c-142 100-232 162-268 186-2 2-12 8-24 18-12 8-22 16-30 22-8 4-18 10-30 18-12 6-22 12-32 16-12 2-20 4-30 4v0c-10 0-18-2-30-4-10-4-20-10-32-16-12-8-22-14-30-18-8-6-18-14-30-22-12-10-22-16-24-18-36-24-86-60-150-104-66-46-104-72-118-82-24-16-46-38-66-66-22-28-32-54-32-78 0-30 8-54 24-74 16-20 38-30 68-30h840c26 0 46 10 64 28s28 38 28 64z"
+					"M962 386.836v399.023c0 21.094-7.031 40.43-22.852 56.25s-35.156 22.852-58.008 22.852h-738.281c-22.852 0-42.188-7.031-58.008-22.852s-22.852-35.156-22.852-56.25v-399.023c14.063 15.82 31.641 29.883 50.977 43.945 121.289 82.617 203.906 138.867 249.609 172.266 19.336 14.063 35.156 26.367 45.703 33.398 12.305 7.031 28.125 15.82 47.461 24.609 21.094 7.031 38.672 12.305 56.25 12.305v0c17.578 0 35.156-5.273 56.25-12.305 19.336-8.789 35.156-17.578 47.461-24.609 10.547-7.031 26.367-19.336 45.703-33.398 58.008-40.43 140.625-98.438 249.609-172.266 19.336-14.063 36.914-28.125 50.977-43.945zM962 239.18c0 26.367-8.789 50.977-24.609 75.586s-36.914 43.945-61.523 61.523c-124.805 87.891-203.906 142.383-235.547 163.477-1.758 1.758-10.547 7.031-21.094 15.82-10.547 7.031-19.336 14.063-26.367 19.336-7.031 3.516-15.82 8.789-26.367 15.82-10.547 5.273-19.336 10.547-28.125 14.063-10.547 1.758-17.578 3.516-26.367 3.516v0c-8.789 0-15.82-1.758-26.367-3.516-8.789-3.516-17.578-8.789-28.125-14.063-10.547-7.031-19.336-12.305-26.367-15.82-7.031-5.273-15.82-12.305-26.367-19.336-10.547-8.789-19.336-14.063-21.094-15.82-31.641-21.094-75.586-52.734-131.836-91.406-58.008-40.43-91.406-63.281-103.711-72.070-21.094-14.063-40.43-33.398-58.008-58.008-19.336-24.609-28.125-47.461-28.125-68.555 0-26.367 7.031-47.461 21.094-65.039s33.398-26.367 59.766-26.367h738.281c22.852 0 40.43 8.789 56.25 24.609s24.609 33.398 24.609 56.25z"
 				],
 				"defaultCode": 107,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 9,
-				"order": 11,
+				"order": 13,
 				"prevSize": 32,
 				"code": 107,
 				"name": "uni6B",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 14
+			"iconIdx": 12
 		},
 		{
 			"icon": {
 				"paths": [
-					"M694 182c0 10-2 20-10 26-8 8-16 12-26 12h-72v584h72c10 0 18 4 26 12 8 6 10 16 10 26 0 10-2 18-10 24l-146 148c-8 6-16 10-26 10s-18-4-26-10l-146-148c-8-6-10-14-10-24s2-20 10-26c8-8 16-12 26-12h72v-584h-72c-10 0-18-4-26-12-8-6-10-16-10-26 0-10 2-18 10-24l146-148c8-6 16-10 26-10s18 4 26 10l146 148c8 6 10 14 10 24z"
+					"M671.961 221.961c0 8.789-1.758 17.578-8.789 22.852-7.031 7.031-14.063 10.547-22.852 10.547h-63.281v513.281h63.281c8.789 0 15.82 3.516 22.852 10.547 7.031 5.273 8.789 14.063 8.789 22.852s-1.758 15.82-8.789 21.094l-128.32 130.078c-7.031 5.273-14.063 8.789-22.852 8.789s-15.82-3.516-22.852-8.789l-128.32-130.078c-7.031-5.273-8.789-12.305-8.789-21.094s1.758-17.578 8.789-22.852c7.031-7.031 14.063-10.547 22.852-10.547h63.281v-513.281h-63.281c-8.789 0-15.82-3.516-22.852-10.547-7.031-5.273-8.789-14.063-8.789-22.852s1.758-15.82 8.789-21.094l128.32-130.078c7.031-5.273 14.063-8.789 22.852-8.789s15.82 3.516 22.852 8.789l128.32 130.078c7.031 5.273 8.789 12.305 8.789 21.094z"
 				],
 				"defaultCode": 108,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 10,
-				"order": 12,
+				"order": 14,
 				"prevSize": 32,
 				"code": 108,
 				"name": "uni6C",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 15
+			"iconIdx": 13
 		},
 		{
 			"icon": {
 				"paths": [
-					"M670 548c0 6-2 10-6 14l-266 266c-4 4-10 6-14 6s-10-2-14-6l-28-28c-4-4-6-8-6-14 0-4 2-10 6-12l224-226-224-224c-4-4-6-8-6-14 0-4 2-8 6-12l28-28c4-4 10-6 14-6s10 2 14 6l266 266c4 4 6 8 6 12z"
+					"M670 516c0 6-2 10-6 14l-266 266c-4 4-10 6-14 6s-10-2-14-6l-28-28c-4-4-6-8-6-14 0-4 2-10 6-12l224-226-224-224c-4-4-6-8-6-14 0-4 2-8 6-12l28-28c4-4 10-6 14-6s10 2 14 6l266 266c4 4 6 8 6 12z"
 				],
 				"defaultCode": 110,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 12,
-				"order": 14,
+				"order": 15,
 				"prevSize": 32,
 				"code": 110,
 				"name": "uni6E",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 17
+			"iconIdx": 14
 		},
 		{
 			"icon": {
@@ -300,37 +300,37 @@
 					"M732 676v38c0 4-2 8-6 12s-8 6-12 6h-404c-4 0-8-2-12-6s-6-8-6-12v-38c0-4 2-10 6-12 4-4 8-6 12-6h404c4 0 8 2 12 6 4 2 6 8 6 12zM732 530v36c0 6-2 10-6 14s-8 6-12 6h-404c-4 0-8-2-12-6s-6-8-6-14v-36c0-6 2-10 6-12 4-4 8-6 12-6h404c4 0 8 2 12 6 4 2 6 6 6 12zM220 878h584v-440h-238c-14 0-28-4-38-16-10-10-16-22-16-38v-238h-292zM586 366h214c-4-12-8-20-12-24l-180-178c-4-6-12-10-22-14zM878 384v512c0 16-6 28-16 38-10 12-24 16-40 16h-620c-16 0-30-4-40-16-10-10-16-22-16-38v-768c0-16 6-28 16-38 10-12 24-16 40-16h364c16 0 32 2 52 10 18 8 32 18 42 28l178 178c12 10 20 26 28 44s12 34 12 50z"
 				],
 				"defaultCode": 104,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 13,
-				"order": 15,
+				"order": 16,
 				"prevSize": 32,
 				"code": 104,
 				"name": "uni68",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 18
+			"iconIdx": 15
 		},
 		{
 			"icon": {
 				"paths": [
-					"M342 342c0 28-10 52-30 72s-44 30-74 30c-28 0-52-10-72-30-20-20-30-44-30-72 0-30 10-54 30-74 20-20 44-30 72-30 30 0 54 10 74 30 20 20 30 44 30 74zM888 546v240h-752v-104l172-170 84 86 274-274zM938 170h-852c-6 0-10 2-12 6-4 4-6 8-6 12v648c0 4 2 8 6 12 2 4 6 6 12 6h852c6 0 10-2 12-6 4-4 6-8 6-12v-648c0-4-2-8-6-12-2-4-6-6-12-6zM1024 188v648c0 24-8 44-26 60-16 18-36 26-60 26h-852c-24 0-44-8-60-26-18-16-26-36-26-60v-648c0-24 8-44 26-60 16-18 36-26 60-26h852c24 0 44 8 60 26 18 16 26 36 26 60z"
+					"M362.586 362.586c0 24.609-8.789 45.703-26.367 63.281s-38.672 26.367-65.039 26.367c-24.609 0-45.703-8.789-63.281-26.367s-26.367-38.672-26.367-63.281c0-26.367 8.789-47.461 26.367-65.039s38.672-26.367 63.281-26.367c26.367 0 47.461 8.789 65.039 26.367s26.367 38.672 26.367 65.039zM842.469 541.883v210.938h-660.938v-91.406l151.172-149.414 73.828 75.586 240.82-240.82zM886.414 211.414h-748.828c-5.273 0-8.789 1.758-10.547 5.273-3.516 3.516-5.273 7.031-5.273 10.547v569.531c0 3.516 1.758 7.031 5.273 10.547 1.758 3.516 5.273 5.273 10.547 5.273h748.828c5.273 0 8.789-1.758 10.547-5.273 3.516-3.516 5.273-7.031 5.273-10.547v-569.531c0-3.516-1.758-7.031-5.273-10.547-1.758-3.516-5.273-5.273-10.547-5.273zM962 227.234v569.531c0 21.094-7.031 38.672-22.852 52.734-14.063 15.82-31.641 22.852-52.734 22.852h-748.828c-21.094 0-38.672-7.031-52.734-22.852-15.82-14.063-22.852-31.641-22.852-52.734v-569.531c0-21.094 7.031-38.672 22.852-52.734 14.063-15.82 31.641-22.852 52.734-22.852h748.828c21.094 0 38.672 7.031 52.734 22.852 15.82 14.063 22.852 31.641 22.852 52.734z"
 				],
 				"defaultCode": 111,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 14,
-				"order": 16,
+				"order": 17,
 				"prevSize": 32,
 				"code": 111,
 				"name": "uni6F",
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 19
+			"iconIdx": 16
 		},
 		{
 			"icon": {
@@ -338,7 +338,7 @@
 					"M798 420c0 6-2 10-6 14l-266 266c-4 4-10 6-14 6s-10-2-14-6l-266-266c-4-4-6-8-6-14 0-4 2-8 6-12l30-30c2-2 8-4 12-4 6 0 10 2 14 4l224 226 224-226c4-2 8-4 14-4 4 0 10 2 12 4l30 30c4 4 6 8 6 12z"
 				],
 				"defaultCode": 113,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 16,
@@ -349,7 +349,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 21
+			"iconIdx": 17
 		},
 		{
 			"icon": {
@@ -357,7 +357,7 @@
 					"M732 786v-36c0-6-2-10-6-14-4-2-8-4-12-4h-404c-4 0-8 2-12 4-4 4-6 8-6 14v36c0 6 2 10 6 14 4 2 8 4 12 4h404c4 0 8-2 12-4 4-4 6-8 6-14zM732 640v-36c0-6-2-10-6-14s-8-4-12-4h-404c-4 0-8 0-12 4s-6 8-6 14v36c0 6 2 10 6 14 4 2 8 4 12 4h404c4 0 8-2 12-4 4-4 6-8 6-14zM878 438v458c0 16-6 28-16 38-10 12-24 16-40 16h-620c-16 0-30-4-40-16-10-10-16-22-16-38v-768c0-16 6-28 16-38 10-12 24-16 40-16h310v310c0 16 6 28 16 38 10 12 24 16 38 16zM876 366h-290v-292c30 6 56 18 74 38l178 178c20 20 32 44 38 76z"
 				],
 				"defaultCode": 114,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 17,
@@ -368,15 +368,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 22
+			"iconIdx": 18
 		},
 		{
 			"icon": {
 				"paths": [
-					"M914 750v-402c0-16-6-28-16-40-10-10-24-16-38-16h-402c-16 0-30-4-40-16-10-10-16-24-16-38v-36c0-16-6-30-16-40s-24-16-38-16h-184c-14 0-28 6-38 16s-16 24-16 40v548c0 14 6 28 16 38 10 12 24 16 38 16h696c14 0 28-4 38-16 10-10 16-24 16-38zM988 348v402c0 34-14 64-38 90-26 26-56 38-90 38h-696c-34 0-64-12-90-38-24-26-38-56-38-90v-548c0-36 14-66 38-92 26-24 56-36 90-36h184c34 0 64 12 90 36 24 26 38 56 38 92v18h384c34 0 64 12 90 38 24 24 38 54 38 90z"
+					"M888.875 767.125v-376.875c0-15-5.625-26.25-15-37.5-9.375-9.375-22.5-15-35.625-15h-376.875c-15 0-28.125-3.75-37.5-15-9.375-9.375-15-22.5-15-35.625v-33.75c0-15-5.625-28.125-15-37.5s-22.5-15-35.625-15h-172.5c-13.125 0-26.25 5.625-35.625 15s-15 22.5-15 37.5v513.75c0 13.125 5.625 26.25 15 35.625 9.375 11.25 22.5 15 35.625 15h652.5c13.125 0 26.25-3.75 35.625-15 9.375-9.375 15-22.5 15-35.625zM958.25 390.25v376.875c0 31.875-13.125 60-35.625 84.375-24.375 24.375-52.5 35.625-84.375 35.625h-652.5c-31.875 0-60-11.25-84.375-35.625-22.5-24.375-35.625-52.5-35.625-84.375v-513.75c0-33.75 13.125-61.875 35.625-86.25 24.375-22.5 52.5-33.75 84.375-33.75h172.5c31.875 0 60 11.25 84.375 33.75 22.5 24.375 35.625 52.5 35.625 86.25v16.875h360c31.875 0 60 11.25 84.375 35.625 22.5 22.5 35.625 50.625 35.625 84.375z"
 				],
 				"defaultCode": 115,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 18,
@@ -387,15 +387,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 23
+			"iconIdx": 19
 		},
 		{
 			"icon": {
 				"paths": [
-					"M914 420v110c0 16-6 28-16 40-10 10-24 16-38 16h-238v236c0 16-6 30-16 40s-24 16-40 16h-108c-16 0-30-6-40-16s-16-24-16-40v-236h-238c-14 0-28-6-38-16-10-12-16-24-16-40v-110c0-14 6-28 16-38s24-16 38-16h238v-238c0-16 6-28 16-38 10-12 24-16 40-16h108c16 0 30 4 40 16 10 10 16 22 16 38v238h238c14 0 28 6 38 16s16 24 16 38z"
+					"M888.875 425.75v103.125c0 15-5.625 26.25-15 37.5-9.375 9.375-22.5 15-35.625 15h-223.125v221.25c0 15-5.625 28.125-15 37.5s-22.5 15-37.5 15h-101.25c-15 0-28.125-5.625-37.5-15s-15-22.5-15-37.5v-221.25h-223.125c-13.125 0-26.25-5.625-35.625-15-9.375-11.25-15-22.5-15-37.5v-103.125c0-13.125 5.625-26.25 15-35.625s22.5-15 35.625-15h223.125v-223.125c0-15 5.625-26.25 15-35.625 9.375-11.25 22.5-15 37.5-15h101.25c15 0 28.125 3.75 37.5 15 9.375 9.375 15 20.625 15 35.625v223.125h223.125c13.125 0 26.25 5.625 35.625 15s15 22.5 15 35.625z"
 				],
 				"defaultCode": 116,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 19,
@@ -406,7 +406,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 24
+			"iconIdx": 20
 		},
 		{
 			"icon": {
@@ -414,7 +414,7 @@
 					"M330 256c0-20-8-38-22-52s-32-22-52-22c-20 0-38 8-52 22-14 14-22 32-22 52 0 20 8 38 22 52 14 14 32 22 52 22 20 0 38-8 52-22 14-14 22-32 22-52zM938 586c0 20-6 36-20 50l-280 282c-16 14-34 20-52 20-22 0-38-6-52-20l-408-410c-16-14-28-32-38-58-10-24-14-46-14-66v-238c0-20 6-36 20-52 16-14 32-20 52-20h238c20 0 42 4 66 14 26 10 44 22 60 38l408 408c14 14 20 32 20 52z"
 				],
 				"defaultCode": 117,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 20,
@@ -425,15 +425,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 25
+			"iconIdx": 21
 		},
 		{
 			"icon": {
 				"paths": [
-					"M1002 542c0 10-6 22-16 36l-180 210c-14 18-36 34-64 46-28 14-52 20-76 20h-580c-12 0-24-2-32-8-10-4-16-12-16-22 0-12 6-24 18-36l178-210c16-20 38-34 64-48 28-12 54-18 78-18h580c12 0 22 2 32 6 10 6 14 14 14 24zM820 358v86h-444c-34 0-68 8-106 26-36 16-66 38-88 62l-178 212-4 4c0-2 0-4 0-8 0-2 0-4 0-6v-512c0-32 12-60 36-84 22-24 50-36 84-36h170c32 0 60 12 84 36s36 52 36 84v16h290c32 0 60 12 84 36s36 52 36 84z"
+					"M942.664 570.367c0 8.789-5.273 19.336-14.063 31.641l-158.203 184.57c-12.305 15.82-31.641 29.883-56.25 40.43-24.609 12.305-45.703 17.578-66.797 17.578h-509.766c-10.547 0-21.094-1.758-28.125-7.031-8.789-3.516-14.063-10.547-14.063-19.336 0-10.547 5.273-21.094 15.82-31.641l156.445-184.57c14.063-17.578 33.398-29.883 56.25-42.188 24.609-10.547 47.461-15.82 68.555-15.82h509.766c10.547 0 19.336 1.758 28.125 5.273 8.789 5.273 12.305 12.305 12.305 21.094zM782.703 408.648v75.586h-390.234c-29.883 0-59.766 7.031-93.164 22.852-31.641 14.063-58.008 33.398-77.344 54.492l-156.445 186.328-3.516 3.516c0-1.758 0-3.516 0-7.031 0-1.758 0-3.516 0-5.273v-450c0-28.125 10.547-52.734 31.641-73.828 19.336-21.094 43.945-31.641 73.828-31.641h149.414c28.125 0 52.734 10.547 73.828 31.641s31.641 45.703 31.641 73.828v14.063h254.883c28.125 0 52.734 10.547 73.828 31.641s31.641 45.703 31.641 73.828z"
 				],
 				"defaultCode": 118,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 21,
@@ -444,7 +444,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 26
+			"iconIdx": 22
 		},
 		{
 			"icon": {
@@ -452,7 +452,7 @@
 					"M658 512c0-40-14-74-42-104-30-28-64-42-104-42-40 0-74 14-104 42-28 30-42 64-42 104 0 40 14 74 42 104 30 28 64 42 104 42 40 0 74-14 104-42 28-30 42-64 42-104zM950 450v126c0 6 0 10-4 14-2 4-6 6-12 8l-104 16c-8 20-16 38-24 52 14 18 34 44 62 78 4 4 6 10 6 14 0 6-2 10-6 14-10 14-28 34-56 62-28 26-46 40-54 40-4 0-10-2-14-6l-80-62c-16 10-34 16-52 22-6 52-12 88-16 106-2 12-10 16-20 16h-128c-4 0-10 0-14-4s-6-8-6-12l-16-106c-18-6-36-12-52-20l-80 60c-4 4-8 6-14 6s-10-2-14-6c-48-44-80-76-94-96-4-4-4-8-4-14 0-4 0-8 4-12 6-8 16-22 28-38 14-18 24-32 32-42-10-18-18-38-24-56l-104-16c-6 0-10-2-12-6-4-4-4-8-4-14v-126c0-6 0-10 4-14 2-4 6-6 10-8l106-16c6-16 14-34 24-52-16-22-36-48-62-78-4-6-6-10-6-14 0-4 2-8 6-14 10-14 28-34 56-60 28-28 46-42 54-42 4 0 10 2 14 6l80 62c16-10 34-16 52-22 6-52 12-88 16-106 2-12 10-16 20-16h128c4 0 10 0 14 4s6 8 6 12l16 106c18 6 36 12 52 20l80-60c4-4 8-6 14-6s10 2 14 6c50 46 82 78 94 98 4 2 4 6 4 12 0 4 0 8-4 12-6 8-16 22-28 38-14 18-24 32-32 42 10 18 18 36 24 56l104 16c6 0 10 2 12 6 4 4 4 8 4 14z"
 				],
 				"defaultCode": 119,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 22,
@@ -463,15 +463,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 27
+			"iconIdx": 23
 		},
 		{
 			"icon": {
 				"paths": [
-					"M954 324c0 14-4 28-16 38l-490 492c-12 10-24 16-40 16-14 0-28-6-38-16l-284-284c-12-12-16-24-16-40 0-14 4-28 16-38l76-78c12-10 24-16 40-16 14 0 28 6 38 16l168 168 376-376c10-10 24-16 38-16 16 0 28 6 40 16l76 78c12 12 16 24 16 40z"
+					"M954 292c0 14-4 28-16 38l-490 492c-12 10-24 16-40 16-14 0-28-6-38-16l-284-284c-12-12-16-24-16-40 0-14 4-28 16-38l76-78c12-10 24-16 40-16 14 0 28 6 38 16l168 168 376-376c10-10 24-16 38-16 16 0 28 6 40 16l76 78c12 12 16 24 16 40z"
 				],
 				"defaultCode": 120,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 23,
@@ -482,15 +482,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 28
+			"iconIdx": 24
 		},
 		{
 			"icon": {
 				"paths": [
-					"M688 310c0 6-2 10-6 14l-224 224 224 226c4 2 6 8 6 12 0 6-2 10-6 14l-28 28c-4 4-10 6-14 6s-10-2-14-6l-266-266c-4-4-6-8-6-14 0-4 2-8 6-12l266-266c4-4 10-6 14-6s10 2 14 6l28 28c4 4 6 8 6 12z"
+					"M688 278c0 6-2 10-6 14l-224 224 224 226c4 2 6 8 6 12 0 6-2 10-6 14l-28 28c-4 4-10 6-14 6s-10-2-14-6l-266-266c-4-4-6-8-6-14 0-4 2-8 6-12l266-266c4-4 10-6 14-6s10 2 14 6l28 28c4 4 6 8 6 12z"
 				],
 				"defaultCode": 122,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 24,
@@ -501,7 +501,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 29
+			"iconIdx": 25
 		},
 		{
 			"icon": {
@@ -509,7 +509,7 @@
 					"M464 742l352-350c6-8 10-16 10-26s-4-18-10-26l-58-58c-8-8-16-12-26-12s-20 4-26 12l-268 266-120-120c-6-8-16-10-26-10s-18 2-26 10l-58 58c-6 8-10 16-10 26s4 18 10 26l206 204c6 8 14 12 24 12s20-4 26-12zM950 238v548c0 46-16 84-48 116s-70 48-116 48h-548c-46 0-84-16-116-48s-48-70-48-116v-548c0-46 16-84 48-116s70-48 116-48h548c46 0 84 16 116 48s48 70 48 116z"
 				],
 				"defaultCode": 65,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 25,
@@ -520,7 +520,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 30
+			"iconIdx": 26
 		},
 		{
 			"icon": {
@@ -528,7 +528,7 @@
 					"M768 548v-72c0-10-4-20-10-26-8-8-16-12-26-12h-146v-146c0-10-4-18-12-26-6-6-16-10-26-10h-72c-10 0-20 4-26 10-8 8-12 16-12 26v146h-146c-10 0-18 4-26 12-6 6-10 16-10 26v72c0 10 4 20 10 26 8 8 16 12 26 12h146v146c0 10 4 18 12 26 6 6 16 10 26 10h72c10 0 20-4 26-10 8-8 12-16 12-26v-146h146c10 0 18-4 26-12 6-6 10-16 10-26zM950 512c0 80-18 154-58 220-40 68-92 120-160 160-66 40-140 58-220 58-80 0-154-18-220-58-68-40-120-92-160-160-40-66-58-140-58-220 0-80 18-154 58-220 40-68 92-120 160-160 66-40 140-58 220-58 80 0 154 18 220 58 68 40 120 92 160 160 40 66 58 140 58 220z"
 				],
 				"defaultCode": 66,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 26,
@@ -539,15 +539,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 31
+			"iconIdx": 27
 		},
 		{
 			"icon": {
 				"paths": [
-					"M365.797 867.819c-140.918-40.513-544.297-218.423-86.313-806.757 246.606 167.341 341.727 315.305 359.34 436.846-118.019 42.275-199.047 125.066-188.478 274.791-65.176-153.249-116.258-366.387-137.395-498.498-10.569 155.010 12.33 429.8 52.844 593.618zM522.569 904.81c-33.469-93.358-103.928-401.617 424.516-385.764 15.854 484.407-241.322 466.791-355.819 433.323 47.56-93.358 109.211-177.91 186.717-248.369-95.121 52.844-181.433 119.78-255.415 200.808z"
+					"M374.935 845.58c-132.111-37.981-510.278-204.772-80.918-756.335 231.193 156.882 320.369 295.598 336.881 409.543-110.643 39.633-186.607 117.249-176.698 257.617-61.102-143.671-108.992-343.488-128.808-467.342-9.908 145.322 11.559 402.938 49.541 556.517zM521.908 880.259c-31.377-87.523-97.433-376.516 397.984-361.654 14.863 454.132-226.239 437.617-333.58 406.24 44.587-87.523 102.385-166.791 175.047-232.846-89.176 49.541-170.093 112.294-239.452 188.258z"
 				],
 				"defaultCode": 68,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 27,
@@ -558,15 +558,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 32
+			"iconIdx": 28
 		},
 		{
 			"icon": {
 				"paths": [
-					"M426 870c30 12 56 18 80 18 50 0 92-8 124-24 32-16 56-38 70-64 14-28 22-62 22-104 0-44-8-78-24-102-22-36-48-60-80-72-30-14-78-20-142-20-28 0-46 2-58 6v182l2 154c0 6 2 14 6 26zM418 442c18 4 38 4 64 4 66 0 116-12 150-36 34-26 50-68 50-128 0-42-16-78-48-108-32-28-80-42-146-42-20 0-44 2-74 8 0 16 0 30 2 44 2 46 4 100 2 158v56c0 18 0 32 0 44zM110 950v-52c18-4 30-6 40-8 30-4 52-10 70-18 6-10 10-20 12-28 4-26 6-62 6-112l-2-284c-2-96-4-174-6-230 0-34-2-54-6-62 0-2-2-4-6-8-8-4-20-6-40-8-12 0-32-4-64-8l-4-46 150-4 216-8h26c2 0 4 0 8 0s6 0 8 0c0 0 4 0 12 0s16 0 24 0h42c34 0 70 4 110 16 16 4 34 12 54 22 22 10 42 24 58 42 18 18 30 38 38 60 8 22 12 46 12 70 0 26-6 52-18 74-14 22-32 42-56 60-10 6-38 22-84 44 66 14 118 42 152 82 34 40 52 86 52 136 0 28-6 60-16 92-8 24-22 46-40 66-26 28-52 48-80 62-28 14-68 26-116 34-32 6-70 8-114 6l-112-2c-32 0-90 2-170 6-14 2-66 4-156 6z"
+					"M431.375 847.625c28.125 11.25 52.5 16.875 75 16.875 46.875 0 86.25-7.5 116.25-22.5s52.5-35.625 65.625-60c13.125-26.25 20.625-58.125 20.625-97.5 0-41.25-7.5-73.125-22.5-95.625-20.625-33.75-45-56.25-75-67.5-28.125-13.125-73.125-18.75-133.125-18.75-26.25 0-43.125 1.875-54.375 5.625v170.625l1.875 144.375c0 5.625 1.875 13.125 5.625 24.375zM423.875 446.375c16.875 3.75 35.625 3.75 60 3.75 61.875 0 108.75-11.25 140.625-33.75 31.875-24.375 46.875-63.75 46.875-120 0-39.375-15-73.125-45-101.25-30-26.25-75-39.375-136.875-39.375-18.75 0-41.25 1.875-69.375 7.5 0 15 0 28.125 1.875 41.25 1.875 43.125 3.75 93.75 1.875 148.125v52.5c0 16.875 0 30 0 41.25zM135.125 922.625v-48.75c16.875-3.75 28.125-5.625 37.5-7.5 28.125-3.75 48.75-9.375 65.625-16.875 5.625-9.375 9.375-18.75 11.25-26.25 3.75-24.375 5.625-58.125 5.625-105l-1.875-266.25c-1.875-90-3.75-163.125-5.625-215.625 0-31.875-1.875-50.625-5.625-58.125 0-1.875-1.875-3.75-5.625-7.5-7.5-3.75-18.75-5.625-37.5-7.5-11.25 0-30-3.75-60-7.5l-3.75-43.125 140.625-3.75 202.5-7.5h24.375c1.875 0 3.75 0 7.5 0s5.625 0 7.5 0c0 0 3.75 0 11.25 0s15 0 22.5 0h39.375c31.875 0 65.625 3.75 103.125 15 15 3.75 31.875 11.25 50.625 20.625 20.625 9.375 39.375 22.5 54.375 39.375 16.875 16.875 28.125 35.625 35.625 56.25s11.25 43.125 11.25 65.625c0 24.375-5.625 48.75-16.875 69.375-13.125 20.625-30 39.375-52.5 56.25-9.375 5.625-35.625 20.625-78.75 41.25 61.875 13.125 110.625 39.375 142.5 76.875s48.75 80.625 48.75 127.5c0 26.25-5.625 56.25-15 86.25-7.5 22.5-20.625 43.125-37.5 61.875-24.375 26.25-48.75 45-75 58.125s-63.75 24.375-108.75 31.875c-30 5.625-65.625 7.5-106.875 5.625l-105-1.875c-30 0-84.375 1.875-159.375 5.625-13.125 1.875-61.875 3.75-146.25 5.625z"
 				],
 				"defaultCode": 67,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 28,
@@ -577,15 +577,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 33
+			"iconIdx": 29
 		},
 		{
 			"icon": {
 				"paths": [
-					"M220 950l10-48c0-2 16-6 44-12 28-8 50-14 66-22 10-14 18-34 22-58l16-80 40-190c2-16 6-32 8-48 4-16 8-28 10-38 2-10 6-18 8-26 2-8 2-14 4-18 2-4 2-6 2-6l16-90 10-36 12-78 6-28v-22c-16-8-44-14-84-16-10 0-18-2-20-2l10-58 182 8c14 0 28 0 40 0 26 0 66-2 124-4 12-2 24-2 38-4 14 0 20 0 20 0 0 6-2 14-2 20-4 12-6 22-8 30-22 8-42 14-62 18-24 6-44 12-58 18-4 12-10 28-14 50-4 16-6 32-8 46-16 76-28 134-38 176l-34 178-22 90-24 134-8 26c0 2 0 8 2 14 24 6 46 10 68 12 14 2 26 4 38 6-2 12-2 22-4 34-4 12-6 20-6 24-6 0-12 0-14 0-8 0-16 0-24 0-2 0-8 0-16 0-6-2-34-6-82-10l-114-2c-14 0-48 2-98 6-28 4-48 4-56 6z"
+					"M238.25 922.625l9.375-45c0-1.875 15-5.625 41.25-11.25 26.25-7.5 46.875-13.125 61.875-20.625 9.375-13.125 16.875-31.875 20.625-54.375l15-75 37.5-178.125c1.875-15 5.625-30 7.5-45 3.75-15 7.5-26.25 9.375-35.625s5.625-16.875 7.5-24.375c1.875-7.5 1.875-13.125 3.75-16.875s1.875-5.625 1.875-5.625l15-84.375 9.375-33.75 11.25-73.125 5.625-26.25v-20.625c-15-7.5-41.25-13.125-78.75-15-9.375 0-16.875-1.875-18.75-1.875l9.375-54.375 170.625 7.5c13.125 0 26.25 0 37.5 0 24.375 0 61.875-1.875 116.25-3.75 11.25-1.875 22.5-1.875 35.625-3.75 13.125 0 18.75 0 18.75 0 0 5.625-1.875 13.125-1.875 18.75-3.75 11.25-5.625 20.625-7.5 28.125-20.625 7.5-39.375 13.125-58.125 16.875-22.5 5.625-41.25 11.25-54.375 16.875-3.75 11.25-9.375 26.25-13.125 46.875-3.75 15-5.625 30-7.5 43.125-15 71.25-26.25 125.625-35.625 165l-31.875 166.875-20.625 84.375-22.5 125.625-7.5 24.375c0 1.875 0 7.5 1.875 13.125 22.5 5.625 43.125 9.375 63.75 11.25 13.125 1.875 24.375 3.75 35.625 5.625-1.875 11.25-1.875 20.625-3.75 31.875-3.75 11.25-5.625 18.75-5.625 22.5-5.625 0-11.25 0-13.125 0-7.5 0-15 0-22.5 0-1.875 0-7.5 0-15 0-5.625-1.875-31.875-5.625-76.875-9.375l-106.875-1.875c-13.125 0-45 1.875-91.875 5.625-26.25 3.75-45 3.75-52.5 5.625z"
 				],
 				"defaultCode": 69,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 29,
@@ -596,15 +596,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 34
+			"iconIdx": 30
 		},
 		{
 			"icon": {
 				"paths": [
-					"M220 804c0 32-12 56-32 78-22 22-48 32-78 32-30 0-56-10-78-32-22-22-32-46-32-78 0-30 10-56 32-78 22-20 48-32 78-32 30 0 56 12 78 32 20 22 32 48 32 78zM220 512c0 30-12 56-32 78-22 22-48 32-78 32-30 0-56-10-78-32-22-22-32-48-32-78 0-30 10-56 32-78 22-22 48-32 78-32 30 0 56 10 78 32 20 22 32 48 32 78zM1024 750v110c0 4-2 8-6 12s-8 6-12 6h-696c-4 0-8-2-12-6s-6-8-6-12v-110c0-6 2-10 6-14 4-2 8-4 12-4h696c4 0 8 2 12 4 4 4 6 8 6 14zM220 220c0 30-12 56-32 78-22 20-48 32-78 32-30 0-56-12-78-32-22-22-32-48-32-78 0-32 10-56 32-78 22-22 48-32 78-32 30 0 56 10 78 32 20 22 32 46 32 78zM1024 458v108c0 6-2 10-6 14s-8 6-12 6h-696c-4 0-8-2-12-6s-6-8-6-14v-108c0-6 2-10 6-14s8-6 12-6h696c4 0 8 2 12 6s6 8 6 14zM1024 164v110c0 6-2 10-6 14-4 2-8 4-12 4h-696c-4 0-8-2-12-4-4-4-6-8-6-14v-110c0-4 2-8 6-12s8-6 12-6h696c4 0 8 2 12 6s6 8 6 12z"
+					"M271.399 752.601c0 26.367-9.888 46.143-26.367 64.27-18.127 18.128-39.551 26.367-64.27 26.367s-46.143-8.24-64.27-26.367c-18.128-18.128-26.367-37.903-26.367-64.27 0-24.719 8.24-46.143 26.367-64.27 18.127-16.479 39.551-26.367 64.27-26.367s46.143 9.888 64.27 26.367c16.479 18.128 26.367 39.551 26.367 64.27zM271.399 512c0 24.719-9.888 46.143-26.367 64.27-18.127 18.128-39.551 26.367-64.27 26.367s-46.143-8.24-64.27-26.367c-18.128-18.128-26.367-39.551-26.367-64.27s8.24-46.143 26.367-64.27c18.127-18.127 39.551-26.367 64.27-26.367s46.143 8.24 64.27 26.367c16.479 18.127 26.367 39.551 26.367 64.27zM933.875 708.106v90.637c0 3.296-1.648 6.592-4.943 9.888s-6.592 4.943-9.888 4.943h-573.487c-3.296 0-6.592-1.648-9.888-4.943s-4.943-6.592-4.943-9.888v-90.638c0-4.943 1.648-8.24 4.943-11.536 3.296-1.648 6.592-3.296 9.888-3.296h573.487c3.296 0 6.592 1.648 9.888 3.296 3.296 3.296 4.943 6.592 4.943 11.536zM271.399 271.399c0 24.719-9.888 46.143-26.367 64.27-18.127 16.479-39.551 26.367-64.27 26.367s-46.143-9.888-64.27-26.367c-18.128-18.127-26.367-39.551-26.367-64.27 0-26.367 8.24-46.143 26.367-64.27s39.551-26.367 64.27-26.367c24.719 0 46.143 8.24 64.27 26.367 16.479 18.127 26.367 37.903 26.367 64.27zM933.875 467.505v88.989c0 4.943-1.648 8.24-4.943 11.536s-6.592 4.943-9.888 4.943h-573.487c-3.296 0-6.592-1.648-9.888-4.943s-4.943-6.592-4.943-11.536v-88.989c0-4.943 1.648-8.24 4.943-11.536s6.592-4.943 9.888-4.943h573.487c3.296 0 6.592 1.648 9.888 4.943s4.943 6.592 4.943 11.536zM933.875 225.257v90.638c0 4.943-1.648 8.24-4.943 11.536-3.296 1.648-6.592 3.296-9.888 3.296h-573.487c-3.296 0-6.592-1.648-9.888-3.296-3.296-3.296-4.943-6.592-4.943-11.536v-90.637c0-3.296 1.648-6.592 4.943-9.888s6.592-4.943 9.888-4.943h573.487c3.296 0 6.592 1.648 9.888 4.943s4.943 6.592 4.943 9.888z"
 				],
 				"defaultCode": 70,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 30,
@@ -615,15 +615,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 35
+			"iconIdx": 31
 		},
 		{
 			"icon": {
 				"paths": [
-					"M218 926c0 30-10 54-32 72-20 18-46 26-76 26-42 0-74-12-100-38l34-50c18 18 38 26 60 26 12 0 20-4 28-8 10-6 14-14 14-24 0-26-20-36-60-32l-16-32c4-4 10-12 18-26 10-12 18-22 26-30 6-8 14-16 20-22v-2c-6 0-16 2-28 2s-22 0-28 0v30h-60v-86h190v50l-54 66c20 4 36 14 46 28 12 14 18 30 18 50zM218 568v90h-206c-2-14-4-24-4-30 0-20 6-38 14-54 8-16 20-28 32-38 12-10 26-20 38-28 12-8 24-16 32-24 10-8 14-18 14-26 0-10-4-18-8-22-6-6-14-8-24-8-16 0-32 12-46 34l-48-34c10-20 22-36 40-46s40-16 62-16c26 0 50 8 70 24 18 16 28 36 28 64 0 18-6 36-20 52-12 16-26 28-42 36-16 10-30 20-44 30-12 10-20 20-20 30h72v-34zM1024 750v110c0 4-2 8-6 12s-8 6-12 6h-696c-4 0-8-2-12-6s-6-8-6-12v-110c0-6 2-10 6-14 4-2 8-4 12-4h696c4 0 8 2 12 4 4 4 6 8 6 14zM220 236v56h-192v-56h62c0-16 0-38 0-70 0-30 0-54 0-68v-8h-2c-2 6-12 18-28 32l-40-44 78-72h60v230zM1024 458v108c0 6-2 10-6 14s-8 6-12 6h-696c-4 0-8-2-12-6s-6-8-6-14v-108c0-6 2-10 6-14s8-6 12-6h696c4 0 8 2 12 6s6 8 6 14zM1024 164v110c0 6-2 10-6 14-4 2-8 4-12 4h-696c-4 0-8-2-12-4-4-4-6-8-6-14v-110c0-4 2-8 6-12s8-6 12-6h696c4 0 8 2 12 6s6 8 6 12z"
+					"M284.893 831.805c0 23.174-7.725 41.714-24.719 55.618-15.449 13.904-35.534 20.085-58.708 20.085-32.444 0-57.163-9.27-77.248-29.354l26.264-38.623c13.904 13.904 29.354 20.085 46.348 20.085 9.27 0 15.449-3.090 21.629-6.18 7.725-4.634 10.815-10.815 10.815-18.54 0-20.085-15.449-27.809-46.348-24.719l-12.36-24.719c3.090-3.090 7.725-9.27 13.904-20.085 7.725-9.27 13.904-16.994 20.085-23.174 4.634-6.18 10.815-12.36 15.449-16.995v-1.545c-4.634 0-12.36 1.545-21.629 1.545s-16.994 0-21.629 0v23.174h-46.348v-66.433h146.77v38.623l-41.714 50.984c15.449 3.090 27.809 10.815 35.534 21.629 9.27 10.815 13.904 23.174 13.904 38.623zM284.893 555.259v69.523h-159.13c-1.545-10.815-3.090-18.54-3.090-23.174 0-15.449 4.634-29.354 10.815-41.714s15.449-21.629 24.719-29.354c9.27-7.725 20.085-15.449 29.354-21.629s18.54-12.36 24.719-18.54c7.725-6.18 10.815-13.904 10.815-20.085 0-7.725-3.090-13.904-6.18-16.994-4.634-4.634-10.815-6.18-18.54-6.18-12.36 0-24.719 9.27-35.534 26.264l-37.079-26.264c7.725-15.449 16.994-27.809 30.899-35.534s30.899-12.36 47.893-12.36c20.085 0 38.623 6.18 54.073 18.54 13.904 12.36 21.629 27.809 21.629 49.438 0 13.904-4.634 27.809-15.449 40.169-9.27 12.36-20.085 21.629-32.444 27.809-12.36 7.725-23.174 15.449-33.989 23.174-9.27 7.725-15.449 15.449-15.449 23.174h55.618v-26.264zM907.508 695.849v84.972c0 3.090-1.545 6.18-4.634 9.27s-6.18 4.634-9.27 4.634h-537.644c-3.090 0-6.18-1.545-9.27-4.634s-4.634-6.18-4.634-9.27v-84.973c0-4.634 1.545-7.725 4.634-10.815 3.090-1.545 6.18-3.090 9.27-3.090h537.644c3.090 0 6.18 1.545 9.27 3.090 3.090 3.090 4.634 6.18 4.634 10.815zM286.437 298.797v43.259h-148.315v-43.259h47.893c0-12.36 0-29.354 0-54.073 0-23.174 0-41.714 0-52.529v-6.18h-1.545c-1.545 4.634-9.27 13.904-21.629 24.719l-30.899-33.989 60.253-55.618h46.348v177.669zM907.508 470.286v83.427c0 4.634-1.545 7.725-4.634 10.815s-6.18 4.634-9.27 4.634h-537.644c-3.090 0-6.18-1.545-9.27-4.634s-4.634-6.18-4.634-10.815v-83.427c0-4.634 1.545-7.725 4.634-10.815s6.18-4.634 9.27-4.634h537.644c3.090 0 6.18 1.545 9.27 4.634s4.634 6.18 4.634 10.815zM907.508 243.178v84.973c0 4.634-1.545 7.725-4.634 10.815-3.090 1.545-6.18 3.090-9.27 3.090h-537.644c-3.090 0-6.18-1.545-9.27-3.090-3.090-3.090-4.634-6.18-4.634-10.815v-84.972c0-3.090 1.545-6.18 4.634-9.27s6.18-4.634 9.27-4.634h537.644c3.090 0 6.18 1.545 9.27 4.634s4.634 6.18 4.634 9.27z"
 				],
 				"defaultCode": 71,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 31,
@@ -634,15 +634,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 36
+			"iconIdx": 32
 		},
 		{
 			"icon": {
 				"paths": [
-					"M950 512c0 60-10 116-34 170s-54 102-94 140c-38 40-86 70-140 94-54 24-110 34-170 34-66 0-128-12-186-40-60-28-110-68-152-118-2-4-4-8-4-12 0-6 2-8 6-12l78-78c4-4 8-6 14-6s10 4 14 6c26 38 62 66 102 84 40 20 82 30 128 30 40 0 78-8 114-22 36-16 66-36 92-64 28-26 48-56 64-92 14-36 22-74 22-114 0-40-8-78-22-114-16-36-36-66-64-92-26-28-56-48-92-64-36-14-74-22-114-22-38 0-74 6-108 20-34 14-64 32-90 58l78 78c12 12 14 26 8 40-8 16-18 22-34 22h-256c-10 0-18-2-26-10s-10-16-10-26v-256c0-16 6-26 22-34 14-6 28-4 40 8l74 74c40-38 88-68 140-90 52-20 106-30 162-30 60 0 116 10 170 34 54 24 102 54 140 94 40 38 70 86 94 140 24 54 34 110 34 170z"
+					"M922.625 512c0 56.25-9.375 108.75-31.875 159.375s-50.625 95.625-88.125 131.25c-35.625 37.5-80.625 65.625-131.25 88.125s-103.125 31.875-159.375 31.875c-61.875 0-120-11.25-174.375-37.5-56.25-26.25-103.125-63.75-142.5-110.625-1.875-3.75-3.75-7.5-3.75-11.25 0-5.625 1.875-7.5 5.625-11.25l73.125-73.125c3.75-3.75 7.5-5.625 13.125-5.625s9.375 3.75 13.125 5.625c24.375 35.625 58.125 61.875 95.625 78.75 37.5 18.75 76.875 28.125 120 28.125 37.5 0 73.125-7.5 106.875-20.625 33.75-15 61.875-33.75 86.25-60 26.25-24.375 45-52.5 60-86.25 13.125-33.75 20.625-69.375 20.625-106.875s-7.5-73.125-20.625-106.875c-15-33.75-33.75-61.875-60-86.25-24.375-26.25-52.5-45-86.25-60-33.75-13.125-69.375-20.625-106.875-20.625-35.625 0-69.375 5.625-101.25 18.75s-60 30-84.375 54.375l73.125 73.125c11.25 11.25 13.125 24.375 7.5 37.5-7.5 15-16.875 20.625-31.875 20.625h-240c-9.375 0-16.875-1.875-24.375-9.375s-9.375-15-9.375-24.375v-240c0-15 5.625-24.375 20.625-31.875 13.125-5.625 26.25-3.75 37.5 7.5l69.375 69.375c37.5-35.625 82.5-63.75 131.25-84.375 48.75-18.75 99.375-28.125 151.875-28.125 56.25 0 108.75 9.375 159.375 31.875s95.625 50.625 131.25 88.125c37.5 35.625 65.625 80.625 88.125 131.25s31.875 103.125 31.875 159.375z"
 				],
 				"defaultCode": 72,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 32,
@@ -653,15 +653,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 37
+			"iconIdx": 33
 		},
 		{
 			"icon": {
 				"paths": [
-					"M950 146v256c0 10-2 18-10 26s-16 10-26 10h-256c-16 0-26-6-34-22-6-14-4-28 8-40l80-78c-56-52-124-78-200-78-40 0-78 8-114 22-36 16-66 36-92 64-28 26-48 56-64 92-14 36-22 74-22 114 0 40 8 78 22 114 16 36 36 66 64 92 26 28 56 48 92 64 36 14 74 22 114 22 46 0 88-10 128-30 40-18 76-46 102-84 4-2 8-6 14-6 6 0 10 2 14 6l78 78c4 4 6 6 6 12 0 4-2 8-4 12-42 50-92 90-152 118-58 28-120 40-186 40-60 0-116-10-170-34-54-24-102-54-140-94-40-38-70-86-94-140-24-54-34-110-34-170 0-60 10-116 34-170 24-54 54-102 94-140 38-40 86-70 140-94 54-24 110-34 170-34 56 0 110 10 162 30 52 22 100 52 140 90l74-74c12-12 24-14 40-8 16 8 22 18 22 34z"
+					"M922.625 168.875v240c0 9.375-1.875 16.875-9.375 24.375s-15 9.375-24.375 9.375h-240c-15 0-24.375-5.625-31.875-20.625-5.625-13.125-3.75-26.25 7.5-37.5l75-73.125c-52.5-48.75-116.25-73.125-187.5-73.125-37.5 0-73.125 7.5-106.875 20.625-33.75 15-61.875 33.75-86.25 60-26.25 24.375-45 52.5-60 86.25-13.125 33.75-20.625 69.375-20.625 106.875s7.5 73.125 20.625 106.875c15 33.75 33.75 61.875 60 86.25 24.375 26.25 52.5 45 86.25 60 33.75 13.125 69.375 20.625 106.875 20.625 43.125 0 82.5-9.375 120-28.125 37.5-16.875 71.25-43.125 95.625-78.75 3.75-1.875 7.5-5.625 13.125-5.625s9.375 1.875 13.125 5.625l73.125 73.125c3.75 3.75 5.625 5.625 5.625 11.25 0 3.75-1.875 7.5-3.75 11.25-39.375 46.875-86.25 84.375-142.5 110.625-54.375 26.25-112.5 37.5-174.375 37.5-56.25 0-108.75-9.375-159.375-31.875s-95.625-50.625-131.25-88.125c-37.5-35.625-65.625-80.625-88.125-131.25s-31.875-103.125-31.875-159.375c0-56.25 9.375-108.75 31.875-159.375s50.625-95.625 88.125-131.25c35.625-37.5 80.625-65.625 131.25-88.125s103.125-31.875 159.375-31.875c52.5 0 103.125 9.375 151.875 28.125 48.75 20.625 93.75 48.75 131.25 84.375l69.375-69.375c11.25-11.25 22.5-13.125 37.5-7.5 15 7.5 20.625 16.875 20.625 31.875z"
 				],
 				"defaultCode": 73,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 33,
@@ -672,15 +672,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 38
+			"iconIdx": 34
 		},
 		{
 			"icon": {
 				"paths": [
-					"M868 694c0-14-4-28-16-38l-118-118c-10-12-24-16-40-16s-28 6-40 18c0 0 4 4 10 10 6 6 10 10 12 12 2 2 6 6 10 12 4 4 6 8 6 14 2 4 2 10 2 16 0 14-4 28-16 38-10 10-22 16-38 16-6 0-10 0-16-2-4-2-10-4-14-8-6-2-8-6-12-8-2-2-6-6-12-12-6-6-8-10-10-10-12 10-18 24-18 40 0 16 4 30 16 40l116 118c12 10 24 16 40 16 14 0 28-6 38-16l84-82c12-12 16-24 16-40zM466 292c0-16-4-28-16-38l-116-120c-12-10-24-16-40-16-14 0-28 6-38 16l-84 84c-12 10-16 24-16 38 0 16 4 28 16 38l118 120c10 10 24 16 40 16s28-6 40-18c0-2-4-6-10-12-6-6-10-10-12-12-2-2-6-6-10-10-4-6-6-10-6-14-2-6-2-10-2-16 0-16 4-28 16-40 10-10 22-16 38-16 6 0 10 2 16 2 4 2 10 4 14 8 6 4 8 6 12 8 2 2 6 6 12 12 6 6 8 10 10 12 12-12 18-26 18-42zM978 694c0 46-16 86-48 116l-84 84c-32 32-70 48-116 48s-86-16-116-48l-118-120c-32-30-48-70-48-116s16-86 50-118l-50-50c-32 32-72 50-118 50s-86-16-118-48l-118-120c-32-32-48-70-48-116s16-84 48-116l84-84c32-32 70-46 116-46s86 16 116 48l118 118c32 32 48 70 48 116s-16 86-50 120l50 50c32-34 72-50 118-50s86 16 118 48l118 118c32 32 48 72 48 116z"
+					"M824.891 703.961c0-12.305-3.516-24.609-14.063-33.398l-103.711-103.711c-8.789-10.547-21.094-14.063-35.156-14.063s-24.609 5.273-35.156 15.82c0 0 3.516 3.516 8.789 8.789s8.789 8.789 10.547 10.547c1.758 1.758 5.273 5.273 8.789 10.547 3.516 3.516 5.273 7.031 5.273 12.305 1.758 3.516 1.758 8.789 1.758 14.063 0 12.305-3.516 24.609-14.063 33.398-8.789 8.789-19.336 14.063-33.398 14.063-5.273 0-8.789 0-14.063-1.758-3.516-1.758-8.789-3.516-12.305-7.031-5.273-1.758-7.031-5.273-10.547-7.031-1.758-1.758-5.273-5.273-10.547-10.547s-7.031-8.789-8.789-8.789c-10.547 8.789-15.82 21.094-15.82 35.156s3.516 26.367 14.063 35.156l101.953 103.711c10.547 8.789 21.094 14.063 35.156 14.063 12.305 0 24.609-5.273 33.398-14.063l73.828-72.070c10.547-10.547 14.063-21.094 14.063-35.156zM471.57 350.641c0-14.063-3.516-24.609-14.063-33.398l-101.953-105.469c-10.547-8.789-21.094-14.063-35.156-14.063-12.305 0-24.609 5.273-33.398 14.063l-73.828 73.828c-10.547 8.789-14.063 21.094-14.063 33.398 0 14.063 3.516 24.609 14.063 33.398l103.711 105.469c8.789 8.789 21.094 14.063 35.156 14.063s24.609-5.273 35.156-15.82c0-1.758-3.516-5.273-8.789-10.547s-8.789-8.789-10.547-10.547c-1.758-1.758-5.273-5.273-8.789-8.789-3.516-5.273-5.273-8.789-5.273-12.305-1.758-5.273-1.758-8.789-1.758-14.063 0-14.063 3.516-24.609 14.063-35.156 8.789-8.789 19.336-14.063 33.398-14.063 5.273 0 8.789 1.758 14.063 1.758 3.516 1.758 8.789 3.516 12.305 7.031 5.273 3.516 7.031 5.273 10.547 7.031 1.758 1.758 5.273 5.273 10.547 10.547s7.031 8.789 8.789 10.547c10.547-10.547 15.82-22.852 15.82-36.914zM921.57 703.961c0 40.43-14.063 75.586-42.188 101.953l-73.828 73.828c-28.125 28.125-61.523 42.188-101.953 42.188s-75.586-14.063-101.953-42.188l-103.711-105.469c-28.125-26.367-42.188-61.523-42.188-101.953s14.063-75.586 43.945-103.711l-43.945-43.945c-28.125 28.125-63.281 43.945-103.711 43.945s-75.586-14.063-103.711-42.188l-103.711-105.469c-28.125-28.125-42.188-61.523-42.188-101.953s14.063-73.828 42.188-101.953l73.828-73.828c28.125-28.125 61.523-40.43 101.953-40.43s75.586 14.063 101.953 42.188l103.711 103.711c28.125 28.125 42.188 61.523 42.188 101.953s-14.063 75.586-43.945 105.469l43.945 43.945c28.125-29.883 63.281-43.945 103.711-43.945s75.586 14.063 103.711 42.188l103.711 103.711c28.125 28.125 42.188 63.281 42.188 101.953z"
 				],
 				"defaultCode": 74,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 34,
@@ -691,7 +691,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 39
+			"iconIdx": 35
 		},
 		{
 			"icon": {
@@ -699,7 +699,7 @@
 					"M950 512c0 80-18 154-58 220-40 68-92 120-160 160-66 40-140 58-220 58-80 0-154-18-220-58-68-40-120-92-160-160-40-66-58-140-58-220 0-80 18-154 58-220 40-68 92-120 160-160 66-40 140-58 220-58 80 0 154 18 220 58 68 40 120 92 160 160 40 66 58 140 58 220z"
 				],
 				"defaultCode": 75,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 35,
@@ -710,7 +710,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 40
+			"iconIdx": 36
 		},
 		{
 			"icon": {
@@ -718,7 +718,7 @@
 					"M512 202c-56 0-108 14-156 40-48 28-86 66-114 114-26 48-40 100-40 156 0 56 14 108 40 156 28 48 66 86 114 114 48 26 100 40 156 40 56 0 108-14 156-40 48-28 86-66 114-114 26-48 40-100 40-156 0-56-14-108-40-156-28-48-66-86-114-114-48-26-100-40-156-40zM950 512c0 80-18 154-58 220-40 68-92 120-160 160-66 40-140 58-220 58-80 0-154-18-220-58-68-40-120-92-160-160-40-66-58-140-58-220 0-80 18-154 58-220 40-68 92-120 160-160 66-40 140-58 220-58 80 0 154 18 220 58 68 40 120 92 160 160 40 66 58 140 58 220z"
 				],
 				"defaultCode": 76,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 36,
@@ -729,7 +729,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 41
+			"iconIdx": 37
 		},
 		{
 			"icon": {
@@ -737,7 +737,7 @@
 					"M958 694c0 22-8 38-22 52l-42 44c-16 14-32 20-52 20-22 0-38-6-52-20l-278-278-278 278c-14 14-30 20-52 20-20 0-36-6-50-20l-44-44c-14-14-22-30-22-52 0-20 8-36 22-52l372-372c14-14 32-20 52-20s38 6 52 20l372 372c14 16 22 32 22 52z"
 				],
 				"defaultCode": 77,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 37,
@@ -748,7 +748,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 42
+			"iconIdx": 38
 		},
 		{
 			"icon": {
@@ -756,7 +756,7 @@
 					"M958 402c0 20-8 38-22 52l-372 372c-14 14-32 22-52 22s-38-8-52-22l-372-372c-14-14-22-32-22-52s8-38 22-52l42-42c16-14 34-22 52-22 22 0 38 8 52 22l278 278 278-278c14-14 30-22 52-22 18 0 36 8 52 22l42 42c14 16 22 32 22 52z"
 				],
 				"defaultCode": 78,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 38,
@@ -767,15 +767,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 43
+			"iconIdx": 39
 		},
 		{
 			"icon": {
 				"paths": [
-					"M316 512c-58 2-104 24-142 68h-70c-30 0-54-6-74-22-20-14-30-34-30-62 0-126 22-188 66-188 2 0 10 2 24 10 12 8 30 16 52 24 20 6 42 10 62 10 24 0 48-4 72-12-2 14-2 26-2 36 0 48 14 94 42 136zM888 852c0 42-14 76-40 100-26 26-60 38-102 38h-468c-42 0-76-12-102-38-26-24-40-58-40-100 0-20 2-38 2-56 2-18 4-36 8-58 4-20 8-40 14-58 6-18 14-34 22-52 10-16 22-30 34-42 12-12 28-22 46-30 18-6 38-10 60-10 2 0 10 4 22 12 12 8 24 16 38 26 16 8 34 18 58 24 24 8 48 12 72 12 24 0 48-4 72-12 24-6 42-16 58-24 14-10 26-18 38-26 12-8 20-12 22-12 22 0 42 4 60 10 18 8 34 18 46 30 12 12 24 26 34 42 8 18 16 34 22 52 6 18 10 38 14 58 4 22 6 40 8 58 0 18 2 36 2 56zM342 170c0 38-14 70-40 98-28 26-60 40-98 40-36 0-70-14-96-40-26-28-40-60-40-98 0-38 14-70 40-96 26-26 60-40 96-40 38 0 70 14 98 40 26 26 40 58 40 96zM716 376c0 56-20 104-60 144s-88 60-144 60c-56 0-104-20-144-60-40-40-60-88-60-144 0-58 20-106 60-146 40-40 88-60 144-60 56 0 104 20 144 60 40 40 60 88 60 146zM1024 496c0 28-10 48-30 62-20 16-44 22-74 22h-70c-38-44-84-66-142-68 28-42 42-88 42-136 0-10 0-22-2-36 24 8 48 12 72 12 20 0 42-4 62-10 22-8 40-16 52-24 14-8 22-10 24-10 44 0 66 62 66 188zM956 170c0 38-14 70-40 98-26 26-60 40-96 40-38 0-70-14-98-40-26-28-40-60-40-98 0-38 14-70 40-96 28-26 60-40 98-40 36 0 70 14 96 40 26 26 40 58 40 96z"
+					"M350.501 512c-47.791 1.648-85.693 19.776-117.005 56.031h-57.678c-24.719 0-44.495-4.943-60.974-18.128-16.479-11.536-24.719-28.015-24.719-51.086 0-103.821 18.127-154.907 54.382-154.907 1.648 0 8.24 1.648 19.776 8.24 9.888 6.592 24.719 13.184 42.847 19.776 16.479 4.943 34.607 8.24 51.086 8.24 19.776 0 39.551-3.296 59.326-9.888-1.648 11.536-1.648 21.424-1.648 29.663 0 39.551 11.536 77.453 34.607 112.060zM821.815 792.151c0 34.607-11.536 62.622-32.959 82.398-21.424 21.424-49.438 31.311-84.045 31.311h-385.62c-34.607 0-62.622-9.888-84.045-31.311-21.424-19.776-32.959-47.791-32.959-82.398 0-16.479 1.648-31.311 1.648-46.143 1.648-14.831 3.296-29.663 6.592-47.791 3.296-16.479 6.592-32.959 11.536-47.791s11.536-28.015 18.128-42.847c8.24-13.184 18.127-24.719 28.015-34.607s23.071-18.127 37.903-24.719c14.831-4.943 31.311-8.24 49.438-8.24 1.648 0 8.24 3.296 18.128 9.888s19.776 13.184 31.311 21.424c13.184 6.592 28.015 14.831 47.791 19.776 19.776 6.592 39.551 9.888 59.326 9.888s39.551-3.296 59.326-9.888c19.776-4.943 34.607-13.184 47.791-19.776 11.536-8.24 21.424-14.831 31.311-21.424s16.479-9.888 18.127-9.888c18.128 0 34.607 3.296 49.438 8.24 14.831 6.592 28.015 14.831 37.903 24.719s19.776 21.424 28.015 34.607c6.592 14.831 13.184 28.015 18.127 42.847s8.24 31.311 11.536 47.791c3.296 18.128 4.943 32.959 6.592 47.791 0 14.831 1.648 29.663 1.648 46.143zM371.924 230.201c0 31.311-11.536 57.678-32.959 80.75-23.071 21.424-49.438 32.959-80.75 32.959-29.663 0-57.678-11.536-79.102-32.959-21.424-23.071-32.959-49.438-32.959-80.75s11.536-57.678 32.959-79.102c21.424-21.424 49.438-32.959 79.102-32.959 31.311 0 57.678 11.536 80.75 32.959 21.424 21.424 32.959 47.791 32.959 79.102zM680.091 399.94c0 46.143-16.479 85.693-49.438 118.653s-72.51 49.438-118.653 49.438c-46.143 0-85.693-16.479-118.653-49.438s-49.438-72.51-49.438-118.653c0-47.791 16.479-87.341 49.438-120.3s72.51-49.438 118.653-49.438c46.143 0 85.693 16.479 118.653 49.438s49.438 72.51 49.438 120.3zM933.875 498.817c0 23.071-8.24 39.551-24.719 51.086-16.479 13.184-36.255 18.128-60.974 18.128h-57.678c-31.311-36.255-69.214-54.383-117.005-56.031 23.071-34.607 34.607-72.51 34.607-112.060 0-8.24 0-18.127-1.648-29.663 19.776 6.592 39.551 9.888 59.326 9.888 16.479 0 34.607-3.296 51.086-8.24 18.128-6.592 32.959-13.184 42.847-19.776 11.536-6.592 18.128-8.24 19.776-8.24 36.255 0 54.383 51.086 54.383 154.907zM877.844 230.201c0 31.311-11.536 57.678-32.959 80.75-21.424 21.424-49.438 32.959-79.102 32.959-31.311 0-57.678-11.536-80.75-32.959-21.424-23.071-32.959-49.438-32.959-80.75s11.536-57.678 32.959-79.102c23.071-21.424 49.438-32.959 80.75-32.959 29.663 0 57.678 11.536 79.102 32.959s32.959 47.791 32.959 79.102z"
 				],
 				"defaultCode": 79,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 39,
@@ -786,7 +786,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 44
+			"iconIdx": 40
 		},
 		{
 			"icon": {
@@ -794,7 +794,7 @@
 					"M750 512c0 14-6 24-18 32l-312 182c-6 4-12 6-18 6s-12-2-18-6-18-18-18-32v-364c0-14 6-26 18-32 12-8 24-8 36 0l312 182c12 8 18 18 18 32zM822 512c0-56-14-108-40-156-28-48-66-86-114-114-48-26-100-40-156-40-56 0-108 14-156 40-48 28-86 66-114 114-26 48-40 100-40 156 0 56 14 108 40 156 28 48 66 86 114 114 48 26 100 40 156 40 56 0 108-14 156-40 48-28 86-66 114-114 26-48 40-100 40-156zM950 512c0 80-18 154-58 220-40 68-92 120-160 160-66 40-140 58-220 58-80 0-154-18-220-58-68-40-120-92-160-160-40-66-58-140-58-220 0-80 18-154 58-220 40-68 92-120 160-160 66-40 140-58 220-58 80 0 154 18 220 58 68 40 120 92 160 160 40 66 58 140 58 220z"
 				],
 				"defaultCode": 80,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 40,
@@ -805,15 +805,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 45
+			"iconIdx": 41
 		},
 		{
 			"icon": {
 				"paths": [
-					"M476 292c0-30-12-56-32-78-22-20-48-32-78-32-30 0-56 12-78 32-22 22-32 48-32 78 0 16 4 32 10 48-14-8-30-10-46-10-32 0-56 10-78 32-22 20-32 46-32 76 0 32 10 58 32 78 22 22 46 32 78 32 30 0 56-10 78-32 20-20 32-46 32-78 0-16-4-30-12-46 16 6 32 10 48 10 30 0 56-10 78-32 20-22 32-46 32-78zM962 694c0 8-10 20-28 38-18 20-32 28-38 28-4 0-8-2-16-8-8-6-14-12-22-20-6-6-12-14-22-22-8-10-12-14-14-16l-54 56 126 126c10 10 16 24 16 38 0 16-8 32-22 46-16 16-30 22-46 22-16 0-30-4-40-16l-384-382c-66 50-136 74-208 74-62 0-112-20-152-58-38-40-58-90-58-152 0-60 18-120 54-178 36-60 84-106 142-142 58-36 118-54 178-54 62 0 114 18 152 58 40 38 60 90 60 152 0 72-26 140-76 208l204 202 54-54c-2-2-6-6-14-14-10-8-18-16-24-22-6-6-12-14-18-20-6-8-10-14-10-18 0-6 10-18 28-36 18-20 32-28 38-28 4 0 10 2 14 4 2 4 10 12 26 26 14 14 30 30 46 46 16 16 32 32 50 48 16 18 30 32 42 46 10 12 16 20 16 22z"
+					"M512.359 318.641c0-26.367-10.547-49.219-28.125-68.555-19.336-17.578-42.188-28.125-68.555-28.125s-49.219 10.547-68.555 28.125c-19.336 19.336-28.125 42.188-28.125 68.555 0 14.063 3.516 28.125 8.789 42.188-12.305-7.031-26.367-8.789-40.43-8.789-28.125 0-49.219 8.789-68.555 28.125-19.336 17.578-28.125 40.43-28.125 66.797 0 28.125 8.789 50.977 28.125 68.555 19.336 19.336 40.43 28.125 68.555 28.125 26.367 0 49.219-8.789 68.555-28.125 17.578-17.578 28.125-40.43 28.125-68.555 0-14.063-3.516-26.367-10.547-40.43 14.063 5.273 28.125 8.789 42.188 8.789 26.367 0 49.219-8.789 68.555-28.125 17.578-19.336 28.125-40.43 28.125-68.555zM939.508 671.961c0 7.031-8.789 17.578-24.609 33.398-15.82 17.578-28.125 24.609-33.398 24.609-3.516 0-7.031-1.758-14.063-7.031s-12.305-10.547-19.336-17.578c-5.273-5.273-10.547-12.305-19.336-19.336-7.031-8.789-10.547-12.305-12.305-14.063l-47.461 49.219 110.742 110.742c8.789 8.789 14.063 21.094 14.063 33.398 0 14.063-7.031 28.125-19.336 40.43-14.063 14.063-26.367 19.336-40.43 19.336s-26.367-3.516-35.156-14.063l-337.5-335.742c-58.008 43.945-119.531 65.039-182.813 65.039-54.492 0-98.438-17.578-133.594-50.977-33.398-35.156-50.977-79.102-50.977-133.594 0-52.734 15.82-105.469 47.461-156.445 31.641-52.734 73.828-93.164 124.805-124.805s103.711-47.461 156.445-47.461c54.492 0 100.195 15.82 133.594 50.977 35.156 33.398 52.734 79.102 52.734 133.594 0 63.281-22.852 123.047-66.797 182.813l179.297 177.539 47.461-47.461c-1.758-1.758-5.273-5.273-12.305-12.305-8.789-7.031-15.82-14.063-21.094-19.336s-10.547-12.305-15.82-17.578c-5.273-7.031-8.789-12.305-8.789-15.82 0-5.273 8.789-15.82 24.609-31.641 15.82-17.578 28.125-24.609 33.398-24.609 3.516 0 8.789 1.758 12.305 3.516 1.758 3.516 8.789 10.547 22.852 22.852 12.305 12.305 26.367 26.367 40.43 40.43s28.125 28.125 43.945 42.188c14.063 15.82 26.367 28.125 36.914 40.43 8.789 10.547 14.063 17.578 14.063 19.336z"
 				],
 				"defaultCode": 81,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 41,
@@ -824,15 +824,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 46
+			"iconIdx": 42
 		},
 		{
 			"icon": {
 				"paths": [
-					"M784 740c140 48 210 90 210 124 0 0 0 108 0 108 0 0-482 0-482 0 0 0-482 0-482 0 0 0 0-108 0-108 0-34 70-76 210-124 64-24 108-48 130-72 24-24 36-56 36-96 0-16-8-32-24-50-14-20-24-44-32-76-2-8-4-14-10-18-4-4-8-6-14-8-4-2-8-8-14-18-4-10-8-24-8-44 0-10 0-20 4-26 4-8 6-12 10-12 0 0 4-4 4-4-6-34-10-64-12-90-4-38 10-76 42-116 30-38 84-58 160-58 76 0 130 20 162 58 32 40 44 78 40 116 0 0-12 90-12 90 12 4 18 20 18 42 0 20-4 34-8 44-6 10-10 16-14 18-6 2-10 4-14 8-6 4-8 10-10 18-6 34-16 58-32 76-16 18-24 34-24 50 0 40 12 72 36 96 24 24 68 48 130 72z"
+					"M751.063 712.391c123.047 42.188 184.57 79.102 184.57 108.984 0 0 0 94.922 0 94.922s-423.633 0-423.633 0c0 0-423.633 0-423.633 0s0-94.922 0-94.922c0-29.883 61.523-66.797 184.57-108.984 56.25-21.094 94.922-42.188 114.258-63.281 21.094-21.094 31.641-49.219 31.641-84.375 0-14.063-7.031-28.125-21.094-43.945-12.305-17.578-21.094-38.672-28.125-66.797-1.758-7.031-3.516-12.305-8.789-15.82-3.516-3.516-7.031-5.273-12.305-7.031-3.516-1.758-7.031-7.031-12.305-15.82-3.516-8.789-7.031-21.094-7.031-38.672 0-8.789 0-17.578 3.516-22.852 3.516-7.031 5.273-10.547 8.789-10.547 0 0 3.516-3.516 3.516-3.516-5.273-29.883-8.789-56.25-10.547-79.102-3.516-33.398 8.789-66.797 36.914-101.953 26.367-33.398 73.828-50.977 140.625-50.977s114.258 17.578 142.383 50.977c28.125 35.156 38.672 68.555 35.156 101.953 0 0-10.547 79.102-10.547 79.102 10.547 3.516 15.82 17.578 15.82 36.914 0 17.578-3.516 29.883-7.031 38.672-5.273 8.789-8.789 14.063-12.305 15.82-5.273 1.758-8.789 3.516-12.305 7.031-5.273 3.516-7.031 8.789-8.789 15.82-5.273 29.883-14.063 50.977-28.125 66.797s-21.094 29.883-21.094 43.945c0 35.156 10.547 63.281 31.641 84.375s59.766 42.188 114.258 63.281z"
 				],
 				"defaultCode": 121,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 42,
@@ -843,7 +843,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 47
+			"iconIdx": 43
 		},
 		{
 			"icon": {
@@ -851,7 +851,7 @@
 					"M880 246h-376c-20-24-40-50-46-56-4-12-16-20-28-20h-150c-10 0-18 6-26 12l-50 64h-60c-32 0-56 26-56 56v496c0 30 24 56 56 56h736c32 0 56-26 56-56v-496c0-30-24-56-56-56z"
 				],
 				"defaultCode": 82,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 43,
@@ -862,15 +862,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 48
+			"iconIdx": 44
 		},
 		{
 			"icon": {
 				"paths": [
-					"M842 750c0-24-8-46-24-66-18-20-38-30-60-30-20 0-36 6-48 20-10 14-16 32-16 54 0 22 6 40 20 54 14 16 34 22 60 22 18 0 34-4 48-14 14-12 20-24 20-40zM494 822c0 6-2 10-6 14l-182 182c-4 4-8 6-14 6-4 0-8-2-12-6l-184-182c-6-6-6-12-4-20 4-8 10-12 18-12h110v-786c0-6 2-10 4-12 4-4 8-6 14-6h110c4 0 10 2 12 6 4 2 6 6 6 12v786h110c4 0 10 2 12 6 4 4 6 8 6 12zM922 784c0 24-2 46-8 68-4 24-12 46-22 66-12 20-24 38-40 54-14 16-34 28-56 38-22 10-46 14-72 14-24 0-44-4-62-10-10-2-18-6-24-8l22-64c6 2 12 4 18 6 14 4 28 8 42 8 32 0 58-12 78-34 18-22 32-50 38-84h-2c-8 10-20 16-34 22-16 6-32 8-50 8-40 0-72-14-98-40-26-28-38-60-38-100 0-40 14-74 40-102 28-26 62-40 104-40 48 0 86 18 118 54 30 36 46 84 46 144zM906 374v64h-268v-64h94v-248c0-2 0-6 0-10 2-4 2-8 2-10v-8h-2l-4 6c-4 4-8 10-14 18l-36 32-48-48 110-106h70v374z"
+					"M766.918 695.849c0-18.54-6.18-35.534-18.54-50.984-13.904-15.449-29.354-23.174-46.348-23.174-15.449 0-27.809 4.634-37.079 15.449-7.725 10.815-12.36 24.719-12.36 41.714s4.634 30.899 15.449 41.714c10.815 12.36 26.264 16.995 46.348 16.995 13.904 0 26.264-3.090 37.079-10.815 10.815-9.27 15.449-18.54 15.449-30.899zM498.096 751.467c0 4.634-1.545 7.725-4.634 10.815l-140.59 140.59c-3.090 3.090-6.18 4.634-10.815 4.634-3.090 0-6.18-1.545-9.27-4.634l-142.136-140.59c-4.634-4.634-4.634-9.27-3.090-15.449 3.090-6.18 7.725-9.27 13.904-9.27h84.972v-607.166c0-4.634 1.545-7.725 3.090-9.27 3.090-3.090 6.18-4.634 10.815-4.634h84.973c3.090 0 7.725 1.545 9.27 4.634 3.090 1.545 4.634 4.634 4.634 9.27v607.166h84.973c3.090 0 7.725 1.545 9.27 4.634 3.090 3.090 4.634 6.18 4.634 9.27zM828.716 722.114c0 18.54-1.545 35.534-6.18 52.529-3.090 18.54-9.27 35.534-16.994 50.984-9.27 15.449-18.54 29.354-30.899 41.714-10.815 12.36-26.264 21.629-43.259 29.354s-35.534 10.815-55.618 10.815c-18.54 0-33.989-3.090-47.893-7.725-7.725-1.545-13.904-4.634-18.54-6.18l16.995-49.438c4.634 1.545 9.27 3.090 13.904 4.634 10.815 3.090 21.629 6.18 32.444 6.18 24.719 0 44.804-9.27 60.253-26.264 13.904-16.994 24.719-38.623 29.354-64.888h-1.545c-6.18 7.725-15.449 12.36-26.264 16.995-12.36 4.634-24.719 6.18-38.623 6.18-30.899 0-55.618-10.815-75.703-30.899-20.085-21.629-29.354-46.348-29.354-77.248s10.815-57.163 30.899-78.792c21.629-20.085 47.893-30.899 80.337-30.899 37.079 0 66.433 13.904 91.152 41.714 23.174 27.809 35.534 64.888 35.534 111.237zM816.356 405.399v49.438h-207.023v-49.438h72.612v-191.574c0-1.545 0-4.634 0-7.725 1.545-3.090 1.545-6.18 1.545-7.725v-6.18h-1.545l-3.090 4.634c-3.090 3.090-6.18 7.725-10.815 13.904l-27.809 24.719-37.079-37.079 84.973-81.882h54.073v288.907z"
 				],
 				"defaultCode": 84,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 44,
@@ -881,15 +881,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 49
+			"iconIdx": 45
 		},
 		{
 			"icon": {
 				"paths": [
-					"M842 566v276c0 10-4 18-12 24-6 8-16 12-26 12h-218v-220h-148v220h-218c-10 0-20-4-26-12-8-6-12-14-12-24v-276c0 0 0 0 2 0 0-2 0-2 0-2l328-272 328 272c0 0 2 2 2 2zM968 528l-34 42c-4 4-8 6-12 6h-2c-6 0-10-2-12-4l-396-330-396 330c-4 4-8 4-14 4-4 0-8-2-12-6l-34-42c-4-4-4-8-4-14s2-10 6-12l410-342c12-10 28-16 44-16s32 6 44 16l138 116v-112c0-4 2-10 6-12 4-4 8-6 14-6h108c6 0 10 2 14 6 4 2 6 8 6 12v234l124 104c4 2 6 6 6 12s0 10-4 14z"
+					"M821.375 562.625v258.75c0 9.375-3.75 16.875-11.25 22.5-5.625 7.5-15 11.25-24.375 11.25h-204.375v-206.25h-138.75v206.25h-204.375c-9.375 0-18.75-3.75-24.375-11.25-7.5-5.625-11.25-13.125-11.25-22.5v-258.75c0 0 0 0 1.875 0 0-1.875 0-1.875 0-1.875l307.5-255 307.5 255c0 0 1.875 1.875 1.875 1.875zM939.5 527l-31.875 39.375c-3.75 3.75-7.5 5.625-11.25 5.625h-1.875c-5.625 0-9.375-1.875-11.25-3.75l-371.25-309.375-371.25 309.375c-3.75 3.75-7.5 3.75-13.125 3.75-3.75 0-7.5-1.875-11.25-5.625l-31.875-39.375c-3.75-3.75-3.75-7.5-3.75-13.125s1.875-9.375 5.625-11.25l384.375-320.625c11.25-9.375 26.25-15 41.25-15s30 5.625 41.25 15l129.375 108.75v-105c0-3.75 1.875-9.375 5.625-11.25 3.75-3.75 7.5-5.625 13.125-5.625h101.25c5.625 0 9.375 1.875 13.125 5.625 3.75 1.875 5.625 7.5 5.625 11.25v219.375l116.25 97.5c3.75 1.875 5.625 5.625 5.625 11.25s0 9.375-3.75 13.125z"
 				],
 				"defaultCode": 87,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 45,
@@ -900,15 +900,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 50
+			"iconIdx": 46
 		},
 		{
 			"icon": {
 				"paths": [
-					"M730 742c2 8 2 14-4 20l-200 220c-2 4-8 6-12 6-6 0-10-2-14-6l-202-220c-6-6-6-12-4-20 4-6 10-10 16-10h128v-714c0-6 2-10 6-12 4-4 8-6 14-6h108c6 0 10 2 14 6 4 2 6 6 6 12v714h128c8 0 12 4 16 10z"
+					"M703.602 714.148c1.758 7.031 1.758 12.305-3.516 17.578l-175.781 193.359c-1.758 3.516-7.031 5.273-10.547 5.273-5.273 0-8.789-1.758-12.305-5.273l-177.539-193.359c-5.273-5.273-5.273-10.547-3.516-17.578 3.516-5.273 8.789-8.789 14.063-8.789h112.5v-627.539c0-5.273 1.758-8.789 5.273-10.547 3.516-3.516 7.031-5.273 12.305-5.273h94.922c5.273 0 8.789 1.758 12.305 5.273 3.516 1.758 5.273 5.273 5.273 10.547v627.539h112.5c7.031 0 10.547 3.516 14.063 8.789z"
 				],
 				"defaultCode": 88,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 46,
@@ -919,15 +919,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 51
+			"iconIdx": 47
 		},
 		{
 			"icon": {
 				"paths": [
-					"M730 282c-4 6-10 10-16 10h-128v714c0 6-2 10-6 12-4 4-8 6-14 6h-108c-6 0-10-2-14-6-4-2-6-6-6-12v-714h-128c-8 0-12-4-16-10-2-8-2-14 4-20l200-220c2-4 8-6 12-6 6 0 10 2 14 6l202 220c6 6 6 12 4 20z"
+					"M703.602 309.852c-3.516 5.273-8.789 8.789-14.063 8.789h-112.5v627.539c0 5.273-1.758 8.789-5.273 10.547-3.516 3.516-7.031 5.273-12.305 5.273h-94.922c-5.273 0-8.789-1.758-12.305-5.273-3.516-1.758-5.273-5.273-5.273-10.547v-627.539h-112.5c-7.031 0-10.547-3.516-14.063-8.789-1.758-7.031-1.758-12.305 3.516-17.578l175.781-193.359c1.758-3.516 7.031-5.273 10.547-5.273 5.273 0 8.789 1.758 12.305 5.273l177.539 193.359c5.273 5.273 5.273 10.547 3.516 17.578z"
 				],
 				"defaultCode": 89,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 47,
@@ -938,7 +938,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 52
+			"iconIdx": 48
 		},
 		{
 			"icon": {
@@ -946,7 +946,7 @@
 					"M402 420v330c0 6-2 10-4 12-4 4-8 6-14 6h-36c-6 0-10-2-14-6-4-2-4-6-4-12v-330c0-4 0-10 4-12 4-4 8-6 14-6h36c6 0 10 2 14 6 2 2 4 8 4 12zM548 420v330c0 6-2 10-4 12-4 4-8 6-14 6h-36c-6 0-10-2-14-6-2-2-4-6-4-12v-330c0-4 2-10 4-12 4-4 8-6 14-6h36c6 0 10 2 14 6 2 2 4 8 4 12zM694 420v330c0 6 0 10-4 12-4 4-8 6-14 6h-36c-6 0-10-2-14-6-2-2-4-6-4-12v-330c0-4 2-10 4-12 4-4 8-6 14-6h36c6 0 10 2 14 6 4 2 4 8 4 12zM768 834v-542h-512v542c0 8 2 16 4 24 2 6 6 12 8 14 4 4 6 6 6 6h476c0 0 2-2 6-6 2-2 6-8 8-14 2-8 4-16 4-24zM384 220h256l-28-68c-2-2-6-4-10-6h-180c-4 2-8 4-10 6zM914 238v36c0 6-2 10-4 14-4 2-8 4-14 4h-54v542c0 32-10 60-28 82-18 24-40 34-64 34h-476c-24 0-46-10-64-32s-28-50-28-82v-544h-54c-6 0-10-2-14-4-2-4-4-8-4-14v-36c0-6 2-10 4-14 4-2 8-4 14-4h176l40-96c6-14 16-26 32-36 14-10 30-14 44-14h184c14 0 30 4 44 14 16 10 26 22 32 36l40 96h176c6 0 10 2 14 4 2 4 4 8 4 14z"
 				],
 				"defaultCode": 90,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 48,
@@ -957,15 +957,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 53
+			"iconIdx": 49
 		},
 		{
 			"icon": {
 				"paths": [
-					"M740 224c0 8-6 16-16 16-8 0-16-8-16-16 0-10 8-16 16-16 10 0 16 6 16 16zM746 376c0 0-22-100-154-74-12-46-10-80 18-110 40-42 104-20 104-20v-34c-22-10-44-12-66-12-86 0-134 64-154 108l-238 438 68-12-124 238 86-16 66-186c186 0 426-68 394-320zM826 292l-52-52-42 52zM382 642c0 0 8-2 18-4 10-4 26-6 44-12 10-2 20-6 30-8 10-4 22-8 32-12 12-6 22-10 32-16 12-6 22-14 32-20 2-2 6-4 8-6l6-6c6-6 10-10 14-14s8-10 12-14c2-2 4-4 6-8l2-4 2-2c2-4 4-6 4-8 2-2 4-6 4-8 2-2 2-2 2-4 2 0 2-2 2-4 2-2 2-4 4-6 2-6 4-10 6-16 0-4 2-8 4-14 0-4 2-8 2-12 0-4 2-8 2-12 0-4 2-8 2-12 0-2 0-6 0-8 0-10 2-18 2-18l10 2c0 0-2 6-2 16 0 4-2 6-2 10 0 4 0 8-2 10 0 4 0 8-2 14 0 4-2 8-2 12-2 6-4 10-6 16-2 4-4 10-6 14 0 2-2 6-4 8 0 2 0 2-2 4 0 2 0 2-2 4 0 2-2 4-4 8-2 2-2 4-4 6-2 2-2 4-2 4l-4 4c-2 2-4 6-6 8-4 4-8 10-12 14-4 4-8 8-14 14l-6 6c-4 2-6 2-8 4-12 8-22 16-34 22-10 4-22 10-32 14-12 4-22 8-34 12-10 2-20 6-30 8-18 4-34 8-44 10-10 2-18 4-18 4z"
+					"M788.707 162.475c0 9.709-7.282 19.419-19.419 19.419-9.709 0-19.419-9.709-19.419-19.419 0-12.137 9.709-19.419 19.419-19.419 12.137 0 19.419 7.282 19.419 19.419zM795.989 346.946c0 0-26.7-121.363-186.899-89.808-14.563-55.827-12.137-97.090 21.845-133.499 48.545-50.973 126.218-24.272 126.218-24.272v-41.264c-26.7-12.137-53.399-14.563-80.099-14.563-104.372 0-162.626 77.673-186.899 131.072l-288.844 531.57 82.527-14.563-150.491 288.844 104.372-19.419 80.099-225.735c225.735 0 517.006-82.527 478.171-388.362zM893.079 245.002l-63.109-63.109-50.973 63.109zM354.228 669.772c0 0 9.709-2.427 21.845-4.854 12.137-4.854 31.554-7.282 53.399-14.563 12.137-2.427 24.272-7.282 36.409-9.709 12.137-4.854 26.7-9.709 38.836-14.563 14.563-7.282 26.7-12.137 38.836-19.419 14.563-7.282 26.7-16.991 38.836-24.272 2.427-2.427 7.282-4.854 9.709-7.282l7.282-7.282c7.282-7.282 12.137-12.137 16.991-16.991s9.709-12.137 14.563-16.991c2.427-2.427 4.854-4.854 7.282-9.709l2.427-4.854 2.427-2.427c2.427-4.854 4.854-7.282 4.854-9.709 2.427-2.427 4.854-7.282 4.854-9.709 2.427-2.427 2.427-2.427 2.427-4.854 2.427 0 2.427-2.427 2.427-4.854 2.427-2.427 2.427-4.854 4.854-7.282 2.427-7.282 4.854-12.137 7.282-19.419 0-4.854 2.427-9.709 4.854-16.991 0-4.854 2.427-9.709 2.427-14.563s2.427-9.709 2.427-14.563c0-4.854 2.427-9.709 2.427-14.563 0-2.427 0-7.282 0-9.709 0-12.137 2.427-21.845 2.427-21.845l12.137 2.427c0 0-2.427 7.282-2.427 19.419 0 4.854-2.427 7.282-2.427 12.137s0 9.709-2.427 12.137c0 4.854 0 9.709-2.427 16.991 0 4.854-2.427 9.709-2.427 14.563-2.427 7.282-4.854 12.137-7.282 19.419-2.427 4.854-4.854 12.137-7.282 16.991 0 2.427-2.427 7.282-4.854 9.709 0 2.427 0 2.427-2.427 4.854 0 2.427 0 2.427-2.427 4.854 0 2.427-2.427 4.854-4.854 9.709-2.427 2.427-2.427 4.854-4.854 7.282s-2.427 4.854-2.427 4.854l-4.854 4.854c-2.427 2.427-4.854 7.282-7.282 9.709-4.854 4.854-9.709 12.137-14.563 16.991s-9.709 9.709-16.991 16.991l-7.282 7.282c-4.854 2.427-7.282 2.427-9.709 4.854-14.563 9.709-26.7 19.419-41.264 26.7-12.137 4.854-26.7 12.137-38.836 16.991-14.563 4.854-26.7 9.709-41.264 14.563-12.137 2.427-24.272 7.282-36.409 9.709-21.845 4.854-41.264 9.709-53.399 12.137s-21.845 4.854-21.845 4.854z"
 				],
 				"defaultCode": 86,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 49,
@@ -976,15 +976,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 54
+			"iconIdx": 50
 		},
 		{
 			"icon": {
 				"paths": [
-					"M150 874c-96-96-150-226-150-362 0-282 230-512 512-512l64 64-64 64c-212 0-384 172-384 384 0 102 40 200 112 272l-78 10zM512 1024l-64-64 64-64c212 0 384-172 384-384 0-102-40-200-112-272l78-10 12-80c96 96 150 226 150 362 0 282-230 512-512 512z"
+					"M213.721 810.279c-79.102-79.102-123.596-186.218-123.596-298.279 0-232.361 189.514-421.875 421.875-421.875l52.734 52.734-52.734 52.734c-174.683 0-316.406 141.724-316.406 316.406 0 84.045 32.959 164.795 92.286 224.122l-64.27 8.24zM512 933.875l-52.734-52.734 52.734-52.734c174.683 0 316.406-141.724 316.406-316.406 0-84.045-32.959-164.795-92.286-224.122l64.27-8.24 9.888-65.918c79.102 79.102 123.596 186.218 123.596 298.279 0 232.361-189.514 421.875-421.875 421.875z"
 				],
 				"defaultCode": 49,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 50,
@@ -995,15 +995,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 55
+			"iconIdx": 51
 		},
 		{
 			"icon": {
 				"paths": [
-					"M436 898c0 70-58 126-128 126s-128-56-128-126c0-72 58-128 128-128 70 0 128 56 128 128zM436 512c0 70-58 128-128 128s-128-58-128-128c0-70 58-128 128-128 70 0 128 58 128 128zM436 126c0 72-58 128-128 128s-128-56-128-128c0-70 58-126 128-126 70 0 128 56 128 126zM844 898c0 70-58 126-128 126s-128-56-128-126c0-72 58-128 128-128 70 0 128 56 128 128zM844 512c0 70-58 128-128 128s-128-58-128-128c0-70 58-128 128-128 70 0 128 58 128 128zM844 126c0 72-58 128-128 128s-128-56-128-128c0-70 58-126 128-126 70 0 128 56 128 126z"
+					"M449.378 830.054c0 57.678-47.791 103.821-105.469 103.821s-105.469-46.143-105.469-103.821c0-59.326 47.791-105.469 105.469-105.469s105.469 46.143 105.469 105.469zM449.378 512c0 57.678-47.791 105.469-105.469 105.469s-105.469-47.791-105.469-105.469c0-57.678 47.791-105.469 105.469-105.469s105.469 47.791 105.469 105.469zM449.378 193.946c0 59.326-47.791 105.469-105.469 105.469s-105.469-46.143-105.469-105.469c0-57.678 47.791-103.821 105.469-103.821s105.469 46.143 105.469 103.821zM785.56 830.054c0 57.678-47.791 103.821-105.469 103.821s-105.469-46.143-105.469-103.821c0-59.326 47.791-105.469 105.469-105.469s105.469 46.143 105.469 105.469zM785.56 512c0 57.678-47.791 105.469-105.469 105.469s-105.469-47.791-105.469-105.469c0-57.678 47.791-105.469 105.469-105.469s105.469 47.791 105.469 105.469zM785.56 193.946c0 59.326-47.791 105.469-105.469 105.469s-105.469-46.143-105.469-105.469c0-57.678 47.791-103.821 105.469-103.821s105.469 46.143 105.469 103.821z"
 				],
 				"defaultCode": 85,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 51,
@@ -1014,15 +1014,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 56
+			"iconIdx": 52
 		},
 		{
 			"icon": {
 				"paths": [
-					"M664 172v188h98v196h-384v-110l-304 204 304 202v-108h572v-572z"
+					"M654.5 193.25v176.25h91.875v183.75h-360v-103.125l-285 191.25 285 189.375v-101.25h536.25v-536.25z"
 				],
 				"defaultCode": 51,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 52,
@@ -1033,15 +1033,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 57
+			"iconIdx": 53
 		},
 		{
 			"icon": {
 				"paths": [
-					"M384 384h-384l298 218-108 358 306-214 336 214-138-358 330-218h-384l-144-368z"
+					"M406.531 406.531h-316.406l245.544 179.627-88.989 294.983 252.136-176.331 276.856 176.331-113.708-294.983 271.912-179.627h-316.406l-118.653-303.223z"
 				],
 				"defaultCode": 50,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 53,
@@ -1052,7 +1052,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 58
+			"iconIdx": 54
 		},
 		{
 			"icon": {
@@ -1060,7 +1060,7 @@
 					"M270 112h482v46h-482zM810 466l-254 248v-444h-90v440l-250-244-66 64 362 362 362-362z"
 				],
 				"defaultCode": 53,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 54,
@@ -1071,7 +1071,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 59
+			"iconIdx": 55
 		},
 		{
 			"icon": {
@@ -1079,7 +1079,7 @@
 					"M272 112h482v46h-482zM216 716l252-248v444h90v-440l252 244 64-64-362-362-362 362z"
 				],
 				"defaultCode": 54,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 55,
@@ -1090,15 +1090,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 60
+			"iconIdx": 56
 		},
 		{
 			"icon": {
 				"paths": [
-					"M692 382c0 4 0 8 0 12s-2 8-2 14c0 4-2 10-2 14-2 6-4 12-4 18-2 6-4 12-6 18-2 6-4 12-6 20-2 2-4 6-4 8-2 2-2 4-2 6-2 2-2 2-4 4-2 4-2 6-4 10-2 4-4 6-6 10l-4 4-2 6c-2 2-4 6-8 8-4 6-8 14-14 18-6 6-12 12-18 18l-8 8c-4 2-6 4-10 8-12 10-26 18-40 26-14 8-28 14-42 20-14 6-28 12-42 16-12 4-24 8-36 12-24 6-44 10-58 14-14 4-22 4-22 4 0 0 8 0 22-4 14-2 34-6 58-12 12-4 24-6 38-10 14-4 28-10 42-16 14-6 28-12 42-20 14-6 28-16 42-26 4-2 6-4 10-6l10-8c6-6 12-12 16-18 6-6 12-12 16-18 4-4 6-6 8-10l4-4c0-2 2-4 2-6 2-2 4-6 8-10 0-2 2-6 4-10 2 0 2-2 4-4 0-2 0-4 2-6 2-2 2-6 4-10 4-6 6-12 8-18 2-8 4-14 6-20 2-6 2-12 4-16 2-6 2-12 4-16 0-6 0-10 2-14 0-6 0-10 0-12 2-16 2-24 2-24h-12c0 0 0 8-2 22zM916 222l-68-66c-2-66-44-110-64-122-20-18-66-32-118-26-50 8-122 34-172 128-98 184-308 578-310 582-2 0-2 2 0 2 0 2 2 2 2 2l80-14-156 302c0 2 0 2 2 4 0 0 0 0 2 0 0 0 0 0 0 0l112-20c0 0 2 0 2-2l82-240c210-2 356-52 436-154 84-108 72-244 58-308l-10-62h120c0 0 2 0 2-2 2 0 0-2 0-4zM806 138c0 10-10 20-20 20-12 0-20-10-20-20 0-12 8-22 20-22 10 0 20 10 20 22zM740 594c-80 100-224 150-432 150-2 0-2 2-2 4l-84 240-102 18 156-302c0-2 0-2 0-4-2 0-2-2-4-2l-80 16c28-52 218-404 308-574 50-92 118-118 166-124 50-6 92 6 112 20v44c-4 0-32-10-58-10s-56 10-74 30c-32 36-40 72-24 132 108-20 156 26 174 54 14 60 30 198-56 308zM798 222l46-60 60 60z"
+					"M680.75 390.125c0 3.75 0 7.5 0 11.25s-1.875 7.5-1.875 13.125c0 3.75-1.875 9.375-1.875 13.125-1.875 5.625-3.75 11.25-3.75 16.875-1.875 5.625-3.75 11.25-5.625 16.875s-3.75 11.25-5.625 18.75c-1.875 1.875-3.75 5.625-3.75 7.5-1.875 1.875-1.875 3.75-1.875 5.625-1.875 1.875-1.875 1.875-3.75 3.75-1.875 3.75-1.875 5.625-3.75 9.375s-3.75 5.625-5.625 9.375l-3.75 3.75-1.875 5.625c-1.875 1.875-3.75 5.625-7.5 7.5-3.75 5.625-7.5 13.125-13.125 16.875-5.625 5.625-11.25 11.25-16.875 16.875l-7.5 7.5c-3.75 1.875-5.625 3.75-9.375 7.5-11.25 9.375-24.375 16.875-37.5 24.375s-26.25 13.125-39.375 18.75c-13.125 5.625-26.25 11.25-39.375 15-11.25 3.75-22.5 7.5-33.75 11.25-22.5 5.625-41.25 9.375-54.375 13.125s-20.625 3.75-20.625 3.75c0 0 7.5 0 20.625-3.75 13.125-1.875 31.875-5.625 54.375-11.25 11.25-3.75 22.5-5.625 35.625-9.375s26.25-9.375 39.375-15c13.125-5.625 26.25-11.25 39.375-18.75 13.125-5.625 26.25-15 39.375-24.375 3.75-1.875 5.625-3.75 9.375-5.625l9.375-7.5c5.625-5.625 11.25-11.25 15-16.875 5.625-5.625 11.25-11.25 15-16.875 3.75-3.75 5.625-5.625 7.5-9.375l3.75-3.75c0-1.875 1.875-3.75 1.875-5.625 1.875-1.875 3.75-5.625 7.5-9.375 0-1.875 1.875-5.625 3.75-9.375 1.875 0 1.875-1.875 3.75-3.75 0-1.875 0-3.75 1.875-5.625s1.875-5.625 3.75-9.375c3.75-5.625 5.625-11.25 7.5-16.875 1.875-7.5 3.75-13.125 5.625-18.75s1.875-11.25 3.75-15c1.875-5.625 1.875-11.25 3.75-15 0-5.625 0-9.375 1.875-13.125 0-5.625 0-9.375 0-11.25 1.875-15 1.875-22.5 1.875-22.5h-11.25c0 0 0 7.5-1.875 20.625zM890.75 240.125l-63.75-61.875c-1.875-61.875-41.25-103.125-60-114.375-18.75-16.875-61.875-30-110.625-24.375-46.875 7.5-114.375 31.875-161.25 120-91.875 172.5-288.75 541.875-290.625 545.625-1.875 0-1.875 1.875 0 1.875 0 1.875 1.875 1.875 1.875 1.875l75-13.125-146.25 283.125c0 1.875 0 1.875 1.875 3.75 0 0 0 0 1.875 0 0 0 0 0 0 0l105-18.75c0 0 1.875 0 1.875-1.875l76.875-225c196.875-1.875 333.75-48.75 408.75-144.375 78.75-101.25 67.5-228.75 54.375-288.75l-9.375-58.125h112.5c0 0 1.875 0 1.875-1.875 1.875 0 0-1.875 0-3.75zM787.625 161.375c0 9.375-9.375 18.75-18.75 18.75-11.25 0-18.75-9.375-18.75-18.75 0-11.25 7.5-20.625 18.75-20.625 9.375 0 18.75 9.375 18.75 20.625zM725.75 588.875c-75 93.75-210 140.625-405 140.625-1.875 0-1.875 1.875-1.875 3.75l-78.75 225-95.625 16.875 146.25-283.125c0-1.875 0-1.875 0-3.75-1.875 0-1.875-1.875-3.75-1.875l-75 15c26.25-48.75 204.375-378.75 288.75-538.125 46.875-86.25 110.625-110.625 155.625-116.25 46.875-5.625 86.25 5.625 105 18.75v41.25c-3.75 0-30-9.375-54.375-9.375s-52.5 9.375-69.375 28.125c-30 33.75-37.5 67.5-22.5 123.75 101.25-18.75 146.25 24.375 163.125 50.625 13.125 56.25 28.125 185.625-52.5 288.75zM780.125 240.125l43.125-56.25 56.25 56.25z"
 				],
 				"defaultCode": 48,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 56,
@@ -1109,15 +1109,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 61
+			"iconIdx": 57
 		},
 		{
 			"icon": {
 				"paths": [
-					"M506 40c130 0 240 44 334 134 92 90 140 200 144 330 0 130-44 242-136 334-90 94-200 142-330 146-130 0-242-44-334-136-94-90-142-200-144-330-2-130 42-242 134-334 92-94 202-142 332-144zM504 798c20 0 38-6 50-18 12-14 20-30 20-48 0-22-4-38-18-52-12-12-30-18-50-18 0 0-2 0-2 0-20 0-36 6-48 18-14 12-20 28-22 48 0 20 6 36 20 50 12 12 28 20 48 20 0 0 2 0 2 0zM674 462c18-22 26-48 26-80 0-52-18-92-54-118-36-26-82-38-138-38-44 0-80 8-106 26-48 28-72 78-74 150 0 0 0 4 0 4 0 0 112 0 112 0 0 0 0-4 0-4 0-18 6-36 16-56 12-16 30-24 56-24 28 0 46 6 54 20 10 14 16 28 16 46 0 12-6 26-16 40-6 8-14 16-22 20 0 0-6 4-6 4-4 4-8 8-16 12-6 4-14 10-20 16-8 4-14 10-22 16-8 6-14 12-18 18-8 14-14 40-18 80 0 0 0 8 0 8 0 0 112 0 112 0 0 0 0-4 0-4 0-8 0-18 4-28 4-14 12-26 28-38 0 0 28-18 28-18 32-24 50-40 58-52z"
+					"M506.375 69.5c121.875 0 225 41.25 313.125 125.625 86.25 84.375 131.25 187.5 135 309.375 0 121.875-41.25 226.875-127.5 313.125-84.375 88.125-187.5 133.125-309.375 136.875-121.875 0-226.875-41.25-313.125-127.5-88.125-84.375-133.125-187.5-135-309.375s39.375-226.875 125.625-313.125c86.25-88.125 189.375-133.125 311.25-135zM504.5 780.125c18.75 0 35.625-5.625 46.875-16.875 11.25-13.125 18.75-28.125 18.75-45 0-20.625-3.75-35.625-16.875-48.75-11.25-11.25-28.125-16.875-46.875-16.875 0 0-1.875 0-1.875 0-18.75 0-33.75 5.625-45 16.875-13.125 11.25-18.75 26.25-20.625 45 0 18.75 5.625 33.75 18.75 46.875 11.25 11.25 26.25 18.75 45 18.75 0 0 1.875 0 1.875 0zM663.875 465.125c16.875-20.625 24.375-45 24.375-75 0-48.75-16.875-86.25-50.625-110.625s-76.875-35.625-129.375-35.625c-41.25 0-75 7.5-99.375 24.375-45 26.25-67.5 73.125-69.375 140.625 0 0 0 3.75 0 3.75s105 0 105 0c0 0 0-3.75 0-3.75 0-16.875 5.625-33.75 15-52.5 11.25-15 28.125-22.5 52.5-22.5 26.25 0 43.125 5.625 50.625 18.75 9.375 13.125 15 26.25 15 43.125 0 11.25-5.625 24.375-15 37.5-5.625 7.5-13.125 15-20.625 18.75 0 0-5.625 3.75-5.625 3.75-3.75 3.75-7.5 7.5-15 11.25-5.625 3.75-13.125 9.375-18.75 15-7.5 3.75-13.125 9.375-20.625 15s-13.125 11.25-16.875 16.875c-7.5 13.125-13.125 37.5-16.875 75 0 0 0 7.5 0 7.5s105 0 105 0c0 0 0-3.75 0-3.75 0-7.5 0-16.875 3.75-26.25 3.75-13.125 11.25-24.375 26.25-35.625 0 0 26.25-16.875 26.25-16.875 30-22.5 46.875-37.5 54.375-48.75z"
 				],
 				"defaultCode": 63,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 57,
@@ -1128,15 +1128,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 62
+			"iconIdx": 58
 		},
 		{
 			"icon": {
 				"paths": [
-					"M998 894c8 12 8 24 0 36-6 10-16 16-30 16 0 0-914 0-914 0-12 0-22-6-28-16-8-12-8-24-2-36 0 0 456-800 456-800 6-12 16-18 32-18 14 0 24 6 30 18 0 0 456 800 456 800zM568 844c0 0 0-102 0-102s-112 0-112 0c0 0 0 102 0 102 0 0 112 0 112 0zM568 666c0 0 0-308 0-308s-112 0-112 0c0 0 0 308 0 308 0 0 112 0 112 0z"
+					"M939.148 847.742c7.031 10.547 7.031 21.094 0 31.641-5.273 8.789-14.063 14.063-26.367 14.063 0 0-803.32 0-803.32 0-10.547 0-19.336-5.273-24.609-14.063-7.031-10.547-7.031-21.094-1.758-31.641 0 0 400.781-703.125 400.781-703.125 5.273-10.547 14.063-15.82 28.125-15.82 12.305 0 21.094 5.273 26.367 15.82 0 0 400.781 703.125 400.781 703.125zM561.219 803.797c0 0 0-89.648 0-89.648s-98.438 0-98.438 0c0 0 0 89.648 0 89.648s98.438 0 98.438 0zM561.219 647.352c0 0 0-270.703 0-270.703s-98.438 0-98.438 0c0 0 0 270.703 0 270.703s98.438 0 98.438 0z"
 				],
 				"defaultCode": 33,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 58,
@@ -1147,15 +1147,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 63
+			"iconIdx": 59
 		},
 		{
 			"icon": {
 				"paths": [
-					"M512 0c-282 0-512 230-512 512s230 512 512 512c282 0 512-230 512-512 0-282-230-512-512-512zM432 748l-234-236 90-90 144 146 308-308 90 90z"
+					"M512 62c-247.852 0-450 202.148-450 450s202.148 450 450 450c247.852 0 450-202.148 450-450s-202.148-450-450-450zM441.688 719.422l-205.664-207.422 79.102-79.102 126.563 128.32 270.703-270.703 79.102 79.102z"
 				],
 				"defaultCode": 57,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 59,
@@ -1166,15 +1166,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 64
+			"iconIdx": 60
 		},
 		{
 			"icon": {
 				"paths": [
-					"M870 652v234h-716v-234h-136v302c0 38 30 70 68 70h852c38 0 68-32 68-70v-302zM500 628l-198-236c0 0-30-30 4-30 32 0 110 0 110 0 0 0 0-18 0-48 0-82 0-236 0-298 0 0-4-16 22-16 24 0 136 0 156 0 18 0 16 14 16 14 0 60 0 218 0 298 0 26 0 44 0 44 0 0 64 0 104 0 38 0 10 30 10 30 0 0-168 222-192 244-16 18-32-2-32-2z"
+					"M806.983 627.357v192.81h-589.966v-192.81h-112.060v248.841c0 31.311 24.719 57.678 56.031 57.678h702.026c31.311 0 56.031-26.367 56.031-57.678v-248.841zM502.112 607.581l-163.147-194.458c0 0-24.719-24.719 3.296-24.719 26.367 0 90.637 0 90.637 0s0-14.831 0-39.551c0-67.566 0-194.458 0-245.544 0 0-3.296-13.184 18.128-13.184 19.776 0 112.060 0 128.54 0 14.831 0 13.184 11.536 13.184 11.536 0 49.438 0 179.627 0 245.544 0 21.424 0 36.255 0 36.255s52.734 0 85.693 0c31.311 0 8.24 24.719 8.24 24.719s-138.428 182.922-158.203 201.050c-13.184 14.831-26.367-1.648-26.367-1.648z"
 				],
 				"defaultCode": 83,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 60,
@@ -1185,15 +1185,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 65
+			"iconIdx": 61
 		},
 		{
 			"icon": {
 				"paths": [
-					"M512 379.619c19.982 0 37.466 2.499 54.95 9.99s32.472 14.987 44.959 27.477c12.489 12.489 22.481 27.477 27.477 42.461 7.494 17.484 12.489 34.967 12.489 52.453 0 17.484-4.994 34.967-12.489 52.453-4.994 14.987-14.987 29.973-27.477 42.461-12.489 12.489-27.477 19.982-44.959 27.477-17.484 7.494-34.967 9.99-54.95 9.99-19.982 0-37.466-2.499-54.95-9.99-17.484-7.494-32.472-14.987-44.959-27.477-12.489-12.489-22.481-27.477-27.477-42.461-7.494-17.484-12.489-34.967-12.489-52.453 0-17.484 4.994-34.967 12.489-52.453 4.994-14.987 14.987-29.973 27.477-42.461 12.489-12.489 27.477-19.982 44.959-27.477 17.484-7.494 34.967-9.99 54.95-9.99zM512 719.314c29.973 0 57.448-4.994 84.924-14.987s49.954-24.978 69.937-44.959c19.982-17.484 34.967-39.964 47.457-64.941 9.99-27.477 14.987-52.453 14.987-82.426 0-29.973-4.994-54.95-14.987-82.426-12.489-24.978-27.477-47.457-47.457-64.941-19.982-19.982-42.461-34.967-69.937-44.959-27.477-9.99-54.95-14.987-84.924-14.987-29.973 0-57.448 4.994-84.924 14.987-27.477 9.99-49.954 24.978-69.937 44.959-19.982 17.484-34.967 39.964-47.457 64.941-9.99 27.477-14.987 52.453-14.987 82.426 0 29.973 4.994 54.95 14.987 82.426 12.489 24.978 27.477 47.457 47.457 64.941 19.982 19.982 42.461 34.967 69.937 44.959 27.477 9.99 54.95 14.987 84.924 14.987zM512 234.751c44.959 0 87.422 4.994 127.384 14.987s77.431 24.978 112.398 42.461c34.967 14.987 64.941 34.967 92.417 54.95 27.477 22.481 52.453 42.461 72.435 62.443 17.484 19.982 32.472 39.964 42.461 57.448 12.489 19.982 17.484 34.967 17.484 44.959 0 9.99-4.994 24.978-17.484 44.959-9.99 17.484-24.978 37.466-42.461 57.448-19.982 19.982-44.959 39.964-72.435 62.443-27.477 19.982-57.448 39.964-92.417 54.95-34.967 17.484-72.435 32.472-112.398 42.461-39.964 9.99-82.426 14.987-127.384 14.987-44.959 0-87.422-4.994-127.384-14.987-42.461-9.99-77.431-24.978-112.398-42.461-34.967-14.987-64.941-34.967-92.417-54.95-27.477-22.481-52.453-42.461-72.435-62.443-17.484-19.982-32.472-39.964-42.461-57.448-12.489-19.982-17.484-34.967-17.484-44.959 0-9.99 4.994-24.978 17.484-44.959 9.99-17.484 24.978-37.466 42.461-57.448 19.982-19.982 44.959-39.964 72.435-62.443 27.477-19.982 57.448-39.964 92.417-54.95 34.967-17.484 69.937-32.472 112.398-42.461 39.964-9.99 82.426-14.987 127.384-14.987z"
+					"M512 387.893c18.733 0 35.124 2.343 51.516 9.366s30.442 14.050 42.149 25.76c11.708 11.708 21.076 25.76 25.76 39.807 7.026 16.391 11.708 32.782 11.708 49.175 0 16.391-4.682 32.782-11.708 49.175-4.682 14.050-14.050 28.1-25.76 39.807s-25.76 18.733-42.149 25.76c-16.391 7.026-32.782 9.366-51.516 9.366s-35.124-2.343-51.516-9.366c-16.391-7.026-30.442-14.050-42.149-25.76-11.708-11.708-21.076-25.76-25.76-39.807-7.026-16.391-11.708-32.782-11.708-49.175 0-16.391 4.682-32.782 11.708-49.175 4.682-14.050 14.050-28.1 25.76-39.807s25.76-18.733 42.149-25.76c16.391-7.026 32.782-9.366 51.516-9.366zM512 706.357c28.1 0 53.857-4.682 79.616-14.050s46.832-23.417 65.566-42.149c18.733-16.391 32.782-37.466 44.491-60.882 9.366-25.76 14.050-49.175 14.050-77.274s-4.682-51.516-14.050-77.274c-11.708-23.417-25.76-44.491-44.491-60.882-18.733-18.733-39.807-32.782-65.566-42.149-25.76-9.366-51.516-14.050-79.616-14.050s-53.857 4.682-79.616 14.050c-25.76 9.366-46.832 23.417-65.566 42.149-18.733 16.391-32.782 37.466-44.491 60.882-9.366 25.76-14.050 49.175-14.050 77.274s4.682 51.516 14.050 77.274c11.708 23.417 25.76 44.491 44.491 60.882 18.733 18.733 39.807 32.782 65.566 42.149 25.76 9.366 51.516 14.050 79.616 14.050zM512 252.079c42.149 0 81.958 4.682 119.423 14.050s72.592 23.417 105.373 39.807c32.782 14.050 60.882 32.782 86.641 51.516 25.76 21.076 49.175 39.807 67.908 58.54 16.391 18.733 30.442 37.466 39.807 53.858 11.708 18.733 16.391 32.782 16.391 42.149 0 9.366-4.682 23.417-16.391 42.149-9.366 16.391-23.417 35.124-39.807 53.858-18.733 18.733-42.149 37.466-67.908 58.54-25.76 18.733-53.857 37.466-86.641 51.516-32.782 16.391-67.908 30.442-105.373 39.807s-77.274 14.050-119.423 14.050c-42.149 0-81.958-4.682-119.423-14.050-39.807-9.366-72.592-23.417-105.373-39.807-32.782-14.050-60.882-32.782-86.641-51.516-25.76-21.076-49.175-39.807-67.908-58.54-16.391-18.733-30.443-37.466-39.807-53.858-11.708-18.733-16.391-32.782-16.391-42.149 0-9.366 4.682-23.417 16.391-42.149 9.366-16.391 23.417-35.124 39.807-53.858 18.733-18.733 42.149-37.466 67.908-58.54 25.76-18.733 53.858-37.466 86.641-51.516 32.782-16.391 65.566-30.442 105.373-39.807 37.466-9.366 77.274-14.050 119.423-14.050z"
 				],
 				"defaultCode": 52,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 61,
@@ -1204,15 +1204,15 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 66
+			"iconIdx": 62
 		},
 		{
 			"icon": {
 				"paths": [
-					"M832 1024h-640c-106 0-192-86-192-192v-640c0-84 54-154 128-180v84c0 54 44 96 96 96s96-42 96-96v-96h384v96c0 54 44 96 96 96s96-42 96-96v-84c74 26 128 96 128 180v640c0 106-86 192-192 192zM896 320h-768v512c0 36 28 64 64 64h640c36 0 64-28 64-64zM640 640h128v128h-128zM640 448h128v128h-128zM448 640h128v128h-128zM448 448h128v128h-128zM256 640h128v128h-128zM256 448h128v128h-128zM800 128c-18 0-32-14-32-32v-96h64v96c0 18-14 32-32 32zM224 128c-18 0-32-14-32-32v-96h64v96c0 18-14 32-32 32z"
+					"M775.672 933.875h-527.344c-87.341 0-158.203-70.862-158.203-158.203v-527.344c0-69.214 44.495-126.892 105.469-148.315v69.214c0 44.495 36.255 79.102 79.102 79.102s79.102-34.607 79.102-79.102v-79.102h316.406v79.102c0 44.495 36.255 79.102 79.102 79.102s79.102-34.607 79.102-79.102v-69.214c60.974 21.424 105.469 79.102 105.469 148.315v527.344c0 87.341-70.862 158.203-158.203 158.203zM828.406 353.797h-632.813v421.875c0 29.663 23.071 52.734 52.734 52.734h527.344c29.663 0 52.734-23.071 52.734-52.734zM617.469 617.469h105.469v105.469h-105.469zM617.469 459.266h105.469v105.469h-105.469zM459.266 617.469h105.469v105.469h-105.469zM459.266 459.266h105.469v105.469h-105.469zM301.063 617.469h105.469v105.469h-105.469zM301.063 459.266h105.469v105.469h-105.469zM749.305 195.594c-14.831 0-26.367-11.536-26.367-26.367v-79.102h52.734v79.102c0 14.831-11.536 26.367-26.367 26.367zM274.695 195.594c-14.831 0-26.367-11.536-26.367-26.367v-79.102h52.734v79.102c0 14.831-11.536 26.367-26.367 26.367z"
 				],
 				"defaultCode": 55,
-				"grid": 0
+				"grid": 16
 			},
 			"properties": {
 				"id": 62,
@@ -1223,7 +1223,7 @@
 				"ligatures": ""
 			},
 			"setIdx": 0,
-			"iconIdx": 67
+			"iconIdx": 63
 		}
 	],
 	"height": 1024,
@@ -1245,9 +1245,11 @@
 				"baseline": 6.25,
 				"whitespace": 50
 			},
-			"resetPoint": 58880,
-			"showMetrics": false,
-			"showMetadata": false
+			"showMetadata": false,
+			"showMetrics": true,
+			"useClassSelector": false,
+			"classSelector": ".icon",
+			"embed": false
 		},
 		"imagePref": {},
 		"historySize": 100,
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot
index b1fad90917fdfbaae391544f6366b12bda0d53c4..605751ad41fb7c6fa3c62568d7881f273d6a9900 100755
GIT binary patch
literal 25504
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
VIfJ@A_*b0ze=lrQx<2Od{{igi%yIw#

literal 26124
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

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
index 4efa0249c4a..f095fbd63b3 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
@@ -7,68 +7,68 @@
 <font-face units-per-em="512" ascent="480" descent="-32" />
 <missing-glyph horiz-adv-x="512" />
 <glyph unicode="&#x20;" d="" horiz-adv-x="256" />
-<glyph unicode="&#x21;" d="M499 33c4-6 4-12 0-18-3-5-8-8-15-8 0 0-457 0-457 0-6 0-11 3-14 8-4 6-4 12-1 18 0 0 228 400 228 400 3 6 8 9 16 9 7 0 12-3 15-9 0 0 228-400 228-400zM284 58c0 0 0 51 0 51s-56 0-56 0c0 0 0-51 0-51 0 0 56 0 56 0zM284 147c0 0 0 154 0 154s-56 0-56 0c0 0 0-154 0-154 0 0 56 0 56 0z" />
-<glyph unicode="&#x24;" d="M51.015 429.196v-409.778h409.777v409.777h-409.777zM176.358 84.156h-82.644v42.699h150.825v-42.699zM396.055 299.719h-302.339v64.050h301.651v-64.050zM395.365 184.017h-301.651v64.049h301.651v-64.049z" />
-<glyph unicode="&#x30;" d="M346 289c0-2 0-4 0-6s-1-4-1-7c0-2-1-5-1-7-1-3-2-6-2-9-1-3-2-6-3-9-1-3-2-6-3-10-1-1-2-3-2-4-1-1-1-2-1-3-1-1-1-1-2-2-1-2-1-3-2-5-1-2-2-3-3-5l-2-2-1-3c-1-1-2-3-4-4-2-3-4-7-7-9-3-3-6-6-9-9l-4-4c-2-1-3-2-5-4-6-5-13-9-20-13-7-4-14-7-21-10-7-3-14-6-21-8-6-2-12-4-18-6-12-3-22-5-29-7-7-2-11-2-11-2 0 0 4 0 11 2 7 1 17 3 29 6 6 2 12 3 19 5 7 2 14 5 21 8 7 3 14 6 21 10 7 3 14 8 21 13 2 1 3 2 5 3l5 4c3 3 6 6 8 9 3 3 6 6 8 9 2 2 3 3 4 5l2 2c0 1 1 2 1 3 1 1 2 3 4 5 0 1 1 3 2 5 1 0 1 1 2 2 0 1 0 2 1 3 1 1 1 3 2 5 2 3 3 6 4 9 1 4 2 7 3 10 1 3 1 6 2 8 1 3 1 6 2 8 0 3 0 5 1 7 0 3 0 5 0 6 1 8 1 12 1 12h-6c0 0 0-4-1-11zM458 369l-34 33c-1 33-22 55-32 61-10 9-33 16-59 13-25-4-61-17-86-64-49-92-154-289-155-291-1 0-1-1 0-1 0-1 1-1 1-1l40 7-78-151c0-1 0-1 1-2 0 0 0 0 1 0 0 0 0 0 0 0l56 10c0 0 1 0 1 1l41 120c105 1 178 26 218 77 42 54 36 122 29 154l-5 31h60c0 0 1 0 1 1 1 0 0 1 0 2zM403 411c0-5-5-10-10-10-6 0-10 5-10 10 0 6 4 11 10 11 5 0 10-5 10-11zM370 183c-40-50-112-75-216-75-1 0-1-1-1-2l-42-120-51-9 78 151c0 1 0 1 0 2-1 0-1 1-2 1l-40-8c14 26 109 202 154 287 25 46 59 59 83 62 25 3 46-3 56-10v-22c-2 0-16 5-29 5s-28-5-37-15c-16-18-20-36-12-66 54 10 78-13 87-27 7-30 15-99-28-154zM399 369l23 30 30-30z" />
-<glyph unicode="&#x31;" d="M75 43c-48 48-75 113-75 181 0 141 115 256 256 256l32-32-32-32c-106 0-192-86-192-192 0-51 20-100 56-136l-39-5zM256-32l-32 32 32 32c106 0 192 86 192 192 0 51-20 100-56 136l39 5 6 40c48-48 75-113 75-181 0-141-115-256-256-256z" />
-<glyph unicode="&#x32;" d="M192 288h-192l149-109-54-179 153 107 168-107-69 179 165 109h-192l-72 184z" />
-<glyph unicode="&#x33;" d="M332 394v-94h49v-98h-192v55l-152-102 152-101v54h286v286z" />
-<glyph unicode="&#x34;" d="M256 290.19c9.991 0 18.733-1.25 27.475-4.995s16.236-7.493 22.48-13.738c6.245-6.245 11.24-13.738 13.738-21.231 3.747-8.742 6.245-17.483 6.245-26.226 0-8.742-2.497-17.483-6.245-26.226-2.497-7.493-7.493-14.986-13.738-21.231-6.245-6.245-13.738-9.991-22.48-13.738-8.742-3.747-17.483-4.995-27.475-4.995-9.991 0-18.733 1.25-27.475 4.995-8.742 3.747-16.236 7.493-22.48 13.738-6.244 6.245-11.24 13.738-13.738 21.231-3.747 8.742-6.244 17.483-6.244 26.226 0 8.742 2.497 17.483 6.244 26.226 2.497 7.494 7.494 14.986 13.738 21.231 6.244 6.245 13.738 9.991 22.48 13.738 8.742 3.747 17.483 4.995 27.475 4.995zM256 120.343c14.986 0 28.724 2.497 42.462 7.493s24.977 12.489 34.969 22.48c9.991 8.742 17.483 19.982 23.728 32.471 4.995 13.738 7.493 26.226 7.493 41.213 0 14.987-2.497 27.475-7.493 41.213-6.245 12.489-13.738 23.728-23.728 32.47-9.991 9.991-21.231 17.483-34.969 22.479-13.738 4.995-27.475 7.494-42.462 7.494-14.987 0-28.724-2.497-42.462-7.494-13.738-4.995-24.977-12.489-34.969-22.479-9.991-8.742-17.483-19.982-23.728-32.471-4.995-13.738-7.494-26.226-7.494-41.213 0-14.986 2.497-27.475 7.494-41.213 6.244-12.489 13.738-23.728 23.728-32.471 9.991-9.991 21.231-17.483 34.969-22.479 13.738-4.995 27.475-7.493 42.462-7.493zM256 362.625c22.48 0 43.711-2.497 63.692-7.494s38.716-12.489 56.199-21.231c17.483-7.493 32.471-17.483 46.209-27.475 13.738-11.24 26.226-21.231 36.217-31.221 8.742-9.991 16.236-19.982 21.231-28.724 6.245-9.991 8.742-17.483 8.742-22.48 0-4.995-2.497-12.489-8.742-22.48-4.995-8.742-12.489-18.733-21.231-28.724-9.991-9.991-22.48-19.982-36.217-31.221-13.738-9.991-28.724-19.982-46.209-27.475-17.483-8.742-36.218-16.236-56.199-21.231-19.982-4.995-41.213-7.493-63.692-7.493-22.48 0-43.711 2.497-63.692 7.493-21.231 4.995-38.715 12.489-56.199 21.231-17.483 7.493-32.471 17.483-46.209 27.475-13.739 11.24-26.227 21.231-36.218 31.221-8.742 9.991-16.236 19.982-21.23 28.724-6.245 9.991-8.742 17.483-8.742 22.48 0 4.995 2.497 12.489 8.742 22.48 4.995 8.742 12.489 18.733 21.23 28.724 9.991 9.991 22.48 19.982 36.218 31.221 13.739 9.991 28.724 19.982 46.209 27.475 17.483 8.742 34.969 16.236 56.199 21.231 19.982 4.995 41.213 7.494 63.692 7.494z" />
+<glyph unicode="&#x21;" d="M469.574 56.129c3.515-5.274 3.515-10.547 0-15.82-2.637-4.394-7.031-7.031-13.183-7.031 0 0-401.66 0-401.66 0-5.273 0-9.668 2.637-12.305 7.031-3.516 5.274-3.516 10.547-0.879 15.82 0 0 200.391 351.563 200.391 351.563 2.637 5.274 7.031 7.91 14.063 7.91 6.152 0 10.547-2.636 13.183-7.91 0 0 200.39-351.563 200.39-351.563zM280.61 78.101c0 0 0 44.824 0 44.824s-49.219 0-49.219 0c0 0 0-44.824 0-44.824s49.219 0 49.219 0zM280.61 156.324c0 0 0 135.351 0 135.351s-49.219 0-49.219 0c0 0 0-135.351 0-135.351s49.219 0 49.219 0z" />
+<glyph unicode="&#x24;" d="M37.349 442.875v-437.096h437.096v437.096h-437.096zM171.049 74.832h-88.153v45.546h160.88v-45.546zM405.392 304.767h-322.495v68.32h321.762v-68.32zM404.656 181.352h-321.762v68.32h321.762v-68.32z" />
+<glyph unicode="&#x30;" d="M340.375 284.938c0-1.875 0-3.75 0-5.625s-0.938-3.75-0.938-6.563c0-1.875-0.938-4.688-0.938-6.563-0.938-2.813-1.875-5.625-1.875-8.438-0.938-2.813-1.875-5.625-2.813-8.438s-1.875-5.625-2.813-9.375c-0.938-0.938-1.875-2.813-1.875-3.75-0.938-0.938-0.938-1.875-0.938-2.813-0.938-0.938-0.938-0.938-1.875-1.875-0.938-1.875-0.938-2.813-1.875-4.688s-1.875-2.813-2.813-4.688l-1.875-1.875-0.938-2.813c-0.938-0.938-1.875-2.813-3.75-3.75-1.875-2.813-3.75-6.563-6.563-8.438-2.813-2.813-5.625-5.625-8.438-8.438l-3.75-3.75c-1.875-0.938-2.813-1.875-4.688-3.75-5.625-4.688-12.188-8.438-18.75-12.188s-13.125-6.563-19.688-9.375c-6.563-2.813-13.125-5.625-19.688-7.5-5.625-1.875-11.25-3.75-16.875-5.625-11.25-2.813-20.625-4.688-27.188-6.563s-10.313-1.875-10.313-1.875c0 0 3.75 0 10.313 1.875 6.563 0.938 15.938 2.813 27.188 5.625 5.625 1.875 11.25 2.813 17.813 4.688s13.125 4.688 19.688 7.5c6.563 2.813 13.125 5.625 19.688 9.375 6.563 2.813 13.125 7.5 19.688 12.188 1.875 0.938 2.813 1.875 4.688 2.813l4.688 3.75c2.813 2.813 5.625 5.625 7.5 8.438 2.813 2.813 5.625 5.625 7.5 8.438 1.875 1.875 2.813 2.813 3.75 4.688l1.875 1.875c0 0.938 0.938 1.875 0.938 2.813 0.938 0.938 1.875 2.813 3.75 4.688 0 0.938 0.938 2.813 1.875 4.688 0.938 0 0.938 0.938 1.875 1.875 0 0.938 0 1.875 0.938 2.813s0.938 2.813 1.875 4.688c1.875 2.813 2.813 5.625 3.75 8.438 0.938 3.75 1.875 6.563 2.813 9.375s0.938 5.625 1.875 7.5c0.938 2.813 0.938 5.625 1.875 7.5 0 2.813 0 4.688 0.938 6.563 0 2.813 0 4.688 0 5.625 0.938 7.5 0.938 11.25 0.938 11.25h-5.625c0 0 0-3.75-0.938-10.313zM445.375 359.938l-31.875 30.938c-0.938 30.938-20.625 51.563-30 57.188-9.375 8.438-30.938 15-55.313 12.188-23.438-3.75-57.188-15.938-80.625-60-45.938-86.25-144.375-270.938-145.313-272.813-0.938 0-0.938-0.938 0-0.938 0-0.938 0.938-0.938 0.938-0.938l37.5 6.563-73.125-141.563c0-0.938 0-0.938 0.938-1.875 0 0 0 0 0.938 0 0 0 0 0 0 0l52.5 9.375c0 0 0.938 0 0.938 0.938l38.438 112.5c98.438 0.938 166.875 24.375 204.375 72.188 39.375 50.625 33.75 114.375 27.188 144.375l-4.688 29.063h56.25c0 0 0.938 0 0.938 0.938 0.938 0 0 0.938 0 1.875zM393.813 399.313c0-4.688-4.688-9.375-9.375-9.375-5.625 0-9.375 4.688-9.375 9.375 0 5.625 3.75 10.313 9.375 10.313 4.688 0 9.375-4.688 9.375-10.313zM362.875 185.563c-37.5-46.875-105-70.313-202.5-70.313-0.938 0-0.938-0.938-0.938-1.875l-39.375-112.5-47.813-8.438 73.125 141.563c0 0.938 0 0.938 0 1.875-0.938 0-0.938 0.938-1.875 0.938l-37.5-7.5c13.125 24.375 102.188 189.375 144.375 269.063 23.438 43.125 55.313 55.313 77.813 58.125 23.438 2.813 43.125-2.813 52.5-9.375v-20.625c-1.875 0-15 4.688-27.188 4.688s-26.25-4.688-34.688-14.063c-15-16.875-18.75-33.75-11.25-61.875 50.625 9.375 73.125-12.188 81.563-25.313 6.563-28.125 14.063-92.813-26.25-144.375zM390.063 359.938l21.563 28.125 28.125-28.125z" />
+<glyph unicode="&#x31;" d="M106.861 74.861c-39.551 39.551-61.798 93.109-61.798 149.139 0 116.18 94.757 210.938 210.938 210.938l26.367-26.367-26.367-26.367c-87.341 0-158.203-70.862-158.203-158.203 0-42.022 16.48-82.397 46.143-112.061l-32.135-4.12zM256 13.063l-26.367 26.367 26.367 26.367c87.341 0 158.203 70.862 158.203 158.203 0 42.023-16.48 82.397-46.143 112.061l32.135 4.12 4.944 32.959c39.551-39.551 61.798-93.109 61.798-149.139 0-116.18-94.757-210.938-210.938-210.938z" />
+<glyph unicode="&#x32;" d="M203.266 276.735h-158.203l122.772-89.814-44.495-147.492 126.068 88.166 138.428-88.166-56.854 147.491 135.956 89.813h-158.203l-59.327 151.612z" />
+<glyph unicode="&#x33;" d="M327.25 383.375v-88.125h45.938v-91.875h-180v51.563l-142.5-95.625 142.5-94.688v50.625h268.125v268.125z" />
+<glyph unicode="&#x34;" d="M256 286.053c9.366 0 17.562-1.171 25.758-4.683s15.221-7.025 21.075-12.88c5.854-5.854 10.538-12.88 12.88-19.903 3.513-8.196 5.854-16.391 5.854-24.588 0-8.195-2.341-16.391-5.854-24.587-2.341-7.025-7.025-14.050-12.88-19.904s-12.88-9.366-21.075-12.88c-8.195-3.513-16.391-4.683-25.758-4.683s-17.562 1.171-25.758 4.683c-8.196 3.513-15.221 7.025-21.075 12.88-5.854 5.854-10.538 12.88-12.88 19.904-3.513 8.195-5.854 16.391-5.854 24.587s2.341 16.391 5.854 24.588c2.341 7.025 7.025 14.050 12.88 19.903s12.88 9.367 21.075 12.88c8.196 3.513 16.391 4.683 25.758 4.683zM256 126.822c14.050 0 26.928 2.341 39.808 7.025s23.416 11.709 32.783 21.075c9.366 8.195 16.391 18.733 22.245 30.441 4.683 12.88 7.025 24.587 7.025 38.637s-2.341 25.758-7.025 38.637c-5.854 11.709-12.88 22.245-22.245 30.441-9.366 9.366-19.904 16.391-32.783 21.074s-25.758 7.025-39.808 7.025-26.928-2.341-39.808-7.025c-12.88-4.683-23.416-11.708-32.783-21.074-9.367-8.196-16.391-18.733-22.245-30.441-4.683-12.88-7.025-24.588-7.025-38.637s2.341-25.758 7.025-38.637c5.854-11.709 12.88-22.245 22.245-30.441 9.367-9.366 19.904-16.391 32.783-21.075s25.758-7.025 39.808-7.025zM256 353.961c21.075 0 40.979-2.341 59.712-7.025s36.296-11.709 52.687-19.904c16.391-7.025 30.441-16.391 43.32-25.758 12.88-10.538 24.587-19.904 33.954-29.27 8.195-9.367 15.221-18.733 19.904-26.929 5.854-9.367 8.195-16.391 8.195-21.075s-2.341-11.708-8.195-21.075c-4.683-8.195-11.709-17.562-19.904-26.929-9.366-9.366-21.075-18.733-33.954-29.27-12.88-9.366-26.928-18.733-43.32-25.758-16.391-8.195-33.954-15.221-52.687-19.904s-38.637-7.025-59.712-7.025c-21.075 0-40.979 2.341-59.712 7.025-19.904 4.683-36.296 11.709-52.686 19.904-16.391 7.025-30.441 16.391-43.321 25.758-12.88 10.538-24.588 19.904-33.954 29.27-8.195 9.366-15.221 18.733-19.904 26.929-5.854 9.366-8.196 16.391-8.196 21.075s2.341 11.709 8.195 21.075c4.683 8.196 11.709 17.562 19.904 26.929 9.367 9.367 21.075 18.733 33.954 29.27 12.88 9.367 26.929 18.733 43.321 25.758 16.391 8.196 32.783 15.221 52.686 19.904 18.733 4.683 38.637 7.025 59.712 7.025z" />
 <glyph unicode="&#x35;" d="M135 424h241v-23h-241zM405 247l-127-124v222h-45v-220l-125 122-33-32 181-181 181 181z" />
 <glyph unicode="&#x36;" d="M136 424h241v-23h-241zM108 122l126 124v-222h45v220l126-122 32 32-181 181-181-181z" />
-<glyph unicode="&#x37;" d="M416-32h-320c-53 0-96 43-96 96v320c0 42 27 77 64 90v-42c0-27 22-48 48-48s48 21 48 48v48h192v-48c0-27 22-48 48-48s48 21 48 48v42c37-13 64-48 64-90v-320c0-53-43-96-96-96zM448 320h-384v-256c0-18 14-32 32-32h320c18 0 32 14 32 32zM320 160h64v-64h-64zM320 256h64v-64h-64zM224 160h64v-64h-64zM224 256h64v-64h-64zM128 160h64v-64h-64zM128 256h64v-64h-64zM400 416c-9 0-16 7-16 16v48h32v-48c0-9-7-16-16-16zM112 416c-9 0-16 7-16 16v48h32v-48c0-9-7-16-16-16z" />
-<glyph unicode="&#x39;" d="M256 480c-141 0-256-115-256-256s115-256 256-256c141 0 256 115 256 256 0 141-115 256-256 256zM216 106l-117 118 45 45 72-73 154 154 45-45z" />
-<glyph unicode="&#x3f;" d="M253 460c65 0 120-22 167-67 46-45 70-100 72-165 0-65-22-121-68-167-45-47-100-71-165-73-65 0-121 22-167 68-47 45-71 100-72 165-1 65 21 121 67 167 46 47 101 71 166 72zM252 81c10 0 19 3 25 9 6 7 10 15 10 24 0 11-2 19-9 26-6 6-15 9-25 9 0 0-1 0-1 0-10 0-18-3-24-9-7-6-10-14-11-24 0-10 3-18 10-25 6-6 14-10 24-10 0 0 1 0 1 0zM337 249c9 11 13 24 13 40 0 26-9 46-27 59-18 13-41 19-69 19-22 0-40-4-53-13-24-14-36-39-37-75 0 0 0-2 0-2 0 0 56 0 56 0 0 0 0 2 0 2 0 9 3 18 8 28 6 8 15 12 28 12 14 0 23-3 27-10 5-7 8-14 8-23 0-6-3-13-8-20-3-4-7-8-11-10 0 0-3-2-3-2-2-2-4-4-8-6-3-2-7-5-10-8-4-2-7-5-11-8-4-3-7-6-9-9-4-7-7-20-9-40 0 0 0-4 0-4 0 0 56 0 56 0 0 0 0 2 0 2 0 4 0 9 2 14 2 7 6 13 14 19 0 0 14 9 14 9 16 12 25 20 29 26z" />
+<glyph unicode="&#x37;" d="M387.836 13.063h-263.672c-43.671 0-79.102 35.431-79.102 79.101v263.672c0 34.607 22.248 63.446 52.734 74.158v-34.607c0-22.248 18.127-39.551 39.551-39.551s39.551 17.303 39.551 39.551v39.551h158.203v-39.551c0-22.248 18.127-39.551 39.551-39.551s39.551 17.303 39.551 39.551v34.607c30.487-10.712 52.735-39.551 52.735-74.158v-263.672c0-43.671-35.431-79.101-79.101-79.101zM414.203 303.101h-316.406v-210.938c0-14.832 11.535-26.367 26.367-26.367h263.672c14.832 0 26.367 11.536 26.367 26.367zM308.735 171.265h52.735v-52.735h-52.735zM308.735 250.367h52.735v-52.734h-52.735zM229.633 171.265h52.734v-52.735h-52.734zM229.633 250.367h52.734v-52.734h-52.734zM150.531 171.265h52.734v-52.735h-52.734zM150.531 250.367h52.734v-52.734h-52.734zM374.652 382.203c-7.416 0-13.183 5.768-13.183 13.184v39.551h26.367v-39.551c0-7.416-5.768-13.184-13.183-13.184zM137.347 382.203c-7.416 0-13.183 5.768-13.183 13.184v39.551h26.367v-39.551c0-7.416-5.768-13.184-13.184-13.184z" />
+<glyph unicode="&#x39;" d="M256 449c-123.926 0-225-101.074-225-225s101.074-225 225-225c123.926 0 225 101.074 225 225s-101.074 225-225 225zM220.844 120.289l-102.832 103.711 39.551 39.551 63.281-64.16 135.351 135.351 39.551-39.551z" />
+<glyph unicode="&#x3f;" d="M253.188 445.25c60.938 0 112.5-20.625 156.563-62.813 43.125-42.188 65.625-93.75 67.5-154.688 0-60.938-20.625-113.438-63.75-156.563-42.188-44.063-93.75-66.563-154.688-68.438-60.938 0-113.438 20.625-156.563 63.75-44.063 42.188-66.563 93.75-67.5 154.688s19.688 113.438 62.813 156.563c43.125 44.063 94.688 66.563 155.625 67.5zM252.25 89.938c9.375 0 17.813 2.813 23.438 8.438 5.625 6.563 9.375 14.063 9.375 22.5 0 10.313-1.875 17.813-8.438 24.375-5.625 5.625-14.063 8.438-23.438 8.438 0 0-0.938 0-0.938 0-9.375 0-16.875-2.813-22.5-8.438-6.563-5.625-9.375-13.125-10.313-22.5 0-9.375 2.813-16.875 9.375-23.438 5.625-5.625 13.125-9.375 22.5-9.375 0 0 0.938 0 0.938 0zM331.938 247.438c8.438 10.313 12.188 22.5 12.188 37.5 0 24.375-8.438 43.125-25.313 55.313s-38.438 17.813-64.688 17.813c-20.625 0-37.5-3.75-49.688-12.188-22.5-13.125-33.75-36.563-34.688-70.313 0 0 0-1.875 0-1.875s52.5 0 52.5 0c0 0 0 1.875 0 1.875 0 8.438 2.813 16.875 7.5 26.25 5.625 7.5 14.063 11.25 26.25 11.25 13.125 0 21.563-2.813 25.313-9.375 4.688-6.563 7.5-13.125 7.5-21.563 0-5.625-2.813-12.188-7.5-18.75-2.813-3.75-6.563-7.5-10.313-9.375 0 0-2.813-1.875-2.813-1.875-1.875-1.875-3.75-3.75-7.5-5.625-2.813-1.875-6.563-4.688-9.375-7.5-3.75-1.875-6.563-4.688-10.313-7.5s-6.563-5.625-8.438-8.438c-3.75-6.563-6.563-18.75-8.438-37.5 0 0 0-3.75 0-3.75s52.5 0 52.5 0c0 0 0 1.875 0 1.875 0 3.75 0 8.438 1.875 13.125 1.875 6.563 5.625 12.188 13.125 17.813 0 0 13.125 8.438 13.125 8.438 15 11.25 23.438 18.75 27.188 24.375z" />
 <glyph unicode="&#x41;" d="M232 109l176 175c3 4 5 8 5 13s-2 9-5 13l-29 29c-4 4-8 6-13 6s-10-2-13-6l-134-133-60 60c-3 4-8 5-13 5s-9-1-13-5l-29-29c-3-4-5-8-5-13s2-9 5-13l103-102c3-4 7-6 12-6s10 2 13 6zM475 361v-274c0-23-8-42-24-58s-35-24-58-24h-274c-23 0-42 8-58 24s-24 35-24 58v274c0 23 8 42 24 58s35 24 58 24h274c23 0 42-8 58-24s24-35 24-58z" />
-<glyph unicode="&#x42;" d="M384 206v36c0 5-2 10-5 13-4 4-8 6-13 6h-73v73c0 5-2 9-6 13-3 3-8 5-13 5h-36c-5 0-10-2-13-5-4-4-6-8-6-13v-73h-73c-5 0-9-2-13-6-3-3-5-8-5-13v-36c0-5 2-10 5-13 4-4 8-6 13-6h73v-73c0-5 2-9 6-13 3-3 8-5 13-5h36c5 0 10 2 13 5 4 4 6 8 6 13v73h73c5 0 9 2 13 6 3 3 5 8 5 13zM475 224c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z" />
-<glyph unicode="&#x43;" d="M213 45c15-6 28-9 40-9 25 0 46 4 62 12 16 8 28 19 35 32 7 14 11 31 11 52 0 22-4 39-12 51-11 18-24 30-40 36-15 7-39 10-71 10-14 0-23-1-29-3v-91l1-77c0-3 1-7 3-13zM209 259c9-2 19-2 32-2 33 0 58 6 75 18 17 13 25 34 25 64 0 21-8 39-24 54-16 14-40 21-73 21-10 0-22-1-37-4 0-8 0-15 1-22 1-23 2-50 1-79v-28c0-9 0-16 0-22zM55 5v26c9 2 15 3 20 4 15 2 26 5 35 9 3 5 5 10 6 14 2 13 3 31 3 56l-1 142c-1 48-2 87-3 115 0 17-1 27-3 31 0 1-1 2-3 4-4 2-10 3-20 4-6 0-16 2-32 4l-2 23 75 2 108 4h13c1 0 2 0 4 0s3 0 4 0c0 0 2 0 6 0s8 0 12 0h21c17 0 35-2 55-8 8-2 17-6 27-11 11-5 21-12 29-21 9-9 15-19 19-30 4-11 6-23 6-35 0-13-3-26-9-37-7-11-16-21-28-30-5-3-19-11-42-22 33-7 59-21 76-41 17-20 26-43 26-68 0-14-3-30-8-46-4-12-11-23-20-33-13-14-26-24-40-31-14-7-34-13-58-17-16-3-35-4-57-3l-56 1c-16 0-45-1-85-3-7-1-33-2-78-3z" />
-<glyph unicode="&#x44;" d="M182.899 46.091c-70.459 20.257-272.149 109.212-43.156 403.378 123.303-83.671 170.863-157.652 179.67-218.423-59.010-21.137-99.524-62.533-94.239-137.396-32.588 76.625-58.129 183.193-68.698 249.249-5.285-77.505 6.165-214.9 26.422-296.809zM261.284 27.595c-16.734 46.679-51.964 200.809 212.258 192.882 7.927-242.204-120.661-233.396-177.909-216.661 23.78 46.679 54.606 88.955 93.358 124.185-47.56-26.422-90.716-59.89-127.707-100.404z" />
-<glyph unicode="&#x45;" d="M110 5l5 24c0 1 8 3 22 6 14 4 25 7 33 11 5 7 9 17 11 29l8 40 20 95c1 8 3 16 4 24 2 8 4 14 5 19 1 5 3 9 4 13 1 4 1 7 2 9 1 2 1 3 1 3l8 45 5 18 6 39 3 14v11c-8 4-22 7-42 8-5 0-9 1-10 1l5 29 91-4c7 0 14 0 20 0 13 0 33 1 62 2 6 1 12 1 19 2 7 0 10 0 10 0 0-3-1-7-1-10-2-6-3-11-4-15-11-4-21-7-31-9-12-3-22-6-29-9-2-6-5-14-7-25-2-8-3-16-4-23-8-38-14-67-19-88l-17-89-11-45-12-67-4-13c0-1 0-4 1-7 12-3 23-5 34-6 7-1 13-2 19-3-1-6-1-11-2-17-2-6-3-10-3-12-3 0-6 0-7 0-4 0-8 0-12 0-1 0-4 0-8 0-3 1-17 3-41 5l-57 1c-7 0-24-1-49-3-14-2-24-2-28-3z" />
-<glyph unicode="&#x46;" d="M110 78c0-16-6-28-16-39-11-11-24-16-39-16-15 0-28 5-39 16-11 11-16 23-16 39 0 15 5 28 16 39 11 10 24 16 39 16 15 0 28-6 39-16 10-11 16-24 16-39zM110 224c0-15-6-28-16-39-11-11-24-16-39-16-15 0-28 5-39 16-11 11-16 24-16 39 0 15 5 28 16 39 11 11 24 16 39 16 15 0 28-5 39-16 10-11 16-24 16-39zM512 105v-55c0-2-1-4-3-6s-4-3-6-3h-348c-2 0-4 1-6 3s-3 4-3 6v55c0 3 1 5 3 7 2 1 4 2 6 2h348c2 0 4-1 6-2 2-2 3-4 3-7zM110 370c0-15-6-28-16-39-11-10-24-16-39-16-15 0-28 6-39 16-11 11-16 24-16 39 0 16 5 28 16 39 11 11 24 16 39 16 15 0 28-5 39-16 10-11 16-23 16-39zM512 251v-54c0-3-1-5-3-7s-4-3-6-3h-348c-2 0-4 1-6 3s-3 4-3 7v54c0 3 1 5 3 7s4 3 6 3h348c2 0 4-1 6-3s3-4 3-7zM512 398v-55c0-3-1-5-3-7-2-1-4-2-6-2h-348c-2 0-4 1-6 2-2 2-3 4-3 7v55c0 2 1 4 3 6s4 3 6 3h348c2 0 4-1 6-3s3-4 3-6z" />
-<glyph unicode="&#x47;" d="M109 17c0-15-5-27-16-36-10-9-23-13-38-13-21 0-37 6-50 19l17 25c9-9 19-13 30-13 6 0 10 2 14 4 5 3 7 7 7 12 0 13-10 18-30 16l-8 16c2 2 5 6 9 13 5 6 9 11 13 15 3 4 7 8 10 11v1c-3 0-8-1-14-1s-11 0-14 0v-15h-30v43h95v-25l-27-33c10-2 18-7 23-14 6-7 9-15 9-25zM109 196v-45h-103c-1 7-2 12-2 15 0 10 3 19 7 27 4 8 10 14 16 19 6 5 13 10 19 14 6 4 12 8 16 12 5 4 7 9 7 13 0 5-2 9-4 11-3 3-7 4-12 4-8 0-16-6-23-17l-24 17c5 10 11 18 20 23s20 8 31 8c13 0 25-4 35-12 9-8 14-18 14-32 0-9-3-18-10-26-6-8-13-14-21-18-8-5-15-10-22-15-6-5-10-10-10-15h36v17zM512 105v-55c0-2-1-4-3-6s-4-3-6-3h-348c-2 0-4 1-6 3s-3 4-3 6v55c0 3 1 5 3 7 2 1 4 2 6 2h348c2 0 4-1 6-2 2-2 3-4 3-7zM110 362v-28h-96v28h31c0 8 0 19 0 35 0 15 0 27 0 34v4h-1c-1-3-6-9-14-16l-20 22 39 36h30v-115zM512 251v-54c0-3-1-5-3-7s-4-3-6-3h-348c-2 0-4 1-6 3s-3 4-3 7v54c0 3 1 5 3 7s4 3 6 3h348c2 0 4-1 6-3s3-4 3-7zM512 398v-55c0-3-1-5-3-7-2-1-4-2-6-2h-348c-2 0-4 1-6 2-2 2-3 4-3 7v55c0 2 1 4 3 6s4 3 6 3h348c2 0 4-1 6-3s3-4 3-6z" />
-<glyph unicode="&#x48;" d="M475 224c0-30-5-58-17-85s-27-51-47-70c-19-20-43-35-70-47-27-12-55-17-85-17-33 0-64 6-93 20-30 14-55 34-76 59-1 2-2 4-2 6 0 3 1 4 3 6l39 39c2 2 4 3 7 3s5-2 7-3c13-19 31-33 51-42 20-10 41-15 64-15 20 0 39 4 57 11 18 8 33 18 46 32 14 13 24 28 32 46 7 18 11 37 11 57 0 20-4 39-11 57-8 18-18 33-32 46-13 14-28 24-46 32-18 7-37 11-57 11-19 0-37-3-54-10-17-7-32-16-45-29l39-39c6-6 7-13 4-20-4-8-9-11-17-11h-128c-5 0-9 1-13 5s-5 8-5 13v128c0 8 3 13 11 17 7 3 14 2 20-4l37-37c20 19 44 34 70 45 26 10 53 15 81 15 30 0 58-5 85-17 27-12 51-27 70-47 20-19 35-43 47-70 12-27 17-55 17-85z" />
-<glyph unicode="&#x49;" d="M475 407v-128c0-5-1-9-5-13s-8-5-13-5h-128c-8 0-13 3-17 11-3 7-2 14 4 20l40 39c-28 26-62 39-100 39-20 0-39-4-57-11-18-8-33-18-46-32-14-13-24-28-32-46-7-18-11-37-11-57 0-20 4-39 11-57 8-18 18-33 32-46 13-14 28-24 46-32 18-7 37-11 57-11 23 0 44 5 64 15 20 9 38 23 51 42 2 1 4 3 7 3 3 0 5-1 7-3l39-39c2-2 3-3 3-6 0-2-1-4-2-6-21-25-46-45-76-59-29-14-60-20-93-20-30 0-58 5-85 17-27 12-51 27-70 47-20 19-35 43-47 70-12 27-17 55-17 85 0 30 5 58 17 85 12 27 27 51 47 70 19 20 43 35 70 47 27 12 55 17 85 17 28 0 55-5 81-15 26-11 50-26 70-45l37 37c6 6 12 7 20 4 8-4 11-9 11-17z" />
-<glyph unicode="&#x4a;" d="M434 133c0 7-2 14-8 19l-59 59c-5 6-12 8-20 8s-14-3-20-9c0 0 2-2 5-5 3-3 5-5 6-6 1-1 3-3 5-6 2-2 3-4 3-7 1-2 1-5 1-8 0-7-2-14-8-19-5-5-11-8-19-8-3 0-5 0-8 1-2 1-5 2-7 4-3 1-4 3-6 4-1 1-3 3-6 6-3 3-4 5-5 5-6-5-9-12-9-20 0-8 2-15 8-20l58-59c6-5 12-8 20-8 7 0 14 3 19 8l42 41c6 6 8 12 8 20zM233 334c0 8-2 14-8 19l-58 60c-6 5-12 8-20 8-7 0-14-3-19-8l-42-42c-6-5-8-12-8-19 0-8 2-14 8-19l59-60c5-5 12-8 20-8s14 3 20 9c0 1-2 3-5 6-3 3-5 5-6 6-1 1-3 3-5 5-2 3-3 5-3 7-1 3-1 5-1 8 0 8 2 14 8 20 5 5 11 8 19 8 3 0 5-1 8-1 2-1 5-2 7-4 3-2 4-3 6-4 1-1 3-3 6-6 3-3 4-5 5-6 6 6 9 13 9 21zM489 133c0-23-8-43-24-58l-42-42c-16-16-35-24-58-24s-43 8-58 24l-59 60c-16 15-24 35-24 58s8 43 25 59l-25 25c-16-16-36-25-59-25s-43 8-59 24l-59 60c-16 16-24 35-24 58s8 42 24 58l42 42c16 16 35 23 58 23s43-8 58-24l59-59c16-16 24-35 24-58s-8-43-25-60l25-25c16 17 36 25 59 25s43-8 59-24l59-59c16-16 24-36 24-58z" />
-<glyph unicode="&#x4b;" d="M475 224c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z" />
-<glyph unicode="&#x4c;" d="M256 379c-28 0-54-7-78-20-24-14-43-33-57-57-13-24-20-50-20-78 0-28 7-54 20-78 14-24 33-43 57-57 24-13 50-20 78-20 28 0 54 7 78 20 24 14 43 33 57 57 13 24 20 50 20 78 0 28-7 54-20 78-14 24-33 43-57 57-24 13-50 20-78 20zM475 224c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z" />
+<glyph unicode="&#x42;" d="M384 206v36c0 5-2 10-5 13-4 4-8 6-13 6h-73v73c0 5-2 9-6 13-3 3-8 5-13 5h-36c-5 0-10-2-13-5-4-4-6-8-6-13v-73h-73c-5 0-9-2-13-6-3-3-5-8-5-13v-36c0-5 2-10 5-13 4-4 8-6 13-6h73v-73c0-5 2-9 6-13 3-3 8-5 13-5h36c5 0 10 2 13 5 4 4 6 8 6 13v73h73c5 0 9 2 13 6 3 3 5 8 5 13zM475 224c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29s-77 9-110 29c-34 20-60 46-80 80-20 33-29 70-29 110s9 77 29 110c20 34 46 60 80 80 33 20 70 29 110 29s77-9 110-29c34-20 60-46 80-80 20-33 29-70 29-110z" />
+<glyph unicode="&#x43;" d="M215.688 56.188c14.063-5.625 26.25-8.438 37.5-8.438 23.438 0 43.125 3.75 58.125 11.25s26.25 17.813 32.813 30c6.563 13.125 10.313 29.063 10.313 48.75 0 20.625-3.75 36.563-11.25 47.813-10.313 16.875-22.5 28.125-37.5 33.75-14.063 6.563-36.563 9.375-66.563 9.375-13.125 0-21.563-0.938-27.188-2.813v-85.313l0.938-72.188c0-2.813 0.938-6.563 2.813-12.188zM211.938 256.813c8.438-1.875 17.813-1.875 30-1.875 30.938 0 54.375 5.625 70.313 16.875 15.938 12.188 23.438 31.875 23.438 60 0 19.688-7.5 36.563-22.5 50.625-15 13.125-37.5 19.688-68.438 19.688-9.375 0-20.625-0.938-34.688-3.75 0-7.5 0-14.063 0.938-20.625 0.938-21.563 1.875-46.875 0.938-74.063v-26.25c0-8.438 0-15 0-20.625zM67.563 18.688v24.375c8.438 1.875 14.063 2.813 18.75 3.75 14.063 1.875 24.375 4.688 32.813 8.438 2.813 4.688 4.688 9.375 5.625 13.125 1.875 12.188 2.813 29.063 2.813 52.5l-0.938 133.125c-0.938 45-1.875 81.563-2.813 107.813 0 15.938-0.938 25.313-2.813 29.063 0 0.938-0.938 1.875-2.813 3.75-3.75 1.875-9.375 2.813-18.75 3.75-5.625 0-15 1.875-30 3.75l-1.875 21.563 70.313 1.875 101.25 3.75h12.188c0.938 0 1.875 0 3.75 0s2.813 0 3.75 0c0 0 1.875 0 5.625 0s7.5 0 11.25 0h19.688c15.938 0 32.813-1.875 51.563-7.5 7.5-1.875 15.938-5.625 25.313-10.313 10.313-4.688 19.688-11.25 27.188-19.688 8.438-8.438 14.063-17.813 17.813-28.125s5.625-21.563 5.625-32.813c0-12.188-2.813-24.375-8.438-34.688-6.563-10.313-15-19.688-26.25-28.125-4.688-2.813-17.813-10.313-39.375-20.625 30.938-6.563 55.313-19.688 71.25-38.438s24.375-40.313 24.375-63.75c0-13.125-2.813-28.125-7.5-43.125-3.75-11.25-10.313-21.563-18.75-30.938-12.188-13.125-24.375-22.5-37.5-29.063s-31.875-12.188-54.375-15.938c-15-2.813-32.813-3.75-53.438-2.813l-52.5 0.938c-15 0-42.188-0.938-79.688-2.813-6.563-0.938-30.938-1.875-73.125-2.813z" />
+<glyph unicode="&#x44;" d="M187.468 57.21c-66.055 18.99-255.139 102.386-40.459 378.168 115.597-78.441 160.184-147.799 168.44-204.772-55.322-19.817-93.303-58.625-88.349-128.808-30.551 71.836-54.496 171.744-64.404 233.671-4.954-72.661 5.78-201.469 24.77-278.259zM260.954 39.87c-15.689 43.762-48.716 188.258 198.992 180.827 7.432-227.066-113.12-218.808-166.79-203.12 22.293 43.762 51.192 83.395 87.524 116.423-44.588-24.77-85.046-56.147-119.726-94.129z" />
+<glyph unicode="&#x45;" d="M119.125 18.688l4.688 22.5c0 0.938 7.5 2.813 20.625 5.625 13.125 3.75 23.438 6.563 30.938 10.313 4.688 6.563 8.438 15.938 10.313 27.188l7.5 37.5 18.75 89.063c0.938 7.5 2.813 15 3.75 22.5 1.875 7.5 3.75 13.125 4.688 17.813s2.813 8.438 3.75 12.188c0.938 3.75 0.938 6.563 1.875 8.438s0.938 2.813 0.938 2.813l7.5 42.188 4.688 16.875 5.625 36.563 2.813 13.125v10.313c-7.5 3.75-20.625 6.563-39.375 7.5-4.688 0-8.438 0.938-9.375 0.938l4.688 27.188 85.313-3.75c6.563 0 13.125 0 18.75 0 12.188 0 30.938 0.938 58.125 1.875 5.625 0.938 11.25 0.938 17.813 1.875 6.563 0 9.375 0 9.375 0 0-2.813-0.938-6.563-0.938-9.375-1.875-5.625-2.813-10.313-3.75-14.063-10.313-3.75-19.688-6.563-29.063-8.438-11.25-2.813-20.625-5.625-27.188-8.438-1.875-5.625-4.688-13.125-6.563-23.438-1.875-7.5-2.813-15-3.75-21.563-7.5-35.625-13.125-62.813-17.813-82.5l-15.938-83.438-10.313-42.188-11.25-62.813-3.75-12.188c0-0.938 0-3.75 0.938-6.563 11.25-2.813 21.563-4.688 31.875-5.625 6.563-0.938 12.188-1.875 17.813-2.813-0.938-5.625-0.938-10.313-1.875-15.938-1.875-5.625-2.813-9.375-2.813-11.25-2.813 0-5.625 0-6.563 0-3.75 0-7.5 0-11.25 0-0.938 0-3.75 0-7.5 0-2.813 0.938-15.938 2.813-38.438 4.688l-53.438 0.938c-6.563 0-22.5-0.938-45.938-2.813-13.125-1.875-22.5-1.875-26.25-2.813z" />
+<glyph unicode="&#x46;" d="M135.7 103.7c0-13.183-4.944-23.072-13.183-32.135-9.064-9.064-19.776-13.183-32.135-13.183s-23.072 4.12-32.135 13.183c-9.064 9.064-13.184 18.952-13.184 32.135 0 12.36 4.12 23.072 13.184 32.135 9.063 8.24 19.776 13.183 32.135 13.183s23.072-4.944 32.135-13.183c8.239-9.064 13.184-19.776 13.184-32.135zM135.7 224c0-12.36-4.944-23.072-13.183-32.135-9.064-9.064-19.776-13.183-32.135-13.183s-23.072 4.12-32.135 13.183c-9.064 9.064-13.184 19.776-13.184 32.135s4.12 23.072 13.184 32.135c9.063 9.063 19.776 13.183 32.135 13.183s23.072-4.12 32.135-13.183c8.239-9.064 13.184-19.775 13.184-32.135zM466.938 125.947v-45.318c0-1.648-0.824-3.296-2.471-4.944s-3.296-2.471-4.944-2.471h-286.743c-1.648 0-3.296 0.824-4.944 2.471s-2.471 3.296-2.471 4.944v45.319c0 2.471 0.824 4.12 2.471 5.768 1.648 0.824 3.296 1.648 4.944 1.648h286.743c1.648 0 3.296-0.824 4.944-1.648 1.648-1.648 2.471-3.296 2.471-5.768zM135.7 344.3c0-12.359-4.944-23.072-13.183-32.135-9.064-8.239-19.776-13.184-32.135-13.184s-23.072 4.944-32.135 13.184c-9.064 9.064-13.184 19.776-13.184 32.135 0 13.183 4.12 23.072 13.184 32.135s19.776 13.183 32.135 13.183c12.359 0 23.072-4.12 32.135-13.183 8.239-9.064 13.184-18.952 13.184-32.135zM466.938 246.248v-44.495c0-2.471-0.824-4.12-2.471-5.768s-3.296-2.471-4.944-2.471h-286.743c-1.648 0-3.296 0.824-4.944 2.471s-2.471 3.296-2.471 5.768v44.495c0 2.471 0.824 4.12 2.471 5.768s3.296 2.471 4.944 2.471h286.743c1.648 0 3.296-0.824 4.944-2.471s2.471-3.296 2.471-5.768zM466.938 367.371v-45.319c0-2.471-0.824-4.12-2.471-5.768-1.648-0.824-3.296-1.648-4.944-1.648h-286.743c-1.648 0-3.296 0.824-4.944 1.648-1.648 1.648-2.471 3.296-2.471 5.768v45.318c0 1.648 0.824 3.296 2.471 4.944s3.296 2.472 4.944 2.472h286.743c1.648 0 3.296-0.824 4.944-2.472s2.471-3.296 2.471-4.944z" />
+<glyph unicode="&#x47;" d="M142.446 64.098c0-11.587-3.863-20.857-12.359-27.809-7.725-6.952-17.767-10.043-29.354-10.043-16.222 0-28.581 4.635-38.624 14.677l13.132 19.312c6.952-6.952 14.677-10.043 23.174-10.043 4.635 0 7.725 1.545 10.814 3.090 3.862 2.317 5.407 5.408 5.407 9.27 0 10.043-7.725 13.904-23.174 12.36l-6.18 12.36c1.545 1.545 3.862 4.635 6.952 10.043 3.862 4.635 6.952 8.497 10.043 11.587 2.317 3.090 5.407 6.18 7.725 8.498v0.772c-2.317 0-6.18-0.772-10.814-0.772s-8.497 0-10.814 0v-11.587h-23.174v33.216h73.385v-19.312l-20.857-25.492c7.725-1.545 13.905-5.408 17.767-10.815 4.635-5.408 6.952-11.587 6.952-19.312zM142.446 202.37v-34.762h-79.565c-0.773 5.408-1.545 9.27-1.545 11.587 0 7.724 2.317 14.677 5.407 20.857s7.725 10.815 12.359 14.677c4.635 3.863 10.043 7.724 14.677 10.815s9.27 6.18 12.359 9.27c3.862 3.090 5.407 6.952 5.407 10.042 0 3.863-1.545 6.952-3.090 8.497-2.317 2.317-5.407 3.090-9.27 3.090-6.18 0-12.359-4.635-17.767-13.132l-18.54 13.132c3.862 7.724 8.497 13.904 15.45 17.767s15.45 6.18 23.947 6.18c10.043 0 19.311-3.090 27.036-9.27 6.952-6.18 10.815-13.905 10.815-24.719 0-6.952-2.317-13.905-7.725-20.084-4.635-6.18-10.043-10.815-16.222-13.904-6.18-3.863-11.587-7.724-16.995-11.587-4.635-3.863-7.725-7.724-7.725-11.587h27.809v13.132zM453.754 132.075v-42.486c0-1.545-0.772-3.090-2.317-4.635s-3.090-2.317-4.635-2.317h-268.822c-1.545 0-3.090 0.772-4.635 2.317s-2.317 3.090-2.317 4.635v42.486c0 2.317 0.773 3.863 2.317 5.408 1.545 0.772 3.090 1.545 4.635 1.545h268.822c1.545 0 3.090-0.772 4.635-1.545 1.545-1.545 2.317-3.090 2.317-5.408zM143.219 330.601v-21.63h-74.157v21.63h23.947c0 6.18 0 14.677 0 27.036 0 11.587 0 20.857 0 26.264v3.090h-0.772c-0.772-2.317-4.635-6.952-10.814-12.36l-15.45 16.995 30.127 27.809h23.174v-88.835zM453.754 244.857v-41.713c0-2.317-0.772-3.863-2.317-5.408s-3.090-2.317-4.635-2.317h-268.822c-1.545 0-3.090 0.772-4.635 2.317s-2.317 3.090-2.317 5.408v41.714c0 2.317 0.773 3.863 2.317 5.407s3.090 2.317 4.635 2.317h268.822c1.545 0 3.090-0.773 4.635-2.317s2.317-3.090 2.317-5.407zM453.754 358.411v-42.487c0-2.317-0.772-3.862-2.317-5.407-1.545-0.772-3.090-1.545-4.635-1.545h-268.822c-1.545 0-3.090 0.773-4.635 1.545-1.545 1.545-2.317 3.090-2.317 5.407v42.486c0 1.545 0.773 3.090 2.317 4.635s3.090 2.317 4.635 2.317h268.822c1.545 0 3.090-0.772 4.635-2.317s2.317-3.090 2.317-4.635z" />
+<glyph unicode="&#x48;" d="M461.313 224c0-28.125-4.688-54.375-15.938-79.688s-25.313-47.813-44.063-65.625c-17.813-18.75-40.313-32.813-65.625-44.063s-51.563-15.938-79.688-15.938c-30.938 0-60 5.625-87.188 18.75-28.125 13.125-51.563 31.875-71.25 55.313-0.938 1.875-1.875 3.75-1.875 5.625 0 2.813 0.938 3.75 2.813 5.625l36.563 36.563c1.875 1.875 3.75 2.813 6.563 2.813s4.688-1.875 6.563-2.813c12.188-17.813 29.063-30.938 47.813-39.375 18.75-9.375 38.438-14.063 60-14.063 18.75 0 36.563 3.75 53.438 10.313 16.875 7.5 30.938 16.875 43.125 30 13.125 12.188 22.5 26.25 30 43.125 6.563 16.875 10.313 34.688 10.313 53.438s-3.75 36.563-10.313 53.438c-7.5 16.875-16.875 30.938-30 43.125-12.188 13.125-26.25 22.5-43.125 30-16.875 6.563-34.688 10.313-53.438 10.313-17.813 0-34.688-2.813-50.625-9.375s-30-15-42.188-27.188l36.563-36.563c5.625-5.625 6.563-12.188 3.75-18.75-3.75-7.5-8.438-10.313-15.938-10.313h-120c-4.688 0-8.438 0.938-12.188 4.688s-4.688 7.5-4.688 12.188v120c0 7.5 2.813 12.188 10.313 15.938 6.563 2.813 13.125 1.875 18.75-3.75l34.688-34.688c18.75 17.813 41.25 31.875 65.625 42.188 24.375 9.375 49.688 14.063 75.938 14.063 28.125 0 54.375-4.688 79.688-15.938s47.813-25.313 65.625-44.063c18.75-17.813 32.813-40.313 44.063-65.625s15.938-51.563 15.938-79.688z" />
+<glyph unicode="&#x49;" d="M461.313 395.563v-120c0-4.688-0.938-8.438-4.688-12.188s-7.5-4.688-12.188-4.688h-120c-7.5 0-12.188 2.813-15.938 10.313-2.813 6.563-1.875 13.125 3.75 18.75l37.5 36.563c-26.25 24.375-58.125 36.563-93.75 36.563-18.75 0-36.563-3.75-53.438-10.313-16.875-7.5-30.938-16.875-43.125-30-13.125-12.188-22.5-26.25-30-43.125-6.563-16.875-10.313-34.688-10.313-53.438s3.75-36.563 10.313-53.438c7.5-16.875 16.875-30.938 30-43.125 12.188-13.125 26.25-22.5 43.125-30 16.875-6.563 34.688-10.313 53.438-10.313 21.563 0 41.25 4.688 60 14.063 18.75 8.438 35.625 21.563 47.813 39.375 1.875 0.938 3.75 2.813 6.563 2.813s4.688-0.938 6.563-2.813l36.563-36.563c1.875-1.875 2.813-2.813 2.813-5.625 0-1.875-0.938-3.75-1.875-5.625-19.688-23.438-43.125-42.188-71.25-55.313-27.188-13.125-56.25-18.75-87.188-18.75-28.125 0-54.375 4.688-79.688 15.938s-47.813 25.313-65.625 44.063c-18.75 17.813-32.813 40.313-44.063 65.625s-15.938 51.563-15.938 79.688c0 28.125 4.688 54.375 15.938 79.688s25.313 47.813 44.063 65.625c17.813 18.75 40.313 32.813 65.625 44.063s51.563 15.938 79.688 15.938c26.25 0 51.563-4.688 75.938-14.063 24.375-10.313 46.875-24.375 65.625-42.188l34.688 34.688c5.625 5.625 11.25 6.563 18.75 3.75 7.5-3.75 10.313-8.438 10.313-15.938z" />
+<glyph unicode="&#x4a;" d="M412.445 128.019c0 6.152-1.758 12.305-7.031 16.699l-51.856 51.856c-4.394 5.274-10.547 7.031-17.578 7.031s-12.305-2.637-17.578-7.91c0 0 1.758-1.758 4.394-4.394s4.394-4.394 5.274-5.274c0.879-0.879 2.637-2.637 4.394-5.274 1.758-1.758 2.637-3.515 2.637-6.152 0.879-1.758 0.879-4.394 0.879-7.031 0-6.152-1.758-12.305-7.031-16.699-4.394-4.394-9.668-7.031-16.699-7.031-2.637 0-4.394 0-7.031 0.879-1.758 0.879-4.394 1.758-6.152 3.515-2.637 0.879-3.515 2.637-5.274 3.515-0.879 0.879-2.637 2.637-5.274 5.274s-3.515 4.394-4.394 4.394c-5.274-4.394-7.91-10.547-7.91-17.578s1.758-13.183 7.031-17.578l50.976-51.856c5.274-4.394 10.547-7.031 17.578-7.031 6.152 0 12.305 2.637 16.699 7.031l36.914 36.035c5.274 5.274 7.031 10.547 7.031 17.578zM235.785 304.679c0 7.032-1.758 12.305-7.031 16.699l-50.977 52.734c-5.274 4.394-10.547 7.031-17.578 7.031-6.153 0-12.304-2.637-16.699-7.031l-36.914-36.914c-5.273-4.394-7.031-10.547-7.031-16.699 0-7.031 1.758-12.304 7.031-16.699l51.855-52.734c4.394-4.394 10.547-7.031 17.578-7.031s12.304 2.637 17.578 7.91c0 0.879-1.758 2.637-4.394 5.274s-4.394 4.394-5.274 5.274c-0.879 0.879-2.637 2.637-4.394 4.394-1.758 2.637-2.637 4.394-2.637 6.152-0.879 2.637-0.879 4.394-0.879 7.032 0 7.031 1.758 12.304 7.031 17.578 4.394 4.394 9.668 7.031 16.699 7.031 2.637 0 4.394-0.879 7.031-0.879 1.758-0.879 4.394-1.758 6.153-3.516 2.637-1.758 3.516-2.637 5.274-3.516 0.879-0.879 2.637-2.636 5.274-5.274s3.516-4.394 4.394-5.274c5.274 5.274 7.91 11.426 7.91 18.457zM460.785 128.019c0-20.215-7.031-37.793-21.094-50.976l-36.914-36.914c-14.063-14.063-30.762-21.094-50.976-21.094s-37.793 7.031-50.976 21.094l-51.856 52.735c-14.063 13.183-21.094 30.762-21.094 50.976s7.031 37.793 21.972 51.856l-21.972 21.973c-14.063-14.063-31.641-21.973-51.856-21.973s-37.793 7.031-51.856 21.094l-51.856 52.734c-14.063 14.063-21.094 30.762-21.094 50.977s7.032 36.914 21.094 50.976l36.914 36.914c14.063 14.063 30.761 20.215 50.977 20.215s37.793-7.031 50.977-21.094l51.856-51.856c14.063-14.063 21.094-30.762 21.094-50.976s-7.031-37.793-21.973-52.734l21.973-21.972c14.063 14.941 31.64 21.972 51.856 21.972s37.793-7.031 51.856-21.094l51.856-51.855c14.063-14.063 21.094-31.64 21.094-50.976z" />
+<glyph unicode="&#x4b;" d="M475 224c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29s-77 9-110 29c-34 20-60 46-80 80-20 33-29 70-29 110s9 77 29 110c20 34 46 60 80 80 33 20 70 29 110 29s77-9 110-29c34-20 60-46 80-80 20-33 29-70 29-110z" />
+<glyph unicode="&#x4c;" d="M256 379c-28 0-54-7-78-20-24-14-43-33-57-57-13-24-20-50-20-78s7-54 20-78c14-24 33-43 57-57 24-13 50-20 78-20s54 7 78 20c24 14 43 33 57 57 13 24 20 50 20 78s-7 54-20 78c-14 24-33 43-57 57-24 13-50 20-78 20zM475 224c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29s-77 9-110 29c-34 20-60 46-80 80-20 33-29 70-29 110s9 77 29 110c20 34 46 60 80 80 33 20 70 29 110 29s77-9 110-29c34-20 60-46 80-80 20-33 29-70 29-110z" />
 <glyph unicode="&#x4d;" d="M479 133c0-11-4-19-11-26l-21-22c-8-7-16-10-26-10-11 0-19 3-26 10l-139 139-139-139c-7-7-15-10-26-10-10 0-18 3-25 10l-22 22c-7 7-11 15-11 26 0 10 4 18 11 26l186 186c7 7 16 10 26 10s19-3 26-10l186-186c7-8 11-16 11-26z" />
 <glyph unicode="&#x4e;" d="M479 279c0-10-4-19-11-26l-186-186c-7-7-16-11-26-11s-19 4-26 11l-186 186c-7 7-11 16-11 26s4 19 11 26l21 21c8 7 17 11 26 11 11 0 19-4 26-11l139-139 139 139c7 7 15 11 26 11 9 0 18-4 26-11l21-21c7-8 11-16 11-26z" />
-<glyph unicode="&#x4f;" d="M158 224c-29-1-52-12-71-34h-35c-15 0-27 3-37 11-10 7-15 17-15 31 0 63 11 94 33 94 1 0 5-1 12-5 6-4 15-8 26-12 10-3 21-5 31-5 12 0 24 2 36 6-1-7-1-13-1-18 0-24 7-47 21-68zM444 54c0-21-7-38-20-50-13-13-30-19-51-19h-234c-21 0-38 6-51 19-13 12-20 29-20 50 0 10 1 19 1 28 1 9 2 18 4 29 2 10 4 20 7 29 3 9 7 17 11 26 5 8 11 15 17 21 6 6 14 11 23 15 9 3 19 5 30 5 1 0 5-2 11-6 6-4 12-8 19-13 8-4 17-9 29-12 12-4 24-6 36-6 12 0 24 2 36 6 12 3 21 8 29 12 7 5 13 9 19 13 6 4 10 6 11 6 11 0 21-2 30-5 9-4 17-9 23-15 6-6 12-13 17-21 4-9 8-17 11-26 3-9 5-19 7-29 2-11 3-20 4-29 0-9 1-18 1-28zM171 395c0-19-7-35-20-49-14-13-30-20-49-20-18 0-35 7-48 20-13 14-20 30-20 49 0 19 7 35 20 48 13 13 30 20 48 20 19 0 35-7 49-20 13-13 20-29 20-48zM358 292c0-28-10-52-30-72s-44-30-72-30c-28 0-52 10-72 30-20 20-30 44-30 72 0 29 10 53 30 73 20 20 44 30 72 30 28 0 52-10 72-30 20-20 30-44 30-73zM512 232c0-14-5-24-15-31-10-8-22-11-37-11h-35c-19 22-42 33-71 34 14 21 21 44 21 68 0 5 0 11-1 18 12-4 24-6 36-6 10 0 21 2 31 5 11 4 20 8 26 12 7 4 11 5 12 5 22 0 33-31 33-94zM478 395c0-19-7-35-20-49-13-13-30-20-48-20-19 0-35 7-49 20-13 14-20 30-20 49 0 19 7 35 20 48 14 13 30 20 49 20 18 0 35-7 48-20 13-13 20-29 20-48z" />
-<glyph unicode="&#x50;" d="M375 224c0-7-3-12-9-16l-156-91c-3-2-6-3-9-3s-6 1-9 3-9 9-9 16v182c0 7 3 13 9 16 6 4 12 4 18 0l156-91c6-4 9-9 9-16zM411 224c0 28-7 54-20 78-14 24-33 43-57 57-24 13-50 20-78 20-28 0-54-7-78-20-24-14-43-33-57-57-13-24-20-50-20-78 0-28 7-54 20-78 14-24 33-43 57-57 24-13 50-20 78-20 28 0 54 7 78 20 24 14 43 33 57 57 13 24 20 50 20 78zM475 224c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z" />
-<glyph unicode="&#x51;" d="M238 334c0 15-6 28-16 39-11 10-24 16-39 16-15 0-28-6-39-16-11-11-16-24-16-39 0-8 2-16 5-24-7 4-15 5-23 5-16 0-28-5-39-16-11-10-16-23-16-38 0-16 5-29 16-39 11-11 23-16 39-16 15 0 28 5 39 16 10 10 16 23 16 39 0 8-2 15-6 23 8-3 16-5 24-5 15 0 28 5 39 16 10 11 16 23 16 39zM481 133c0-4-5-10-14-19-9-10-16-14-19-14-2 0-4 1-8 4-4 3-7 6-11 10-3 3-6 7-11 11-4 5-6 7-7 8l-27-28 63-63c5-5 8-12 8-19 0-8-4-16-11-23-8-8-15-11-23-11-8 0-15 2-20 8l-192 191c-33-25-68-37-104-37-31 0-56 10-76 29-19 20-29 45-29 76 0 30 9 60 27 89 18 30 42 53 71 71 29 18 59 27 89 27 31 0 57-9 76-29 20-19 30-45 30-76 0-36-13-70-38-104l102-101 27 27c-1 1-3 3-7 7-5 4-9 8-12 11-3 3-6 7-9 10-3 4-5 7-5 9 0 3 5 9 14 18 9 10 16 14 19 14 2 0 5-1 7-2 1-2 5-6 13-13 7-7 15-15 23-23 8-8 16-16 25-24 8-9 15-16 21-23 5-6 8-10 8-11z" />
+<glyph unicode="&#x4f;" d="M175.25 224c-23.895-0.824-42.846-9.888-58.502-28.015h-28.839c-12.359 0-22.248 2.471-30.487 9.064-8.239 5.768-12.359 14.007-12.359 25.543 0 51.911 9.063 77.454 27.191 77.454 0.824 0 4.12-0.824 9.888-4.12 4.944-3.296 12.359-6.592 21.424-9.888 8.24-2.471 17.303-4.12 25.543-4.12 9.888 0 19.775 1.648 29.663 4.944-0.824-5.768-0.824-10.712-0.824-14.832 0-19.776 5.768-38.726 17.303-56.030zM410.908 83.925c0-17.303-5.768-31.311-16.48-41.199-10.712-10.712-24.719-15.656-42.022-15.656h-192.81c-17.303 0-31.311 4.944-42.023 15.656-10.712 9.888-16.48 23.895-16.48 41.199 0 8.24 0.824 15.656 0.824 23.072 0.824 7.416 1.648 14.832 3.296 23.896 1.648 8.24 3.296 16.48 5.768 23.895s5.768 14.007 9.064 21.423c4.12 6.592 9.064 12.36 14.007 17.303s11.536 9.063 18.952 12.36c7.416 2.471 15.655 4.12 24.719 4.12 0.824 0 4.12-1.648 9.064-4.944s9.888-6.592 15.655-10.712c6.592-3.296 14.007-7.416 23.895-9.888 9.888-3.296 19.775-4.944 29.663-4.944s19.776 1.648 29.663 4.944c9.888 2.471 17.303 6.592 23.895 9.888 5.768 4.12 10.712 7.416 15.656 10.712s8.24 4.944 9.063 4.944c9.064 0 17.303-1.648 24.719-4.12 7.416-3.296 14.007-7.416 18.952-12.36s9.888-10.712 14.007-17.303c3.296-7.416 6.592-14.007 9.063-21.423s4.12-15.656 5.768-23.895c1.648-9.064 2.471-16.48 3.296-23.895 0-7.416 0.824-14.832 0.824-23.072zM185.962 364.899c0-15.655-5.768-28.839-16.48-40.375-11.536-10.712-24.719-16.48-40.375-16.48-14.832 0-28.839 5.768-39.551 16.48-10.712 11.536-16.48 24.719-16.48 40.375s5.768 28.839 16.48 39.551c10.712 10.712 24.719 16.48 39.551 16.48 15.655 0 28.839-5.768 40.375-16.48 10.712-10.712 16.48-23.895 16.48-39.551zM340.046 280.030c0-23.071-8.24-42.846-24.719-59.326s-36.255-24.719-59.327-24.719c-23.072 0-42.846 8.24-59.327 24.719s-24.719 36.255-24.719 59.327c0 23.896 8.239 43.671 24.719 60.15s36.255 24.719 59.327 24.719c23.072 0 42.846-8.239 59.327-24.719s24.719-36.255 24.719-60.15zM466.938 230.591c0-11.536-4.12-19.776-12.36-25.543-8.24-6.592-18.127-9.064-30.487-9.064h-28.839c-15.656 18.127-34.607 27.192-58.502 28.015 11.536 17.303 17.303 36.255 17.303 56.030 0 4.12 0 9.063-0.824 14.832 9.888-3.296 19.776-4.944 29.663-4.944 8.24 0 17.303 1.648 25.543 4.12 9.064 3.296 16.48 6.592 21.423 9.888 5.768 3.296 9.064 4.12 9.888 4.12 18.127 0 27.192-25.543 27.192-77.453zM438.922 364.899c0-15.655-5.768-28.839-16.48-40.375-10.712-10.712-24.719-16.48-39.551-16.48-15.656 0-28.839 5.768-40.375 16.48-10.712 11.536-16.479 24.719-16.479 40.375s5.768 28.839 16.48 39.551c11.536 10.712 24.719 16.48 40.375 16.48 14.832 0 28.839-5.768 39.551-16.48s16.479-23.895 16.479-39.551z" />
+<glyph unicode="&#x50;" d="M375 224c0-7-3-12-9-16l-156-91c-3-2-6-3-9-3s-6 1-9 3-9 9-9 16v182c0 7 3 13 9 16 6 4 12 4 18 0l156-91c6-4 9-9 9-16zM411 224c0 28-7 54-20 78-14 24-33 43-57 57-24 13-50 20-78 20s-54-7-78-20c-24-14-43-33-57-57-13-24-20-50-20-78s7-54 20-78c14-24 33-43 57-57 24-13 50-20 78-20s54 7 78 20c24 14 43 33 57 57 13 24 20 50 20 78zM475 224c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29s-77 9-110 29c-34 20-60 46-80 80-20 33-29 70-29 110s9 77 29 110c20 34 46 60 80 80 33 20 70 29 110 29s77-9 110-29c34-20 60-46 80-80 20-33 29-70 29-110z" />
+<glyph unicode="&#x51;" d="M256.18 320.679c0 13.184-5.274 24.61-14.063 34.278-9.668 8.789-21.094 14.063-34.278 14.063s-24.609-5.274-34.278-14.063c-9.668-9.668-14.063-21.094-14.063-34.278 0-7.031 1.758-14.063 4.394-21.094-6.153 3.515-13.184 4.394-20.215 4.394-14.063 0-24.609-4.394-34.278-14.063-9.668-8.789-14.063-20.215-14.063-33.399 0-14.063 4.394-25.488 14.063-34.278 9.668-9.668 20.215-14.063 34.278-14.063 13.184 0 24.609 4.394 34.278 14.063 8.789 8.789 14.063 20.215 14.063 34.278 0 7.031-1.758 13.183-5.274 20.215 7.031-2.637 14.063-4.394 21.094-4.394 13.184 0 24.609 4.394 34.278 14.063 8.789 9.668 14.062 20.215 14.062 34.277zM469.754 144.019c0-3.515-4.394-8.789-12.305-16.699-7.91-8.789-14.063-12.305-16.699-12.305-1.758 0-3.515 0.879-7.031 3.515s-6.152 5.274-9.668 8.789c-2.637 2.637-5.274 6.152-9.668 9.668-3.515 4.394-5.274 6.152-6.152 7.031l-23.731-24.61 55.371-55.371c4.394-4.394 7.031-10.547 7.031-16.699 0-7.031-3.515-14.063-9.668-20.215-7.031-7.031-13.183-9.668-20.215-9.668s-13.183 1.758-17.578 7.031l-168.75 167.871c-29.004-21.973-59.766-32.519-91.406-32.519-27.246 0-49.219 8.789-66.797 25.488-16.699 17.578-25.489 39.551-25.489 66.797 0 26.367 7.91 52.734 23.73 78.222 15.82 26.367 36.914 46.582 62.403 62.402s51.856 23.731 78.222 23.731c27.246 0 50.097-7.91 66.797-25.488 17.578-16.699 26.367-39.551 26.367-66.797 0-31.64-11.426-61.524-33.399-91.406l89.649-88.769 23.731 23.731c-0.879 0.879-2.637 2.637-6.152 6.152-4.394 3.515-7.91 7.031-10.547 9.668s-5.274 6.152-7.91 8.789c-2.637 3.515-4.394 6.152-4.394 7.91 0 2.637 4.394 7.91 12.305 15.82 7.91 8.789 14.063 12.304 16.699 12.304 1.758 0 4.394-0.879 6.152-1.758 0.879-1.758 4.394-5.274 11.426-11.426 6.152-6.152 13.183-13.183 20.215-20.215s14.063-14.063 21.973-21.094c7.031-7.91 13.183-14.063 18.457-20.215 4.394-5.274 7.031-8.789 7.031-9.668z" />
 <glyph unicode="&#x52;" d="M440 357h-188c-10 12-20 25-23 28-2 6-8 10-14 10h-75c-5 0-9-3-13-6l-25-32h-30c-16 0-28-13-28-28v-248c0-15 12-28 28-28h368c16 0 28 13 28 28v248c0 15-12 28-28 28z" />
-<glyph unicode="&#x53;" d="M435 154v-117h-358v117h-68v-151c0-19 15-35 34-35h426c19 0 34 16 34 35v151zM250 166l-99 118c0 0-15 15 2 15 16 0 55 0 55 0 0 0 0 9 0 24 0 41 0 118 0 149 0 0-2 8 11 8 12 0 68 0 78 0 9 0 8-7 8-7 0-30 0-109 0-149 0-13 0-22 0-22 0 0 32 0 52 0 19 0 5-15 5-15 0 0-84-111-96-122-8-9-16 1-16 1z" />
-<glyph unicode="&#x54;" d="M421 105c0 12-4 23-12 33-9 10-19 15-30 15-10 0-18-3-24-10-5-7-8-16-8-27 0-11 3-20 10-27 7-8 17-11 30-11 9 0 17 2 24 7 7 6 10 12 10 20zM247 69c0-3-1-5-3-7l-91-91c-2-2-4-3-7-3-2 0-4 1-6 3l-92 91c-3 3-3 6-2 10 2 4 5 6 9 6h55v393c0 3 1 5 2 6 2 2 4 3 7 3h55c2 0 5-1 6-3 2-1 3-3 3-6v-393h55c2 0 5-1 6-3 2-2 3-4 3-6zM461 88c0-12-1-23-4-34-2-12-6-23-11-33-6-10-12-19-20-27-7-8-17-14-28-19-11-5-23-7-36-7-12 0-22 2-31 5-5 1-9 3-12 4l11 32c3-1 6-2 9-3 7-2 14-4 21-4 16 0 29 6 39 17 9 11 16 25 19 42h-1c-4-5-10-8-17-11-8-3-16-4-25-4-20 0-36 7-49 20-13 14-19 30-19 50 0 20 7 37 20 51 14 13 31 20 52 20 24 0 43-9 59-27 15-18 23-42 23-72zM453 293v-32h-134v32h47v124c0 1 0 3 0 5 1 2 1 4 1 5v4h-1l-2-3c-2-2-4-5-7-9l-18-16-24 24 55 53h35v-187z" />
-<glyph unicode="&#x55;" d="M218 31c0-35-29-63-64-63s-64 28-64 63c0 36 29 64 64 64 35 0 64-28 64-64zM218 224c0-35-29-64-64-64s-64 29-64 64c0 35 29 64 64 64 35 0 64-29 64-64zM218 417c0-36-29-64-64-64s-64 28-64 64c0 35 29 63 64 63 35 0 64-28 64-63zM422 31c0-35-29-63-64-63s-64 28-64 63c0 36 29 64 64 64 35 0 64-28 64-64zM422 224c0-35-29-64-64-64s-64 29-64 64c0 35 29 64 64 64 35 0 64-29 64-64zM422 417c0-36-29-64-64-64s-64 28-64 64c0 35 29 63 64 63 35 0 64-28 64-63z" />
-<glyph unicode="&#x56;" d="M370 368c0-4-3-8-8-8-4 0-8 4-8 8 0 5 4 8 8 8 5 0 8-3 8-8zM373 292c0 0-11 50-77 37-6 23-5 40 9 55 20 21 52 10 52 10v17c-11 5-22 6-33 6-43 0-67-32-77-54l-119-219 34 6-62-119 43 8 33 93c93 0 213 34 197 160zM413 334l-26 26-21-26zM191 159c0 0 4 1 9 2 5 2 13 3 22 6 5 1 10 3 15 4 5 2 11 4 16 6 6 3 11 5 16 8 6 3 11 7 16 10 1 1 3 2 4 3l3 3c3 3 5 5 7 7s4 5 6 7c1 1 2 2 3 4l1 2 1 1c1 2 2 3 2 4 1 1 2 3 2 4 1 1 1 1 1 2 1 0 1 1 1 2 1 1 1 2 2 3 1 3 2 5 3 8 0 2 1 4 2 7 0 2 1 4 1 6 0 2 1 4 1 6 0 2 1 4 1 6 0 1 0 3 0 4 0 5 1 9 1 9l5-1c0 0-1-3-1-8 0-2-1-3-1-5 0-2 0-4-1-5 0-2 0-4-1-7 0-2-1-4-1-6-1-3-2-5-3-8-1-2-2-5-3-7 0-1-1-3-2-4 0-1 0-1-1-2 0-1 0-1-1-2 0-1-1-2-2-4-1-1-1-2-2-3-1-1-1-2-1-2l-2-2c-1-1-2-3-3-4-2-2-4-5-6-7-2-2-4-4-7-7l-3-3c-2-1-3-1-4-2-6-4-11-8-17-11-5-2-11-5-16-7-6-2-11-4-17-6-5-1-10-3-15-4-9-2-17-4-22-5-5-1-9-2-9-2z" />
-<glyph unicode="&#x57;" d="M421 197v-138c0-5-2-9-6-12-3-4-8-6-13-6h-109v110h-74v-110h-109c-5 0-10 2-13 6-4 3-6 7-6 12v138c0 0 0 0 1 0 0 1 0 1 0 1l164 136 164-136c0 0 1-1 1-1zM484 216l-17-21c-2-2-4-3-6-3h-1c-3 0-5 1-6 2l-198 165-198-165c-2-2-4-2-7-2-2 0-4 1-6 3l-17 21c-2 2-2 4-2 7s1 5 3 6l205 171c6 5 14 8 22 8s16-3 22-8l69-58v56c0 2 1 5 3 6 2 2 4 3 7 3h54c3 0 5-1 7-3 2-1 3-4 3-6v-117l62-52c2-1 3-3 3-6s0-5-2-7z" />
-<glyph unicode="&#x58;" d="M365 109c1-4 1-7-2-10l-100-110c-1-2-4-3-6-3-3 0-5 1-7 3l-101 110c-3 3-3 6-2 10 2 3 5 5 8 5h64v357c0 3 1 5 3 6 2 2 4 3 7 3h54c3 0 5-1 7-3 2-1 3-3 3-6v-357h64c4 0 6-2 8-5z" />
-<glyph unicode="&#x59;" d="M365 339c-2-3-5-5-8-5h-64v-357c0-3-1-5-3-6-2-2-4-3-7-3h-54c-3 0-5 1-7 3-2 1-3 3-3 6v357h-64c-4 0-6 2-8 5-1 4-1 7 2 10l100 110c1 2 4 3 6 3 3 0 5-1 7-3l101-110c3-3 3-6 2-10z" />
+<glyph unicode="&#x53;" d="M403.491 166.322v-96.405h-294.983v96.405h-56.030v-124.421c0-15.656 12.359-28.839 28.016-28.839h351.013c15.656 0 28.015 13.183 28.015 28.839v124.421zM251.056 176.209l-81.573 97.229c0 0-12.359 12.36 1.648 12.36 13.184 0 45.319 0 45.319 0s0 7.415 0 19.775c0 33.783 0 97.229 0 122.772 0 0-1.648 6.592 9.064 6.592 9.888 0 56.030 0 64.27 0 7.416 0 6.592-5.768 6.592-5.768 0-24.719 0-89.813 0-122.772 0-10.712 0-18.127 0-18.127s26.367 0 42.846 0c15.656 0 4.12-12.36 4.12-12.36s-69.214-91.461-79.101-100.525c-6.592-7.416-13.184 0.824-13.184 0.824z" />
+<glyph unicode="&#x54;" d="M383.459 132.075c0 9.27-3.090 17.767-9.27 25.492-6.952 7.724-14.677 11.587-23.174 11.587-7.724 0-13.904-2.317-18.539-7.724-3.863-5.408-6.18-12.36-6.18-20.857s2.317-15.45 7.724-20.857c5.408-6.18 13.132-8.498 23.174-8.498 6.952 0 13.132 1.545 18.539 5.408 5.408 4.635 7.724 9.27 7.724 15.45zM249.048 104.267c0-2.317-0.773-3.863-2.317-5.408l-70.295-70.295c-1.545-1.545-3.090-2.317-5.407-2.317-1.545 0-3.090 0.772-4.635 2.317l-71.068 70.295c-2.317 2.317-2.317 4.635-1.545 7.724 1.545 3.090 3.862 4.635 6.952 4.635h42.486v303.583c0 2.317 0.773 3.863 1.545 4.635 1.545 1.545 3.090 2.317 5.407 2.317h42.487c1.545 0 3.863-0.772 4.635-2.317 1.545-0.772 2.317-2.317 2.317-4.635v-303.583h42.487c1.545 0 3.863-0.772 4.635-2.317 1.545-1.545 2.317-3.090 2.317-4.635zM414.358 118.943c0-9.27-0.772-17.767-3.090-26.264-1.545-9.27-4.635-17.767-8.497-25.492-4.635-7.724-9.27-14.677-15.45-20.857-5.408-6.18-13.132-10.815-21.63-14.677s-17.767-5.408-27.809-5.408c-9.27 0-16.995 1.545-23.947 3.863-3.863 0.772-6.952 2.317-9.27 3.090l8.498 24.719c2.317-0.772 4.635-1.545 6.952-2.317 5.408-1.545 10.815-3.090 16.222-3.090 12.36 0 22.402 4.635 30.127 13.132 6.952 8.497 12.36 19.312 14.677 32.444h-0.772c-3.090-3.863-7.724-6.18-13.132-8.498-6.18-2.317-12.36-3.090-19.312-3.090-15.45 0-27.809 5.408-37.851 15.45-10.043 10.815-14.677 23.174-14.677 38.624s5.408 28.582 15.45 39.396c10.815 10.043 23.947 15.45 40.168 15.45 18.539 0 33.216-6.952 45.576-20.857 11.587-13.904 17.767-32.444 17.767-55.618zM408.178 277.3v-24.719h-103.512v24.719h36.306v95.787c0 0.773 0 2.317 0 3.863 0.772 1.545 0.772 3.090 0.772 3.863v3.090h-0.772l-1.545-2.317c-1.545-1.545-3.090-3.863-5.408-6.952l-13.904-12.36-18.539 18.539 42.486 40.941h27.036v-144.453z" />
+<glyph unicode="&#x55;" d="M224.689 64.973c0-28.839-23.895-51.911-52.734-51.911s-52.734 23.072-52.734 51.911c0 29.663 23.895 52.734 52.734 52.734s52.734-23.072 52.734-52.735zM224.689 224c0-28.839-23.895-52.735-52.734-52.735s-52.734 23.895-52.734 52.735c0 28.839 23.895 52.735 52.734 52.735s52.734-23.896 52.734-52.735zM224.689 383.027c0-29.663-23.895-52.734-52.734-52.734s-52.734 23.072-52.734 52.735c0 28.839 23.895 51.91 52.734 51.91s52.734-23.072 52.734-51.91zM392.78 64.973c0-28.839-23.895-51.911-52.735-51.911s-52.735 23.072-52.735 51.911c0 29.663 23.895 52.734 52.735 52.734s52.735-23.072 52.735-52.735zM392.78 224c0-28.839-23.895-52.735-52.735-52.735s-52.735 23.895-52.735 52.735c0 28.839 23.895 52.735 52.735 52.735s52.735-23.896 52.735-52.735zM392.78 383.027c0-29.663-23.895-52.734-52.735-52.734s-52.735 23.072-52.735 52.735c0 28.839 23.895 51.91 52.735 51.91s52.735-23.072 52.735-51.91z" />
+<glyph unicode="&#x56;" d="M394.353 398.762c0-4.854-3.641-9.709-9.709-9.709-4.854 0-9.709 4.855-9.709 9.709 0 6.069 4.854 9.709 9.709 9.709 6.068 0 9.709-3.641 9.709-9.709zM397.995 306.527c0 0-13.35 60.681-93.45 44.904-7.281 27.913-6.069 48.545 10.923 66.75 24.272 25.486 63.109 12.136 63.109 12.136v20.632c-13.35 6.069-26.7 7.281-40.050 7.281-52.186 0-81.313-38.837-93.45-65.536l-144.422-265.785 41.263 7.281-75.246-144.422 52.186 9.709 40.049 112.868c112.867 0 258.503 41.264 239.085 194.181zM446.539 357.499l-31.555 31.554-25.486-31.554zM177.114 145.114c0 0 4.855 1.214 10.922 2.427 6.069 2.427 15.777 3.641 26.7 7.281 6.069 1.214 12.136 3.641 18.204 4.854 6.069 2.427 13.35 4.854 19.418 7.281 7.281 3.641 13.35 6.068 19.418 9.709 7.281 3.641 13.35 8.495 19.418 12.136 1.214 1.214 3.641 2.427 4.854 3.641l3.641 3.641c3.641 3.641 6.069 6.068 8.495 8.495s4.854 6.068 7.281 8.495c1.214 1.214 2.427 2.427 3.641 4.854l1.214 2.427 1.214 1.214c1.214 2.427 2.427 3.641 2.427 4.855 1.214 1.214 2.427 3.641 2.427 4.855 1.214 1.214 1.214 1.214 1.214 2.427 1.214 0 1.214 1.214 1.214 2.427 1.214 1.214 1.214 2.427 2.427 3.641 1.214 3.641 2.427 6.069 3.641 9.709 0 2.427 1.214 4.855 2.427 8.496 0 2.427 1.214 4.854 1.214 7.281s1.214 4.855 1.214 7.282c0 2.427 1.214 4.854 1.214 7.281 0 1.214 0 3.641 0 4.855 0 6.068 1.214 10.923 1.214 10.923l6.068-1.214c0 0-1.214-3.641-1.214-9.709 0-2.427-1.214-3.641-1.214-6.068s0-4.855-1.214-6.069c0-2.427 0-4.854-1.214-8.495 0-2.427-1.214-4.854-1.214-7.281-1.214-3.641-2.427-6.069-3.641-9.709-1.214-2.427-2.427-6.069-3.641-8.495 0-1.214-1.214-3.641-2.427-4.855 0-1.214 0-1.214-1.214-2.427 0-1.214 0-1.214-1.214-2.427 0-1.214-1.214-2.427-2.427-4.855-1.214-1.214-1.214-2.427-2.427-3.641s-1.214-2.427-1.214-2.427l-2.427-2.427c-1.214-1.214-2.427-3.641-3.641-4.854-2.427-2.427-4.854-6.069-7.281-8.495s-4.854-4.854-8.495-8.495l-3.641-3.641c-2.427-1.214-3.641-1.214-4.854-2.427-7.281-4.854-13.35-9.709-20.632-13.35-6.069-2.427-13.35-6.068-19.418-8.495-7.281-2.427-13.35-4.854-20.632-7.281-6.069-1.214-12.136-3.641-18.204-4.854-10.923-2.427-20.632-4.854-26.7-6.068s-10.923-2.427-10.923-2.427z" />
+<glyph unicode="&#x57;" d="M410.688 198.688v-129.375c0-4.688-1.875-8.438-5.625-11.25-2.813-3.75-7.5-5.625-12.188-5.625h-102.188v103.125h-69.375v-103.125h-102.188c-4.688 0-9.375 1.875-12.188 5.625-3.75 2.813-5.625 6.563-5.625 11.25v129.375c0 0 0 0 0.938 0 0 0.938 0 0.938 0 0.938l153.75 127.5 153.75-127.5c0 0 0.938-0.938 0.938-0.938zM469.75 216.5l-15.938-19.688c-1.875-1.875-3.75-2.813-5.625-2.813h-0.938c-2.813 0-4.688 0.938-5.625 1.875l-185.625 154.688-185.625-154.688c-1.875-1.875-3.75-1.875-6.563-1.875-1.875 0-3.75 0.938-5.625 2.813l-15.938 19.688c-1.875 1.875-1.875 3.75-1.875 6.563s0.938 4.688 2.813 5.625l192.188 160.313c5.625 4.688 13.125 7.5 20.625 7.5s15-2.813 20.625-7.5l64.688-54.375v52.5c0 1.875 0.938 4.688 2.813 5.625 1.875 1.875 3.75 2.813 6.563 2.813h50.625c2.813 0 4.688-0.938 6.563-2.813 1.875-0.938 2.813-3.75 2.813-5.625v-109.688l58.125-48.75c1.875-0.938 2.813-2.813 2.813-5.625s0-4.688-1.875-6.563z" />
+<glyph unicode="&#x58;" d="M351.801 122.926c0.879-3.515 0.879-6.152-1.758-8.789l-87.89-96.68c-0.879-1.758-3.515-2.637-5.274-2.637-2.637 0-4.394 0.879-6.153 2.637l-88.769 96.68c-2.637 2.637-2.637 5.274-1.758 8.789 1.758 2.637 4.394 4.394 7.031 4.394h56.25v313.769c0 2.637 0.879 4.394 2.637 5.274 1.758 1.758 3.516 2.637 6.153 2.637h47.461c2.637 0 4.394-0.879 6.152-2.637 1.758-0.879 2.637-2.637 2.637-5.274v-313.769h56.25c3.515 0 5.274-1.758 7.031-4.394z" />
+<glyph unicode="&#x59;" d="M351.801 325.074c-1.758-2.637-4.394-4.394-7.031-4.394h-56.25v-313.769c0-2.637-0.879-4.394-2.637-5.274-1.758-1.758-3.515-2.637-6.152-2.637h-47.461c-2.637 0-4.394 0.879-6.153 2.637-1.758 0.879-2.637 2.637-2.637 5.274v313.769h-56.25c-3.516 0-5.274 1.758-7.031 4.394-0.879 3.516-0.879 6.152 1.758 8.789l87.891 96.68c0.879 1.758 3.516 2.636 5.274 2.636 2.636 0 4.395-0.879 6.153-2.636l88.769-96.68c2.637-2.637 2.637-5.274 1.758-8.789z" />
 <glyph unicode="&#x5a;" d="M201 270v-165c0-3-1-5-2-6-2-2-4-3-7-3h-18c-3 0-5 1-7 3-2 1-2 3-2 6v165c0 2 0 5 2 6 2 2 4 3 7 3h18c3 0 5-1 7-3 1-1 2-4 2-6zM274 270v-165c0-3-1-5-2-6-2-2-4-3-7-3h-18c-3 0-5 1-7 3-1 1-2 3-2 6v165c0 2 1 5 2 6 2 2 4 3 7 3h18c3 0 5-1 7-3 1-1 2-4 2-6zM347 270v-165c0-3 0-5-2-6-2-2-4-3-7-3h-18c-3 0-5 1-7 3-1 1-2 3-2 6v165c0 2 1 5 2 6 2 2 4 3 7 3h18c3 0 5-1 7-3 2-1 2-4 2-6zM384 63v271h-256v-271c0-4 1-8 2-12 1-3 3-6 4-7 2-2 3-3 3-3h238c0 0 1 1 3 3 1 1 3 4 4 7 1 4 2 8 2 12zM192 370h128l-14 34c-1 1-3 2-5 3h-90c-2-1-4-2-5-3zM457 361v-18c0-3-1-5-2-7-2-1-4-2-7-2h-27v-271c0-16-5-30-14-41-9-12-20-17-32-17h-238c-12 0-23 5-32 16s-14 25-14 41v272h-27c-3 0-5 1-7 2-1 2-2 4-2 7v18c0 3 1 5 2 7 2 1 4 2 7 2h88l20 48c3 7 8 13 16 18 7 5 15 7 22 7h92c7 0 15-2 22-7 8-5 13-11 16-18l20-48h88c3 0 5-1 7-2 1-2 2-4 2-7z" />
-<glyph unicode="&#x61;" d="M239 224c0 19-7 35-20 48-13 14-29 20-48 20-19 0-35-6-49-20-13-13-20-29-20-48 0-19 7-35 20-48 14-14 30-20 49-20 19 0 35 6 48 20 13 13 20 29 20 48zM444 87c0 10-4 18-10 24-7 7-15 11-24 11-10 0-18-4-24-11-7-6-11-14-11-24 0-9 4-17 10-24 7-6 15-10 25-10 9 0 17 4 24 10 6 7 10 15 10 24zM444 361c0 9-4 17-10 24-7 6-15 10-24 10-10 0-18-4-24-10-7-7-11-15-11-24 0-10 4-18 10-25 7-6 15-10 25-10 9 0 17 4 24 10 6 7 10 15 10 25zM341 248v-49c0-2 0-4-2-5-1-2-2-3-4-3l-41-6c-2-7-5-13-9-21 6-8 14-18 24-30 2-2 2-4 2-6 0-2 0-4-2-5-4-5-11-13-22-24-10-10-17-16-21-16-2 0-3 1-5 2l-31 24c-6-3-13-6-20-8-2-19-4-33-7-41-1-5-3-7-8-7h-49c-2 0-4 1-5 2-2 2-3 3-3 5l-6 41c-6 2-13 4-20 8l-32-24c-1-1-3-2-5-2s-4 1-6 3c-25 23-38 37-38 42 0 2 1 4 2 5 2 3 5 8 11 14 5 7 9 13 12 17-4 8-7 15-9 22l-41 6c-1 0-3 1-4 3-1 1-2 3-2 5v49c0 2 1 4 2 5 1 2 3 3 4 3l41 6c2 7 5 13 9 21-6 8-14 18-24 30-1 2-2 4-2 6 0 2 1 4 2 5 4 5 11 13 22 24 11 10 18 16 21 16 2 0 4-1 6-2l30-24c6 3 13 6 21 8 2 19 4 33 6 41 1 5 4 7 8 7h49c2 0 4-1 6-2 1-2 2-3 2-5l7-41c6-2 12-4 20-8l31 24c1 1 3 2 5 2s4-1 6-3c26-23 38-37 38-42 0-2 0-4-1-5-3-3-6-8-12-15-5-6-9-12-12-16 4-8 7-16 9-22l41-6c2 0 3-1 4-3 2-1 2-3 2-5zM512 106v-37c0-3-13-6-40-8-2-5-5-10-8-14 9-20 14-33 14-37 0-1 0-1-1-2-22-13-33-19-33-19-2 0-6 4-13 13-6 8-11 14-13 18-4-1-7-1-8-1-2 0-5 0-8 1-3-4-8-10-14-18-7-9-11-13-13-13 0 0-11 6-33 19 0 1-1 1-1 2 0 4 5 17 14 37-3 4-6 9-8 14-27 2-40 5-40 8v37c0 3 13 6 40 8 2 6 5 10 8 14-9 20-14 33-14 37 0 1 1 1 1 2 1 0 4 2 10 5 5 3 10 6 15 9 5 3 8 5 8 5 2 0 6-5 13-13 6-8 11-14 14-18 3 1 6 1 8 1 1 0 4 0 8-1 9 13 17 23 24 30l2 1c0 0 11-7 33-19 1-1 1-1 1-2 0-4-5-17-14-37 3-4 6-8 8-14 27-2 40-5 40-8zM512 379v-37c0-3-13-6-40-8-2-5-5-10-8-14 9-20 14-33 14-37 0-1 0-1-1-2-22-13-33-19-33-19-2 0-6 4-13 13-6 8-11 14-13 18-4-1-7-1-8-1-2 0-5 0-8 1-3-4-8-10-14-18-7-9-11-13-13-13 0 0-11 6-33 19 0 1-1 1-1 2 0 4 5 17 14 37-3 4-6 9-8 14-27 2-40 5-40 8v37c0 3 13 6 40 8 2 6 5 10 8 14-9 20-14 33-14 37 0 1 1 1 1 2 1 0 4 2 10 5 5 4 10 7 15 9 5 3 8 5 8 5 2 0 6-4 13-13 6-8 11-14 14-18 3 1 6 1 8 1 1 0 4 0 8-1 9 13 17 23 24 30l2 1c0 0 11-7 33-19 1-1 1-1 1-2 0-4-5-17-14-37 3-4 6-8 8-14 27-2 40-5 40-8z" />
-<glyph unicode="&#x62;" d="M439 261v-229c0-8-3-14-8-19-5-6-12-8-20-8h-310c-8 0-15 2-20 8-5 5-8 11-8 19v384c0 8 3 14 8 19 5 6 12 8 20 8h155v-155c0-8 3-14 8-19 5-6 12-8 19-8zM438 297h-145v146c15-3 28-9 37-19l89-89c10-10 16-22 19-38z" />
-<glyph unicode="&#x63;" d="M110 41h292v220h-119c-7 0-14 2-19 8-5 5-8 11-8 19v119h-146zM293 297h107c-2 6-4 10-6 12l-90 89c-2 3-6 5-11 7zM439 288v-256c0-8-3-14-8-19-5-6-12-8-20-8h-310c-8 0-15 2-20 8-5 5-8 11-8 19v384c0 8 3 14 8 19 5 6 12 8 20 8h182c8 0 16-1 26-5 9-4 16-9 21-14l89-89c6-5 10-13 14-22s6-17 6-25z" />
-<glyph unicode="&#x64;" d="M140 41l26 26-67 67-26-26v-30h37v-37zM290 306c0 4-2 7-7 7-1 0-3-1-4-2l-155-155c-2-2-2-3-2-5 0-4 2-6 6-6 2 0 4 0 5 2l155 154c1 2 2 3 2 5zM274 361l119-119-238-237h-118v118zM469 334c0-10-3-19-10-26l-48-47-118 118 47 48c7 7 15 10 26 10 10 0 18-3 26-10l67-67c7-8 10-16 10-26z" />
-<glyph unicode="&#x65;" d="M399 142c0-3-1-5-3-7l-15-14c-1-2-4-3-6-3-3 0-5 1-7 3l-112 112-112-112c-2-2-4-3-7-3-2 0-5 1-6 3l-15 14c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3s5-1 7-3l133-133c2-2 3-4 3-6z" />
-<glyph unicode="&#x66;" d="M347 242c0 36-12 66-37 91s-55 37-91 37c-35 0-65-12-90-37-25-25-38-55-38-91 0-35 13-65 38-90 25-25 55-38 90-38 36 0 66 13 91 38 25 25 37 55 37 90zM494 5c0-10-4-19-11-26s-16-11-26-11c-10 0-19 4-26 11l-98 98c-34-24-72-36-114-36-27 0-53 5-78 16-25 11-46 25-64 43-18 18-32 39-43 64-10 25-16 51-16 78 0 28 6 54 16 78 11 25 25 47 43 65 18 18 39 32 64 43 25 10 51 15 78 15 28 0 54-5 79-15 24-11 46-25 64-43 18-18 32-40 43-65 10-24 16-50 16-78 0-42-12-80-36-114l98-98c7-7 11-15 11-25z" />
-<glyph unicode="&#x67;" d="M426 102c0-7-3-14-8-19l-39-39c-5-5-12-8-20-8-7 0-14 3-19 8l-84 84-84-84c-5-5-12-8-19-8-8 0-15 3-20 8l-39 39c-5 5-8 12-8 19 0 8 3 14 8 20l84 84-84 84c-5 5-8 12-8 19 0 8 3 14 8 20l39 38c5 6 12 8 20 8 7 0 14-2 19-8l84-84 84 84c5 6 12 8 19 8 8 0 15-2 20-8l39-38c5-6 8-12 8-20 0-7-3-14-8-19l-84-84 84-84c5-6 8-12 8-20z" />
+<glyph unicode="&#x61;" d="M239 224c0 19-7 35-20 48-13 14-29 20-48 20s-35-6-49-20c-13-13-20-29-20-48s7-35 20-48c14-14 30-20 49-20s35 6 48 20c13 13 20 29 20 48zM444 87c0 10-4 18-10 24-7 7-15 11-24 11-10 0-18-4-24-11-7-6-11-14-11-24 0-9 4-17 10-24 7-6 15-10 25-10 9 0 17 4 24 10 6 7 10 15 10 24zM444 361c0 9-4 17-10 24-7 6-15 10-24 10-10 0-18-4-24-10-7-7-11-15-11-24 0-10 4-18 10-25 7-6 15-10 25-10 9 0 17 4 24 10 6 7 10 15 10 25zM341 248v-49c0-2 0-4-2-5-1-2-2-3-4-3l-41-6c-2-7-5-13-9-21 6-8 14-18 24-30 2-2 2-4 2-6s0-4-2-5c-4-5-11-13-22-24-10-10-17-16-21-16-2 0-3 1-5 2l-31 24c-6-3-13-6-20-8-2-19-4-33-7-41-1-5-3-7-8-7h-49c-2 0-4 1-5 2-2 2-3 3-3 5l-6 41c-6 2-13 4-20 8l-32-24c-1-1-3-2-5-2s-4 1-6 3c-25 23-38 37-38 42 0 2 1 4 2 5 2 3 5 8 11 14 5 7 9 13 12 17-4 8-7 15-9 22l-41 6c-1 0-3 1-4 3-1 1-2 3-2 5v49c0 2 1 4 2 5 1 2 3 3 4 3l41 6c2 7 5 13 9 21-6 8-14 18-24 30-1 2-2 4-2 6s1 4 2 5c4 5 11 13 22 24 11 10 18 16 21 16 2 0 4-1 6-2l30-24c6 3 13 6 21 8 2 19 4 33 6 41 1 5 4 7 8 7h49c2 0 4-1 6-2 1-2 2-3 2-5l7-41c6-2 12-4 20-8l31 24c1 1 3 2 5 2s4-1 6-3c26-23 38-37 38-42 0-2 0-4-1-5-3-3-6-8-12-15-5-6-9-12-12-16 4-8 7-16 9-22l41-6c2 0 3-1 4-3 2-1 2-3 2-5zM512 106v-37c0-3-13-6-40-8-2-5-5-10-8-14 9-20 14-33 14-37 0-1 0-1-1-2-22-13-33-19-33-19-2 0-6 4-13 13-6 8-11 14-13 18-4-1-7-1-8-1-2 0-5 0-8 1-3-4-8-10-14-18-7-9-11-13-13-13 0 0-11 6-33 19 0 1-1 1-1 2 0 4 5 17 14 37-3 4-6 9-8 14-27 2-40 5-40 8v37c0 3 13 6 40 8 2 6 5 10 8 14-9 20-14 33-14 37 0 1 1 1 1 2 1 0 4 2 10 5 5 3 10 6 15 9s8 5 8 5c2 0 6-5 13-13 6-8 11-14 14-18 3 1 6 1 8 1 1 0 4 0 8-1 9 13 17 23 24 30l2 1c0 0 11-7 33-19 1-1 1-1 1-2 0-4-5-17-14-37 3-4 6-8 8-14 27-2 40-5 40-8zM512 379v-37c0-3-13-6-40-8-2-5-5-10-8-14 9-20 14-33 14-37 0-1 0-1-1-2-22-13-33-19-33-19-2 0-6 4-13 13-6 8-11 14-13 18-4-1-7-1-8-1-2 0-5 0-8 1-3-4-8-10-14-18-7-9-11-13-13-13 0 0-11 6-33 19 0 1-1 1-1 2 0 4 5 17 14 37-3 4-6 9-8 14-27 2-40 5-40 8v37c0 3 13 6 40 8 2 6 5 10 8 14-9 20-14 33-14 37 0 1 1 1 1 2 1 0 4 2 10 5 5 4 10 7 15 9 5 3 8 5 8 5 2 0 6-4 13-13 6-8 11-14 14-18 3 1 6 1 8 1 1 0 4 0 8-1 9 13 17 23 24 30l2 1c0 0 11-7 33-19 1-1 1-1 1-2 0-4-5-17-14-37 3-4 6-8 8-14 27-2 40-5 40-8z" />
+<glyph unicode="&#x62;" d="M451.2 263.466v-244.267c0-8.534-3.2-14.933-8.534-20.267-5.334-6.4-12.8-8.534-21.334-8.534h-330.666c-8.534 0-16 2.134-21.334 8.534-5.334 5.334-8.534 11.733-8.534 20.267v409.6c0 8.534 3.2 14.933 8.534 20.267 5.334 6.4 12.8 8.534 21.334 8.534h165.333v-165.333c0-8.534 3.2-14.934 8.533-20.267 5.334-6.4 12.8-8.534 20.267-8.534zM450.134 301.866h-154.667v155.734c16-3.2 29.866-9.6 39.466-20.267l94.933-94.934c10.666-10.666 17.067-23.466 20.267-40.534z" />
+<glyph unicode="&#x63;" d="M100.266 28.8h311.466v234.666h-126.933c-7.466 0-14.933 2.134-20.267 8.534-5.334 5.334-8.534 11.734-8.534 20.267v126.933h-155.733zM295.466 301.866h114.134c-2.134 6.4-4.267 10.667-6.4 12.8l-96 94.933c-2.134 3.2-6.4 5.333-11.733 7.466zM451.2 292.267v-273.067c0-8.534-3.2-14.933-8.534-20.267-5.334-6.4-12.8-8.534-21.334-8.534h-330.666c-8.534 0-16 2.134-21.334 8.534-5.334 5.334-8.534 11.733-8.534 20.267v409.6c0 8.534 3.2 14.933 8.534 20.267 5.334 6.4 12.8 8.534 21.334 8.534h194.133c8.534 0 17.067-1.067 27.733-5.334 9.6-4.267 17.067-9.6 22.4-14.933l94.933-94.934c6.4-5.333 10.666-13.866 14.933-23.466s6.4-18.133 6.4-26.666z" />
+<glyph unicode="&#x64;" d="M156 41l26 26-67 67-26-26v-30h37v-37zM306 306c0 4-2 7-7 7-1 0-3-1-4-2l-155-155c-2-2-2-3-2-5 0-4 2-6 6-6 2 0 4 0 5 2l155 154c1 2 2 3 2 5zM290 361l119-119-238-237h-118v118zM485 334c0-10-3-19-10-26l-48-47-118 118 47 48c7 7 15 10 26 10 10 0 18-3 26-10l67-67c7-8 10-16 10-26z" />
+<glyph unicode="&#x65;" d="M399 158c0-3-1-5-3-7l-15-14c-1-2-4-3-6-3-3 0-5 1-7 3l-112 112-112-112c-2-2-4-3-7-3-2 0-5 1-6 3l-15 14c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3s5-1 7-3l133-133c2-2 3-4 3-6z" />
+<glyph unicode="&#x66;" d="M341.313 256.875c0 33.75-11.25 61.875-34.688 85.313s-51.563 34.688-85.313 34.688c-32.813 0-60.938-11.25-84.375-34.688s-35.625-51.563-35.625-85.313c0-32.813 12.188-60.938 35.625-84.375s51.563-35.625 84.375-35.625c33.75 0 61.875 12.188 85.313 35.625s34.688 51.563 34.688 84.375zM479.125 34.688c0-9.375-3.75-17.813-10.313-24.375s-15-10.313-24.375-10.313c-9.375 0-17.813 3.75-24.375 10.313l-91.875 91.875c-31.875-22.5-67.5-33.75-106.875-33.75-25.313 0-49.688 4.688-73.125 15s-43.125 23.438-60 40.313c-16.875 16.875-30 36.563-40.313 60-9.375 23.438-15 47.813-15 73.125 0 26.25 5.625 50.625 15 73.125 10.313 23.438 23.438 44.063 40.313 60.938s36.563 30 60 40.313c23.438 9.375 47.813 14.063 73.125 14.063 26.25 0 50.625-4.688 74.063-14.063 22.5-10.313 43.125-23.438 60-40.313s30-37.5 40.313-60.938c9.375-22.5 15-46.875 15-73.125 0-39.375-11.25-75-33.75-106.875l91.875-91.875c6.563-6.563 10.313-14.063 10.313-23.438z" />
+<glyph unicode="&#x67;" d="M426 118c0-7-3-14-8-19l-39-39c-5-5-12-8-20-8-7 0-14 3-19 8l-84 84-84-84c-5-5-12-8-19-8-8 0-15 3-20 8l-39 39c-5 5-8 12-8 19 0 8 3 14 8 20l84 84-84 84c-5 5-8 12-8 19 0 8 3 14 8 20l39 38c5 6 12 8 20 8 7 0 14-2 19-8l84-84 84 84c5 6 12 8 19 8 8 0 15-2 20-8l39-38c5-6 8-12 8-20 0-7-3-14-8-19l-84-84 84-84c5-6 8-12 8-20z" />
 <glyph unicode="&#x68;" d="M366 142v-19c0-2-1-4-3-6s-4-3-6-3h-202c-2 0-4 1-6 3s-3 4-3 6v19c0 2 1 5 3 6 2 2 4 3 6 3h202c2 0 4-1 6-3 2-1 3-4 3-6zM366 215v-18c0-3-1-5-3-7s-4-3-6-3h-202c-2 0-4 1-6 3s-3 4-3 7v18c0 3 1 5 3 6 2 2 4 3 6 3h202c2 0 4-1 6-3 2-1 3-3 3-6zM110 41h292v220h-119c-7 0-14 2-19 8-5 5-8 11-8 19v119h-146zM293 297h107c-2 6-4 10-6 12l-90 89c-2 3-6 5-11 7zM439 288v-256c0-8-3-14-8-19-5-6-12-8-20-8h-310c-8 0-15 2-20 8-5 5-8 11-8 19v384c0 8 3 14 8 19 5 6 12 8 20 8h182c8 0 16-1 26-5 9-4 16-9 21-14l89-89c6-5 10-13 14-22s6-17 6-25z" />
-<glyph unicode="&#x69;" d="M475 215c0 6-5 9-14 9h-290c-7 0-15-2-23-6s-15-8-19-14l-79-97c-3-4-4-7-4-10 0-6 4-10 14-10h290c7 0 15 2 23 6s14 9 19 14l78 97c3 4 5 8 5 11zM171 258h204v43c0 7-2 13-7 18s-11 7-18 7h-154c-7 0-13 3-18 8s-7 11-7 18v17c0 7-3 13-8 18s-11 8-18 8h-85c-7 0-13-3-18-8s-8-11-8-18v-227l68 84c8 9 19 17 31 23 13 6 26 9 38 9zM509 215c0-11-4-22-12-32l-79-97c-8-10-18-17-31-23-13-7-25-10-37-10h-290c-17 0-31 6-42 18-12 12-18 26-18 42v256c0 16 6 30 18 42 11 12 25 18 42 18h85c16 0 30-6 42-18s18-26 18-42v-8h145c16 0 30-6 42-18s18-26 18-42v-43h51c9 0 18-2 26-6 8-5 14-11 18-19 3-6 4-12 4-18z" />
-<glyph unicode="&#x6a;" d="M494 306v-201c0-17-7-32-19-45-13-13-28-19-45-19h-348c-17 0-32 6-45 19-12 13-19 28-19 45v274c0 18 7 33 19 46 13 12 28 18 45 18h92c17 0 32-6 45-18 12-13 19-28 19-46v-9h192c17 0 32-6 45-19 12-12 19-27 19-45z" />
-<glyph unicode="&#x6b;" d="M512 277v-227c0-12-4-23-13-32s-20-13-33-13h-420c-13 0-24 4-33 13s-13 20-13 32v227c8-9 18-17 29-25 69-47 116-79 142-98 11-8 20-15 26-19 7-4 16-9 27-14 12-4 22-7 32-7v0c10 0 20 3 32 7 11 5 20 10 27 14 6 4 15 11 26 19 33 23 80 56 142 98 11 8 21 16 29 25zM512 361c0-15-5-29-14-43s-21-25-35-35c-71-50-116-81-134-93-1-1-6-4-12-9-6-4-11-8-15-11-4-2-9-5-15-9-6-3-11-6-16-8-6-1-10-2-15-2v0c-5 0-9 1-15 2-5 2-10 5-16 8-6 4-11 7-15 9-4 3-9 7-15 11-6 5-11 8-12 9-18 12-43 30-75 52-33 23-52 36-59 41-12 8-23 19-33 33-11 14-16 27-16 39 0 15 4 27 12 37 8 10 19 15 34 15h420c13 0 23-5 32-14s14-19 14-32z" />
-<glyph unicode="&#x6c;" d="M347 389c0-5-1-10-5-13-4-4-8-6-13-6h-36v-292h36c5 0 9-2 13-6 4-3 5-8 5-13 0-5-1-9-5-12l-73-74c-4-3-8-5-13-5s-9 2-13 5l-73 74c-4 3-5 7-5 12s1 10 5 13c4 4 8 6 13 6h36v292h-36c-5 0-9 2-13 6-4 3-5 8-5 13 0 5 1 9 5 12l73 74c4 3 8 5 13 5s9-2 13-5l73-74c4-3 5-7 5-12z" />
-<glyph unicode="&#x6d;" d="M258.003 436.375c-65.452 0-118.702-53.248-118.702-118.702v-67.793c0-0.77-0.951-2.068-1.698-2.317-6.418-2.142-11.632-3.995-16.404-5.836-5.691-2.194-9.983-8.5-9.983-14.67v-155.772c0-6.127 4.265-12.44 9.921-14.682 43.753-17.338 89.802-26.127 136.867-26.127s93.115 8.791 136.868 26.129c5.653 2.241 9.916 8.551 9.916 14.679v155.772c0 6.171-4.293 12.476-9.986 14.673-4.774 1.84-9.988 3.696-16.402 5.836-0.745 0.249-1.695 1.548-1.695 2.317v67.793c-0 65.452-53.249 118.7-118.7 118.7zM225.672 179.613c0 17.868 14.476 32.329 32.328 32.329 17.853 0 32.329-14.459 32.329-32.329 0-11.84-6.678-21.753-16.164-27.373v-53.45c0-8.935-7.23-16.164-16.165-16.164-8.935 0-16.164 7.23-16.164 16.164v53.45c-9.487 5.62-16.164 15.533-16.164 27.373zM335.889 317.676v-58.494c-25.541 5.494-51.745 8.279-77.875 8.282-26.118 0-52.318-2.784-77.898-8.275v58.488c0 42.946 34.938 77.885 77.886 77.885s77.888-34.939 77.888-77.886z" horiz-adv-x="522" />
-<glyph unicode="&#x6e;" d="M335 206c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3s-5 1-7 3l-14 14c-2 2-3 4-3 7 0 2 1 5 3 6l112 113-112 112c-2 2-3 4-3 7 0 2 1 4 3 6l14 14c2 2 5 3 7 3s5-1 7-3l133-133c2-2 3-4 3-6z" />
-<glyph unicode="&#x6f;" d="M171 309c0-14-5-26-15-36s-22-15-37-15c-14 0-26 5-36 15-10 10-15 22-15 36 0 15 5 27 15 37 10 10 22 15 36 15 15 0 27-5 37-15 10-10 15-22 15-37zM444 207v-120h-376v52l86 85 42-43 137 137zM469 395h-426c-3 0-5-1-6-3-2-2-3-4-3-6v-324c0-2 1-4 3-6 1-2 3-3 6-3h426c3 0 5 1 6 3 2 2 3 4 3 6v324c0 2-1 4-3 6-1 2-3 3-6 3zM512 386v-324c0-12-4-22-13-30-8-9-18-13-30-13h-426c-12 0-22 4-30 13-9 8-13 18-13 30v324c0 12 4 22 13 30 8 9 18 13 30 13h426c12 0 22-4 30-13 9-8 13-18 13-30z" />
-<glyph unicode="&#x70;" d="M394.088 242.442c-4.774 1.84-16.738 6.001-16.909 6.139-14.010 3.499-42.005 11.314-42.005 11.314-25.541 5.495-51.745 8.279-77.875 8.282-25.379 0-50.831-2.638-75.721-7.825l-38.922 38.923c-30.368 30.368-30.368 79.778 0 110.146s79.779 30.37 110.148 0.002l40.473-40.471c13.639 3.306 28.887 10.028 38.592 20.812-0.779-0.081-1.837 0.159-2.264 0.582l-47.938 47.938c-46.283 46.279-121.588 46.279-167.869-0.002-46.281-46.281-46.282-121.587 0-167.869l22.375-22.376c-6.089-2.038-11.1-3.825-15.691-5.595-5.691-2.194-9.984-8.5-9.984-14.67v-155.772c0-6.127 4.265-12.44 9.921-14.682 43.753-17.338 89.802-26.127 136.867-26.127s93.115 8.791 136.869 26.129c5.653 2.241 9.916 8.551 9.916 14.679v155.773c0 6.171-4.292 12.476-9.985 14.672zM273.452 152.954v-53.45c0-8.935-7.23-16.164-16.165-16.164-8.935 0-16.164 7.23-16.164 16.164v53.45c-9.487 5.619-16.164 15.532-16.164 27.373 0 17.868 14.476 32.329 32.329 32.329 17.853 0 32.329-14.459 32.329-32.329 0-11.841-6.678-21.753-16.164-27.373z" horiz-adv-x="522" />
+<glyph unicode="&#x69;" d="M448.481 200.090c0 5.274-4.394 7.91-12.305 7.91h-254.883c-6.153 0-13.184-1.758-20.215-5.274s-13.184-7.031-16.699-12.305l-69.433-85.254c-2.636-3.515-3.516-6.152-3.516-8.789 0-5.274 3.516-8.789 12.305-8.789h254.883c6.152 0 13.183 1.758 20.215 5.274s12.305 7.91 16.699 12.305l68.555 85.254c2.637 3.515 4.394 7.031 4.394 9.668zM181.293 237.883h179.297v37.793c0 6.152-1.758 11.426-6.152 15.82s-9.668 6.152-15.82 6.152h-135.351c-6.153 0-11.426 2.637-15.821 7.032s-6.153 9.668-6.153 15.82v14.941c0 6.153-2.637 11.426-7.031 15.821s-9.668 7.031-15.821 7.031h-74.707c-6.153 0-11.426-2.637-15.82-7.031s-7.032-9.668-7.032-15.821v-199.511l59.765 73.828c7.031 7.91 16.699 14.941 27.246 20.215 11.426 5.274 22.851 7.91 33.399 7.91zM478.363 200.090c0-9.668-3.515-19.336-10.547-28.125l-69.433-85.254c-7.031-8.789-15.82-14.942-27.246-20.215-11.426-6.152-21.973-8.789-32.519-8.789h-254.883c-14.942 0-27.246 5.274-36.914 15.82-10.547 10.547-15.82 22.851-15.82 36.914v225c0 14.063 5.274 26.367 15.82 36.914 9.668 10.547 21.972 15.82 36.914 15.82h74.707c14.063 0 26.367-5.273 36.914-15.82s15.821-22.851 15.821-36.914v-7.031h127.441c14.063 0 26.367-5.274 36.914-15.821s15.82-22.851 15.82-36.914v-37.793h44.824c7.91 0 15.82-1.758 22.851-5.274 7.031-4.394 12.305-9.668 15.82-16.699 2.637-5.274 3.515-10.547 3.515-15.82z" />
+<glyph unicode="&#x6a;" d="M479.125 284.875v-188.438c0-15.938-6.563-30-17.813-42.188-12.188-12.188-26.25-17.813-42.188-17.813h-326.25c-15.938 0-30 5.625-42.188 17.813-11.25 12.188-17.813 26.25-17.813 42.188v256.875c0 16.875 6.563 30.938 17.813 43.125 12.188 11.25 26.25 16.875 42.188 16.875h86.25c15.938 0 30-5.625 42.188-16.875 11.25-12.188 17.813-26.25 17.813-43.125v-8.438h180c15.938 0 30-5.625 42.188-17.813 11.25-11.25 17.813-25.313 17.813-42.188z" />
+<glyph unicode="&#x6b;" d="M481 286.582v-199.512c0-10.547-3.515-20.215-11.426-28.125s-17.578-11.426-29.004-11.426h-369.14c-11.426 0-21.094 3.515-29.004 11.426s-11.426 17.578-11.426 28.125v199.512c7.032-7.91 15.82-14.942 25.489-21.972 60.645-41.309 101.953-69.434 124.805-86.133 9.668-7.031 17.578-13.183 22.851-16.699 6.153-3.515 14.063-7.91 23.731-12.305 10.547-3.515 19.336-6.152 28.125-6.152v0c8.789 0 17.578 2.637 28.125 6.152 9.668 4.394 17.578 8.789 23.731 12.305 5.274 3.515 13.183 9.668 22.851 16.699 29.004 20.215 70.313 49.219 124.805 86.133 9.668 7.031 18.457 14.063 25.488 21.973zM481 360.41c0-13.183-4.394-25.488-12.305-37.793s-18.457-21.972-30.762-30.761c-62.403-43.946-101.953-71.192-117.774-81.739-0.879-0.879-5.274-3.515-10.547-7.91-5.274-3.515-9.668-7.031-13.183-9.668-3.515-1.758-7.91-4.394-13.183-7.91-5.274-2.637-9.668-5.274-14.063-7.031-5.274-0.879-8.789-1.758-13.183-1.758v0c-4.394 0-7.91 0.879-13.184 1.758-4.394 1.758-8.789 4.394-14.063 7.031-5.274 3.515-9.668 6.152-13.184 7.91-3.516 2.637-7.91 6.152-13.184 9.668-5.274 4.394-9.668 7.031-10.547 7.91-15.821 10.547-37.793 26.367-65.918 45.703-29.004 20.215-45.703 31.641-51.856 36.035-10.547 7.031-20.215 16.699-29.004 29.004-9.668 12.305-14.063 23.731-14.063 34.278 0 13.183 3.516 23.731 10.547 32.519s16.699 13.183 29.883 13.183h369.14c11.426 0 20.215-4.394 28.125-12.304s12.305-16.699 12.305-28.125z" />
+<glyph unicode="&#x6c;" d="M335.981 369.019c0-4.394-0.879-8.789-4.394-11.426-3.515-3.516-7.031-5.274-11.426-5.274h-31.64v-256.64h31.64c4.394 0 7.91-1.758 11.426-5.274 3.515-2.637 4.394-7.031 4.394-11.426s-0.879-7.91-4.394-10.547l-64.16-65.039c-3.515-2.637-7.031-4.394-11.426-4.394s-7.91 1.758-11.426 4.394l-64.16 65.039c-3.516 2.637-4.394 6.152-4.394 10.547s0.879 8.789 4.394 11.426c3.516 3.515 7.031 5.274 11.426 5.274h31.641v256.64h-31.641c-4.394 0-7.91 1.758-11.426 5.274-3.516 2.637-4.394 7.031-4.394 11.426s0.879 7.91 4.394 10.547l64.16 65.039c3.516 2.636 7.031 4.394 11.426 4.394s7.91-1.758 11.426-4.394l64.16-65.039c3.515-2.637 4.394-6.153 4.394-10.547z" />
+<glyph unicode="&#x6d;" d="M257.505 455.62c-76.315 0-138.399-62.084-138.399-138.4v-79.045c0-0.897-1.109-2.411-1.981-2.702-7.483-2.498-13.562-4.659-19.126-6.805-6.634-2.559-11.639-9.911-11.639-17.103v-181.623c0-7.144 4.973-14.505 11.567-17.117 51.014-20.216 104.705-30.462 159.581-30.462s108.567 10.249 159.582 30.464c6.591 2.613 11.561 9.971 11.561 17.115v181.623c0 7.196-5.005 14.546-11.642 17.107-5.567 2.146-11.646 4.308-19.123 6.805-0.868 0.29-1.976 1.804-1.976 2.702v79.044c-0 76.315-62.085 138.398-138.399 138.398zM219.809 156.246c0 20.834 16.879 37.694 37.694 37.694s37.694-16.858 37.694-37.694c0-13.805-7.786-25.363-18.846-31.915v-62.321c0-10.416-8.43-18.846-18.848-18.846-10.417 0-18.846 8.43-18.846 18.846v62.321c-11.061 6.552-18.846 18.109-18.846 31.915zM348.317 317.222v-68.201c-29.779 6.406-60.332 9.652-90.798 9.656-30.451 0-61-3.246-90.825-9.649v68.193c0 50.073 40.736 90.81 90.81 90.81s90.813-40.737 90.813-90.811z" horiz-adv-x="522" />
+<glyph unicode="&#x6e;" d="M335 222c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3s-5 1-7 3l-14 14c-2 2-3 4-3 7 0 2 1 5 3 6l112 113-112 112c-2 2-3 4-3 7 0 2 1 4 3 6l14 14c2 2 5 3 7 3s5-1 7-3l133-133c2-2 3-4 3-6z" />
+<glyph unicode="&#x6f;" d="M181.293 298.707c0-12.304-4.394-22.851-13.184-31.64s-19.336-13.184-32.519-13.184c-12.305 0-22.852 4.394-31.641 13.184s-13.183 19.336-13.183 31.64c0 13.183 4.394 23.731 13.183 32.519s19.336 13.183 31.641 13.183c13.184 0 23.731-4.394 32.519-13.183s13.184-19.336 13.184-32.519zM421.235 209.058v-105.469h-330.469v45.703l75.586 74.707 36.914-37.793 120.41 120.41zM443.207 374.293h-374.414c-2.636 0-4.394-0.879-5.273-2.637-1.758-1.758-2.636-3.515-2.636-5.273v-284.765c0-1.758 0.879-3.515 2.636-5.274 0.879-1.758 2.636-2.637 5.273-2.637h374.414c2.637 0 4.394 0.879 5.274 2.637 1.758 1.758 2.637 3.515 2.637 5.274v284.765c0 1.758-0.879 3.515-2.637 5.274-0.879 1.758-2.637 2.636-5.274 2.636zM481 366.383v-284.765c0-10.547-3.515-19.336-11.426-26.367-7.031-7.91-15.82-11.426-26.367-11.426h-374.414c-10.547 0-19.336 3.515-26.367 11.426-7.91 7.031-11.426 15.82-11.426 26.367v284.765c0 10.547 3.516 19.336 11.426 26.367 7.032 7.91 15.82 11.426 26.367 11.426h374.414c10.547 0 19.336-3.516 26.367-11.426 7.91-7.031 11.426-15.821 11.426-26.367z" />
+<glyph unicode="&#x70;" d="M402.961 206.472c-5.092 1.962-17.854 6.401-18.037 6.548-14.945 3.733-44.805 12.069-44.805 12.069-27.243 5.861-55.194 8.831-83.066 8.833-27.071 0-54.219-2.814-80.769-8.346l-41.517 41.518c-32.393 32.392-32.393 85.096 0 117.489s85.097 32.394 117.491 0.001l43.171-43.169c14.548 3.526 30.813 10.696 41.165 22.2-0.832-0.087-1.96 0.169-2.414 0.622l-51.133 51.133c-49.368 49.365-129.694 49.365-179.060-0.002s-49.368-129.693 0-179.061l23.867-23.868c-6.495-2.174-11.84-4.079-16.737-5.969-6.070-2.341-10.649-9.067-10.649-15.648v-166.156c0-6.536 4.549-13.27 10.582-15.661 46.67-18.494 95.789-27.868 145.992-27.868s99.322 9.377 145.993 27.871c6.030 2.39 10.577 9.122 10.577 15.658v166.158c0 6.582-4.578 13.308-10.651 15.651zM274.282 111.017v-57.014c0-9.53-7.712-17.241-17.243-17.241s-17.242 7.712-17.242 17.241v57.014c-10.119 5.993-17.242 16.567-17.242 29.197 0 19.059 15.44 34.484 34.483 34.484s34.485-15.423 34.485-34.485c0-12.63-7.123-23.204-17.241-29.197z" horiz-adv-x="522" />
 <glyph unicode="&#x71;" d="M399 270c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3s-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l15 15c1 1 4 2 6 2 3 0 5-1 7-2l112-113 112 113c2 1 4 2 7 2 2 0 5-1 6-2l15-15c2-2 3-4 3-6z" />
 <glyph unicode="&#x72;" d="M366 87v18c0 3-1 5-3 7-2 1-4 2-6 2h-202c-2 0-4-1-6-2-2-2-3-4-3-7v-18c0-3 1-5 3-7 2-1 4-2 6-2h202c2 0 4 1 6 2 2 2 3 4 3 7zM366 160v18c0 3-1 5-3 7s-4 2-6 2h-202c-2 0-4 0-6-2s-3-4-3-7v-18c0-3 1-5 3-7 2-1 4-2 6-2h202c2 0 4 1 6 2 2 2 3 4 3 7zM439 261v-229c0-8-3-14-8-19-5-6-12-8-20-8h-310c-8 0-15 2-20 8-5 5-8 11-8 19v384c0 8 3 14 8 19 5 6 12 8 20 8h155v-155c0-8 3-14 8-19 5-6 12-8 19-8zM438 297h-145v146c15-3 28-9 37-19l89-89c10-10 16-22 19-38z" />
-<glyph unicode="&#x73;" d="M457 105v201c0 8-3 14-8 20-5 5-12 8-19 8h-201c-8 0-15 2-20 8-5 5-8 12-8 19v18c0 8-3 15-8 20s-12 8-19 8h-92c-7 0-14-3-19-8s-8-12-8-20v-274c0-7 3-14 8-19 5-6 12-8 19-8h348c7 0 14 2 19 8 5 5 8 12 8 19zM494 306v-201c0-17-7-32-19-45-13-13-28-19-45-19h-348c-17 0-32 6-45 19-12 13-19 28-19 45v274c0 18 7 33 19 46 13 12 28 18 45 18h92c17 0 32-6 45-18 12-13 19-28 19-46v-9h192c17 0 32-6 45-19 12-12 19-27 19-45z" />
-<glyph unicode="&#x74;" d="M457 270v-55c0-8-3-14-8-20-5-5-12-8-19-8h-119v-118c0-8-3-15-8-20s-12-8-20-8h-54c-8 0-15 3-20 8s-8 12-8 20v118h-119c-7 0-14 3-19 8-5 6-8 12-8 20v55c0 7 3 14 8 19s12 8 19 8h119v119c0 8 3 14 8 19 5 6 12 8 20 8h54c8 0 15-2 20-8 5-5 8-11 8-19v-119h119c7 0 14-3 19-8s8-12 8-19z" />
-<glyph unicode="&#x75;" d="M165 352c0 10-4 19-11 26s-16 11-26 11c-10 0-19-4-26-11-7-7-11-16-11-26 0-10 4-19 11-26 7-7 16-11 26-11 10 0 19 4 26 11 7 7 11 16 11 26zM469 187c0-10-3-18-10-25l-140-141c-8-7-17-10-26-10-11 0-19 3-26 10l-204 205c-8 7-14 16-19 29-5 12-7 23-7 33v119c0 10 3 18 10 26 8 7 16 10 26 10h119c10 0 21-2 33-7 13-5 22-11 30-19l204-204c7-7 10-16 10-26z" />
-<glyph unicode="&#x76;" d="M501 209c0-5-3-11-8-18l-90-105c-7-9-18-17-32-23-14-7-26-10-38-10h-290c-6 0-12 1-16 4-5 2-8 6-8 11 0 6 3 12 9 18l89 105c8 10 19 17 32 24 14 6 27 9 39 9h290c6 0 11-1 16-3 5-3 7-7 7-12zM410 301v-43h-222c-17 0-34-4-53-13-18-8-33-19-44-31l-89-106-2-2c0 1 0 2 0 4 0 1 0 2 0 3v256c0 16 6 30 18 42 11 12 25 18 42 18h85c16 0 30-6 42-18s18-26 18-42v-8h145c16 0 30-6 42-18s18-26 18-42z" />
-<glyph unicode="&#x77;" d="M329 224c0 20-7 37-21 52-15 14-32 21-52 21-20 0-37-7-52-21-14-15-21-32-21-52 0-20 7-37 21-52 15-14 32-21 52-21 20 0 37 7 52 21 14 15 21 32 21 52zM475 255v-63c0-3 0-5-2-7-1-2-3-3-6-4l-52-8c-4-10-8-19-12-26 7-9 17-22 31-39 2-2 3-5 3-7 0-3-1-5-3-7-5-7-14-17-28-31-14-13-23-20-27-20-2 0-5 1-7 3l-40 31c-8-5-17-8-26-11-3-26-6-44-8-53-1-6-5-8-10-8h-64c-2 0-5 0-7 2s-3 4-3 6l-8 53c-9 3-18 6-26 10l-40-30c-2-2-4-3-7-3s-5 1-7 3c-24 22-40 38-47 48-2 2-2 4-2 7 0 2 0 4 2 6 3 4 8 11 14 19 7 9 12 16 16 21-5 9-9 19-12 28l-52 8c-3 0-5 1-6 3-2 2-2 4-2 7v63c0 3 0 5 2 7 1 2 3 3 5 4l53 8c3 8 7 17 12 26-8 11-18 24-31 39-2 3-3 5-3 7 0 2 1 4 3 7 5 7 14 17 28 30 14 14 23 21 27 21 2 0 5-1 7-3l40-31c8 5 17 8 26 11 3 26 6 44 8 53 1 6 5 8 10 8h64c2 0 5 0 7-2s3-4 3-6l8-53c9-3 18-6 26-10l40 30c2 2 4 3 7 3s5-1 7-3c25-23 41-39 47-49 2-1 2-3 2-6 0-2 0-4-2-6-3-4-8-11-14-19-7-9-12-16-16-21 5-9 9-18 12-28l52-8c3 0 5-1 6-3 2-2 2-4 2-7z" />
-<glyph unicode="&#x78;" d="M477 318c0-7-2-14-8-19l-245-246c-6-5-12-8-20-8-7 0-14 3-19 8l-142 142c-6 6-8 12-8 20 0 7 2 14 8 19l38 39c6 5 12 8 20 8 7 0 14-3 19-8l84-84 188 188c5 5 12 8 19 8 8 0 14-3 20-8l38-39c6-6 8-12 8-20z" />
-<glyph unicode="&#x79;" d="M392 110c70-24 105-45 105-62 0 0 0-54 0-54 0 0-241 0-241 0 0 0-241 0-241 0 0 0 0 54 0 54 0 17 35 38 105 62 32 12 54 24 65 36 12 12 18 28 18 48 0 8-4 16-12 25-7 10-12 22-16 38-1 4-2 7-5 9-2 2-4 3-7 4-2 1-4 4-7 9-2 5-4 12-4 22 0 5 0 10 2 13 2 4 3 6 5 6 0 0 2 2 2 2-3 17-5 32-6 45-2 19 5 38 21 58 15 19 42 29 80 29 38 0 65-10 81-29 16-20 22-39 20-58 0 0-6-45-6-45 6-2 9-10 9-21 0-10-2-17-4-22-3-5-5-8-7-9-3-1-5-2-7-4-3-2-4-5-5-9-3-17-8-29-16-38-8-9-12-17-12-25 0-20 6-36 18-48 12-12 34-24 65-36z" />
-<glyph unicode="&#x7a;" d="M344 325c0-3-1-5-3-7l-112-112 112-113c2-1 3-4 3-6 0-3-1-5-3-7l-14-14c-2-2-5-3-7-3s-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3s5-1 7-3l14-14c2-2 3-4 3-6z" />
+<glyph unicode="&#x73;" d="M444.438 96.438v188.438c0 7.5-2.813 13.125-7.5 18.75-4.688 4.688-11.25 7.5-17.813 7.5h-188.438c-7.5 0-14.063 1.875-18.75 7.5-4.688 4.688-7.5 11.25-7.5 17.813v16.875c0 7.5-2.813 14.063-7.5 18.75s-11.25 7.5-17.813 7.5h-86.25c-6.563 0-13.125-2.813-17.813-7.5s-7.5-11.25-7.5-18.75v-256.875c0-6.563 2.813-13.125 7.5-17.813 4.688-5.625 11.25-7.5 17.813-7.5h326.25c6.563 0 13.125 1.875 17.813 7.5 4.688 4.688 7.5 11.25 7.5 17.813zM479.125 284.875v-188.438c0-15.938-6.563-30-17.813-42.188-12.188-12.188-26.25-17.813-42.188-17.813h-326.25c-15.938 0-30 5.625-42.188 17.813-11.25 12.188-17.813 26.25-17.813 42.188v256.875c0 16.875 6.563 30.938 17.813 43.125 12.188 11.25 26.25 16.875 42.188 16.875h86.25c15.938 0 30-5.625 42.188-16.875 11.25-12.188 17.813-26.25 17.813-43.125v-8.438h180c15.938 0 30-5.625 42.188-17.813 11.25-11.25 17.813-25.313 17.813-42.188z" />
+<glyph unicode="&#x74;" d="M444.438 267.125v-51.563c0-7.5-2.813-13.125-7.5-18.75-4.688-4.688-11.25-7.5-17.813-7.5h-111.563v-110.625c0-7.5-2.813-14.063-7.5-18.75s-11.25-7.5-18.75-7.5h-50.625c-7.5 0-14.063 2.813-18.75 7.5s-7.5 11.25-7.5 18.75v110.625h-111.563c-6.563 0-13.125 2.813-17.813 7.5-4.688 5.625-7.5 11.25-7.5 18.75v51.563c0 6.563 2.813 13.125 7.5 17.813s11.25 7.5 17.813 7.5h111.563v111.563c0 7.5 2.813 13.125 7.5 17.813 4.688 5.625 11.25 7.5 18.75 7.5h50.625c7.5 0 14.063-1.875 18.75-7.5 4.688-4.688 7.5-10.313 7.5-17.813v-111.563h111.563c6.563 0 13.125-2.813 17.813-7.5s7.5-11.25 7.5-17.813z" />
+<glyph unicode="&#x75;" d="M165 352c0 10-4 19-11 26s-16 11-26 11c-10 0-19-4-26-11s-11-16-11-26c0-10 4-19 11-26s16-11 26-11c10 0 19 4 26 11s11 16 11 26zM469 187c0-10-3-18-10-25l-140-141c-8-7-17-10-26-10-11 0-19 3-26 10l-204 205c-8 7-14 16-19 29-5 12-7 23-7 33v119c0 10 3 18 10 26 8 7 16 10 26 10h119c10 0 21-2 33-7 13-5 22-11 30-19l204-204c7-7 10-16 10-26z" />
+<glyph unicode="&#x76;" d="M471.332 194.817c0-4.394-2.637-9.668-7.031-15.82l-79.101-92.285c-6.152-7.91-15.82-14.942-28.125-20.215-12.305-6.152-22.851-8.789-33.399-8.789h-254.883c-5.273 0-10.547 0.879-14.063 3.515-4.395 1.758-7.032 5.274-7.032 9.668 0 5.274 2.636 10.547 7.91 15.82l78.222 92.285c7.031 8.789 16.699 14.942 28.125 21.094 12.304 5.274 23.731 7.91 34.278 7.91h254.883c5.274 0 9.668-0.879 14.063-2.637 4.394-2.637 6.152-6.152 6.152-10.547zM391.351 275.676v-37.793h-195.117c-14.941 0-29.883-3.516-46.582-11.426-15.821-7.031-29.004-16.699-38.672-27.246l-78.222-93.164-1.758-1.758c0 0.879 0 1.758 0 3.515 0 0.879 0 1.758 0 2.637v225c0 14.063 5.274 26.367 15.82 36.914 9.668 10.547 21.972 15.821 36.914 15.821h74.707c14.063 0 26.367-5.274 36.914-15.821s15.821-22.851 15.821-36.914v-7.031h127.441c14.063 0 26.367-5.274 36.914-15.82s15.82-22.852 15.82-36.914z" />
+<glyph unicode="&#x77;" d="M329 224c0 20-7 37-21 52-15 14-32 21-52 21s-37-7-52-21c-14-15-21-32-21-52s7-37 21-52c15-14 32-21 52-21s37 7 52 21c14 15 21 32 21 52zM475 255v-63c0-3 0-5-2-7-1-2-3-3-6-4l-52-8c-4-10-8-19-12-26 7-9 17-22 31-39 2-2 3-5 3-7 0-3-1-5-3-7-5-7-14-17-28-31-14-13-23-20-27-20-2 0-5 1-7 3l-40 31c-8-5-17-8-26-11-3-26-6-44-8-53-1-6-5-8-10-8h-64c-2 0-5 0-7 2s-3 4-3 6l-8 53c-9 3-18 6-26 10l-40-30c-2-2-4-3-7-3s-5 1-7 3c-24 22-40 38-47 48-2 2-2 4-2 7 0 2 0 4 2 6 3 4 8 11 14 19 7 9 12 16 16 21-5 9-9 19-12 28l-52 8c-3 0-5 1-6 3-2 2-2 4-2 7v63c0 3 0 5 2 7 1 2 3 3 5 4l53 8c3 8 7 17 12 26-8 11-18 24-31 39-2 3-3 5-3 7s1 4 3 7c5 7 14 17 28 30 14 14 23 21 27 21 2 0 5-1 7-3l40-31c8 5 17 8 26 11 3 26 6 44 8 53 1 6 5 8 10 8h64c2 0 5 0 7-2s3-4 3-6l8-53c9-3 18-6 26-10l40 30c2 2 4 3 7 3s5-1 7-3c25-23 41-39 47-49 2-1 2-3 2-6 0-2 0-4-2-6-3-4-8-11-14-19-7-9-12-16-16-21 5-9 9-18 12-28l52-8c3 0 5-1 6-3 2-2 2-4 2-7z" />
+<glyph unicode="&#x78;" d="M477 334c0-7-2-14-8-19l-245-246c-6-5-12-8-20-8-7 0-14 3-19 8l-142 142c-6 6-8 12-8 20 0 7 2 14 8 19l38 39c6 5 12 8 20 8 7 0 14-3 19-8l84-84 188 188c5 5 12 8 19 8 8 0 14-3 20-8l38-39c6-6 8-12 8-20z" />
+<glyph unicode="&#x79;" d="M375.531 123.805c61.524-21.094 92.285-39.551 92.285-54.492 0 0 0-47.461 0-47.461s-211.817 0-211.817 0c0 0-211.816 0-211.816 0s0 47.461 0 47.461c0 14.942 30.761 33.399 92.285 54.492 28.125 10.547 47.461 21.094 57.129 31.64 10.547 10.547 15.821 24.61 15.821 42.188 0 7.031-3.516 14.063-10.547 21.973-6.153 8.789-10.547 19.336-14.063 33.399-0.879 3.515-1.758 6.153-4.394 7.91-1.758 1.758-3.516 2.637-6.153 3.516-1.758 0.879-3.516 3.516-6.153 7.91-1.758 4.394-3.516 10.547-3.516 19.336 0 4.394 0 8.789 1.758 11.426 1.758 3.515 2.637 5.274 4.394 5.274 0 0 1.758 1.758 1.758 1.758-2.637 14.941-4.394 28.125-5.274 39.551-1.758 16.699 4.394 33.399 18.457 50.976 13.184 16.699 36.914 25.488 70.313 25.488s57.129-8.789 71.192-25.488c14.063-17.578 19.336-34.277 17.578-50.976 0 0-5.274-39.551-5.274-39.551 5.274-1.758 7.91-8.789 7.91-18.457 0-8.789-1.758-14.942-3.515-19.336-2.637-4.394-4.394-7.031-6.152-7.91-2.637-0.879-4.394-1.758-6.152-3.516-2.637-1.758-3.515-4.394-4.394-7.91-2.637-14.941-7.031-25.488-14.063-33.398s-10.547-14.942-10.547-21.973c0-17.578 5.274-31.64 15.82-42.188s29.883-21.094 57.129-31.64z" />
+<glyph unicode="&#x7a;" d="M344 341c0-3-1-5-3-7l-112-112 112-113c2-1 3-4 3-6 0-3-1-5-3-7l-14-14c-2-2-5-3-7-3s-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3s5-1 7-3l14-14c2-2 3-4 3-6z" />
 </font></defs></svg>
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf
index 0fef3a9104b626de878859f4acba311e1127ce0d..84159ccc98436dfe8cd5d94f8ebcfa1169528801 100755
GIT binary patch
literal 25340
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
NUv+1*((y4r{~rmxyC(nu

literal 25960
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%0AwuPuAJ&cY}
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

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff
index b5abeb1ce2943ca46e90fc01a974eabad5477089..fd8552d2604b0fac9782c4712e210d997fcee641 100755
GIT binary patch
delta 9771
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
IteN+}0Fnxl&;S4c

delta 9559
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
G+Ww!B$}%wk


From 7184d6f6d25610503f781e5a3c87ca2fa53aad5e Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Mon, 16 Jun 2014 17:28:42 +0100
Subject: [PATCH 105/293] font tweaks

---
 .../static/wagtailadmin/scss/components/messages.scss           | 2 ++
 wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss         | 1 +
 2 files changed, 3 insertions(+)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss
index ff01dc248e5..f5c32d8c576 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss
@@ -21,6 +21,8 @@
         margin-right:0.5em;
         font-size:1.5em;
         vertical-align:middle;
+        -webkit-font-smoothing: antialiased;
+        -moz-osx-font-smoothing: grayscale;
     }
 
     .error{
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
index 38eb40ae2ca..cf49dee6f1a 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
@@ -219,6 +219,7 @@ img{
             text-shadow:-1px -1px 0px rgba(0,0,0,0.3);
 
             &:before{
+                vertical-align:-20%;
                 margin-right:0.5em;
             }
             &:hover{

From 0f6b6784dc21b8b4905657cc8e65448d70acce49 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Tue, 17 Jun 2014 09:45:42 +0100
Subject: [PATCH 106/293] fixing incorrect test import

---
 wagtail/contrib/wagtailstyleguide/tests.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wagtail/contrib/wagtailstyleguide/tests.py b/wagtail/contrib/wagtailstyleguide/tests.py
index 71f8f6e7627..6a1c4318360 100644
--- a/wagtail/contrib/wagtailstyleguide/tests.py
+++ b/wagtail/contrib/wagtailstyleguide/tests.py
@@ -1,12 +1,12 @@
 from django.test import TestCase
 from django.core.urlresolvers import reverse
 
-from wagtail.tests.utils import login
+from wagtail.tests.utils import WagtailTestUtils
 
 
-class TestStyleGuide(TestCase):
+class TestStyleGuide(TestCase, WagtailTestUtils):
     def setUp(self):
-        login(self.client)
+        self.login();
 
     def test_styleguide(self):
         response = self.client.get(reverse('wagtailstyleguide'))

From 7bb37d4efb9cf8f7a180b8c2b2af7a4dcad6ae50 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 17 Jun 2014 09:49:57 +0100
Subject: [PATCH 107/293] Cleaned up wagtailembeds/tests.py imports

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

diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py
index e10c3f4c042..892dde5bd17 100644
--- a/wagtail/wagtailembeds/tests.py
+++ b/wagtail/wagtailembeds/tests.py
@@ -8,10 +8,8 @@
     no_embedly = True
 
 from django.test import TestCase
-from django.test.client import Client
 
-from wagtail.tests.utils import WagtailTestUtils
-from wagtail.tests.utils import unittest
+from wagtail.tests.utils import WagtailTestUtils, unittest
 
 from wagtail.wagtailembeds import get_embed
 from wagtail.wagtailembeds.embeds import (
@@ -19,8 +17,7 @@
     EmbedlyException,
     AccessDeniedEmbedlyException,
 )
-from wagtail.wagtailembeds.embeds import embedly as wagtail_embedly
-from wagtail.wagtailembeds.embeds import oembed as wagtail_oembed
+from wagtail.wagtailembeds.embeds import embedly as wagtail_embedly, oembed as wagtail_oembed
 
 
 

From 5987f2843a4f06663391ff379f33f7b73e90f3cd Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 17 Jun 2014 14:56:44 +0100
Subject: [PATCH 108/293] remove redundant imports from wagtailcore/models.py

---
 wagtail/wagtailcore/models.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 48875f09a40..983661158b4 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -1,5 +1,3 @@
-import sys
-import os
 from StringIO import StringIO
 from urlparse import urlparse
 

From 4788144c86b1dbdc5e230add8407652acefd0316 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Tue, 17 Jun 2014 15:09:10 +0100
Subject: [PATCH 109/293] first bash at customisable tabs like in PR #210

---
 wagtail/wagtailadmin/edit_handlers.py         |  3 +-
 .../edit_handlers/tabbed_interface.html       |  4 +-
 wagtail/wagtailadmin/views/pages.py           | 40 +++++++++++++++++--
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py
index 245f7ad60d1..ecf69202503 100644
--- a/wagtail/wagtailadmin/edit_handlers.py
+++ b/wagtail/wagtailadmin/edit_handlers.py
@@ -447,10 +447,11 @@ class BaseObjectList(BaseCompositeEditHandler):
     template = "wagtailadmin/edit_handlers/object_list.html"
 
 
-def ObjectList(children, heading=""):
+def ObjectList(children, heading="", classes=None):
     return type('_ObjectList', (BaseObjectList,), {
         'children': children,
         'heading': heading,
+        'classes': classes
     })
 
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html
index 5bbccb03b93..813e40f53fb 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html
@@ -1,12 +1,12 @@
 <ul class="tab-nav merged">
     {% for child in self.children %}
-        <li class="{% if forloop.first %}active{% endif %}"><a href="#{{ child.heading|slugify }}" class="{% if forloop.first %}active{% endif %}">{{ child.heading }}</a></li>
+        <li class="{{ child.classes }} {% if forloop.first %}active{% endif %}"><a href="#{{ child.heading|slugify }}" class="{% if forloop.first %}active{% endif %}">{{ child.heading }}</a></li>
     {% endfor %}
 </ul>
 
 <div class="tab-content">
     {% for child in self.children %}
-        <section id="{{ child.heading|slugify }}" class="{% if forloop.first %}active{% endif %}">
+        <section id="{{ child.heading|slugify }}" class="{{ child.classes }} {% if forloop.first %}active{% endif %}">
             {{ child.render_as_object }}
         </section>
     {% endfor %}
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 69e6b7f4f43..dedf3bff353 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -155,6 +155,9 @@ def clean_slug(slug):
             page.save_revision(user=request.user, submitted_for_moderation=is_submitting)
 
             if is_publishing:
+                message = mark_safe(render_to_string(self.template, {
+                    'self': self
+                }))
                 messages.success(request, _("Page '{0}' published.").format(page.title))
             elif is_submitting:
                 messages.success(request, _("Page '{0}' submitted for moderation.").format(page.title))
@@ -527,12 +530,41 @@ def set_page_position(request, page_to_move_id):
 PAGE_EDIT_HANDLERS = {}
 
 
+def get_default_panels(page_class):
+    panels = []
+
+    try:
+        panels.append(ObjectList(page_class.content_panels, heading='Content'))
+    except AttributeError:
+        pass
+
+    try:
+        panels.append(ObjectList(page_class.promote_panels, heading='Promote'))
+    except AttributeError:
+        pass
+
+    try:
+        panels.append(ObjectList(page_class.settings_panels, heading='Settings', classes='settings'))
+    except AttributeError:
+        pass
+
+    return panels
+
+
+def get_panels(page_class):
+    try:
+        return page_class.panels
+    except AttributeError:
+        return get_default_panels(page_class)
+
+
+def set_panels(page_class, panels):
+    page_class.panels = panels
+
+
 def get_page_edit_handler(page_class):
     if page_class not in PAGE_EDIT_HANDLERS:
-        PAGE_EDIT_HANDLERS[page_class] = TabbedInterface([
-            ObjectList(page_class.content_panels, heading='Content'),
-            ObjectList(page_class.promote_panels, heading='Promote')
-        ])
+        PAGE_EDIT_HANDLERS[page_class] = TabbedInterface(get_panels(page_class))
 
     return PAGE_EDIT_HANDLERS[page_class]
 

From 9efb6a38d75269caaeae71809c3c8b6409deadee Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Tue, 17 Jun 2014 16:37:22 +0100
Subject: [PATCH 110/293] styling for scenario where tabs run onto multiple
 lines

---
 wagtail/wagtailadmin/edit_handlers.py         |  2 +-
 .../wagtailadmin/scss/components/icons.scss   |  1 -
 .../wagtailadmin/scss/components/tabs.scss    | 49 ++++++++++++++-----
 wagtail/wagtailadmin/views/pages.py           | 20 ++++----
 4 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py
index ecf69202503..d3be76161cd 100644
--- a/wagtail/wagtailadmin/edit_handlers.py
+++ b/wagtail/wagtailadmin/edit_handlers.py
@@ -447,7 +447,7 @@ class BaseObjectList(BaseCompositeEditHandler):
     template = "wagtailadmin/edit_handlers/object_list.html"
 
 
-def ObjectList(children, heading="", classes=None):
+def ObjectList(children, heading="", classes=""):
     return type('_ObjectList', (BaseObjectList,), {
         'children': children,
         'heading': heading,
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
index 4de3aa13152..9411cb1a8cc 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
@@ -96,7 +96,6 @@
 .icon-unlocked:before {
     content: "p";
 }
-
 .icon-doc-full-inverse:before {
     content: "r";
 }
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
index b0dec687d98..c008ed15ec0 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
@@ -1,13 +1,15 @@
 .tab-nav{
     @include clearfix();
     padding:0;
+    background:$color-grey-4;
 
     li{
         list-style-type:none;
-        width:48%;
+        width:50%;
         float:left;
         padding:0;
         position:relative;
+        margin-bottom:-1px;
 
         &:before,&:after{
             display:none;
@@ -18,13 +20,12 @@
         @include box-shadow(inset 0px -2px 3px 0 rgba(0,0,0,0.1));
         background-color:$color-grey-4;
         outline:none;
-        line-height:3em;
         text-transform:uppercase;
         font-weight:700;
         font-size:1.2em;
         text-decoration:none;
         display:block;
-        padding:0 20px;
+        padding:0.7em $mobile-nice-padding;
         color:$color-grey-2;
         border-top:0.3em solid $color-grey-4;
         border-bottom:1px solid transparent;
@@ -57,6 +58,20 @@
         }
     }
 
+    li.settings a{
+        padding-left:30px;
+        padding-right:30px;
+
+        &:before{
+            font-family:wagtail;
+            vertical-align:middle;
+            text-transform:none;
+            content:"w";
+            margin-right:0.5em;
+            font-size:1.2em;
+        }
+    }
+
     li.active a{
         @include box-shadow(none);
         color:$color-grey-1;
@@ -66,7 +81,6 @@
 
     /* For cases where tab-nav should merge with header */
     &.merged{
-        background-color:$color-header-bg;
         margin-top:0;
     }
 }
@@ -82,14 +96,27 @@
 }
 
 @media screen and (min-width: $breakpoint-mobile){
-    .tab-nav li{
-        width:auto;
-        padding:0;
-        margin-left:0.7em;
-    }
+    .tab-nav{
+        /* For cases where tab-nav should merge with header */
+        &.merged{
+            background-color:$color-header-bg;
+        }
+
+        li{
+            width:auto;
+            padding:0;
+            margin-left:0.7em;
 
-    .tab-nav a{
-        padding:0 50px;
+            &.tab-right{
+                float:right;
+                margin-right:0.7em;
+            }
+        }
+
+        a{
+            padding-left:$desktop-nice-padding - 10;
+            padding-right:$desktop-nice-padding - 10;
+        }
     }
 
     .modal-content .tab-nav li{
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index dedf3bff353..086c61f0fe5 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -531,40 +531,40 @@ def set_page_position(request, page_to_move_id):
 
 
 def get_default_panels(page_class):
-    panels = []
+    handlers = []
 
     try:
-        panels.append(ObjectList(page_class.content_panels, heading='Content'))
+        handlers.append(ObjectList(page_class.content_panels, heading='Content'))
     except AttributeError:
         pass
 
     try:
-        panels.append(ObjectList(page_class.promote_panels, heading='Promote'))
+        handlers.append(ObjectList(page_class.promote_panels, heading='Promote'))
     except AttributeError:
         pass
 
     try:
-        panels.append(ObjectList(page_class.settings_panels, heading='Settings', classes='settings'))
+        handlers.append(ObjectList(page_class.settings_panels, heading='Settings', classes='tab-right settings'))
     except AttributeError:
         pass
 
-    return panels
+    return handlers
 
 
-def get_panels(page_class):
+def get_which_page_edit_handler(page_class):
     try:
-        return page_class.panels
+        return page_class.handlers
     except AttributeError:
         return get_default_panels(page_class)
 
 
-def set_panels(page_class, panels):
-    page_class.panels = panels
+def set_page_edit_handler(page_class, handlers):
+    page_class.handlers = handlers
 
 
 def get_page_edit_handler(page_class):
     if page_class not in PAGE_EDIT_HANDLERS:
-        PAGE_EDIT_HANDLERS[page_class] = TabbedInterface(get_panels(page_class))
+        PAGE_EDIT_HANDLERS[page_class] = TabbedInterface(get_which_page_edit_handler(page_class))
 
     return PAGE_EDIT_HANDLERS[page_class]
 

From b95d6a0fab18a17a59dc981f7c6213e083c07d6d Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Tue, 17 Jun 2014 16:58:12 +0100
Subject: [PATCH 111/293] removed partial work from other branch

---
 wagtail/wagtailadmin/views/pages.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 086c61f0fe5..15aa81808e9 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -155,9 +155,6 @@ def clean_slug(slug):
             page.save_revision(user=request.user, submitted_for_moderation=is_submitting)
 
             if is_publishing:
-                message = mark_safe(render_to_string(self.template, {
-                    'self': self
-                }))
                 messages.success(request, _("Page '{0}' published.").format(page.title))
             elif is_submitting:
                 messages.success(request, _("Page '{0}' submitted for moderation.").format(page.title))

From fb9a876e92c0cbd53a3e30367efcbc05e35b0cdc Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Tue, 17 Jun 2014 17:20:22 +0100
Subject: [PATCH 112/293] moved set_page_edit_hanlder to edit_handlders.py.
 Still not happy it's invoked the right way though

---
 wagtail/wagtailadmin/edit_handlers.py | 4 ++++
 wagtail/wagtailadmin/views/pages.py   | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py
index d3be76161cd..b7090ff22ec 100644
--- a/wagtail/wagtailadmin/edit_handlers.py
+++ b/wagtail/wagtailadmin/edit_handlers.py
@@ -261,6 +261,10 @@ def extract_panel_definitions_from_model_class(model, exclude=None):
     return panels
 
 
+def set_page_edit_handler(page_class, handlers):
+    page_class.handlers = handlers
+
+
 class EditHandler(object):
     """
     Abstract class providing sensible default behaviours for objects implementing
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 15aa81808e9..67d0e752526 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -555,10 +555,6 @@ def get_which_page_edit_handler(page_class):
         return get_default_panels(page_class)
 
 
-def set_page_edit_handler(page_class, handlers):
-    page_class.handlers = handlers
-
-
 def get_page_edit_handler(page_class):
     if page_class not in PAGE_EDIT_HANDLERS:
         PAGE_EDIT_HANDLERS[page_class] = TabbedInterface(get_which_page_edit_handler(page_class))

From b480c9e7eb9a88d99402ced8b5535b51d2f78f17 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 17 Jun 2014 17:25:49 +0100
Subject: [PATCH 113/293] Fixes to wagtailadmin page index view

---
 wagtail/wagtailadmin/views/pages.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 69e6b7f4f43..7efe553ceb1 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -25,16 +25,14 @@ def index(request, parent_page_id=None):
     pages = parent_page.get_children().prefetch_related('content_type')
 
     # Get page ordering
-    if 'ordering' in request.GET:
-        ordering = request.GET['ordering']
-
-        if ordering in ['title', '-title', 'content_type', '-content_type', 'live', '-live']:
-            pages = pages.order_by(ordering)
-    else:
+    ordering = request.GET.get('ordering', 'title')
+    if ordering not in ['title', '-title', 'content_type', '-content_type', 'live', '-live', 'ord']:
         ordering = 'title'
 
     # Pagination
     if ordering != 'ord':
+        pages = pages.order_by(ordering)
+
         p = request.GET.get('p', 1)
         paginator = Paginator(pages, 50)
         try:

From 13c341a4d4f243acc52023fbcff316d7b607ae8c Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 17 Jun 2014 17:26:31 +0100
Subject: [PATCH 114/293] Improvements to wagtailadmin explorer tests

---
 .../wagtailadmin/tests/test_pages_views.py    | 80 ++++++++++++++++++-
 1 file changed, 77 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py
index 12c42f3e404..878441f886a 100644
--- a/wagtail/wagtailadmin/tests/test_pages_views.py
+++ b/wagtail/wagtailadmin/tests/test_pages_views.py
@@ -5,6 +5,7 @@
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User, Permission
 from django.core import mail
+from django.core.paginator import Paginator
 
 
 class TestPageExplorer(TestCase, WagtailTestUtils):
@@ -13,9 +14,10 @@ def setUp(self):
         self.root_page = Page.objects.get(id=2)
 
         # Add child page
-        self.child_page = SimplePage()
-        self.child_page.title = "Hello world!"
-        self.child_page.slug = "hello-world"
+        self.child_page = SimplePage(
+            title="Hello world!",
+            slug="hello-world",
+        )
         self.root_page.add_child(instance=self.child_page)
 
         # Login
@@ -24,9 +26,81 @@ def setUp(self):
     def test_explore(self):
         response = self.client.get(reverse('wagtailadmin_explore', args=(self.root_page.id, )))
         self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/index.html')
         self.assertEqual(self.root_page, response.context['parent_page'])
         self.assertTrue(response.context['pages'].paginator.object_list.filter(id=self.child_page.id).exists())
 
+    def test_explore_root(self):
+        response = self.client.get(reverse('wagtailadmin_explore_root'))
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/index.html')
+        self.assertEqual(Page.objects.get(id=1), response.context['parent_page'])
+        self.assertTrue(response.context['pages'].paginator.object_list.filter(id=self.root_page.id).exists())
+
+    def test_ordering(self):
+        response = self.client.get(reverse('wagtailadmin_explore_root'), {'ordering': 'content_type'})
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/index.html')
+        self.assertEqual(response.context['ordering'], 'content_type')
+
+    def test_invalid_ordering(self):
+        response = self.client.get(reverse('wagtailadmin_explore_root'), {'ordering': 'invalid_order'})
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/index.html')
+        self.assertEqual(response.context['ordering'], 'title')
+
+    def test_reordering(self):
+        response = self.client.get(reverse('wagtailadmin_explore_root'), {'ordering': 'ord'})
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/index.html')
+        self.assertEqual(response.context['ordering'], 'ord')
+
+        # Pages must not be paginated
+        self.assertNotIsInstance(response.context['pages'], Paginator)
+
+    def make_pages(self):
+        for i in range(150):
+            self.root_page.add_child(instance=SimplePage(
+                title="Page " + str(i),
+                slug="page-" + str(i),
+            ))
+
+    def test_pagination(self):
+        self.make_pages()
+
+        response = self.client.get(reverse('wagtailadmin_explore', args=(self.root_page.id, )), {'p': 2})
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/index.html')
+
+        # Check that we got the correct page
+        self.assertEqual(response.context['pages'].number, 2)
+
+    def test_pagination_invalid(self):
+        self.make_pages()
+
+        response = self.client.get(reverse('wagtailadmin_explore', args=(self.root_page.id, )), {'p': 'Hello World!'})
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/index.html')
+
+        # Check that we got page one
+        self.assertEqual(response.context['pages'].number, 1)
+
+    def test_pagination_out_of_range(self):
+        self.make_pages()
+
+        response = self.client.get(reverse('wagtailadmin_explore', args=(self.root_page.id, )), {'p': 99999})
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/index.html')
+
+        # Check that we got the last page
+        self.assertEqual(response.context['pages'].number, response.context['pages'].paginator.num_pages)
+
 
 class TestPageCreation(TestCase, WagtailTestUtils):
     def setUp(self):

From 553e7062b66bbfaea9d7ba3be5a0d4640269a451 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Tue, 17 Jun 2014 17:37:28 +0100
Subject: [PATCH 115/293] added FieldRowPanel from @kaedroho
 5dc7a220f8799a7c6871b119724f7e07cb54f4fb

---
 wagtail/wagtailadmin/edit_handlers.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py
index 245f7ad60d1..fb5f4b8483a 100644
--- a/wagtail/wagtailadmin/edit_handlers.py
+++ b/wagtail/wagtailadmin/edit_handlers.py
@@ -454,6 +454,17 @@ def ObjectList(children, heading=""):
     })
 
 
+class BaseFieldRowPanel(BaseCompositeEditHandler):
+    template = "wagtailadmin/edit_handlers/field_row_panel.html"
+
+
+def FieldRowPanel(children, classname=None):
+    return type('_FieldRowPanel', (BaseFieldRowPanel,), {
+        'children': children,
+        'classname': classname,
+    })
+
+
 class BaseMultiFieldPanel(BaseCompositeEditHandler):
     template = "wagtailadmin/edit_handlers/multi_field_panel.html"
 

From 9917d777c558ef18bc27f25131faa617f84912a6 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 17 Jun 2014 17:38:00 +0100
Subject: [PATCH 116/293] Improvements to existing slug unit tests for create
 and edit views

---
 .../wagtailadmin/tests/test_pages_views.py    | 28 ++++++++++++++++++-
 wagtail/wagtailadmin/views/pages.py           |  2 ++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py
index 878441f886a..de5415d73ea 100644
--- a/wagtail/wagtailadmin/tests/test_pages_views.py
+++ b/wagtail/wagtailadmin/tests/test_pages_views.py
@@ -218,7 +218,7 @@ def test_create_simplepage_post_submit(self):
         self.assertEqual(mail.outbox[0].to, ['moderator@email.com'])
         self.assertEqual(mail.outbox[0].subject, 'The page "New page!" has been submitted for moderation')
 
-    def test_create_simplepage_post_existingslug(self):
+    def test_create_simplepage_post_existing_slug(self):
         # This tests the existing slug checking on page save
 
         # Create a page
@@ -239,6 +239,9 @@ def test_create_simplepage_post_existingslug(self):
         # Should not be redirected (as the save should fail)
         self.assertEqual(response.status_code, 200)
 
+        # Check that a form error was raised
+        self.assertFormError(response, 'form', 'slug', "This slug is already in use")
+
     def test_create_nonexistantparent(self):
         response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', 100000)))
         self.assertEqual(response.status_code, 404)
@@ -371,6 +374,29 @@ def test_page_edit_post_submit(self):
         self.assertEqual(mail.outbox[0].to, ['moderator@email.com'])
         self.assertEqual(mail.outbox[0].subject, 'The page "Hello world!" has been submitted for moderation') # Note: should this be "I've been edited!"?
 
+    def test_page_edit_post_existing_slug(self):
+        # This tests the existing slug checking on page edit
+
+        # Create a page
+        self.child_page = SimplePage()
+        self.child_page.title = "Hello world 2"
+        self.child_page.slug = "hello-world2"
+        self.root_page.add_child(instance=self.child_page)
+
+        # Attempt to change the slug to one thats already in use
+        post_data = {
+            'title': "Hello world 2",
+            'slug': 'hello-world',
+            'action-submit': "Submit",
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
+
+        # Should not be redirected (as the save should fail)
+        self.assertEqual(response.status_code, 200)
+
+        # Check that a form error was raised
+        self.assertFormError(response, 'form', 'slug', "This slug is already in use")
+
     def test_preview_on_edit(self):
         post_data = {
             'title': "I've been edited!",
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 7efe553ceb1..a611a064719 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -179,6 +179,7 @@ def clean_slug(slug):
         'parent_page': parent_page,
         'edit_handler': edit_handler,
         'display_modes': page.get_page_modes(),
+        'form': form, # Used in unit tests
     })
 
 
@@ -264,6 +265,7 @@ def clean_slug(slug):
         'edit_handler': edit_handler,
         'errors_debug': errors_debug,
         'display_modes': page.get_page_modes(),
+        'form': form, # Used in unit tests
     })
 
 

From 68da7f0c2c44d2b8661e6849cde56e29141ef98f Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Tue, 17 Jun 2014 17:39:48 +0100
Subject: [PATCH 117/293] corrected commit ref to
 kaedroho@5dc7a220f8799a7c6871b119724f7e07cb54f4fb

---
 .../wagtailadmin/edit_handlers/field_row_panel.html        | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html
new file mode 100644
index 00000000000..e7371f0b9cb
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html
@@ -0,0 +1,7 @@
+<ul class="field-row">
+    {% for child in self.children %}
+       <li class="field-col {{ child.classname }}">
+           {{ child.render_as_field }}
+       </li>
+    {% endfor %}
+</ul>

From 015f7c126d973175edf6e6d18bd277e152be01ac Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 17 Jun 2014 17:49:52 +0100
Subject: [PATCH 118/293] Removed assertURLEqual, replaced with Djangos built
 in assertRedirects

---
 wagtail/tests/utils.py                        | 18 -----------
 .../tests/test_account_management.py          | 23 +++++--------
 .../wagtailadmin/tests/test_pages_views.py    | 32 +++++++------------
 wagtail/wagtailimages/tests.py                |  9 ++----
 wagtail/wagtailredirects/tests.py             |  9 ++----
 wagtail/wagtailsnippets/tests.py              |  9 ++----
 wagtail/wagtailusers/tests.py                 |  6 ++--
 7 files changed, 30 insertions(+), 76 deletions(-)

diff --git a/wagtail/tests/utils.py b/wagtail/tests/utils.py
index 0b13e593203..02327799b47 100644
--- a/wagtail/tests/utils.py
+++ b/wagtail/tests/utils.py
@@ -24,21 +24,3 @@ def login(self):
         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):
-        """
-        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))
diff --git a/wagtail/wagtailadmin/tests/test_account_management.py b/wagtail/wagtailadmin/tests/test_account_management.py
index 3553b8fba5b..566d687230b 100644
--- a/wagtail/wagtailadmin/tests/test_account_management.py
+++ b/wagtail/wagtailadmin/tests/test_account_management.py
@@ -43,8 +43,7 @@ def test_login_view_post(self):
         response = self.client.post(reverse('wagtailadmin_login'), post_data)
 
         # Check that the user was redirected to the dashboard
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailadmin_home'))
+        self.assertRedirects(response, reverse('wagtailadmin_home'))
 
         # Check that the user was logged in
         self.assertTrue('_auth_user_id' in self.client.session)
@@ -60,8 +59,7 @@ def test_already_logged_in_redirect(self):
         response = self.client.get(reverse('wagtailadmin_login'))
 
         # Check that the user was redirected to the dashboard
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailadmin_home'))
+        self.assertRedirects(response, reverse('wagtailadmin_home'))
 
     def test_logout(self):
         """
@@ -71,8 +69,7 @@ def test_logout(self):
         response = self.client.get(reverse('wagtailadmin_logout'))
 
         # Check that the user was redirected to the login page
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailadmin_login'))
+        self.assertRedirects(response, reverse('wagtailadmin_login'))
 
         # Check that the user was logged out
         self.assertFalse('_auth_user_id' in self.client.session)
@@ -89,8 +86,7 @@ def test_not_logged_in_redirect(self):
         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'))
+        self.assertRedirects(response, reverse('wagtailadmin_login') + '?next=' + reverse('wagtailadmin_home'))
 
     def test_not_logged_in_redirect_default_settings(self):
         """
@@ -109,7 +105,7 @@ def test_not_logged_in_redirect_default_settings(self):
         # 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'))
+        self.assertRedirects(response, reverse('wagtailadmin_login') + '?next=' + reverse('wagtailadmin_home'))
 
 
 class TestAccountSection(TestCase, WagtailTestUtils):
@@ -154,8 +150,7 @@ def test_change_password_view_post(self):
         response = self.client.post(reverse('wagtailadmin_account_change_password'), post_data)
 
         # Check that the user was redirected to the account page
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailadmin_account'))
+        self.assertRedirects(response, reverse('wagtailadmin_account'))
 
         # Check that the password was changed
         self.assertTrue(User.objects.get(username='test').check_password('newpassword'))
@@ -214,8 +209,7 @@ def test_password_reset_view_post(self):
         response = self.client.post(reverse('password_reset'), post_data)
 
         # Check that the user was redirected to the done page
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('password_reset_done'))
+        self.assertRedirects(response, reverse('password_reset_done'))
 
         # Check that a password reset email was sent to the user
         self.assertEqual(len(mail.outbox), 1)
@@ -306,8 +300,7 @@ def test_password_reset_confirm_view_post(self):
         response = self.client.post(reverse('password_reset_confirm', kwargs=self.url_kwargs), post_data)
 
         # Check that the user was redirected to the complete page
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('password_reset_complete'))
+        self.assertRedirects(response, reverse('password_reset_complete'))
 
         # Check that the password was changed
         self.assertTrue(User.objects.get(username='test').check_password('newpassword'))
diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py
index de5415d73ea..3da08de137d 100644
--- a/wagtail/wagtailadmin/tests/test_pages_views.py
+++ b/wagtail/wagtailadmin/tests/test_pages_views.py
@@ -159,8 +159,7 @@ def test_create_simplepage_post(self):
         response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
 
         # Should be redirected to explorer page
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
+        self.assertRedirects(response, 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
@@ -178,8 +177,7 @@ def test_create_simplepage_post_publish(self):
         response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
 
         # Should be redirected to explorer page
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
+        self.assertRedirects(response, 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
@@ -201,8 +199,7 @@ def test_create_simplepage_post_submit(self):
         response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
 
         # Should be redirected to explorer page
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
+        self.assertRedirects(response, 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
@@ -317,8 +314,7 @@ def test_page_edit_post(self):
         response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
     
         # Should be redirected to explorer page
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
+        self.assertRedirects(response, 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)
@@ -335,8 +331,7 @@ def test_page_edit_post_publish(self):
         response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
     
         # Should be redirected to explorer page
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
+        self.assertRedirects(response, 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)
@@ -359,8 +354,7 @@ def test_page_edit_post_submit(self):
         response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
     
         # Should be redirected to explorer page
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
+        self.assertRedirects(response, 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)
@@ -449,8 +443,7 @@ def test_page_delete_post(self):
         response = self.client.post(reverse('wagtailadmin_pages_delete', args=(self.child_page.id, )), post_data)
 
         # Should be redirected to explorer page
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
+        self.assertRedirects(response, 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)
@@ -609,9 +602,8 @@ def test_unpublish_view_post(self):
             'foo': "Must post something or the view won't see this as a POST request",
         })
 
-        # 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, )))
+        # Should be redirected to explorer page
+        self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
 
         # Check that the page was unpublished
         self.assertFalse(SimplePage.objects.get(id=self.page.id).live)
@@ -649,8 +641,7 @@ def test_approve_moderation_view(self):
         })
 
         # Check that the user was redirected to the dashboard
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailadmin_home'))
+        self.assertRedirects(response, reverse('wagtailadmin_home'))
 
         # Page must be live
         self.assertTrue(Page.objects.get(id=self.page.id).live)
@@ -701,8 +692,7 @@ def test_reject_moderation_view(self):
         })
 
         # Check that the user was redirected to the dashboard
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailadmin_home'))
+        self.assertRedirects(response, reverse('wagtailadmin_home'))
 
         # Page must not be live
         self.assertFalse(Page.objects.get(id=self.page.id).live)
diff --git a/wagtail/wagtailimages/tests.py b/wagtail/wagtailimages/tests.py
index b31e3374552..4604a94ef1c 100644
--- a/wagtail/wagtailimages/tests.py
+++ b/wagtail/wagtailimages/tests.py
@@ -253,8 +253,7 @@ def test_add(self):
         })
 
         # Should redirect back to index
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailimages_index'))
+        self.assertRedirects(response, reverse('wagtailimages_index'))
 
         # Check that the image was created
         images = Image.objects.filter(title="Test image")
@@ -293,8 +292,7 @@ def test_edit(self):
         })
 
         # Should redirect back to index
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailimages_index'))
+        self.assertRedirects(response, reverse('wagtailimages_index'))
 
         # Check that the image was edited
         image = Image.objects.get(id=self.image.id)
@@ -328,8 +326,7 @@ def test_delete(self):
         })
 
         # Should redirect back to index
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailimages_index'))
+        self.assertRedirects(response, 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 29ad7ec0bd2..9aab1e98ada 100644
--- a/wagtail/wagtailredirects/tests.py
+++ b/wagtail/wagtailredirects/tests.py
@@ -113,8 +113,7 @@ def test_add(self):
         })
 
         # Should redirect back to index
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailredirects_index'))
+        self.assertRedirects(response, reverse('wagtailredirects_index'))
 
         # Check that the redirect was created
         redirects = models.Redirect.objects.filter(old_path='/test')
@@ -163,8 +162,7 @@ def test_edit(self):
         })
 
         # Should redirect back to index
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailredirects_index'))
+        self.assertRedirects(response, reverse('wagtailredirects_index'))
 
         # Check that the redirect was edited
         redirects = models.Redirect.objects.filter(old_path='/test')
@@ -210,8 +208,7 @@ def test_delete(self):
         })
 
         # Should redirect back to index
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailredirects_index'))
+        self.assertRedirects(response, 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 9e25877944e..1b1e012de54 100644
--- a/wagtail/wagtailsnippets/tests.py
+++ b/wagtail/wagtailsnippets/tests.py
@@ -70,8 +70,7 @@ def test_create_invalid(self):
     def test_create(self):
         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')))
+        self.assertRedirects(response, reverse('wagtailsnippets_list', args=('tests', 'advert')))
 
         snippets = Advert.objects.filter(text='test_advert')
         self.assertEqual(snippets.count(), 1)
@@ -120,8 +119,7 @@ def test_edit_invalid(self):
     def test_edit(self):
         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')))
+        self.assertRedirects(response, reverse('wagtailsnippets_list', args=('tests', 'advert')))
 
         snippets = Advert.objects.filter(text='edited_test_advert')
         self.assertEqual(snippets.count(), 1)
@@ -146,8 +144,7 @@ def test_delete_post(self):
         response = self.client.post(reverse('wagtailsnippets_delete', args=('tests', 'advert', self.test_snippet.id, )), post_data)
 
         # Should be redirected to explorer page
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailsnippets_list', args=('tests', 'advert')))
+        self.assertRedirects(response, 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 6de97f202ec..a360fe4686d 100644
--- a/wagtail/wagtailusers/tests.py
+++ b/wagtail/wagtailusers/tests.py
@@ -54,8 +54,7 @@ def test_create(self):
         })
 
         # Should redirect back to index
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailusers_index'))
+        self.assertRedirects(response, reverse('wagtailusers_index'))
 
         # Check that the user was created
         users = User.objects.filter(username='testuser')
@@ -96,8 +95,7 @@ def test_edit(self):
         })
 
         # Should redirect back to index
-        self.assertEqual(response.status_code, 302)
-        self.assertURLEqual(response.url, reverse('wagtailusers_index'))
+        self.assertRedirects(response, reverse('wagtailusers_index'))
 
         # Check that the user was edited
         user = User.objects.get(id=self.test_user.id)

From a2254148e908b0c68eae7e8f615e97dd39f16e83 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 17 Jun 2014 20:40:55 +0100
Subject: [PATCH 119/293] Remove subpage_types logic from is_navigable and
 get_navigation_menu_items. It's now clear that we will never mandate the use
 of subpage_types, so we can't use its presence or absence as an indicator of
 whether or not a page is appropriate to be included in navigation menus.

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

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 983661158b4..cefbe2b88fa 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -414,10 +414,10 @@ def serve(self, request, *args, **kwargs):
     def is_navigable(self):
         """
         Return true if it's meaningful to browse subpages of this page -
-        i.e. it currently has subpages, or its page type indicates that sub-pages are supported,
+        i.e. it currently has subpages,
         or it's at the top level (this rule necessary for empty out-of-the-box sites to have working navigation)
         """
-        return (not self.is_leaf()) or (self.content_type_id not in get_leaf_page_content_type_ids()) or self.depth == 2
+        return (not self.is_leaf()) or self.depth == 2
 
     def get_other_siblings(self):
         # get sibling pages excluding self
@@ -654,13 +654,8 @@ def get_siblings(self, inclusive=True):
 
 def get_navigation_menu_items():
     # Get all pages that appear in the navigation menu: ones which have children,
-    # or are a non-leaf type (indicating that they *could* have children),
     # or are at the top-level (this rule required so that an empty site out-of-the-box has a working menu)
-    navigable_content_type_ids = get_navigable_page_content_type_ids()
-    if navigable_content_type_ids:
-        pages = Page.objects.filter(Q(content_type__in=navigable_content_type_ids)|Q(depth=2)|Q(numchild__gt=0)).order_by('path')
-    else:
-        pages = Page.objects.filter(Q(depth=2)|Q(numchild__gt=0)).order_by('path')
+    pages = Page.objects.filter(Q(depth=2)|Q(numchild__gt=0)).order_by('path')
 
     # Turn this into a tree structure:
     #     tree_node = (page, children)

From 8d3ac405c42cd880b36d88f1140a594510da9824 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 17 Jun 2014 21:10:18 +0100
Subject: [PATCH 120/293] Deprecate get_leaf_page_content_type_ids and
 get_navigable_page_content_type_ids, as they have incorrect semantics for
 page subclasses that don't define subpage_types. Replace them with a naive
 implementation that doesn't require metaclass hacks

---
 wagtail/wagtailcore/models.py | 46 ++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index cefbe2b88fa..1100b3d068a 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -1,5 +1,6 @@
 from StringIO import StringIO
 from urlparse import urlparse
+import warnings
 
 from modelcluster.models import ClusterableModel
 
@@ -99,30 +100,29 @@ def get_page_types():
     return _PAGE_CONTENT_TYPES
 
 
-LEAF_PAGE_MODEL_CLASSES = []
-_LEAF_PAGE_CONTENT_TYPE_IDS = []
-
-
 def get_leaf_page_content_type_ids():
-    global _LEAF_PAGE_CONTENT_TYPE_IDS
-    if len(_LEAF_PAGE_CONTENT_TYPE_IDS) != len(LEAF_PAGE_MODEL_CLASSES):
-        _LEAF_PAGE_CONTENT_TYPE_IDS = [
-            ContentType.objects.get_for_model(cls).id for cls in LEAF_PAGE_MODEL_CLASSES
-        ]
-    return _LEAF_PAGE_CONTENT_TYPE_IDS
-
-
-NAVIGABLE_PAGE_MODEL_CLASSES = []
-_NAVIGABLE_PAGE_CONTENT_TYPE_IDS = []
-
+    warnings.warn("""
+        get_leaf_page_content_type_ids is deprecated, as it treats pages without an explicit subpage_types
+        setting as 'leaf' pages. Code that calls get_leaf_page_content_type_ids must be rewritten to avoid
+        this incorrect assumption.
+    """, DeprecationWarning)
+    return [
+        content_type.id
+        for content_type in get_page_types()
+        if not getattr(content_type.model_class(), 'subpage_types', None)
+    ]
 
 def get_navigable_page_content_type_ids():
-    global _NAVIGABLE_PAGE_CONTENT_TYPE_IDS
-    if len(_NAVIGABLE_PAGE_CONTENT_TYPE_IDS) != len(NAVIGABLE_PAGE_MODEL_CLASSES):
-        _NAVIGABLE_PAGE_CONTENT_TYPE_IDS = [
-            ContentType.objects.get_for_model(cls).id for cls in NAVIGABLE_PAGE_MODEL_CLASSES
-        ]
-    return _NAVIGABLE_PAGE_CONTENT_TYPE_IDS
+    warnings.warn("""
+        get_navigable_page_content_type_ids is deprecated, as it treats pages without an explicit subpage_types
+        setting as 'leaf' pages. Code that calls get_navigable_page_content_type_ids must be rewritten to avoid
+        this incorrect assumption.
+    """, DeprecationWarning)
+    return [
+        content_type.id
+        for content_type in get_page_types()
+        if getattr(content_type.model_class(), 'subpage_types', None)
+    ]
 
 
 class PageManager(models.Manager):
@@ -207,10 +207,6 @@ def __init__(cls, name, bases, dct):
         if not cls.is_abstract:
             # register this type in the list of page content types
             PAGE_MODEL_CLASSES.append(cls)
-        if cls.subpage_types:
-            NAVIGABLE_PAGE_MODEL_CLASSES.append(cls)
-        else:
-            LEAF_PAGE_MODEL_CLASSES.append(cls)
 
 
 class Page(MP_Node, ClusterableModel, Indexed):

From 9071a8e0043f9041244a66b1baa388eef3ecafa5 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 17 Jun 2014 21:48:48 +0100
Subject: [PATCH 121/293] Tweak subpage_types logic so that subpage_types=None
 (or undefined) means 'no restriction on subpages', freeing up [] to mean 'no
 subpages allowed'

---
 wagtail/tests/models.py                       |  2 +-
 .../wagtailadmin/tests/test_pages_views.py    | 12 ++++++
 wagtail/wagtailcore/models.py                 | 42 +++++++++----------
 3 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py
index a85cedcfad0..f798129dc3d 100644
--- a/wagtail/tests/models.py
+++ b/wagtail/tests/models.py
@@ -306,4 +306,4 @@ class BusinessIndex(Page):
     subpage_types = ['tests.BusinessChild']
 
 class BusinessChild(Page):
-    pass
+    subpage_types = []
diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py
index 9e51c56816e..5a710722655 100644
--- a/wagtail/wagtailadmin/tests/test_pages_views.py
+++ b/wagtail/wagtailadmin/tests/test_pages_views.py
@@ -688,6 +688,12 @@ def setUp(self):
         self.business_index.slug = "business-index"
         self.root_page.add_child(instance=self.business_index)
 
+        # Add business child
+        self.business_child = BusinessChild()
+        self.business_child.title = "Business Child"
+        self.business_child.slug = "business-child"
+        self.business_index.add_child(instance=self.business_child)
+
         # Login
         self.login()
 
@@ -702,3 +708,9 @@ def test_business_subpage(self):
         self.assertEqual(response.status_code, 200)
         self.assertNotContains(response, 'Standard Child')
         self.assertContains(response, 'Business Child')
+
+    def test_business_child_subpage(self):
+        response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(self.business_child.id, )))
+        self.assertEqual(response.status_code, 200)
+        self.assertNotContains(response, 'Standard Child')
+        self.assertEqual(0, len(response.context['page_types']))
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 1100b3d068a..5c3f9d1c51b 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -253,9 +253,6 @@ def __init__(self, *args, **kwargs):
     def __unicode__(self):
         return self.title
 
-    # by default pages do not allow any kind of subpages
-    subpage_types = []
-
     is_abstract = True  # don't offer Page in the list of page types a superuser can create
 
     def set_url_path(self, parent):
@@ -478,29 +475,30 @@ def clean_subpage_types(cls):
             where required
         """
         if cls._clean_subpage_types is None:
-            if len(cls.subpage_types) == 0:
+            subpage_types = getattr(cls, 'subpage_types', None)
+            if subpage_types is None:
+                # if subpage_types is not specified on the Page class, allow all page types as subpages
                 res = get_page_types()
             else:
                 res = []
-            
-            for page_type in cls.subpage_types:
-                if isinstance(page_type, basestring):
-                    try:
-                        app_label, model_name = page_type.split(".")
-                    except ValueError:
-                        # If we can't split, assume a model in current app
-                        app_label = cls._meta.app_label
-                        model_name = page_type
-
-                    model = get_model(app_label, model_name)
-                    if model:
-                        res.append(ContentType.objects.get_for_model(model))
-                    else:
-                        raise NameError(_("name '{0}' (used in subpage_types list) is not defined.").format(page_type))
+                for page_type in cls.subpage_types:
+                    if isinstance(page_type, basestring):
+                        try:
+                            app_label, model_name = page_type.split(".")
+                        except ValueError:
+                            # If we can't split, assume a model in current app
+                            app_label = cls._meta.app_label
+                            model_name = page_type
+
+                        model = get_model(app_label, model_name)
+                        if model:
+                            res.append(ContentType.objects.get_for_model(model))
+                        else:
+                            raise NameError(_("name '{0}' (used in subpage_types list) is not defined.").format(page_type))
 
-                else:
-                    # assume it's already a model class
-                    res.append(ContentType.objects.get_for_model(page_type))
+                    else:
+                        # assume it's already a model class
+                        res.append(ContentType.objects.get_for_model(page_type))
 
             cls._clean_subpage_types = res
 

From 8f9298f2b4960cb68b72caf851030479859136c7 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 17 Jun 2014 22:03:11 +0100
Subject: [PATCH 122/293] Changelog / contributors entry for #243

---
 CHANGELOG.txt    | 1 +
 CONTRIBUTORS.rst | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 6c28594a916..ddd41d76eb2 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -8,6 +8,7 @@ Changelog
  * Snippets are now ordered alphabetically
  * Removed the "More" section from the admin menu
  * Added pagination to page listings in admin
+ * Support for setting a subpage_types property on page models, to define which page types are allowed as subpages
  * Fix: Animated GIFs are now coalesced before resizing
  * Fix: Wand backend clones images before modifying them
  * Fix: Admin breadcrumb now positioned correctly on mobile
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index d7222307d98..a3f9c7221d5 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -28,6 +28,7 @@ Contributors
 * Ben Margolis
 * Tom Talbot
 * Jeffrey Hearn
+* Robert Clark
 
 Translators
 ===========

From a713895440657907fd3e39cfafda3a7ad8daf4df Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 17 Jun 2014 22:14:23 +0100
Subject: [PATCH 123/293] get_page_types no longer required in
 wagtailadmin.views.pages

---
 wagtail/wagtailadmin/views/pages.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 916c373ebbb..c60a1800e45 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -12,7 +12,7 @@
 from wagtail.wagtailadmin.forms import SearchForm
 from wagtail.wagtailadmin import tasks, hooks
 
-from wagtail.wagtailcore.models import Page, PageRevision, get_page_types
+from wagtail.wagtailcore.models import Page, PageRevision
 
 
 @permission_required('wagtailadmin.access_admin')

From a4b60715b99135ffe7bc452d312f043125a1d685 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 17 Jun 2014 22:27:11 +0100
Subject: [PATCH 124/293] Check that the content type passed to
 wagtailadmin.pages.create is valid according to subpage_types

---
 wagtail/wagtailadmin/tests/test_pages_views.py | 13 +++++++++++++
 wagtail/wagtailadmin/views/pages.py            | 12 ++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py
index 09e6b6f5cb2..986bb260cf8 100644
--- a/wagtail/wagtailadmin/tests/test_pages_views.py
+++ b/wagtail/wagtailadmin/tests/test_pages_views.py
@@ -719,3 +719,16 @@ def test_business_child_subpage(self):
         self.assertEqual(response.status_code, 200)
         self.assertNotContains(response, 'Standard Child')
         self.assertEqual(0, len(response.context['page_types']))
+
+    def test_cannot_add_invalid_subpage_type(self):
+        # cannot add SimplePage as a child of BusinessIndex, as SimplePage is not present in subpage_types
+        response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.business_index.id)))
+        self.assertEqual(response.status_code, 403)
+
+        # likewise for BusinessChild which has an empty subpage_types list
+        response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.business_child.id)))
+        self.assertEqual(response.status_code, 403)
+
+        # but we can add a BusinessChild to BusinessIndex
+        response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'businesschild', self.business_index.id)))
+        self.assertEqual(response.status_code, 200)
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index c60a1800e45..559adb92240 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -111,15 +111,11 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_
     except ContentType.DoesNotExist:
         raise Http404
 
-    page_class = content_type.model_class()
-
     # page must be in the list of allowed subpage types for this parent ID
-    # == Restriction temporarily relaxed so that as superusers we can add index pages and things -
-    # == TODO: reinstate this for regular editors when we have distinct user types
-    #
-    # if page_class not in parent_page.clean_subpage_types():
-    #     messages.error(request, "Sorry, you do not have access to create a page of type '%s' here." % content_type.name)
-    #     return redirect('wagtailadmin_pages_select_type')
+    if content_type not in parent_page.clean_subpage_types():
+        raise PermissionDenied
+
+    page_class = content_type.model_class()
 
     page = page_class(owner=request.user)
     edit_handler_class = get_page_edit_handler(page_class)

From 6bfe82f5e59ca375725b2769dc5b2564d3d19e2c Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 17 Jun 2014 22:53:54 +0100
Subject: [PATCH 125/293] Make can_add_subpage and can_publish_subpage
 permission checks return False for page models that disallow subpages; this
 ensures that 'add child page' links are not shown

---
 .../wagtailadmin/tests/test_pages_views.py    | 32 ++++++++++++++++---
 wagtail/wagtailcore/models.py                 |  7 +++-
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py
index 986bb260cf8..5a2958fb523 100644
--- a/wagtail/wagtailadmin/tests/test_pages_views.py
+++ b/wagtail/wagtailadmin/tests/test_pages_views.py
@@ -703,22 +703,44 @@ def setUp(self):
         self.login()
 
     def test_standard_subpage(self):
-        response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(self.standard_index.id, )))
+        add_subpage_url = reverse('wagtailadmin_pages_add_subpage', args=(self.standard_index.id, ))
+
+        # explorer should contain a link to 'add child page'
+        response = self.client.get(reverse('wagtailadmin_explore', args=(self.standard_index.id, )))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, add_subpage_url)
+
+        # add_subpage should give us the full set of page types to choose
+        response = self.client.get(add_subpage_url)
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, 'Standard Child')
         self.assertContains(response, 'Business Child')
 
     def test_business_subpage(self):
-        response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(self.business_index.id, )))
+        add_subpage_url = reverse('wagtailadmin_pages_add_subpage', args=(self.business_index.id, ))
+
+        # explorer should contain a link to 'add child page'
+        response = self.client.get(reverse('wagtailadmin_explore', args=(self.business_index.id, )))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, add_subpage_url)
+
+        # add_subpage should give us a cut-down set of page types to choose
+        response = self.client.get(add_subpage_url)
         self.assertEqual(response.status_code, 200)
         self.assertNotContains(response, 'Standard Child')
         self.assertContains(response, 'Business Child')
 
     def test_business_child_subpage(self):
-        response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(self.business_child.id, )))
+        add_subpage_url = reverse('wagtailadmin_pages_add_subpage', args=(self.business_child.id, ))
+
+        # explorer should not contain a link to 'add child page', as this page doesn't accept subpages
+        response = self.client.get(reverse('wagtailadmin_explore', args=(self.business_child.id, )))
         self.assertEqual(response.status_code, 200)
-        self.assertNotContains(response, 'Standard Child')
-        self.assertEqual(0, len(response.context['page_types']))
+        self.assertNotContains(response, add_subpage_url)
+
+        # this also means that fetching add_subpage is blocked at the permission-check level
+        response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(self.business_child.id, )))
+        self.assertEqual(response.status_code, 403)
 
     def test_cannot_add_invalid_subpage_type(self):
         # cannot add SimplePage as a child of BusinessIndex, as SimplePage is not present in subpage_types
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 5c3f9d1c51b..d7d23c9889a 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -843,6 +843,8 @@ def __init__(self, user_perms, page):
     def can_add_subpage(self):
         if not self.user.is_active:
             return False
+        if not self.page.specific_class.clean_subpage_types():  # this page model has an empty subpage_types list, so no subpages are allowed
+            return False
         return self.user.is_superuser or ('add' in self.permissions)
 
     def can_edit(self):
@@ -897,10 +899,13 @@ def can_publish_subpage(self):
         """
         Niggly special case for creating and publishing a page in one go.
         Differs from can_publish in that we want to be able to publish subpages of root, but not
-        to be able to publish root itself
+        to be able to publish root itself. (Also, can_publish_subpage returns false if the page
+        does not allow subpages at all.)
         """
         if not self.user.is_active:
             return False
+        if not self.page.specific_class.clean_subpage_types():  # this page model has an empty subpage_types list, so no subpages are allowed
+            return False
 
         return self.user.is_superuser or ('publish' in self.permissions)
 

From eddb060c8d3ea0701fc7ff651127a0f6611eb295 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 17 Jun 2014 23:08:30 +0100
Subject: [PATCH 126/293] Bypass 'choose a page type' screen when there is only
 one available choice in subpage_types

---
 wagtail/tests/models.py                       |  3 +++
 .../wagtailadmin/tests/test_pages_views.py    | 19 +++++++++++++++----
 wagtail/wagtailadmin/views/pages.py           |  6 ++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py
index f798129dc3d..ca6d411dac0 100644
--- a/wagtail/tests/models.py
+++ b/wagtail/tests/models.py
@@ -303,6 +303,9 @@ class StandardChild(Page):
     pass
 
 class BusinessIndex(Page):
+    subpage_types = ['tests.BusinessChild', 'tests.BusinessSubIndex']
+
+class BusinessSubIndex(Page):
     subpage_types = ['tests.BusinessChild']
 
 class BusinessChild(Page):
diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py
index 5a2958fb523..5f4b0021c3c 100644
--- a/wagtail/wagtailadmin/tests/test_pages_views.py
+++ b/wagtail/wagtailadmin/tests/test_pages_views.py
@@ -1,5 +1,5 @@
 from django.test import TestCase
-from wagtail.tests.models import SimplePage, EventPage, StandardIndex, StandardChild, BusinessIndex, BusinessChild
+from wagtail.tests.models import SimplePage, EventPage, StandardIndex, StandardChild, BusinessIndex, BusinessChild, BusinessSubIndex
 from wagtail.tests.utils import unittest, WagtailTestUtils
 from wagtail.wagtailcore.models import Page, PageRevision
 from django.core.urlresolvers import reverse
@@ -681,24 +681,30 @@ def setUp(self):
         # Find root page
         self.root_page = Page.objects.get(id=2)
 
-        # Add standard page
+        # Add standard page (allows subpages of any type)
         self.standard_index = StandardIndex()
         self.standard_index.title = "Standard Index"
         self.standard_index.slug = "standard-index"
         self.root_page.add_child(instance=self.standard_index)
 
-        # Add business page
+        # Add business page (allows BusinessChild and BusinessSubIndex as subpages)
         self.business_index = BusinessIndex()
         self.business_index.title = "Business Index"
         self.business_index.slug = "business-index"
         self.root_page.add_child(instance=self.business_index)
 
-        # Add business child
+        # Add business child (allows no subpages)
         self.business_child = BusinessChild()
         self.business_child.title = "Business Child"
         self.business_child.slug = "business-child"
         self.business_index.add_child(instance=self.business_child)
 
+        # Add business subindex (allows only BusinessChild as subpages)
+        self.business_subindex = BusinessSubIndex()
+        self.business_subindex.title = "Business Subindex"
+        self.business_subindex.slug = "business-subindex"
+        self.business_index.add_child(instance=self.business_subindex)
+
         # Login
         self.login()
 
@@ -754,3 +760,8 @@ def test_cannot_add_invalid_subpage_type(self):
         # but we can add a BusinessChild to BusinessIndex
         response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'businesschild', self.business_index.id)))
         self.assertEqual(response.status_code, 200)
+
+    def test_not_prompted_for_page_type_when_only_one_choice(self):
+        response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(self.business_subindex.id, )))
+        # BusinessChild is the only valid subpage type of BusinessSubIndex, so redirect straight there
+        self.assertRedirects(response, reverse('wagtailadmin_pages_create', args=('tests', 'businesschild', self.business_subindex.id)))
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 559adb92240..f12a08fe6cb 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -59,6 +59,12 @@ def add_subpage(request, parent_page_id):
 
     page_types = sorted(parent_page.clean_subpage_types(), key=lambda pagetype: pagetype.name.lower())
 
+    if len(page_types) == 1:
+        # Only one page type is available - redirect straight to the create form rather than
+        # making the user choose
+        content_type = page_types[0]
+        return redirect('wagtailadmin_pages_create', content_type.app_label, content_type.model, parent_page.id)
+
     return render(request, 'wagtailadmin/pages/add_subpage.html', {
         'parent_page': parent_page,
         'page_types': page_types,

From c46ab6c20975528fd7b42e9bbb00a494606f5e4d Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 18 Jun 2014 11:24:38 +0100
Subject: [PATCH 127/293] Renamed wagtailcore.util to wagtailcore.utils

---
 wagtail/wagtailadmin/edit_handlers.py                  | 2 +-
 wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py | 2 +-
 wagtail/wagtailcore/models.py                          | 2 +-
 wagtail/wagtailcore/util.py                            | 9 +++++----
 wagtail/wagtailcore/utils.py                           | 6 ++++++
 5 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 wagtail/wagtailcore/utils.py

diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py
index 245f7ad60d1..9fd125f5637 100644
--- a/wagtail/wagtailadmin/edit_handlers.py
+++ b/wagtail/wagtailadmin/edit_handlers.py
@@ -19,7 +19,7 @@
 from django.utils.translation import ugettext_lazy
 
 from wagtail.wagtailcore.models import Page
-from wagtail.wagtailcore.util import camelcase_to_underscore
+from wagtail.wagtailcore.utils import camelcase_to_underscore
 from wagtail.wagtailcore.fields import RichTextArea
 
 
diff --git a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
index 2d85c355e3d..9f03c7b6392 100644
--- a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
+++ b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
@@ -6,7 +6,7 @@
 from wagtail.wagtailadmin.menu import MenuItem
 
 from wagtail.wagtailcore.models import get_navigation_menu_items, UserPagePermissionsProxy
-from wagtail.wagtailcore.util import camelcase_to_underscore
+from wagtail.wagtailcore.utils import camelcase_to_underscore
 
 
 register = template.Library()
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 5c3f9d1c51b..b14181faf79 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -18,7 +18,7 @@
 
 from treebeard.mp_tree import MP_Node
 
-from wagtail.wagtailcore.util import camelcase_to_underscore
+from wagtail.wagtailcore.utils import camelcase_to_underscore
 from wagtail.wagtailcore.query import PageQuerySet
 
 from wagtail.wagtailsearch import Indexed, get_search_backend
diff --git a/wagtail/wagtailcore/util.py b/wagtail/wagtailcore/util.py
index c5ad7ea8da1..842fe24faea 100644
--- a/wagtail/wagtailcore/util.py
+++ b/wagtail/wagtailcore/util.py
@@ -1,6 +1,7 @@
-import re
+import warnings
 
+warnings.warn(
+    "The wagtail.wagtailcore.util module has been renamed. "
+    "Use wagtail.wagtailcore.utils instead.", DeprecationWarning)
 
-def camelcase_to_underscore(str):
-    # http://djangosnippets.org/snippets/585/
-    return re.sub('(((?<=[a-z])[A-Z])|([A-Z](?![A-Z]|$)))', '_\\1', str).lower().strip('_')
+from .utils import *
diff --git a/wagtail/wagtailcore/utils.py b/wagtail/wagtailcore/utils.py
new file mode 100644
index 00000000000..c5ad7ea8da1
--- /dev/null
+++ b/wagtail/wagtailcore/utils.py
@@ -0,0 +1,6 @@
+import re
+
+
+def camelcase_to_underscore(str):
+    # http://djangosnippets.org/snippets/585/
+    return re.sub('(((?<=[a-z])[A-Z])|([A-Z](?![A-Z]|$)))', '_\\1', str).lower().strip('_')

From ace28dd602a2ddd2220863705a977f1786361011 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 18 Jun 2014 11:26:11 +0100
Subject: [PATCH 128/293] move preview css to scss file

---
 .../static/wagtailadmin/js/page-editor.js     | 11 ++-
 .../wagtailadmin/scss/layouts/preview.scss    | 86 +++++++++++++++++
 .../templates/wagtailadmin/pages/preview.html | 92 ++-----------------
 3 files changed, 99 insertions(+), 90 deletions(-)
 create mode 100644 wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/preview.scss

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index b8de0d13176..fd7d272c504 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -332,7 +332,9 @@ $(function() {
     });
 
     /* Set up behaviour of preview button */
-    $('.action-preview').click(function() {
+    $('.action-preview').click(function(e) {        
+        e.preventDefault();
+        
         var previewWindow = window.open($(this).data('placeholder'), $(this).data('windowname'));
 
         $.ajax({
@@ -349,9 +351,10 @@ $(function() {
                     frame.document.write(data);                 
                     frame.document.close();
 
-                    var removeTimeout = setTimeout(function(){
+                    var hideTimeout = setTimeout(function(){
                         pdoc.getElementById('loading-spinner-wrapper').className += 'remove';
-                    }, 100) /* just enough to give effect without adding discernible slowness */
+                        clearTimeout(hideTimeout);
+                    }, 50) // just enough to give effect without adding discernible slowness
                 } else {
                     previewWindow.close();
                     document.open();
@@ -365,11 +368,11 @@ $(function() {
                 error output rather than giving a 'friendly' error message so that
                 developers can debug template errors. (On a production site, we'd
                 typically be serving a friendly custom 500 page anyhow.) */
+
                 previewWindow.document.open();
                 previewWindow.document.write(xhr.responseText);
                 previewWindow.document.close();
             }
         });
-        return false;
     });
 });
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/preview.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/preview.scss
new file mode 100644
index 00000000000..a655eddfbd2
--- /dev/null
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/preview.scss
@@ -0,0 +1,86 @@
+@import "../variables.scss";
+@import "../mixins.scss";
+
+/* This font is just a single spinner glyph */
+@font-face {
+    font-family: 'wagtail';
+    src: url(data:application/x-font-ttf;charset=utf-8;base64,AAEAAAALAIAAAwAwT1MvMggiBucAAAC8AAAAYGNtYXAAIwC5AAABHAAAAExnYXNwAAAAEAAAAWgAAAAIZ2x5Zu2pTysAAAFwAAAA0GhlYWQAoBqvAAACQAAAADZoaGVhA+IB5gAAAngAAAAkaG10eAMAAAAAAAKcAAAAFGxvY2EAKAB8AAACsAAAAAxtYXhwAAgAMwAAArwAAAAgbmFtZTAOqMkAAALcAAABOXBvc3QAAwAAAAAEGAAAACAAAwIAAZAABQAAAUwBZgAAAEcBTAFmAAAA9QAZAIQAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAABAAAAAMQHg/+D/4AHgACAAAAABAAAAAAAAAAAAAAAgAAAAAAACAAAAAwAAABQAAwABAAAAFAAEADgAAAAKAAgAAgACAAEAIAAx//3//wAAAAAAIAAx//3//wAB/+P/0wADAAEAAAAAAAAAAAAAAAEAAf//AA8AAQAAAAAAAAAAAAIAADc5AQAAAAABAAAAAAAAAAAAAgAANzkBAAAAAAEAAAAAAAAAAAACAAA3OQEAAAAAAgAA/+ACAAHgABcAMAAANy4DNTQ+Ah8BByYOAhUUHgIXBxcnNz4DJzYuAic/AR4DBxYOAiNLEhwTCihGXTUgIChGNB4HDxQOKLAhISdHMx8BAQgOFQ0mBxEdEgsBASlFXjQrEiouMRo0XkUpAR8hAR8zRycUJCQeDwR0IR8BHTVFKRImIiANBSgSKi4xGjVdRigAAAEAAAABAADi0eQAXw889QALAgAAAAAAz8Bs+QAAAADPwGz5AAD/4AIAAeAAAAAIAAIAAAAAAAAAAQAAAeD/4AAAAgAAAAAAAgAAAQAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAABAAAAAgAAAAAAAAAACgAUAB4AaAABAAAABQAxAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAADgCuAAEAAAAAAAEADgAAAAEAAAAAAAIADgBHAAEAAAAAAAMADgAkAAEAAAAAAAQADgBVAAEAAAAAAAUAFgAOAAEAAAAAAAYABwAyAAEAAAAAAAoAKABjAAMAAQQJAAEADgAAAAMAAQQJAAIADgBHAAMAAQQJAAMADgAkAAMAAQQJAAQADgBVAAMAAQQJAAUAFgAOAAMAAQQJAAYADgA5AAMAAQQJAAoAKABjAHcAYQBnAHQAYQBpAGwAVgBlAHIAcwBpAG8AbgAgADEALgAwAHcAYQBnAHQAYQBpAGx3YWd0YWlsAHcAYQBnAHQAYQBpAGwAUgBlAGcAdQBsAGEAcgB3AGEAZwB0AGEAaQBsAEcAZQBuAGUAcgBhAHQAZQBkACAAYgB5ACAASQBjAG8ATQBvAG8AbgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA) format('truetype'),
+         url(data:application/font-woff;charset=utf-8;base64,d09GRk9UVE8AAARsAAoAAAAABCQAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABDRkYgAAAA9AAAAO4AAADuSyBzg09TLzIAAAHkAAAAYAAAAGAIIgbnY21hcAAAAkQAAABMAAAATAAjALlnYXNwAAACkAAAAAgAAAAIAAAAEGhlYWQAAAKYAAAANgAAADYAoBqvaGhlYQAAAtAAAAAkAAAAJAPiAeZobXR4AAAC9AAAABQAAAAUAwAAAG1heHAAAAMIAAAABgAAAAYABVAAbmFtZQAAAxAAAAE5AAABOTAOqMlwb3N0AAAETAAAACAAAAAgAAMAAAEABAQAAQEBCHdhZ3RhaWwAAQIAAQA6+BwC+BsD+BgEHgoAGVP/i4seCgAZU/+LiwwHi2v4lPh0BR0AAAB0Dx0AAAB5ER0AAAAJHQAAAOUSAAYBAQgPERMWGXdhZ3RhaWx3YWd0YWlsdTB1MXUyMHUzMQAAAgGJAAMABQEBBAcKDWT8lA78lA78lA77lA7WthVbu3DMi8+L9yH3B/cH9yGLCKtra2sFIYs1NYshi1ifWq9nCGSGBfdD+wcVa6urqwX1i+Hhi/WLvne8Z68IspCRswW7W6ZKi0eL+yH7B/sH+yGLCA74lBT4lBWLDAoAAAADAgABkAAFAAABTAFmAAAARwFMAWYAAAD1ABkAhAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAEAAAAAxAeD/4P/gAeAAIAAAAAEAAAAAAAAAAAAAACAAAAAAAAIAAAADAAAAFAADAAEAAAAUAAQAOAAAAAoACAACAAIAAQAgADH//f//AAAAAAAgADH//f//AAH/4//TAAMAAQAAAAAAAAAAAAAAAQAB//8ADwABAAAAAQAAaXw/5l8PPPUACwIAAAAAAM/AbPkAAAAAz8Bs+QAA/+ACAAHgAAAACAACAAAAAAAAAAEAAAHg/+AAAAIAAAAAAAIAAAEAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAQAAAAIAAAAAAFAAAAUAAAAAAA4ArgABAAAAAAABAA4AAAABAAAAAAACAA4ARwABAAAAAAADAA4AJAABAAAAAAAEAA4AVQABAAAAAAAFABYADgABAAAAAAAGAAcAMgABAAAAAAAKACgAYwADAAEECQABAA4AAAADAAEECQACAA4ARwADAAEECQADAA4AJAADAAEECQAEAA4AVQADAAEECQAFABYADgADAAEECQAGAA4AOQADAAEECQAKACgAYwB3AGEAZwB0AGEAaQBsAFYAZQByAHMAaQBvAG4AIAAxAC4AMAB3AGEAZwB0AGEAaQBsd2FndGFpbAB3AGEAZwB0AGEAaQBsAFIAZQBnAHUAbABhAHIAdwBhAGcAdABhAGkAbABHAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAEkAYwBvAE0AbwBvAG4AAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==) format('woff');
+    font-weight: normal;
+    font-style: normal;
+}
+
+html,body {
+    height:100%;
+    padding:0;
+    margin:0;
+}
+
+#loading-spinner-wrapper{
+    position:fixed;
+    bottom:0;
+    text-align:center;
+    height:100%;
+    width:100%;
+    font-size:0em;
+    z-index:999999;
+    background:white;
+    @include transition(all 0.3s ease);
+
+    &.remove{
+        bottom:-100%;
+    }
+
+    &:before {
+        content: '';
+        width:0px;
+        display: inline-block;
+        height: 100%;
+        vertical-align: middle;
+        margin-left:-0.4em;
+    }
+}
+
+#loading-spinner{
+    position:relative;
+    display:inline-block;
+    width:120px;
+    height:120px;
+    vertical-align:middle;
+
+    &:after{
+        font-size:120px;
+        line-height:120px;
+        color:$color-teal;
+        position:absolute;
+        left:0;
+        top:0;
+        font-family:wagtail;
+        content:"1";
+        width:1em;
+        animation: spin 0.8s infinite linear;
+        -webkit-animation: spin 0.8s infinite linear;
+        -moz-animation: spin 0.8s infinite linear;   
+    }
+}
+
+#preview-frame{
+    height:100%;
+    width:100%;
+    position:absolute;
+    z-index:1;
+    border:0;
+}
+
+@keyframes spin {
+    from { transform: rotate(0deg); }
+    to { transform: rotate(360deg); }
+}
+@-webkit-keyframes spin {
+    from { -webkit-transform: rotate(0deg); }
+    to { -webkit-transform: rotate(360deg); }
+}
+@-moz-keyframes spin {
+    from { -moz-transform: rotate(0deg); }
+    to { -moz-transform: rotate(360deg); }
+}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
index 3cacb7d1042..d5c4b7a51ce 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
@@ -1,93 +1,13 @@
 <!DOCTYPE HTML>
-{% load static %}
+{% load static compress i18n %}
 <html>
     <head>
-        <title>Preview loading...</title>
-        <style>
-            /* This font is just a single spinner glyph */
-            @font-face {
-                font-family: 'wagtail';
-                src: url(data:application/x-font-ttf;charset=utf-8;base64,AAEAAAALAIAAAwAwT1MvMggiBucAAAC8AAAAYGNtYXAAIwC5AAABHAAAAExnYXNwAAAAEAAAAWgAAAAIZ2x5Zu2pTysAAAFwAAAA0GhlYWQAoBqvAAACQAAAADZoaGVhA+IB5gAAAngAAAAkaG10eAMAAAAAAAKcAAAAFGxvY2EAKAB8AAACsAAAAAxtYXhwAAgAMwAAArwAAAAgbmFtZTAOqMkAAALcAAABOXBvc3QAAwAAAAAEGAAAACAAAwIAAZAABQAAAUwBZgAAAEcBTAFmAAAA9QAZAIQAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAABAAAAAMQHg/+D/4AHgACAAAAABAAAAAAAAAAAAAAAgAAAAAAACAAAAAwAAABQAAwABAAAAFAAEADgAAAAKAAgAAgACAAEAIAAx//3//wAAAAAAIAAx//3//wAB/+P/0wADAAEAAAAAAAAAAAAAAAEAAf//AA8AAQAAAAAAAAAAAAIAADc5AQAAAAABAAAAAAAAAAAAAgAANzkBAAAAAAEAAAAAAAAAAAACAAA3OQEAAAAAAgAA/+ACAAHgABcAMAAANy4DNTQ+Ah8BByYOAhUUHgIXBxcnNz4DJzYuAic/AR4DBxYOAiNLEhwTCihGXTUgIChGNB4HDxQOKLAhISdHMx8BAQgOFQ0mBxEdEgsBASlFXjQrEiouMRo0XkUpAR8hAR8zRycUJCQeDwR0IR8BHTVFKRImIiANBSgSKi4xGjVdRigAAAEAAAABAADi0eQAXw889QALAgAAAAAAz8Bs+QAAAADPwGz5AAD/4AIAAeAAAAAIAAIAAAAAAAAAAQAAAeD/4AAAAgAAAAAAAgAAAQAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAABAAAAAgAAAAAAAAAACgAUAB4AaAABAAAABQAxAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAADgCuAAEAAAAAAAEADgAAAAEAAAAAAAIADgBHAAEAAAAAAAMADgAkAAEAAAAAAAQADgBVAAEAAAAAAAUAFgAOAAEAAAAAAAYABwAyAAEAAAAAAAoAKABjAAMAAQQJAAEADgAAAAMAAQQJAAIADgBHAAMAAQQJAAMADgAkAAMAAQQJAAQADgBVAAMAAQQJAAUAFgAOAAMAAQQJAAYADgA5AAMAAQQJAAoAKABjAHcAYQBnAHQAYQBpAGwAVgBlAHIAcwBpAG8AbgAgADEALgAwAHcAYQBnAHQAYQBpAGx3YWd0YWlsAHcAYQBnAHQAYQBpAGwAUgBlAGcAdQBsAGEAcgB3AGEAZwB0AGEAaQBsAEcAZQBuAGUAcgBhAHQAZQBkACAAYgB5ACAASQBjAG8ATQBvAG8AbgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA) format('truetype'),
-                     url(data:application/font-woff;charset=utf-8;base64,d09GRk9UVE8AAARsAAoAAAAABCQAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABDRkYgAAAA9AAAAO4AAADuSyBzg09TLzIAAAHkAAAAYAAAAGAIIgbnY21hcAAAAkQAAABMAAAATAAjALlnYXNwAAACkAAAAAgAAAAIAAAAEGhlYWQAAAKYAAAANgAAADYAoBqvaGhlYQAAAtAAAAAkAAAAJAPiAeZobXR4AAAC9AAAABQAAAAUAwAAAG1heHAAAAMIAAAABgAAAAYABVAAbmFtZQAAAxAAAAE5AAABOTAOqMlwb3N0AAAETAAAACAAAAAgAAMAAAEABAQAAQEBCHdhZ3RhaWwAAQIAAQA6+BwC+BsD+BgEHgoAGVP/i4seCgAZU/+LiwwHi2v4lPh0BR0AAAB0Dx0AAAB5ER0AAAAJHQAAAOUSAAYBAQgPERMWGXdhZ3RhaWx3YWd0YWlsdTB1MXUyMHUzMQAAAgGJAAMABQEBBAcKDWT8lA78lA78lA77lA7WthVbu3DMi8+L9yH3B/cH9yGLCKtra2sFIYs1NYshi1ifWq9nCGSGBfdD+wcVa6urqwX1i+Hhi/WLvne8Z68IspCRswW7W6ZKi0eL+yH7B/sH+yGLCA74lBT4lBWLDAoAAAADAgABkAAFAAABTAFmAAAARwFMAWYAAAD1ABkAhAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAEAAAAAxAeD/4P/gAeAAIAAAAAEAAAAAAAAAAAAAACAAAAAAAAIAAAADAAAAFAADAAEAAAAUAAQAOAAAAAoACAACAAIAAQAgADH//f//AAAAAAAgADH//f//AAH/4//TAAMAAQAAAAAAAAAAAAAAAQAB//8ADwABAAAAAQAAaXw/5l8PPPUACwIAAAAAAM/AbPkAAAAAz8Bs+QAA/+ACAAHgAAAACAACAAAAAAAAAAEAAAHg/+AAAAIAAAAAAAIAAAEAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAQAAAAIAAAAAAFAAAAUAAAAAAA4ArgABAAAAAAABAA4AAAABAAAAAAACAA4ARwABAAAAAAADAA4AJAABAAAAAAAEAA4AVQABAAAAAAAFABYADgABAAAAAAAGAAcAMgABAAAAAAAKACgAYwADAAEECQABAA4AAAADAAEECQACAA4ARwADAAEECQADAA4AJAADAAEECQAEAA4AVQADAAEECQAFABYADgADAAEECQAGAA4AOQADAAEECQAKACgAYwB3AGEAZwB0AGEAaQBsAFYAZQByAHMAaQBvAG4AIAAxAC4AMAB3AGEAZwB0AGEAaQBsd2FndGFpbAB3AGEAZwB0AGEAaQBsAFIAZQBnAHUAbABhAHIAdwBhAGcAdABhAGkAbABHAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAEkAYwBvAE0AbwBvAG4AAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==) format('woff');
-                font-weight: normal;
-                font-style: normal;
-            }
-            html,body {
-                height:100%;
-                padding:0;
-                margin:0;
-            }
-
-            #loading-spinner-wrapper{
-                position:fixed;
-                bottom:0;
-                text-align:center;
-                height:100%;
-                width:100%;
-                font-size:0em;
-                z-index:999999;
-                background:white;
-                -webkit-transition: all 0.3s ease;
-                   -moz-transition: all 0.3s ease;
-                     -o-transition: all 0.3s ease;
-                        transition: all 0.3s ease;   
-            }
-                #loading-spinner-wrapper.remove{
-                    bottom:-100%;
-                }
-                #loading-spinner-wrapper:before {
-                    content: '';
-                    width:0px;
-                    display: inline-block;
-                    height: 100%;
-                    vertical-align: middle;
-                    margin-left:-0.4em;
-                }
-                #loading-spinner{
-                    position:relative;
-                    display:inline-block;
-                    width:120px;
-                    height:120px;
-                    vertical-align:middle;
-                }
-                    #loading-spinner:after{
-                        font-size:120px;
-                        line-height:120px;
-                        color:#43b1b0;
-                        position:absolute;
-                        left:0;
-                        top:0;
-                        font-family:wagtail;
-                        content:"1";
-                        width:1em;
-                        animation: spin 0.8s infinite linear;
-                        -webkit-animation: spin 0.8s infinite linear;
-                        -moz-animation: spin 0.8s infinite linear;   
-                    }
-            
-            #preview-frame{
-                height:100%;
-                width:100%;
-                position:absolute;
-                z-index:1;
-                border:0;
-            }
-
-            @keyframes spin {
-                from { transform: rotate(0deg); }
-                to { transform: rotate(360deg); }
-            }
-            @-webkit-keyframes spin {
-                from { -webkit-transform: rotate(0deg); }
-                to { -webkit-transform: rotate(360deg); }
-            }
-            @-moz-keyframes spin {
-                from { -moz-transform: rotate(0deg); }
-                to { -moz-transform: rotate(360deg); }
-            }
-        </style>
+        <title>{% trans "Preview" %}</title>
+        {% compress css %}
+            <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/layouts/preview.scss" type="text/x-scss" />
+        {% endcompress %}
     </head>
-    <body>
+    <body class="ready">
         <div id="loading-spinner-wrapper">
             <div id="loading-spinner"></div>
         </div>

From 46fc45877cf479f57bd105afa485133108bc24a2 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 18 Jun 2014 11:27:34 +0100
Subject: [PATCH 129/293] Replaced get_query_set methods with get_queryset

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

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index b14181faf79..1f0c98d83e2 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -126,56 +126,56 @@ def get_navigable_page_content_type_ids():
 
 
 class PageManager(models.Manager):
-    def get_query_set(self):
+    def get_queryset(self):
         return PageQuerySet(self.model).order_by('path')
 
     def live(self):
-        return self.get_query_set().live()
+        return self.get_queryset().live()
 
     def not_live(self):
-        return self.get_query_set().not_live()
+        return self.get_queryset().not_live()
 
     def page(self, other):
-        return self.get_query_set().page(other)
+        return self.get_queryset().page(other)
 
     def not_page(self, other):
-        return self.get_query_set().not_page(other)
+        return self.get_queryset().not_page(other)
 
     def descendant_of(self, other, inclusive=False):
-        return self.get_query_set().descendant_of(other, inclusive)
+        return self.get_queryset().descendant_of(other, inclusive)
 
     def not_descendant_of(self, other, inclusive=False):
-        return self.get_query_set().not_descendant_of(other, inclusive)
+        return self.get_queryset().not_descendant_of(other, inclusive)
 
     def child_of(self, other):
-        return self.get_query_set().child_of(other)
+        return self.get_queryset().child_of(other)
 
     def not_child_of(self, other):
-        return self.get_query_set().not_child_of(other)
+        return self.get_queryset().not_child_of(other)
 
     def ancestor_of(self, other, inclusive=False):
-        return self.get_query_set().ancestor_of(other, inclusive)
+        return self.get_queryset().ancestor_of(other, inclusive)
 
     def not_ancestor_of(self, other, inclusive=False):
-        return self.get_query_set().not_ancestor_of(other, inclusive)
+        return self.get_queryset().not_ancestor_of(other, inclusive)
 
     def parent_of(self, other):
-        return self.get_query_set().parent_of(other)
+        return self.get_queryset().parent_of(other)
 
     def not_parent_of(self, other):
-        return self.get_query_set().not_parent_of(other)
+        return self.get_queryset().not_parent_of(other)
 
     def sibling_of(self, other, inclusive=False):
-        return self.get_query_set().sibling_of(other, inclusive)
+        return self.get_queryset().sibling_of(other, inclusive)
 
     def not_sibling_of(self, other, inclusive=False):
-        return self.get_query_set().not_sibling_of(other, inclusive)
+        return self.get_queryset().not_sibling_of(other, inclusive)
 
     def type(self, model):
-        return self.get_query_set().type(model)
+        return self.get_queryset().type(model)
 
     def not_type(self, model):
-        return self.get_query_set().not_type(model)
+        return self.get_queryset().not_type(model)
 
 
 class PageBase(models.base.ModelBase):
@@ -697,8 +697,8 @@ class Meta:
 
 
 class SubmittedRevisionsManager(models.Manager):
-    def get_query_set(self):
-        return super(SubmittedRevisionsManager, self).get_query_set().filter(submitted_for_moderation=True)
+    def get_queryset(self):
+        return super(SubmittedRevisionsManager, self).get_queryset().filter(submitted_for_moderation=True)
 
 
 class PageRevision(models.Model):

From 1ca6de4d463e7ed62bf72bc758c07b4522a13bce Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 18 Jun 2014 11:54:12 +0100
Subject: [PATCH 130/293] Improvements to wagtaildocs pagination tests

---
 wagtail/wagtaildocs/tests.py | 86 ++++++++++++++++++++++++++++++++----
 1 file changed, 78 insertions(+), 8 deletions(-)

diff --git a/wagtail/wagtaildocs/tests.py b/wagtail/wagtaildocs/tests.py
index 3353ce39ed9..576a3116f49 100644
--- a/wagtail/wagtaildocs/tests.py
+++ b/wagtail/wagtaildocs/tests.py
@@ -56,11 +56,46 @@ def test_search(self):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context['query_string'], "Hello")
 
+    def make_docs(self):
+        for i in range(50):
+            document = models.Document(title="Test " + str(i))
+            document.save()
+
     def test_pagination(self):
-        pages = ['0', '1', '-1', '9999', 'Not a page']
-        for page in pages:
-            response = self.get({'p': page})
-            self.assertEqual(response.status_code, 200)
+        self.make_docs()
+
+        response = self.client.get(reverse('wagtaildocs_index'), {'p': 2})
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtaildocs/documents/index.html')
+
+        # Check that we got the correct page
+        self.assertEqual(response.context['documents'].number, 2)
+
+    def test_pagination_invalid(self):
+        self.make_docs()
+
+        response = self.client.get(reverse('wagtaildocs_index'), {'p': 'Hello World!'})
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtaildocs/documents/index.html')
+
+        # Check that we got page one
+        self.assertEqual(response.context['documents'].number, 1)
+
+    def test_pagination_out_of_range(self):
+        self.make_docs()
+
+        response = self.client.get(reverse('wagtaildocs_index'), {'p': 99999})
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtaildocs/documents/index.html')
+
+        # Check that we got the last page
+        self.assertEqual(response.context['documents'].number, response.context['documents'].paginator.num_pages)
 
     def test_ordering(self):
         orderings = ['title', '-created_at']
@@ -138,11 +173,46 @@ def test_search(self):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context['query_string'], "Hello")
 
+    def make_docs(self):
+        for i in range(50):
+            document = models.Document(title="Test " + str(i))
+            document.save()
+
     def test_pagination(self):
-        pages = ['0', '1', '-1', '9999', 'Not a page']
-        for page in pages:
-            response = self.get({'p': page})
-            self.assertEqual(response.status_code, 200)
+        self.make_docs()
+
+        response = self.client.get(reverse('wagtaildocs_chooser'), {'p': 2})
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtaildocs/documents/list.html')
+
+        # Check that we got the correct page
+        self.assertEqual(response.context['documents'].number, 2)
+
+    def test_pagination_invalid(self):
+        self.make_docs()
+
+        response = self.client.get(reverse('wagtaildocs_chooser'), {'p': 'Hello World!'})
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtaildocs/documents/list.html')
+
+        # Check that we got page one
+        self.assertEqual(response.context['documents'].number, 1)
+
+    def test_pagination_out_of_range(self):
+        self.make_docs()
+
+        response = self.client.get(reverse('wagtaildocs_chooser'), {'p': 99999})
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtaildocs/documents/list.html')
+
+        # Check that we got the last page
+        self.assertEqual(response.context['documents'].number, response.context['documents'].paginator.num_pages)
 
 
 class TestDocumentChooserChosenView(TestCase, WagtailTestUtils):

From bf84b7f64a0903200f82a5b2ff562d6c639289aa Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 18 Jun 2014 11:57:37 +0100
Subject: [PATCH 131/293] Removed get method from wagtaildocs tests

---
 wagtail/wagtaildocs/tests.py | 41 +++++++++---------------------------
 1 file changed, 10 insertions(+), 31 deletions(-)

diff --git a/wagtail/wagtaildocs/tests.py b/wagtail/wagtaildocs/tests.py
index 576a3116f49..a39796c1de7 100644
--- a/wagtail/wagtaildocs/tests.py
+++ b/wagtail/wagtaildocs/tests.py
@@ -43,16 +43,13 @@ class TestDocumentIndexView(TestCase, WagtailTestUtils):
     def setUp(self):
         self.login()
 
-    def get(self, params={}):
-        return self.client.get(reverse('wagtaildocs_index'), params)
-
     def test_simple(self):
-        response = self.get()
+        response = self.client.get(reverse('wagtaildocs_index'))
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtaildocs/documents/index.html')
 
     def test_search(self):
-        response = self.get({'q': "Hello"})
+        response = self.client.get(reverse('wagtaildocs_index'), {'q': "Hello"})
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context['query_string'], "Hello")
 
@@ -100,7 +97,7 @@ def test_pagination_out_of_range(self):
     def test_ordering(self):
         orderings = ['title', '-created_at']
         for ordering in orderings:
-            response = self.get({'ordering': ordering})
+            response = self.client.get(reverse('wagtaildocs_index'), {'ordering': ordering})
             self.assertEqual(response.status_code, 200)
 
 
@@ -108,11 +105,8 @@ class TestDocumentAddView(TestCase, WagtailTestUtils):
     def setUp(self):
         self.login()
 
-    def get(self, params={}):
-        return self.client.get(reverse('wagtaildocs_add_document'), params)
-
     def test_simple(self):
-        response = self.get()
+        response = self.client.get(reverse('wagtaildocs_add_document'))
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtaildocs/documents/add.html')
 
@@ -126,11 +120,8 @@ def setUp(self):
         # Create a document to edit
         self.document = models.Document.objects.create(title="Test document")
 
-    def get(self, params={}):
-        return self.client.get(reverse('wagtaildocs_edit_document', args=(self.document.id,)), params)
-
     def test_simple(self):
-        response = self.get()
+        response = self.client.get(reverse('wagtaildocs_edit_document', args=(self.document.id,)))
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtaildocs/documents/edit.html')
 
@@ -144,11 +135,8 @@ def setUp(self):
         # Create a document to delete
         self.document = models.Document.objects.create(title="Test document")
 
-    def get(self, params={}):
-        return self.client.get(reverse('wagtaildocs_delete_document', args=(self.document.id,)), params)
-
     def test_simple(self):
-        response = self.get()
+        response = self.client.get(reverse('wagtaildocs_delete_document', args=(self.document.id,)))
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtaildocs/documents/confirm_delete.html')
 
@@ -159,17 +147,14 @@ class TestDocumentChooserView(TestCase, WagtailTestUtils):
     def setUp(self):
         self.login()
 
-    def get(self, params={}):
-        return self.client.get(reverse('wagtaildocs_chooser'), params)
-
     def test_simple(self):
-        response = self.get()
+        response = self.client.get(reverse('wagtaildocs_chooser'))
         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"})
+        response = self.client.get(reverse('wagtaildocs_chooser'), {'q': "Hello"})
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context['query_string'], "Hello")
 
@@ -222,11 +207,8 @@ def setUp(self):
         # Create a document to choose
         self.document = models.Document.objects.create(title="Test document")
 
-    def get(self, params={}):
-        return self.client.get(reverse('wagtaildocs_document_chosen', args=(self.document.id,)), params)
-
     def test_simple(self):
-        response = self.get()
+        response = self.client.get(reverse('wagtaildocs_document_chosen', args=(self.document.id,)))
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtaildocs/chooser/document_chosen.js')
 
@@ -237,11 +219,8 @@ class TestDocumentChooserUploadView(TestCase, WagtailTestUtils):
     def setUp(self):
         self.login()
 
-    def get(self, params={}):
-        return self.client.get(reverse('wagtaildocs_chooser_upload'), params)
-
     def test_simple(self):
-        response = self.get()
+        response = self.client.get(reverse('wagtaildocs_chooser_upload'))
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtaildocs/chooser/chooser.html')
         self.assertTemplateUsed(response, 'wagtaildocs/chooser/chooser.js')

From 929aa0f5e8725f7bd678dcb6a15b87de481a3e05 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 18 Jun 2014 12:26:15 +0100
Subject: [PATCH 132/293] Added posting tests to wagtaildocs

---
 wagtail/wagtaildocs/tests.py | 76 ++++++++++++++++++++++++++++++++----
 1 file changed, 69 insertions(+), 7 deletions(-)

diff --git a/wagtail/wagtaildocs/tests.py b/wagtail/wagtaildocs/tests.py
index a39796c1de7..a8420406baf 100644
--- a/wagtail/wagtaildocs/tests.py
+++ b/wagtail/wagtaildocs/tests.py
@@ -110,22 +110,58 @@ def test_simple(self):
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtaildocs/documents/add.html')
 
-    # TODO: Test posting
+    def test_post(self):
+        # Build a fake file
+        fake_file = ContentFile("A boring example document")
+        fake_file.name = 'test.txt'
+
+        # Submit
+        post_data = {
+            'title': "Test document",
+            'file': fake_file,
+        }
+        response = self.client.post(reverse('wagtaildocs_add_document'), post_data)
+
+        # User should be redirected back to the index
+        self.assertRedirects(response, reverse('wagtaildocs_index'))
+
+        # Document should be created
+        self.assertTrue(models.Document.objects.filter(title="Test document").exists())
 
 
 class TestDocumentEditView(TestCase, WagtailTestUtils):
     def setUp(self):
         self.login()
 
+        # Build a fake file
+        fake_file = ContentFile("A boring example document")
+        fake_file.name = 'test.txt'
+
         # Create a document to edit
-        self.document = models.Document.objects.create(title="Test document")
+        self.document = models.Document.objects.create(title="Test document", file=fake_file)
 
     def test_simple(self):
         response = self.client.get(reverse('wagtaildocs_edit_document', args=(self.document.id,)))
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtaildocs/documents/edit.html')
 
-    # TODO: Test posting
+    def test_post(self):
+        # Build a fake file
+        fake_file = ContentFile("A boring example document")
+        fake_file.name = 'test.txt'
+
+        # Submit title change
+        post_data = {
+            'title': "Test document changed!",
+            'file': fake_file,
+        }
+        response = self.client.post(reverse('wagtaildocs_edit_document', args=(self.document.id,)), post_data)
+
+        # User should be redirected back to the index
+        self.assertRedirects(response, reverse('wagtaildocs_index'))
+
+        # Document title should be changed
+        self.assertEqual(models.Document.objects.get(id=self.document.id).title, "Test document changed!")
 
 
 class TestDocumentDeleteView(TestCase, WagtailTestUtils):
@@ -140,7 +176,18 @@ def test_simple(self):
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtaildocs/documents/confirm_delete.html')
 
-    # TODO: Test posting
+    def test_delete(self):
+        # Submit title change
+        post_data = {
+            'foo': 'bar'
+        }
+        response = self.client.post(reverse('wagtaildocs_delete_document', args=(self.document.id,)), post_data)
+
+        # User should be redirected back to the index
+        self.assertRedirects(response, reverse('wagtaildocs_index'))
+
+        # Document should be deleted
+        self.assertFalse(models.Document.objects.filter(id=self.document.id).exists())
 
 
 class TestDocumentChooserView(TestCase, WagtailTestUtils):
@@ -212,8 +259,6 @@ def test_simple(self):
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtaildocs/chooser/document_chosen.js')
 
-    # TODO: Test posting
-
 
 class TestDocumentChooserUploadView(TestCase, WagtailTestUtils):
     def setUp(self):
@@ -225,7 +270,24 @@ def test_simple(self):
         self.assertTemplateUsed(response, 'wagtaildocs/chooser/chooser.html')
         self.assertTemplateUsed(response, 'wagtaildocs/chooser/chooser.js')
 
-    # TODO: Test document upload with chooser
+    def test_post(self):
+        # Build a fake file
+        fake_file = ContentFile("A boring example document")
+        fake_file.name = 'test.txt'
+
+        # Submit
+        post_data = {
+            'title': "Test document",
+            'file': fake_file,
+        }
+        response = self.client.post(reverse('wagtaildocs_chooser_upload'), post_data)
+
+        # Check that the response is a javascript file saying the document was chosen
+        self.assertTemplateUsed(response, 'wagtaildocs/chooser/document_chosen.js')
+        self.assertContains(response, "modal.respond('documentChosen'")
+
+        # Document should be created
+        self.assertTrue(models.Document.objects.filter(title="Test document").exists())
 
 
 class TestDocumentFilenameProperties(TestCase):

From ec46d09772a5ecc99e8352f65f73f984e764a501 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 18 Jun 2014 13:05:33 +0100
Subject: [PATCH 133/293] Improved editors picks pagination tests

---
 .../wagtailsearch/tests/test_editorspicks.py  | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/wagtail/wagtailsearch/tests/test_editorspicks.py b/wagtail/wagtailsearch/tests/test_editorspicks.py
index 7ee974fd0d3..ed37d9c62c6 100644
--- a/wagtail/wagtailsearch/tests/test_editorspicks.py
+++ b/wagtail/wagtailsearch/tests/test_editorspicks.py
@@ -1,4 +1,5 @@
 from django.test import TestCase
+from django.core.urlresolvers import reverse
 from wagtail.tests.utils import unittest, WagtailTestUtils
 from wagtail.wagtailsearch import models
 
@@ -68,6 +69,51 @@ def test_pagination(self):
             response = self.get({'p': page})
             self.assertEqual(response.status_code, 200)
 
+    def make_editors_picks(self):
+        for i in range(50):
+            models.EditorsPick.objects.create(
+                query=models.Query.get("query " + str(i)),
+                page_id=1,
+                sort_order=0,
+                description="First editors pick",
+            )
+
+    def test_pagination(self):
+        self.make_editors_picks()
+
+        response = self.client.get(reverse('wagtailsearch_editorspicks_index'), {'p': 2})
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailsearch/editorspicks/index.html')
+
+        # Check that we got the correct page
+        self.assertEqual(response.context['queries'].number, 2)
+
+    def test_pagination_invalid(self):
+        self.make_editors_picks()
+
+        response = self.client.get(reverse('wagtailsearch_editorspicks_index'), {'p': 'Hello World!'})
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailsearch/editorspicks/index.html')
+
+        # Check that we got page one
+        self.assertEqual(response.context['queries'].number, 1)
+
+    def test_pagination_out_of_range(self):
+        self.make_editors_picks()
+
+        response = self.client.get(reverse('wagtailsearch_editorspicks_index'), {'p': 99999})
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailsearch/editorspicks/index.html')
+
+        # Check that we got the last page
+        self.assertEqual(response.context['queries'].number, response.context['queries'].paginator.num_pages)
+
 
 class TestEditorsPicksAddView(TestCase, WagtailTestUtils):
     def setUp(self):

From 620e58632f374c464828f7e75a38b66b81517c6a Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 18 Jun 2014 13:08:54 +0100
Subject: [PATCH 134/293] General improvements to editorspicks tests

---
 .../wagtailsearch/tests/test_editorspicks.py  | 29 ++++---------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/wagtail/wagtailsearch/tests/test_editorspicks.py b/wagtail/wagtailsearch/tests/test_editorspicks.py
index ed37d9c62c6..c92dd4ef632 100644
--- a/wagtail/wagtailsearch/tests/test_editorspicks.py
+++ b/wagtail/wagtailsearch/tests/test_editorspicks.py
@@ -1,5 +1,6 @@
 from django.test import TestCase
 from django.core.urlresolvers import reverse
+
 from wagtail.tests.utils import unittest, WagtailTestUtils
 from wagtail.wagtailsearch import models
 
@@ -50,25 +51,16 @@ class TestEditorsPicksIndexView(TestCase, WagtailTestUtils):
     def setUp(self):
         self.login()
 
-    def get(self, params={}):
-        return self.client.get('/admin/search/editorspicks/', params)
-
     def test_simple(self):
-        response = self.get()
+        response = self.client.get(reverse('wagtailsearch_editorspicks_index'))
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtailsearch/editorspicks/index.html')
 
     def test_search(self):
-        response = self.get({'q': "Hello"})
+        response = self.client.get(reverse('wagtailsearch_editorspicks_index'), {'q': "Hello"})
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context['query_string'], "Hello")
 
-    def test_pagination(self):
-        pages = ['0', '1', '-1', '9999', 'Not a page']
-        for page in pages:
-            response = self.get({'p': page})
-            self.assertEqual(response.status_code, 200)
-
     def make_editors_picks(self):
         for i in range(50):
             models.EditorsPick.objects.create(
@@ -119,11 +111,8 @@ class TestEditorsPicksAddView(TestCase, WagtailTestUtils):
     def setUp(self):
         self.login()
 
-    def get(self, params={}):
-        return self.client.get('/admin/search/editorspicks/add/', params)
-
     def test_simple(self):
-        response = self.get()
+        response = self.client.get(reverse('wagtailsearch_editorspicks_add'))
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtailsearch/editorspicks/add.html')
 
@@ -138,11 +127,8 @@ def setUp(self):
         self.query = models.Query.get("Hello")
         self.query.editors_picks.create(page_id=1, description="Root page")
 
-    def get(self, params={}):
-        return self.client.get('/admin/search/editorspicks/' + str(self.query.id) + '/', params)
-
     def test_simple(self):
-        response = self.get()
+        response = self.client.get(reverse('wagtailsearch_editorspicks_edit', args=(self.query.id, )))
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtailsearch/editorspicks/edit.html')
 
@@ -157,11 +143,8 @@ def setUp(self):
         self.query = models.Query.get("Hello")
         self.query.editors_picks.create(page_id=1, description="Root page")
 
-    def get(self, params={}):
-        return self.client.get('/admin/search/editorspicks/' + str(self.query.id) + '/delete/', params)
-
     def test_simple(self):
-        response = self.get()
+        response = self.client.get(reverse('wagtailsearch_editorspicks_delete', args=(self.query.id, )))
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtailsearch/editorspicks/confirm_delete.html')
 

From a05df1a534d1f6cfadd65c7fdbcaf2f799e12e70 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 18 Jun 2014 13:39:12 +0100
Subject: [PATCH 135/293] Added posting tests to editors picks

---
 .../wagtailsearch/tests/test_editorspicks.py  | 135 +++++++++++++++++-
 1 file changed, 130 insertions(+), 5 deletions(-)

diff --git a/wagtail/wagtailsearch/tests/test_editorspicks.py b/wagtail/wagtailsearch/tests/test_editorspicks.py
index c92dd4ef632..211a54cc9cb 100644
--- a/wagtail/wagtailsearch/tests/test_editorspicks.py
+++ b/wagtail/wagtailsearch/tests/test_editorspicks.py
@@ -116,7 +116,39 @@ def test_simple(self):
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtailsearch/editorspicks/add.html')
 
-    # TODO: Test posting
+    def test_post(self):
+        # Submit
+        post_data = {
+            'query_string': "test",
+            'editors_picks-TOTAL_FORMS': 1,
+            'editors_picks-INITIAL_FORMS': 0,
+            'editors_picks-MAX_NUM_FORMS': 1000,
+            'editors_picks-0-DELETE': '',
+            'editors_picks-0-ORDER': 0,
+            'editors_picks-0-page': 1,
+            'editors_picks-0-description': "Hello",
+        }
+        response = self.client.post(reverse('wagtailsearch_editorspicks_add'), post_data)
+
+        # User should be redirected back to the index
+        self.assertRedirects(response, reverse('wagtailsearch_editorspicks_index'))
+
+        # Check that the editors pick was created
+        self.assertTrue(models.Query.get('test').editors_picks.filter(page_id=1).exists())
+
+    def test_post_without_recommendations(self):
+        # Submit
+        post_data = {
+            'query_string': "test",
+            'editors_picks-TOTAL_FORMS': 0,
+            'editors_picks-INITIAL_FORMS': 0,
+            'editors_picks-MAX_NUM_FORMS': 1000,
+        }
+        response = self.client.post(reverse('wagtailsearch_editorspicks_add'), post_data)
+
+        # User should be given an error
+        self.assertEqual(response.status_code, 200)
+        self.assertFormsetError(response, 'editors_pick_formset', None, None, "Please specify at least one recommendation for this search term.")
 
 
 class TestEditorsPicksEditView(TestCase, WagtailTestUtils):
@@ -125,14 +157,92 @@ def setUp(self):
 
         # Create an editors pick to edit
         self.query = models.Query.get("Hello")
-        self.query.editors_picks.create(page_id=1, description="Root page")
+        self.editors_pick = self.query.editors_picks.create(page_id=1, description="Root page")
+        self.editors_pick_2 = self.query.editors_picks.create(page_id=2, description="Homepage")
 
     def test_simple(self):
         response = self.client.get(reverse('wagtailsearch_editorspicks_edit', args=(self.query.id, )))
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtailsearch/editorspicks/edit.html')
 
-    # TODO: Test posting
+    def test_post(self):
+        # Submit
+        post_data = {
+            'query_string': "Hello",
+            'editors_picks-TOTAL_FORMS': 2,
+            'editors_picks-INITIAL_FORMS': 2,
+            'editors_picks-MAX_NUM_FORMS': 1000,
+            'editors_picks-0-id': self.editors_pick.id,
+            'editors_picks-0-DELETE': '',
+            'editors_picks-0-ORDER': 0,
+            'editors_picks-0-page': 1,
+            'editors_picks-0-description': "Description has changed", # Change
+            'editors_picks-1-id': self.editors_pick_2.id,
+            'editors_picks-1-DELETE': '',
+            'editors_picks-1-ORDER': 0,
+            'editors_picks-1-page': 2,
+            'editors_picks-1-description': "Homepage",
+        }
+        response = self.client.post(reverse('wagtailsearch_editorspicks_edit', args=(self.query.id, )), post_data)
+
+        # User should be redirected back to the index
+        self.assertRedirects(response, reverse('wagtailsearch_editorspicks_index'))
+
+        # Check that the editors pick description was edited
+        self.assertEqual(models.EditorsPick.objects.get(id=self.editors_pick.id).description, "Description has changed")
+
+    def test_post_delete_recommendation(self):
+        # Submit
+        post_data = {
+            'query_string': "Hello",
+            'editors_picks-TOTAL_FORMS': 2,
+            'editors_picks-INITIAL_FORMS': 2,
+            'editors_picks-MAX_NUM_FORMS': 1000,
+            'editors_picks-0-id': self.editors_pick.id,
+            'editors_picks-0-DELETE': '',
+            'editors_picks-0-ORDER': 0,
+            'editors_picks-0-page': 1,
+            'editors_picks-0-description': "Root page",
+            'editors_picks-1-id': self.editors_pick_2.id,
+            'editors_picks-1-DELETE': 1,
+            'editors_picks-1-ORDER': 0,
+            'editors_picks-1-page': 2,
+            'editors_picks-1-description': "Homepage",
+        }
+        response = self.client.post(reverse('wagtailsearch_editorspicks_edit', args=(self.query.id, )), post_data)
+
+        # User should be redirected back to the index
+        self.assertRedirects(response, reverse('wagtailsearch_editorspicks_index'))
+
+        # Check that the recommendation was deleted
+        self.assertFalse(models.EditorsPick.objects.filter(id=self.editors_pick_2.id).exists())
+
+        # The other recommendation should still exist
+        self.assertTrue(models.EditorsPick.objects.filter(id=self.editors_pick.id).exists())
+
+    def test_post_without_recommendations(self):
+        # Submit
+        post_data = {
+            'query_string': "Hello",
+            'editors_picks-TOTAL_FORMS': 2,
+            'editors_picks-INITIAL_FORMS': 2,
+            'editors_picks-MAX_NUM_FORMS': 1000,
+            'editors_picks-0-id': self.editors_pick.id,
+            'editors_picks-0-DELETE': 1,
+            'editors_picks-0-ORDER': 0,
+            'editors_picks-0-page': 1,
+            'editors_picks-0-description': "Description has changed", # Change
+            'editors_picks-1-id': self.editors_pick_2.id,
+            'editors_picks-1-DELETE': 1,
+            'editors_picks-1-ORDER': 0,
+            'editors_picks-1-page': 2,
+            'editors_picks-1-description': "Homepage",
+        }
+        response = self.client.post(reverse('wagtailsearch_editorspicks_edit', args=(self.query.id, )), post_data)
+
+        # User should be given an error
+        self.assertEqual(response.status_code, 200)
+        self.assertFormsetError(response, 'editors_pick_formset', None, None, "Please specify at least one recommendation for this search term.")
 
 
 class TestEditorsPicksDeleteView(TestCase, WagtailTestUtils):
@@ -141,11 +251,26 @@ def setUp(self):
 
         # Create an editors pick to delete
         self.query = models.Query.get("Hello")
-        self.query.editors_picks.create(page_id=1, description="Root page")
+        self.editors_pick = self.query.editors_picks.create(page_id=1, description="Root page")
+        self.editors_pick_2 = self.query.editors_picks.create(page_id=2, description="Homepage")
 
     def test_simple(self):
         response = self.client.get(reverse('wagtailsearch_editorspicks_delete', args=(self.query.id, )))
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtailsearch/editorspicks/confirm_delete.html')
 
-    # TODO: Test posting
+    def test_post(self):
+        # Submit
+        post_data = {
+            'foo': 'bar',
+        }
+        response = self.client.post(reverse('wagtailsearch_editorspicks_delete', args=(self.query.id, )), post_data)
+
+        # User should be redirected back to the index
+        self.assertRedirects(response, reverse('wagtailsearch_editorspicks_index'))
+
+        # Check that both recommendations were deleted
+        self.assertFalse(models.EditorsPick.objects.filter(id=self.editors_pick_2.id).exists())
+
+        # The other recommendation should still exist
+        self.assertFalse(models.EditorsPick.objects.filter(id=self.editors_pick.id).exists())

From e220c77cc01727650959173e47981755d4540e25 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 18 Jun 2014 14:20:42 +0100
Subject: [PATCH 136/293] Added test to test reordering of editors picks

---
 .../wagtailsearch/tests/test_editorspicks.py  | 37 +++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailsearch/tests/test_editorspicks.py b/wagtail/wagtailsearch/tests/test_editorspicks.py
index 211a54cc9cb..99debab404b 100644
--- a/wagtail/wagtailsearch/tests/test_editorspicks.py
+++ b/wagtail/wagtailsearch/tests/test_editorspicks.py
@@ -179,7 +179,7 @@ def test_post(self):
             'editors_picks-0-description': "Description has changed", # Change
             'editors_picks-1-id': self.editors_pick_2.id,
             'editors_picks-1-DELETE': '',
-            'editors_picks-1-ORDER': 0,
+            'editors_picks-1-ORDER': 1,
             'editors_picks-1-page': 2,
             'editors_picks-1-description': "Homepage",
         }
@@ -191,6 +191,37 @@ def test_post(self):
         # Check that the editors pick description was edited
         self.assertEqual(models.EditorsPick.objects.get(id=self.editors_pick.id).description, "Description has changed")
 
+    def test_post_reorder(self):
+        # Check order before reordering
+        self.assertEqual(models.Query.get("Hello").editors_picks.all()[0], self.editors_pick)
+        self.assertEqual(models.Query.get("Hello").editors_picks.all()[1], self.editors_pick_2)
+
+        # Submit
+        post_data = {
+            'query_string': "Hello",
+            'editors_picks-TOTAL_FORMS': 2,
+            'editors_picks-INITIAL_FORMS': 2,
+            'editors_picks-MAX_NUM_FORMS': 1000,
+            'editors_picks-0-id': self.editors_pick.id,
+            'editors_picks-0-DELETE': '',
+            'editors_picks-0-ORDER': 1, # Change
+            'editors_picks-0-page': 1,
+            'editors_picks-0-description': "Root page",
+            'editors_picks-1-id': self.editors_pick_2.id,
+            'editors_picks-1-DELETE': '',
+            'editors_picks-1-ORDER': 0, # Change
+            'editors_picks-1-page': 2,
+            'editors_picks-1-description': "Homepage",
+        }
+        response = self.client.post(reverse('wagtailsearch_editorspicks_edit', args=(self.query.id, )), post_data)
+
+        # User should be redirected back to the index
+        self.assertRedirects(response, reverse('wagtailsearch_editorspicks_index'))
+
+        # Check that the recommendations were reordered
+        self.assertEqual(models.Query.get("Hello").editors_picks.all()[0], self.editors_pick_2)
+        self.assertEqual(models.Query.get("Hello").editors_picks.all()[1], self.editors_pick)
+
     def test_post_delete_recommendation(self):
         # Submit
         post_data = {
@@ -205,7 +236,7 @@ def test_post_delete_recommendation(self):
             'editors_picks-0-description': "Root page",
             'editors_picks-1-id': self.editors_pick_2.id,
             'editors_picks-1-DELETE': 1,
-            'editors_picks-1-ORDER': 0,
+            'editors_picks-1-ORDER': 1,
             'editors_picks-1-page': 2,
             'editors_picks-1-description': "Homepage",
         }
@@ -234,7 +265,7 @@ def test_post_without_recommendations(self):
             'editors_picks-0-description': "Description has changed", # Change
             'editors_picks-1-id': self.editors_pick_2.id,
             'editors_picks-1-DELETE': 1,
-            'editors_picks-1-ORDER': 0,
+            'editors_picks-1-ORDER': 1,
             'editors_picks-1-page': 2,
             'editors_picks-1-description': "Homepage",
         }

From cbc401befe360490c49add0dfc86454cb3bf0543 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 18 Jun 2014 14:50:42 +0100
Subject: [PATCH 137/293] Deleted test to test query popularity over time (not
 implemented)

---
 wagtail/wagtailsearch/tests/test_queries.py | 39 ---------------------
 1 file changed, 39 deletions(-)

diff --git a/wagtail/wagtailsearch/tests/test_queries.py b/wagtail/wagtailsearch/tests/test_queries.py
index 5c341d7d652..70854c785eb 100644
--- a/wagtail/wagtailsearch/tests/test_queries.py
+++ b/wagtail/wagtailsearch/tests/test_queries.py
@@ -102,45 +102,6 @@ def test_query_popularity(self):
         self.assertEqual(popular_queries[1], models.Query.get("popular query"))
         self.assertEqual(popular_queries[2], models.Query.get("little popular query"))
 
-    @unittest.expectedFailure # Time based popularity isn't implemented yet
-    def test_query_popularity_over_time(self):
-        today = timezone.now().date()
-        two_days_ago = today - datetime.timedelta(days=2)
-        a_week_ago = today - datetime.timedelta(days=7)
-        a_month_ago = today - datetime.timedelta(days=30)
-
-        # Add 10 hits to a query that was very popular query a month ago
-        for i in range(10):
-            models.Query.get("old popular query").add_hit(date=a_month_ago)
-
-        # Add 5 hits to a query that is was popular 2 days ago
-        for i in range(5):
-            models.Query.get("new popular query").add_hit(date=two_days_ago)
-
-        # Get most popular queries
-        popular_queries = models.Query.get_most_popular()
-
-        # Old popular query should be most popular
-        self.assertEqual(popular_queries.count(), 2)
-        self.assertEqual(popular_queries[0], models.Query.get("old popular query"))
-        self.assertEqual(popular_queries[1], models.Query.get("new popular query"))
-
-        # Get most popular queries for past week
-        past_week_popular_queries = models.Query.get_most_popular(date_since=a_week_ago)
-
-        # Only new popular query should be in this list
-        self.assertEqual(past_week_popular_queries.count(), 1)
-        self.assertEqual(past_week_popular_queries[0], models.Query.get("new popular query"))
-
-        # Old popular query gets a couple more hits!
-        for i in range(2):
-            models.Query.get("old popular query").add_hit()
-
-        # Old popular query should now be in the most popular queries
-        self.assertEqual(past_week_popular_queries.count(), 2)
-        self.assertEqual(past_week_popular_queries[0], models.Query.get("new popular query"))
-        self.assertEqual(past_week_popular_queries[1], models.Query.get("old popular query"))
-
 
 class TestGarbageCollectCommand(TestCase):
     def test_garbage_collect_command(self):

From 9c0f4212e339fc0aa1c8b94f05778f65be4dc536 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 18 Jun 2014 15:49:02 +0100
Subject: [PATCH 138/293] Only allow logged in users to access the userbar
 views

---
 wagtail/wagtailadmin/views/userbar.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/views/userbar.py b/wagtail/wagtailadmin/views/userbar.py
index 6e6ef349207..41776f6841b 100644
--- a/wagtail/wagtailadmin/views/userbar.py
+++ b/wagtail/wagtailadmin/views/userbar.py
@@ -1,9 +1,13 @@
 from django.shortcuts import render
+from django.contrib.auth.decorators import permission_required
 
 from wagtail.wagtailadmin.userbar import EditPageItem, AddPageItem, ApproveModerationEditPageItem, RejectModerationEditPageItem
 from wagtail.wagtailadmin import hooks
 from wagtail.wagtailcore.models import Page, PageRevision
 
+
+
+@permission_required('wagtailadmin.access_admin')
 def for_frontend(request, page_id):
     items = [
         EditPageItem(Page.objects.get(id=page_id)),
@@ -24,6 +28,8 @@ def for_frontend(request, page_id):
         'items': rendered_items,
     })
 
+
+@permission_required('wagtailadmin.access_admin')
 def for_moderation(request, revision_id):
     items = [
         EditPageItem(PageRevision.objects.get(id=revision_id).page),
@@ -44,4 +50,4 @@ def for_moderation(request, revision_id):
     # Render the edit bird
     return render(request, 'wagtailadmin/userbar/base.html', {
         'items': rendered_items,
-    })
\ No newline at end of file
+    })

From 3577e618806f79f2ebf83af96eeff75a5ab4c05e Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 18 Jun 2014 15:58:22 +0100
Subject: [PATCH 139/293] Raise exception if userbar views are accessed by
 anonymous user

---
 wagtail/wagtailadmin/views/userbar.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailadmin/views/userbar.py b/wagtail/wagtailadmin/views/userbar.py
index 41776f6841b..2b3749da011 100644
--- a/wagtail/wagtailadmin/views/userbar.py
+++ b/wagtail/wagtailadmin/views/userbar.py
@@ -6,8 +6,7 @@
 from wagtail.wagtailcore.models import Page, PageRevision
 
 
-
-@permission_required('wagtailadmin.access_admin')
+@permission_required('wagtailadmin.access_admin', raise_exception=True)
 def for_frontend(request, page_id):
     items = [
         EditPageItem(Page.objects.get(id=page_id)),
@@ -29,7 +28,7 @@ def for_frontend(request, page_id):
     })
 
 
-@permission_required('wagtailadmin.access_admin')
+@permission_required('wagtailadmin.access_admin', raise_exception=True)
 def for_moderation(request, revision_id):
     items = [
         EditPageItem(PageRevision.objects.get(id=revision_id).page),

From ed4af844dec210792e5e9dd474b7d7211769f3d2 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 18 Jun 2014 15:58:54 +0100
Subject: [PATCH 140/293] Added tests for userbar

---
 wagtail/wagtailadmin/tests/test_userbar.py | 82 ++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 wagtail/wagtailadmin/tests/test_userbar.py

diff --git a/wagtail/wagtailadmin/tests/test_userbar.py b/wagtail/wagtailadmin/tests/test_userbar.py
new file mode 100644
index 00000000000..52ec2d60ad6
--- /dev/null
+++ b/wagtail/wagtailadmin/tests/test_userbar.py
@@ -0,0 +1,82 @@
+from django.test import TestCase
+from django.test.client import RequestFactory
+from django.core.urlresolvers import reverse
+from django.template import Template, Context
+from django.contrib.auth.models import User, AnonymousUser
+
+from wagtail.tests.utils import WagtailTestUtils
+from wagtail.wagtailcore.models import Page
+
+
+class TestUserbarTag(TestCase):
+    def setUp(self):
+        self.user = User.objects.create_superuser(username='test', email='test@email.com', password='password')
+        self.homepage = Page.objects.get(id=2)
+
+    def dummy_request(self, user=None):
+        request = RequestFactory().get('/')
+        request.user = user or AnonymousUser()
+        return request
+
+    def test_userbar_tag(self):
+        template = Template("{% load wagtailuserbar %}{% wagtailuserbar %}")
+        content = template.render(Context({
+            'self': self.homepage,
+            'request': self.dummy_request(self.user),
+        }))
+
+        self.assertIn("<!-- Wagtail user bar embed code -->", content)
+
+    def test_userbar_tag_anonymous_user(self):
+        template = Template("{% load wagtailuserbar %}{% wagtailuserbar %}")
+        content = template.render(Context({
+            'self': self.homepage,
+            'request': self.dummy_request(),
+        }))
+
+        # Make sure nothing was rendered
+        self.assertEqual(content, '')
+
+
+class TestUserbarFrontend(TestCase, WagtailTestUtils):
+    def setUp(self):
+        self.login()
+        self.homepage = Page.objects.get(id=2)
+
+    def test_userbar_frontend(self):
+        response = self.client.get(reverse('wagtailadmin_userbar_frontend', args=(self.homepage.id, )))
+
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailadmin/userbar/base.html')
+
+    def test_userbar_anonymous_user_cannot_see(self):
+        # Logout
+        self.client.logout()
+
+        response = self.client.get(reverse('wagtailadmin_userbar_frontend', args=(self.homepage.id, )))
+
+        # Check that the user recieved a forbidden message
+        self.assertEqual(response.status_code, 403)
+
+
+class TestUserbarModeration(TestCase, WagtailTestUtils):
+    def setUp(self):
+        self.login()
+        self.homepage = Page.objects.get(id=2)
+        self.homepage.save_revision()
+        self.revision = self.homepage.get_latest_revision()
+
+    def test_userbar_frontend(self):
+        response = self.client.get(reverse('wagtailadmin_userbar_moderation', args=(self.revision.id, )))
+
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailadmin/userbar/base.html')
+
+    def test_userbar_anonymous_user_cannot_see(self):
+        # Logout
+        self.client.logout()
+
+        response = self.client.get(reverse('wagtailadmin_userbar_moderation', args=(self.revision.id, )))
+
+        # Check that the user recieved a forbidden message
+        self.assertEqual(response.status_code, 403)

From 733294cafa45a191478b4dccce4d7f5a22ee98de Mon Sep 17 00:00:00 2001
From: Robert Clark <robert@bablmedia.com>
Date: Wed, 18 Jun 2014 11:04:39 -0400
Subject: [PATCH 141/293] return a queryset instead of the first sibling

---
 wagtail/wagtailcore/models.py                   | 8 ++++----
 wagtail/wagtailcore/tests/test_page_queryset.py | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index e2b72800521..9dcc65f6f1d 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -645,11 +645,11 @@ def get_descendants(self, inclusive=False):
     def get_siblings(self, inclusive=True):
         return Page.objects.sibling_of(self, inclusive)
 
-    def get_next_published_sibling(self):
-        return self.get_siblings().live().filter(path__gt=self.path).order_by('path').first()
+    def get_next_siblings(self):
+        return self.get_siblings().filter(path__gt=self.path).order_by('path')
 
-    def get_prev_published_sibling(self):
-        return self.get_siblings().live().filter(path__lt=self.path).order_by('-path').first()
+    def get_prev_siblings(self):
+        return self.get_siblings().filter(path__lt=self.path).order_by('-path')
 
 def get_navigation_menu_items():
     # Get all pages that appear in the navigation menu: ones which have children,
diff --git a/wagtail/wagtailcore/tests/test_page_queryset.py b/wagtail/wagtailcore/tests/test_page_queryset.py
index 3db3bd5f8fd..020d98d153a 100644
--- a/wagtail/wagtailcore/tests/test_page_queryset.py
+++ b/wagtail/wagtailcore/tests/test_page_queryset.py
@@ -262,7 +262,7 @@ def test_published_next(self):
         # All pages must be live
         while current_page:
             self.assertTrue(current_page.live)
-            current_page = current_page.get_next_published_sibling()
+            current_page = current_page.get_next_siblings().live().first()
 
     def test_published_prev(self):
         events_index = Page.objects.get(url_path='/home/events/')
@@ -271,4 +271,4 @@ def test_published_prev(self):
         # All pages must be live
         while current_page:
             self.assertTrue(current_page.live)
-            current_page = current_page.get_prev_published_sibling()
+            current_page = current_page.get_prev_siblings().live().first()

From 3778c476bb8b8f9972e0857d0c6bd0ea4ca2c235 Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Wed, 18 Jun 2014 17:16:04 +0100
Subject: [PATCH 142/293] Add unit tests for edit_handlers.py. Lint
 edit_handlers.py.

---
 .gitignore                                    |   1 +
 wagtail/wagtailadmin/edit_handlers.py         |  77 ++-
 .../wagtailadmin/tests/test_edit_handlers.py  | 523 ++++++++++++++++++
 3 files changed, 572 insertions(+), 29 deletions(-)
 create mode 100644 wagtail/wagtailadmin/tests/test_edit_handlers.py

diff --git a/.gitignore b/.gitignore
index bd904efc9d6..57f9d0eab5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.pyc
 .DS_Store
+/.ropeproject/
 /.coverage
 /dist/
 /MANIFEST
diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py
index 245f7ad60d1..39f38d499f6 100644
--- a/wagtail/wagtailadmin/edit_handlers.py
+++ b/wagtail/wagtailadmin/edit_handlers.py
@@ -12,7 +12,11 @@
 from django.db import models
 from django.forms.models import fields_for_model
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured, ValidationError
+from django.core.exceptions import (
+    ObjectDoesNotExist,
+    ImproperlyConfigured,
+    ValidationError
+)
 from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.utils.translation import ugettext as _
@@ -33,7 +37,8 @@ def __init__(self, attrs=None):
         if attrs:
             default_attrs.update(attrs)
 
-        super(FriendlyDateInput, self).__init__(attrs=default_attrs, format='%d %b %Y')
+        super(FriendlyDateInput, self).__init__(attrs=default_attrs,
+                                                format='%d %b %Y')
 
 
 class FriendlyTimeInput(forms.TimeInput):
@@ -46,7 +51,8 @@ def __init__(self, attrs=None):
         if attrs:
             default_attrs.update(attrs)
 
-        super(FriendlyTimeInput, self).__init__(attrs=default_attrs, format='%I.%M%p')
+        super(FriendlyTimeInput, self).__init__(attrs=default_attrs,
+                                                format='%I.%M%p')
 
 
 class FriendlyTimeField(forms.CharField):
@@ -87,7 +93,7 @@ class LocalizedDateInput(forms.DateInput):
     and adds class="friendly_date" to be picked up by jquery datepicker.
     """
     def __init__(self, attrs=None):
-        default_attrs = {'class': 'localized_date', 'localize':True}
+        default_attrs = {'class': 'localized_date', 'localize': True}
         if attrs:
             default_attrs.update(attrs)
 
@@ -104,7 +110,8 @@ def __init__(self, attrs=None):
         if attrs:
             default_attrs.update(attrs)
         # Just use 24-hour format
-        super(LocalizedTimeInput, self).__init__(attrs=default_attrs, format='%H:%M')
+        super(LocalizedTimeInput, self).__init__(attrs=default_attrs,
+                                                 format='%H:%M')
 
 
 class LocalizedTimeField(forms.CharField):
@@ -118,7 +125,7 @@ def to_python(self, time_string):
         match = expr.match(time_string.lower())
         if match:
             # Pull out values from string
-            hour_string, minute_string= match.groups()
+            hour_string, minute_string = match.groups()
 
             # Convert hours and minutes to integers
             hour = int(hour_string)
@@ -126,31 +133,38 @@ def to_python(self, time_string):
                 minute = int(minute_string)
             else:
                 minute = 0
-            if hour>=24 or hour < 0 or minute >=60 or minute < 0:
+            if hour >= 24 or hour < 0 or minute >= 60 or minute < 0:
                 raise ValidationError(_("Please type a valid time"))
 
             return datetime.time(hour=hour, minute=minute)
         else:
-            raise ValidationError(_("Please type a valid time") )
+            raise ValidationError(_("Please type a valid time"))
 
 
-if hasattr(settings, 'USE_L10N') and settings.USE_L10N==True:
+if hasattr(settings, 'USE_L10N') and settings.USE_L10N is True:
     FORM_FIELD_OVERRIDES = {
         models.DateField: {'widget': LocalizedDateInput},
-        models.TimeField: {'widget': LocalizedTimeInput, 'form_class': LocalizedTimeField},
+        models.TimeField: {'widget': LocalizedTimeInput,
+                           'form_class': LocalizedTimeField},
     }
-else: # Fall back to friendly date/time
+else:  # Fall back to friendly date/time
     FORM_FIELD_OVERRIDES = {
         models.DateField: {'widget': FriendlyDateInput},
-        models.TimeField: {'widget': FriendlyTimeInput, 'form_class': FriendlyTimeField},
+        models.TimeField: {'widget': FriendlyTimeInput,
+                           'form_class': FriendlyTimeField},
     }
 
 WIDGET_JS = {
-    FriendlyDateInput: (lambda id: "initFriendlyDateChooser(fixPrefix('%s'));" % id),
-    FriendlyTimeInput: (lambda id: "initFriendlyTimeChooser(fixPrefix('%s'));" % id),
-    LocalizedDateInput: (lambda id: "initLocalizedDateChooser(fixPrefix('%s'));" % id),
-    LocalizedTimeInput: (lambda id: "initLocalizedTimeChooser(fixPrefix('%s'));" % id),
-    RichTextArea: (lambda id: "makeRichTextEditable(fixPrefix('%s'));" % id),
+    FriendlyDateInput: (lambda id: "initFriendlyDateChooser(fixPrefix('%s'));"
+                        % id),
+    FriendlyTimeInput: (lambda id: "initFriendlyTimeChooser(fixPrefix('%s'));"
+                        % id),
+    LocalizedDateInput: (lambda id: "initLocalizedDateChooser(fixPrefix('%s'));"
+                         % id),
+    LocalizedTimeInput: (lambda id: "initLocalizedTimeChooser(fixPrefix('%s'));"
+                         % id),
+    RichTextArea: (lambda id: "makeRichTextEditable(fixPrefix('%s'));"
+                   % id),
     TagWidget: (
         lambda id: "initTagField(fixPrefix('%s'), '%s');" % (
             id, addslashes(reverse('wagtailadmin_tag_autocomplete'))
@@ -159,7 +173,8 @@ def to_python(self, time_string):
 }
 
 
-# Callback to allow us to override the default form fields provided for each model field.
+# Callback to allow us to override the default form fields provided
+# for each model field.
 def formfield_for_dbfield(db_field, **kwargs):
     # snarfed from django/contrib/admin/options.py
 
@@ -177,13 +192,13 @@ def formfield_for_dbfield(db_field, **kwargs):
 class WagtailAdminModelFormMetaclass(ClusterFormMetaclass):
     # Override the behaviour of the regular ModelForm metaclass -
     # which handles the translation of model fields to form fields -
-    # to use our own formfield_for_dbfield function to do that translation.
-    # This is done by sneaking a formfield_callback property into the class
-    # being defined (unless the class already provides a formfield_callback
-    # of its own).
+    # to use our own formfield_for_dbfield function to do that
+    # translation. This is done by sneaking a formfield_callback
+    # property into the class being defined (unless the class already
+    # provides a formfield_callback of its own).
 
-    # while we're at it, we'll also set extra_form_count to 0, as we're creating
-    # extra forms in JS
+    # while we're at it, we'll also set extra_form_count to 0, as
+    # we're creating extra forms in JS
     extra_form_count = 0
 
     def __new__(cls, name, bases, attrs):
@@ -200,8 +215,8 @@ def __new__(cls, name, bases, attrs):
 
 
 def get_form_for_model(
-    model,
-    fields=None, exclude=None, formsets=None, exclude_formsets=None, widgets=None
+    model, fields=None, exclude=None, formsets=None,
+    exclude_formsets=None, widgets=None
 ):
 
     # django's modelform_factory with a bit of custom behaviour
@@ -215,7 +230,8 @@ def get_form_for_model(
     if exclude is not None:
         attrs['exclude'] = exclude
     if issubclass(model, Page):
-        attrs['exclude'] = attrs.get('exclude', []) + ['content_type', 'path', 'depth', 'numchild']
+        attrs['exclude'] = attrs.get('exclude', []) + ['content_type', 'path',
+                                                       'depth', 'numchild']
 
     if widgets is not None:
         attrs['widgets'] = widgets
@@ -232,7 +248,9 @@ def get_form_for_model(
         'Meta': type('Meta', (object,), attrs)
     }
 
-    return WagtailAdminModelFormMetaclass(class_name, (WagtailAdminModelForm,), form_class_attrs)
+    return WagtailAdminModelFormMetaclass(class_name,
+                                          (WagtailAdminModelForm,),
+                                          form_class_attrs)
 
 
 def extract_panel_definitions_from_model_class(model, exclude=None):
@@ -247,7 +265,8 @@ def extract_panel_definitions_from_model_class(model, exclude=None):
     if issubclass(model, Page):
         _exclude = ['content_type', 'path', 'depth', 'numchild']
 
-    fields = fields_for_model(model, exclude=_exclude, formfield_callback=formfield_for_dbfield)
+    fields = fields_for_model(model, exclude=_exclude,
+                              formfield_callback=formfield_for_dbfield)
 
     for field_name, field in fields.items():
         try:
diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py
new file mode 100644
index 00000000000..45db35c5ba0
--- /dev/null
+++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py
@@ -0,0 +1,523 @@
+from mock import MagicMock
+
+from django.test import TestCase
+from django.core.exceptions import ValidationError
+
+from wagtail.wagtailadmin.edit_handlers import (
+    FriendlyDateInput,
+    FriendlyTimeInput,
+    FriendlyTimeField,
+    LocalizedTimeInput,
+    LocalizedDateInput,
+    LocalizedTimeField,
+    get_form_for_model,
+    extract_panel_definitions_from_model_class,
+    BaseFieldPanel,
+    FieldPanel,
+    RichTextFieldPanel,
+    EditHandler,
+    WagtailAdminModelForm,
+    BaseCompositeEditHandler,
+    BaseTabbedInterface,
+    TabbedInterface,
+    BaseObjectList,
+    ObjectList,
+    PageChooserPanel
+)
+from wagtail.wagtailcore.models import Page, Site
+
+
+class TestFriendlyDateInput(TestCase):
+    def test_attrs(self):
+        """
+        When the attrs argument is passed to FriendlyDateInput's
+        constructor, they should be set on the FriendlyDateInput
+        object along with the default attrs
+        """
+        friendly = FriendlyDateInput(attrs={'awesome': 'sauce'})
+        self.assertEqual(friendly.attrs, {'class': 'friendly_date',
+                                          'awesome': 'sauce'})
+
+
+class TestFriendlyTimeInput(TestCase):
+    def test_attrs(self):
+        """
+        When the attrs argument is passed to FriendlyDateInput's
+        constructor, they should be set on the FriendlyDateInput
+        object along with the default attrs
+        """
+        friendly = FriendlyTimeInput(attrs={'awesome': 'sauce'})
+        self.assertEqual(friendly.attrs, {'class': 'friendly_time',
+                                          'awesome': 'sauce'})
+
+
+class TestFriendlyTimeField(TestCase):
+    def setUp(self):
+        self.friendly = FriendlyTimeField()
+
+    def test_no_time_string(self):
+        """
+        to_python() should return None if it is passed an empty
+        string
+        """
+        result = self.friendly.to_python('')
+        self.assertEqual(result, None)
+
+    def test_invalid_time_string(self):
+        """
+        to_python() should raise a ValidationError if it is passed
+        an invalid time string
+        """
+        self.assertRaises(ValidationError, self.friendly.to_python, 'bacon')
+
+    def test_afternoon_time_string(self):
+        """
+        to_python() should convert a time string that ends with 'pm'
+        to a 24-hour time in the afternoon
+        """
+        python_time = self.friendly.to_python('3:49pm')
+        self.assertEqual(str(python_time), '15:49:00')
+
+    def test_morning_time_string(self):
+        """
+        to_python() should convert a time string that ends with 'am'
+        to a 24-hour time in the morning
+        """
+        python_time = self.friendly.to_python('3:49am')
+        self.assertEqual(str(python_time), '03:49:00')
+
+    def test_no_minutes_time_string(self):
+        """
+        If minutes are not specified in the time string, they should
+        default to zero
+        """
+        python_time = self.friendly.to_python('3am')
+        self.assertEqual(str(python_time), '03:00:00')
+
+
+class TestLocalizedDateInput(TestCase):
+    def test_attrs(self):
+        """
+        When the attrs argument is passed to LocalizedDateInput's
+        constructor, they should be set on the LocalizedDateInput
+        object along with the default attrs
+        """
+        localized = LocalizedDateInput(attrs={'awesome': 'sauce'})
+        self.assertEqual(localized.attrs, {'class': 'localized_date',
+                                           'localize': True,
+                                           'awesome': 'sauce'})
+
+
+class TestLocalizedTimeInput(TestCase):
+    def test_attrs(self):
+        """
+        When the attrs argument is passed to LocalizedTimeInput's
+        constructor, they should be set on the LocalizedTimeInput
+        object along with the default attrs
+        """
+        localized = LocalizedTimeInput(attrs={'awesome': 'sauce'})
+        self.assertEqual(localized.attrs, {'class': 'localized_time',
+                                          'awesome': 'sauce'})
+
+
+class TestLocalizedTimeField(TestCase):
+    def setUp(self):
+        self.localized = LocalizedTimeField()
+
+    def test_no_time_string(self):
+        """
+        to_python() should return None if it is passed an empty
+        string
+        """
+        result = self.localized.to_python('')
+        self.assertEqual(result, None)
+
+    def test_non_time_string(self):
+        """
+        to_python() should raise a ValidationError if it is passed
+        a string that does not represent a time
+        """
+        self.assertRaises(ValidationError, self.localized.to_python, 'bacon')
+
+    def test_invalid_time_string(self):
+        """
+        to_python() should raise a ValidationError if it is passed
+        an invalid time string
+        """
+        self.assertRaises(ValidationError, self.localized.to_python, '99:99')
+
+    def test_afternoon_time_string(self):
+        """
+        to_python() should understand 24-hour time
+        """
+        python_time = self.localized.to_python('15:49')
+        self.assertEqual(str(python_time), '15:49:00')
+
+    def test_morning_time_string(self):
+        """
+        to_python() should understand 24-hour time
+        """
+        python_time = self.localized.to_python('3:49')
+        self.assertEqual(str(python_time), '03:49:00')
+
+    def test_no_minutes_time_string(self):
+        """
+        If minutes are not specified in the time string, they should
+        default to zero
+        """
+        python_time = self.localized.to_python('3')
+        self.assertEqual(str(python_time), '03:00:00')
+
+
+class TestGetFormForModel(TestCase):
+    class FakeClass(object):
+        _meta = MagicMock()
+
+    def setUp(self):
+        self.mock_exclude = MagicMock()
+
+    def test_get_form_for_model(self):
+        form = get_form_for_model(self.FakeClass,
+                                  fields=[],
+                                  exclude=[self.mock_exclude],
+                                  formsets=['baz'],
+                                  exclude_formsets=['quux'],
+                                  widgets=['bacon'])
+        self.assertEqual(form.Meta.exclude, [self.mock_exclude])
+        self.assertEqual(form.Meta.formsets, ['baz'])
+        self.assertEqual(form.Meta.exclude_formsets, ['quux'])
+        self.assertEqual(form.Meta.widgets, ['bacon'])
+
+
+class TestExtractPanelDefinitionsFromModelClass(TestCase):
+    class FakePage(Page):
+        pass
+
+    def test_can_extract_panels(self):
+        mock = MagicMock()
+        mock.panels = 'foo'
+        result = extract_panel_definitions_from_model_class(mock)
+        self.assertEqual(result, 'foo')
+
+    def test_exclude(self):
+        panels = extract_panel_definitions_from_model_class(Site, exclude=['hostname'])
+        for panel in panels:
+            self.assertNotEqual(panel.field_name, 'hostname')
+
+    def test_extracted_objects_are_panels(self):
+        panels = extract_panel_definitions_from_model_class(self.FakePage)
+        for panel in panels:
+            self.assertTrue(issubclass(panel, BaseFieldPanel))
+
+
+class TestEditHandler(TestCase):
+    class FakeForm(dict):
+        def __init__(self, *args, **kwargs):
+            self.fields = self.fields_iterator()
+
+        def fields_iterator(self):
+            for i in self:
+                yield i
+
+    def setUp(self):
+        self.edit_handler = EditHandler(form=True, instance=True)
+        self.edit_handler.render = lambda: "foo"
+
+    def test_widget_overrides(self):
+        result = EditHandler.widget_overrides()
+        self.assertEqual(result, {})
+
+    def test_required_formsets(self):
+        result = EditHandler.required_formsets()
+        self.assertEqual(result, [])
+
+    def test_get_form_class(self):
+        result = EditHandler.get_form_class(Page)
+        self.assertTrue(issubclass(result, WagtailAdminModelForm))
+
+    def test_edit_handler_init_no_instance(self):
+        self.assertRaises(ValueError, EditHandler, form=True)
+
+    def test_edit_handler_init_no_form(self):
+        self.assertRaises(ValueError, EditHandler, instance=True)
+
+    def test_object_classnames(self):
+        result = self.edit_handler.object_classnames()
+        self.assertEqual(result, "")
+
+    def test_field_classnames(self):
+        result = self.edit_handler.field_classnames()
+        self.assertEqual(result, "")
+
+    def test_field_type(self):
+        result = self.edit_handler.field_type()
+        self.assertEqual(result, "")
+
+    def test_render_as_object(self):
+        result = self.edit_handler.render_as_object()
+        self.assertEqual(result, "foo")
+
+    def test_render_as_field(self):
+        result = self.edit_handler.render_as_field()
+        self.assertEqual(result, "foo")
+
+    def test_render_js(self):
+        result = self.edit_handler.render_js()
+        self.assertEqual(result, "")
+
+    def test_rendered_fields(self):
+        result = self.edit_handler.rendered_fields()
+        self.assertEqual(result, [])
+
+    def test_render_missing_fields(self):
+        fake_form = self.FakeForm()
+        fake_form["foo"] = "bar"
+        self.edit_handler.form = fake_form
+        self.assertEqual(self.edit_handler.render_missing_fields(), "bar")
+
+    def test_render_form_content(self):
+        fake_form = self.FakeForm()
+        fake_form["foo"] = "bar"
+        self.edit_handler.form = fake_form
+        self.assertEqual(self.edit_handler.render_form_content(), "foobar")
+
+
+class TestBaseCompositeEditHandler(TestCase):
+    def setUp(self):
+        mock = MagicMock()
+        mock.widget_overrides.return_value = {'foo': 'bar'}
+        mock.required_formsets.return_value = {'baz': 'quux'}
+        BaseCompositeEditHandler.children = [mock]
+        self.base_composite_edit_handler = BaseCompositeEditHandler(
+            instance=True,
+            form=True)
+
+    def tearDown(self):
+        BaseCompositeEditHandler.children = None
+
+    def test_object_classnames_no_classname(self):
+        result = self.base_composite_edit_handler.object_classnames()
+        self.assertEqual(result, "multi-field")
+
+    def test_object_classnames(self):
+        self.base_composite_edit_handler.classname = "foo"
+        result = self.base_composite_edit_handler.object_classnames()
+        self.assertEqual(result, "multi-field foo")
+
+    def test_widget_overrides(self):
+        result = self.base_composite_edit_handler.widget_overrides()
+        self.assertEqual(result, {'foo': 'bar'})
+
+    def test_required_formsets(self):
+        result = self.base_composite_edit_handler.required_formsets()
+        self.assertEqual(result, ['baz'])
+
+
+class TestBaseTabbedInterface(TestCase):
+    class FakeChild(object):
+        class FakeGrandchild(object):
+            def render_js(self):
+                return "foo"
+
+            def rendered_fields(self):
+                return ["bar"]
+
+        def __call__(self, *args, **kwargs):
+            fake_grandchild = self.FakeGrandchild()
+            return fake_grandchild
+
+    def test_render(self):
+        mock = MagicMock()
+        BaseTabbedInterface.children = [mock]
+        self.base_tabbed_interface = BaseTabbedInterface(
+            instance=True,
+            form=True)
+        result = self.base_tabbed_interface.render()
+        self.assertRegexpMatches(result, '<ul')
+        self.assertRegexpMatches(result, '<li')
+        self.assertRegexpMatches(result, '<div')
+
+    def test_render_js(self):
+        fake_child = self.FakeChild()
+        BaseTabbedInterface.children = [fake_child]
+        self.base_tabbed_interface = BaseTabbedInterface(
+            instance=True,
+            form=True)
+        result = self.base_tabbed_interface.render_js()
+        self.assertEqual(result, "foo")
+
+    def test_rendered_fields(self):
+        fake_child = self.FakeChild()
+        BaseTabbedInterface.children = [fake_child]
+        self.base_tabbed_interface = BaseTabbedInterface(
+            instance=True,
+            form=True)
+        result = self.base_tabbed_interface.rendered_fields()
+        self.assertEqual(result, ["bar"])
+
+
+class TestTabbedInterface(TestCase):
+    def test_tabbed_interface(self):
+        tabbed_interface = TabbedInterface(['foo'])
+        self.assertTrue(issubclass(tabbed_interface, BaseTabbedInterface))
+
+
+class TestObjectList(TestCase):
+    def test_object_list(self):
+        object_list = ObjectList(['foo'])
+        self.assertTrue(issubclass(object_list, BaseObjectList))
+
+
+class TestBaseFieldPanel(TestCase):
+    class FakeClass(object):
+        required = False
+
+    class FakeField(object):
+        label = 'label'
+        help_text = 'help text'
+
+    def setUp(self):
+        fake_field = self.FakeField()
+        BaseFieldPanel.field_name = 'barbecue'
+        self.base_field_panel = BaseFieldPanel(
+            instance=True,
+            form={'barbecue': fake_field})
+
+    def test_object_classnames_no_classname(self):
+        result = self.base_field_panel.object_classnames()
+        self.assertEqual(result, "single-field")
+
+    def test_object_classnames(self):
+        self.base_field_panel.classname = "bar"
+        result = self.base_field_panel.object_classnames()
+        self.assertEqual(result, "single-field bar")
+
+    def test_field_type(self):
+        fake_object = self.FakeClass()
+        another_fake_object = self.FakeClass()
+        fake_object.field = another_fake_object
+        self.base_field_panel.bound_field = fake_object
+        self.assertEqual(self.base_field_panel.field_type(), 'fake_class')
+
+    def test_field_classnames(self):
+        fake_object = self.FakeClass()
+        another_fake_object = self.FakeClass()
+        another_fake_object.required = True
+        fake_object.errors = True
+        fake_object.field = another_fake_object
+        self.base_field_panel.bound_field = fake_object
+        self.assertEqual(self.base_field_panel.field_classnames(),
+                         'fake_class required error')
+
+
+class TestFieldPanel(TestCase):
+    class FakeClass(object):
+        required = False
+
+    class FakeField(object):
+        label = 'label'
+        help_text = 'help text'
+        errors = ['errors']
+        id_for_label = 'id for label'
+
+    def setUp(self):
+        fake_field = self.FakeField()
+        fake_field.field = self.FakeClass()
+        self.field_panel = FieldPanel('barbecue', 'snowman')(
+            instance=True,
+            form={'barbecue': fake_field})
+
+    def test_render_as_object(self):
+        result = self.field_panel.render_as_object()
+        self.assertRegexpMatches(result,
+                                 '<legend>label</legend>')
+        self.assertRegexpMatches(result,
+                                 '<li class="fake_class error">')
+        self.assertRegexpMatches(result,
+                                 '<p class="error-message">')
+
+    def test_render_js(self):
+        field = self.FakeField()
+        bound_field = self.FakeField()
+        widget = FriendlyDateInput()
+        field.widget = widget
+        bound_field.field = field
+        self.field_panel.bound_field = bound_field
+        result = self.field_panel.render_js()
+        self.assertEqual(result,
+                         "initFriendlyDateChooser(fixPrefix('id for label'));")
+
+    def test_render_js_unknown_widget(self):
+        field = self.FakeField()
+        bound_field = self.FakeField()
+        widget = self.FakeField()
+        field.widget = widget
+        bound_field.field = field
+        self.field_panel.bound_field = bound_field
+        result = self.field_panel.render_js()
+        self.assertEqual(result,
+                         '')
+
+    def test_render_as_field(self):
+        field = self.FakeField()
+        bound_field = self.FakeField()
+        bound_field.field = field
+        self.field_panel.bound_field = bound_field
+        result = self.field_panel.render_as_field()
+        self.assertRegexpMatches(result,
+                                 '<p class="help">help text</p>')
+        self.assertRegexpMatches(result,
+                                 '<span>errors</span>')
+
+    def test_rendered_fields(self):
+        result = self.field_panel.rendered_fields()
+        self.assertEqual(result, ['barbecue'])
+
+
+class TestRichTextFieldPanel(TestCase):
+    class FakeField(object):
+        label = 'label'
+        help_text = 'help text'
+        errors = ['errors']
+        id_for_label = 'id for label'
+
+    def test_render_js(self):
+        fake_field = self.FakeField()
+        rich_text_field_panel = RichTextFieldPanel('barbecue')(
+            instance=True,
+            form={'barbecue': fake_field})
+        result = rich_text_field_panel.render_js()
+        self.assertEqual(result,
+                         "makeRichTextEditable(fixPrefix('id for label'));")
+
+
+class TestPageChooserPanel(TestCase):
+    class FakeField(object):
+        label = 'label'
+        help_text = 'help text'
+        errors = ['errors']
+        id_for_label = 'id for label'
+
+    class FakeInstance(object):
+        class FakePage(object):
+            class FakeParent(object):
+                id = 1
+
+            def get_parent(self):
+                return self.FakeParent()
+
+        def __init__(self):
+            fake_page = self.FakePage()
+            self.barbecue = fake_page
+
+
+    def setUp(self):
+        fake_field = self.FakeField()
+        fake_instance = self.FakeInstance()
+        self.page_chooser_panel = PageChooserPanel('barbecue')(
+            instance=fake_instance,
+            form={'barbecue': fake_field})
+
+    def test_render_js(self):
+        result = self.page_chooser_panel.render_js()
+        self.assertEqual(result, "createPageChooser(fixPrefix('id for label'), 'wagtailcore.page', 1);")

From e40dea8d28358f6dbd7ee736052c8b1f8c741faf Mon Sep 17 00:00:00 2001
From: Tom Dyson <tom@torchbox.com>
Date: Wed, 18 Jun 2014 17:17:14 +0100
Subject: [PATCH 143/293] wagtail -> Wagtail in contributing.rst

---
 docs/contributing.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index e8e42f1352c..f5eb168b2c4 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -20,7 +20,7 @@ Coding guidelines
 Styleguide
 ~~~~~~~~~~
 
-Developers working on the wagtail UI or creating new UI components may wish to test their work against the Styleguide, which is provided as the contrib module "wagtailstyleguide".
+Developers working on the Wagtail UI or creating new UI components may wish to test their work against our Styleguide, which is provided as the contrib module "wagtailstyleguide".
 
 To install the styleguide module on your site, add it to the list of ``INSTALLED_APPS`` in your settings:
 
@@ -34,7 +34,7 @@ To install the styleguide module on your site, add it to the list of ``INSTALLED
 
 At present the styleguide is static: new UI components must be added to it manually, and there are no hooks into it for other modules to use. We hope to support hooks in the future.
 
-The styleguide doesn't currently provide examples of all the core interface components, notably the Page, Document, Image and Snippet chooser interfaces are not currently represented.
+The styleguide doesn't currently provide examples of all the core interface components; notably the Page, Document, Image and Snippet chooser interfaces are not currently represented.
 
 
 Translations

From 9a1da28c38096c360a056aa1c26595382d7e3792 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 18 Jun 2014 17:22:46 +0100
Subject: [PATCH 144/293] Changelog entries for #236, #286 and #315

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

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ddd41d76eb2..039935b439a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -9,6 +9,9 @@ Changelog
  * Removed the "More" section from the admin menu
  * Added pagination to page listings in admin
  * Support for setting a subpage_types property on page models, to define which page types are allowed as subpages
+ * Added a new datetime picker
+ * Added styleguide
+ * Aesthetic improvements to preview experience
  * Fix: Animated GIFs are now coalesced before resizing
  * Fix: Wand backend clones images before modifying them
  * Fix: Admin breadcrumb now positioned correctly on mobile

From 06dc598d0a928109aee35517f6bd161bcaf64ba8 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <xcession@xcessionsites.com>
Date: Wed, 18 Jun 2014 17:25:58 +0100
Subject: [PATCH 145/293] Update CHANGELOG.txt

---
 CHANGELOG.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 039935b439a..6686cf973ef 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -9,8 +9,8 @@ Changelog
  * Removed the "More" section from the admin menu
  * Added pagination to page listings in admin
  * Support for setting a subpage_types property on page models, to define which page types are allowed as subpages
- * Added a new datetime picker
- * Added styleguide
+ * Added a new datetime picker widget
+ * Added styleguide (mainly for wagtail developers)
  * Aesthetic improvements to preview experience
  * Fix: Animated GIFs are now coalesced before resizing
  * Fix: Wand backend clones images before modifying them

From d95763251d5f70f819656fafeadcf3c7fb6c2603 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 18 Jun 2014 17:29:24 +0100
Subject: [PATCH 146/293] Corrected names of userbar tests

---
 wagtail/wagtailadmin/tests/test_userbar.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_userbar.py b/wagtail/wagtailadmin/tests/test_userbar.py
index 52ec2d60ad6..acdb81690eb 100644
--- a/wagtail/wagtailadmin/tests/test_userbar.py
+++ b/wagtail/wagtailadmin/tests/test_userbar.py
@@ -49,7 +49,7 @@ def test_userbar_frontend(self):
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtailadmin/userbar/base.html')
 
-    def test_userbar_anonymous_user_cannot_see(self):
+    def test_userbar_frontend_anonymous_user_cannot_see(self):
         # Logout
         self.client.logout()
 
@@ -66,13 +66,13 @@ def setUp(self):
         self.homepage.save_revision()
         self.revision = self.homepage.get_latest_revision()
 
-    def test_userbar_frontend(self):
+    def test_userbar_moderation(self):
         response = self.client.get(reverse('wagtailadmin_userbar_moderation', args=(self.revision.id, )))
 
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtailadmin/userbar/base.html')
 
-    def test_userbar_anonymous_user_cannot_see(self):
+    def test_userbar_moderation_anonymous_user_cannot_see(self):
         # Logout
         self.client.logout()
 

From cd06b2c6e22666f523716866c9663d4012b2aae1 Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Wed, 18 Jun 2014 17:33:20 +0100
Subject: [PATCH 147/293] Remove broken test

---
 wagtail/wagtailadmin/tests/test_edit_handlers.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py
index 8e0e4a7c54b..cd21748b459 100644
--- a/wagtail/wagtailadmin/tests/test_edit_handlers.py
+++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py
@@ -287,17 +287,6 @@ def test_render_as_object(self):
         self.assertRegexpMatches(result,
                                  '<p class="error-message">')
 
-    def test_render_js(self):
-        field = self.FakeField()
-        bound_field = self.FakeField()
-        widget = FriendlyDateInput()
-        field.widget = widget
-        bound_field.field = field
-        self.field_panel.bound_field = bound_field
-        result = self.field_panel.render_js()
-        self.assertEqual(result,
-                         "initFriendlyDateChooser(fixPrefix('id for label'));")
-
     def test_render_js_unknown_widget(self):
         field = self.FakeField()
         bound_field = self.FakeField()

From 9a5954607d4ddc232991e493d61484e3fb2fbdcb Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 19 Jun 2014 10:28:56 +0100
Subject: [PATCH 148/293] Renamed pageurl tags to wagtailcore_tags

---
 wagtail/wagtailcore/templatetags/pageurl.py   | 26 ++++---------------
 .../templatetags/wagtailcore_tags.py          | 25 ++++++++++++++++++
 2 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 wagtail/wagtailcore/templatetags/wagtailcore_tags.py

diff --git a/wagtail/wagtailcore/templatetags/pageurl.py b/wagtail/wagtailcore/templatetags/pageurl.py
index d3488d9b459..fe64a302f6a 100644
--- a/wagtail/wagtailcore/templatetags/pageurl.py
+++ b/wagtail/wagtailcore/templatetags/pageurl.py
@@ -1,24 +1,8 @@
-from django import template
+import warnings
 
-from wagtail.wagtailcore.models import Page
+warnings.warn(
+    "The pageurl tags has been renamed. "
+    "Use wagtailcore_tags instead.", DeprecationWarning)
 
-register = template.Library()
 
-
-@register.simple_tag(takes_context=True)
-def pageurl(context, page):
-    """
-    Outputs a page's URL as relative (/foo/bar/) if it's within the same site as the
-    current page, or absolute (http://example.com/foo/bar/) if not.
-    """
-    return page.relative_url(context['request'].site)
-
-@register.simple_tag(takes_context=True)
-def slugurl(context, slug):
-    """Returns the URL for the page that has the given slug."""
-    page = Page.objects.filter(slug=slug).first()
-
-    if page:
-        return page.relative_url(context['request'].site)
-    else:
-        return None
+from wagtail.wagtailcore.templatetags.wagtailcore_tags import register
diff --git a/wagtail/wagtailcore/templatetags/wagtailcore_tags.py b/wagtail/wagtailcore/templatetags/wagtailcore_tags.py
new file mode 100644
index 00000000000..d91c05742df
--- /dev/null
+++ b/wagtail/wagtailcore/templatetags/wagtailcore_tags.py
@@ -0,0 +1,25 @@
+from django import template
+
+from wagtail.wagtailcore.models import Page
+
+register = template.Library()
+
+
+@register.simple_tag(takes_context=True)
+def pageurl(context, page):
+    """
+    Outputs a page's URL as relative (/foo/bar/) if it's within the same site as the
+    current page, or absolute (http://example.com/foo/bar/) if not.
+    """
+    return page.relative_url(context['request'].site)
+
+
+@register.simple_tag(takes_context=True)
+def slugurl(context, slug):
+    """Returns the URL for the page that has the given slug."""
+    page = Page.objects.filter(slug=slug).first()
+
+    if page:
+        return page.relative_url(context['request'].site)
+    else:
+        return None

From 122abc9a8c7a332b623b86e7a5c6d9bdb28ac4b4 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 19 Jun 2014 10:30:09 +0100
Subject: [PATCH 149/293] renamed rich_text tags to wagtailrichtext_tags

---
 wagtail/wagtailcore/templatetags/rich_text.py       | 13 +++++--------
 .../templatetags/wagtailrichtext_tags.py            | 11 +++++++++++
 2 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 wagtail/wagtailcore/templatetags/wagtailrichtext_tags.py

diff --git a/wagtail/wagtailcore/templatetags/rich_text.py b/wagtail/wagtailcore/templatetags/rich_text.py
index d3bc64fddcb..d7d16264504 100644
--- a/wagtail/wagtailcore/templatetags/rich_text.py
+++ b/wagtail/wagtailcore/templatetags/rich_text.py
@@ -1,11 +1,8 @@
-from django import template
-from django.utils.safestring import mark_safe
+import warnings
 
-from wagtail.wagtailcore.rich_text import expand_db_html
+warnings.warn(
+    "The rich_text tags has been renamed. "
+    "Use wagtailrichtext_tags instead.", DeprecationWarning)
 
-register = template.Library()
 
-
-@register.filter
-def richtext(value):
-    return mark_safe('<div class="rich-text">' + expand_db_html(value) + '</div>')
+from wagtail.wagtailcore.templatetags.wagtailrichtext_tags import register
diff --git a/wagtail/wagtailcore/templatetags/wagtailrichtext_tags.py b/wagtail/wagtailcore/templatetags/wagtailrichtext_tags.py
new file mode 100644
index 00000000000..d3bc64fddcb
--- /dev/null
+++ b/wagtail/wagtailcore/templatetags/wagtailrichtext_tags.py
@@ -0,0 +1,11 @@
+from django import template
+from django.utils.safestring import mark_safe
+
+from wagtail.wagtailcore.rich_text import expand_db_html
+
+register = template.Library()
+
+
+@register.filter
+def richtext(value):
+    return mark_safe('<div class="rich-text">' + expand_db_html(value) + '</div>')

From 65ec6d77e8effdf54aefcb6d5b42f65ba2089436 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 19 Jun 2014 10:36:03 +0100
Subject: [PATCH 150/293] Merged richtext tags into wagtailcore_tags

---
 wagtail/wagtailcore/templatetags/rich_text.py         |  4 ++--
 wagtail/wagtailcore/templatetags/wagtailcore_tags.py  |  7 +++++++
 .../wagtailcore/templatetags/wagtailrichtext_tags.py  | 11 -----------
 3 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 wagtail/wagtailcore/templatetags/wagtailrichtext_tags.py

diff --git a/wagtail/wagtailcore/templatetags/rich_text.py b/wagtail/wagtailcore/templatetags/rich_text.py
index d7d16264504..94c2d176c1e 100644
--- a/wagtail/wagtailcore/templatetags/rich_text.py
+++ b/wagtail/wagtailcore/templatetags/rich_text.py
@@ -2,7 +2,7 @@
 
 warnings.warn(
     "The rich_text tags has been renamed. "
-    "Use wagtailrichtext_tags instead.", DeprecationWarning)
+    "Use wagtailcore_tags instead.", DeprecationWarning)
 
 
-from wagtail.wagtailcore.templatetags.wagtailrichtext_tags import register
+from wagtail.wagtailcore.templatetags.wagtailcore_tags import register
diff --git a/wagtail/wagtailcore/templatetags/wagtailcore_tags.py b/wagtail/wagtailcore/templatetags/wagtailcore_tags.py
index d91c05742df..5e137c7a2ef 100644
--- a/wagtail/wagtailcore/templatetags/wagtailcore_tags.py
+++ b/wagtail/wagtailcore/templatetags/wagtailcore_tags.py
@@ -1,6 +1,8 @@
 from django import template
+from django.utils.safestring import mark_safe
 
 from wagtail.wagtailcore.models import Page
+from wagtail.wagtailcore.rich_text import expand_db_html
 
 register = template.Library()
 
@@ -23,3 +25,8 @@ def slugurl(context, slug):
         return page.relative_url(context['request'].site)
     else:
         return None
+
+
+@register.filter
+def richtext(value):
+    return mark_safe('<div class="rich-text">' + expand_db_html(value) + '</div>')
diff --git a/wagtail/wagtailcore/templatetags/wagtailrichtext_tags.py b/wagtail/wagtailcore/templatetags/wagtailrichtext_tags.py
deleted file mode 100644
index d3bc64fddcb..00000000000
--- a/wagtail/wagtailcore/templatetags/wagtailrichtext_tags.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from django import template
-from django.utils.safestring import mark_safe
-
-from wagtail.wagtailcore.rich_text import expand_db_html
-
-register = template.Library()
-
-
-@register.filter
-def richtext(value):
-    return mark_safe('<div class="rich-text">' + expand_db_html(value) + '</div>')

From b3e79519329dc9f2b3ebd94405b3e84024dc8353 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 19 Jun 2014 10:39:50 +0100
Subject: [PATCH 151/293] Moved embed_filters to wagtailembeds_tags

---
 .../templatetags/embed_filters.py             | 26 ++++-------------
 .../templatetags/wagtailembeds_tags.py        | 28 +++++++++++++++++++
 2 files changed, 33 insertions(+), 21 deletions(-)
 create mode 100644 wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py

diff --git a/wagtail/wagtailembeds/templatetags/embed_filters.py b/wagtail/wagtailembeds/templatetags/embed_filters.py
index d916c0ffbab..25326fec607 100644
--- a/wagtail/wagtailembeds/templatetags/embed_filters.py
+++ b/wagtail/wagtailembeds/templatetags/embed_filters.py
@@ -1,24 +1,8 @@
-from django import template
-from django.utils.safestring import mark_safe
+import warnings
 
-from wagtail.wagtailembeds import get_embed
+warnings.warn(
+    "The embed_filters tags has been renamed. "
+    "Use wagtailembeds_tags instead.", DeprecationWarning)
 
 
-register = template.Library()
-
-
-@register.filter
-def embed(url, max_width=None):
-    embed = get_embed(url, max_width=max_width)
-    try:
-        if embed is not None:
-            return mark_safe(embed.html)
-        else:
-            return ''
-    except:
-        return ''
-
-
-@register.filter
-def embedly(url, max_width=None):
-    return embed(url, max_width)
+from wagtail.wagtailembeds.templatetags.wagtailembeds_tags import register
diff --git a/wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py b/wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py
new file mode 100644
index 00000000000..aad751c6a60
--- /dev/null
+++ b/wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py
@@ -0,0 +1,28 @@
+from django import template
+from django.utils.safestring import mark_safe
+
+from wagtail.wagtailembeds import get_embed
+
+
+register = template.Library()
+
+
+@register.filter
+def embed(url, max_width=None):
+    embed = get_embed(url, max_width=max_width)
+    try:
+        if embed is not None:
+            return mark_safe(embed.html)
+        else:
+            return ''
+    except:
+        return ''
+
+
+@register.filter
+def embedly(url, max_width=None):
+    warnings.warn(
+        "The 'embedly' filter has been renamed. "
+        "Use 'embed' instead.", DeprecationWarning)
+
+    return embed(url, max_width)

From 008b3238abfb874e520c7cad0349fc55441aca6f Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 19 Jun 2014 10:41:53 +0100
Subject: [PATCH 152/293] Moved image_tags to wagtailimages_tags

---
 .../wagtailimages/templatetags/image_tags.py  | 71 ++-----------------
 .../templatetags/wagtailimages_tags.py        | 69 ++++++++++++++++++
 2 files changed, 74 insertions(+), 66 deletions(-)
 create mode 100644 wagtail/wagtailimages/templatetags/wagtailimages_tags.py

diff --git a/wagtail/wagtailimages/templatetags/image_tags.py b/wagtail/wagtailimages/templatetags/image_tags.py
index e59d9cd1486..7eba192d463 100644
--- a/wagtail/wagtailimages/templatetags/image_tags.py
+++ b/wagtail/wagtailimages/templatetags/image_tags.py
@@ -1,69 +1,8 @@
-from django import template
+import warnings
 
-from wagtail.wagtailimages.models import Filter
+warnings.warn(
+    "The image_tags tags has been renamed. "
+    "Use wagtailimages_tags instead.", DeprecationWarning)
 
-register = template.Library()
 
-# Local cache of filters, avoid hitting the DB
-filters = {}
-
-@register.tag(name="image")
-def image(parser, token):
-    args = token.split_contents()
-
-    if len(args) == 3:
-        # token is of the form {% image self.photo max-320x200 %}
-        tag_name, image_var, filter_spec = args
-        return ImageNode(image_var, filter_spec)
-
-    elif len(args) == 5:
-        # token is of the form {% image self.photo max-320x200 as img %}
-        tag_name, image_var, filter_spec, as_token, out_var = args
-
-        if as_token != 'as':
-            raise template.TemplateSyntaxError("'image' tag should be of the form {%% image self.photo max-320x200 %%} or {%% image self.photo max-320x200 as img %%}")
-
-        return ImageNode(image_var, filter_spec, out_var)
-
-    else:
-        raise template.TemplateSyntaxError("'image' tag should be of the form {%% image self.photo max-320x200 %%} or {%% image self.photo max-320x200 as img %%}")
-
-
-class ImageNode(template.Node):
-    def __init__(self, image_var_name, filter_spec, output_var_name=None):
-        self.image_var = template.Variable(image_var_name)
-        self.output_var_name = output_var_name
-
-        if filter_spec not in filters:
-            filters[filter_spec], _ = Filter.objects.get_or_create(spec=filter_spec)
-        self.filter = filters[filter_spec]
-
-    def render(self, context):
-        try:
-            image = self.image_var.resolve(context)
-        except template.VariableDoesNotExist:
-            return ''
-
-        if not image:
-            return ''
-
-        try:
-            rendition = image.get_rendition(self.filter)
-        except IOError:
-            # It's fairly routine for people to pull down remote databases to their
-            # local dev versions without retrieving the corresponding image files.
-            # In such a case, we would get an IOError at the point where we try to
-            # create the resized version of a non-existent image. Since this is a
-            # bit catastrophic for a missing image, we'll substitute a dummy
-            # Rendition object so that we just output a broken link instead.
-            Rendition = image.renditions.model  # pick up any custom Image / Rendition classes that may be in use
-            rendition = Rendition(image=image, width=0, height=0)
-            rendition.file.name = 'not-found'
-
-        if self.output_var_name:
-            # return the rendition object in the given variable
-            context[self.output_var_name] = rendition
-            return ''
-        else:
-            # render the rendition's image tag now
-            return rendition.img_tag()
+from wagtail.wagtailimages.templatetags.wagtailimages_tags import register
diff --git a/wagtail/wagtailimages/templatetags/wagtailimages_tags.py b/wagtail/wagtailimages/templatetags/wagtailimages_tags.py
new file mode 100644
index 00000000000..e59d9cd1486
--- /dev/null
+++ b/wagtail/wagtailimages/templatetags/wagtailimages_tags.py
@@ -0,0 +1,69 @@
+from django import template
+
+from wagtail.wagtailimages.models import Filter
+
+register = template.Library()
+
+# Local cache of filters, avoid hitting the DB
+filters = {}
+
+@register.tag(name="image")
+def image(parser, token):
+    args = token.split_contents()
+
+    if len(args) == 3:
+        # token is of the form {% image self.photo max-320x200 %}
+        tag_name, image_var, filter_spec = args
+        return ImageNode(image_var, filter_spec)
+
+    elif len(args) == 5:
+        # token is of the form {% image self.photo max-320x200 as img %}
+        tag_name, image_var, filter_spec, as_token, out_var = args
+
+        if as_token != 'as':
+            raise template.TemplateSyntaxError("'image' tag should be of the form {%% image self.photo max-320x200 %%} or {%% image self.photo max-320x200 as img %%}")
+
+        return ImageNode(image_var, filter_spec, out_var)
+
+    else:
+        raise template.TemplateSyntaxError("'image' tag should be of the form {%% image self.photo max-320x200 %%} or {%% image self.photo max-320x200 as img %%}")
+
+
+class ImageNode(template.Node):
+    def __init__(self, image_var_name, filter_spec, output_var_name=None):
+        self.image_var = template.Variable(image_var_name)
+        self.output_var_name = output_var_name
+
+        if filter_spec not in filters:
+            filters[filter_spec], _ = Filter.objects.get_or_create(spec=filter_spec)
+        self.filter = filters[filter_spec]
+
+    def render(self, context):
+        try:
+            image = self.image_var.resolve(context)
+        except template.VariableDoesNotExist:
+            return ''
+
+        if not image:
+            return ''
+
+        try:
+            rendition = image.get_rendition(self.filter)
+        except IOError:
+            # It's fairly routine for people to pull down remote databases to their
+            # local dev versions without retrieving the corresponding image files.
+            # In such a case, we would get an IOError at the point where we try to
+            # create the resized version of a non-existent image. Since this is a
+            # bit catastrophic for a missing image, we'll substitute a dummy
+            # Rendition object so that we just output a broken link instead.
+            Rendition = image.renditions.model  # pick up any custom Image / Rendition classes that may be in use
+            rendition = Rendition(image=image, width=0, height=0)
+            rendition.file.name = 'not-found'
+
+        if self.output_var_name:
+            # return the rendition object in the given variable
+            context[self.output_var_name] = rendition
+            return ''
+        else:
+            # render the rendition's image tag now
+            return rendition.img_tag()

From f73c7da7728f92cd07702de89cd31544db5fff7f Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 19 Jun 2014 11:17:32 +0100
Subject: [PATCH 153/293] Update docs to import tags from correct tags module

---
 docs/building_your_site/frontenddevelopers.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/building_your_site/frontenddevelopers.rst b/docs/building_your_site/frontenddevelopers.rst
index f0054eaab59..704708e0cdf 100644
--- a/docs/building_your_site/frontenddevelopers.rst
+++ b/docs/building_your_site/frontenddevelopers.rst
@@ -100,7 +100,7 @@ For example:
 
 .. code-block:: django
 
-    {% load image %}
+    {% load wagtailimages_tags %}
     ...
 
     {% image self.photo width-400 %}
@@ -190,7 +190,7 @@ In some cases greater control over the ``img`` tag is required, for example to a
 
 .. code-block:: django
     
-    {% load image %}
+    {% load wagtailimages_tags %}
     ...
     {% image self.photo width-400 as tmp_photo %}
 
@@ -209,7 +209,7 @@ Only fields using ``RichTextField`` need this applied in the template.
 
 .. code-block:: django
 
-    {% load rich_text %}
+    {% load wagtailcore_tags %}
     ...
     {{ self.body|richtext }}
 
@@ -252,7 +252,7 @@ Takes a Page object and returns a relative URL (``/foo/bar/``) if within the sam
 
 .. code-block:: django
 
-    {% load pageurl %}
+    {% load wagtailcore_tags %}
     ...
     <a href="{% pageurl self.blog_page %}">
 
@@ -263,7 +263,7 @@ Takes any ``slug`` as defined in a page's "Promote" tab and returns the URL for
 
 .. code-block:: django
 
-    {% load slugurl %}
+    {% load wagtailcore_tags %}
     ...
     <a href="{% slugurl self.your_slug %}">
 

From 879269ab20e69894c8e947892101f9eba3669471 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 19 Jun 2014 11:22:58 +0100
Subject: [PATCH 154/293] Added versionchanged notes to docs

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

diff --git a/docs/building_your_site/frontenddevelopers.rst b/docs/building_your_site/frontenddevelopers.rst
index 704708e0cdf..0ef918582df 100644
--- a/docs/building_your_site/frontenddevelopers.rst
+++ b/docs/building_your_site/frontenddevelopers.rst
@@ -90,6 +90,9 @@ In addition to Django's standard tags and filters, Wagtail provides some of its
 Images (tag)
 ~~~~~~~~~~~~
 
+.. versionchanged:: 0.4
+    The 'image_tags' tags library was renamed to 'wagtailimages_tags'
+
 The ``image`` tag inserts an XHTML-compatible ``img`` element into the page, setting its ``src``, ``width``, ``height`` and ``alt``. See also :ref:`image_tag_alt`.
 
 The syntax for the tag is thus::
@@ -203,6 +206,9 @@ In some cases greater control over the ``img`` tag is required, for example to a
 Rich text (filter)
 ~~~~~~~~~~~~~~~~~~
 
+.. versionchanged:: 0.4
+    The 'rich_text' tags library was renamed to 'wagtailcore_tags'
+
 This filter takes a chunk of HTML content and renders it as safe HTML in the page. Importantly it also expands internal shorthand references to embedded images and links made in the Wagtail editor into fully-baked HTML ready for display.
 
 Only fields using ``RichTextField`` need this applied in the template.
@@ -245,6 +251,9 @@ Wagtail embeds and images are included at their full width, which may overflow t
 Internal links (tag)
 ~~~~~~~~~~~~~~~~~~~~
 
+.. versionchanged:: 0.4
+    The 'pageurl' tags library was renamed to 'wagtailcore_tags'
+
 pageurl
 --------
 

From 03ce91c992c1c8d2dc49649d10b35add650fbd90 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <xcession@xcessionsites.com>
Date: Thu, 19 Jun 2014 12:28:07 +0100
Subject: [PATCH 155/293] Update CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index a3f9c7221d5..fcba8d2d7f9 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -1,8 +1,8 @@
 Original Authors
 ================
 
-* Matthew Westcott matthew.westcott@torchbox.com
-* David Cranwell david.cranwell@torchbox.com
+* Matthew Westcott matthew.westcott@torchbox.com twitter: @gasmanic
+* David Cranwell david.cranwell@torchbox.com twitter: @davecranwell
 * Karl Hobley karl.hobley@torchbox.com
 * Helen Chapman helen.chapman@torchbox.com
 

From 6a33834d2948d69ce75c8ef3413cb9acc093557f Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 19 Jun 2014 13:30:39 +0100
Subject: [PATCH 156/293] ongoing styling of tabs an publishing fields, inc
 introduction of salmon colour

---
 .../templates/wagtailstyleguide/base.html     | 13 +++++++---
 wagtail/wagtailadmin/edit_handlers.py         | 17 ++++++++++--
 .../wagtailadmin/scss/components/forms.scss   |  8 ++++++
 .../wagtailadmin/scss/components/tabs.scss    |  5 ++--
 .../scss/layouts/page-editor.scss             | 26 +++++++++++++------
 .../wagtailadmin/scss/layouts/styleguide.scss |  6 +++++
 .../static/wagtailadmin/scss/variables.scss   |  2 ++
 7 files changed, 61 insertions(+), 16 deletions(-)

diff --git a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
index e7bd8860611..e0d478fe1bf 100644
--- a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
+++ b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
@@ -42,9 +42,10 @@ <h2>Colour palette</h2>
                 <li class="color-teal">color-teal</li>
                 <li class="color-teal-darker">color-teal-darker</li>
                 <li class="color-teal-dark">color-teal-dark</li>
-                <li class="color-red">color-red</li>
-                <li class="color-orange">color-orange</li>
-                <li class="color-green">color-green</li>
+            </ul>
+            <ul>
+                <li class="color-salmon">color-salmon</li>
+                <li class="color-salmon-light">color-salmon-light</li>
             </ul>
             <ul>
                 <li class="color-grey-1">color-grey-1</li>
@@ -54,6 +55,12 @@ <h2>Colour palette</h2>
                 <li class="color-grey-4">color-grey-4</li>
                 <li class="color-grey-5">color-grey-5</li>
             </ul>
+            <ul>
+                <li class="color-red">color-red</li>
+                <li class="color-orange">color-orange</li>
+                <li class="color-green">color-green</li>
+            </ul>
+           
         </section>
 
         <section id="typography">
diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py
index 175c63225f9..bfdeaf8129b 100644
--- a/wagtail/wagtailadmin/edit_handlers.py
+++ b/wagtail/wagtailadmin/edit_handlers.py
@@ -602,17 +602,30 @@ def InlinePanel(base_model, relation_name, panels=None, label='', help_text=''):
     })
 
 
+# This allows users to include the publishing panel in their own per-model override
+# without having to write these fields out by hand, potentially losing 'classname' 
+# and therefore the associated styling of the publishing panel
+def PublishingPanel():
+    return MultiFieldPanel([
+        FieldPanel('go_live_at'),
+        FieldPanel('expire_at'),
+    ], ugettext_lazy('Scheduled publishing'), classname="publishing")
+
+
 # Now that we've defined EditHandlers, we can set up wagtailcore.Page to have some.
 Page.content_panels = [
     FieldPanel('title', classname="full title"),
 ]
+
 Page.promote_panels = [
     MultiFieldPanel([
         FieldPanel('slug'),
         FieldPanel('seo_title'),
         FieldPanel('show_in_menus'),
         FieldPanel('search_description'),
-        FieldPanel('go_live_at'),
-        FieldPanel('expire_at'),
     ], ugettext_lazy('Common page configuration')),
 ]
+
+Page.settings_panels = [
+    PublishingPanel()
+]
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index 5a870fbcf52..0327c940af9 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -1,3 +1,9 @@
+/* 
+    These are the generic stylings for forms of any type. 
+    If you're styling something specific to the page editing interface,
+    it probably ought to go in layouts/page-editor.scss
+*/
+
 form {
     ul, li{
         list-style-type:none;
@@ -292,6 +298,7 @@ button.icon{
     overflow:hidden;
 
     > li{
+        @include row();
         position:relative;
         background-color:white;
         padding:1em 10em 1em 1.5em; /* 10em padding leaves room for controls */
@@ -447,6 +454,7 @@ li.focused > .help{
     }
 }
 
+
 .fields li{
     @include row();
     padding-top:0.5em;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
index af0c496b113..dab30d114a3 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
@@ -2,7 +2,6 @@
     @include row();
     padding:0;
     background:$color-grey-4;
-    overflow:hidden;
 
     li{
         list-style-type:none;
@@ -22,10 +21,10 @@
         text-decoration:none;
         display:block;
         padding:0.7em;
-        padding-bottom:1em;
-        margin-bottom:-0.3em;
         color:white;
         border-top:0.3em solid lighten($color-teal-darker, 3%);
+        max-height:1.2em;
+        overflow:hidden;
 
         &:hover{
             color:white;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
index 5e3120c8248..c9fe5b54b04 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
@@ -25,9 +25,6 @@
     }
 }
 
-.objects{
-    background:url("#{$static-root}bg-dark-diag.svg");
-}
 .object{
     position:relative;
     overflow:hidden;
@@ -80,7 +77,7 @@
 
     > h2, &.single-field label{
         -webkit-font-smoothing: auto;
-        background:$color-grey-3;
+        background:$color-salmon-light;
         text-transform:uppercase;
         padding:0.9em 0 0.9em 4em;
         font-size:0.95em;
@@ -92,10 +89,10 @@
         left:0;
         right:0;
         z-index:1;
-        text-shadow:1px 1px 1px rgba(255,255,255,0.5);
-        @include box-shadow(0 0 7px 0 rgba(0,0,0,0.4));
+        overflow:hidden;
 
         &:before{
+            text-shadow:none;
             font-family:wagtail;
             text-transform:none;
             content:"q";
@@ -108,10 +105,11 @@
             line-height:1.8em;
             left:0px;
             width:1.7em;
-            opacity:0.15;
+            color:white;
             padding:0;
             margin:0;
             cursor:pointer;
+            background-color:$color-salmon;
         }
     }
 
@@ -186,6 +184,17 @@
         }
     }
 
+    /* special panel for the publishing fields, requires a bit more pizzazz */
+    &.publishing{
+        h2:before{
+            content:"7";
+            font-size:2.5em;
+            line-height:1.4em;
+            width:1.3em;
+        }
+       
+    }
+
     &.title input,
     &.title textarea{
         font-size:2em;
@@ -235,16 +244,17 @@
             top:0px;
             left:0px;
             width:3.3em;
-            background-color:$color-teal;
             padding:0;
             margin:0 0 0 -20px;
             cursor:pointer;
 
             a{
+                @include border-radius(0);
                 font-size: 0em;
                 line-height: 0;
                 overflow: visible;
                 display:block;
+                background-color:$color-salmon;
 
                 &:before{
                     position:relative;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss
index 38d4281da9a..09cb627edb7 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss
@@ -68,6 +68,12 @@ section{
     .color-grey-5{
         background-color:$color-grey-5;
     }
+    .color-salmon{
+        background-color:$color-salmon;
+    }
+    .color-salmon-light{
+        background-color:$color-salmon-light;
+    }
 }
 
 
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss
index 0f65679893f..9479b8a28a5 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss
@@ -30,6 +30,8 @@ $color-teal-dark: #246060;
 $color-red: #f7474e;
 $color-orange:#e9b04d;
 $color-green: #189370;
+$color-salmon: #f37e77;
+$color-salmon-light: #fcf2f2;
 
 /* darker to lighter */
 $color-grey-1: #333333;

From d1b321f859e3a9f19e636c9ec4a0af9ac4992b27 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 19 Jun 2014 13:33:48 +0100
Subject: [PATCH 157/293] made red more distinct from salmon

---
 wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss
index 9479b8a28a5..e27817175fc 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss
@@ -27,7 +27,7 @@ $breakpoint-desktop-larger: 100em; /* 1600px */
 $color-teal: #43b1b0;
 $color-teal-darker: darken($color-teal, 10%);
 $color-teal-dark: #246060;
-$color-red: #f7474e;
+$color-red: #cd3238;
 $color-orange:#e9b04d;
 $color-green: #189370;
 $color-salmon: #f37e77;

From 62fc679720aeb18c79e9d17fa5e4c6b67b105340 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 19 Jun 2014 13:47:09 +0100
Subject: [PATCH 158/293] further tweaks to colours and form layout

---
 .../static/wagtailadmin/scss/components/datetimepicker.scss | 2 +-
 .../static/wagtailadmin/scss/components/forms.scss          | 2 +-
 .../static/wagtailadmin/scss/layouts/page-editor.scss       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss
index 078c9346999..4902c241830 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss
@@ -246,7 +246,7 @@
 	.xdsoft_calendar td.xdsoft_default,
 	.xdsoft_calendar td.xdsoft_current,
 	.xdsoft_timepicker .xdsoft_time_box > div > div.xdsoft_current{
-		background: $color-orange;
+		background: $color-salmon;
 		color:#fff;
 		font-weight: 700;
 	}
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index 0327c940af9..1d9b8b7a734 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -456,7 +456,7 @@ li.focused > .help{
 
 
 .fields li{
-    @include row();
+    @include clearfix();
     padding-top:0.5em;
     padding-bottom:1.2em;
 }
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
index c9fe5b54b04..c75f0b6bcf9 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
@@ -79,7 +79,7 @@
         -webkit-font-smoothing: auto;
         background:$color-salmon-light;
         text-transform:uppercase;
-        padding:0.9em 0 0.9em 4em;
+        padding:0.9em 0 0.9em 4.1em;
         font-size:0.95em;
         margin:0 0 0.2em 0;
         line-height:1.5em;
@@ -188,9 +188,9 @@
     &.publishing{
         h2:before{
             content:"7";
-            font-size:2.5em;
+            font-size:2.4em;
             line-height:1.4em;
-            width:1.3em;
+            width:1.4em;
         }
        
     }

From 4c5a1b1ae9a16821bdade3fd133eaca2b1e82d18 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 19 Jun 2014 14:17:27 +0100
Subject: [PATCH 159/293] Recache coverage badge

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 62b3c5cd5ac..0e68b8c6b18 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 .. image:: https://travis-ci.org/torchbox/wagtail.png?branch=master
     :target: https://travis-ci.org/torchbox/wagtail
 
-.. image:: https://coveralls.io/repos/torchbox/wagtail/badge.png?branch=master&zxcv
+.. image:: https://coveralls.io/repos/torchbox/wagtail/badge.png?branch=master&zxcv1
     :target: https://coveralls.io/r/torchbox/wagtail?branch=master 
 
 .. image:: https://pypip.in/v/wagtail/badge.png?zxcv

From 269dfe62f5517013d54810832a846ac143339b60 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 19 Jun 2014 16:58:48 +0100
Subject: [PATCH 160/293] refactoring how/where fields get their classes added

---
 .../templates/wagtailstyleguide/base.html     |   1 +
 wagtail/contrib/wagtailstyleguide/views.py    |   1 +
 wagtail/wagtailadmin/edit_handlers.py         |  26 +--
 .../wagtailadmin/scss/components/forms.scss   |  99 +++++++----
 .../wagtailadmin/scss/components/header.scss  |   7 -
 .../wagtailadmin/scss/components/icons.scss   |  10 +-
 .../scss/fonts/wagtail-icomoon.json           | 164 ++++++++++--------
 .../wagtailadmin/scss/fonts/wagtail.eot       | Bin 25504 -> 25648 bytes
 .../wagtailadmin/scss/fonts/wagtail.svg       |   1 +
 .../wagtailadmin/scss/fonts/wagtail.ttf       | Bin 25340 -> 25484 bytes
 .../wagtailadmin/scss/fonts/wagtail.woff      | Bin 15108 -> 15192 bytes
 .../wagtailadmin/scss/layouts/login.scss      |  18 +-
 .../edit_handlers/chooser_panel.html          |   2 +-
 .../edit_handlers/field_panel_field.html      |  24 +--
 .../edit_handlers/multi_field_panel.html      |   4 +-
 ...el_object.html => single_field_panel.html} |   2 +-
 .../templates/wagtailadmin/shared/field.html  |  25 +++
 .../wagtailadmin/shared/field_as_li.html      |  25 +--
 .../templates/wagtailadmin/shared/header.html |   2 +-
 .../wagtailforms/index_submissions.html       |   2 +-
 20 files changed, 223 insertions(+), 190 deletions(-)
 rename wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/{field_panel_object.html => single_field_panel.html} (57%)
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/shared/field.html

diff --git a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
index e0d478fe1bf..767f69f7f10 100644
--- a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
+++ b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
@@ -388,6 +388,7 @@ <h2>Icons</h2>
                 <li class="icon icon-warning">warning</li>
                 <li class="icon icon-success">success</li>
                 <li class="icon icon-date">date</li>
+                <li class="icon icon-time">time</li>
                 <li class="icon icon-form">form</li>
             </ul>
 
diff --git a/wagtail/contrib/wagtailstyleguide/views.py b/wagtail/contrib/wagtailstyleguide/views.py
index 52c5433a1e7..9c830073c20 100644
--- a/wagtail/contrib/wagtailstyleguide/views.py
+++ b/wagtail/contrib/wagtailstyleguide/views.py
@@ -23,6 +23,7 @@ class ExampleForm(forms.Form):
     url = forms.URLField(required=True)
     email = forms.EmailField(max_length=254)
     date = forms.DateField()
+    time = forms.TimeField()
     select = forms.ChoiceField(choices=CHOICES)
     boolean = forms.BooleanField(required=False)
 
diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py
index bfdeaf8129b..9ded8bb297f 100644
--- a/wagtail/wagtailadmin/edit_handlers.py
+++ b/wagtail/wagtailadmin/edit_handlers.py
@@ -195,9 +195,20 @@ def object_classnames(self):
         return ""
 
     def field_classnames(self):
+        classname = self.field_type() + "test"
+        
+        if self.bound_field.field.required:
+            classname += " required"
+        if self.bound_field.errors:
+            classname += " error"
+
+        return classname
+
+
+    def input_classnames(self):
         """
-        Additional classnames to add to the <li> when rendering this within a
-        <ul class="fields">
+        Additional classnames to add to the .input surrounding the input field.
+        Mainly used to identify certain field types boolean_field, url_field, date_field etc
         """
         return ""
 
@@ -367,16 +378,7 @@ def object_classnames(self):
     def field_type(self):
         return camelcase_to_underscore(self.bound_field.field.__class__.__name__)
 
-    def field_classnames(self):
-        classname = self.field_type()
-        if self.bound_field.field.required:
-            classname += " required"
-        if self.bound_field.errors:
-            classname += " error"
-
-        return classname
-
-    object_template = "wagtailadmin/edit_handlers/field_panel_object.html"
+    object_template = "wagtailadmin/edit_handlers/single_field_panel.html"
 
     def render_as_object(self):
         return mark_safe(render_to_string(self.object_template, {
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index 1d9b8b7a734..cfa028877f4 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -419,43 +419,85 @@ li.focused > .help{
 .boolean_field .help, .radio .help{
     opacity:1;
 }
-.iconfield {
-    position:relative;
+
+/* 
+    This is expected to go on the parent of the input/select/textarea
+    so in most cases .input
+*/
+.iconfield, /* generic */
+.date_field,
+.time_field,
+.date_time_field,
+.url_field{
+    .input{
+        position:relative;
+
+        &:before, &:after{
+            font-family:wagtail;
+            position:absolute;
+            top:0.5em;
+            line-height:100%;
+            font-size:2em;
+            color:$color-grey-3;
+        }
+        &:before{
+            left:0.3em;
+        }
+        &:after{
+            right:0.5em;
+        }
+    }
 
     input:not([type=radio]), input:not([type=checkbox]), input:not([type=submit]), input:not([type=button]){
         padding-left:2.5em;
     }
 
-    &:before, &:after{
-        font-family:wagtail;
-        position:absolute;
-        top:0.4em;
-        font-size:1.4em;
-        color:$color-grey-3;
-    }
-    &:before{
-        left:0.5em;
-    }
-    &:after{
-        right:0.5em;
+    /* smaller fields required slight repositioning of icons */
+    &.field-small{
+        .input{
+            &:before, &:after{
+                font-size:1.5em;
+                top:0.3em;
+            }
+            &:before{
+                left:0.5em;
+            }
+            &:after{
+                right:0.5em;
+            }
+        }
     }
 
     /* special case for search spinners */
     &.icon-spinner:after{
         color:$color-teal;
         opacity:0.8;
-        font-size:20px;
-        width:20px;
-        height:20px;
-        line-height:23px;
         text-align:center;
         top:0.3em;
+    }
+}
+
+.date_field,
+.date_time_field{
+    .input:before{
+        @extend .icon-date:before;
+    }
+}
+
+.time_field{
+    .input:before{
+        @extend .icon-time:before;
+    }
+}
 
+.url_field{
+    .input:before{
+        @extend .icon-link:before;
     }
 }
 
 
-.fields li{
+.fields > li{
     @include clearfix();
     padding-top:0.5em;
     padding-bottom:1.2em;
@@ -679,18 +721,17 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
         @include column(2);
         padding-top:1.2em;
         padding-left:0;
+    }
 
-        .model_multiple_choice_field &,
-        .boolean_field &,
-        .model_choice_field &,
-        .image_field &,
-        .file_field &{
+    /* these fields are formatted differently and label alignment must change */
+    .model_multiple_choice_field,
+    .boolean_field,
+    .model_choice_field,
+    .image_field,
+    .file_field{
+        label{
             padding-top:0;
         }
-
-        .boolean_field &{
-            padding-bottom:0;
-        }
     }
 
     input[type=submit], input[type=reset], input[type=button], .button, button{
@@ -721,5 +762,5 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
     .field-content{
         @include column(10);
         padding-right:0;
-    }
+    }   
 }
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss
index d93eaa2707d..3f079897f5c 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss
@@ -97,13 +97,6 @@ header{
     }
 }
 
-/* mozilla specific hack */
-@-moz-document url-prefix() { 
-    .iconfield.icon-spinner:after{
-        line-height:20px;
-    }
-}
-
 .page-explorer header{
     margin-bottom:0;
     padding-bottom:0em;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
index 30a089a18ec..e316e5e970d 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
@@ -209,9 +209,9 @@
 }
 .icon-spinner:after{
     width:1em;
-    animation: spin 1s infinite;
-    -webkit-animation: spin 1s infinite;
-    -moz-animation: spin 1s infinite;
+    animation: spin 0.5s infinite linear;
+    -webkit-animation: spin 0.5s infinite linear;
+    -moz-animation: spin 0.5s infinite linear;
     content:"1";
 }
 .icon-pick:before{
@@ -233,6 +233,9 @@
 .icon-date:before{
     content:"7";
 }
+.icon-time:before{
+    content:"8";
+}
 .icon-success:before{
     content:"9";
 }
@@ -245,6 +248,7 @@
 .icon-form:before{
     content:"$";
 }
+
 .icon.text-replace{
     font-size:0em;
     line-height:0;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
index 583faf89a9e..57c8a26f19f 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
@@ -1,6 +1,29 @@
 {
 	"IcoMoonType": "selection",
 	"icons": [
+		{
+			"icon": {
+				"paths": [
+					"M632.913 707.493l-173.647-173.649v-232.782h105.469v189.094l142.759 142.757zM512 90.125c-232.995 0-421.875 188.88-421.875 421.875s188.88 421.875 421.875 421.875 421.875-188.88 421.875-421.875-188.88-421.875-421.875-421.875zM512 828.406c-174.747 0-316.406-141.659-316.406-316.406s141.659-316.406 316.406-316.406c174.747 0 316.406 141.659 316.406 316.406s-141.659 316.406-316.406 316.406z"
+				],
+				"tags": [
+					"clock",
+					"time",
+					"schedule"
+				],
+				"grid": 16
+			},
+			"properties": {
+				"id": 72,
+				"order": 9,
+				"prevSize": 32,
+				"code": 56,
+				"name": "clock",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"iconIdx": 72
+		},
 		{
 			"icon": {
 				"paths": [
@@ -20,7 +43,7 @@
 				"name": "lock39copy",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 0
 		},
 		{
@@ -42,7 +65,7 @@
 				"name": "lock39-open",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 1
 		},
 		{
@@ -63,7 +86,7 @@
 				"name": "form",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 2
 		},
 		{
@@ -82,7 +105,7 @@
 				"name": "uni61",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 3
 		},
 		{
@@ -101,7 +124,7 @@
 				"name": "uni62",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 4
 		},
 		{
@@ -120,7 +143,7 @@
 				"name": "uni63",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 5
 		},
 		{
@@ -139,7 +162,7 @@
 				"name": "uni64",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 6
 		},
 		{
@@ -158,7 +181,7 @@
 				"name": "uni65",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 7
 		},
 		{
@@ -177,7 +200,7 @@
 				"name": "uni66",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 8
 		},
 		{
@@ -196,7 +219,7 @@
 				"name": "uni67",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 9
 		},
 		{
@@ -215,7 +238,7 @@
 				"name": "uni69",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 10
 		},
 		{
@@ -234,7 +257,7 @@
 				"name": "uni6A",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 11
 		},
 		{
@@ -253,7 +276,7 @@
 				"name": "uni6B",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 12
 		},
 		{
@@ -272,7 +295,7 @@
 				"name": "uni6C",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 13
 		},
 		{
@@ -291,7 +314,7 @@
 				"name": "uni6E",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 14
 		},
 		{
@@ -310,7 +333,7 @@
 				"name": "uni68",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 15
 		},
 		{
@@ -329,7 +352,7 @@
 				"name": "uni6F",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 16
 		},
 		{
@@ -348,7 +371,7 @@
 				"name": "uni71",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 17
 		},
 		{
@@ -367,7 +390,7 @@
 				"name": "uni72",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 18
 		},
 		{
@@ -386,7 +409,7 @@
 				"name": "uni73",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 19
 		},
 		{
@@ -405,7 +428,7 @@
 				"name": "uni74",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 20
 		},
 		{
@@ -424,7 +447,7 @@
 				"name": "uni75",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 21
 		},
 		{
@@ -443,7 +466,7 @@
 				"name": "uni76",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 22
 		},
 		{
@@ -462,7 +485,7 @@
 				"name": "uni77",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 23
 		},
 		{
@@ -481,7 +504,7 @@
 				"name": "uni78",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 24
 		},
 		{
@@ -500,7 +523,7 @@
 				"name": "uni7A",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 25
 		},
 		{
@@ -519,7 +542,7 @@
 				"name": "uni41",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 26
 		},
 		{
@@ -538,7 +561,7 @@
 				"name": "uni42",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 27
 		},
 		{
@@ -557,7 +580,7 @@
 				"name": "uni44",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 28
 		},
 		{
@@ -576,7 +599,7 @@
 				"name": "uni43",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 29
 		},
 		{
@@ -595,7 +618,7 @@
 				"name": "uni45",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 30
 		},
 		{
@@ -614,7 +637,7 @@
 				"name": "uni46",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 31
 		},
 		{
@@ -633,7 +656,7 @@
 				"name": "uni47",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 32
 		},
 		{
@@ -652,7 +675,7 @@
 				"name": "uni48",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 33
 		},
 		{
@@ -671,7 +694,7 @@
 				"name": "uni49",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 34
 		},
 		{
@@ -690,7 +713,7 @@
 				"name": "uni4A",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 35
 		},
 		{
@@ -709,7 +732,7 @@
 				"name": "uni4B",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 36
 		},
 		{
@@ -728,7 +751,7 @@
 				"name": "uni4C",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 37
 		},
 		{
@@ -747,7 +770,7 @@
 				"name": "uni4D",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 38
 		},
 		{
@@ -766,7 +789,7 @@
 				"name": "uni4E",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 39
 		},
 		{
@@ -785,7 +808,7 @@
 				"name": "uni4F",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 40
 		},
 		{
@@ -804,7 +827,7 @@
 				"name": "uni50",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 41
 		},
 		{
@@ -823,7 +846,7 @@
 				"name": "uni51",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 42
 		},
 		{
@@ -842,7 +865,7 @@
 				"name": "uni79",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 43
 		},
 		{
@@ -861,7 +884,7 @@
 				"name": "uni52",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 44
 		},
 		{
@@ -880,7 +903,7 @@
 				"name": "uni54",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 45
 		},
 		{
@@ -899,7 +922,7 @@
 				"name": "uni57",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 46
 		},
 		{
@@ -918,7 +941,7 @@
 				"name": "uni58",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 47
 		},
 		{
@@ -937,7 +960,7 @@
 				"name": "uni59",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 48
 		},
 		{
@@ -956,7 +979,7 @@
 				"name": "uni5A",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 49
 		},
 		{
@@ -975,7 +998,7 @@
 				"name": "uni56",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 50
 		},
 		{
@@ -994,7 +1017,7 @@
 				"name": "uni31",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 51
 		},
 		{
@@ -1013,7 +1036,7 @@
 				"name": "uni55",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 52
 		},
 		{
@@ -1032,7 +1055,7 @@
 				"name": "uni33",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 53
 		},
 		{
@@ -1051,7 +1074,7 @@
 				"name": "uni32",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 54
 		},
 		{
@@ -1070,7 +1093,7 @@
 				"name": "uni35",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 55
 		},
 		{
@@ -1089,7 +1112,7 @@
 				"name": "uni36",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 56
 		},
 		{
@@ -1108,7 +1131,7 @@
 				"name": "uni30",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 57
 		},
 		{
@@ -1127,7 +1150,7 @@
 				"name": "uni3F",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 58
 		},
 		{
@@ -1146,7 +1169,7 @@
 				"name": "uni21",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 59
 		},
 		{
@@ -1165,7 +1188,7 @@
 				"name": "uni39",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 60
 		},
 		{
@@ -1184,7 +1207,7 @@
 				"name": "uni53",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 61
 		},
 		{
@@ -1203,7 +1226,7 @@
 				"name": "uni34",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 62
 		},
 		{
@@ -1222,7 +1245,7 @@
 				"name": "uni37",
 				"ligatures": ""
 			},
-			"setIdx": 0,
+			"setIdx": 1,
 			"iconIdx": 63
 		}
 	],
@@ -1245,13 +1268,14 @@
 				"baseline": 6.25,
 				"whitespace": 50
 			},
-			"showMetadata": false,
-			"showMetrics": true,
-			"useClassSelector": false,
-			"classSelector": ".icon",
-			"embed": false
+			"resetPoint": 58880
+		},
+		"imagePref": {
+			"color": 0,
+			"height": 32,
+			"columns": 16,
+			"margin": 16
 		},
-		"imagePref": {},
 		"historySize": 100,
 		"showCodes": true,
 		"search": "",
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot
index 605751ad41fb7c6fa3c62568d7881f273d6a9900..343d7c831ef39f15f44a94e09b379e52092ed427 100755
GIT binary patch
delta 589
zcmXw$Ur5tY6vxlGKb<;tn`^D@=dj=Jx4GH=Ib7{uvdR!6ri=<45w@Sx9AnFYd$0mW
zG(tj3+fz?TM2JKT=ev)ZM1MyQ^;ALh5YbEIL;CAX@V<P{=X>rs_uPAzH?gvXD&GXa
zLTX7BXo#<_C6-Q?itrgX0nh>f*(rG@PpTuHCvBd}-ne$RbK^1bBEVQFJt<E><@OJN
zq=E8*G#T7i<|B>~+tRth>>Y!ymzesXAv>LtcmEz%1IQ)HFXZIeJjB^+fN?qlgzIw7
zJn7S{yd;B~U^qWLQvi-qkjj>?;H|R>3iUJ)2MiEIut6A3!DYCq>?%rq9|+|6$U6h_
zzK6;;<%{xBd8fQpwy6%wB0E$)!Sd=N2Oen04_Jjp;DM&>b_D%Lk&`s6sf+XXMVTYu
zWmZn|vY<W6{C!>Qh=#Lb|0w!#NcO}c0-_L!d0ZnQ2~i4-xCos*BJYd{QpjyWG`U04
z+-PBJ2(@B(*zFz;iwA1hdti3e(PchRfa=q>#fz48_Oo_X+y4hz+5V;8Y%M>k2X!sS
zlR+FT&nHioH<CNWxyDu1c2lC+*^+5lSKn`a-=5K2&<1obI#eAMJ=0$@2!?;g<Hmxq
zW@<34@NImB-|LK7)`XbwM6`${u_oQKs;xV=@7)o*)Bemc;CR?`zUSAms1uyeU0&C^
d`<&;K*X{k?J3wy^Fvwm3eIYFxt{NE6;D2f7lu7^q

delta 444
zcmdmRf^ordMz#gX3=DsgCbF5aa0NRpnCQ?_&lt)$hk=1nhJk^hBt5aX07we}`4fON
zM|w_W+H1d;4}ts{3=FX!GEx&$7*?E}$G{NZ0hBk(017ZaV$uil4*>Zp8M!4DjUoa}
zK>ib;9)X<v<U~%cFLxLi621WCyK)mN3K;yE&M`0~HURkwd5O7_sRn#2P67oM05w<^
z<QJDPFaxC+lI~27VXXE}05U~@4q|3tVPIrXWKdx+XRu_jXNY2``v3R;e~?NB1)!(_
zSk#dr5iH91|MCBa|F8YO`v1cJ^Z!o*bu%(BY?fkb=Gtt?+aD}*ZIW9=JipCX25z8J
zf#Cd+V<j+p@|^^8MwiJViPn>Y6Tj3aur;vru|MEc;LPH3;qKs7;N#$XBakAnM=(ur
zhY*+WHIYrCuf(*(y2N)$#7Q2KN|V|m%_Nhdz@!kNa7ochu}jH8>45S&l{qROR3E6t
zsQpm)&|uJ5qVYv@n^uz66YVVRf4UQNAL%XA`vG(T(3uP_OlKIlK(1i`I&Sl^q%1}N
D9MXga

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
index f095fbd63b3..11310f29378 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
@@ -17,6 +17,7 @@
 <glyph unicode="&#x35;" d="M135 424h241v-23h-241zM405 247l-127-124v222h-45v-220l-125 122-33-32 181-181 181 181z" />
 <glyph unicode="&#x36;" d="M136 424h241v-23h-241zM108 122l126 124v-222h45v220l126-122 32 32-181 181-181-181z" />
 <glyph unicode="&#x37;" d="M387.836 13.063h-263.672c-43.671 0-79.102 35.431-79.102 79.101v263.672c0 34.607 22.248 63.446 52.734 74.158v-34.607c0-22.248 18.127-39.551 39.551-39.551s39.551 17.303 39.551 39.551v39.551h158.203v-39.551c0-22.248 18.127-39.551 39.551-39.551s39.551 17.303 39.551 39.551v34.607c30.487-10.712 52.735-39.551 52.735-74.158v-263.672c0-43.671-35.431-79.101-79.101-79.101zM414.203 303.101h-316.406v-210.938c0-14.832 11.535-26.367 26.367-26.367h263.672c14.832 0 26.367 11.536 26.367 26.367zM308.735 171.265h52.735v-52.735h-52.735zM308.735 250.367h52.735v-52.734h-52.735zM229.633 171.265h52.734v-52.735h-52.734zM229.633 250.367h52.734v-52.734h-52.734zM150.531 171.265h52.734v-52.735h-52.734zM150.531 250.367h52.734v-52.734h-52.734zM374.652 382.203c-7.416 0-13.183 5.768-13.183 13.184v39.551h26.367v-39.551c0-7.416-5.768-13.184-13.183-13.184zM137.347 382.203c-7.416 0-13.183 5.768-13.183 13.184v39.551h26.367v-39.551c0-7.416-5.768-13.184-13.184-13.184z" />
+<glyph unicode="&#x38;" d="M316.457 126.253l-86.823 86.825v116.391h52.734v-94.547l71.38-71.379zM256 434.938c-116.498 0-210.938-94.44-210.938-210.938s94.44-210.938 210.938-210.938 210.938 94.44 210.938 210.938-94.44 210.938-210.938 210.938zM256 65.797c-87.374 0-158.203 70.829-158.203 158.203s70.829 158.203 158.203 158.203c87.374 0 158.203-70.829 158.203-158.203s-70.829-158.203-158.203-158.203z" />
 <glyph unicode="&#x39;" d="M256 449c-123.926 0-225-101.074-225-225s101.074-225 225-225c123.926 0 225 101.074 225 225s-101.074 225-225 225zM220.844 120.289l-102.832 103.711 39.551 39.551 63.281-64.16 135.351 135.351 39.551-39.551z" />
 <glyph unicode="&#x3f;" d="M253.188 445.25c60.938 0 112.5-20.625 156.563-62.813 43.125-42.188 65.625-93.75 67.5-154.688 0-60.938-20.625-113.438-63.75-156.563-42.188-44.063-93.75-66.563-154.688-68.438-60.938 0-113.438 20.625-156.563 63.75-44.063 42.188-66.563 93.75-67.5 154.688s19.688 113.438 62.813 156.563c43.125 44.063 94.688 66.563 155.625 67.5zM252.25 89.938c9.375 0 17.813 2.813 23.438 8.438 5.625 6.563 9.375 14.063 9.375 22.5 0 10.313-1.875 17.813-8.438 24.375-5.625 5.625-14.063 8.438-23.438 8.438 0 0-0.938 0-0.938 0-9.375 0-16.875-2.813-22.5-8.438-6.563-5.625-9.375-13.125-10.313-22.5 0-9.375 2.813-16.875 9.375-23.438 5.625-5.625 13.125-9.375 22.5-9.375 0 0 0.938 0 0.938 0zM331.938 247.438c8.438 10.313 12.188 22.5 12.188 37.5 0 24.375-8.438 43.125-25.313 55.313s-38.438 17.813-64.688 17.813c-20.625 0-37.5-3.75-49.688-12.188-22.5-13.125-33.75-36.563-34.688-70.313 0 0 0-1.875 0-1.875s52.5 0 52.5 0c0 0 0 1.875 0 1.875 0 8.438 2.813 16.875 7.5 26.25 5.625 7.5 14.063 11.25 26.25 11.25 13.125 0 21.563-2.813 25.313-9.375 4.688-6.563 7.5-13.125 7.5-21.563 0-5.625-2.813-12.188-7.5-18.75-2.813-3.75-6.563-7.5-10.313-9.375 0 0-2.813-1.875-2.813-1.875-1.875-1.875-3.75-3.75-7.5-5.625-2.813-1.875-6.563-4.688-9.375-7.5-3.75-1.875-6.563-4.688-10.313-7.5s-6.563-5.625-8.438-8.438c-3.75-6.563-6.563-18.75-8.438-37.5 0 0 0-3.75 0-3.75s52.5 0 52.5 0c0 0 0 1.875 0 1.875 0 3.75 0 8.438 1.875 13.125 1.875 6.563 5.625 12.188 13.125 17.813 0 0 13.125 8.438 13.125 8.438 15 11.25 23.438 18.75 27.188 24.375z" />
 <glyph unicode="&#x41;" d="M232 109l176 175c3 4 5 8 5 13s-2 9-5 13l-29 29c-4 4-8 6-13 6s-10-2-13-6l-134-133-60 60c-3 4-8 5-13 5s-9-1-13-5l-29-29c-3-4-5-8-5-13s2-9 5-13l103-102c3-4 7-6 12-6s10 2 13 6zM475 361v-274c0-23-8-42-24-58s-35-24-58-24h-274c-23 0-42 8-58 24s-24 35-24 58v274c0 23 8 42 24 58s35 24 58 24h274c23 0 42-8 58-24s24-35 24-58z" />
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf
index 84159ccc98436dfe8cd5d94f8ebcfa1169528801..ee751e5a601509283d42f5ed3356375793bb1e2b 100755
GIT binary patch
delta 575
zcmex!l(FYH;{=6zhTDwC85kI47#J9G(i4jdfV2RR-vOjK(sL@)+NAf-2l6K{FvPWF
zq$Z{?Y-oJJz>pvUlsC%&3NSxnG63>@fP9sV+>(lB5dnQ5A7~DvNKSro;@|J0Tnr3}
zEkOC6+{B6kh5)8>3=By?I~Wx55_2U}4fs}^1PTBRVYDpBFD_wV21+p`=S<vD?HmDQ
z2?5>1%)rFJ$e_re!eGf@&k)5>_5bhx{~%=y3P3RfpqL{=B3O*^|KtA;|6lum@&ASY
zr-1qxCqGOQ-aL`9fUBOFL6?D-@iOCP237_s2B0HV)y<9N8JU&%nAqi*jg9P>)Xnsm
zl$n+En9SAen2e3&n8f**l^Jcq8I2j;6Lo#86c`y5tbBB}{VbFi8I>&jw1HeLDMm&q
zEh_~j3mpkYMhP7YrMmEvICn;VMN3~D9bZdD7%lRzUs4;y)s}?O3=EriCIriDVR~~V
zp5Nvx12+@cPv=i8m<eKl=*es1%^6)MKZ&=VES>P9zK(Sj+bQ-44lT|s&MjPh+?RN>
z_=5P&1l9?%32qQ#5(*Jf5cwl!B32@HMS?|Qg%pp}2C0A2J~EpWd=wTb$|$xdUQy~&
z=2HHl@=VoAO-pT=x|8}O4KIy%ns!<YT5GiRw72MZ=-$%P(fgq91PpQp23Mvt48RBk
R0-)n2KTZ<dyf`tE5dd0LlK}t#

delta 433
zcmeA<&iLmj;{=6z#!$vN3=E7i3=9k<>50V!Kw1FEp8%ve(sL@)Ui-a#2;|RTV2J&Y
zk(!vou;T1I28Q?!puAZIP=NUnlRl7t0LWL#$StX86cJzo@}B_p2;}4^CvtLqxx>Ja
z@C7K}m77>mz~Ikxj)5Vu0mxU#OU#u_HQ-xu5-6|$sKK%zzqo{f87Re&bZ6p@YR?29
zO9bd1W(F1pMg~O&6$Wz#O9p#}D2A&4fB*jnDP&LpiW-1L9T^hAqKy9^|9|-Z+W)Kn
zFZ@6M|0Ga1<K)6*(aoKV1zekZdHRE8u1#`_i08NY%D@eDD-fJNa;yYKPqs)fXLOld
zkYGJ|eZrUe1hxitKK2Kk3Y=M7F5Dfw3Va-VZv;{V_6Vj4?hxV<z9zCs^p%*FSeN)N
zi8#qaQfX3Kq?u$g6qpnu6fP-RDRwD2C>>B<r!q(7gX#md7_}ej9vTc9OEkV{ZqrKA
rdZL}B{ZDs-?jyZrdOv_JU<6_prZWs&AlEPe9XGi+S#Yy)QY0e)5)y)t

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff
index fd8552d2604b0fac9782c4712e210d997fcee641..08166f5b26f7bc7634e6ca8a706b9b8af65dc501 100755
GIT binary patch
delta 611
zcmZoEyHO@q?(gR29}?ovz+fH0z{LOr)&dNSlRsJsPt@eA-^0LQw&zm%))W50`bG>4
z<{N<W2_Vd&#BPwBn^?fWU?BkH=Ya8T#^dRU#UQa7AfE$@1u{|-Q-ESEK)x9mZ)kjx
z0Tcv^0nKMn0b%AxOa>XbB^5xi2Mi31A|Tu>VkDrSn^*xf(DDmV5gQo01~B9$=B5J0
z{s0wOg0KPKijxKT#U((uTTFc6DO$oW3ly#t1d<G#K*DUZ5QE!fH%52Ho0EGPO&KjF
zA7EU;?9AXgIh#qLzLsq(`wfm-&Iqn`T;I80@J91{3z!N@3T+c+6J9F9CXy~@D=sb(
zEU{2hQ7TVbPG*B_i|j)=JNeJbi&VH(7O1MJwyRmHolt+J$)=g46|MC|dye*Bo$I>&
zx*zl&=`S^~Hn?EeXslpdZ{lsT=Fb#92>LyR??={Q(Z06L9L(Zu0T;dtiJCs@{?4(#
zyIc3N3#;b$#iGACx^;BAf#h$FS32K0fRf#>UV+H(96GOn!W`XySVc{`T`qM$>V9<T
z5|HS=<kD@@ZQ|l$vRRtbMsISYd6{zrFc5?o1Q?hZm>3ut6oJ8Q$zabA#ZdMC@BjZm
zIR*v=pqK$r%#k4xEXMf%@&AYaul>LH|HA)MKz-oUFj?1vUnXMHs(^TYo39MqOkkbo
hPb`=TVu0w$5f<i*u9GKNSWiA~agWh;^D@ggMgYh`z4rhB

delta 534
zcmcan)>0-`?(gR29}?ovz+lb7z{LOrR(lv2Cp%h;P1ND8Phwy&OWL3}eZ7CMz7Ye1
zc?3{C0fae}*bS0%6AOT1JAnKW5M~TzoRgkd3>34_0rEMZSRf-cF$E}Q0_2;4@rtwa
zGJt|Wu^b>@1%#O&G3jUImQ(=6CNMBC3V?8<h>-wOZej({K+6R{MQmW~62Op`n41a|
zTLDyL3Bm?^D^3>V7Xuw(^<?4;PtgK?S)g#KAdqC>1QKSELJY2x-5A{`_c5AIKE}9=
z*@?kraz2wneIk1chbAWrR}|M`?kT+NeBb#W3LF(m651pjD7;BTSoEdXVe$VGz7l7p
zq@+&C#K;=R_R7AJpReqvyj{gd<&vtg>Ql86^=TTLH2JjHwI*nLXs^_1*0t81qt~Y&
zsQ=uc#!%PjjIp-ycaw-eQ}`h0_Y}S#S%*dY+Pd2|3owhaZLZ|B&|_qnyurNOGXdyg
z5e5MUW(F1pMg~P-*qAd|GT1XjF;xBk`~N>smVrS5C~5!}b!12ci!%Oy{Qu$qYyYqQ
zzwrP3|C2!7pa>M5Tx-EEv%o2sE1uuxD+4zZSoirO$3T(A0HP<aurOzInf$=Qda}Ib
MEk>8kzbxYz0jJfITmS$7

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss
index 13845ce5393..e4bd18be251 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss
@@ -44,6 +44,7 @@ form{
     }
 }
     label{
+        width:auto;
         color:white;
     }
     input[type=submit]{
@@ -85,22 +86,7 @@ form{
         }
         .iconfield:before{
             display:none;
-        }
-
-    .full label{
-        @include border-radius(2px);
-        text-transform:uppercase;
-        padding:2px 5px;
-        position:absolute;
-        top:0;
-        left:0;
-        margin-top:-1px;
-        font-size:0.7em;
-        z-index:1;
-        margin:0.2em 0;
-        line-height:1.5em;
-        font-weight:normal;
-    }
+        }   
 
     /* Special full-width, one-off fields i.e a single text or textarea input */
     .full input{
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html
index a2058cab9ce..d6fc35c1011 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html
@@ -1,4 +1,4 @@
-{% extends "wagtailadmin/edit_handlers/field_panel_field.html" %}
+{% extends "wagtailadmin/shared/field.html" %}
 {% load i18n %}
 {% comment %}
     Either the chosen or unchosen div will be shown, depending on the presence
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_field.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_field.html
index 472cae0b2c0..f6f2fb4f5e9 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_field.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_field.html
@@ -1,23 +1 @@
-<div class="field">
-    {{ field.label_tag }}
-    <div class="field-content">
-        <div class="input {{ input_classes }} ">
-            {% block form_field %}
-                {{ field }}
-            {% endblock %}
-            <span></span>
-        </div>
-        {% if field.help_text %}
-            <p class="help">{{ field.help_text }}</p>
-        {% endif %}
-
-        {% if field.errors %}
-            <p class="error-message">
-                {% for error in field.errors %}
-                    <span>{{ error }}</span>
-                {% endfor %}
-            </p>
-        {% endif %}
-    </div>
-</div>
-
+{% include "wagtailadmin/shared/field.html" %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/multi_field_panel.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/multi_field_panel.html
index fc43a70e5d6..62d75c9b6b9 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/multi_field_panel.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/multi_field_panel.html
@@ -2,9 +2,7 @@
     <legend>{{ self.heading }}</legend>
     <ul class="fields">
         {% for child in self.children %}
-            <li {% if child.field_classnames %}class="{{ child.field_classnames }}"{% endif %}>
-                {{ child.render_as_field }}
-            </li>
+            <li>{{ child.render_as_field }}</li>
         {% endfor %}
     </ul>
 </fieldset>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_object.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/single_field_panel.html
similarity index 57%
rename from wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_object.html
rename to wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/single_field_panel.html
index 5becef9b46d..ecb35cbd69d 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_object.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/single_field_panel.html
@@ -1,6 +1,6 @@
 <fieldset>
     <legend>{{ self.heading }}</legend>
     <ul class="fields">
-        <li class="{{ self.field_classnames }}">{{ field_content }}</li>
+        <li>{{ field_content }}</li>
     </ul>
 </fieldset>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field.html
new file mode 100644
index 00000000000..9113e1b6b4f
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field.html
@@ -0,0 +1,25 @@
+{% load wagtailadmin_tags %}
+<div class="field {{ field.field_classnames }} {{ field|fieldtype }} {{ field_classes }}">
+    {{ field.label_tag }}
+    <div class="field-content">
+        <div class="input {{ field.input_classnames }} {{ input_classes }} ">
+            {% block form_field %}
+                {{ field }}
+            {% endblock %}
+            
+            {# This span only used on rare occasions by certain types of input #}
+            <span></span>
+        </div>
+        {% if field.help_text %}
+            <p class="help">{{ field.help_text }}</p>
+        {% endif %}
+
+        {% if field.errors %}
+            <p class="error-message">
+                {% for error in field.errors %}
+                    <span>{{ error|escape }}</span>
+                {% endfor %}
+            </p>
+        {% endif %}
+    </div>
+</div>
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html
index a1f51174a9a..d10e9ba270f 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html
@@ -1,25 +1,4 @@
 {% load wagtailadmin_tags %}
-<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">
-            <div class="input {{ input_classes }} ">
-                {% block form_field %}
-                    {{ field }}
-                {% endblock %}
-                <span></span>
-            </div>
-            {% if field.help_text %}
-                <p class="help">{{ field.help_text }}</p>
-            {% endif %}
-
-            {% if field.errors %}
-                <p class="error-message">
-                    {% for error in field.errors %}
-                        <span>{{ error|escape }}</span>
-                    {% endfor %}
-                </p>
-            {% endif %}
-        </div>
-    </div>
+<li class="{% if field.field.required %}required{% endif %} {{ wrapper_classes }} {{ li_classes }} {% if field.errors %}error{% endif %}">
+    {% include "wagtailadmin/shared/field.html" %}
 </li>
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html
index 59340d2d8e9..be391989d23 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html
@@ -8,7 +8,7 @@ <h1 class="icon icon-{{ icon }}">{{ title }} <span>{{ subtitle }}</span></h1>
                 <form class="col search-form" action="{% url search_url %}" method="get">
                     <ul class="fields">
                         {% for field in search_form %}
-                            {% include "wagtailadmin/shared/field_as_li.html" with field=field input_classes="field-small iconfield icon-search" %}
+                            {% include "wagtailadmin/shared/field_as_li.html" with field=field field_classes="field-small iconfield" input_classes="icon-search" %}
                         {% endfor %}
                         <li class="submit visuallyhidden"><input type="submit" value="Search" class="button" /></li>
                     </ul>
diff --git a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
index ae957229521..8e166111b84 100644
--- a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
+++ b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
@@ -39,7 +39,7 @@ <h1 class="icon icon-form">
                     <div class="col search-bar">
                         <ul class="fields row rowflush">
                             {% for field in select_date_form %}
-                                {% include "wagtailadmin/shared/field_as_li.html" with field=field input_classes="field-small iconfield icon-date" li_classes="col4" %}
+                                {% include "wagtailadmin/shared/field_as_li.html" with field=field field_classes="field-small" li_classes="col4" %}
                             {% endfor %}
                             <li class="submit col2">
                                 <button name="action" value="filter" class="button">{% trans 'Filter' %}</button>

From e87190f5bb2856a8f535ed343c68deac779d8133 Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Thu, 19 Jun 2014 17:23:36 +0100
Subject: [PATCH 161/293] Update edit handlers unit tests

Add more tests. Clean up modified class properties after tests finish.
Replace assertRegexpMatches with assertIn.
---
 .../wagtailadmin/tests/test_edit_handlers.py  | 177 ++++++++++++++++--
 1 file changed, 160 insertions(+), 17 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py
index cd21748b459..c5eef6b8cc0 100644
--- a/wagtail/wagtailadmin/tests/test_edit_handlers.py
+++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py
@@ -1,6 +1,8 @@
 from mock import MagicMock
 
 from django.test import TestCase
+from django.core.exceptions import ImproperlyConfigured
+from django.forms.widgets import HiddenInput
 
 from wagtail.wagtailadmin.edit_handlers import (
     get_form_for_model,
@@ -15,7 +17,8 @@
     TabbedInterface,
     BaseObjectList,
     ObjectList,
-    PageChooserPanel
+    PageChooserPanel,
+    InlinePanel
 )
 from wagtail.wagtailcore.models import Page, Site
 
@@ -144,7 +147,7 @@ def setUp(self):
             form=True)
 
     def tearDown(self):
-        BaseCompositeEditHandler.children = None
+        del BaseCompositeEditHandler.children
 
     def test_object_classnames_no_classname(self):
         result = self.base_composite_edit_handler.object_classnames()
@@ -184,9 +187,10 @@ def test_render(self):
             instance=True,
             form=True)
         result = self.base_tabbed_interface.render()
-        self.assertRegexpMatches(result, '<ul')
-        self.assertRegexpMatches(result, '<li')
-        self.assertRegexpMatches(result, '<div')
+        self.assertIn('<ul', result)
+        self.assertIn('<li', result)
+        self.assertIn('<div', result)
+        del BaseTabbedInterface.children
 
     def test_render_js(self):
         fake_child = self.FakeChild()
@@ -196,6 +200,7 @@ def test_render_js(self):
             form=True)
         result = self.base_tabbed_interface.render_js()
         self.assertEqual(result, "foo")
+        del BaseTabbedInterface.children
 
     def test_rendered_fields(self):
         fake_child = self.FakeChild()
@@ -205,6 +210,7 @@ def test_rendered_fields(self):
             form=True)
         result = self.base_tabbed_interface.rendered_fields()
         self.assertEqual(result, ["bar"])
+        del BaseTabbedInterface.children
 
 
 class TestTabbedInterface(TestCase):
@@ -280,12 +286,12 @@ def setUp(self):
 
     def test_render_as_object(self):
         result = self.field_panel.render_as_object()
-        self.assertRegexpMatches(result,
-                                 '<legend>label</legend>')
-        self.assertRegexpMatches(result,
-                                 '<li class="fake_class error">')
-        self.assertRegexpMatches(result,
-                                 '<p class="error-message">')
+        self.assertIn('<legend>label</legend>',
+                      result)
+        self.assertIn('<li class="fake_class error">',
+                      result)
+        self.assertIn('<p class="error-message">',
+                      result)
 
     def test_render_js_unknown_widget(self):
         field = self.FakeField()
@@ -304,10 +310,10 @@ def test_render_as_field(self):
         bound_field.field = field
         self.field_panel.bound_field = bound_field
         result = self.field_panel.render_as_field()
-        self.assertRegexpMatches(result,
-                                 '<p class="help">help text</p>')
-        self.assertRegexpMatches(result,
-                                 '<span>errors</span>')
+        self.assertIn('<p class="help">help text</p>',
+                      result)
+        self.assertIn('<span>errors</span>',
+                      result)
 
     def test_rendered_fields(self):
         result = self.field_panel.rendered_fields()
@@ -343,6 +349,8 @@ class FakePage(object):
             class FakeParent(object):
                 id = 1
 
+            name = 'fake page'
+
             def get_parent(self):
                 return self.FakeParent()
 
@@ -350,7 +358,6 @@ def __init__(self):
             fake_page = self.FakePage()
             self.barbecue = fake_page
 
-
     def setUp(self):
         fake_field = self.FakeField()
         fake_instance = self.FakeInstance()
@@ -360,4 +367,140 @@ def setUp(self):
 
     def test_render_js(self):
         result = self.page_chooser_panel.render_js()
-        self.assertEqual(result, "createPageChooser(fixPrefix('id for label'), 'wagtailcore.page', 1);")
+        self.assertEqual(result,
+                         "createPageChooser(fixPrefix('id for label'), 'wagtailcore.page', 1);")
+
+    def test_get_chosen_item(self):
+        result = self.page_chooser_panel.get_chosen_item()
+        self.assertEqual(result.name, 'fake page')
+
+    def test_render_as_field(self):
+        result = self.page_chooser_panel.render_as_field()
+        self.assertIn('<p class="help">help text</p>', result)
+        self.assertIn('<span>errors</span>', result)
+
+    def test_widget_overrides(self):
+        result = self.page_chooser_panel.widget_overrides()
+        self.assertEqual(result, {'barbecue': HiddenInput})
+
+    def test_target_content_type(self):
+        result = PageChooserPanel(
+            'barbecue',
+            'wagtailcore.site'
+        ).target_content_type()
+        self.assertEqual(result.name, 'site')
+
+    def test_target_content_type_malformed_type(self):
+        result = PageChooserPanel(
+            'barbecue',
+            'snowman'
+        )
+        self.assertRaises(ImproperlyConfigured,
+                          result.target_content_type)
+
+    def test_target_content_type_nonexistent_type(self):
+        result = PageChooserPanel(
+            'barbecue',
+            'snowman.lorry'
+        )
+        self.assertRaises(ImproperlyConfigured,
+                          result.target_content_type)
+
+
+class TestInlinePanel(TestCase):
+    class FakeField(object):
+        class FakeFormset(object):
+            class FakeForm(object):
+                class FakeInstance(object):
+                    def __repr__(self):
+                        return 'fake instance'
+                fields = {'DELETE': MagicMock(),
+                          'ORDER': MagicMock()}
+                instance = FakeInstance()
+
+                def __repr__(self):
+                    return 'fake form'
+
+            forms = [FakeForm()]
+            empty_form = FakeForm()
+            can_order = True
+
+        label = 'label'
+        help_text = 'help text'
+        errors = ['errors']
+        id_for_label = 'id for label'
+        formsets = {'formset': FakeFormset()}
+
+    class FakeInstance(object):
+        class FakePage(object):
+            class FakeParent(object):
+                id = 1
+
+            name = 'fake page'
+
+            def get_parent(self):
+                return self.FakeParent()
+
+        def __init__(self):
+            fake_page = self.FakePage()
+            self.barbecue = fake_page
+
+    def setUp(self):
+        self.fake_field = self.FakeField()
+        self.fake_instance = self.FakeInstance()
+        self.mock_panel = MagicMock()
+        self.mock_panel.name = 'mock panel'
+        self.mock_model = MagicMock()
+        self.mock_model.formset.related.model.panels = [self.mock_panel]
+
+    def test_get_panel_definitions_no_panels(self):
+        """
+        Check that get_panel_definitions returns the panels set on the model
+        when no panels are set on the InlinePanel
+        """
+        inline_panel = InlinePanel(self.mock_model, 'formset')(
+            instance=self.fake_instance,
+            form=self.fake_field)
+        result = inline_panel.get_panel_definitions()
+        self.assertEqual(result[0].name, 'mock panel')
+        expected_calls = '[call(instance=fake instance, form=fake form),\n call(instance=fake instance, form=fake form)]'
+        self.assertEqual(str(self.mock_panel.mock_calls), expected_calls)
+
+    def test_get_panel_definitions(self):
+        """
+        Check that get_panel_definitions returns the panels set on
+        InlinePanel
+        """
+        other_mock_panel = MagicMock()
+        other_mock_panel.name = 'other mock panel'
+        inline_panel = InlinePanel(self.mock_model,
+                                   'formset',
+                                   panels=[other_mock_panel])(
+            instance=self.fake_instance,
+            form=self.fake_field)
+        result = inline_panel.get_panel_definitions()
+        self.assertEqual(result[0].name, 'other mock panel')
+        expected_calls = '[call(instance=fake instance, form=fake form),\n call(instance=fake instance, form=fake form)]'
+        self.assertEqual(str(other_mock_panel.mock_calls), expected_calls)
+
+    def test_required_formsets(self):
+        inline_panel = InlinePanel(self.mock_model, 'formset')(
+            instance=self.fake_instance,
+            form=self.fake_field)
+        self.assertEqual(inline_panel.required_formsets(), ['formset'])
+
+    def test_render(self):
+        inline_panel = InlinePanel(self.mock_model,
+                                   'formset',
+                                   label='foo')(
+            instance=self.fake_instance,
+            form=self.fake_field)
+        self.assertIn('Add foo', inline_panel.render())
+
+    def test_render_js(self):
+        inline_panel = InlinePanel(self.mock_model,
+                                   'formset')(
+            instance=self.fake_instance,
+            form=self.fake_field)
+        self.assertIn('var panel = InlinePanel({',
+                      inline_panel.render_js())

From 4e8e1f97ca250920f958ffdd732edbf4de816402 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 19 Jun 2014 17:28:34 +0100
Subject: [PATCH 162/293] use self.attrs in AbstractRendition.img_tag to avoid
 duplication

---
 wagtail/wagtailimages/models.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/wagtail/wagtailimages/models.py b/wagtail/wagtailimages/models.py
index 17e1ece86eb..8535199e7cb 100644
--- a/wagtail/wagtailimages/models.py
+++ b/wagtail/wagtailimages/models.py
@@ -243,9 +243,7 @@ def attrs(self):
         )
 
     def img_tag(self):
-        return mark_safe(
-            '<img src="%s" width="%d" height="%d" alt="%s">' % (escape(self.url), self.width, self.height, escape(self.image.title))
-        )
+        return mark_safe('<img %s>' % self.attrs)
 
     class Meta:
         abstract = True

From f6ae1834fa350692db2632be6f6714b69726c4e6 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 19 Jun 2014 17:34:59 +0100
Subject: [PATCH 163/293] Document the 'attrs' property of image renditions

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

diff --git a/docs/building_your_site/frontenddevelopers.rst b/docs/building_your_site/frontenddevelopers.rst
index f0054eaab59..a8cf6a25ece 100644
--- a/docs/building_your_site/frontenddevelopers.rst
+++ b/docs/building_your_site/frontenddevelopers.rst
@@ -197,6 +197,11 @@ In some cases greater control over the ``img`` tag is required, for example to a
     <img src="{{ tmp_photo.src }}" width="{{ tmp_photo.width }}" 
         height="{{ tmp_photo.height }}" alt="{{ tmp_photo.alt }}" class="my-custom-class" />
 
+You can also use the ``attrs`` property as a shorthand to output the ``src``, ``width``, ``height`` and ``alt`` attributes in one go:
+
+.. code-block:: django
+
+    <img {{ tmp_photo.attrs }} class="my-custom-class" />
 
 .. _rich-text-filter:
 

From aad0e24a48812a683ad295870a700b07eee31eac Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 19 Jun 2014 17:36:57 +0100
Subject: [PATCH 164/293] Changelog entry for #299

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

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 6686cf973ef..c577040c609 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -12,6 +12,7 @@ Changelog
  * Added a new datetime picker widget
  * Added styleguide (mainly for wagtail developers)
  * Aesthetic improvements to preview experience
+ * Added an 'attrs' property to image rendition objects to output src, width, height and alt attributes all in one go
  * Fix: Animated GIFs are now coalesced before resizing
  * Fix: Wand backend clones images before modifying them
  * Fix: Admin breadcrumb now positioned correctly on mobile

From 73e7ca00985a0d71aedafa6e5e6c21d5bac890ec Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 19 Jun 2014 17:52:36 +0100
Subject: [PATCH 165/293] removed include of hallo-wagtail-toolbar.js, which
 only appeared to be broken and was almost identical to the core version

---
 .../js/hallo-plugins/hallo-wagtail-toolbar.js   |  1 +
 .../static/wagtailadmin/js/page-editor.js       |  7 +++++--
 .../wagtailadmin/scss/components/forms.scss     | 17 ++++++++++-------
 .../wagtailadmin/scss/panels/rich-text.scss     |  3 +--
 .../wagtailadmin/pages/_editor_js.html          |  1 -
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js b/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js
index 8e93b85437f..f2f2827106d 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js
@@ -33,6 +33,7 @@
         }
       },
       _getPosition: function(event, selection) {
+        alert('here');
         var offset, position, width;
         if (!event) {
           return;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index eacb8f86d9d..3ed3d268c02 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -1,11 +1,14 @@
+"use strict";
+
 var halloPlugins = {
     'halloformat': {},
     'halloheadings': {formatBlocks: ["p", "h2", "h3", "h4", "h5"]},
     'hallolists': {},
     'hallohr': {},
     'halloreundo': {},
-    'hallowagtaillink': {},
+    'hallowagtaillink': {}
 };
+
 function registerHalloPlugin(name, opts) {
     halloPlugins[name] = (opts || {});
 }
@@ -197,7 +200,7 @@ function InlinePanel(opts) {
 
     self.updateMoveButtonDisabledStates = function() {
         if (opts.canOrder) {
-            forms = self.formsUl.children('li:visible');
+            var forms = self.formsUl.children('li:visible');
             forms.each(function(i) {
                 $('ul.controls .inline-child-move-up', this).toggleClass('disabled', i === 0).toggleClass('enabled', i !== 0);
                 $('ul.controls .inline-child-move-down', this).toggleClass('disabled', i === forms.length - 1).toggleClass('enabled', i != forms.length - 1);
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index cfa028877f4..97b93a06547 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -497,19 +497,22 @@ li.focused > .help{
 }
 
 
-.fields > li{
-    @include clearfix();
-    padding-top:0.5em;
-    padding-bottom:1.2em;
-}
-
-.field-content .input li{
+/* This is specifically for model that are a generated set of checkboxes/radios */
+.model_multiple_choice_field .input li,
+.choice_field .input li{
     label{
+        display:block;
         width:auto;
         float:none;
     }
 }
 
+.fields > li{
+    @include clearfix();
+    padding-top:0.5em;
+    padding-bottom:1.2em;
+}
+
 .input{
     clear:both;
 }
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss
index 36db5559a33..0e0b72454cc 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss
@@ -3,7 +3,6 @@
 
 .hallotoolbar{
     position:absolute;
-    left:$mobile-nice-padding;
     z-index:5;
     margin-top:4em;
     margin-left:0em;
@@ -150,6 +149,6 @@
 
 @media screen and (min-width: $breakpoint-mobile){
     .hallotoolbar{
-        left:$menu-width + $desktop-nice-padding;
+        
     }
 }
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
index 3ddb8c1f36a..5848ca53bd4 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
@@ -16,7 +16,6 @@
     <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/tag-it.js"></script>
     <script src="{{ STATIC_URL }}wagtailadmin/js/expanding_formset.js"></script>
     <script src="{{ STATIC_URL }}wagtailadmin/js/modal-workflow.js"></script>
-    <script src="{{ STATIC_URL }}wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js"></script>
     <script src="{{ STATIC_URL }}wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js"></script>
     <script src="{{ STATIC_URL }}wagtailadmin/js/hallo-plugins/hallo-hr.js"></script>
     <script src="{{ STATIC_URL }}wagtailadmin/js/page-editor.js"></script>

From 5e055972cde55f373a41e1012e1ada3a5b07e9b4 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 19 Jun 2014 21:55:45 +0100
Subject: [PATCH 166/293] Refactor image tag parser so that it only has two
 cases to handle

---
 wagtail/wagtailimages/models.py               |  4 +--
 .../wagtailimages/templatetags/image_tags.py  | 25 ++++++-------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/wagtail/wagtailimages/models.py b/wagtail/wagtailimages/models.py
index 550be203401..3ff2f978247 100644
--- a/wagtail/wagtailimages/models.py
+++ b/wagtail/wagtailimages/models.py
@@ -68,8 +68,8 @@ def get_rendition(self, filter):
         except ObjectDoesNotExist:
             file_field = self.file
 
-			# If we have a backend attribute then pass it to process
-			# image - else pass 'default'
+            # If we have a backend attribute then pass it to process
+            # image - else pass 'default'
             backend_name = getattr(self, 'backend', 'default')
             generated_image_file = filter.process_image(file_field.file, backend_name=backend_name)
 
diff --git a/wagtail/wagtailimages/templatetags/image_tags.py b/wagtail/wagtailimages/templatetags/image_tags.py
index e8a4c2191ba..5c72734177f 100644
--- a/wagtail/wagtailimages/templatetags/image_tags.py
+++ b/wagtail/wagtailimages/templatetags/image_tags.py
@@ -15,31 +15,22 @@ def image(parser, token):
     filter_spec = bits[1]
     bits = bits[2:]
 
-    if len(bits) == 0:
-        # token is of the form {% image self.photo max-320x200 %}
-        return ImageNode(image_var, filter_spec)
-
-    elif len(bits) == 2:
+    if len(bits) == 2 and bits[0] == 'as':
         # token is of the form {% image self.photo max-320x200 as img %}
-
-        if bits[0] == 'as':
-            return ImageNode(image_var, filter_spec, output_var_name=bits[1])
-
-    if len(bits) > 0:
-        # customized <img> attrs
+        return ImageNode(image_var, filter_spec, output_var_name=bits[1])
+    else:
+        # token is of the form {% image self.photo max-320x200 %} - all additional tokens
+        # should be kwargs, which become attributes
         attrs = {}
         for bit in bits:
             try:
-                name,value = bit.split('=')
-            except:
-                raise template.TemplateSyntaxError("'image' tag should be of the form {%% image self.photo max-320x200 [ custom-attr=\"value\" [ ... ] ] %%} or {%% image self.photo max-320x200 as img %%}")
+                name, value = bit.split('=')
+            except ValueError:
+                raise template.TemplateSyntaxError("'image' tag should be of the form {% image self.photo max-320x200 [ custom-attr=\"value\" ... ] %} or {% image self.photo max-320x200 as img %}")
             attrs[name] = parser.compile_filter(value) # setup to resolve context variables as value
 
         return ImageNode(image_var, filter_spec, attrs=attrs)
 
-    # something is wrong if we made it this far
-    raise template.TemplateSyntaxError("'image' tag should be of the form {%% image self.photo max-320x200 [ custom-attr=\"value\" [ ... ] ] %%} or {%% image self.photo max-320x200 as img %%}")
-
 
 class ImageNode(template.Node):
     def __init__(self, image_var_name, filter_spec, output_var_name=None, attrs={}):

From 0c4b5ba5566f1a32bc6fe1769741407a18820298 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 19 Jun 2014 22:02:45 +0100
Subject: [PATCH 167/293] Add unit test for image tag with extra attributes

---
 wagtail/wagtailimages/tests.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/wagtail/wagtailimages/tests.py b/wagtail/wagtailimages/tests.py
index d546c396ddf..2fbac118c52 100644
--- a/wagtail/wagtailimages/tests.py
+++ b/wagtail/wagtailimages/tests.py
@@ -210,6 +210,20 @@ def test_image_tag_attrs(self):
         self.assertTrue('height="300"' in result)
         self.assertTrue('alt="Test image"' in result)
 
+    def render_image_tag_with_extra_attributes(self, image, title):
+        temp = template.Template('{% load image_tags %}{% image image_obj width-400 class="photo" title=title|lower %}')
+        context = template.Context({'image_obj': image, 'title': title})
+        return temp.render(context)
+
+    def test_image_tag_with_extra_attributes(self):
+        result = self.render_image_tag_with_extra_attributes(self.image, 'My Wonderful Title')
+
+        # Check that all the required HTML attributes are set
+        self.assertTrue('width="400"' in result)
+        self.assertTrue('height="300"' in result)
+        self.assertTrue('class="photo"' in result)
+        self.assertTrue('title="my wonderful title"' in result)
+
 ## ===== ADMIN VIEWS =====
 
 

From b26744e13790b730e2fdc6214af261032c36adba Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 19 Jun 2014 22:06:41 +0100
Subject: [PATCH 168/293] changelog entry for #294

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

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c577040c609..19eec21e765 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -12,6 +12,7 @@ Changelog
  * Added a new datetime picker widget
  * Added styleguide (mainly for wagtail developers)
  * Aesthetic improvements to preview experience
+ * 'image' tag now accepts extra keyword arguments to be output as attributes on the img tag
  * Added an 'attrs' property to image rendition objects to output src, width, height and alt attributes all in one go
  * Fix: Animated GIFs are now coalesced before resizing
  * Fix: Wand backend clones images before modifying them

From 91fe81bb9b8ed9648584a78ef5be23bd83a868f2 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 20 Jun 2014 10:11:10 +0100
Subject: [PATCH 169/293] addressing issue where toolbar was in wrong place.
 hallo-wagtail-toolbar appeared to override the version provided by hallo, yet
 removed the one feature from the original version that was essential.

---
 .../js/hallo-plugins/hallo-wagtail-toolbar.js | 98 -------------------
 .../static/wagtailadmin/js/page-editor.js     |  2 +-
 .../static/wagtailadmin/js/vendor/hallo.js    |  1 +
 .../wagtailadmin/scss/panels/rich-text.scss   | 10 +-
 .../wagtailadmin/pages/_editor_js.html        |  1 -
 5 files changed, 9 insertions(+), 103 deletions(-)
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js b/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js
deleted file mode 100644
index f2f2827106d..00000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js
+++ /dev/null
@@ -1,98 +0,0 @@
-(function(jQuery) {
-    return jQuery.widget('IKS.halloToolbarFixed', {
-      toolbar: null,
-      options: {
-        parentElement: 'body',
-        editable: null,
-        toolbar: null,
-        affix: true,
-        affixTopOffset: 2
-      },
-      _create: function() {
-        var el, widthToAdd,
-          _this = this;
-        this.toolbar = this.options.toolbar;
-        this.toolbar.show();
-        jQuery(this.options.parentElement).append(this.toolbar);
-        this._bindEvents();
-        jQuery(window).resize(function(event) {
-          return _this.setPosition();
-        });
-        jQuery(window).scroll(function(event) {
-          return _this.setPosition();
-        });
-        if (this.options.parentElement === 'body') {
-          el = jQuery(this.element);
-          widthToAdd = parseFloat(el.css('padding-left'));
-          widthToAdd += parseFloat(el.css('padding-right'));
-          widthToAdd += parseFloat(el.css('border-left-width'));
-          widthToAdd += parseFloat(el.css('border-right-width'));
-          widthToAdd += (parseFloat(el.css('outline-width'))) * 2;
-          widthToAdd += (parseFloat(el.css('outline-offset'))) * 2;
-          return jQuery(this.toolbar).css("width", el.width() + widthToAdd);
-        }
-      },
-      _getPosition: function(event, selection) {
-        alert('here');
-        var offset, position, width;
-        if (!event) {
-          return;
-        }
-        width = parseFloat(this.element.css('outline-width'));
-        offset = width + parseFloat(this.element.css('outline-offset'));
-        return position = {
-          top: this.element.offset().top - this.toolbar.outerHeight() - offset,
-          left: this.element.offset().left - offset
-        };
-      },
-      _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;
-      },
-      setPosition: function() {
-        var elementBottom, elementTop, height, offset, scrollTop, topOffset;
-        if (this.options.parentElement !== 'body') {
-          return;
-        }
-
-        this.toolbar.css('top', this.element.offset().top - this.toolbar.outerHeight());
-        
-        if (this.options.affix) {
-          this.toolbar.removeClass('affixed');
-          scrollTop = jQuery(window).scrollTop();
-          offset = this.element.offset();
-          height = this.element.height();
-          topOffset = this.options.affixTopOffset;
-          elementTop = offset.top - (this.toolbar.height() + this.options.affixTopOffset);
-          elementBottom = (height - topOffset) + (offset.top - this.toolbar.height());
-          if (scrollTop > elementTop && scrollTop < elementBottom) {
-            this.toolbar.addClass('affixed');
-            this.toolbar.css('top', this.options.affixTopOffset);
-          }
-        } else {
-          
-        }
-        return this.toolbar;
-      },
-      _updatePosition: function(position) {},
-      _bindEvents: function() {
-        var _this = this;
-        this.element.on('halloactivated', function(event, data) {
-          _this.setPosition();
-          return _this.toolbar.show();
-        });
-        return this.element.on('hallodeactivated', function(event, data) {
-          return _this.toolbar.hide();
-        });
-      }
-    });
-})(jQuery);
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index 3ed3d268c02..32c2fa10ea3 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -33,7 +33,7 @@ function makeRichTextEditable(id) {
 
     richText.hallo({
         toolbar: 'halloToolbarFixed',
-        toolbarcssClass: 'testy',
+        toolbarCssClass: (input.closest('.object').hasClass('full')) ? 'full' : '',
         plugins: halloPlugins
     }).bind('hallomodified', function(event, data) {
         input.val(data.content);
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js
index af5950fdbdf..9e4655dc45c 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js
@@ -2829,6 +2829,7 @@
         } else {
 
         }
+
         return this.toolbar.css('left', this.element.offset().left - 2);
       },
       _updatePosition: function(position) {},
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss
index 0e0b72454cc..2ff4501c89b 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss
@@ -5,7 +5,11 @@
     position:absolute;
     z-index:5;
     margin-top:4em;
-    margin-left:0em;
+    margin-left:1.2em;
+}
+/* full is added to hallotoolbar when invoked on a field set to the full layout style */
+.hallotoolbar.full{
+    margin-left:$mobile-nice-padding;
 }
 .hallotoolbar.affixed{
     position:fixed;
@@ -148,7 +152,7 @@
 }
 
 @media screen and (min-width: $breakpoint-mobile){
-    .hallotoolbar{
-        
+    .hallotoolbar.full{
+        margin-left:$desktop-nice-padding;
     }
 }
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
index 5848ca53bd4..17bcbd8bff0 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
@@ -19,7 +19,6 @@
     <script src="{{ STATIC_URL }}wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js"></script>
     <script src="{{ STATIC_URL }}wagtailadmin/js/hallo-plugins/hallo-hr.js"></script>
     <script src="{{ STATIC_URL }}wagtailadmin/js/page-editor.js"></script>
-
     <script src="{{ STATIC_URL }}wagtailadmin/js/page-chooser.js"></script>
     <script src="{{ STATIC_URL }}admin/js/urlify.js"></script>
 

From 4081206c77fd5c9bcfc03dfe6ed923dfa4d93f23 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Sat, 5 Apr 2014 20:10:58 +0100
Subject: [PATCH 170/293] Scrapped ElasticUtils, use Elasticsearch-py instead

Conflicts:
	wagtail/wagtailsearch/backends/elasticsearch.py
	wagtail/wagtailsearch/indexed.py
---
 runtests.py                                   |   2 +-
 .../wagtailsearch/backends/elasticsearch.py   | 187 +++++++++++++-----
 2 files changed, 142 insertions(+), 47 deletions(-)

diff --git a/runtests.py b/runtests.py
index 96653b40d37..efa66910f07 100755
--- a/runtests.py
+++ b/runtests.py
@@ -13,7 +13,7 @@
 if not settings.configured:
 
     try:
-        import elasticutils
+        import elasticsearch
         has_elasticsearch = True
     except ImportError:
         has_elasticsearch = False
diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index d2b58d564ff..7571db5ac34 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -1,6 +1,8 @@
+from __future__ import absolute_import
+
 from django.db import models
 
-from elasticutils import get_es, S
+from elasticsearch import Elasticsearch, NotFoundError
 
 from wagtail.wagtailsearch.backends.base import BaseSearch
 from wagtail.wagtailsearch.indexed import Indexed
@@ -9,16 +11,131 @@
 
 
 class ElasticSearchResults(object):
-    def __init__(self, model, query, prefetch_related=[]):
+    def __init__(self, backend, model, query_string, fields=None, filters={}, prefetch_related=[]):
+        self.backend = backend
         self.model = model
-        self.query = query
-        self.count = query.count()
+        self.query_string = query_string
+        self.fields = fields
+        self.filters = filters
         self.prefetch_related = prefetch_related
 
+    def _get_filters(self):
+        # Filters
+        filters = []
+
+        # Filter by content type
+        filters.append({
+            'prefix': {
+                'content_type': self.model.indexed_get_content_type()
+            }
+        })
+
+        # Extra filters
+        if self.filters:
+            for key, value in self.filters.items():
+                if '__' in key:
+                    field, lookup = key.split('__')
+                else:
+                    field = key
+                    lookup = None
+
+                if lookup is None:
+                    if value is None:
+                        filters.append({
+                            'missing': {
+                                'field': field,
+                            }
+                        })
+                    else:
+                        filters.append({
+                            'term': {
+                                field: value
+                            }
+                        })
+
+                if lookup in ['startswith', 'prefix']:
+                    filters.append({
+                        'prefix': {
+                            field: value
+                        }
+                    })
+
+                if lookup in ['gt', 'gte', 'lt', 'lte']:
+                    filters.append({
+                        'range': {
+                            field: {
+                                lookup: value,
+                            }
+                        }
+                    })
+
+                if lookup == 'range':
+                    lower, upper = value
+                    filters.append({
+                        'range': {
+                            field: {
+                                'gte': lower,
+                                'lte': upper,
+                            }
+                        }
+                    })
+
+        return filters
+
+    def _get_query(self):
+        # Query
+        query = {
+            'query_string': {
+                'query': self.query_string,
+            }
+        }
+
+        # Fields
+        if self.fields:
+            query['query_string']['fields'] = self.fields
+
+        # Filters
+        filters = self._get_filters()
+
+        return {
+            'query': {
+                'filtered': {
+                    'query': query,
+                    'filter': {
+                        'and': filters,
+                    }
+                }
+            }
+        }
+
+    def _get_results_pks(self, offset=0, limit=None):
+        query = self._get_query()
+        query['query']['from'] = offset
+        if limit is not None:
+            query['query']['size'] = limit
+
+        hits = self.backend.es.search(
+            index=self.backend.es_index,
+            body=query,
+            _source=False,
+            fields='pk',
+        )
+
+        return [hit['fields']['pk'][0] for hit in hits['hits']['hits']]
+
+    def _get_count(self):
+        query = self._get_query()
+        count = self.backend.es.count(
+            index=self.backend.es_index,
+            body=query,
+        )
+
+        return count['count']
+
     def __getitem__(self, key):
         if isinstance(key, slice):
             # Get primary keys
-            pk_list_unclean = [result._source["pk"] for result in self.query[key]]
+            pk_list_unclean = self._get_results_pks(key.start, key.stop - key.start)
 
             # Remove duplicate keys (and preserve order)
             seen_pks = set()
@@ -45,11 +162,11 @@ def __getitem__(self, key):
             return results_sorted
         else:
             # Return a single item
-            pk = self.query[key]._source["pk"]
+            pk = self._get_results_pks(key, key + 1)[0]
             return self.model.objects.get(pk=pk)
 
     def __len__(self):
-        return self.count
+        return self._get_count()
 
 
 class ElasticSearch(BaseSearch):
@@ -64,22 +181,17 @@ def __init__(self, params):
 
         # Get ElasticSearch interface
         # Any remaining params are passed into the ElasticSearch constructor
-        self.es = get_es(
+        self.es = Elasticsearch(
             urls=self.es_urls,
             timeout=self.es_timeout,
             force_new=self.es_force_new,
             **params)
-        self.s = S().es(
-            urls=self.es_urls,
-            timeout=self.es_timeout,
-            force_new=self.es_force_new,
-            **params).indexes(self.es_index)
 
     def reset_index(self):
         # Delete old index
         try:
-            self.es.delete_index(self.es_index)
-        except:
+            self.es.indices.delete(self.es_index)
+        except NotFoundError:
             pass
 
         # Settings
@@ -128,7 +240,7 @@ def reset_index(self):
         }
 
         # Create new index
-        self.es.create_index(self.es_index, INDEX_SETTINGS)
+        self.es.indices.create(self.es_index, INDEX_SETTINGS)
 
     def add_type(self, model):
         # Get type name
@@ -144,14 +256,14 @@ def add_type(self, model):
         }.items() + indexed_fields.items())
 
         # Put mapping
-        self.es.put_mapping(self.es_index, content_type, {
+        self.es.indices.put_mapping(index=self.es_index, doc_type=content_type, body={
             content_type: {
                 "properties": fields,
             }
         })
 
     def refresh_index(self):
-        self.es.refresh(self.es_index)
+        self.es.indices.refresh(self.es_index)
 
     def add(self, obj):
         # Make sure the object can be indexed
@@ -165,6 +277,10 @@ def add(self, obj):
         self.es.index(self.es_index, obj.indexed_get_content_type(), doc, id=doc["id"])
 
     def add_bulk(self, obj_list):
+        # TODO: Make this work with new elastic search module
+        for obj in obj_list:
+            self.add(obj)
+        return
         # Group all objects by their type
         type_set = {}
         for obj in obj_list:
@@ -194,13 +310,14 @@ def delete(self, obj):
         if not isinstance(obj, Indexed) or not isinstance(obj, models.Model):
             return
 
-        # Get ID for document
-        doc_id = obj.indexed_get_document_id()
-
         # Delete document
         try:
-            self.es.delete(self.es_index, obj.indexed_get_content_type(), doc_id)
-        except:
+            self.es.delete(
+                self.es_index,
+                obj.indexed_get_content_type(),
+                obj.indexed_get_document_id(),
+            )
+        except NotFoundError:
             pass  # Document doesn't exist, ignore this exception
 
     def search(self, query_string, model, fields=None, filters={}, prefetch_related=[]):
@@ -215,27 +332,5 @@ def search(self, query_string, model, fields=None, filters={}, prefetch_related=
         if not query_string:
             return []
 
-        # Query
-        if fields:
-            query = self.s.query_raw({
-                "query_string": {
-                    "query": query_string,
-                    "fields": fields,
-                }
-            })
-        else:
-            query = self.s.query_raw({
-                "query_string": {
-                    "query": query_string,
-                }
-            })
-
-        # Filter results by this content type
-        query = query.filter(content_type__prefix=model.indexed_get_content_type())
-
-        # Extra filters
-        if filters:
-            query = query.filter(**filters)
-
         # Return search results
-        return ElasticSearchResults(model, query, prefetch_related=prefetch_related)
+        return ElasticSearchResults(self, model, query_string, fields=fields, filters=filters, prefetch_related=prefetch_related)

From c00c4d24372079e8a07cc4276cfb2568643abd80 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Sun, 6 Apr 2014 14:35:57 +0100
Subject: [PATCH 171/293] New ElasticSearch module now supports bulk insert

---
 .../wagtailsearch/backends/elasticsearch.py   | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 7571db5ac34..78de0e94fc1 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -3,6 +3,7 @@
 from django.db import models
 
 from elasticsearch import Elasticsearch, NotFoundError
+from elasticsearch.helpers import bulk
 
 from wagtail.wagtailsearch.backends.base import BaseSearch
 from wagtail.wagtailsearch.indexed import Indexed
@@ -277,10 +278,6 @@ def add(self, obj):
         self.es.index(self.es_index, obj.indexed_get_content_type(), doc, id=doc["id"])
 
     def add_bulk(self, obj_list):
-        # TODO: Make this work with new elastic search module
-        for obj in obj_list:
-            self.add(obj)
-        return
         # Group all objects by their type
         type_set = {}
         for obj in obj_list:
@@ -299,11 +296,19 @@ def add_bulk(self, obj_list):
             type_set[obj_type].append(obj.indexed_build_document())
 
         # Loop through each type and bulk add them
-        results = []
         for type_name, type_objects in type_set.items():
-            results.append((type_name, len(type_objects)))
-            self.es.bulk_index(self.es_index, type_name, type_objects)
-        return results
+            # Get list of actions
+            actions = []
+            for obj in type_objects:
+                action = {
+                    '_index': self.es_index,
+                    '_type': type_name,
+                    '_id': obj['id'],
+                }
+                action.update(obj)
+                actions.append(action)
+
+            bulk(self.es, actions)
 
     def delete(self, obj):
         # Object must be a decendant of Indexed and be a django model

From 598e6193da90908241937fe1a3fe9ab27983df36 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Sun, 6 Apr 2014 18:07:53 +0100
Subject: [PATCH 172/293] Install elasticsearch instead of elasticutils on
 travis

Conflicts:
	.travis.yml
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3e0a4bb986c..8764f28596e 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 embedly
+  - pip install psycopg2 elasticsearch wand embedly
   - pip install coveralls
 # Pre-test configuration
 before_script:

From 05cb87e3eb99c07764f176359d3ad488e020bb37 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 8 Apr 2014 10:47:13 +0100
Subject: [PATCH 173/293] Tests now succeed on elasticsearch 0.90.x

---
 .../wagtailsearch/backends/elasticsearch.py   | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 78de0e94fc1..d626d1d1c11 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -2,7 +2,7 @@
 
 from django.db import models
 
-from elasticsearch import Elasticsearch, NotFoundError
+from elasticsearch import Elasticsearch, NotFoundError, RequestError
 from elasticsearch.helpers import bulk
 
 from wagtail.wagtailsearch.backends.base import BaseSearch
@@ -99,38 +99,48 @@ def _get_query(self):
         filters = self._get_filters()
 
         return {
-            'query': {
-                'filtered': {
-                    'query': query,
-                    'filter': {
-                        'and': filters,
-                    }
+            'filtered': {
+                'query': query,
+                'filter': {
+                    'and': filters,
                 }
             }
         }
 
     def _get_results_pks(self, offset=0, limit=None):
         query = self._get_query()
-        query['query']['from'] = offset
+        query['from'] = offset
         if limit is not None:
-            query['query']['size'] = limit
+            query['size'] = limit
 
         hits = self.backend.es.search(
             index=self.backend.es_index,
-            body=query,
+            body=dict(query=query),
             _source=False,
             fields='pk',
         )
 
-        return [hit['fields']['pk'][0] for hit in hits['hits']['hits']]
+        pks = [hit['fields']['pk'] for hit in hits['hits']['hits']]
+
+        # ElasticSearch 1.x likes to pack pks into lists, unpack them if this has happened
+        return [pk[0] if isinstance(pk, list) else pk for pk in pks]
 
     def _get_count(self):
         query = self._get_query()
+
+        # Elasticsearch 1.x
         count = self.backend.es.count(
             index=self.backend.es_index,
-            body=query,
+            body=dict(query=query),
         )
 
+        # ElasticSearch 0.90.x fallback
+        if not count['_shards']['successful'] and "No query registered for [query]]" in count['_shards']['failures'][0]['reason']:
+            count = self.backend.es.count(
+                index=self.backend.es_index,
+                body=query,
+            )
+
         return count['count']
 
     def __getitem__(self, key):

From 2c50a49ef6a69b1bef5b251bfded7cf95f5e22ea Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 20 Jun 2014 10:34:27 +0100
Subject: [PATCH 174/293] further tweaks to prevent scrolling of date inputs

---
 wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js  | 4 ++++
 .../static/wagtailadmin/scss/layouts/page-editor.scss       | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index 32c2fa10ea3..fe60f1dd44a 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -60,6 +60,7 @@ function initDateChooser(id) {
     if (window.dateTimePickerTranslations) {
         $('#' + id).datetimepicker({
             timepicker: false,
+            scrollInput:false,
             format: 'Y-m-d',
             i18n: {
                 lang: window.dateTimePickerTranslations
@@ -69,6 +70,7 @@ function initDateChooser(id) {
     } else {
         $('#' + id).datetimepicker({
             timepicker: false,
+            scrollInput:false,
             format: 'Y-m-d',
         });
     }
@@ -78,6 +80,7 @@ function initTimeChooser(id) {
     if (window.dateTimePickerTranslations) {
         $('#' + id).datetimepicker({
             datepicker: false,
+            scrollInput:false,
             format: 'H:i',
             i18n: {
                 lang: window.dateTimePickerTranslations
@@ -96,6 +99,7 @@ function initDateTimeChooser(id) {
     if (window.dateTimePickerTranslations) {
         $('#' + id).datetimepicker({
             format: 'Y-m-d H:i',
+            scrollInput:false,
             i18n: {
                 lang: window.dateTimePickerTranslations
             },
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
index c75f0b6bcf9..ae9fb50788b 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
@@ -25,6 +25,12 @@
     }
 }
 
+.page-editor .xdsoft_datetimepicker{
+    border-top:0;
+    margin-top:-1px;
+    margin-left:3px;
+}
+
 .object{
     position:relative;
     overflow:hidden;

From 2156c0ddd27722663456997c1ef57dee3db743f6 Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Fri, 20 Jun 2014 10:55:49 +0100
Subject: [PATCH 175/293] Fix Travis test failures

---
 .../wagtailadmin/tests/test_edit_handlers.py  | 44 ++++++++++++++-----
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py
index c5eef6b8cc0..19c1174056b 100644
--- a/wagtail/wagtailadmin/tests/test_edit_handlers.py
+++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py
@@ -137,34 +137,54 @@ def test_render_form_content(self):
 
 
 class TestBaseCompositeEditHandler(TestCase):
-    def setUp(self):
+    def test_object_classnames_no_classname(self):
         mock = MagicMock()
         mock.widget_overrides.return_value = {'foo': 'bar'}
         mock.required_formsets.return_value = {'baz': 'quux'}
         BaseCompositeEditHandler.children = [mock]
-        self.base_composite_edit_handler = BaseCompositeEditHandler(
+        base_composite_edit_handler = BaseCompositeEditHandler(
             instance=True,
             form=True)
-
-    def tearDown(self):
-        del BaseCompositeEditHandler.children
-
-    def test_object_classnames_no_classname(self):
-        result = self.base_composite_edit_handler.object_classnames()
+        result = base_composite_edit_handler.object_classnames()
         self.assertEqual(result, "multi-field")
+        del BaseCompositeEditHandler.children
 
     def test_object_classnames(self):
-        self.base_composite_edit_handler.classname = "foo"
-        result = self.base_composite_edit_handler.object_classnames()
+        mock = MagicMock()
+        mock.widget_overrides.return_value = {'foo': 'bar'}
+        mock.required_formsets.return_value = {'baz': 'quux'}
+        BaseCompositeEditHandler.children = [mock]
+        base_composite_edit_handler = BaseCompositeEditHandler(
+            instance=True,
+            form=True)
+        base_composite_edit_handler.classname = "foo"
+        result = base_composite_edit_handler.object_classnames()
         self.assertEqual(result, "multi-field foo")
+        del BaseCompositeEditHandler.children
 
     def test_widget_overrides(self):
-        result = self.base_composite_edit_handler.widget_overrides()
+        mock = MagicMock()
+        mock.widget_overrides.return_value = {'foo': 'bar'}
+        mock.required_formsets.return_value = {'baz': 'quux'}
+        BaseCompositeEditHandler.children = [mock]
+        base_composite_edit_handler = BaseCompositeEditHandler(
+            instance=True,
+            form=True)
+        result = base_composite_edit_handler.widget_overrides()
         self.assertEqual(result, {'foo': 'bar'})
+        del BaseCompositeEditHandler.children
 
     def test_required_formsets(self):
-        result = self.base_composite_edit_handler.required_formsets()
+        mock = MagicMock()
+        mock.widget_overrides.return_value = {'foo': 'bar'}
+        mock.required_formsets.return_value = {'baz': 'quux'}
+        BaseCompositeEditHandler.children = [mock]
+        base_composite_edit_handler = BaseCompositeEditHandler(
+            instance=True,
+            form=True)
+        result = base_composite_edit_handler.required_formsets()
         self.assertEqual(result, ['baz'])
+        del BaseCompositeEditHandler.children
 
 
 class TestBaseTabbedInterface(TestCase):

From 112ff57d20b079f4a80b66d0f255ce9532af9be9 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 10:58:44 +0100
Subject: [PATCH 176/293] Split ESResults into ESResults and ESQuery

---
 .../wagtailsearch/backends/elasticsearch.py   | 43 +++++++++++--------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index d626d1d1c11..434a4e38026 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -11,14 +11,12 @@
 import string
 
 
-class ElasticSearchResults(object):
-    def __init__(self, backend, model, query_string, fields=None, filters={}, prefetch_related=[]):
-        self.backend = backend
+class ElasticSearchQuery(object):
+    def __init__(self, model, query_string, fields=None, filters={}):
         self.model = model
         self.query_string = query_string
-        self.fields = fields
+        self.fields = fields or ['_all']
         self.filters = filters
-        self.prefetch_related = prefetch_related
 
     def _get_filters(self):
         # Filters
@@ -83,7 +81,7 @@ def _get_filters(self):
 
         return filters
 
-    def _get_query(self):
+    def to_es(self):
         # Query
         query = {
             'query_string': {
@@ -107,26 +105,37 @@ def _get_query(self):
             }
         }
 
-    def _get_results_pks(self, offset=0, limit=None):
-        query = self._get_query()
-        query['from'] = offset
-        if limit is not None:
-            query['size'] = limit
 
-        hits = self.backend.es.search(
+class ElasticSearchResults(object):
+    def __init__(self, backend, query, prefetch_related=[]):
+        self.backend = backend
+        self.query = query
+        self.prefetch_related = prefetch_related
+
+    def _get_results_pks(self, offset=0, limit=None):
+        # Params for elasticsearch query
+        params = dict(
             index=self.backend.es_index,
-            body=dict(query=query),
+            body=dict(query=self.query.to_es()),
             _source=False,
             fields='pk',
+            from_=offset,
         )
 
+        # Add limit if set
+        if limit is not None:
+            params['size'] = limit
+
+        # Send to ElasticSearch
+        hits = self.backend.es.search(**params)
+
         pks = [hit['fields']['pk'] for hit in hits['hits']['hits']]
 
         # ElasticSearch 1.x likes to pack pks into lists, unpack them if this has happened
         return [pk[0] if isinstance(pk, list) else pk for pk in pks]
 
     def _get_count(self):
-        query = self._get_query()
+        query = self.query.to_es()
 
         # Elasticsearch 1.x
         count = self.backend.es.count(
@@ -157,7 +166,7 @@ def __getitem__(self, key):
                     pk_list.append(pk)
 
             # Get results
-            results = self.model.objects.filter(pk__in=pk_list)
+            results = self.query.model.objects.filter(pk__in=pk_list)
 
             # Prefetch related
             for prefetch in self.prefetch_related:
@@ -174,7 +183,7 @@ def __getitem__(self, key):
         else:
             # Return a single item
             pk = self._get_results_pks(key, key + 1)[0]
-            return self.model.objects.get(pk=pk)
+            return self.query.model.objects.get(pk=pk)
 
     def __len__(self):
         return self._get_count()
@@ -348,4 +357,4 @@ def search(self, query_string, model, fields=None, filters={}, prefetch_related=
             return []
 
         # Return search results
-        return ElasticSearchResults(self, model, query_string, fields=fields, filters=filters, prefetch_related=prefetch_related)
+        return ElasticSearchResults(self, ElasticSearchQuery(model, query_string, fields=fields, filters=filters), prefetch_related=prefetch_related)

From b2844a32252eebd72604a5a68c0f59ba3ca86d87 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 11:01:19 +0100
Subject: [PATCH 177/293] Renamed a couple of methods on ElasticSearchResults

---
 wagtail/wagtailsearch/backends/elasticsearch.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 434a4e38026..c47427d356d 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -112,7 +112,7 @@ def __init__(self, backend, query, prefetch_related=[]):
         self.query = query
         self.prefetch_related = prefetch_related
 
-    def _get_results_pks(self, offset=0, limit=None):
+    def _do_search(self, offset=0, limit=None):
         # Params for elasticsearch query
         params = dict(
             index=self.backend.es_index,
@@ -134,7 +134,7 @@ def _get_results_pks(self, offset=0, limit=None):
         # ElasticSearch 1.x likes to pack pks into lists, unpack them if this has happened
         return [pk[0] if isinstance(pk, list) else pk for pk in pks]
 
-    def _get_count(self):
+    def _do_count(self):
         query = self.query.to_es()
 
         # Elasticsearch 1.x
@@ -155,7 +155,7 @@ def _get_count(self):
     def __getitem__(self, key):
         if isinstance(key, slice):
             # Get primary keys
-            pk_list_unclean = self._get_results_pks(key.start, key.stop - key.start)
+            pk_list_unclean = self._do_search(key.start, key.stop - key.start)
 
             # Remove duplicate keys (and preserve order)
             seen_pks = set()
@@ -182,11 +182,11 @@ def __getitem__(self, key):
             return results_sorted
         else:
             # Return a single item
-            pk = self._get_results_pks(key, key + 1)[0]
+            pk = self._do_search(key, key + 1)[0]
             return self.query.model.objects.get(pk=pk)
 
     def __len__(self):
-        return self._get_count()
+        return self._do_count()
 
 
 class ElasticSearch(BaseSearch):

From f73d66908e32891ba9e49b1be2bf1cb4c3233508 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 11:02:12 +0100
Subject: [PATCH 178/293] Added __repr__ method to ElasticSearchQuery

---
 wagtail/wagtailsearch/backends/elasticsearch.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index c47427d356d..7b301442e74 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -1,5 +1,8 @@
 from __future__ import absolute_import
 
+import string
+import json
+
 from django.db import models
 
 from elasticsearch import Elasticsearch, NotFoundError, RequestError
@@ -8,7 +11,6 @@
 from wagtail.wagtailsearch.backends.base import BaseSearch
 from wagtail.wagtailsearch.indexed import Indexed
 
-import string
 
 
 class ElasticSearchQuery(object):
@@ -105,6 +107,9 @@ def to_es(self):
             }
         }
 
+    def __repr__(self):
+        return json.dumps(self.to_es())
+
 
 class ElasticSearchResults(object):
     def __init__(self, backend, query, prefetch_related=[]):

From 3d3d0eb2bdc20a394eb316bcfcc13ea7b61453b2 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 11:09:45 +0100
Subject: [PATCH 179/293] Removed ability to use prefetch_related in search
 queries This will be replaced by search on queryset

---
 wagtail/wagtailsearch/backends/db.py            |  7 ++++---
 wagtail/wagtailsearch/backends/elasticsearch.py | 13 ++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/db.py b/wagtail/wagtailsearch/backends/db.py
index 419d8a99be7..0531bc3aada 100644
--- a/wagtail/wagtailsearch/backends/db.py
+++ b/wagtail/wagtailsearch/backends/db.py
@@ -1,3 +1,5 @@
+import warnings
+
 from django.db import models
 
 from wagtail.wagtailsearch.backends.base import BaseSearch
@@ -64,8 +66,7 @@ def search(self, query_string, model, fields=None, filters={}, prefetch_related=
         # Distinct
         query = query.distinct()
 
-        # Prefetch related
-        for prefetch in prefetch_related:
-            query = query.prefetch_related(prefetch)
+        # Give deprecation warning if prefetch_related was used
+        warnings.warn("prefetch_related on search queries is no longer implemented. ", DeprecationWarning)
 
         return query
\ No newline at end of file
diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 7b301442e74..e9fa739f8b6 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -2,6 +2,7 @@
 
 import string
 import json
+import warnings
 
 from django.db import models
 
@@ -112,10 +113,9 @@ def __repr__(self):
 
 
 class ElasticSearchResults(object):
-    def __init__(self, backend, query, prefetch_related=[]):
+    def __init__(self, backend, query):
         self.backend = backend
         self.query = query
-        self.prefetch_related = prefetch_related
 
     def _do_search(self, offset=0, limit=None):
         # Params for elasticsearch query
@@ -173,10 +173,6 @@ def __getitem__(self, key):
             # Get results
             results = self.query.model.objects.filter(pk__in=pk_list)
 
-            # Prefetch related
-            for prefetch in self.prefetch_related:
-                results = results.prefetch_related(prefetch)
-
             # Put results into a dictionary (using primary key as the key)
             results_dict = dict((str(result.pk), result) for result in results)
 
@@ -361,5 +357,8 @@ def search(self, query_string, model, fields=None, filters={}, prefetch_related=
         if not query_string:
             return []
 
+        # Give deprecation warning if prefetch_related was used
+        warnings.warn("prefetch_related on search queries is no longer implemented. ", DeprecationWarning)
+
         # Return search results
-        return ElasticSearchResults(self, ElasticSearchQuery(model, query_string, fields=fields, filters=filters), prefetch_related=prefetch_related)
+        return ElasticSearchResults(self, ElasticSearchQuery(model, query_string, fields=fields, filters=filters))

From 69c9863d4c60c512b08e2f9375791eb9dd295f51 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 11:18:18 +0100
Subject: [PATCH 180/293] Made finding objects for search results the
 responsibility of do_search

---
 .../wagtailsearch/backends/elasticsearch.py   | 40 +++++++------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index e9fa739f8b6..eecbd2f1dfe 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -137,7 +137,18 @@ def _do_search(self, offset=0, limit=None):
         pks = [hit['fields']['pk'] for hit in hits['hits']['hits']]
 
         # ElasticSearch 1.x likes to pack pks into lists, unpack them if this has happened
-        return [pk[0] if isinstance(pk, list) else pk for pk in pks]
+        pks = [pk[0] if isinstance(pk, list) else pk for pk in pks]
+
+        # Initialise results dictionary
+        results = dict((str(pk), None) for pk in pks)
+
+        # Find objects in database and add them to dict
+        queryset = self.query.model.objects.filter(pk__in=pks)
+        for obj in queryset:
+            results[str(obj.pk)] = obj
+
+        # Return results in order given by ElasticSearch
+        return [results[str(pk)] for pk in pks if results[str(pk)]]
 
     def _do_count(self):
         query = self.query.to_es()
@@ -159,32 +170,11 @@ def _do_count(self):
 
     def __getitem__(self, key):
         if isinstance(key, slice):
-            # Get primary keys
-            pk_list_unclean = self._do_search(key.start, key.stop - key.start)
-
-            # Remove duplicate keys (and preserve order)
-            seen_pks = set()
-            pk_list = []
-            for pk in pk_list_unclean:
-                if pk not in seen_pks:
-                    seen_pks.add(pk)
-                    pk_list.append(pk)
-
-            # Get results
-            results = self.query.model.objects.filter(pk__in=pk_list)
-
-            # Put results into a dictionary (using primary key as the key)
-            results_dict = dict((str(result.pk), result) for result in results)
-
-            # Build new list with items in the correct order
-            results_sorted = [results_dict[str(pk)] for pk in pk_list if str(pk) in results_dict]
-
-            # Return the list
-            return results_sorted
+            # Run query
+            return self._do_search(key.start, key.stop - key.start)
         else:
             # Return a single item
-            pk = self._do_search(key, key + 1)[0]
-            return self.query.model.objects.get(pk=pk)
+            return self._do_search(key, key + 1)[0]
 
     def __len__(self):
         return self._do_count()

From 16b385da974402c20df7e7ef8a1a3b1595ba049e Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 11:35:19 +0100
Subject: [PATCH 181/293] Slicing ESResults now returns a new ESResults object
 Previously, slicing an ESResults object made it run a query against
 ElasticSearch and return the results This commit changes this by making slice
 return a new ESResults object with start and stop limits applied. To get
 results, you now have to iterate the ESResults object.

---
 .../wagtailsearch/backends/elasticsearch.py   | 64 +++++++++++++++----
 1 file changed, 53 insertions(+), 11 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index eecbd2f1dfe..6bd48aafe8e 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -116,24 +116,47 @@ class ElasticSearchResults(object):
     def __init__(self, backend, query):
         self.backend = backend
         self.query = query
-
-    def _do_search(self, offset=0, limit=None):
+        self.start = 0
+        self.stop = None
+
+    def _set_limits(self, start=None, stop=None):
+        if stop is not None:
+            if self.stop is not None:
+                self.stop = min(self.stop, self.start + stop)
+            else:
+                self.stop = self.start + stop
+
+        if start is not None:
+            if self.stop is not None:
+                self.start = min(self.stop, self.start + start)
+            else:
+                self.start = self.start + start
+
+    def _clone(self):
+        klass = self.__class__
+        new = klass(self.backend, self.query)
+        new.start = self.start
+        new.stop = self.stop
+        return new
+
+    def _do_search(self):
         # Params for elasticsearch query
         params = dict(
             index=self.backend.es_index,
             body=dict(query=self.query.to_es()),
             _source=False,
             fields='pk',
-            from_=offset,
+            from_=self.start,
         )
 
-        # Add limit if set
-        if limit is not None:
-            params['size'] = limit
+        # Add size if set
+        if self.stop is not None:
+            params['size'] = self.stop - self.start
 
         # Send to ElasticSearch
         hits = self.backend.es.search(**params)
 
+        # Get pks from results
         pks = [hit['fields']['pk'] for hit in hits['hits']['hits']]
 
         # ElasticSearch 1.x likes to pack pks into lists, unpack them if this has happened
@@ -151,6 +174,7 @@ def _do_search(self, offset=0, limit=None):
         return [results[str(pk)] for pk in pks if results[str(pk)]]
 
     def _do_count(self):
+        # Get query
         query = self.query.to_es()
 
         # Elasticsearch 1.x
@@ -166,15 +190,33 @@ def _do_count(self):
                 body=query,
             )
 
-        return count['count']
+        # Get count
+        hit_count = count['count']
+
+        # Add limits
+        hit_count -= self.start
+        if self.stop is not None:
+            hit_count = min(hit_count, self.stop - self.start)
+
+        return max(hit_count, 0)
 
     def __getitem__(self, key):
+        new = self._clone()
+
         if isinstance(key, slice):
-            # Run query
-            return self._do_search(key.start, key.stop - key.start)
+            # Set limits
+            start = int(key.start) if key.start else None
+            stop = int(key.stop) if key.stop else None
+            new._set_limits(start, stop)
+
+            return new
         else:
-            # Return a single item
-            return self._do_search(key, key + 1)[0]
+            new.start = key
+            new.stop = key + 1
+            return list(new)[0]
+
+    def __iter__(self):
+        return iter(self._do_search())
 
     def __len__(self):
         return self._do_count()

From 1475d440e3b5a38eb9ff4a939b7bce4fcc1d0850 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 11:42:17 +0100
Subject: [PATCH 182/293] len(ESResults) now runs query and gets the length of
 the results. Added ESResults.count() which asks Elasticsearch for the count
 but doesn't run the query

---
 wagtail/wagtailsearch/backends/elasticsearch.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 6bd48aafe8e..5f62b96a873 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -173,7 +173,7 @@ def _do_search(self):
         # Return results in order given by ElasticSearch
         return [results[str(pk)] for pk in pks if results[str(pk)]]
 
-    def _do_count(self):
+    def count(self):
         # Get query
         query = self.query.to_es()
 
@@ -219,7 +219,7 @@ def __iter__(self):
         return iter(self._do_search())
 
     def __len__(self):
-        return self._do_count()
+        return len(self._do_search())
 
 
 class ElasticSearch(BaseSearch):

From d4aa5d50905ecde6bf5199218cdc102b87b8ab1b Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 11:43:33 +0100
Subject: [PATCH 183/293] Added __repr__ method to ElasticSearchResults

---
 wagtail/wagtailsearch/backends/elasticsearch.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 5f62b96a873..e9db7fbf14f 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -221,6 +221,12 @@ def __iter__(self):
     def __len__(self):
         return len(self._do_search())
 
+    def __repr__(self):
+        data = list(self[:21])
+        if len(data) > 20:
+            data[-1] = "...(remaining elements truncated)..."
+        return repr(data)
+
 
 class ElasticSearch(BaseSearch):
     def __init__(self, params):

From a5834513c31b2260287c2411ec3a3dcb25e11d12 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 11:51:38 +0100
Subject: [PATCH 184/293] Implemented results caching on ElasticSearchResults

---
 .../wagtailsearch/backends/elasticsearch.py   | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index e9db7fbf14f..29141542a54 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -118,6 +118,8 @@ def __init__(self, backend, query):
         self.query = query
         self.start = 0
         self.stop = None
+        self._results_cache = None
+        self._count_cache = None
 
     def _set_limits(self, start=None, stop=None):
         if stop is not None:
@@ -173,7 +175,7 @@ def _do_search(self):
         # Return results in order given by ElasticSearch
         return [results[str(pk)] for pk in pks if results[str(pk)]]
 
-    def count(self):
+    def _do_count(self):
         # Get query
         query = self.query.to_es()
 
@@ -200,6 +202,19 @@ def count(self):
 
         return max(hit_count, 0)
 
+    def results(self):
+        if self._results_cache is None:
+            self._results_cache = self._do_search()
+        return self._results_cache
+
+    def count(self):
+        if self._count_cache is None:
+            if self._results_cache is not None:
+                self._count_cache = len(self._results_cache)
+            else:
+                self._count_cache = self._do_count()
+        return self._count_cache
+
     def __getitem__(self, key):
         new = self._clone()
 
@@ -209,17 +224,24 @@ def __getitem__(self, key):
             stop = int(key.stop) if key.stop else None
             new._set_limits(start, stop)
 
+            # Copy results cache
+            if self._results_cache is not None:
+                new._results_cache = self._results_cache[key]
+
             return new
         else:
+            if self._results_cache is not None:
+                return self._results_cache[key]
+
             new.start = key
             new.stop = key + 1
             return list(new)[0]
 
     def __iter__(self):
-        return iter(self._do_search())
+        return iter(self.results())
 
     def __len__(self):
-        return len(self._do_search())
+        return len(self.results())
 
     def __repr__(self):
         data = list(self[:21])

From d68d764d911c9c291cbd74da3ad77fc675a1a296 Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Fri, 20 Jun 2014 12:37:20 +0100
Subject: [PATCH 185/293] Reorganise unit tests to obviate the use of del

---
 .../wagtailadmin/tests/test_edit_handlers.py  | 129 ++++++------------
 1 file changed, 42 insertions(+), 87 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py
index 19c1174056b..c930974fefa 100644
--- a/wagtail/wagtailadmin/tests/test_edit_handlers.py
+++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py
@@ -12,7 +12,6 @@
     RichTextFieldPanel,
     EditHandler,
     WagtailAdminModelForm,
-    BaseCompositeEditHandler,
     BaseTabbedInterface,
     TabbedInterface,
     BaseObjectList,
@@ -136,107 +135,63 @@ def test_render_form_content(self):
         self.assertEqual(self.edit_handler.render_form_content(), "foobar")
 
 
-class TestBaseCompositeEditHandler(TestCase):
-    def test_object_classnames_no_classname(self):
-        mock = MagicMock()
-        mock.widget_overrides.return_value = {'foo': 'bar'}
-        mock.required_formsets.return_value = {'baz': 'quux'}
-        BaseCompositeEditHandler.children = [mock]
-        base_composite_edit_handler = BaseCompositeEditHandler(
-            instance=True,
-            form=True)
-        result = base_composite_edit_handler.object_classnames()
-        self.assertEqual(result, "multi-field")
-        del BaseCompositeEditHandler.children
-
-    def test_object_classnames(self):
-        mock = MagicMock()
-        mock.widget_overrides.return_value = {'foo': 'bar'}
-        mock.required_formsets.return_value = {'baz': 'quux'}
-        BaseCompositeEditHandler.children = [mock]
-        base_composite_edit_handler = BaseCompositeEditHandler(
-            instance=True,
-            form=True)
-        base_composite_edit_handler.classname = "foo"
-        result = base_composite_edit_handler.object_classnames()
-        self.assertEqual(result, "multi-field foo")
-        del BaseCompositeEditHandler.children
-
-    def test_widget_overrides(self):
-        mock = MagicMock()
-        mock.widget_overrides.return_value = {'foo': 'bar'}
-        mock.required_formsets.return_value = {'baz': 'quux'}
-        BaseCompositeEditHandler.children = [mock]
-        base_composite_edit_handler = BaseCompositeEditHandler(
-            instance=True,
-            form=True)
-        result = base_composite_edit_handler.widget_overrides()
-        self.assertEqual(result, {'foo': 'bar'})
-        del BaseCompositeEditHandler.children
-
-    def test_required_formsets(self):
-        mock = MagicMock()
-        mock.widget_overrides.return_value = {'foo': 'bar'}
-        mock.required_formsets.return_value = {'baz': 'quux'}
-        BaseCompositeEditHandler.children = [mock]
-        base_composite_edit_handler = BaseCompositeEditHandler(
-            instance=True,
-            form=True)
-        result = base_composite_edit_handler.required_formsets()
-        self.assertEqual(result, ['baz'])
-        del BaseCompositeEditHandler.children
-
-
-class TestBaseTabbedInterface(TestCase):
+class TestTabbedInterface(TestCase):
     class FakeChild(object):
         class FakeGrandchild(object):
             def render_js(self):
-                return "foo"
+                return "rendered js"
 
             def rendered_fields(self):
-                return ["bar"]
+                return ["rendered fields"]
+
+        def widget_overrides(self):
+            return {'foo': 'bar'}
+
+        def required_formsets(self):
+            return {'baz': 'quux'}
 
         def __call__(self, *args, **kwargs):
             fake_grandchild = self.FakeGrandchild()
             return fake_grandchild
 
+    def setUp(self):
+        fake_child = self.FakeChild()
+        self.TabbedInterfaceClass = TabbedInterface([fake_child])
+        self.tabbed_interface = self.TabbedInterfaceClass(instance=True,
+                                                          form=True)
+
+    def test_tabbed_interface(self):
+        self.assertTrue(issubclass(self.TabbedInterfaceClass,
+                                   BaseTabbedInterface))
+
+    def test_object_classnames_no_classname(self):
+        result = self.tabbed_interface.object_classnames()
+        self.assertEqual(result, 'multi-field')
+
+    def test_object_classnames(self):
+        self.tabbed_interface.classname = 'foo'
+        result = self.tabbed_interface.object_classnames()
+        self.assertEqual(result, 'multi-field foo')
+
+    def test_widget_overrides(self):
+        result = self.tabbed_interface.widget_overrides()
+        self.assertEqual(result, {'foo': 'bar'})
+
+    def test_required_formsets(self):
+        result = self.tabbed_interface.required_formsets()
+        self.assertEqual(result, ['baz'])
+
     def test_render(self):
-        mock = MagicMock()
-        BaseTabbedInterface.children = [mock]
-        self.base_tabbed_interface = BaseTabbedInterface(
-            instance=True,
-            form=True)
-        result = self.base_tabbed_interface.render()
-        self.assertIn('<ul', result)
-        self.assertIn('<li', result)
-        self.assertIn('<div', result)
-        del BaseTabbedInterface.children
+        result = self.tabbed_interface.render()
+        self.assertIn('<div class="tab-content">', result)
 
     def test_render_js(self):
-        fake_child = self.FakeChild()
-        BaseTabbedInterface.children = [fake_child]
-        self.base_tabbed_interface = BaseTabbedInterface(
-            instance=True,
-            form=True)
-        result = self.base_tabbed_interface.render_js()
-        self.assertEqual(result, "foo")
-        del BaseTabbedInterface.children
+        result = self.tabbed_interface.render_js()
+        self.assertEqual(result, 'rendered js')
 
     def test_rendered_fields(self):
-        fake_child = self.FakeChild()
-        BaseTabbedInterface.children = [fake_child]
-        self.base_tabbed_interface = BaseTabbedInterface(
-            instance=True,
-            form=True)
-        result = self.base_tabbed_interface.rendered_fields()
-        self.assertEqual(result, ["bar"])
-        del BaseTabbedInterface.children
-
-
-class TestTabbedInterface(TestCase):
-    def test_tabbed_interface(self):
-        tabbed_interface = TabbedInterface(['foo'])
-        self.assertTrue(issubclass(tabbed_interface, BaseTabbedInterface))
+        result = self.tabbed_interface.rendered_fields()
+        self.assertEqual(result, ["rendered fields"])
 
 
 class TestObjectList(TestCase):

From f147581ca697242930c2bf760e38d852f3bde897 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 20 Jun 2014 12:58:18 +0100
Subject: [PATCH 186/293] better css class concat

---
 wagtail/wagtailadmin/edit_handlers.py         | 28 ++++++++--------
 .../wagtailadmin/scss/components/forms.scss   | 33 +++++++++++++------
 .../edit_handlers/field_row_panel.html        |  4 +--
 .../edit_handlers/multi_field_panel.html      |  2 +-
 .../edit_handlers/object_list.html            |  2 +-
 .../edit_handlers/tabbed_interface.html       |  4 +--
 6 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py
index c8d2ac0c6b6..61eb0bd5b90 100644
--- a/wagtail/wagtailadmin/edit_handlers.py
+++ b/wagtail/wagtailadmin/edit_handlers.py
@@ -193,10 +193,15 @@ def classes(self):
         Subclasses of EditHandler should override this, invoking super(B, self).classes() to
         append more classes specific to the situation.
         """
+
+        classes = []
+
         try:
-            return self.classname
+            classes.append(self.classname)
         except AttributeError:
-            return ""
+            pass
+
+        return classes
 
     def field_type(self):
         """
@@ -343,12 +348,8 @@ class BaseMultiFieldPanel(BaseCompositeEditHandler):
 
     def classes(self):
         classes = super(BaseMultiFieldPanel, self).classes()
-
-        try:
-            classes += " multi-field " 
-        except (AttributeError, TypeError):
-            pass
-
+        classes.append("multi-field")
+   
         return classes
 
 def MultiFieldPanel(children, heading="", classname=""):
@@ -371,12 +372,13 @@ def classes(self):
         classes = super(BaseFieldPanel, self).classes();
 
         if self.bound_field.field.required:
-            classes += " required "
+            classes.append("required")
         if self.bound_field.errors:
-            classes += " error "
+            classes.append("error")
+        
+        classes.append(self.field_type())
+        classes.append("single-field")
         
-        classes += self.field_type() + " single-field "
-
         return classes
 
     def field_type(self):
@@ -616,7 +618,7 @@ def PublishingPanel():
         FieldRowPanel([
             FieldPanel('go_live_at'),
             FieldPanel('expire_at'),
-        ], classname="labels-above"),   
+        ], classname="label-above"),   
     ], ugettext_lazy('Scheduled publishing'), classname="publishing")
 
 
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index 7b84c618119..1658a0edc11 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -507,12 +507,19 @@ li.focused > .help{
     }
 }
 
-.fields > li{
+.fields > li,
+.field-col{
     @include clearfix();
     padding-top:0.5em;
     padding-bottom:1.2em;
 }
 
+.field-row{
+    @include clearfix();
+    /* negative margin the bottom so it doesn't add too much space */
+    margin-bottom:-1.2em;
+}
+
 .input{
     clear:both;
 }
@@ -526,15 +533,6 @@ li.focused > .help{
     }
 }
 
-.field-col{
-    float:left;
-}
-
-.labels-above{
-    
-}
-
-
 .field{
     &.col1,
     &.col2,
@@ -746,6 +744,15 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
         }
     }
 
+    .label-above{
+        .field > label{
+            display:block;
+            padding:0 0 0.8em 0;
+            float:none;
+            width:auto;
+        }
+    }
+
     input[type=submit], input[type=reset], input[type=button], .button, button{
         font-size:0.95em;
         padding:0.75em 1.4em;
@@ -771,8 +778,14 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
         @include row();
     }
 
+    .field-col{
+        float:left;
+        padding-left:0 !important;
+    }
+
     .field-content{
         @include column(10);
         padding-right:0;
+        padding-left:0;
     }   
 }
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html
index 4ef5dfff4cb..ead32db1a33 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html
@@ -1,6 +1,6 @@
-<ul class="field-row {{ self.classes }}">
+<ul class="field-row {{ self.classes|join:" " }}">
     {% for child in self.children %}
-       <li class="field-col">
+       <li class="field-col {{ child.classes|join:" " }}">
            {{ child.render_as_field }}
        </li>
     {% endfor %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/multi_field_panel.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/multi_field_panel.html
index 62d75c9b6b9..2d1be5b4611 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/multi_field_panel.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/multi_field_panel.html
@@ -2,7 +2,7 @@
     <legend>{{ self.heading }}</legend>
     <ul class="fields">
         {% for child in self.children %}
-            <li>{{ child.render_as_field }}</li>
+            <li class="{{ child.classes|join:" " }}">{{ child.render_as_field }}</li>
         {% endfor %}
     </ul>
 </fieldset>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/object_list.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/object_list.html
index 5c8357680eb..81bc39dc793 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/object_list.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/object_list.html
@@ -1,6 +1,6 @@
 <ul class="objects">
     {% for child in self.children %}
-        <li class="object {{ child.classes }}">
+        <li class="object {{ child.classes|join:" " }}">
             {% if child.heading %}
                 <h2>{{ child.heading }}</h2>
             {% endif %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html
index 813e40f53fb..b70c1d47af2 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html
@@ -1,12 +1,12 @@
 <ul class="tab-nav merged">
     {% for child in self.children %}
-        <li class="{{ child.classes }} {% if forloop.first %}active{% endif %}"><a href="#{{ child.heading|slugify }}" class="{% if forloop.first %}active{% endif %}">{{ child.heading }}</a></li>
+        <li class="{{ child.classes|join:" " }} {% if forloop.first %}active{% endif %}"><a href="#{{ child.heading|slugify }}" class="{% if forloop.first %}active{% endif %}">{{ child.heading }}</a></li>
     {% endfor %}
 </ul>
 
 <div class="tab-content">
     {% for child in self.children %}
-        <section id="{{ child.heading|slugify }}" class="{{ child.classes }} {% if forloop.first %}active{% endif %}">
+        <section id="{{ child.heading|slugify }}" class="{{ child.classes|join:" " }} {% if forloop.first %}active{% endif %}">
             {{ child.render_as_object }}
         </section>
     {% endfor %}

From 8cb94f0b5c37df70624453ca0a7a1b8269f8973b Mon Sep 17 00:00:00 2001
From: Dave Cranwell <xcession@xcessionsites.com>
Date: Fri, 20 Jun 2014 13:46:43 +0100
Subject: [PATCH 187/293] Update frontenddevelopers.rst

Added notes about new image manipulation techniques
---
 .../building_your_site/frontenddevelopers.rst | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/docs/building_your_site/frontenddevelopers.rst b/docs/building_your_site/frontenddevelopers.rst
index a8cf6a25ece..bb12c592247 100644
--- a/docs/building_your_site/frontenddevelopers.rst
+++ b/docs/building_your_site/frontenddevelopers.rst
@@ -186,7 +186,24 @@ The available resizing methods are:
 More control over the ``img`` tag
 ---------------------------------
 
-In some cases greater control over the ``img`` tag is required, for example to add a custom ``class``. Rather than generating the ``img`` element for you, Wagtail can assign the relevant data to another object using Django's ``as`` syntax:
+Greater control over the ``img`` tag is often required, for example to add a custom ``class``. This can be most easily achieved in two ways:
+
+.. versionadded:: 0.4
+
+Adding attributes to the  {% image %} tag
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Simply add extra attributes with the syntax ``attribute="value"`` to the tag:
+
+.. code-block:: django
+
+    {% image self.photo width-400 class="foo" id="bar" %}
+
+
+Generating the image "as"
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Wagtail can assign the image data to another object using Django's ``as`` syntax:
 
 .. code-block:: django
     
@@ -197,12 +214,17 @@ In some cases greater control over the ``img`` tag is required, for example to a
     <img src="{{ tmp_photo.src }}" width="{{ tmp_photo.width }}" 
         height="{{ tmp_photo.height }}" alt="{{ tmp_photo.alt }}" class="my-custom-class" />
 
+
+The ``attrs`` shortcut
+-----------------------
+
 You can also use the ``attrs`` property as a shorthand to output the ``src``, ``width``, ``height`` and ``alt`` attributes in one go:
 
 .. code-block:: django
 
     <img {{ tmp_photo.attrs }} class="my-custom-class" />
 
+
 .. _rich-text-filter:
 
 Rich text (filter)

From c1f2f745afcd99cefccc9d9ac0f7615a2a73c69d Mon Sep 17 00:00:00 2001
From: Dave Cranwell <xcession@xcessionsites.com>
Date: Fri, 20 Jun 2014 13:49:25 +0100
Subject: [PATCH 188/293] Update frontenddevelopers.rst

heading level fix
---
 docs/building_your_site/frontenddevelopers.rst | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/building_your_site/frontenddevelopers.rst b/docs/building_your_site/frontenddevelopers.rst
index bb12c592247..7b674bf0d6d 100644
--- a/docs/building_your_site/frontenddevelopers.rst
+++ b/docs/building_your_site/frontenddevelopers.rst
@@ -190,8 +190,7 @@ Greater control over the ``img`` tag is often required, for example to add a cus
 
 .. versionadded:: 0.4
 
-Adding attributes to the  {% image %} tag
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**Adding attributes to the  {% image %} tag**
 
 Simply add extra attributes with the syntax ``attribute="value"`` to the tag:
 
@@ -200,8 +199,8 @@ Simply add extra attributes with the syntax ``attribute="value"`` to the tag:
     {% image self.photo width-400 class="foo" id="bar" %}
 
 
-Generating the image "as"
-~~~~~~~~~~~~~~~~~~~~~~~~~
+**Generating the image "as"**
+
 
 Wagtail can assign the image data to another object using Django's ``as`` syntax:
 

From 135d4f20a622196caf33c4eb2ac8294b5e8b7f66 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <xcession@xcessionsites.com>
Date: Fri, 20 Jun 2014 14:04:11 +0100
Subject: [PATCH 189/293] Update frontenddevelopers.rst

---
 docs/building_your_site/frontenddevelopers.rst | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/docs/building_your_site/frontenddevelopers.rst b/docs/building_your_site/frontenddevelopers.rst
index 7b674bf0d6d..602c53c7f71 100644
--- a/docs/building_your_site/frontenddevelopers.rst
+++ b/docs/building_your_site/frontenddevelopers.rst
@@ -186,34 +186,32 @@ The available resizing methods are:
 More control over the ``img`` tag
 ---------------------------------
 
-Greater control over the ``img`` tag is often required, for example to add a custom ``class``. This can be most easily achieved in two ways:
+Wagtail provides two shorcuts to gain grater greater control over the ``img`` element:
 
 .. versionadded:: 0.4
-
 **Adding attributes to the  {% image %} tag**
 
-Simply add extra attributes with the syntax ``attribute="value"`` to the tag:
+Extra attributes can be specified with the syntax ``attribute="value"``:
 
 .. code-block:: django
 
     {% image self.photo width-400 class="foo" id="bar" %}
 
+No validation is performed on attributes add in this way by the developer. It's possible to add `src`, `width`, `height` and `alt` of your own that might conflict with those generated by the tag itself.
 
-**Generating the image "as"**
 
+**Generating the image "as"**
 
 Wagtail can assign the image data to another object using Django's ``as`` syntax:
 
 .. code-block:: django
     
-    {% load image %}
-    ...
     {% image self.photo width-400 as tmp_photo %}
 
     <img src="{{ tmp_photo.src }}" width="{{ tmp_photo.width }}" 
         height="{{ tmp_photo.height }}" alt="{{ tmp_photo.alt }}" class="my-custom-class" />
 
-
+.. versionadded:: 0.4
 The ``attrs`` shortcut
 -----------------------
 

From ba0805e521986329a7ec4f55bde934aec30e678e Mon Sep 17 00:00:00 2001
From: Dave Cranwell <xcession@xcessionsites.com>
Date: Fri, 20 Jun 2014 14:07:33 +0100
Subject: [PATCH 190/293] Update frontenddevelopers.rst

typo fix
---
 docs/building_your_site/frontenddevelopers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/building_your_site/frontenddevelopers.rst b/docs/building_your_site/frontenddevelopers.rst
index 602c53c7f71..8d0c9a3bb1c 100644
--- a/docs/building_your_site/frontenddevelopers.rst
+++ b/docs/building_your_site/frontenddevelopers.rst
@@ -186,7 +186,7 @@ The available resizing methods are:
 More control over the ``img`` tag
 ---------------------------------
 
-Wagtail provides two shorcuts to gain grater greater control over the ``img`` element:
+Wagtail provides two shorcuts to give greater control over the ``img`` element:
 
 .. versionadded:: 0.4
 **Adding attributes to the  {% image %} tag**

From 55cd5aad835f604583e30cfd2375358d08e08606 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 20 Jun 2014 14:08:49 +0100
Subject: [PATCH 191/293] Revert frame-writing stuff from #315, as it fails
 when the preview loads before the placeholder - see
 https://github.com/torchbox/wagtail/pull/315#issuecomment-46669595

---
 .../static/wagtailadmin/js/page-editor.js     | 19 +++++--------------
 .../templates/wagtailadmin/pages/preview.html |  1 -
 wagtail/wagtailadmin/urls.py                  |  1 -
 wagtail/wagtailadmin/views/pages.py           |  6 ------
 4 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index eacb8f86d9d..03adb7acace 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -329,9 +329,9 @@ $(function() {
     });
 
     /* Set up behaviour of preview button */
-    $('.action-preview').click(function(e) {        
+    $('.action-preview').click(function(e) {
         e.preventDefault();
-        
+
         var previewWindow = window.open($(this).data('placeholder'), $(this).data('windowname'));
 
         $.ajax({
@@ -340,18 +340,9 @@ $(function() {
             data: $('#page-edit-form').serialize(),
             success: function(data, textStatus, request) {
                 if (request.getResponseHeader('X-Wagtail-Preview') == 'ok') {
-                    var pdoc = previewWindow.document;
-                    var frame = pdoc.getElementById('preview-frame');
-
-                    frame = frame.contentWindow || frame.contentDocument.document || frame.contentDocument;
-                    frame.document.open();
-                    frame.document.write(data);                 
-                    frame.document.close();
-
-                    var hideTimeout = setTimeout(function(){
-                        pdoc.getElementById('loading-spinner-wrapper').className += 'remove';
-                        clearTimeout(hideTimeout);
-                    }, 50) // just enough to give effect without adding discernible slowness
+                    previewWindow.document.open();
+                    previewWindow.document.write(data);
+                    previewWindow.document.close();
                 } else {
                     previewWindow.close();
                     document.open();
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
index d5c4b7a51ce..46a4d286736 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
@@ -11,6 +11,5 @@
         <div id="loading-spinner-wrapper">
             <div id="loading-spinner"></div>
         </div>
-        <iframe id="preview-frame" src="{% url 'wagtailadmin_pages_preview_loading' %}"></iframe>
     </body>
 </html>
diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py
index 21f127c1dc1..ee68f46554f 100644
--- a/wagtail/wagtailadmin/urls.py
+++ b/wagtail/wagtailadmin/urls.py
@@ -50,7 +50,6 @@
     url(r'^pages/(\d+)/edit/preview/$', pages.preview_on_edit, name='wagtailadmin_pages_preview_on_edit'),
 
     url(r'^pages/preview/$', pages.preview, name='wagtailadmin_pages_preview'),
-    url(r'^pages/preview_loading/$', pages.preview_loading, name='wagtailadmin_pages_preview_loading'),
 
     url(r'^pages/(\d+)/view_draft/$', pages.view_draft, name='wagtailadmin_pages_view_draft'),
     url(r'^pages/(\d+)/add_subpage/$', pages.add_subpage, name='wagtailadmin_pages_add_subpage'),
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index bfca644632b..f215eb213f3 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -420,12 +420,6 @@ def preview(request):
     """
     return render(request, 'wagtailadmin/pages/preview.html')
 
-def preview_loading(request):
-    """
-    This page is blank, but must be real HTML so its DOM can be written to once the preview of the page has rendered
-    """
-    return HttpResponse("<html><head><title></title></head><body></body></html>")
-
 @permission_required('wagtailadmin.access_admin')
 def unpublish(request, page_id):
     page = get_object_or_404(Page, id=page_id)

From 2afb13667fa99150bc6cbeaa52061f97dfd2aae6 Mon Sep 17 00:00:00 2001
From: jmiguelv <jose.m.vieira@kcl.ac.uk>
Date: Thu, 19 Jun 2014 10:48:51 +0100
Subject: [PATCH 192/293] Added a new hook to add new element rules to the
 Whitelister.

---
 wagtail/wagtailcore/whitelist.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailcore/whitelist.py b/wagtail/wagtailcore/whitelist.py
index a3d377bd630..0cfbbd2dbc8 100644
--- a/wagtail/wagtailcore/whitelist.py
+++ b/wagtail/wagtailcore/whitelist.py
@@ -5,6 +5,8 @@
 from bs4 import BeautifulSoup, NavigableString, Tag
 from urlparse import urlparse
 
+from wagtail.wagtailadmin import hooks
+
 
 ALLOWED_URL_SCHEMES = ['', 'http', 'https', 'ftp', 'mailto', 'tel']
 
@@ -65,7 +67,8 @@ class Whitelister(object):
         'h6': allow_without_attributes,
         'hr': allow_without_attributes,
         'i': allow_without_attributes,
-        'img': attribute_rule({'src': check_url, 'width': True, 'height': True, 'alt': True}),
+        'img': attribute_rule({'src': check_url, 'width': True, 'height': True,
+                               'alt': True}),
         'li': allow_without_attributes,
         'ol': allow_without_attributes,
         'p': allow_without_attributes,
@@ -77,7 +80,12 @@ class Whitelister(object):
 
     @classmethod
     def clean(cls, html):
-        """Clean up an HTML string to contain just the allowed elements / attributes"""
+        """Clean up an HTML string to contain just the allowed elements /
+        attributes"""
+        for fn in hooks.get_hooks('construct_whitelister_element_rules'):
+            cls.element_rules = dict(
+                cls.element_rules.items() + fn().items())
+
         doc = BeautifulSoup(html, 'lxml')
         cls.clean_node(doc, doc)
         return unicode(doc)

From 9bc770d0a65386b81955d7660e14af00d9230ed3 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 20 Jun 2014 14:50:10 +0100
Subject: [PATCH 193/293] Add unit tests for DbWhitelister, including ability
 to override the whitelist via hooks

---
 wagtail/tests/wagtail_hooks.py                |  9 ++++
 .../wagtailcore/tests/test_dbwhitelister.py   | 43 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 wagtail/wagtailcore/tests/test_dbwhitelister.py

diff --git a/wagtail/tests/wagtail_hooks.py b/wagtail/tests/wagtail_hooks.py
index 91c76c9f40b..5dccca666b9 100644
--- a/wagtail/tests/wagtail_hooks.py
+++ b/wagtail/tests/wagtail_hooks.py
@@ -1,4 +1,5 @@
 from wagtail.wagtailadmin import hooks
+from wagtail.wagtailcore.whitelist import attribute_rule, check_url, allow_without_attributes
 
 def editor_css():
     return """<link rel="stylesheet" href="/path/to/my/custom.css">"""
@@ -8,3 +9,11 @@ def editor_css():
 def editor_js():
     return """<script src="/path/to/my/custom.js"></script>"""
 hooks.register('insert_editor_js', editor_js)
+
+
+def whitelister_element_rules():
+    return {
+        'blockquote': allow_without_attributes,
+        'a': attribute_rule({'href': check_url, 'target': True}),
+    }
+hooks.register('construct_whitelister_element_rules', whitelister_element_rules)
diff --git a/wagtail/wagtailcore/tests/test_dbwhitelister.py b/wagtail/wagtailcore/tests/test_dbwhitelister.py
new file mode 100644
index 00000000000..db5b931eeed
--- /dev/null
+++ b/wagtail/wagtailcore/tests/test_dbwhitelister.py
@@ -0,0 +1,43 @@
+from django.test import TestCase
+from wagtail.wagtailcore.rich_text import DbWhitelister
+
+from bs4 import BeautifulSoup
+
+class TestDbWhitelister(TestCase):
+    def assertHtmlEqual(self, str1, str2):
+        """
+        Assert that two HTML strings are equal at the DOM level
+        (necessary because we can't guarantee the order that attributes are output in)
+        """
+        self.assertEqual(BeautifulSoup(str1), BeautifulSoup(str2))
+
+    def test_page_link_is_rewritten(self):
+        input_html = '<p>Look at the <a data-linktype="page" data-id="2" href="/">lovely homepage</a> of my <a href="http://wagtail.io/">Wagtail</a> site</p>'
+        output_html = DbWhitelister.clean(input_html)
+        expected = '<p>Look at the <a linktype="page" id="2">lovely homepage</a> of my <a href="http://wagtail.io/">Wagtail</a> site</p>'
+        self.assertHtmlEqual(expected, output_html)
+
+    def test_document_link_is_rewritten(self):
+        input_html = '<p>Look at our <a data-linktype="document" data-id="1" href="/documents/1/brochure.pdf">horribly oversized brochure</a></p>'
+        output_html = DbWhitelister.clean(input_html)
+        expected = '<p>Look at our <a linktype="document" id="1">horribly oversized brochure</a></p>'
+        self.assertHtmlEqual(expected, output_html)
+
+    def test_image_embed_is_rewritten(self):
+        input_html = '<p>OMG look at this picture of a kitten: <figure data-embedtype="image" data-id="5" data-format="image-with-caption" data-alt="A cute kitten" class="fancy-image"><img src="/media/images/kitten.jpg" width="320" height="200" alt="A cute kitten" /><figcaption>A kitten, yesterday.</figcaption></figure></p>'
+        output_html = DbWhitelister.clean(input_html)
+        expected = '<p>OMG look at this picture of a kitten: <embed embedtype="image" id="5" format="image-with-caption" alt="A cute kitten" /></p>'
+        self.assertHtmlEqual(expected, output_html)
+
+    def test_media_embed_is_rewritten(self):
+        input_html = '<p>OMG look at this video of a kitten: <iframe data-embedtype="media" data-url="https://www.youtube.com/watch?v=dQw4w9WgXcQ" width="640" height="480" src="//www.youtube.com/embed/dQw4w9WgXcQ" frameborder="0" allowfullscreen></iframe></p>'
+        output_html = DbWhitelister.clean(input_html)
+        expected = '<p>OMG look at this video of a kitten: <embed embedtype="media" url="https://www.youtube.com/watch?v=dQw4w9WgXcQ" /></p>'
+        self.assertHtmlEqual(expected, output_html)
+
+    def test_whitelist_hooks(self):
+        # wagtail.tests.wagtail_hooks overrides the whitelist to permit <blockquote> and <a target="...">
+        input_html = '<blockquote>I would put a tax on all people who <a href="https://twitter.com/DMReporter/status/432914941201223680/photo/1" target="_blank" tea="darjeeling">stand in water</a>.</blockquote><p>- <character>Gumby</character>'
+        output_html = DbWhitelister.clean(input_html)
+        expected = '<blockquote>I would put a tax on all people who <a href="https://twitter.com/DMReporter/status/432914941201223680/photo/1" target="_blank">stand in water</a>.</blockquote><p>- Gumby'
+        self.assertHtmlEqual(expected, output_html)

From 505a1291a80a3a7fb088004b98b5192afa561d01 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 20 Jun 2014 15:07:58 +0100
Subject: [PATCH 194/293] Move construct_whitelister_element_rules hook logic
 into DbWhitelister, as the whitelist module should be Wagtail-agnostic

---
 wagtail/wagtailcore/rich_text.py                | 14 ++++++++++++++
 wagtail/wagtailcore/tests/test_dbwhitelister.py | 11 +++++++++--
 wagtail/wagtailcore/whitelist.py                |  6 ------
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/wagtail/wagtailcore/rich_text.py b/wagtail/wagtailcore/rich_text.py
index aa8f2533620..8004cb30d20 100644
--- a/wagtail/wagtailcore/rich_text.py
+++ b/wagtail/wagtailcore/rich_text.py
@@ -13,6 +13,8 @@
 from wagtail.wagtailimages.models import get_image_model
 from wagtail.wagtailimages.formats import get_image_format
 
+from wagtail.wagtailadmin import hooks
+
 
 # Define a set of 'embed handlers' and 'link handlers'. These handle the translation
 # of 'special' HTML elements in rich text - ones which we do not want to include
@@ -158,6 +160,18 @@ def expand_db_attributes(attrs, for_editor):
 # Prepare a whitelisting engine with custom behaviour:
 # rewrite any elements with a data-embedtype or data-linktype attribute
 class DbWhitelister(Whitelister):
+    has_loaded_custom_whitelist_rules = False
+
+    @classmethod
+    def clean(cls, html):
+        if not cls.has_loaded_custom_whitelist_rules:
+            for fn in hooks.get_hooks('construct_whitelister_element_rules'):
+                cls.element_rules = dict(
+                    cls.element_rules.items() + fn().items())
+            cls.has_loaded_custom_whitelist_rules = True
+
+        return super(DbWhitelister, cls).clean(html)
+
     @classmethod
     def clean_tag_node(cls, doc, tag):
         if 'data-embedtype' in tag.attrs:
diff --git a/wagtail/wagtailcore/tests/test_dbwhitelister.py b/wagtail/wagtailcore/tests/test_dbwhitelister.py
index db5b931eeed..795b9637c04 100644
--- a/wagtail/wagtailcore/tests/test_dbwhitelister.py
+++ b/wagtail/wagtailcore/tests/test_dbwhitelister.py
@@ -1,5 +1,6 @@
 from django.test import TestCase
 from wagtail.wagtailcore.rich_text import DbWhitelister
+from wagtail.wagtailcore.whitelist import Whitelister
 
 from bs4 import BeautifulSoup
 
@@ -37,7 +38,13 @@ def test_media_embed_is_rewritten(self):
 
     def test_whitelist_hooks(self):
         # wagtail.tests.wagtail_hooks overrides the whitelist to permit <blockquote> and <a target="...">
-        input_html = '<blockquote>I would put a tax on all people who <a href="https://twitter.com/DMReporter/status/432914941201223680/photo/1" target="_blank" tea="darjeeling">stand in water</a>.</blockquote><p>- <character>Gumby</character>'
+        input_html = '<blockquote>I would put a tax on all people who <a href="https://twitter.com/DMReporter/status/432914941201223680/photo/1" target="_blank" tea="darjeeling">stand in water</a>.</blockquote><p>- <character>Gumby</character></p>'
         output_html = DbWhitelister.clean(input_html)
-        expected = '<blockquote>I would put a tax on all people who <a href="https://twitter.com/DMReporter/status/432914941201223680/photo/1" target="_blank">stand in water</a>.</blockquote><p>- Gumby'
+        expected = '<blockquote>I would put a tax on all people who <a href="https://twitter.com/DMReporter/status/432914941201223680/photo/1" target="_blank">stand in water</a>.</blockquote><p>- Gumby</p>'
+        self.assertHtmlEqual(expected, output_html)
+
+        # check that the base Whitelister class is unaffected by these custom whitelist rules
+        input_html = '<blockquote>I would put a tax on all people who <a href="https://twitter.com/DMReporter/status/432914941201223680/photo/1" target="_blank" tea="darjeeling">stand in water</a>.</blockquote><p>- <character>Gumby</character></p>'
+        output_html = Whitelister.clean(input_html)
+        expected = 'I would put a tax on all people who <a href="https://twitter.com/DMReporter/status/432914941201223680/photo/1">stand in water</a>.<p>- Gumby</p>'
         self.assertHtmlEqual(expected, output_html)
diff --git a/wagtail/wagtailcore/whitelist.py b/wagtail/wagtailcore/whitelist.py
index 0cfbbd2dbc8..9a5f67cf10a 100644
--- a/wagtail/wagtailcore/whitelist.py
+++ b/wagtail/wagtailcore/whitelist.py
@@ -5,8 +5,6 @@
 from bs4 import BeautifulSoup, NavigableString, Tag
 from urlparse import urlparse
 
-from wagtail.wagtailadmin import hooks
-
 
 ALLOWED_URL_SCHEMES = ['', 'http', 'https', 'ftp', 'mailto', 'tel']
 
@@ -82,10 +80,6 @@ class Whitelister(object):
     def clean(cls, html):
         """Clean up an HTML string to contain just the allowed elements /
         attributes"""
-        for fn in hooks.get_hooks('construct_whitelister_element_rules'):
-            cls.element_rules = dict(
-                cls.element_rules.items() + fn().items())
-
         doc = BeautifulSoup(html, 'lxml')
         cls.clean_node(doc, doc)
         return unicode(doc)

From 1aab35ba24341bb497316ccd880f813a095c6792 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 20 Jun 2014 16:08:50 +0100
Subject: [PATCH 195/293] add documentation for the
 construct_whitelister_element_rules hook

---
 docs/editing_api.rst | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/docs/editing_api.rst b/docs/editing_api.rst
index 88fc9458f5e..9f7602b11f6 100644
--- a/docs/editing_api.rst
+++ b/docs/editing_api.rst
@@ -546,6 +546,28 @@ Where ``'hook'`` is one of the following hook strings and ``function`` is a func
       + 'demo/css/vendor/font-awesome/css/font-awesome.min.css">')
     hooks.register('insert_editor_css', editor_css)
 
+.. _construct_whitelister_element_rules:
+
+``construct_whitelister_element_rules``
+  .. versionadded:: 0.4
+  Customise the rules that define which HTML elements are allowed in rich text areas. By default only a limited set of HTML elements and attributes are whitelisted - all others are stripped out. The callables passed into this hook must return a dict, which maps element names to handler functions that will perform some kind of manipulation of the element. These handler functions receive the element as a `BeautifulSoup <http://www.crummy.com/software/BeautifulSoup/bs4/doc/>`_ Tag object.
+
+  The ``wagtail.wagtailcore.whitelist`` module provides a few helper functions to assist in defining these handlers: ``allow_without_attributes``, a handler which preserves the element but strips out all of its attributes, and ``attribute_rule`` which accepts a dict specifying how to handle each attribute, and returns a handler function. This dict will map attribute names to either True (indicating that the attribute should be kept), False (indicating that it should be dropped), or a callable (which takes the initial attribute value and returns either a final value for the attribute, or None to drop the attribute).
+
+  For example, the following hook function will add the ``<blockquote>`` element to the whitelist, and allow the ``target`` attribute on ``<a>`` elements:
+
+  .. code-block:: python
+
+    from wagtail.wagtailadmin import hooks
+    from wagtail.wagtailcore.whitelist import attribute_rule, check_url, allow_without_attributes
+
+    def whitelister_element_rules():
+        return {
+            'blockquote': allow_without_attributes,
+            'a': attribute_rule({'href': check_url, 'target': True}),
+        }
+    hooks.register('construct_whitelister_element_rules', whitelister_element_rules)
+
 
 Image Formats in the Rich Text Editor
 -------------------------------------

From f4c51d8205f4c3a9cc5146021761e7d9f1d20671 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 20 Jun 2014 16:10:03 +0100
Subject: [PATCH 196/293] add changelog entry for
 construct_whitelister_element_rules hook

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

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 19eec21e765..e5cda8b44c4 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -14,6 +14,7 @@ Changelog
  * Aesthetic improvements to preview experience
  * 'image' tag now accepts extra keyword arguments to be output as attributes on the img tag
  * Added an 'attrs' property to image rendition objects to output src, width, height and alt attributes all in one go
+ * Added 'construct_whitelister_element_rules' hook for customising the HTML whitelist used when saving rich text fields
  * Fix: Animated GIFs are now coalesced before resizing
  * Fix: Wand backend clones images before modifying them
  * Fix: Admin breadcrumb now positioned correctly on mobile

From e1155c32efc145eacef9d49079abb12fee74de6d Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 20 Jun 2014 17:24:27 +0100
Subject: [PATCH 197/293] elegant preview now only available for non-IE because
 jquery can't adequately talk to child windows in IE.

---
 .../static/wagtailadmin/js/page-editor.js     | 81 +++++++++++++------
 .../templates/wagtailadmin/pages/preview.html |  1 +
 .../templates/wagtailadmin/skeleton.html      |  7 +-
 wagtail/wagtailadmin/urls.py                  |  1 +
 wagtail/wagtailadmin/views/pages.py           | 18 +++--
 5 files changed, 71 insertions(+), 37 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index 03adb7acace..96eed6bf6da 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -331,36 +331,65 @@ $(function() {
     /* Set up behaviour of preview button */
     $('.action-preview').click(function(e) {
         e.preventDefault();
+        $this = $(this);
+
+        var previewWindow = window.open($this.data('placeholder'), $this.data('windowname'));
+        
+        if(/MSIE/.test(navigator.userAgent)){
+            submitPreview.call($this, false);
+        } else {
+            previewWindow.onload = function(){
+                submitPreview.call($this, true);
+            }
+        }
 
-        var previewWindow = window.open($(this).data('placeholder'), $(this).data('windowname'));
+        function submitPreview(enhanced){
+            $.ajax({
+                type: "POST",
+                url: $(this).data('action'),
+                data: $('#page-edit-form').serialize(),
+                success: function(data, textStatus, request) {
+                    if (request.getResponseHeader('X-Wagtail-Preview') == 'ok') {
+                        var pdoc = previewWindow.document;
+                        
+                        if(enhanced){
+                            var frame = pdoc.getElementById('preview-frame');
+
+                            frame = frame.contentWindow || frame.contentDocument.document || frame.contentDocument;
+                            frame.document.open();
+                            frame.document.write(data);                 
+                            frame.document.close();
+
+                            var hideTimeout = setTimeout(function(){
+                                pdoc.getElementById('loading-spinner-wrapper').className += 'remove';
+                                clearTimeout(hideTimeout);
+                            }) // just enough to give effect without adding discernible slowness                       
+                        } else {
+                            pdoc.open();
+                            pdoc.write(data);                 
+                            pdoc.close()
+                        }
+                    } else {
+                        previewWindow.close();
+                        document.open();
+                        document.write(data);
+                        document.close();
+                    }
+                },
+                error: function(xhr, textStatus, errorThrown) {
+                    /* If an error occurs, display it in the preview window so that
+                    we aren't just showing the spinner forever. We preserve the original
+                    error output rather than giving a 'friendly' error message so that
+                    developers can debug template errors. (On a production site, we'd
+                    typically be serving a friendly custom 500 page anyhow.) */
 
-        $.ajax({
-            type: "POST",
-            url: $(this).data('action'),
-            data: $('#page-edit-form').serialize(),
-            success: function(data, textStatus, request) {
-                if (request.getResponseHeader('X-Wagtail-Preview') == 'ok') {
                     previewWindow.document.open();
-                    previewWindow.document.write(data);
+                    previewWindow.document.write(xhr.responseText);
                     previewWindow.document.close();
-                } else {
-                    previewWindow.close();
-                    document.open();
-                    document.write(data);
-                    document.close();
                 }
-            },
-            error: function(xhr, textStatus, errorThrown) {
-                /* If an error occurs, display it in the preview window so that
-                we aren't just showing the spinner forever. We preserve the original
-                error output rather than giving a 'friendly' error message so that
-                developers can debug template errors. (On a production site, we'd
-                typically be serving a friendly custom 500 page anyhow.) */
-
-                previewWindow.document.open();
-                previewWindow.document.write(xhr.responseText);
-                previewWindow.document.close();
-            }
-        });
+            });
+
+        }
+        
     });
 });
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
index 46a4d286736..d5c4b7a51ce 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
@@ -11,5 +11,6 @@
         <div id="loading-spinner-wrapper">
             <div id="loading-spinner"></div>
         </div>
+        <iframe id="preview-frame" src="{% url 'wagtailadmin_pages_preview_loading' %}"></iframe>
     </body>
 </html>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
index ac5038056ad..e24c1a5886a 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
@@ -1,10 +1,7 @@
 <!doctype html>
 {% load compress %}
-<!--[if lt IE 7]>      <html class="no-js ie lt-ie9 lt-ie8 lt-ie7" lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
-<!--[if IE 7]>         <html class="no-js ie lt-ie9 lt-ie8" lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
-<!--[if IE 8]>         <html class="no-js ie lt-ie9" lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
-<!--[if IE 9]>         <html class="no-js ie lt-ie10" lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
-<!--[if gt IE 9]><!--> <html class="no-js"  lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <!--<![endif]-->
+<!--[if lt IE 9]>       <html class="no-js ie lt-ie9" lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
+<!--[if IE 9]>          <html class="no-js ie lt-ie10" lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
 <head>
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py
index ee68f46554f..21f127c1dc1 100644
--- a/wagtail/wagtailadmin/urls.py
+++ b/wagtail/wagtailadmin/urls.py
@@ -50,6 +50,7 @@
     url(r'^pages/(\d+)/edit/preview/$', pages.preview_on_edit, name='wagtailadmin_pages_preview_on_edit'),
 
     url(r'^pages/preview/$', pages.preview, name='wagtailadmin_pages_preview'),
+    url(r'^pages/preview_loading/$', pages.preview_loading, name='wagtailadmin_pages_preview_loading'),
 
     url(r'^pages/(\d+)/view_draft/$', pages.view_draft, name='wagtailadmin_pages_view_draft'),
     url(r'^pages/(\d+)/add_subpage/$', pages.add_subpage, name='wagtailadmin_pages_add_subpage'),
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index f215eb213f3..c3eb24e9ef6 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -25,14 +25,16 @@ def index(request, parent_page_id=None):
     pages = parent_page.get_children().prefetch_related('content_type')
 
     # Get page ordering
-    ordering = request.GET.get('ordering', 'title')
-    if ordering not in ['title', '-title', 'content_type', '-content_type', 'live', '-live', 'ord']:
+    if 'ordering' in request.GET:
+        ordering = request.GET['ordering']
+
+        if ordering in ['title', '-title', 'content_type', '-content_type', 'live', '-live']:
+            pages = pages.order_by(ordering)
+    else:
         ordering = 'title'
 
     # Pagination
     if ordering != 'ord':
-        pages = pages.order_by(ordering)
-
         p = request.GET.get('p', 1)
         paginator = Paginator(pages, 50)
         try:
@@ -177,7 +179,6 @@ def clean_slug(slug):
         'parent_page': parent_page,
         'edit_handler': edit_handler,
         'display_modes': page.get_page_modes(),
-        'form': form, # Used in unit tests
     })
 
 
@@ -263,7 +264,6 @@ def clean_slug(slug):
         'edit_handler': edit_handler,
         'errors_debug': errors_debug,
         'display_modes': page.get_page_modes(),
-        'form': form, # Used in unit tests
     })
 
 
@@ -420,6 +420,12 @@ def preview(request):
     """
     return render(request, 'wagtailadmin/pages/preview.html')
 
+def preview_loading(request):
+    """
+    This page is blank, but must be real HTML so its DOM can be written to once the preview of the page has rendered
+    """
+    return HttpResponse("<html><head><title></title></head><body></body></html>")
+
 @permission_required('wagtailadmin.access_admin')
 def unpublish(request, page_id):
     page = get_object_or_404(Page, id=page_id)

From 307ad3462ac90f7c48e0fb13bac2842f7712788e Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 20 Jun 2014 17:27:56 +0100
Subject: [PATCH 198/293] tweak

---
 wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index 96eed6bf6da..06dba9b906d 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -346,7 +346,7 @@ $(function() {
         function submitPreview(enhanced){
             $.ajax({
                 type: "POST",
-                url: $(this).data('action'),
+                url: $this.data('action'),
                 data: $('#page-edit-form').serialize(),
                 success: function(data, textStatus, request) {
                     if (request.getResponseHeader('X-Wagtail-Preview') == 'ok') {

From 77da60b6d35fea967367ce9c2c3e5604ffcd2540 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Thu, 19 Jun 2014 17:27:20 +0100
Subject: [PATCH 199/293] Add UserProfile model

---
 .../wagtailusers/migrations/0001_initial.py   | 20 +++++
 .../migrations/0002_add_user_profile_model.py | 74 +++++++++++++++++++
 wagtail/wagtailusers/migrations/__init__.py   |  0
 wagtail/wagtailusers/models.py                | 30 ++++++++
 4 files changed, 124 insertions(+)
 create mode 100644 wagtail/wagtailusers/migrations/0001_initial.py
 create mode 100644 wagtail/wagtailusers/migrations/0002_add_user_profile_model.py
 create mode 100644 wagtail/wagtailusers/migrations/__init__.py
 create mode 100644 wagtail/wagtailusers/models.py

diff --git a/wagtail/wagtailusers/migrations/0001_initial.py b/wagtail/wagtailusers/migrations/0001_initial.py
new file mode 100644
index 00000000000..66a35cd76f0
--- /dev/null
+++ b/wagtail/wagtailusers/migrations/0001_initial.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        pass
+
+    def backwards(self, orm):
+        pass
+
+    models = {
+        
+    }
+
+    complete_apps = ['wagtailusers']
\ No newline at end of file
diff --git a/wagtail/wagtailusers/migrations/0002_add_user_profile_model.py b/wagtail/wagtailusers/migrations/0002_add_user_profile_model.py
new file mode 100644
index 00000000000..ff068ce3420
--- /dev/null
+++ b/wagtail/wagtailusers/migrations/0002_add_user_profile_model.py
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'UserProfile'
+        db.create_table(u'wagtailusers_userprofile', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('user', self.gf('django.db.models.fields.related.OneToOneField')(related_name='profile', unique=True, to=orm['auth.User'])),
+            ('submitted_notifications', self.gf('django.db.models.fields.BooleanField')(default=True)),
+            ('rejected_notifications', self.gf('django.db.models.fields.BooleanField')(default=True)),
+            ('approved_notifications', self.gf('django.db.models.fields.BooleanField')(default=True)),
+        ))
+        db.send_create_signal(u'wagtailusers', ['UserProfile'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'UserProfile'
+        db.delete_table(u'wagtailusers_userprofile')
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'wagtailusers.userprofile': {
+            'Meta': {'object_name': 'UserProfile'},
+            'approved_notifications': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rejected_notifications': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'submitted_notifications': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'profile'", 'unique': 'True', 'to': u"orm['auth.User']"})
+        }
+    }
+
+    complete_apps = ['wagtailusers']
\ No newline at end of file
diff --git a/wagtail/wagtailusers/migrations/__init__.py b/wagtail/wagtailusers/migrations/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/wagtail/wagtailusers/models.py b/wagtail/wagtailusers/models.py
new file mode 100644
index 00000000000..6e907a8647f
--- /dev/null
+++ b/wagtail/wagtailusers/models.py
@@ -0,0 +1,30 @@
+from django.db import models
+from django.contrib.auth import get_user_model
+from django.utils.translation import ugettext_lazy as _
+
+
+User = get_user_model()
+
+User.get_profile = lambda u: UserProfile.objects.get_or_create(user=u)[0]
+
+
+class UserProfile(models.Model):
+    user = models.OneToOneField(User)
+
+    submitted_notifications = models.BooleanField(
+            default=True,
+            help_text=_("Receive notification when a page is submitted for moderation")
+            )
+
+    approved_notifications = models.BooleanField(
+            default=True,
+            help_text=_("Receive notification when your page edit is approved")
+            )
+
+    rejected_notifications = models.BooleanField(
+            default=True,
+            help_text=_("Receive notification when your page edit is rejected")
+            )
+
+    def __unicode__(self):
+        return self.user.username

From 6dcb489d6b9579cbbfcdecc781f0806aa3d1df7f Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Thu, 19 Jun 2014 17:35:22 +0100
Subject: [PATCH 200/293] Add notification preferences form, view, template and
 link from account

---
 .../wagtailadmin/account/account.html         | 11 ++++++++++-
 .../account/notification_preferences.html     | 18 ++++++++++++++++++
 wagtail/wagtailadmin/urls.py                  |  1 +
 wagtail/wagtailadmin/views/account.py         | 19 +++++++++++++++++++
 wagtail/wagtailusers/forms.py                 |  9 +++++++--
 5 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/account/notification_preferences.html

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html
index 90f8033504f..21688ce37bf 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html
@@ -28,6 +28,15 @@
                     </small>
                 </li>
             {% endif %}
+            <li class="row row-flush">
+                <div class="col6">
+                    <a href="{% url 'wagtailadmin_account_notification_preferences' %}" class="button button-primary">{% trans "Notification preferences" %}</a>
+                </div>
+
+                <small class="col6">
+                    {% trans "Choose which email notifications to receive." %}
+                </small>
+            </li>
         </ul>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/notification_preferences.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/notification_preferences.html
new file mode 100644
index 00000000000..971ce6f37fa
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/notification_preferences.html
@@ -0,0 +1,18 @@
+{% extends "wagtailadmin/base.html" %}
+{% load i18n %}
+{% block content %}
+    {% trans "Notification Preferences" as prefs_str %}
+    {% include "wagtailadmin/shared/header.html" with title=prefs_str %}
+
+    <div class="nice-padding">
+        <form action="{% url 'wagtailadmin_account_notification_preferences' %}" method="POST">
+            {% csrf_token %}
+            <ul class="listing">
+                {% for field in form %}
+                    {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
+                {% endfor %}
+                <input type="submit" value="{% trans 'Update' %}" />
+            </ul>
+        </form>
+    </div>
+{% endblock %}
diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py
index ee68f46554f..4a3dc0f12f3 100644
--- a/wagtail/wagtailadmin/urls.py
+++ b/wagtail/wagtailadmin/urls.py
@@ -77,6 +77,7 @@
     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'^account/notification_preferences/$', account.notification_preferences, name='wagtailadmin_account_notification_preferences'),
     url(r'^logout/$', account.logout, name='wagtailadmin_logout'),
 
     url(r'^userbar/(\d+)/$', userbar.for_frontend, name='wagtailadmin_userbar_frontend'),
diff --git a/wagtail/wagtailadmin/views/account.py b/wagtail/wagtailadmin/views/account.py
index c5e461f55cb..d5ab71bd6f5 100644
--- a/wagtail/wagtailadmin/views/account.py
+++ b/wagtail/wagtailadmin/views/account.py
@@ -9,6 +9,7 @@
 from django.views.decorators.cache import never_cache
 
 from wagtail.wagtailadmin import forms
+from wagtail.wagtailusers.forms import NotificationPreferencesForm
 
 
 @permission_required('wagtailadmin.access_admin')
@@ -42,6 +43,24 @@ def change_password(request):
     })
 
 
+@permission_required('wagtailadmin.access_admin')
+def notification_preferences(request):
+
+    if request.POST:
+        form = NotificationPreferencesForm(request.POST, instance=request.user.get_profile())
+
+        if form.is_valid():
+            form.save()
+            messages.success(request, _("Your preferences have been updated successfully!"))
+            return redirect('wagtailadmin_account')
+    else:
+        form = NotificationPreferencesForm(instance=request.user.get_profile())
+
+    return render(request, 'wagtailadmin/account/notification_preferences.html', {
+        'form': form,
+    })
+
+
 @sensitive_post_parameters()
 @never_cache
 def login(request):
diff --git a/wagtail/wagtailusers/forms.py b/wagtail/wagtailusers/forms.py
index 1624c65cec5..057fac6bab4 100644
--- a/wagtail/wagtailusers/forms.py
+++ b/wagtail/wagtailusers/forms.py
@@ -1,9 +1,8 @@
 from django import forms
-from django.contrib.auth import get_user_model
 from django.contrib.auth.forms import UserCreationForm as BaseUserCreationForm
 from django.utils.translation import ugettext_lazy as _
 
-User = get_user_model()
+from wagtail.wagtailusers.models import User, UserProfile
 
 
 # extend Django's UserCreationForm with an 'is_superuser' field
@@ -130,3 +129,9 @@ def save(self, commit=True):
             user.save()
             self.save_m2m()
         return user
+
+
+class NotificationPreferencesForm(forms.ModelForm):
+    class Meta:
+        model = UserProfile
+        fields = ("submitted_notifications", "approved_notifications", "rejected_notifications")

From 7822d49431677ee64c813e841cd8c82dc7bac4b6 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Thu, 19 Jun 2014 17:37:08 +0100
Subject: [PATCH 201/293] Implement checking of user notification preferences
 before send_notification()

---
 wagtail/wagtailadmin/tasks.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailadmin/tasks.py b/wagtail/wagtailadmin/tasks.py
index 59779d36ba6..567a91f85b4 100644
--- a/wagtail/wagtailadmin/tasks.py
+++ b/wagtail/wagtailadmin/tasks.py
@@ -53,7 +53,7 @@ def send_notification(page_revision_id, notification, excluded_user_id):
     if notification == 'submitted':
         # Get list of publishers
         recipients = users_with_page_permission(revision.page, 'publish')
-    elif notification == 'approved' or notification == 'rejected':
+    elif notification in ['rejected', 'approved']:
         # Get submitter
         recipients = [revision.user]
     else:
@@ -62,7 +62,7 @@ def send_notification(page_revision_id, notification, excluded_user_id):
     # Get list of email addresses
     email_addresses = [
         recipient.email for recipient in recipients
-        if recipient.email and recipient.id != excluded_user_id
+        if recipient.email and recipient.id != excluded_user_id and getattr(recipient.get_profile(), notification + '_notifications')
     ]
 
     # Return if there are no email addresses

From 4ce37c2653cde295d1f776177fd81a13c80a3ed4 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Thu, 19 Jun 2014 17:40:06 +0100
Subject: [PATCH 202/293] Add link to notification preferences at bottom of
 email templates

---
 .../templates/wagtailadmin/notifications/approved.html        | 4 ++--
 .../wagtailadmin/notifications/base_notification.html         | 3 +++
 .../templates/wagtailadmin/notifications/rejected.html        | 4 ++--
 .../templates/wagtailadmin/notifications/submitted.html       | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/notifications/base_notification.html

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.html b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.html
index 169f4ba7cd7..0af5ec8412f 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been approved{% endblocktrans %}
+{% extends 'wagtailadmin/notifications/base_notification.html' %}{% block notification %}{% load i18n %}{% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been approved{% endblocktrans %}
 {% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been approved.{% endblocktrans %}
 
-{% trans "You can view the page here:" %} {{ revision.page.full_url }}
\ No newline at end of file
+{% trans "You can view the page here:" %} {{ revision.page.full_url }}{% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/base_notification.html b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/base_notification.html
new file mode 100644
index 00000000000..948fe186e4a
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/base_notification.html
@@ -0,0 +1,3 @@
+{% load i18n %}{% block notification %}{% endblock %}
+
+{% trans "Edit your notification preferences here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_account_notification_preferences' %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.html b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.html
index 34a49fae799..f4be249762e 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been rejected{% endblocktrans %}
+{% extends 'wagtailadmin/notifications/base_notification.html' %}{% block notification %}{% load i18n %}{% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been rejected{% endblocktrans %}
 {% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been rejected.{% endblocktrans %}
 
-{% trans "You can edit the page here:"%} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages_edit' revision.page.id %}
\ No newline at end of file
+{% trans "You can edit the page here:"%} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages_edit' revision.page.id %}{% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.html b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.html
index f3a9115e0b1..e048d73a537 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.html
@@ -1,5 +1,5 @@
-{% load i18n %}{% blocktrans with page=revision.page|safe %}The page "{{ page }}" has been submitted for moderation{% endblocktrans %}
+{% extends 'wagtailadmin/notifications/base_notification.html' %}{% block notification %}{% load i18n %}{% blocktrans with page=revision.page|safe %}The page "{{ page }}" has been submitted for moderation{% endblocktrans %}
 {% blocktrans with page=revision.page|safe %}The page "{{ page }}" has been submitted for moderation.{% endblocktrans %}
 
 {% trans "You can preview the page here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages_preview_for_moderation' revision.id %}
-{% trans "You can edit the page here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages_edit' revision.page.id %}
\ No newline at end of file
+{% trans "You can edit the page here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages_edit' revision.page.id %}{% endblock %}

From 64058c989ad6ccffac5085d09e6675bcab8976fd Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 20 Jun 2014 12:15:37 +0100
Subject: [PATCH 203/293] Add userprofile creation method tests

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

diff --git a/wagtail/wagtailusers/tests.py b/wagtail/wagtailusers/tests.py
index a360fe4686d..f9762e5c9c1 100644
--- a/wagtail/wagtailusers/tests.py
+++ b/wagtail/wagtailusers/tests.py
@@ -1,6 +1,6 @@
 from django.test import TestCase
 from django.core.urlresolvers import reverse
-from django.contrib.auth.models import User
+from wagtail.wagtailusers.models import User, UserProfile
 from wagtail.tests.utils import WagtailTestUtils
 
 
@@ -114,3 +114,19 @@ def test_edit_validation_error(self):
 
         # Should not redirect to index
         self.assertEqual(response.status_code, 200)
+
+
+class TestUserProfileCreation(TestCase, WagtailTestUtils):
+    def setUp(self):
+        # Create a user
+        self.test_user = User.objects.create_user(username='testuser', email='testuser@email.com', password='password')
+
+    def test_user_created_without_profile(self):
+        self.assertEqual(UserProfile.objects.filter(user=self.test_user).count(), 0)
+        with self.assertRaises(UserProfile.DoesNotExist):
+            self.test_user.userprofile
+
+    def test_user_profile_created_when_method_called(self):
+        self.assertIsInstance(self.test_user.get_profile(), UserProfile)
+        # and get it from the db too
+        self.assertEqual(UserProfile.objects.filter(user=self.test_user).count(), 1)

From 47b0ffc9e284cfa91745718cee7ee920a766159f Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 20 Jun 2014 12:16:01 +0100
Subject: [PATCH 204/293] Add tests for notification preferences view

---
 .../tests/test_account_management.py          | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/wagtail/wagtailadmin/tests/test_account_management.py b/wagtail/wagtailadmin/tests/test_account_management.py
index 566d687230b..56aa6356034 100644
--- a/wagtail/wagtailadmin/tests/test_account_management.py
+++ b/wagtail/wagtailadmin/tests/test_account_management.py
@@ -177,6 +177,41 @@ def test_change_password_view_post_password_mismatch(self):
         # Check that the password was not changed
         self.assertTrue(User.objects.get(username='test').check_password('password'))
 
+    def test_notification_preferences_view(self):
+        """
+        This tests that the notification preferences view responds with the
+        notification preferences page
+        """
+        # Get notification preferences page
+        response = self.client.get(reverse('wagtailadmin_account_notification_preferences'))
+
+        # Check that the user recieved a notification preferences page
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailadmin/account/notification_preferences.html')
+
+    def test_notification_preferences_view_post(self):
+        """
+        This posts to the notification preferences view and checks that the
+        user's profile is updated
+        """
+        # Post new values to the notification preferences page
+        post_data = {
+            'submitted_notifications': u'false',
+            'approved_notifications': u'false',
+            'rejected_notifications': u'true',
+        }
+        response = self.client.post(reverse('wagtailadmin_account_notification_preferences'), post_data)
+
+        # Check that the user was redirected to the account page
+        self.assertRedirects(response, reverse('wagtailadmin_account'))
+
+        profile = User.objects.get(username='test').get_profile()
+
+        # Check that the notification preferences are as submitted
+        self.assertFalse(profile.submitted_notifications)
+        self.assertFalse(profile.approved_notifications)
+        self.assertTrue(profile.rejected_notifications)
+
 
 class TestPasswordReset(TestCase, WagtailTestUtils):
     """

From c0a925b40dc067b4c0cb2cf0fa0ebef04655ec4a Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 20 Jun 2014 12:16:55 +0100
Subject: [PATCH 205/293] Add tests that notification preferences are
 respected; also move existing notification tests to the new test case

---
 .../wagtailadmin/tests/test_pages_views.py    | 143 ++++++++++++++++--
 1 file changed, 133 insertions(+), 10 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py
index 191c51a5039..a88dd46dcad 100644
--- a/wagtail/wagtailadmin/tests/test_pages_views.py
+++ b/wagtail/wagtailadmin/tests/test_pages_views.py
@@ -651,11 +651,6 @@ def test_approve_moderation_view(self):
         # Page must be live
         self.assertTrue(Page.objects.get(id=self.page.id).live)
 
-        # Submitter must recieve an approved email
-        self.assertEqual(len(mail.outbox), 1)
-        self.assertEqual(mail.outbox[0].to, ['submitter@email.com'])
-        self.assertEqual(mail.outbox[0].subject, 'The page "Hello world!" has been approved')
-
     def test_approve_moderation_view_bad_revision_id(self):
         """
         This tests that the approve moderation view handles invalid revision ids correctly
@@ -705,11 +700,6 @@ def test_reject_moderation_view(self):
         # Revision must no longer be submitted for moderation
         self.assertFalse(PageRevision.objects.get(id=self.revision.id).submitted_for_moderation)
 
-        # Submitter must recieve a rejected email
-        self.assertEqual(len(mail.outbox), 1)
-        self.assertEqual(mail.outbox[0].to, ['submitter@email.com'])
-        self.assertEqual(mail.outbox[0].subject, 'The page "Hello world!" has been rejected')
-
     def test_reject_moderation_view_bad_revision_id(self):
         """
         This tests that the reject moderation view handles invalid revision ids correctly
@@ -855,3 +845,136 @@ def test_not_prompted_for_page_type_when_only_one_choice(self):
         response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(self.business_subindex.id, )))
         # BusinessChild is the only valid subpage type of BusinessSubIndex, so redirect straight there
         self.assertRedirects(response, reverse('wagtailadmin_pages_create', args=('tests', 'businesschild', self.business_subindex.id)))
+
+
+class TestNotificationPreferences(TestCase, WagtailTestUtils):
+    def setUp(self):
+        # Find root page
+        self.root_page = Page.objects.get(id=2)
+
+        # Login
+        self.user = self.login()
+
+        # Create two moderator users for testing 'submitted' email
+        self.moderator = User.objects.create_superuser('moderator', 'moderator@email.com', 'password')
+        self.moderator2 = User.objects.create_superuser('moderator2', 'moderator2@email.com', 'password')
+
+        # Create a submitter for testing 'rejected' and 'approved' emails
+        self.submitter = User.objects.create_user('submitter', 'submitter@email.com', 'password')
+
+        # User profiles for moderator2 and the submitter
+        self.moderator2_profile = self.moderator2.get_profile()
+        self.submitter_profile = self.submitter.get_profile()
+
+        # Create a page and submit it for moderation
+        self.child_page = SimplePage(
+            title="Hello world!",
+            slug='hello-world',
+            live=False,
+        )
+        self.root_page.add_child(instance=self.child_page)
+
+        # POST data to edit the page
+        self.post_data = {
+            'title': "I've been edited!",
+            'content': "Some content",
+            'slug': 'hello-world',
+            'action-submit': "Submit",
+        }
+
+    def submit(self):
+        return self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), self.post_data)
+
+    def silent_submit(self):
+        """
+        Sets up the child_page as needing moderation, without making a request
+        """
+        self.child_page.save_revision(user=self.submitter, submitted_for_moderation=True)
+        self.revision = self.child_page.get_latest_revision()
+
+    def approve(self):
+        return self.client.post(reverse('wagtailadmin_pages_approve_moderation', args=(self.revision.id, )), {
+            'foo': "Must post something or the view won't see this as a POST request",
+        })
+
+    def reject(self):
+        return self.client.post(reverse('wagtailadmin_pages_reject_moderation', args=(self.revision.id, )), {
+            'foo': "Must post something or the view won't see this as a POST request",
+        })
+
+    def test_vanilla_profile(self):
+        # Check that the vanilla profile has rejected notifications on
+        self.assertEqual(self.submitter_profile.rejected_notifications, True)
+
+        # Check that the vanilla profile has approved notifications on
+        self.assertEqual(self.submitter_profile.approved_notifications, True)
+
+    def test_submit_notifications_sent(self):
+        # Submit
+        self.submit()
+
+        # Check that both the moderators got an email, and no others
+        self.assertEqual(len(mail.outbox), 1)
+        self.assertIn(self.moderator.email, mail.outbox[0].to)
+        self.assertIn(self.moderator2.email, mail.outbox[0].to)
+        self.assertEqual(len(mail.outbox[0].to), 2)
+
+    def test_submit_notification_preferences_respected(self):
+        # moderator2 doesn't want emails
+        self.moderator2_profile.submitted_notifications = False
+        self.moderator2_profile.save()
+
+        # Submit
+        self.submit()
+
+        # Check that only one moderator got an email
+        self.assertEqual(len(mail.outbox), 1)
+        self.assertEqual([self.moderator.email], mail.outbox[0].to)
+
+    def test_approved_notifications(self):
+        # Set up the page version
+        self.silent_submit()
+        # Approve
+        self.approve()
+
+        # Submitter must recieve an approved email
+        self.assertEqual(len(mail.outbox), 1)
+        self.assertEqual(mail.outbox[0].to, ['submitter@email.com'])
+        self.assertEqual(mail.outbox[0].subject, 'The page "Hello world!" has been approved')
+
+    def test_approved_notifications_preferences_respected(self):
+        # Submitter doesn't want 'approved' emails
+        self.submitter_profile.approved_notifications = False
+        self.submitter_profile.save()
+
+        # Set up the page version
+        self.silent_submit()
+        # Approve
+        self.approve()
+
+        # No email to send
+        self.assertEqual(len(mail.outbox), 0)
+
+    def test_rejected_notifications(self):
+        # Set up the page version
+        self.silent_submit()
+        # Reject
+        self.reject()
+
+        # Submitter must recieve a rejected email
+        self.assertEqual(len(mail.outbox), 1)
+        self.assertEqual(mail.outbox[0].to, ['submitter@email.com'])
+        self.assertEqual(mail.outbox[0].subject, 'The page "Hello world!" has been rejected')
+
+    def test_rejected_notification_preferences_respected(self):
+        # Submitter doesn't want 'rejected' emails
+        self.submitter_profile.rejected_notifications = False
+        self.submitter_profile.save()
+
+        # Set up the page version
+        self.silent_submit()
+        # Reject
+        self.reject()
+
+        # No email to send
+        self.assertEqual(len(mail.outbox), 0)

From 16f1a44969b8c9bd547285ecc9ac342e99fa3b42 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 20 Jun 2014 15:07:36 +0100
Subject: [PATCH 206/293] Add extra UserPagePermissionsProxy methods:     -
 can_edit_pages     - publishable_pages     - can_publish_pages

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

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 6b273e4b653..a97182c9abf 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -827,6 +827,41 @@ def editable_pages(self):
         else:
             return Page.objects.none()
 
+    def can_edit_pages(self):
+        """Return True if the user has permission to edit any pages"""
+        return True if self.editable_pages().count() else False
+
+    def publishable_pages(self):
+        """Return a queryset of the pages that this user has permission to publish"""
+        # Deal with the trivial cases first...
+        if not self.user.is_active:
+            return Page.objects.none()
+        if self.user.is_superuser:
+            return Page.objects.all()
+
+        # Translate each of the user's permission rules into a Q-expression
+        q_expressions = []
+        for perm in self.permissions:
+            if perm.permission_type == 'publish':
+                # user has publish permission on any subpage of perm.page
+                # (including perm.page itself) that is owned by them
+                q_expressions.append(
+                    Q(path__startswith=perm.page.path, owner=self.user)
+                )
+
+        if q_expressions:
+            all_rules = q_expressions[0]
+            for expr in q_expressions[1:]:
+                all_rules = all_rules | expr
+            return Page.objects.filter(all_rules)
+        else:
+            return Page.objects.none()
+
+    def can_publish_pages(self):
+        """Return True if the user has permission to publish any pages"""
+        return True if self.publishable_pages().count() else False
+
+
 class PagePermissionTester(object):
     def __init__(self, user_perms, page):
         self.user = user_perms.user

From 88b9f21287753096538ae7110161462952ce0f2f Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 20 Jun 2014 15:08:58 +0100
Subject: [PATCH 207/293] Add tests for new UserPagePermissionsProxy methods

---
 .../tests/test_page_permissions.py            | 60 +++++++++++++++++--
 1 file changed, 56 insertions(+), 4 deletions(-)

diff --git a/wagtail/wagtailcore/tests/test_page_permissions.py b/wagtail/wagtailcore/tests/test_page_permissions.py
index dbe35e39bb5..d650cdacc6a 100644
--- a/wagtail/wagtailcore/tests/test_page_permissions.py
+++ b/wagtail/wagtailcore/tests/test_page_permissions.py
@@ -176,13 +176,26 @@ def test_editable_pages_for_user_with_add_permission(self):
         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()
+        user_perms = UserPagePermissionsProxy(event_editor)
+        editable_pages = user_perms.editable_pages()
+        can_edit_pages = user_perms.can_edit_pages()
+        publishable_pages = user_perms.publishable_pages()
+        can_publish_pages = user_perms.can_publish_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())
 
+        self.assertTrue(can_edit_pages)
+
+        self.assertFalse(publishable_pages.filter(id=homepage.id).exists())
+        self.assertFalse(publishable_pages.filter(id=christmas_page.id).exists())
+        self.assertFalse(publishable_pages.filter(id=unpublished_event_page.id).exists())
+        self.assertFalse(publishable_pages.filter(id=someone_elses_event_page.id).exists())
+
+        self.assertFalse(can_publish_pages)
+
     def test_editable_pages_for_user_with_edit_permission(self):
         event_moderator = User.objects.get(username='eventmoderator')
         homepage = Page.objects.get(url_path='/home/')
@@ -190,13 +203,26 @@ def test_editable_pages_for_user_with_edit_permission(self):
         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()
+        user_perms = UserPagePermissionsProxy(event_moderator)
+        editable_pages = user_perms.editable_pages()
+        can_edit_pages = user_perms.can_edit_pages()
+        publishable_pages = user_perms.publishable_pages()
+        can_publish_pages = user_perms.can_publish_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())
 
+        self.assertTrue(can_edit_pages)
+
+        self.assertFalse(publishable_pages.filter(id=homepage.id).exists())
+        self.assertFalse(publishable_pages.filter(id=christmas_page.id).exists())
+        self.assertFalse(publishable_pages.filter(id=unpublished_event_page.id).exists())
+        self.assertTrue(publishable_pages.filter(id=someone_elses_event_page.id).exists())
+
+        self.assertTrue(can_publish_pages)
+
     def test_editable_pages_for_inactive_user(self):
         user = User.objects.get(username='inactiveuser')
         homepage = Page.objects.get(url_path='/home/')
@@ -204,13 +230,26 @@ def test_editable_pages_for_inactive_user(self):
         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()
+        user_perms = UserPagePermissionsProxy(user)
+        editable_pages = user_perms.editable_pages()
+        can_edit_pages = user_perms.can_edit_pages()
+        publishable_pages = user_perms.publishable_pages()
+        can_publish_pages = user_perms.can_publish_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())
 
+        self.assertFalse(can_edit_pages)
+
+        self.assertFalse(publishable_pages.filter(id=homepage.id).exists())
+        self.assertFalse(publishable_pages.filter(id=christmas_page.id).exists())
+        self.assertFalse(publishable_pages.filter(id=unpublished_event_page.id).exists())
+        self.assertFalse(publishable_pages.filter(id=someone_elses_event_page.id).exists())
+
+        self.assertFalse(can_publish_pages)
+
     def test_editable_pages_for_superuser(self):
         user = User.objects.get(username='superuser')
         homepage = Page.objects.get(url_path='/home/')
@@ -218,9 +257,22 @@ def test_editable_pages_for_superuser(self):
         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()
+        user_perms = UserPagePermissionsProxy(user)
+        editable_pages = user_perms.editable_pages()
+        can_edit_pages = user_perms.can_edit_pages()
+        publishable_pages = user_perms.publishable_pages()
+        can_publish_pages = user_perms.can_publish_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())
+
+        self.assertTrue(can_edit_pages)
+
+        self.assertTrue(publishable_pages.filter(id=homepage.id).exists())
+        self.assertTrue(publishable_pages.filter(id=christmas_page.id).exists())
+        self.assertTrue(publishable_pages.filter(id=unpublished_event_page.id).exists())
+        self.assertTrue(publishable_pages.filter(id=someone_elses_event_page.id).exists())
+
+        self.assertTrue(can_publish_pages)

From d12c9181f5933844316000a3aa837949b27a2690 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 20 Jun 2014 15:43:40 +0100
Subject: [PATCH 208/293] Filter notification preferences form fields according
 to user permissions

---
 wagtail/wagtailusers/forms.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/wagtail/wagtailusers/forms.py b/wagtail/wagtailusers/forms.py
index 057fac6bab4..afeef60bde2 100644
--- a/wagtail/wagtailusers/forms.py
+++ b/wagtail/wagtailusers/forms.py
@@ -3,6 +3,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from wagtail.wagtailusers.models import User, UserProfile
+from wagtail.wagtailcore.models import UserPagePermissionsProxy
 
 
 # extend Django's UserCreationForm with an 'is_superuser' field
@@ -132,6 +133,15 @@ def save(self, commit=True):
 
 
 class NotificationPreferencesForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super(NotificationPreferencesForm, self).__init__(*args, **kwargs)
+        user_perms = UserPagePermissionsProxy(self.instance.user)
+        if not user_perms.can_publish_pages():
+            del self.fields['submitted_notifications']
+        if not user_perms.can_edit_pages():
+            del self.fields['approved_notifications']
+            del self.fields['rejected_notifications']
+
     class Meta:
         model = UserProfile
         fields = ("submitted_notifications", "approved_notifications", "rejected_notifications")

From 0cb60d6e278f3d2706aba3859a976242a85cd6c4 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 20 Jun 2014 15:45:52 +0100
Subject: [PATCH 209/293] Add UserPagePermissionsProxy tests for a user who can
 access the admin only

---
 wagtail/tests/fixtures/test.json              | 28 +++++++++++++++++++
 .../tests/test_page_permissions.py            | 27 ++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/wagtail/tests/fixtures/test.json b/wagtail/tests/fixtures/test.json
index 11b82d9f169..3df2ec96436 100644
--- a/wagtail/tests/fixtures/test.json
+++ b/wagtail/tests/fixtures/test.json
@@ -265,6 +265,16 @@
         ]
     }
 },
+{
+    "pk": 6,
+    "model": "auth.group",
+    "fields": {
+        "name": "Admin non-editors",
+        "permissions": [
+            ["access_admin", "wagtailadmin", "admin"]
+        ]
+    }
+},
 {
     "pk": 1,
     "model": "wagtailcore.grouppagepermission",
@@ -400,6 +410,24 @@
         "email": "siteeditor@example.com"
     }
 },
+{
+    "pk": 6,
+    "model": "auth.user",
+    "fields": {
+        "username": "admin_only_user",
+        "first_name": "",
+        "last_name": "",
+        "is_active": true,
+        "is_superuser": false,
+        "is_staff": false,
+        "groups": [
+            ["Admin non-editors"]
+        ],
+        "user_permissions": [],
+        "password": "md5$seasalt$1e9bf2bf5606aa5c39852cc30f0f6f22",
+        "email": "admin_only_user@example.com"
+    }
+},
 
 {
     "pk": 1,
diff --git a/wagtail/wagtailcore/tests/test_page_permissions.py b/wagtail/wagtailcore/tests/test_page_permissions.py
index d650cdacc6a..11a981f8d41 100644
--- a/wagtail/wagtailcore/tests/test_page_permissions.py
+++ b/wagtail/wagtailcore/tests/test_page_permissions.py
@@ -276,3 +276,30 @@ def test_editable_pages_for_superuser(self):
         self.assertTrue(publishable_pages.filter(id=someone_elses_event_page.id).exists())
 
         self.assertTrue(can_publish_pages)
+
+    def test_editable_pages_for_non_editing_user(self):
+        user = User.objects.get(username='admin_only_user')
+        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/')
+
+        user_perms = UserPagePermissionsProxy(user)
+        editable_pages = user_perms.editable_pages()
+        can_edit_pages = user_perms.can_edit_pages()
+        publishable_pages = user_perms.publishable_pages()
+        can_publish_pages = user_perms.can_publish_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())
+
+        self.assertFalse(can_edit_pages)
+
+        self.assertFalse(publishable_pages.filter(id=homepage.id).exists())
+        self.assertFalse(publishable_pages.filter(id=christmas_page.id).exists())
+        self.assertFalse(publishable_pages.filter(id=unpublished_event_page.id).exists())
+        self.assertFalse(publishable_pages.filter(id=someone_elses_event_page.id).exists())
+
+        self.assertFalse(can_publish_pages)

From f910b1dbe8faa25f0c6ad1363aa43e6297afd0ad Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 20 Jun 2014 15:54:19 +0100
Subject: [PATCH 210/293] Only show the link to notification preferences if the
 user has preferences to set

---
 .../wagtailadmin/account/account.html          | 18 ++++++++++--------
 wagtail/wagtailadmin/views/account.py          | 10 ++++++++++
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html
index 21688ce37bf..f543d66dc0c 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html
@@ -28,15 +28,17 @@
                     </small>
                 </li>
             {% endif %}
-            <li class="row row-flush">
-                <div class="col6">
-                    <a href="{% url 'wagtailadmin_account_notification_preferences' %}" class="button button-primary">{% trans "Notification preferences" %}</a>
-                </div>
+            {% if show_notification_preferences %}
+                <li class="row row-flush">
+                    <div class="col6">
+                        <a href="{% url 'wagtailadmin_account_notification_preferences' %}" class="button button-primary">{% trans "Notification preferences" %}</a>
+                    </div>
 
-                <small class="col6">
-                    {% trans "Choose which email notifications to receive." %}
-                </small>
-            </li>
+                    <small class="col6">
+                        {% trans "Choose which email notifications to receive." %}
+                    </small>
+                </li>
+            {% endif %}
         </ul>
     </div>
 {% endblock %}
diff --git a/wagtail/wagtailadmin/views/account.py b/wagtail/wagtailadmin/views/account.py
index d5ab71bd6f5..c5cf6ffae8b 100644
--- a/wagtail/wagtailadmin/views/account.py
+++ b/wagtail/wagtailadmin/views/account.py
@@ -10,12 +10,17 @@
 
 from wagtail.wagtailadmin import forms
 from wagtail.wagtailusers.forms import NotificationPreferencesForm
+from wagtail.wagtailcore.models import UserPagePermissionsProxy
 
 
 @permission_required('wagtailadmin.access_admin')
 def account(request):
+    user_perms = UserPagePermissionsProxy(request.user)
+    show_notification_preferences = user_perms.can_edit_pages() or user_perms.can_publish_pages()
+
     return render(request, 'wagtailadmin/account/account.html', {
         'show_change_password': getattr(settings, 'WAGTAIL_PASSWORD_MANAGEMENT_ENABLED', True) and request.user.has_usable_password(),
+        'show_notification_preferences': show_notification_preferences
     })
 
 
@@ -56,6 +61,11 @@ def notification_preferences(request):
     else:
         form = NotificationPreferencesForm(instance=request.user.get_profile())
 
+    # quick-and-dirty catch-all in case the form has been rendered with no
+    # fields, as the user has no customisable permissions
+    if not form.fields:
+        return redirect('wagtailadmin_account')
+
     return render(request, 'wagtailadmin/account/notification_preferences.html', {
         'form': form,
     })

From dd7344d65d13881aa0d923f9fa0cacbaf3db1cfe Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Mon, 23 Jun 2014 10:51:35 +0100
Subject: [PATCH 211/293] Add tests for notification preferences views' being
 filtered for less privileged users

---
 .../tests/test_account_management.py          | 58 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/tests/test_account_management.py b/wagtail/wagtailadmin/tests/test_account_management.py
index 56aa6356034..e8f46a25b70 100644
--- a/wagtail/wagtailadmin/tests/test_account_management.py
+++ b/wagtail/wagtailadmin/tests/test_account_management.py
@@ -1,7 +1,7 @@
 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.models import User, Group, Permission
 from django.contrib.auth.tokens import PasswordResetTokenGenerator
 from django.core import mail
 
@@ -213,6 +213,62 @@ def test_notification_preferences_view_post(self):
         self.assertTrue(profile.rejected_notifications)
 
 
+class TestAccountManagementForNonModerator(TestCase, WagtailTestUtils):
+    """
+    Tests of reduced-functionality for editors
+    """
+    def setUp(self):
+        # Create a non-moderator user
+        self.submitter = User.objects.create_user('submitter', 'submitter@example.com', 'password')
+        self.submitter.groups.add(Group.objects.get(name='Editors'))
+
+        self.client.login(username=self.submitter.username, password='password')
+
+    def test_notification_preferences_form_is_reduced_for_non_moderators(self):
+        """
+        This tests that a user without publish permissions is not shown the
+        notification preference for 'submitted' items
+        """
+        response = self.client.get(reverse('wagtailadmin_account_notification_preferences'))
+        self.assertIn('approved_notifications', response.context['form'].fields.keys())
+        self.assertIn('rejected_notifications', response.context['form'].fields.keys())
+        self.assertNotIn('submitted_notifications', response.context['form'].fields.keys())
+
+
+class TestAccountManagementForAdminOnlyUser(TestCase, WagtailTestUtils):
+    """
+    Tests for users with no edit/publish permissions at all
+    """
+    def setUp(self):
+        # Create a non-moderator user
+        admin_only_group = Group.objects.create(name='Admin Only')
+        admin_only_group.permissions.add(Permission.objects.get(codename='access_admin'))
+
+        self.admin_only_user = User.objects.create_user('admin_only_user', 'admin_only_user@example.com', 'password')
+        self.admin_only_user.groups.add(admin_only_group)
+
+        self.client.login(username=self.admin_only_user.username, password='password')
+
+    def test_notification_preferences_view_redirects_for_admin_only_users(self):
+        """
+        Test that the user is not shown the notification preferences view but instead
+        redirected to the account page
+        """
+        response = self.client.get(reverse('wagtailadmin_account_notification_preferences'))
+        self.assertRedirects(response, reverse('wagtailadmin_account'))
+
+    def test_notification_preferences_link_not_shown_for_admin_only_users(self):
+        """
+        Test that the user is not even shown the link to the notification
+        preferences view
+        """
+        response = self.client.get(reverse('wagtailadmin_account'))
+        self.assertEqual(response.context['show_notification_preferences'], False)
+        self.assertNotContains(response, reverse('wagtailadmin_account_notification_preferences'))
+        # safety check that checking for absence/presence of urls works
+        self.assertContains(response, reverse('wagtailadmin_home'))
+
+
 class TestPasswordReset(TestCase, WagtailTestUtils):
     """
     This tests that the password reset is working

From 2801c913dc3b64d41cfd5ed70ebab270e434f9df Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 23 Jun 2014 14:22:45 +0100
Subject: [PATCH 212/293] Docs update for #342 merge

---
 docs/wagtail_search.rst | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/docs/wagtail_search.rst b/docs/wagtail_search.rst
index 3d8ea26b234..1fa2c6525d9 100644
--- a/docs/wagtail_search.rst
+++ b/docs/wagtail_search.rst
@@ -220,17 +220,14 @@ The default DB search backend uses Django's ``__icontains`` filter.
 
 Elasticsearch Backend
 `````````````````````
-Prerequisites are the Elasticsearch service itself and, via pip, the `elasticutils`_ and `pyelasticsearch`_ packages:
+Prerequisites are the Elasticsearch service itself and, via pip, the `elasticsearch-py`_ package:
 
 .. code-block:: guess
 
-  pip install elasticutils==0.8.2 pyelasticsearch
+  pip install elasticsearch
 
 .. note::
-    ElasticUtils 0.9+ is not supported.
-
-.. note::
-    The dependency on elasticutils and pyelasticsearch is scheduled to be replaced by a dependency on `elasticsearch-py`_.
+  If you are using Elasticsearch < 1.0, install elasticsearch-py version 0.4.5: ```pip install elasticsearch==0.4.5```
 
 The backend is configured in settings:
 
@@ -246,7 +243,7 @@ The backend is configured in settings:
       }
   }
 
-Other than ``BACKEND`` the keys are optional and default to the values shown. ``FORCE_NEW`` is used by elasticutils. In addition, any other keys are passed directly to the Elasticsearch constructor as case-sensitive keyword arguments (e.g. ``'max_retries': 1``).
+Other than ``BACKEND`` the keys are optional and default to the values shown. ``FORCE_NEW`` is used by elasticsearch-py. In addition, any other keys are passed directly to the Elasticsearch constructor as case-sensitive keyword arguments (e.g. ``'max_retries': 1``).
 
 If you prefer not to run an Elasticsearch server in development or production, there are many hosted services available, including `Searchly`_, who offer a free account suitable for testing and development. To use Searchly:
 
@@ -256,8 +253,6 @@ If you prefer not to run an Elasticsearch server in development or production, t
 -  Configure ``URLS`` and ``INDEX`` in the Elasticsearch entry in ``WAGTAILSEARCH_BACKENDS``
 -  Run ``./manage.py update_index``
 
-.. _elasticutils: http://elasticutils.readthedocs.org
-.. _pyelasticsearch: http://pyelasticsearch.readthedocs.org
 .. _elasticsearch-py: http://elasticsearch-py.readthedocs.org
 .. _Searchly: http://www.searchly.com/
 .. _dashboard.searchly.com/users/sign\_up: https://dashboard.searchly.com/users/sign_up

From 765657329e529f828e0bbf0185c162570301a539 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 23 Jun 2014 14:28:36 +0100
Subject: [PATCH 213/293] Changelog entry for #342

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

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e5cda8b44c4..ca58949b4b5 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ Changelog
 
 0.4 (xx.xx.20xx)
 ~~~~~~~~~~~~~~~~
+ * ElasticUtils/pyelasticsearch swapped for elasticsearch-py
  * Added 'original' as a resizing rule supported by the 'image' tag
  * Hallo.js updated to version 1.0.4
  * Snippets are now ordered alphabetically

From 64eed9684173c9e1be39883061d595de3bb2a69f Mon Sep 17 00:00:00 2001
From: Robert Clark <robert@bablmedia.com>
Date: Mon, 23 Jun 2014 11:40:25 -0400
Subject: [PATCH 214/293] moved tests to page model instead of queryset

---
 wagtail/wagtailcore/tests/test_page_model.py  | 22 +++++++++++++++++++
 .../wagtailcore/tests/test_page_queryset.py   | 18 ---------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py
index 1bae57952ce..dfc45d72a44 100644
--- a/wagtail/wagtailcore/tests/test_page_model.py
+++ b/wagtail/wagtailcore/tests/test_page_model.py
@@ -224,3 +224,25 @@ def test_move_page(self):
         christmas = events_index.get_children().get(slug='christmas')
         self.assertEqual(christmas.depth, 5)
         self.assertEqual(christmas.url_path, '/home/about-us/events/christmas/')
+
+
+class TestPagePagination(TestCase):
+    fixtures = ['test.json']
+
+    def test_published_next(self):
+        events_index = Page.objects.get(url_path='/home/events/')
+        current_page = Page.objects.descendant_of(events_index).live().first()
+
+        # All pages must be live
+        while current_page:
+            self.assertTrue(current_page.live)
+            current_page = current_page.get_next_siblings().live().first()
+
+    def test_published_prev(self):
+        events_index = Page.objects.get(url_path='/home/events/')
+        current_page = Page.objects.descendant_of(events_index).live().last()
+
+        # All pages must be live
+        while current_page:
+            self.assertTrue(current_page.live)
+            current_page = current_page.get_prev_siblings().live().first()
diff --git a/wagtail/wagtailcore/tests/test_page_queryset.py b/wagtail/wagtailcore/tests/test_page_queryset.py
index 020d98d153a..06f2c3e21c3 100644
--- a/wagtail/wagtailcore/tests/test_page_queryset.py
+++ b/wagtail/wagtailcore/tests/test_page_queryset.py
@@ -254,21 +254,3 @@ def test_not_type(self):
         # 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_published_next(self):
-        events_index = Page.objects.get(url_path='/home/events/')
-        current_page = Page.objects.descendant_of(events_index).live().first()
-
-        # All pages must be live
-        while current_page:
-            self.assertTrue(current_page.live)
-            current_page = current_page.get_next_siblings().live().first()
-
-    def test_published_prev(self):
-        events_index = Page.objects.get(url_path='/home/events/')
-        current_page = Page.objects.descendant_of(events_index).live().last()
-
-        # All pages must be live
-        while current_page:
-            self.assertTrue(current_page.live)
-            current_page = current_page.get_prev_siblings().live().first()

From 66dce8df0349fe7bda8a838eed2d3791993ce627 Mon Sep 17 00:00:00 2001
From: Tim Heap <tim@timheap.me>
Date: Tue, 24 Jun 2014 17:12:10 +1000
Subject: [PATCH 215/293] Make the 'X Pages/Images/Documents' stats links

They link to the relevant sections of the admin, allowing for quick
jumping around.
---
 .../static/wagtailadmin/scss/layouts/home.scss            | 7 +++++++
 .../templates/wagtailadmin/home/site_summary.html         | 8 +++++++-
 wagtail/wagtailadmin/views/home.py                        | 3 ++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/home.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/home.scss
index 40711ef7b30..f1e2ee77923 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/home.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/home.scss
@@ -46,6 +46,13 @@ header{
             }
         }
 
+        a{
+            position:relative;
+            display:block;
+            width:100%;
+            height:100%;
+        }
+
         span{
             font-family:Bitter, Georgia, serif;
             display:block;
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/site_summary.html b/wagtail/wagtailadmin/templates/wagtailadmin/home/site_summary.html
index 8a03b4e042e..225568fab32 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/home/site_summary.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/home/site_summary.html
@@ -3,25 +3,31 @@
     <h2 class="visuallyhidden">{% trans "Site summary" %}</h2>
     <ul class="stats">
         <li class="icon icon-doc-empty-inverse">
+            <a href="{% url 'wagtailadmin_explore' root_page.pk %}">
             {% blocktrans count counter=total_pages %}
                 <span>{{ total_pages }}</span> Page
             {% plural %}
                 <span>{{ total_pages }}</span> Pages
             {% endblocktrans %}
+            </a>
         </li>
         <li class="icon icon-image">
+            <a href="{% url 'wagtailimages_index' %}">
             {% blocktrans count counter=total_images %}
                 <span>{{ total_images }}</span> Image
             {% plural %}
                 <span>{{ total_images }}</span> Images
             {% endblocktrans %}
+            </a>
         </li>
         <li class="icon icon-doc-full-inverse">
+            <a href="{% url 'wagtaildocs_index' %}">
             {% blocktrans count counter=total_docs %}
                 <span>{{ total_docs }}</span> Document
             {% plural %}
                 <span>{{ total_docs }}</span> Documents
             {% endblocktrans %}
+            </a>
         </li>
     </ul>
-</section>
\ No newline at end of file
+</section>
diff --git a/wagtail/wagtailadmin/views/home.py b/wagtail/wagtailadmin/views/home.py
index 24800eefc74..77177b6522d 100644
--- a/wagtail/wagtailadmin/views/home.py
+++ b/wagtail/wagtailadmin/views/home.py
@@ -7,7 +7,7 @@
 from wagtail.wagtailadmin import hooks
 from wagtail.wagtailadmin.forms import SearchForm
 
-from wagtail.wagtailcore.models import Page, PageRevision, UserPagePermissionsProxy
+from wagtail.wagtailcore.models import Site, Page, PageRevision, UserPagePermissionsProxy
 
 from wagtail.wagtaildocs.models import Document
 
@@ -27,6 +27,7 @@ def render(self):
             'total_pages': Page.objects.count() - 1,  # subtract 1 because the root node is not a real page
             'total_images': get_image_model().objects.count(),
             'total_docs': Document.objects.count(),
+            'root_page': Site.find_for_request(self.request).root_page,
             'search_form': SearchForm(),
         }, RequestContext(self.request))
 

From d25b6fb6c05a60de7f474201d794fbfcf8fbe135 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 24 Jun 2014 09:12:08 +0100
Subject: [PATCH 216/293] Put prefetch_related back

---
 .../wagtailsearch/backends/elasticsearch.py   | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 29141542a54..5561a3ceeac 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -13,7 +13,6 @@
 from wagtail.wagtailsearch.indexed import Indexed
 
 
-
 class ElasticSearchQuery(object):
     def __init__(self, model, query_string, fields=None, filters={}):
         self.model = model
@@ -113,9 +112,10 @@ def __repr__(self):
 
 
 class ElasticSearchResults(object):
-    def __init__(self, backend, query):
+    def __init__(self, backend, query, prefetch_related=None):
         self.backend = backend
         self.query = query
+        self.prefetch_related = prefetch_related
         self.start = 0
         self.stop = None
         self._results_cache = None
@@ -136,7 +136,7 @@ def _set_limits(self, start=None, stop=None):
 
     def _clone(self):
         klass = self.__class__
-        new = klass(self.backend, self.query)
+        new = klass(self.backend, self.query, prefetch_related=self.prefetch_related)
         new.start = self.start
         new.stop = self.stop
         return new
@@ -167,8 +167,15 @@ def _do_search(self):
         # Initialise results dictionary
         results = dict((str(pk), None) for pk in pks)
 
-        # Find objects in database and add them to dict
+        # Get queryset
         queryset = self.query.model.objects.filter(pk__in=pks)
+
+        # Add prefetch related
+        if self.prefetch_related:
+            for prefetch in self.prefetch_related:
+                queryset = queryset.prefetch_related(prefetch)
+
+        # Find objects in database and add them to dict
         for obj in queryset:
             results[str(obj.pk)] = obj
 
@@ -417,8 +424,5 @@ def search(self, query_string, model, fields=None, filters={}, prefetch_related=
         if not query_string:
             return []
 
-        # Give deprecation warning if prefetch_related was used
-        warnings.warn("prefetch_related on search queries is no longer implemented. ", DeprecationWarning)
-
         # Return search results
-        return ElasticSearchResults(self, ElasticSearchQuery(model, query_string, fields=fields, filters=filters))
+        return ElasticSearchResults(self, ElasticSearchQuery(model, query_string, fields=fields, filters=filters), prefetch_related=prefetch_related)

From 3c1883bca0d4e60e9b60213f01dc405b63948035 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 24 Jun 2014 09:42:31 +0100
Subject: [PATCH 217/293] Put prefetch related back in database backend

---
 wagtail/wagtailsearch/backends/db.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/db.py b/wagtail/wagtailsearch/backends/db.py
index 0531bc3aada..08fdaf048ce 100644
--- a/wagtail/wagtailsearch/backends/db.py
+++ b/wagtail/wagtailsearch/backends/db.py
@@ -66,7 +66,9 @@ def search(self, query_string, model, fields=None, filters={}, prefetch_related=
         # Distinct
         query = query.distinct()
 
-        # Give deprecation warning if prefetch_related was used
-        warnings.warn("prefetch_related on search queries is no longer implemented. ", DeprecationWarning)
+        # Prefetch related
+        if prefetch_related:
+            for prefetch in prefetch_related:
+                query = query.prefetch_related(prefetch)
 
         return query
\ No newline at end of file

From bdbcf3cd99d5b44ca275e38da5e6bab0ab181609 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 24 Jun 2014 09:53:41 +0100
Subject: [PATCH 218/293] Updated deprecation warning messages of moved
 template tags libraries

---
 wagtail/wagtailcore/templatetags/pageurl.py         | 4 ++--
 wagtail/wagtailcore/templatetags/rich_text.py       | 4 ++--
 wagtail/wagtailembeds/templatetags/embed_filters.py | 4 ++--
 wagtail/wagtailimages/templatetags/image_tags.py    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wagtail/wagtailcore/templatetags/pageurl.py b/wagtail/wagtailcore/templatetags/pageurl.py
index fe64a302f6a..b31756c308b 100644
--- a/wagtail/wagtailcore/templatetags/pageurl.py
+++ b/wagtail/wagtailcore/templatetags/pageurl.py
@@ -1,8 +1,8 @@
 import warnings
 
 warnings.warn(
-    "The pageurl tags has been renamed. "
-    "Use wagtailcore_tags instead.", DeprecationWarning)
+    "The pageurl tag library has been moved to wagtailcore_tags. "
+    "Use {% load wagtailcore_tags %} instead.", DeprecationWarning)
 
 
 from wagtail.wagtailcore.templatetags.wagtailcore_tags import register
diff --git a/wagtail/wagtailcore/templatetags/rich_text.py b/wagtail/wagtailcore/templatetags/rich_text.py
index 94c2d176c1e..ed8ac6f0f00 100644
--- a/wagtail/wagtailcore/templatetags/rich_text.py
+++ b/wagtail/wagtailcore/templatetags/rich_text.py
@@ -1,8 +1,8 @@
 import warnings
 
 warnings.warn(
-    "The rich_text tags has been renamed. "
-    "Use wagtailcore_tags instead.", DeprecationWarning)
+    "The rich_text tag library has been moved to wagtailcore_tags. "
+    "Use {% load wagtailcore_tags %} instead.", DeprecationWarning)
 
 
 from wagtail.wagtailcore.templatetags.wagtailcore_tags import register
diff --git a/wagtail/wagtailembeds/templatetags/embed_filters.py b/wagtail/wagtailembeds/templatetags/embed_filters.py
index 25326fec607..7d3500e5815 100644
--- a/wagtail/wagtailembeds/templatetags/embed_filters.py
+++ b/wagtail/wagtailembeds/templatetags/embed_filters.py
@@ -1,8 +1,8 @@
 import warnings
 
 warnings.warn(
-    "The embed_filters tags has been renamed. "
-    "Use wagtailembeds_tags instead.", DeprecationWarning)
+    "The embed_filters tag library has been moved to wagtailcore_tags. "
+    "Use {% load wagtailembeds_tags %} instead.", DeprecationWarning)
 
 
 from wagtail.wagtailembeds.templatetags.wagtailembeds_tags import register
diff --git a/wagtail/wagtailimages/templatetags/image_tags.py b/wagtail/wagtailimages/templatetags/image_tags.py
index 7eba192d463..9a96356c9a2 100644
--- a/wagtail/wagtailimages/templatetags/image_tags.py
+++ b/wagtail/wagtailimages/templatetags/image_tags.py
@@ -1,8 +1,8 @@
 import warnings
 
 warnings.warn(
-    "The image_tags tags has been renamed. "
-    "Use wagtailimages_tags instead.", DeprecationWarning)
+    "The image_tags tag library has been moved to wagtailcore_tags. "
+    "Use {% load wagtailimages_tags %} instead.", DeprecationWarning)
 
 
 from wagtail.wagtailimages.templatetags.wagtailimages_tags import register

From 1a986bab0d9cc324c73c37f6ce4639157e342b97 Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Tue, 24 Jun 2014 10:26:44 +0100
Subject: [PATCH 219/293] Add unit tests for rich_text.py

---
 wagtail/tests/fixtures/test.json            |  18 ++
 wagtail/wagtailcore/tests/test_rich_text.py | 262 ++++++++++++++++++++
 wagtail/wagtailcore/tests/tests.py          |  47 ++--
 wagtail/wagtailembeds/format.py             |   1 -
 4 files changed, 303 insertions(+), 25 deletions(-)
 create mode 100644 wagtail/wagtailcore/tests/test_rich_text.py

diff --git a/wagtail/tests/fixtures/test.json b/wagtail/tests/fixtures/test.json
index 11b82d9f169..bd4807e07b8 100644
--- a/wagtail/tests/fixtures/test.json
+++ b/wagtail/tests/fixtures/test.json
@@ -418,5 +418,23 @@
         "page": 8,
         "submit_time": "2014-01-01T12:00:00.000Z"
     }
+},
+{
+    "pk": 1,
+    "model": "wagtaildocs.Document",
+    "fields": {
+        "title": "test document",
+        "created_at": "2014-01-01T12:00:00.000Z"
+    }
+},
+{
+    "pk": 1,
+    "model": "wagtailimages.Image",
+    "fields": {
+        "title": "test image",
+        "created_at": "2014-01-01T12:00:00.000Z",
+        "width": 0,
+        "height": 0
+    }
 }
 ]
diff --git a/wagtail/wagtailcore/tests/test_rich_text.py b/wagtail/wagtailcore/tests/test_rich_text.py
new file mode 100644
index 00000000000..9c98c6d3f09
--- /dev/null
+++ b/wagtail/wagtailcore/tests/test_rich_text.py
@@ -0,0 +1,262 @@
+from mock import patch
+
+from django.test import TestCase
+
+from wagtail.wagtailcore.rich_text import (
+    ImageEmbedHandler,
+    MediaEmbedHandler,
+    PageLinkHandler,
+    DocumentLinkHandler,
+    DbWhitelister,
+    extract_attrs,
+    expand_db_html
+)
+from bs4 import BeautifulSoup
+
+
+class TestImageEmbedHandler(TestCase):
+    fixtures = ['wagtail/tests/fixtures/test.json']
+
+    def test_get_db_attributes(self):
+        soup = BeautifulSoup(
+            '<b data-id="test-id" data-format="test-format" data-alt="test-alt">foo</b>'
+        )
+        tag = soup.b
+        result = ImageEmbedHandler.get_db_attributes(tag)
+        self.assertEqual(result,
+                         {'alt': 'test-alt',
+                          'id': 'test-id',
+                          'format': 'test-format'})
+
+    def test_expand_db_attributes_page_does_not_exist(self):
+        result = ImageEmbedHandler.expand_db_attributes(
+            {'id': 0},
+            False
+        )
+        self.assertEqual(result, '<img>')
+
+    @patch('wagtail.wagtailimages.models.Image')
+    @patch('django.core.files.File')
+    def test_expand_db_attributes_not_for_editor(self, mock_file, mock_image):
+        result = ImageEmbedHandler.expand_db_attributes(
+            {'id': 1,
+             'alt': 'test-alt',
+             'format': 'left'},
+            False
+        )
+        self.assertIn('<img class="richtext-image left"', result)
+
+    @patch('wagtail.wagtailimages.models.Image')
+    @patch('django.core.files.File')
+    def test_expand_db_attributes_for_editor(self, mock_file, mock_image):
+        result = ImageEmbedHandler.expand_db_attributes(
+            {'id': 1,
+             'alt': 'test-alt',
+             'format': 'left'},
+            True
+        )
+        self.assertIn('<img data-embedtype="image" data-id="1" data-format="left" data-alt="test-alt" class="richtext-image left"', result)
+
+    @patch('wagtail.wagtailimages.models.Image')
+    @patch('django.core.files.File')
+    def test_expand_db_attributes_for_editor_throws_exception(self, mock_file, mock_image):
+        result = ImageEmbedHandler.expand_db_attributes(
+            {'id': 1,
+             'format': 'left'},
+            True
+        )
+        self.assertEqual(result, '')
+
+
+class TestMediaEmbedHandler(TestCase):
+    def test_get_db_attributes(self):
+        soup = BeautifulSoup(
+            '<b data-url="test-url">foo</b>'
+        )
+        tag = soup.b
+        result = MediaEmbedHandler.get_db_attributes(tag)
+        self.assertEqual(result,
+                         {'url': 'test-url'})
+
+    @patch('wagtail.wagtailembeds.embeds.oembed')
+    def test_expand_db_attributes_for_editor(self, oembed):
+        oembed.return_value = {
+            'title': 'test title',
+            'author_name': 'test author name',
+            'provider_name': 'test provider name',
+            'type': 'test type',
+            'thumbnail_url': 'test thumbnail url',
+            'width': 'test width',
+            'height': 'test height',
+            'html': 'test html'
+        }
+        result = MediaEmbedHandler.expand_db_attributes(
+            {'url': 'http://www.youtube.com/watch/'},
+            True
+        )
+        self.assertIn('<div class="embed-placeholder" contenteditable="false" data-embedtype="media" data-url="http://www.youtube.com/watch/">', result)
+        self.assertIn('<h3>test title</h3>', result)
+        self.assertIn('<p>URL: http://www.youtube.com/watch/</p>', result)
+        self.assertIn('<p>Provider: test provider name</p>', result)
+        self.assertIn('<p>Author: test author name</p>', result)
+        self.assertIn('<img src="test thumbnail url" alt="test title">', result)
+
+    @patch('wagtail.wagtailembeds.embeds.oembed')
+    def test_expand_db_attributes_not_for_editor(self, oembed):
+        oembed.return_value = {
+            'title': 'test title',
+            'author_name': 'test author name',
+            'provider_name': 'test provider name',
+            'type': 'test type',
+            'thumbnail_url': 'test thumbnail url',
+            'width': 'test width',
+            'height': 'test height',
+            'html': 'test html'
+        }
+        result = MediaEmbedHandler.expand_db_attributes(
+            {'url': 'http://www.youtube.com/watch/'},
+            False
+        )
+        self.assertIn('test html', result)
+
+
+class TestPageLinkHandler(TestCase):
+    fixtures = ['wagtail/tests/fixtures/test.json']
+
+    def test_get_db_attributes(self):
+        soup = BeautifulSoup(
+            '<a data-id="test-id">foo</a>'
+        )
+        tag = soup.a
+        result = PageLinkHandler.get_db_attributes(tag)
+        self.assertEqual(result,
+                         {'id': 'test-id'})
+
+    def test_expand_db_attributes_page_does_not_exist(self):
+        result = PageLinkHandler.expand_db_attributes(
+            {'id': 0},
+            False
+        )
+        self.assertEqual(result, '<a>')
+
+    def test_expand_db_attributes_for_editor(self):
+        result = PageLinkHandler.expand_db_attributes(
+            {'id': 1},
+            True
+        )
+        self.assertEqual(result,
+                         '<a data-linktype="page" data-id="1" href="None">')
+
+    def test_expand_db_attributes_not_for_editor(self):
+        result = PageLinkHandler.expand_db_attributes(
+            {'id': 1},
+            False
+        )
+        self.assertEqual(result, '<a href="None">')
+
+
+class TestDocumentLinkHandler(TestCase):
+    fixtures = ['wagtail/tests/fixtures/test.json']
+
+    def test_get_db_attributes(self):
+        soup = BeautifulSoup(
+            '<a data-id="test-id">foo</a>'
+        )
+        tag = soup.a
+        result = DocumentLinkHandler.get_db_attributes(tag)
+        self.assertEqual(result,
+                         {'id': 'test-id'})
+
+    def test_expand_db_attributes_document_does_not_exist(self):
+        result = DocumentLinkHandler.expand_db_attributes(
+            {'id': 0},
+            False
+        )
+        self.assertEqual(result, '<a>')
+
+    def test_expand_db_attributes_for_editor(self):
+        result = DocumentLinkHandler.expand_db_attributes(
+            {'id': 1},
+            True
+        )
+        self.assertEqual(result,
+                         '<a data-linktype="document" data-id="1" href="/documents/1/">')
+
+    def test_expand_db_attributes_not_for_editor(self):
+        result = DocumentLinkHandler.expand_db_attributes(
+            {'id': 1},
+            False
+        )
+        self.assertEqual(result,
+                         '<a href="/documents/1/">')
+
+
+class TestDbWhiteLister(TestCase):
+    def test_clean_tag_node_div(self):
+        soup = BeautifulSoup(
+            '<div>foo</div>'
+        )
+        tag = soup.div
+        self.assertEqual(tag.name, 'div')
+        DbWhitelister.clean_tag_node(soup, tag)
+        self.assertEqual(tag.name, 'p')
+
+    def test_clean_tag_node_with_data_embedtype(self):
+        soup = BeautifulSoup(
+            '<p><a data-embedtype="image" data-id=1 data-format="left" data-alt="bar" irrelevant="baz">foo</a></p>'
+        )
+        tag = soup.p
+        DbWhitelister.clean_tag_node(soup, tag)
+        self.assertEqual(str(tag),
+                         '<p><embed alt="bar" embedtype="image" format="left" id="1"/></p>')
+
+    def test_clean_tag_node_with_data_linktype(self):
+        soup = BeautifulSoup(
+            '<a data-linktype="document" data-id="1" irrelevant="baz">foo</a>'
+        )
+        tag = soup.a
+        DbWhitelister.clean_tag_node(soup, tag)
+        self.assertEqual(str(tag), '<a id="1" linktype="document">foo</a>')
+
+    def test_clean_tag_node(self):
+        soup = BeautifulSoup(
+            '<a irrelevant="baz">foo</a>'
+        )
+        tag = soup.a
+        DbWhitelister.clean_tag_node(soup, tag)
+        self.assertEqual(str(tag), '<a>foo</a>')
+
+
+class TestExtractAttrs(TestCase):
+    def test_extract_attr(self):
+        html = '<a foo="bar" baz="quux">snowman</a>'
+        result = extract_attrs(html)
+        self.assertEqual(result, {'foo': 'bar', 'baz': 'quux'})
+
+
+class TestExpandDbHtml(TestCase):
+    def test_expand_db_html_with_linktype(self):
+        html = '<a id="1" linktype="document">foo</a>'
+        result = expand_db_html(html)
+        self.assertEqual(result, '<a>foo</a>')
+
+    def test_expand_db_html_no_linktype(self):
+        html = '<a id="1">foo</a>'
+        result = expand_db_html(html)
+        self.assertEqual(result, '<a id="1">foo</a>')
+
+    @patch('wagtail.wagtailembeds.embeds.oembed')
+    def test_expand_db_html_with_embed(self, oembed):
+        oembed.return_value = {
+            'title': 'test title',
+            'author_name': 'test author name',
+            'provider_name': 'test provider name',
+            'type': 'test type',
+            'thumbnail_url': 'test thumbnail url',
+            'width': 'test width',
+            'height': 'test height',
+            'html': 'test html'
+        }
+        html = '<embed embedtype="media" url="http://www.youtube.com/watch" />'
+        result = expand_db_html(html)
+        self.assertIn('test html', result)
diff --git a/wagtail/wagtailcore/tests/tests.py b/wagtail/wagtailcore/tests/tests.py
index d10474bbaf9..d7d9a24f97c 100644
--- a/wagtail/wagtailcore/tests/tests.py
+++ b/wagtail/wagtailcore/tests/tests.py
@@ -1,12 +1,7 @@
-from StringIO import StringIO
+from django.test import TestCase
 
-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
+from wagtail.wagtailcore.models import Page, Site
+from wagtail.tests.models import SimplePage
 
 
 class TestPageUrlTags(TestCase):
@@ -15,25 +10,28 @@ class TestPageUrlTags(TestCase):
     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>')
+        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>')
+        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.
+    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.
+    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
+    Fix: d6cce69a397d08d5ee81a8cbc1977ab2c9db2682 Discussion:
+    https://github.com/torchbox/wagtail/issues/7
     """
 
     fixtures = ['test.json']
@@ -67,15 +65,16 @@ def test_issue7(self):
 
 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.
+    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.
+    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
+    Fix: d6cce69a397d08d5ee81a8cbc1977ab2c9db2682 Discussion:
+    https://github.com/torchbox/wagtail/issues/157
     """
 
     fixtures = ['test.json']
diff --git a/wagtail/wagtailembeds/format.py b/wagtail/wagtailembeds/format.py
index 1654be989e8..8a73ff52429 100644
--- a/wagtail/wagtailembeds/format.py
+++ b/wagtail/wagtailembeds/format.py
@@ -1,6 +1,5 @@
 from __future__ import division  # Use true division
 
-from django.utils.html import escape
 from django.template.loader import render_to_string
 
 from wagtail.wagtailembeds import get_embed

From b41a6d730fe61e1c5e01d9b669403982f374f4ad Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 24 Jun 2014 12:53:34 +0100
Subject: [PATCH 220/293] Revert "Merge pull request #335 from
 mope/edit-handlers-unit-tests"

This reverts commit 7ad6be82f3913893dcd82dd2af904da4c654c3ff, reversing
changes made to 4c77a4b18a8fef9abd3bcc1fccaf5627f1604522.
---
 .gitignore                                    |   1 -
 wagtail/wagtailadmin/edit_handlers.py         |  39 +-
 .../wagtailadmin/tests/test_edit_handlers.py  | 481 ------------------
 3 files changed, 18 insertions(+), 503 deletions(-)
 delete mode 100644 wagtail/wagtailadmin/tests/test_edit_handlers.py

diff --git a/.gitignore b/.gitignore
index 57f9d0eab5e..bd904efc9d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 *.pyc
 .DS_Store
-/.ropeproject/
 /.coverage
 /dist/
 /MANIFEST
diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py
index 7bbead9b19b..a15440016ce 100644
--- a/wagtail/wagtailadmin/edit_handlers.py
+++ b/wagtail/wagtailadmin/edit_handlers.py
@@ -1,4 +1,6 @@
 import copy
+import re
+import datetime
 
 from taggit.forms import TagWidget
 from modelcluster.forms import ClusterForm, ClusterFormMetaclass
@@ -7,13 +9,13 @@
 from django.template.defaultfilters import addslashes
 from django.utils.safestring import mark_safe
 from django import forms
+from django.db import models
 from django.forms.models import fields_for_model
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import (
-    ObjectDoesNotExist,
-    ImproperlyConfigured,
-)
+from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured, ValidationError
 from django.core.urlresolvers import reverse
+from django.conf import settings
+from django.utils.translation import ugettext as _
 from django.utils.translation import ugettext_lazy
 
 from wagtail.wagtailcore.models import Page
@@ -36,8 +38,7 @@
 }
 
 
-# Callback to allow us to override the default form fields provided
-# for each model field.
+# Callback to allow us to override the default form fields provided for each model field.
 def formfield_for_dbfield(db_field, **kwargs):
     # snarfed from django/contrib/admin/options.py
 
@@ -55,13 +56,13 @@ def formfield_for_dbfield(db_field, **kwargs):
 class WagtailAdminModelFormMetaclass(ClusterFormMetaclass):
     # Override the behaviour of the regular ModelForm metaclass -
     # which handles the translation of model fields to form fields -
-    # to use our own formfield_for_dbfield function to do that
-    # translation. This is done by sneaking a formfield_callback
-    # property into the class being defined (unless the class already
-    # provides a formfield_callback of its own).
+    # to use our own formfield_for_dbfield function to do that translation.
+    # This is done by sneaking a formfield_callback property into the class
+    # being defined (unless the class already provides a formfield_callback
+    # of its own).
 
-    # while we're at it, we'll also set extra_form_count to 0, as
-    # we're creating extra forms in JS
+    # while we're at it, we'll also set extra_form_count to 0, as we're creating
+    # extra forms in JS
     extra_form_count = 0
 
     def __new__(cls, name, bases, attrs):
@@ -78,8 +79,8 @@ def __new__(cls, name, bases, attrs):
 
 
 def get_form_for_model(
-    model, fields=None, exclude=None, formsets=None,
-    exclude_formsets=None, widgets=None
+    model,
+    fields=None, exclude=None, formsets=None, exclude_formsets=None, widgets=None
 ):
 
     # django's modelform_factory with a bit of custom behaviour
@@ -93,8 +94,7 @@ def get_form_for_model(
     if exclude is not None:
         attrs['exclude'] = exclude
     if issubclass(model, Page):
-        attrs['exclude'] = attrs.get('exclude', []) + ['content_type', 'path',
-                                                       'depth', 'numchild']
+        attrs['exclude'] = attrs.get('exclude', []) + ['content_type', 'path', 'depth', 'numchild']
 
     if widgets is not None:
         attrs['widgets'] = widgets
@@ -111,9 +111,7 @@ def get_form_for_model(
         'Meta': type('Meta', (object,), attrs)
     }
 
-    return WagtailAdminModelFormMetaclass(class_name,
-                                          (WagtailAdminModelForm,),
-                                          form_class_attrs)
+    return WagtailAdminModelFormMetaclass(class_name, (WagtailAdminModelForm,), form_class_attrs)
 
 
 def extract_panel_definitions_from_model_class(model, exclude=None):
@@ -128,8 +126,7 @@ def extract_panel_definitions_from_model_class(model, exclude=None):
     if issubclass(model, Page):
         _exclude = ['content_type', 'path', 'depth', 'numchild']
 
-    fields = fields_for_model(model, exclude=_exclude,
-                              formfield_callback=formfield_for_dbfield)
+    fields = fields_for_model(model, exclude=_exclude, formfield_callback=formfield_for_dbfield)
 
     for field_name, field in fields.items():
         try:
diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py
deleted file mode 100644
index c930974fefa..00000000000
--- a/wagtail/wagtailadmin/tests/test_edit_handlers.py
+++ /dev/null
@@ -1,481 +0,0 @@
-from mock import MagicMock
-
-from django.test import TestCase
-from django.core.exceptions import ImproperlyConfigured
-from django.forms.widgets import HiddenInput
-
-from wagtail.wagtailadmin.edit_handlers import (
-    get_form_for_model,
-    extract_panel_definitions_from_model_class,
-    BaseFieldPanel,
-    FieldPanel,
-    RichTextFieldPanel,
-    EditHandler,
-    WagtailAdminModelForm,
-    BaseTabbedInterface,
-    TabbedInterface,
-    BaseObjectList,
-    ObjectList,
-    PageChooserPanel,
-    InlinePanel
-)
-from wagtail.wagtailcore.models import Page, Site
-
-
-class TestGetFormForModel(TestCase):
-    class FakeClass(object):
-        _meta = MagicMock()
-
-    def setUp(self):
-        self.mock_exclude = MagicMock()
-
-    def test_get_form_for_model(self):
-        form = get_form_for_model(self.FakeClass,
-                                  fields=[],
-                                  exclude=[self.mock_exclude],
-                                  formsets=['baz'],
-                                  exclude_formsets=['quux'],
-                                  widgets=['bacon'])
-        self.assertEqual(form.Meta.exclude, [self.mock_exclude])
-        self.assertEqual(form.Meta.formsets, ['baz'])
-        self.assertEqual(form.Meta.exclude_formsets, ['quux'])
-        self.assertEqual(form.Meta.widgets, ['bacon'])
-
-
-class TestExtractPanelDefinitionsFromModelClass(TestCase):
-    class FakePage(Page):
-        pass
-
-    def test_can_extract_panels(self):
-        mock = MagicMock()
-        mock.panels = 'foo'
-        result = extract_panel_definitions_from_model_class(mock)
-        self.assertEqual(result, 'foo')
-
-    def test_exclude(self):
-        panels = extract_panel_definitions_from_model_class(Site, exclude=['hostname'])
-        for panel in panels:
-            self.assertNotEqual(panel.field_name, 'hostname')
-
-    def test_extracted_objects_are_panels(self):
-        panels = extract_panel_definitions_from_model_class(self.FakePage)
-        for panel in panels:
-            self.assertTrue(issubclass(panel, BaseFieldPanel))
-
-
-class TestEditHandler(TestCase):
-    class FakeForm(dict):
-        def __init__(self, *args, **kwargs):
-            self.fields = self.fields_iterator()
-
-        def fields_iterator(self):
-            for i in self:
-                yield i
-
-    def setUp(self):
-        self.edit_handler = EditHandler(form=True, instance=True)
-        self.edit_handler.render = lambda: "foo"
-
-    def test_widget_overrides(self):
-        result = EditHandler.widget_overrides()
-        self.assertEqual(result, {})
-
-    def test_required_formsets(self):
-        result = EditHandler.required_formsets()
-        self.assertEqual(result, [])
-
-    def test_get_form_class(self):
-        result = EditHandler.get_form_class(Page)
-        self.assertTrue(issubclass(result, WagtailAdminModelForm))
-
-    def test_edit_handler_init_no_instance(self):
-        self.assertRaises(ValueError, EditHandler, form=True)
-
-    def test_edit_handler_init_no_form(self):
-        self.assertRaises(ValueError, EditHandler, instance=True)
-
-    def test_object_classnames(self):
-        result = self.edit_handler.object_classnames()
-        self.assertEqual(result, "")
-
-    def test_field_classnames(self):
-        result = self.edit_handler.field_classnames()
-        self.assertEqual(result, "")
-
-    def test_field_type(self):
-        result = self.edit_handler.field_type()
-        self.assertEqual(result, "")
-
-    def test_render_as_object(self):
-        result = self.edit_handler.render_as_object()
-        self.assertEqual(result, "foo")
-
-    def test_render_as_field(self):
-        result = self.edit_handler.render_as_field()
-        self.assertEqual(result, "foo")
-
-    def test_render_js(self):
-        result = self.edit_handler.render_js()
-        self.assertEqual(result, "")
-
-    def test_rendered_fields(self):
-        result = self.edit_handler.rendered_fields()
-        self.assertEqual(result, [])
-
-    def test_render_missing_fields(self):
-        fake_form = self.FakeForm()
-        fake_form["foo"] = "bar"
-        self.edit_handler.form = fake_form
-        self.assertEqual(self.edit_handler.render_missing_fields(), "bar")
-
-    def test_render_form_content(self):
-        fake_form = self.FakeForm()
-        fake_form["foo"] = "bar"
-        self.edit_handler.form = fake_form
-        self.assertEqual(self.edit_handler.render_form_content(), "foobar")
-
-
-class TestTabbedInterface(TestCase):
-    class FakeChild(object):
-        class FakeGrandchild(object):
-            def render_js(self):
-                return "rendered js"
-
-            def rendered_fields(self):
-                return ["rendered fields"]
-
-        def widget_overrides(self):
-            return {'foo': 'bar'}
-
-        def required_formsets(self):
-            return {'baz': 'quux'}
-
-        def __call__(self, *args, **kwargs):
-            fake_grandchild = self.FakeGrandchild()
-            return fake_grandchild
-
-    def setUp(self):
-        fake_child = self.FakeChild()
-        self.TabbedInterfaceClass = TabbedInterface([fake_child])
-        self.tabbed_interface = self.TabbedInterfaceClass(instance=True,
-                                                          form=True)
-
-    def test_tabbed_interface(self):
-        self.assertTrue(issubclass(self.TabbedInterfaceClass,
-                                   BaseTabbedInterface))
-
-    def test_object_classnames_no_classname(self):
-        result = self.tabbed_interface.object_classnames()
-        self.assertEqual(result, 'multi-field')
-
-    def test_object_classnames(self):
-        self.tabbed_interface.classname = 'foo'
-        result = self.tabbed_interface.object_classnames()
-        self.assertEqual(result, 'multi-field foo')
-
-    def test_widget_overrides(self):
-        result = self.tabbed_interface.widget_overrides()
-        self.assertEqual(result, {'foo': 'bar'})
-
-    def test_required_formsets(self):
-        result = self.tabbed_interface.required_formsets()
-        self.assertEqual(result, ['baz'])
-
-    def test_render(self):
-        result = self.tabbed_interface.render()
-        self.assertIn('<div class="tab-content">', result)
-
-    def test_render_js(self):
-        result = self.tabbed_interface.render_js()
-        self.assertEqual(result, 'rendered js')
-
-    def test_rendered_fields(self):
-        result = self.tabbed_interface.rendered_fields()
-        self.assertEqual(result, ["rendered fields"])
-
-
-class TestObjectList(TestCase):
-    def test_object_list(self):
-        object_list = ObjectList(['foo'])
-        self.assertTrue(issubclass(object_list, BaseObjectList))
-
-
-class TestBaseFieldPanel(TestCase):
-    class FakeClass(object):
-        required = False
-
-    class FakeField(object):
-        label = 'label'
-        help_text = 'help text'
-
-    def setUp(self):
-        fake_field = self.FakeField()
-        BaseFieldPanel.field_name = 'barbecue'
-        self.base_field_panel = BaseFieldPanel(
-            instance=True,
-            form={'barbecue': fake_field})
-
-    def test_object_classnames_no_classname(self):
-        result = self.base_field_panel.object_classnames()
-        self.assertEqual(result, "single-field")
-
-    def test_object_classnames(self):
-        self.base_field_panel.classname = "bar"
-        result = self.base_field_panel.object_classnames()
-        self.assertEqual(result, "single-field bar")
-
-    def test_field_type(self):
-        fake_object = self.FakeClass()
-        another_fake_object = self.FakeClass()
-        fake_object.field = another_fake_object
-        self.base_field_panel.bound_field = fake_object
-        self.assertEqual(self.base_field_panel.field_type(), 'fake_class')
-
-    def test_field_classnames(self):
-        fake_object = self.FakeClass()
-        another_fake_object = self.FakeClass()
-        another_fake_object.required = True
-        fake_object.errors = True
-        fake_object.field = another_fake_object
-        self.base_field_panel.bound_field = fake_object
-        self.assertEqual(self.base_field_panel.field_classnames(),
-                         'fake_class required error')
-
-
-class TestFieldPanel(TestCase):
-    class FakeClass(object):
-        required = False
-
-    class FakeField(object):
-        label = 'label'
-        help_text = 'help text'
-        errors = ['errors']
-        id_for_label = 'id for label'
-
-    def setUp(self):
-        fake_field = self.FakeField()
-        fake_field.field = self.FakeClass()
-        self.field_panel = FieldPanel('barbecue', 'snowman')(
-            instance=True,
-            form={'barbecue': fake_field})
-
-    def test_render_as_object(self):
-        result = self.field_panel.render_as_object()
-        self.assertIn('<legend>label</legend>',
-                      result)
-        self.assertIn('<li class="fake_class error">',
-                      result)
-        self.assertIn('<p class="error-message">',
-                      result)
-
-    def test_render_js_unknown_widget(self):
-        field = self.FakeField()
-        bound_field = self.FakeField()
-        widget = self.FakeField()
-        field.widget = widget
-        bound_field.field = field
-        self.field_panel.bound_field = bound_field
-        result = self.field_panel.render_js()
-        self.assertEqual(result,
-                         '')
-
-    def test_render_as_field(self):
-        field = self.FakeField()
-        bound_field = self.FakeField()
-        bound_field.field = field
-        self.field_panel.bound_field = bound_field
-        result = self.field_panel.render_as_field()
-        self.assertIn('<p class="help">help text</p>',
-                      result)
-        self.assertIn('<span>errors</span>',
-                      result)
-
-    def test_rendered_fields(self):
-        result = self.field_panel.rendered_fields()
-        self.assertEqual(result, ['barbecue'])
-
-
-class TestRichTextFieldPanel(TestCase):
-    class FakeField(object):
-        label = 'label'
-        help_text = 'help text'
-        errors = ['errors']
-        id_for_label = 'id for label'
-
-    def test_render_js(self):
-        fake_field = self.FakeField()
-        rich_text_field_panel = RichTextFieldPanel('barbecue')(
-            instance=True,
-            form={'barbecue': fake_field})
-        result = rich_text_field_panel.render_js()
-        self.assertEqual(result,
-                         "makeRichTextEditable(fixPrefix('id for label'));")
-
-
-class TestPageChooserPanel(TestCase):
-    class FakeField(object):
-        label = 'label'
-        help_text = 'help text'
-        errors = ['errors']
-        id_for_label = 'id for label'
-
-    class FakeInstance(object):
-        class FakePage(object):
-            class FakeParent(object):
-                id = 1
-
-            name = 'fake page'
-
-            def get_parent(self):
-                return self.FakeParent()
-
-        def __init__(self):
-            fake_page = self.FakePage()
-            self.barbecue = fake_page
-
-    def setUp(self):
-        fake_field = self.FakeField()
-        fake_instance = self.FakeInstance()
-        self.page_chooser_panel = PageChooserPanel('barbecue')(
-            instance=fake_instance,
-            form={'barbecue': fake_field})
-
-    def test_render_js(self):
-        result = self.page_chooser_panel.render_js()
-        self.assertEqual(result,
-                         "createPageChooser(fixPrefix('id for label'), 'wagtailcore.page', 1);")
-
-    def test_get_chosen_item(self):
-        result = self.page_chooser_panel.get_chosen_item()
-        self.assertEqual(result.name, 'fake page')
-
-    def test_render_as_field(self):
-        result = self.page_chooser_panel.render_as_field()
-        self.assertIn('<p class="help">help text</p>', result)
-        self.assertIn('<span>errors</span>', result)
-
-    def test_widget_overrides(self):
-        result = self.page_chooser_panel.widget_overrides()
-        self.assertEqual(result, {'barbecue': HiddenInput})
-
-    def test_target_content_type(self):
-        result = PageChooserPanel(
-            'barbecue',
-            'wagtailcore.site'
-        ).target_content_type()
-        self.assertEqual(result.name, 'site')
-
-    def test_target_content_type_malformed_type(self):
-        result = PageChooserPanel(
-            'barbecue',
-            'snowman'
-        )
-        self.assertRaises(ImproperlyConfigured,
-                          result.target_content_type)
-
-    def test_target_content_type_nonexistent_type(self):
-        result = PageChooserPanel(
-            'barbecue',
-            'snowman.lorry'
-        )
-        self.assertRaises(ImproperlyConfigured,
-                          result.target_content_type)
-
-
-class TestInlinePanel(TestCase):
-    class FakeField(object):
-        class FakeFormset(object):
-            class FakeForm(object):
-                class FakeInstance(object):
-                    def __repr__(self):
-                        return 'fake instance'
-                fields = {'DELETE': MagicMock(),
-                          'ORDER': MagicMock()}
-                instance = FakeInstance()
-
-                def __repr__(self):
-                    return 'fake form'
-
-            forms = [FakeForm()]
-            empty_form = FakeForm()
-            can_order = True
-
-        label = 'label'
-        help_text = 'help text'
-        errors = ['errors']
-        id_for_label = 'id for label'
-        formsets = {'formset': FakeFormset()}
-
-    class FakeInstance(object):
-        class FakePage(object):
-            class FakeParent(object):
-                id = 1
-
-            name = 'fake page'
-
-            def get_parent(self):
-                return self.FakeParent()
-
-        def __init__(self):
-            fake_page = self.FakePage()
-            self.barbecue = fake_page
-
-    def setUp(self):
-        self.fake_field = self.FakeField()
-        self.fake_instance = self.FakeInstance()
-        self.mock_panel = MagicMock()
-        self.mock_panel.name = 'mock panel'
-        self.mock_model = MagicMock()
-        self.mock_model.formset.related.model.panels = [self.mock_panel]
-
-    def test_get_panel_definitions_no_panels(self):
-        """
-        Check that get_panel_definitions returns the panels set on the model
-        when no panels are set on the InlinePanel
-        """
-        inline_panel = InlinePanel(self.mock_model, 'formset')(
-            instance=self.fake_instance,
-            form=self.fake_field)
-        result = inline_panel.get_panel_definitions()
-        self.assertEqual(result[0].name, 'mock panel')
-        expected_calls = '[call(instance=fake instance, form=fake form),\n call(instance=fake instance, form=fake form)]'
-        self.assertEqual(str(self.mock_panel.mock_calls), expected_calls)
-
-    def test_get_panel_definitions(self):
-        """
-        Check that get_panel_definitions returns the panels set on
-        InlinePanel
-        """
-        other_mock_panel = MagicMock()
-        other_mock_panel.name = 'other mock panel'
-        inline_panel = InlinePanel(self.mock_model,
-                                   'formset',
-                                   panels=[other_mock_panel])(
-            instance=self.fake_instance,
-            form=self.fake_field)
-        result = inline_panel.get_panel_definitions()
-        self.assertEqual(result[0].name, 'other mock panel')
-        expected_calls = '[call(instance=fake instance, form=fake form),\n call(instance=fake instance, form=fake form)]'
-        self.assertEqual(str(other_mock_panel.mock_calls), expected_calls)
-
-    def test_required_formsets(self):
-        inline_panel = InlinePanel(self.mock_model, 'formset')(
-            instance=self.fake_instance,
-            form=self.fake_field)
-        self.assertEqual(inline_panel.required_formsets(), ['formset'])
-
-    def test_render(self):
-        inline_panel = InlinePanel(self.mock_model,
-                                   'formset',
-                                   label='foo')(
-            instance=self.fake_instance,
-            form=self.fake_field)
-        self.assertIn('Add foo', inline_panel.render())
-
-    def test_render_js(self):
-        inline_panel = InlinePanel(self.mock_model,
-                                   'formset')(
-            instance=self.fake_instance,
-            form=self.fake_field)
-        self.assertIn('var panel = InlinePanel({',
-                      inline_panel.render_js())

From ea14d99d18918353d72613b0e55b8f542d88cd82 Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Tue, 24 Jun 2014 14:56:40 +0100
Subject: [PATCH 221/293] Alter comment formatting in wagtailcore tests.py

---
 wagtail/wagtailcore/tests/tests.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/wagtail/wagtailcore/tests/tests.py b/wagtail/wagtailcore/tests/tests.py
index d7d9a24f97c..5fd5aa8025e 100644
--- a/wagtail/wagtailcore/tests/tests.py
+++ b/wagtail/wagtailcore/tests/tests.py
@@ -30,8 +30,8 @@ class TestIssue7(TestCase):
     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
+    Fix: d6cce69a397d08d5ee81a8cbc1977ab2c9db2682
+    Discussion: https://github.com/torchbox/wagtail/issues/7
     """
 
     fixtures = ['test.json']
@@ -73,8 +73,8 @@ class TestIssue157(TestCase):
     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
+    Fix: d6cce69a397d08d5ee81a8cbc1977ab2c9db2682
+    Discussion: https://github.com/torchbox/wagtail/issues/157
     """
 
     fixtures = ['test.json']

From 1f645a7ba092c0fbd757ea5e9d2cfcd0b233bb87 Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Tue, 24 Jun 2014 15:38:13 +0100
Subject: [PATCH 222/293] Fix #80

Searching for a non-existent editor's pick now displays the correct not
found message.
---
 wagtail/wagtailsearch/views/editorspicks.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/wagtail/wagtailsearch/views/editorspicks.py b/wagtail/wagtailsearch/views/editorspicks.py
index bb39c02baed..8e1155922a8 100644
--- a/wagtail/wagtailsearch/views/editorspicks.py
+++ b/wagtail/wagtailsearch/views/editorspicks.py
@@ -13,6 +13,7 @@
 @permission_required('wagtailadmin.access_admin')
 @vary_on_headers('X-Requested-With')
 def index(request):
+    is_searching = False
     page = request.GET.get('p', 1)
     query_string = request.GET.get('q', "")
 
@@ -21,6 +22,7 @@ def index(request):
     # Search
     if query_string:
         queries = queries.filter(query_string__icontains=query_string)
+        is_searching = True
 
     # Pagination
     paginator = Paginator(queries, 20)
@@ -33,11 +35,13 @@ def index(request):
 
     if request.is_ajax():
         return render(request, "wagtailsearch/editorspicks/results.html", {
+            'is_searching': is_searching,
             'queries': queries,
             'query_string': query_string,
         })
     else:
         return render(request, 'wagtailsearch/editorspicks/index.html', {
+            'is_searching': is_searching,
             'queries': queries,
             'query_string': query_string,
             'search_form': SearchForm(data=dict(q=query_string) if query_string else None, placeholder=_("Search editor's picks")),

From 8cc4bdf39efbf5fb70b8daa9b148c88edc630aa6 Mon Sep 17 00:00:00 2001
From: Tim Heap <tim@timheap.me>
Date: Wed, 25 Jun 2014 08:47:48 +1000
Subject: [PATCH 223/293] Link to the root page, not the site root

---
 .../wagtailadmin/templates/wagtailadmin/home/site_summary.html  | 2 +-
 wagtail/wagtailadmin/views/home.py                              | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/site_summary.html b/wagtail/wagtailadmin/templates/wagtailadmin/home/site_summary.html
index 225568fab32..166c0c91291 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/home/site_summary.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/home/site_summary.html
@@ -3,7 +3,7 @@
     <h2 class="visuallyhidden">{% trans "Site summary" %}</h2>
     <ul class="stats">
         <li class="icon icon-doc-empty-inverse">
-            <a href="{% url 'wagtailadmin_explore' root_page.pk %}">
+            <a href="{% url 'wagtailadmin_explore_root' %}">
             {% blocktrans count counter=total_pages %}
                 <span>{{ total_pages }}</span> Page
             {% plural %}
diff --git a/wagtail/wagtailadmin/views/home.py b/wagtail/wagtailadmin/views/home.py
index 77177b6522d..64dcc499ea6 100644
--- a/wagtail/wagtailadmin/views/home.py
+++ b/wagtail/wagtailadmin/views/home.py
@@ -27,7 +27,6 @@ def render(self):
             'total_pages': Page.objects.count() - 1,  # subtract 1 because the root node is not a real page
             'total_images': get_image_model().objects.count(),
             'total_docs': Document.objects.count(),
-            'root_page': Site.find_for_request(self.request).root_page,
             'search_form': SearchForm(),
         }, RequestContext(self.request))
 

From 0696ac8832dd97c06528671482c0ccd8ed5f91e4 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <xcession@xcessionsites.com>
Date: Wed, 25 Jun 2014 10:21:38 +0100
Subject: [PATCH 224/293] Update CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index fcba8d2d7f9..df81741c9b1 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -29,6 +29,7 @@ Contributors
 * Tom Talbot
 * Jeffrey Hearn
 * Robert Clark
+* Tim Heap
 
 Translators
 ===========

From 70211c5650e04a466bb02a6cf55b3248f3a610e4 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 25 Jun 2014 10:48:02 +0100
Subject: [PATCH 225/293] Embeds: Fixed crash when no HTML field is sent back
 from the embed provider

---
 wagtail/wagtailembeds/embeds.py |  4 ++++
 wagtail/wagtailembeds/tests.py  | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/wagtail/wagtailembeds/embeds.py b/wagtail/wagtailembeds/embeds.py
index 03029a23b31..2ec974d8a21 100644
--- a/wagtail/wagtailembeds/embeds.py
+++ b/wagtail/wagtailembeds/embeds.py
@@ -162,6 +162,10 @@ def get_embed(url, max_width=None, finder=None):
     except (TypeError, ValueError):
         embed_dict['height'] = None
 
+    # Make sure html field is valid
+    if 'html' not in embed_dict or not embed_dict['html']:
+        embed_dict['html'] = ''
+
     # Create database record
     embed, created = Embed.objects.get_or_create(
         url=url,
diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py
index 892dde5bd17..09ad3c90257 100644
--- a/wagtail/wagtailembeds/tests.py
+++ b/wagtail/wagtailembeds/tests.py
@@ -79,6 +79,19 @@ def test_invalid_width(self):
         # Width must be set to None
         self.assertEqual(embed.width, None)
 
+    def test_no_html(self) :
+        def no_html_finder(url, max_width=None):
+            """
+            A finder which returns everything but HTML
+            """
+            embed = self.dummy_finder(url, max_width)
+            embed['html'] = None
+            return embed
+
+        embed = get_embed('www.test.com/1234', max_width=400, finder=no_html_finder)
+
+        self.assertEqual(embed.html, '')
+
 
 class TestChooser(TestCase, WagtailTestUtils):
     def setUp(self):

From 015de477af3415e7d910b705d9f6d214f35c2503 Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Wed, 25 Jun 2014 11:13:09 +0100
Subject: [PATCH 226/293] Add unit tests for embed filters

---
 wagtail/wagtailembeds/tests.py | 60 +++++++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py
index 892dde5bd17..8cedf944b1e 100644
--- a/wagtail/wagtailembeds/tests.py
+++ b/wagtail/wagtailembeds/tests.py
@@ -7,6 +7,7 @@
 except ImportError:
     no_embedly = True
 
+from django import template
 from django.test import TestCase
 
 from wagtail.tests.utils import WagtailTestUtils, unittest
@@ -18,7 +19,8 @@
     AccessDeniedEmbedlyException,
 )
 from wagtail.wagtailembeds.embeds import embedly as wagtail_embedly, oembed as wagtail_oembed
-
+from wagtail.wagtailembeds.templatetags.embed_filters import embed as embed_filter
+from wagtail.wagtailembeds.templatetags.embed_filters import embed as embedly_filter
 
 
 class TestEmbeds(TestCase):
@@ -245,3 +247,59 @@ def test_oembed_return_values(self, loads, urlopen):
             'height': 'test_height',
             'html': 'test_html'
         })
+
+
+class TestEmbedFilter(TestCase):
+    def setUp(self):
+        class DummyResponse(object):
+            def read(self):
+                return "foo"
+        self.dummy_response = DummyResponse()
+
+    @patch('urllib2.urlopen')
+    @patch('json.loads')
+    def test_valid_embed(self, loads, urlopen):
+        urlopen.return_value = self.dummy_response
+        loads.return_value = {'type': 'photo',
+                              'url': 'http://www.example.com'}
+        result = embed_filter('http://www.youtube.com/watch/')
+        self.assertEqual(result, '<img src="http://www.example.com" />')
+
+    @patch('urllib2.urlopen')
+    @patch('json.loads')
+    def test_render_embed_filter(self, loads, urlopen):
+        urlopen.return_value = self.dummy_response
+        loads.return_value = {'type': 'photo',
+                              'url': 'http://www.example.com'}
+        temp = template.Template("{% load embed_filters %}{{ 'http://www.youtube.com/watch/'|embed }}")
+        context = template.Context()
+        result = temp.render(context)
+        self.assertEqual(result, '<img src="http://www.example.com" />')
+
+
+class TestEmbedlyFilter(TestCase):
+    def setUp(self):
+        class DummyResponse(object):
+            def read(self):
+                return "foo"
+        self.dummy_response = DummyResponse()
+
+    @patch('urllib2.urlopen')
+    @patch('json.loads')
+    def test_valid_embed(self, loads, urlopen):
+        urlopen.return_value = self.dummy_response
+        loads.return_value = {'type': 'photo',
+                              'url': 'http://www.example.com'}
+        result = embedly_filter('http://www.youtube.com/watch/')
+        self.assertEqual(result, '<img src="http://www.example.com" />')
+
+    @patch('urllib2.urlopen')
+    @patch('json.loads')
+    def test_render_embed_filter(self, loads, urlopen):
+        urlopen.return_value = self.dummy_response
+        loads.return_value = {'type': 'photo',
+                              'url': 'http://www.example.com'}
+        temp = template.Template("{% load embed_filters %}{{ 'http://www.youtube.com/watch/'|embedly }}")
+        context = template.Context()
+        result = temp.render(context)
+        self.assertEqual(result, '<img src="http://www.example.com" />')

From 77c71526174d7e831f6890862eed385b34c6507a Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 25 Jun 2014 11:27:06 +0100
Subject: [PATCH 227/293] Move normalise_query_string into wagtailsearch utils
 and use it in the backends

---
 wagtail/wagtailsearch/backends/db.py          |  6 ++--
 .../wagtailsearch/backends/elasticsearch.py   |  6 ++--
 wagtail/wagtailsearch/models.py               | 28 ++++---------------
 wagtail/wagtailsearch/tests/test_backends.py  |  9 ++++++
 wagtail/wagtailsearch/tests/test_queries.py   | 10 +++++--
 wagtail/wagtailsearch/utils.py                | 20 +++++++++++++
 wagtail/wagtailsearch/views/queries.py        |  3 +-
 7 files changed, 51 insertions(+), 31 deletions(-)
 create mode 100644 wagtail/wagtailsearch/utils.py

diff --git a/wagtail/wagtailsearch/backends/db.py b/wagtail/wagtailsearch/backends/db.py
index 08fdaf048ce..214c71cb3f5 100644
--- a/wagtail/wagtailsearch/backends/db.py
+++ b/wagtail/wagtailsearch/backends/db.py
@@ -1,9 +1,8 @@
-import warnings
-
 from django.db import models
 
 from wagtail.wagtailsearch.backends.base import BaseSearch
 from wagtail.wagtailsearch.indexed import Indexed
+from wagtail.wagtailsearch.utils import normalise_query_string
 
 
 class DBSearch(BaseSearch):
@@ -29,6 +28,9 @@ def delete(self, obj):
         pass # Not needed
 
     def search(self, query_string, model, fields=None, filters={}, prefetch_related=[]):
+        # Normalise query string
+        query_string = normalise_query_string(query_string)
+
         # Get terms
         terms = query_string.split()
         if not terms:
diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 5561a3ceeac..4c7c79da9bb 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -1,6 +1,5 @@
 from __future__ import absolute_import
 
-import string
 import json
 import warnings
 
@@ -11,6 +10,7 @@
 
 from wagtail.wagtailsearch.backends.base import BaseSearch
 from wagtail.wagtailsearch.indexed import Indexed
+from wagtail.wagtailsearch.utils import normalise_query_string
 
 
 class ElasticSearchQuery(object):
@@ -417,8 +417,8 @@ def search(self, query_string, model, fields=None, filters={}, prefetch_related=
         if not issubclass(model, Indexed) or not issubclass(model, models.Model):
             return []
 
-        # Clean up query string
-        query_string = "".join([c for c in query_string if c not in string.punctuation])
+        # Normalise query string
+        query_string = normalise_query_string(query_string)
 
         # Check that theres still a query string after the clean up
         if not query_string:
diff --git a/wagtail/wagtailsearch/models.py b/wagtail/wagtailsearch/models.py
index 6b07872f53f..c8c2f2fa461 100644
--- a/wagtail/wagtailsearch/models.py
+++ b/wagtail/wagtailsearch/models.py
@@ -1,18 +1,18 @@
+import datetime
+
 from django.db import models
 from django.utils import timezone
 
-from indexed import Indexed
-import datetime
-import string
+from wagtail.wagtailsearch.indexed import Indexed
+from wagtail.wagtailsearch.utils import normalise_query_string, MAX_QUERY_STRING_LENGTH
 
-MAX_QUERY_STRING_LENGTH = 255
 
 class Query(models.Model):
     query_string = models.CharField(max_length=MAX_QUERY_STRING_LENGTH, unique=True)
 
     def save(self, *args, **kwargs):
         # Normalise query string
-        self.query_string = self.normalise_query_string(self.query_string)
+        self.query_string = normalise_query_string(self.query_string)
 
         super(Query, self).save(*args, **kwargs)
 
@@ -40,29 +40,13 @@ def garbage_collect(cls):
 
     @classmethod
     def get(cls, query_string):
-        return cls.objects.get_or_create(query_string=cls.normalise_query_string(query_string))[0]
+        return cls.objects.get_or_create(query_string=normalise_query_string(query_string))[0]
 
     @classmethod
     def get_most_popular(cls, date_since=None):
         # TODO: Implement date_since
         return cls.objects.filter(daily_hits__isnull=False).annotate(_hits=models.Sum('daily_hits__hits')).distinct().order_by('-_hits')
 
-    @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()
-
-        # Strip punctuation characters
-        query_string = ''.join([c for c in query_string if c not in string.punctuation])
-
-        # Remove double spaces
-        query_string = ' '.join(query_string.split())
-
-        return query_string
-
 
 class QueryDailyHits(models.Model):
     query = models.ForeignKey(Query, db_index=True, related_name='daily_hits')
diff --git a/wagtail/wagtailsearch/tests/test_backends.py b/wagtail/wagtailsearch/tests/test_backends.py
index bd4a6492641..fa7b4d9fa3a 100644
--- a/wagtail/wagtailsearch/tests/test_backends.py
+++ b/wagtail/wagtailsearch/tests/test_backends.py
@@ -160,6 +160,15 @@ def test_callable_indexed_field(self):
 class TestElasticSearchBackend(BackendTests, TestCase):
     backend_path = 'wagtail.wagtailsearch.backends.elasticsearch.ElasticSearch'
 
+    def test_search_with_spaces_only(self):
+        # Search for some space characters and hope it doesn't crash
+        results = self.backend.search("   ", models.SearchTest)
+
+        # Queries are lazily evaluated, force it to run
+        list(results)
+
+        # Didn't crash, yay!
+
 
 @override_settings(WAGTAILSEARCH_BACKENDS={
     'default': {'BACKEND': 'wagtail.wagtailsearch.backends.db.DBSearch'}
diff --git a/wagtail/wagtailsearch/tests/test_queries.py b/wagtail/wagtailsearch/tests/test_queries.py
index 70854c785eb..fb47478a2ad 100644
--- a/wagtail/wagtailsearch/tests/test_queries.py
+++ b/wagtail/wagtailsearch/tests/test_queries.py
@@ -1,8 +1,12 @@
+from StringIO import StringIO
+
 from django.test import TestCase
 from django.core import management
+
 from wagtail.wagtailsearch import models
 from wagtail.tests.utils import unittest, WagtailTestUtils
-from StringIO import StringIO
+from wagtail.wagtailsearch.utils import normalise_query_string
+
 
 
 class TestHitCounter(TestCase):
@@ -55,12 +59,12 @@ def test_different_queries(self):
 
     def test_truncation(self):
         test_querystring = 'a' * 1000
-        result = models.Query.normalise_query_string(test_querystring)
+        result = 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)
+        result = normalise_query_string(test_querystring)
         self.assertEqual(len(result), 10)
 
 
diff --git a/wagtail/wagtailsearch/utils.py b/wagtail/wagtailsearch/utils.py
new file mode 100644
index 00000000000..1be3483d8aa
--- /dev/null
+++ b/wagtail/wagtailsearch/utils.py
@@ -0,0 +1,20 @@
+import string
+
+
+MAX_QUERY_STRING_LENGTH = 255
+
+
+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()
+
+    # Strip punctuation characters
+    query_string = ''.join([c for c in query_string if c not in string.punctuation])
+
+    # Remove double spaces
+    query_string = ' '.join(query_string.split())
+
+    return query_string
diff --git a/wagtail/wagtailsearch/views/queries.py b/wagtail/wagtailsearch/views/queries.py
index 72de2d97279..a6eb2c0b2ba 100644
--- a/wagtail/wagtailsearch/views/queries.py
+++ b/wagtail/wagtailsearch/views/queries.py
@@ -6,6 +6,7 @@
 from wagtail.wagtailadmin.forms import SearchForm
 
 from wagtail.wagtailsearch import models
+from wagtail.wagtailsearch.utils import normalise_query_string
 
 
 @permission_required('wagtailadmin.access_admin')
@@ -19,7 +20,7 @@ def chooser(request, get_results=False):
         searchform = SearchForm(request.GET)
         if searchform.is_valid():
             query_string = searchform.cleaned_data['q']
-            queries = queries.filter(query_string__icontains=models.Query.normalise_query_string(query_string))
+            queries = queries.filter(query_string__icontains=normalise_query_string(query_string))
     else:
         searchform = SearchForm()
 

From 02d8cc01e37b5aebae6260396af0ef89de4ed593 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 25 Jun 2014 15:28:22 +0100
Subject: [PATCH 228/293] fixes issue #373

---
 .../templates/wagtailadmin/chooser/_search_results.html     | 2 +-
 .../templates/wagtailadmin/shared/breadcrumb.html           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_search_results.html b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_search_results.html
index c08c6e21662..6f575259e75 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_search_results.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_search_results.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% if not is_searching %}
     <h2>{% trans "Explorer" %}</h2>
-    {% include "wagtailadmin/shared/breadcrumb.html" with page=parent_page %}
+    {% include "wagtailadmin/shared/breadcrumb.html" with page=parent_page choosing=1 %}
 
 {% else %}
     <h2>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html
index cb8b65f280a..583d927443c 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html
@@ -3,12 +3,12 @@
 <ul class="breadcrumb">
     {% for page in page.get_ancestors %}
         {% if page.is_root %}
-            <li class="home"><a href="{% url 'wagtailadmin_explore_root' %}" class="icon icon-home text-replace">{% trans 'Home' %}</a></li>
+            <li class="home"><a href="{% if choosing %}{% url 'wagtailadmin_choose_page_child' page.id %}?{{ querystring }}{% else %}{% url 'wagtailadmin_explore_root' %}{% endif %}" class="{% if choosing %}navigate-pages{% endif %} icon icon-home text-replace">{% trans 'Home' %}</a></li>
         {% else %}
-            <li><a href="{% url 'wagtailadmin_explore' page.id %}">{{ page.title }}</a></li>
+            <li><a href="{% if choosing %}{% url 'wagtailadmin_choose_page_child' page.id %}?{{ querystring }}{% else %}{% url 'wagtailadmin_explore' page.id %}{% endif %}" {% if choosing %}class="navigate-pages"{% endif %}>{{ page.title }}</a></li>
         {% endif %}
     {% endfor %}
     {% if include_self %}
-        <li><a href="{% url 'wagtailadmin_explore' page.id %}">{{ page.title }}</a></li>
+        <li><a href="{% if choosing %}{% url 'wagtailadmin_choose_page_child' page.id %}?{{ querystring }}{% else %}{% url 'wagtailadmin_explore' page.id %}{% endif %}" {% if choosing %}class="navigate-pages"{% endif %}>>{{ page.title }}</a></li>
     {% endif %}
 </ul>

From a5715e2ef19957d32f59a36f993882760d6a9863 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 25 Jun 2014 15:33:22 +0100
Subject: [PATCH 229/293] Changelog for #374

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

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ca58949b4b5..8e67096d40c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,7 @@ Changelog
  * Fix: Animated GIFs are now coalesced before resizing
  * Fix: Wand backend clones images before modifying them
  * Fix: Admin breadcrumb now positioned correctly on mobile
+ * Fix: Page chooser breadcrumb now updates the chooser modal instead of linking to Explorer
 
 0.3.1 (03.06.2014)
 ~~~~~~~~~~~~~~~~~~

From 34f2a9034313e4d0f7c381da772765f083e8be0a Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 25 Jun 2014 15:35:19 +0100
Subject: [PATCH 230/293] Changelog for #369

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

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8e67096d40c..9729a290e8d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -20,6 +20,7 @@ Changelog
  * Fix: Wand backend clones images before modifying them
  * Fix: Admin breadcrumb now positioned correctly on mobile
  * Fix: Page chooser breadcrumb now updates the chooser modal instead of linking to Explorer
+ * Fix: Embeds - Fixed crash when no HTML field is sent back from the embed provider
 
 0.3.1 (03.06.2014)
 ~~~~~~~~~~~~~~~~~~

From cdd3144107ed8ed0a5673b2cec82bc638d1a640e Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Wed, 25 Jun 2014 16:15:57 +0100
Subject: [PATCH 231/293] Add more embeds tests

---
 wagtail/wagtailembeds/tests.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py
index 7049f50f4c2..2065e811bf6 100644
--- a/wagtail/wagtailembeds/tests.py
+++ b/wagtail/wagtailembeds/tests.py
@@ -309,6 +309,17 @@ def test_valid_embed(self, loads, urlopen):
     @patch('urllib2.urlopen')
     @patch('json.loads')
     def test_render_embed_filter(self, loads, urlopen):
+        urlopen.return_value = self.dummy_response
+        loads.return_value = {'type': 'photo',
+                              'url': 'http://www.example.com'}
+        temp = template.Template("{% load embed_filters %}{{ 'http://www.youtube.com/watch/'|embed }}")
+        context = template.Context()
+        result = temp.render(context)
+        self.assertEqual(result, '<img src="http://www.example.com" />')
+
+    @patch('urllib2.urlopen')
+    @patch('json.loads')
+    def test_render_embedly_filter(self, loads, urlopen):
         urlopen.return_value = self.dummy_response
         loads.return_value = {'type': 'photo',
                               'url': 'http://www.example.com'}
@@ -316,3 +327,14 @@ def test_render_embed_filter(self, loads, urlopen):
         context = template.Context()
         result = temp.render(context)
         self.assertEqual(result, '<img src="http://www.example.com" />')
+
+    @patch('urllib2.urlopen')
+    @patch('json.loads')
+    def test_render_embed_filter_nonexistent_type(self, loads, urlopen):
+        urlopen.return_value = self.dummy_response
+        loads.return_value = {'type': 'foo',
+                              'url': 'http://www.example.com'}
+        temp = template.Template("{% load embed_filters %}{{ 'http://www.youtube.com/watch/'|embed }}")
+        context = template.Context()
+        result = temp.render(context)
+        self.assertEqual(result, '')

From 49d377a70fe3256aa975217896fb7abc74c47a2f Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Wed, 25 Jun 2014 17:21:41 +0100
Subject: [PATCH 232/293] Add image format tests

---
 wagtail/wagtailimages/tests.py | 54 +++++++++++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailimages/tests.py b/wagtail/wagtailimages/tests.py
index 2fbac118c52..91ed2df6a77 100644
--- a/wagtail/wagtailimages/tests.py
+++ b/wagtail/wagtailimages/tests.py
@@ -1,3 +1,5 @@
+from mock import MagicMock
+
 from django.test import TestCase
 from django import template
 from django.contrib.auth.models import User, Group, Permission
@@ -6,7 +8,11 @@
 
 from wagtail.tests.utils import unittest, WagtailTestUtils
 from wagtail.wagtailimages.models import get_image_model
-from wagtail.wagtailimages.templatetags import image_tags
+from wagtail.wagtailimages.formats import (
+    Format,
+    get_image_format,
+    register_image_format
+)
 
 from wagtail.wagtailimages.backends import get_image_backend
 from wagtail.wagtailimages.backends.pillow import PillowBackend
@@ -419,3 +425,49 @@ def test_simple(self):
         self.assertTemplateUsed(response, 'wagtailimages/chooser/chooser.js')
 
     # TODO: Test uploading through chooser
+
+
+class TestFormat(TestCase):
+    def setUp(self):
+        # test format
+        self.format = Format(
+            'test name',
+            'test label',
+            'test classnames',
+            'test filter spec'
+        )
+        # test image
+        self.image = MagicMock()
+        self.image.id = 0
+
+    def test_editor_attributes(self):
+        result = self.format.editor_attributes(
+            self.image,
+            'test alt text'
+        )
+        self.assertEqual(result,
+                         'data-embedtype="image" data-id="0" data-format="test name" data-alt="test alt text" ')
+
+    def test_image_to_editor_html(self):
+        result = self.format.image_to_editor_html(
+            self.image,
+            'test alt text'
+        )
+        self.assertRegexpMatches(
+            result,
+            '<img data-embedtype="image" data-id="0" data-format="test name" data-alt="test alt text" class="test classnames" src="[^"]+" width="1" height="1" alt="test alt text">',
+            )
+
+    def test_image_to_html_no_classnames(self):
+        self.format.classnames = None
+        result = self.format.image_to_html(self.image, 'test alt text')
+        self.assertRegexpMatches(
+            result,
+            '<img src="[^"]+" width="1" height="1" alt="test alt text">'
+        )
+        self.format.classnames = 'test classnames'
+
+    def test_get_image_format(self):
+        register_image_format(self.format)
+        result = get_image_format('test name')
+        self.assertEqual(result, self.format)

From 0c34959bf5fd5a5c48bc1bdddb663f24a53f593e Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 25 Jun 2014 14:28:52 +0100
Subject: [PATCH 233/293] Simplified UserPagePermissionsProxy.editable_pages
 method

---
 wagtail/wagtailcore/models.py | 37 +++++++++++++----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 6b273e4b653..fc40b20bdcc 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -803,29 +803,20 @@ def editable_pages(self):
         if self.user.is_superuser:
             return Page.objects.all()
 
-        # Translate each of the user's permission rules into a Q-expression
-        q_expressions = []
-        for perm in self.permissions:
-            if perm.permission_type == 'add':
-                # user has edit permission on any subpage of perm.page
-                # (including perm.page itself) that is owned by them
-                q_expressions.append(
-                    Q(path__startswith=perm.page.path, owner=self.user)
-                )
-            elif perm.permission_type == 'edit':
-                # user has edit permission on any subpage of perm.page
-                # (including perm.page itself) regardless of owner
-                q_expressions.append(
-                    Q(path__startswith=perm.page.path)
-                )
-
-        if q_expressions:
-            all_rules = q_expressions[0]
-            for expr in q_expressions[1:]:
-                all_rules = all_rules | expr
-            return Page.objects.filter(all_rules)
-        else:
-            return Page.objects.none()
+        editable_pages = Page.objects.none()
+
+        for perm in self.permissions.filter(permission_type='add'):
+            # user has edit permission on any subpage of perm.page
+            # (including perm.page itself) that is owned by them
+            editable_pages |= Page.objects.descendant_of(perm.page, inclusive=True).filter(owner=self.user)
+
+        for perm in self.permissions.filter(permission_type='edit'):
+            # user has edit permission on any subpage of perm.page
+            # (including perm.page itself) regardless of owner
+            editable_pages |= Page.objects.descendant_of(perm.page, inclusive=True)
+
+        return editable_pages
+
 
 class PagePermissionTester(object):
     def __init__(self, user_perms, page):

From e1bc2425b65f521a3f75f596061fe45ef746f3ba Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 26 Jun 2014 14:32:01 +0100
Subject: [PATCH 234/293] Return new revision object from Page.save_revision

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

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index fc40b20bdcc..0ab47ebc1bf 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -367,7 +367,7 @@ def route(self, request, path_components):
                 raise Http404
 
     def save_revision(self, user=None, submitted_for_moderation=False):
-        self.revisions.create(content_json=self.to_json(), user=user, submitted_for_moderation=submitted_for_moderation)
+        return self.revisions.create(content_json=self.to_json(), user=user, submitted_for_moderation=submitted_for_moderation)
 
     def get_latest_revision(self):
         try:

From c7c001c9fe725b94c87d44178e1175c090427cfa Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 26 Jun 2014 14:32:45 +0100
Subject: [PATCH 235/293] Cleanup Page.get_latest_revision

---
 wagtail/wagtailcore/models.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 0ab47ebc1bf..8b5dd5a6ce3 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -370,12 +370,7 @@ def save_revision(self, user=None, submitted_for_moderation=False):
         return self.revisions.create(content_json=self.to_json(), user=user, submitted_for_moderation=submitted_for_moderation)
 
     def get_latest_revision(self):
-        try:
-            revision = self.revisions.order_by('-created_at')[0]
-        except IndexError:
-            return False
-
-        return revision
+        return self.revisions.order_by('-created_at').first()
 
     def get_latest_revision_as_page(self):
         try:

From d89398f2140c6d492f9f66027b6b067ababdd8f9 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 26 Jun 2014 14:38:29 +0100
Subject: [PATCH 236/293] Cleanup Page.get_latest_revision_as_page

---
 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 8b5dd5a6ce3..5546d6635ce 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -373,12 +373,12 @@ def get_latest_revision(self):
         return self.revisions.order_by('-created_at').first()
 
     def get_latest_revision_as_page(self):
-        try:
-            revision = self.revisions.order_by('-created_at')[0]
-        except IndexError:
-            return self.specific
+        latest_revision = self.get_latest_revision()
 
-        return revision.as_page_object()
+        if latest_revision:
+            return latest_revision.as_page_object()
+        else:
+            return self.specific
 
     def get_context(self, request, *args, **kwargs):
         return {

From a15939add624ac19aac4003779a112451d1e0d5f Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 26 Jun 2014 14:39:06 +0100
Subject: [PATCH 237/293] Make Page.specific and Page.specific_class cached
 properties

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

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 5546d6635ce..9d82e810916 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -15,6 +15,7 @@
 from django.conf import settings
 from django.template.response import TemplateResponse
 from django.utils.translation import ugettext_lazy as _
+from django.utils.functional import cached_property
 
 from treebeard.mp_tree import MP_Node
 
@@ -323,7 +324,7 @@ def _update_descendant_url_paths(self, old_url_path, new_url_path):
         cursor.execute(update_statement, 
             [new_url_path, len(old_url_path) + 1, self.path + '%', self.id])
 
-    @property
+    @cached_property
     def specific(self):
         """
             Return this page in its most specific subclassed form.
@@ -337,7 +338,7 @@ def specific(self):
         else:
             return content_type.get_object_for_this_type(id=self.id)
 
-    @property
+    @cached_property
     def specific_class(self):
         """
             return the class that this page would be if instantiated in its

From deb2e0f9d8141df3b23bc335e373e6e674295b42 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 26 Jun 2014 14:41:09 +0100
Subject: [PATCH 238/293] Deprecate Page.get_other_siblings

---
 docs/building_your_site/djangodevelopers.rst | 1 -
 wagtail/wagtailcore/models.py                | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/building_your_site/djangodevelopers.rst b/docs/building_your_site/djangodevelopers.rst
index b4899d70f3e..82e4c6b89dd 100644
--- a/docs/building_your_site/djangodevelopers.rst
+++ b/docs/building_your_site/djangodevelopers.rst
@@ -203,7 +203,6 @@ Methods:
 * get_context
 * get_template
 * is_navigable
-* get_other_siblings
 * get_ancestors
 * get_descendants
 * get_siblings
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 9d82e810916..c13d7d1e438 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -409,6 +409,10 @@ def is_navigable(self):
         return (not self.is_leaf()) or self.depth == 2
 
     def get_other_siblings(self):
+        warnings.warn(
+            "The 'Page.get_other_siblings()' method has been replaced. "
+            "Use 'Page.get_siblings(inclusive=False)' instead.", DeprecationWarning)
+
         # get sibling pages excluding self
         return self.get_siblings().exclude(id=self.id)
 

From 1a0ffa799d51a17d3eb438b95a9124edd3ece974 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 26 Jun 2014 14:49:18 +0100
Subject: [PATCH 239/293] Added unicode method to PageRevision

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

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index c13d7d1e438..a4c6eaf7712 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -745,6 +745,9 @@ def publish(self):
         self.submitted_for_moderation = False
         page.revisions.update(submitted_for_moderation=False)
 
+    def __unicode__(self):
+        return '"' + unicode(self.page) + '" at ' + unicode(self.created_at)
+
 PAGE_PERMISSION_TYPE_CHOICES = [
     ('add', 'Add'),
     ('edit', 'Edit'),

From ccc533831fc1a7a588a75dfbb29a044798737b4d Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 26 Jun 2014 16:41:51 +0100
Subject: [PATCH 240/293] improving contrast of actions buttons in listings
 over hover colour

---
 .../static/wagtailadmin/scss/components/listing.scss           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
index e79d8b28dd1..94cb0d4d1f9 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
@@ -197,7 +197,7 @@ ul.listing{
     .button{
         color:$color-teal;
         border-color:$color-grey-3;
-        background:transparent;
+        background:white;
 
         &:hover{
             border-color:$color-teal;
@@ -334,6 +334,7 @@ ul.listing{
             margin-top:1em;
         }
         .button{
+            background-color:transparent;
             color:white;
             border-color:$color-teal-darker;
 

From b2e6ce177be81af493da460e7f491628d6e8688d Mon Sep 17 00:00:00 2001
From: Tim Heap <tim@timheap.me>
Date: Fri, 27 Jun 2014 08:35:11 +1000
Subject: [PATCH 241/293] Remove unused import added in 66dce8d

---
 wagtail/wagtailadmin/views/home.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/views/home.py b/wagtail/wagtailadmin/views/home.py
index 64dcc499ea6..24800eefc74 100644
--- a/wagtail/wagtailadmin/views/home.py
+++ b/wagtail/wagtailadmin/views/home.py
@@ -7,7 +7,7 @@
 from wagtail.wagtailadmin import hooks
 from wagtail.wagtailadmin.forms import SearchForm
 
-from wagtail.wagtailcore.models import Site, Page, PageRevision, UserPagePermissionsProxy
+from wagtail.wagtailcore.models import Page, PageRevision, UserPagePermissionsProxy
 
 from wagtail.wagtaildocs.models import Document
 

From b73dc91898ab1ab62fe78c78cd25cf3d5bd307c2 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 27 Jun 2014 09:24:53 +0100
Subject: [PATCH 242/293] fixing buttons (incomplete)

---
 .../templates/wagtailstyleguide/base.html     | 24 +++++----
 .../wagtailadmin/scss/components/forms.scss   | 50 +++++++++++++++----
 2 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
index e7bd8860611..49b47f0b06e 100644
--- a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
+++ b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
@@ -149,29 +149,33 @@ <h2>TD with title class</h2>
         <section id="buttons">
             <h2>Buttons</h2>
 
-            <div href="" class="button">button</div>
+            <a href="#" class="button">button</a>
 
-            <div href="" class="button button-secondary">button-secondary</div>
+            <a href="#" class="button button-secondary">button-secondary</a>
 
-            <div href="" class="button yes">yes</div>
+            <a href="#" class="button yes">yes</a>
 
-            <div href="" class="button no">no / serious</div>
+            <a href="#" class="button no">no / serious</a>
 
-            <div href="" class="button bicolor icon icon-plus">bicolor with icon</div>
+            <a href="#" class="button bicolor icon icon-plus">bicolor with icon</a>
 
-            <div href="" class="button button-small">button-small</div>
+            <a href="#" class="button button-small">button-small</a>
 
-            <div href="" class="button bicolor button-small icon icon-plus">bicolo button-small</div>
+            <a href="#" class="button bicolor button-small icon icon-plus">bicolo button-small</a>
 
-            <div href="" class="button button-secondary no">mixed 1</div>
+            <a href="#" class="button button-secondary no">mixed 1</a>
 
-            <div href="" class="button no bicolor icon icon-cog">mixed 2</div>
+            <a href="#" class="button no bicolor icon icon-cog">mixed 2</a>
+
+            <div class="button no bicolor icon icon-cog">button on a div</div>
 
             <p>Buttons must have interaction possible (i.e be an input or button element) to get a suitable hover cursor</p>
 
             <button>button</button>
 
             <button class="bicolor icon icon-plus">bicolor with icon</button>
+
+            <input type="submit" class="bicolor icon icon-plus" value="bicolor only supported on button elements" />
         </section>
 
         <section id="dropdowns">
@@ -191,7 +195,7 @@ <h2>Dropdown buttons</h2>
 
                 <div class="col3">
                     <div class="dropdown dropdown-button">
-                        <div class="button">drop down</div>
+                        <input type="button" value="drop down" class="button" />
                         <div class="dropdown-toggle icon icon-arrow-down"></div>
                         <ul role="menu">
                             <li><a href="#">Items in this list do not match button width</a></li>
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index 3a14a17ae59..6f5ee06299d 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -55,6 +55,7 @@ input, textarea, select, .richtext, .tagit{
         border: 0 !important;
         margin-top:-3px !important; 
         margin-bottom: -2px !important; 
+        line-height:1em !important;
     }
 
     &:hover{
@@ -76,13 +77,14 @@ input, textarea, select, .richtext, .tagit{
         outline:none;
     }
 
-    &:after{
+    /* Add select arrow back on browsers where native ui has been removed */
+    select ~ span:after{
         @include border-radius(0 6px 6px 0);
         z-index:0;
         position:absolute;
-        right:1px;
+        right:0px;
         top:1px;
-        height:95%;
+        bottom:0px;
         width:1.5em;
         font-family:wagtail;
         content:"q";
@@ -94,12 +96,14 @@ input, textarea, select, .richtext, .tagit{
         pointer-events:none;
         color:$color-grey-3;
         background-color:$color-fieldset-hover;
-        margin:0px 1px 0 0;
-    }
+        margin:0px 1px 1px 0;
 
-    .ie &:after{
-        display:none;
+        .ie &{
+            display:none;
+        }
     }
+
+    
 }
 
 /* radio and check boxes */
@@ -166,7 +170,9 @@ input[type=checkbox]:checked:before{
     color:$color-teal;
 }
 
-/* Core button style */
+/* Core button style 
+Note that these styles include methods to render buttons the same x-browser, described here:
+http://cbjdigital.com/blog/2010/08/bulletproof_css_input_button_heights */
 input[type=submit], input[type=reset], input[type=button], .button, button{
     font-family:Open Sans,Arial,sans-serif;
     @include border-radius(3px);
@@ -182,7 +188,6 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
     position:relative;
     -webkit-font-smoothing: auto;
     vertical-align: middle;
-    line-height:1em;
     display:inline-block;
     overflow:hidden;
     position:relative;
@@ -280,6 +285,14 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
     }
 }
 
+/* Special styles to counteract Firefox's completely unwarranted assumptions about button styles */
+input[type=submit], input[type=reset], input[type=button], button{
+    padding:0 1em;
+    height: em; 
+    vertical-align: middle;
+    line-height:inherit;
+}
+
 button.icon{
     &:before,
     &:after{
@@ -394,7 +407,7 @@ li.focused > .help{
     opacity:1;
 }
 
-.required label:after{
+.required .field > label:after{
     content:"*";
     color:$color-red;
     font-weight:bold;
@@ -652,7 +665,7 @@ ul.tagit li.tagit-choice-editable{
 
 /* search-bars */
 .search-bar{
-    .required label:after{
+    .required .field > label:after{
         display:none;
     }
 }
@@ -674,6 +687,7 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
         padding-top:1.2em;
         padding-left:0;
 
+        .choice_field &,
         .model_multiple_choice_field &,
         .boolean_field &,
         .model_choice_field &,
@@ -691,6 +705,11 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
         font-size:0.95em;
         padding:0.75em 1.4em;
 
+        padding:0 1.4em;
+        height: 2.8em; 
+        vertical-align: middle;
+        line-height:inherit;
+
         &.bicolor{
             padding-left:3.5em;
 
@@ -701,6 +720,15 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
         }
     }
 
+    /* Special styles to counteract Firefox's completely unwarranted assumptions about button styles */
+    input[type=submit], input[type=reset], input[type=button], button{
+        padding:0 1.4em;
+        height: 2.8em; 
+        vertical-align: middle;
+        line-height:inherit;
+    }
+
+
     .help{
         opacity:1;
     }

From 1ba1cad3f622d1d3121d4d15cc1cb79b1df569bb Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 27 Jun 2014 10:09:19 +0100
Subject: [PATCH 243/293] Changed User.get_profile to UserProfile.get_for_user

---
 wagtail/wagtailadmin/tasks.py                        |  3 ++-
 .../wagtailadmin/tests/test_account_management.py    |  6 ++++--
 wagtail/wagtailadmin/tests/test_pages_views.py       | 12 +++++++-----
 wagtail/wagtailadmin/views/account.py                |  5 +++--
 wagtail/wagtailusers/models.py                       |  6 ++++--
 wagtail/wagtailusers/tests.py                        |  2 +-
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/wagtail/wagtailadmin/tasks.py b/wagtail/wagtailadmin/tasks.py
index 567a91f85b4..815971e46cc 100644
--- a/wagtail/wagtailadmin/tasks.py
+++ b/wagtail/wagtailadmin/tasks.py
@@ -5,6 +5,7 @@
 from django.db.models import Q
 
 from wagtail.wagtailcore.models import PageRevision, GroupPagePermission
+from wagtail.wagtailusers.models import UserProfile
 
 # The following will check to see if we can import task from celery - 
 # if not then we definitely haven't installed it
@@ -62,7 +63,7 @@ def send_notification(page_revision_id, notification, excluded_user_id):
     # Get list of email addresses
     email_addresses = [
         recipient.email for recipient in recipients
-        if recipient.email and recipient.id != excluded_user_id and getattr(recipient.get_profile(), notification + '_notifications')
+        if recipient.email and recipient.id != excluded_user_id and getattr(UserProfile.get_for_user(recipient), notification + '_notifications')
     ]
 
     # Return if there are no email addresses
diff --git a/wagtail/wagtailadmin/tests/test_account_management.py b/wagtail/wagtailadmin/tests/test_account_management.py
index e8f46a25b70..7128f8885a7 100644
--- a/wagtail/wagtailadmin/tests/test_account_management.py
+++ b/wagtail/wagtailadmin/tests/test_account_management.py
@@ -1,10 +1,12 @@
 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, Group, Permission
 from django.contrib.auth.tokens import PasswordResetTokenGenerator
 from django.core import mail
 
+from wagtail.tests.utils import unittest, WagtailTestUtils
+from wagtail.wagtailusers.models import UserProfile
+
 
 class TestAuthentication(TestCase, WagtailTestUtils):
     """
@@ -205,7 +207,7 @@ def test_notification_preferences_view_post(self):
         # Check that the user was redirected to the account page
         self.assertRedirects(response, reverse('wagtailadmin_account'))
 
-        profile = User.objects.get(username='test').get_profile()
+        profile = UserProfile.get_for_user(User.objects.get(username='test'))
 
         # Check that the notification preferences are as submitted
         self.assertFalse(profile.submitted_notifications)
diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py
index a88dd46dcad..65a614538db 100644
--- a/wagtail/wagtailadmin/tests/test_pages_views.py
+++ b/wagtail/wagtailadmin/tests/test_pages_views.py
@@ -1,12 +1,14 @@
 from django.test import TestCase
-from wagtail.tests.models import SimplePage, EventPage, StandardIndex, StandardChild, BusinessIndex, BusinessChild, BusinessSubIndex
-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
 from django.core.paginator import Paginator
 
+from wagtail.tests.models import SimplePage, EventPage, StandardIndex, StandardChild, BusinessIndex, BusinessChild, BusinessSubIndex
+from wagtail.tests.utils import unittest, WagtailTestUtils
+from wagtail.wagtailcore.models import Page, PageRevision
+from wagtail.wagtailusers.models import UserProfile
+
 
 class TestPageExplorer(TestCase, WagtailTestUtils):
     def setUp(self):
@@ -863,8 +865,8 @@ def setUp(self):
         self.submitter = User.objects.create_user('submitter', 'submitter@email.com', 'password')
 
         # User profiles for moderator2 and the submitter
-        self.moderator2_profile = self.moderator2.get_profile()
-        self.submitter_profile = self.submitter.get_profile()
+        self.moderator2_profile = UserProfile.get_for_user(self.moderator2)
+        self.submitter_profile = UserProfile.get_for_user(self.submitter)
 
         # Create a page and submit it for moderation
         self.child_page = SimplePage(
diff --git a/wagtail/wagtailadmin/views/account.py b/wagtail/wagtailadmin/views/account.py
index c5cf6ffae8b..65e8dbeec71 100644
--- a/wagtail/wagtailadmin/views/account.py
+++ b/wagtail/wagtailadmin/views/account.py
@@ -10,6 +10,7 @@
 
 from wagtail.wagtailadmin import forms
 from wagtail.wagtailusers.forms import NotificationPreferencesForm
+from wagtail.wagtailusers.models import UserProfile
 from wagtail.wagtailcore.models import UserPagePermissionsProxy
 
 
@@ -52,14 +53,14 @@ def change_password(request):
 def notification_preferences(request):
 
     if request.POST:
-        form = NotificationPreferencesForm(request.POST, instance=request.user.get_profile())
+        form = NotificationPreferencesForm(request.POST, instance=UserProfile.get_for_user(request.user))
 
         if form.is_valid():
             form.save()
             messages.success(request, _("Your preferences have been updated successfully!"))
             return redirect('wagtailadmin_account')
     else:
-        form = NotificationPreferencesForm(instance=request.user.get_profile())
+        form = NotificationPreferencesForm(instance=UserProfile.get_for_user(request.user))
 
     # quick-and-dirty catch-all in case the form has been rendered with no
     # fields, as the user has no customisable permissions
diff --git a/wagtail/wagtailusers/models.py b/wagtail/wagtailusers/models.py
index 6e907a8647f..d6914a6b3ac 100644
--- a/wagtail/wagtailusers/models.py
+++ b/wagtail/wagtailusers/models.py
@@ -5,8 +5,6 @@
 
 User = get_user_model()
 
-User.get_profile = lambda u: UserProfile.objects.get_or_create(user=u)[0]
-
 
 class UserProfile(models.Model):
     user = models.OneToOneField(User)
@@ -26,5 +24,9 @@ class UserProfile(models.Model):
             help_text=_("Receive notification when your page edit is rejected")
             )
 
+    @classmethod
+    def get_for_user(cls, user):
+        return cls.objects.get_or_create(user=user)[0]
+
     def __unicode__(self):
         return self.user.username
diff --git a/wagtail/wagtailusers/tests.py b/wagtail/wagtailusers/tests.py
index f9762e5c9c1..fabe02b4c8a 100644
--- a/wagtail/wagtailusers/tests.py
+++ b/wagtail/wagtailusers/tests.py
@@ -127,6 +127,6 @@ def test_user_created_without_profile(self):
             self.test_user.userprofile
 
     def test_user_profile_created_when_method_called(self):
-        self.assertIsInstance(self.test_user.get_profile(), UserProfile)
+        self.assertIsInstance(UserProfile.get_for_user(self.test_user), UserProfile)
         # and get it from the db too
         self.assertEqual(UserProfile.objects.filter(user=self.test_user).count(), 1)

From 402641bf6c7b4df8e31b670b5dd9cfe7b67dc03e Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 27 Jun 2014 10:29:08 +0100
Subject: [PATCH 244/293] Made wagtailusers work a bit nicer with custom user
 models

---
 wagtail/wagtailusers/forms.py                          |  6 +++++-
 .../migrations/0002_add_user_profile_model.py          | 10 ++++++----
 wagtail/wagtailusers/models.py                         |  7 ++-----
 wagtail/wagtailusers/tests.py                          |  4 +++-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/wagtail/wagtailusers/forms.py b/wagtail/wagtailusers/forms.py
index afeef60bde2..7c8d0b1b610 100644
--- a/wagtail/wagtailusers/forms.py
+++ b/wagtail/wagtailusers/forms.py
@@ -1,11 +1,15 @@
 from django import forms
 from django.contrib.auth.forms import UserCreationForm as BaseUserCreationForm
 from django.utils.translation import ugettext_lazy as _
+from django.contrib.auth import get_user_model
 
-from wagtail.wagtailusers.models import User, UserProfile
+from wagtail.wagtailusers.models import UserProfile
 from wagtail.wagtailcore.models import UserPagePermissionsProxy
 
 
+User = get_user_model()
+
+
 # extend Django's UserCreationForm with an 'is_superuser' field
 class UserCreationForm(BaseUserCreationForm):
 
diff --git a/wagtail/wagtailusers/migrations/0002_add_user_profile_model.py b/wagtail/wagtailusers/migrations/0002_add_user_profile_model.py
index ff068ce3420..9f975009de9 100644
--- a/wagtail/wagtailusers/migrations/0002_add_user_profile_model.py
+++ b/wagtail/wagtailusers/migrations/0002_add_user_profile_model.py
@@ -4,6 +4,8 @@
 from south.v2 import SchemaMigration
 from django.db import models
 
+from wagtail.wagtailcore.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
+
 
 class Migration(SchemaMigration):
 
@@ -11,7 +13,7 @@ def forwards(self, orm):
         # Adding model 'UserProfile'
         db.create_table(u'wagtailusers_userprofile', (
             (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('user', self.gf('django.db.models.fields.related.OneToOneField')(related_name='profile', unique=True, to=orm['auth.User'])),
+            ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm[AUTH_USER_MODEL], unique=True)),
             ('submitted_notifications', self.gf('django.db.models.fields.BooleanField')(default=True)),
             ('rejected_notifications', self.gf('django.db.models.fields.BooleanField')(default=True)),
             ('approved_notifications', self.gf('django.db.models.fields.BooleanField')(default=True)),
@@ -38,8 +40,8 @@ def backwards(self, orm):
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        u'auth.user': {
-            'Meta': {'object_name': 'User'},
+        AUTH_USER_MODEL: {
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
@@ -67,7 +69,7 @@ def backwards(self, orm):
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'rejected_notifications': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
             'submitted_notifications': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'profile'", 'unique': 'True', 'to': u"orm['auth.User']"})
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['%s']" % AUTH_USER_MODEL, 'unique': 'True'})
         }
     }
 
diff --git a/wagtail/wagtailusers/models.py b/wagtail/wagtailusers/models.py
index d6914a6b3ac..4e8bfc63d3e 100644
--- a/wagtail/wagtailusers/models.py
+++ b/wagtail/wagtailusers/models.py
@@ -1,13 +1,10 @@
 from django.db import models
-from django.contrib.auth import get_user_model
+from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
 
-User = get_user_model()
-
-
 class UserProfile(models.Model):
-    user = models.OneToOneField(User)
+    user = models.OneToOneField(settings.AUTH_USER_MODEL)
 
     submitted_notifications = models.BooleanField(
             default=True,
diff --git a/wagtail/wagtailusers/tests.py b/wagtail/wagtailusers/tests.py
index fabe02b4c8a..d59b2e822f8 100644
--- a/wagtail/wagtailusers/tests.py
+++ b/wagtail/wagtailusers/tests.py
@@ -1,7 +1,9 @@
 from django.test import TestCase
 from django.core.urlresolvers import reverse
-from wagtail.wagtailusers.models import User, UserProfile
+from django.contrib.auth.models import User
+
 from wagtail.tests.utils import WagtailTestUtils
+from wagtail.wagtailusers.models import UserProfile
 
 
 class TestUserIndexView(TestCase, WagtailTestUtils):

From 1f67f7bbd91bf82ad166348dfec46b87c2a943f4 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 27 Jun 2014 10:40:00 +0100
Subject: [PATCH 245/293] Don't filter by owner in publishable_pages

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

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index a97182c9abf..40a10a9c548 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -844,9 +844,9 @@ def publishable_pages(self):
         for perm in self.permissions:
             if perm.permission_type == 'publish':
                 # user has publish permission on any subpage of perm.page
-                # (including perm.page itself) that is owned by them
+                # (including perm.page itself)
                 q_expressions.append(
-                    Q(path__startswith=perm.page.path, owner=self.user)
+                    Q(path__startswith=perm.page.path)
                 )
 
         if q_expressions:

From 9079d67392d1668549538657b967378896f61118 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 27 Jun 2014 10:59:15 +0100
Subject: [PATCH 246/293] Changelog entry for notification preferences

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

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9729a290e8d..ef9c25707b8 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,7 @@ Changelog
 0.4 (xx.xx.20xx)
 ~~~~~~~~~~~~~~~~
  * ElasticUtils/pyelasticsearch swapped for elasticsearch-py
+ * Added notification preferences
  * Added 'original' as a resizing rule supported by the 'image' tag
  * Hallo.js updated to version 1.0.4
  * Snippets are now ordered alphabetically

From de219e71080992b1ab1f346b7884d9a31c96b226 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 27 Jun 2014 11:10:50 +0100
Subject: [PATCH 247/293] Fixed broken test Forgot to update this in
 1f67f7bbd91bf82ad166348dfec46b87c2a943f4

---
 wagtail/wagtailcore/tests/test_page_permissions.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailcore/tests/test_page_permissions.py b/wagtail/wagtailcore/tests/test_page_permissions.py
index 11a981f8d41..111b059e616 100644
--- a/wagtail/wagtailcore/tests/test_page_permissions.py
+++ b/wagtail/wagtailcore/tests/test_page_permissions.py
@@ -217,8 +217,8 @@ def test_editable_pages_for_user_with_edit_permission(self):
         self.assertTrue(can_edit_pages)
 
         self.assertFalse(publishable_pages.filter(id=homepage.id).exists())
-        self.assertFalse(publishable_pages.filter(id=christmas_page.id).exists())
-        self.assertFalse(publishable_pages.filter(id=unpublished_event_page.id).exists())
+        self.assertTrue(publishable_pages.filter(id=christmas_page.id).exists())
+        self.assertTrue(publishable_pages.filter(id=unpublished_event_page.id).exists())
         self.assertTrue(publishable_pages.filter(id=someone_elses_event_page.id).exists())
 
         self.assertTrue(can_publish_pages)

From 1840ecb672e25e466f593bfe661f88822d4119a8 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 18 Jun 2014 11:09:14 +0100
Subject: [PATCH 248/293] Added in_menu and not_in_menu methods to PageQuerySet

---
 CHANGELOG.txt                                 |  1 +
 wagtail/wagtailcore/models.py                 |  6 ++++++
 wagtail/wagtailcore/query.py                  |  9 ++++++++
 .../wagtailcore/tests/test_page_queryset.py   | 21 +++++++++++++++++++
 4 files changed, 37 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ef9c25707b8..35e6ab7c337 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -17,6 +17,7 @@ Changelog
  * 'image' tag now accepts extra keyword arguments to be output as attributes on the img tag
  * Added an 'attrs' property to image rendition objects to output src, width, height and alt attributes all in one go
  * Added 'construct_whitelister_element_rules' hook for customising the HTML whitelist used when saving rich text fields
+ * Added 'in_menu' and 'not_in_menu' methods to PageQuerySet
  * Fix: Animated GIFs are now coalesced before resizing
  * Fix: Wand backend clones images before modifying them
  * Fix: Admin breadcrumb now positioned correctly on mobile
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 40a10a9c548..e6aee2fa84b 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -135,6 +135,12 @@ def live(self):
     def not_live(self):
         return self.get_queryset().not_live()
 
+    def in_menu(self):
+        return self.get_query_set().in_menu()
+
+    def not_in_menu(self):
+        return self.get_query_set().not_in_menu()
+
     def page(self, other):
         return self.get_queryset().page(other)
 
diff --git a/wagtail/wagtailcore/query.py b/wagtail/wagtailcore/query.py
index 9404e25b4d6..57e8ffff33d 100644
--- a/wagtail/wagtailcore/query.py
+++ b/wagtail/wagtailcore/query.py
@@ -16,6 +16,15 @@ def live(self):
     def not_live(self):
         return self.exclude(self.live_q())
 
+    def in_menu_q(self):
+        return Q(show_in_menus=True)
+
+    def in_menu(self):
+        return self.filter(self.in_menu_q())
+
+    def not_in_menu(self):
+        return self.exclude(self.in_menu_q())
+
     def page_q(self, other):
         return Q(id=other.id)
 
diff --git a/wagtail/wagtailcore/tests/test_page_queryset.py b/wagtail/wagtailcore/tests/test_page_queryset.py
index 06f2c3e21c3..57599173ce1 100644
--- a/wagtail/wagtailcore/tests/test_page_queryset.py
+++ b/wagtail/wagtailcore/tests/test_page_queryset.py
@@ -34,6 +34,27 @@ def test_not_live(self):
         event = Page.objects.get(url_path='/home/events/someone-elses-event/')
         self.assertTrue(pages.filter(id=event.id).exists())
 
+    def test_in_menu(self):
+        pages = Page.objects.in_menu()
+
+        # All pages must be be in the menus
+        for page in pages:
+            self.assertTrue(page.show_in_menus)
+
+        # Check that the events index is in the results
+        events_index = Page.objects.get(url_path='/home/events/')
+        self.assertTrue(pages.filter(id=events_index.id).exists())
+
+    def test_not_in_menu(self):
+        pages = Page.objects.not_in_menu()
+
+        # All pages must not be in menus
+        for page in pages:
+            self.assertFalse(page.show_in_menus)
+
+        # Check that the root page is in the results
+        self.assertTrue(pages.filter(id=1).exists())
+
     def test_page(self):
         homepage = Page.objects.get(url_path='/home/')
         pages = Page.objects.page(homepage)

From fe45b4e424deb36bf0aea41dd011240ef098889a Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 18 Jun 2014 11:41:54 +0100
Subject: [PATCH 249/293] Replaced get_query_set with get_queryset for in_menu
 methods

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

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index e6aee2fa84b..e98abbb6407 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -136,10 +136,10 @@ def not_live(self):
         return self.get_queryset().not_live()
 
     def in_menu(self):
-        return self.get_query_set().in_menu()
+        return self.get_queryset().in_menu()
 
     def not_in_menu(self):
-        return self.get_query_set().not_in_menu()
+        return self.get_queryset().not_in_menu()
 
     def page(self, other):
         return self.get_queryset().page(other)

From 40ac053e5d11c6fc47d2cee5e2f9f639c3248f60 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Wed, 25 Jun 2014 10:58:05 +0100
Subject: [PATCH 250/293] Implement field validation for Site.is_default_site;
 resolves #289

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

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 40a10a9c548..c7011360436 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -15,6 +15,7 @@
 from django.conf import settings
 from django.template.response import TemplateResponse
 from django.utils.translation import ugettext_lazy as _
+from django.core.exceptions import ValidationError
 
 from treebeard.mp_tree import MP_Node
 
@@ -63,6 +64,25 @@ def root_url(self):
         else:
             return 'http://%s:%d' % (self.hostname, self.port)
 
+    def clean_fields(self, exclude=None):
+        super(Site, self).clean_fields(exclude)
+        # Only one site can have the is_default_site flag set
+        try:
+            default = Site.objects.get(is_default_site=True)
+        except Site.DoesNotExist:
+            pass
+        except Site.MultipleObjectsReturned:
+            raise
+        else:
+            if self.is_default_site and self.pk != default.pk:
+                raise ValidationError(
+                    {'is_default_site': [
+                        _("%(hostname)s is already configured as the default site. You must unset that before you can save this site as default.")
+                        % { 'hostname': default.hostname }
+                        ]
+                        },
+                    )
+
     # clear the wagtail_site_root_paths cache whenever Site records are updated
     def save(self, *args, **kwargs):
         result = super(Site, self).save(*args, **kwargs)

From 49cb5b10250fb28c746067fd66bbc8bfddc55785 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Wed, 25 Jun 2014 11:02:52 +0100
Subject: [PATCH 251/293] Allow multiple sites with the same hostname but
 different ports; resolves #290

---
 ...hostname__add_unique_site_hostname_port.py | 106 ++++++++++++++++++
 wagtail/wagtailcore/models.py                 |  30 ++++-
 2 files changed, 130 insertions(+), 6 deletions(-)
 create mode 100644 wagtail/wagtailcore/migrations/0003_auto__del_unique_site_hostname__add_unique_site_hostname_port.py

diff --git a/wagtail/wagtailcore/migrations/0003_auto__del_unique_site_hostname__add_unique_site_hostname_port.py b/wagtail/wagtailcore/migrations/0003_auto__del_unique_site_hostname__add_unique_site_hostname_port.py
new file mode 100644
index 00000000000..16686e0a9ba
--- /dev/null
+++ b/wagtail/wagtailcore/migrations/0003_auto__del_unique_site_hostname__add_unique_site_hostname_port.py
@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Removing unique constraint on 'Site', fields ['hostname']
+        db.delete_unique(u'wagtailcore_site', ['hostname'])
+
+        # Adding unique constraint on 'Site', fields ['hostname', 'port']
+        db.create_unique(u'wagtailcore_site', ['hostname', 'port'])
+
+
+    def backwards(self, orm):
+        # Removing unique constraint on 'Site', fields ['hostname', 'port']
+        db.delete_unique(u'wagtailcore_site', ['hostname', 'port'])
+
+        # Adding unique constraint on 'Site', fields ['hostname']
+        db.create_unique(u'wagtailcore_site', ['hostname'])
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'wagtailcore.grouppagepermission': {
+            'Meta': {'object_name': 'GroupPagePermission'},
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_permissions'", 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_permissions'", 'to': u"orm['wagtailcore.Page']"}),
+            'permission_type': ('django.db.models.fields.CharField', [], {'max_length': '20'})
+        },
+        u'wagtailcore.page': {
+            'Meta': {'object_name': 'Page'},
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}),
+            'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': u"orm['auth.User']"}),
+            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'show_in_menus': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
+        },
+        u'wagtailcore.pagerevision': {
+            'Meta': {'object_name': 'PageRevision'},
+            'content_json': ('django.db.models.fields.TextField', [], {}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'revisions'", 'to': u"orm['wagtailcore.Page']"}),
+            'submitted_for_moderation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'wagtailcore.site': {
+            'Meta': {'unique_together': "(('hostname', 'port'),)", 'object_name': 'Site'},
+            'hostname': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_default_site': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'port': ('django.db.models.fields.IntegerField', [], {'default': '80'}),
+            'root_page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sites_rooted_here'", 'to': u"orm['wagtailcore.Page']"})
+        }
+    }
+
+    complete_apps = ['wagtailcore']
\ No newline at end of file
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index c7011360436..2b8cc36ec3a 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -31,11 +31,14 @@ def get_by_natural_key(self, hostname):
 
 
 class Site(models.Model):
-    hostname = models.CharField(max_length=255, unique=True, db_index=True)
+    hostname = models.CharField(max_length=255, db_index=True)
     port = models.IntegerField(default=80, help_text=_("Set this to something other than 80 if you need a specific port number to appear in URLs (e.g. development on port 8000). Does not affect request handling (so port forwarding still works)."))
     root_page = models.ForeignKey('Page', related_name='sites_rooted_here')
     is_default_site = models.BooleanField(default=False, help_text=_("If true, this site will handle requests for all other hostnames that do not have a site entry of their own"))
 
+    class Meta:
+        unique_together = ('hostname', 'port')
+
     def natural_key(self):
         return (self.hostname,)
 
@@ -46,9 +49,25 @@ def __unicode__(self):
     def find_for_request(request):
         """Find the site object responsible for responding to this HTTP request object"""
         try:
-            hostname = request.META['HTTP_HOST'].split(':')[0]
-            # find a Site matching this specific hostname
-            return Site.objects.get(hostname=hostname)
+            try:
+                hostname, port = request.META['HTTP_HOST'].split(':')
+            except ValueError:
+                hostname = request.META['HTTP_HOST']
+                port = '80' # FIXME do we want this default?
+            except KeyError:
+                # explicit routing straight to the final except clause
+                raise
+            try:
+                # find a Site matching this specific hostname
+                return Site.objects.get(hostname=hostname)
+            except Site.MultipleObjectsReturned:
+                try:
+                    # as there were more than one, try matching by port too
+                    return Site.objects.get(hostname=hostname, port=int(port))
+                except Site.DoesNotExist:
+                    # explicit acknowledgement that this is another route to
+                    # the final except clause
+                    raise
         except (Site.DoesNotExist, KeyError):
             # If no matching site exists, or request does not specify an HTTP_HOST (which
             # will often be the case for the Django test client), look for a catch-all Site.
@@ -79,8 +98,7 @@ def clean_fields(self, exclude=None):
                     {'is_default_site': [
                         _("%(hostname)s is already configured as the default site. You must unset that before you can save this site as default.")
                         % { 'hostname': default.hostname }
-                        ]
-                        },
+                        ]}
                     )
 
     # clear the wagtail_site_root_paths cache whenever Site records are updated

From eccb87d9a03e8021c0b55620db3cbcc34f4e02bb Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Wed, 25 Jun 2014 11:03:30 +0100
Subject: [PATCH 252/293] Add routing test for when two sites have the same
 hostname but different ports

---
 wagtail/wagtailcore/tests/test_page_model.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py
index 1bae57952ce..cf9a8b7bce7 100644
--- a/wagtail/wagtailcore/tests/test_page_model.py
+++ b/wagtail/wagtailcore/tests/test_page_model.py
@@ -16,6 +16,7 @@ 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)
+        alternate_port_events_site = Site.objects.create(hostname='events.example.com', root_page=events_page, port='8765')
 
         # requests without a Host: header should be directed to the default site
         request = HttpRequest()
@@ -28,6 +29,12 @@ def test_find_site_for_request(self):
         request.META['HTTP_HOST'] = 'events.example.com'
         self.assertEqual(Site.find_for_request(request), events_site)
 
+        # ports in the Host: header should be respected
+        request = HttpRequest()
+        request.path = '/'
+        request.META['HTTP_HOST'] = 'events.example.com:8765'
+        self.assertEqual(Site.find_for_request(request), alternate_port_events_site)
+
         # requests with an unrecognised Host: header should be directed to the default site
         request = HttpRequest()
         request.path = '/'

From ee9297b4453a1edeb6c21d29a3212f9689bb9b6c Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 27 Jun 2014 11:17:44 +0100
Subject: [PATCH 253/293] Update Site.objects.get_by_natural_key() to include
 port

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

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 2b8cc36ec3a..4bf818fb09a 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -26,8 +26,8 @@
 
 
 class SiteManager(models.Manager):
-    def get_by_natural_key(self, hostname):
-        return self.get(hostname=hostname)
+    def get_by_natural_key(self, hostname, port):
+        return self.get(hostname=hostname, port=port)
 
 
 class Site(models.Model):
@@ -40,7 +40,7 @@ class Meta:
         unique_together = ('hostname', 'port')
 
     def natural_key(self):
-        return (self.hostname,)
+        return (self.hostname, self.port)
 
     def __unicode__(self):
         return self.hostname + ("" if self.port == 80 else (":%d" % self.port)) + (" [default]" if self.is_default_site else "")

From 781aabad97bd5552eb00d9f2b36137b0c166fe62 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 27 Jun 2014 11:18:11 +0100
Subject: [PATCH 254/293] Update Site.find_for_request to respect https

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

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 4bf818fb09a..59742ffb7dc 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -53,7 +53,7 @@ def find_for_request(request):
                 hostname, port = request.META['HTTP_HOST'].split(':')
             except ValueError:
                 hostname = request.META['HTTP_HOST']
-                port = '80' # FIXME do we want this default?
+                port = '443' if request.is_secure() else '80'
             except KeyError:
                 # explicit routing straight to the final except clause
                 raise

From e3ccb7166d48c272127ec2405a5732b0fe7d6c93 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 27 Jun 2014 11:26:08 +0100
Subject: [PATCH 255/293] Added changelog entry for #301

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

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ef9c25707b8..d9e3f2cd230 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -17,6 +17,7 @@ Changelog
  * 'image' tag now accepts extra keyword arguments to be output as attributes on the img tag
  * Added an 'attrs' property to image rendition objects to output src, width, height and alt attributes all in one go
  * Added 'construct_whitelister_element_rules' hook for customising the HTML whitelist used when saving rich text fields
+ * Added 'get_next_siblings' and 'get_prev_siblings' to Page
  * Fix: Animated GIFs are now coalesced before resizing
  * Fix: Wand backend clones images before modifying them
  * Fix: Admin breadcrumb now positioned correctly on mobile

From 8416af159a0643e16e64a4466fdf16e465452e7e Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 27 Jun 2014 11:30:15 +0100
Subject: [PATCH 256/293] Changes to get_next/prev_siblings tests

---
 wagtail/wagtailcore/tests/test_page_model.py | 24 ++++++--------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py
index dfc45d72a44..2fc6af5ba98 100644
--- a/wagtail/wagtailcore/tests/test_page_model.py
+++ b/wagtail/wagtailcore/tests/test_page_model.py
@@ -226,23 +226,13 @@ def test_move_page(self):
         self.assertEqual(christmas.url_path, '/home/about-us/events/christmas/')
 
 
-class TestPagePagination(TestCase):
+class TestPrevNextSiblings(TestCase):
     fixtures = ['test.json']
 
-    def test_published_next(self):
-        events_index = Page.objects.get(url_path='/home/events/')
-        current_page = Page.objects.descendant_of(events_index).live().first()
+    def test_get_next_siblings(self):
+        christmas_event = Page.objects.get(url_path='/home/events/christmas/')
+        self.assertTrue(christmas_event.get_next_siblings().filter(url_path='/home/events/final-event/').exists())
 
-        # All pages must be live
-        while current_page:
-            self.assertTrue(current_page.live)
-            current_page = current_page.get_next_siblings().live().first()
-
-    def test_published_prev(self):
-        events_index = Page.objects.get(url_path='/home/events/')
-        current_page = Page.objects.descendant_of(events_index).live().last()
-
-        # All pages must be live
-        while current_page:
-            self.assertTrue(current_page.live)
-            current_page = current_page.get_prev_siblings().live().first()
+    def test_get_prev_siblings(self):
+        final_event = Page.objects.get(url_path='/home/events/final-event/')
+        self.assertTrue(final_event.get_prev_siblings().filter(url_path='/home/events/christmas/').exists())

From 1f28de4cf82a1157ddb11e104ceccf842a5332f0 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 27 Jun 2014 11:31:52 +0100
Subject: [PATCH 257/293] tweaks to unify button presentation cross-browser

---
 .../templates/wagtailstyleguide/base.html     |  22 ++++
 .../scss/components/dropdowns.scss            | 103 ++++--------------
 .../wagtailadmin/scss/components/forms.scss   |  65 +++++++----
 .../wagtailadmin/scss/components/icons.scss   |   4 +-
 .../wagtailadmin/scss/components/listing.scss |   4 -
 .../static/wagtailadmin/scss/core.scss        |   5 -
 .../pages/_preview_button_on_create.html      |   2 +-
 .../pages/_preview_button_on_edit.html        |   2 +-
 8 files changed, 94 insertions(+), 113 deletions(-)

diff --git a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
index 49b47f0b06e..54cfd23a675 100644
--- a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
+++ b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
@@ -173,9 +173,13 @@ <h2>Buttons</h2>
 
             <button>button</button>
 
+            <button class="button-small">small button</button>
+
             <button class="bicolor icon icon-plus">bicolor with icon</button>
 
             <input type="submit" class="bicolor icon icon-plus" value="bicolor only supported on button elements" />
+
+            <button class="icon icon-view">button</button>
         </section>
 
         <section id="dropdowns">
@@ -226,6 +230,24 @@ <h2>Dropdown buttons</h2>
                     </div>
                 </div>
             </div>
+
+            <div class="row">
+                <br />
+                <div class="col3">
+                    <div class="dropdown dropdown-button match-width">
+                        <a href="#" class="button" value="drop down">Link button</a>
+                        <div class="dropdown-toggle icon icon-arrow-down"></div>
+                        <ul role="menu">
+                            <li><a href="#">items should not exceed button width</a></li>
+                            <li><a href="#">item 2</a></li>
+                        </ul>
+                    </div>
+                </div>
+
+                <div class="col3">
+                    <button>button for comparison of height</button>
+                </div>
+            </div>
         </section>
 
         <section id="header">
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/dropdowns.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/dropdowns.scss
index 1428f0fd9b6..9a18c0a22ff 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/dropdowns.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/dropdowns.scss
@@ -2,29 +2,19 @@
     position:relative;
     @include clearfix();
 
-    .dropdown-toggle{
-        color:white;
-        text-transform:uppercase;
-        background-color:$color-teal;
-        line-height:3em;
-        padding-left:1em;
-        padding-right:1em;
-        cursor:pointer;
-
-        &:before,
-        &:after{
-            margin:0;
-        }   
-    }
-
-    input[type=button], input[type=submit], button, .button{
-        padding:1em 0;
+    input[type=submit], input[type=reset], input[type=button], button, .button{
+        padding:0;
         display:block;
         width:100%;
+        height:3em;
+        line-height:3em;
         text-align:left;
         padding-left:1em;
+        float:left;
+    }
+    input[type=submit], input[type=reset], input[type=button], button{
+        line-height:inherit;
     }
-
 
     ul{
         @include unlist();
@@ -115,25 +105,26 @@
         li{ 
             border-width:0 0 1px 0;
         }
-    }
-
-   
-    .button{
-        float:left;
-
-        &:hover{
-            background-color:$color-teal-darker;
-        }
-    }
+    }   
 
-    & > .button + .dropdown-toggle{
+    .dropdown-toggle{
+        color:white;
+        text-transform:uppercase;
+        background-color:$color-teal;
+        line-height:2.8em;
+        cursor:pointer;
+        height:100%;
         border-left:1px solid rgba(255,255,255,0.2);
         position:absolute;
         right:0;
-        height:100%;
         padding:0 0.5em;
         text-align:center;
 
+        &:before,
+        &:after{
+            margin:0;
+        }
+
         &:before{
             width:1em;
             font-size:1.2rem;
@@ -143,7 +134,8 @@
             background-color:$color-teal-darker;
         }
     }
-    &.open > .button + .dropdown-toggle{
+
+    &.open .dropdown-toggle{
         background-color:$color-teal-darker;
     }
 
@@ -193,55 +185,6 @@
     }
 }
 
-h2 .dropdown{
-    display:inline-block;
-    font-size:0.7em;
-    margin-right:0.5em;
-    vertical-align:middle;
-
-    .dropdown-toggle{
-        padding:0.5em 0;
-        border-right:1px solid $color-grey-3;
-
-        /* icon */
-        &:before{
-            opacity:0.5;
-            padding:0.2em;
-            height:1.1em;
-            text-align:left;
-        }
-        &:hover{
-            background-color:$color-teal;
-            border-color:transparent;
-        }
-    }
-    &.open{
-        .dropdown-toggle{
-            background-color:$color-teal;
-        }
-
-        ul{
-            left:auto;
-        }
-    }
-
-    .dropdown-toggle:hover{
-        background-color:$color-grey-3;
-        &:before{
-            color:white;
-            opacity:1;
-        }
-    }
-    &.open .dropdown-toggle:before{
-        background-color:$color-teal;
-        color:white;
-        opacity:1;
-    }
-
-
-}
-
-
 /* Transitions */
 .dropdown ul{
     @include transition(opacity 0.2s linear);
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index 6f5ee06299d..1bb43e5e81a 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -177,28 +177,32 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
     font-family:Open Sans,Arial,sans-serif;
     @include border-radius(3px);
     width:auto;
-    padding:0.7em 1em;
+    height:2.4em;
+    line-height:2.4em;
+    padding:0 1em;
+    font-size:0.9em;
+    font-weight:normal;
+    vertical-align: middle;
+    display:inline-block;
     background-color: $color-button;
     border:1px solid $color-button;
     color:white;
     text-decoration:none;
     text-transform:uppercase;
-    font-size:0.9em;
     white-space: nowrap;
     position:relative;
-    -webkit-font-smoothing: auto;
-    vertical-align: middle;
-    display:inline-block;
     overflow:hidden;
-    position:relative;
-    font-weight:normal;
     outline:none;
+    box-sizing:border-box;
+    -webkit-font-smoothing: auto;
     -moz-appearance: none;
     -moz-box-sizing:border-box;
 
     &.button-small{
-        padding:0.55em 0.8em;
-        font-size:1em;
+        padding:0 0.8em;
+        height:2em;
+        line-height:2em;
+        font-size:0.85em;
     }
 
     &.button-secondary{
@@ -266,7 +270,6 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
     }
 
     &.button-small.bicolor{
-        padding: 0.65em 0.8em;
         padding-left:3.5em;
 
         &:before{
@@ -288,9 +291,13 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
 /* Special styles to counteract Firefox's completely unwarranted assumptions about button styles */
 input[type=submit], input[type=reset], input[type=button], button{
     padding:0 1em;
-    height: em; 
-    vertical-align: middle;
+    height: 2.4em; 
     line-height:inherit;
+
+    &.button-small{
+        height:2em;
+        line-height:inherit;
+    }
 }
 
 button.icon{
@@ -703,29 +710,45 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
 
     input[type=submit], input[type=reset], input[type=button], .button, button{
         font-size:0.95em;
-        padding:0.75em 1.4em;
-
         padding:0 1.4em;
-        height: 2.8em; 
-        vertical-align: middle;
-        line-height:inherit;
+        height: 3em; 
+        line-height:3em;
+
+        &.button-small{
+            height:2.3em;
+            line-height:2.2em;
+        }
 
         &.bicolor{
             padding-left:3.5em;
 
             &:before{
                 width:2.2em;
-                line-height:2.15em;
+                line-height:2.45em;
+            }
+        }
+
+        &.button-small.bicolor{
+            line-height:2.3em;
+
+            &:before{
+                line-height:1.85em;
             }
         }
     }
 
     /* Special styles to counteract Firefox's completely unwarranted assumptions about button styles */
     input[type=submit], input[type=reset], input[type=button], button{
-        padding:0 1.4em;
-        height: 2.8em; 
-        vertical-align: middle;
         line-height:inherit;
+
+        &.button-small, &.bicolor,
+        &.button-small.bicolor{
+           line-height:inherit; 
+        }
+
+        &.button-small{
+            height:2.3em;
+        }
     }
 
 
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
index 92e83bbe5c3..5a677363830 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
@@ -221,8 +221,10 @@
 .icon-redirect:before{
     content:"3";
 }
+/* Credit: Icon made by Zurb from Flaticon.com */
 .icon-view:before{
-    content:"4"; /* Credit: Icon made by Zurb from Flaticon.com */
+    content:"4"; 
+    vertical-align:-4.5px;
     font-size:1.3rem;
 }
 .icon-collapse-down:before{
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
index e79d8b28dd1..74f58af4ccd 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
@@ -179,7 +179,6 @@ ul.listing{
         @include clearfix();
         margin-top:0.8em;
         text-transform:uppercase;
-        font-size:0.85em;
         margin-bottom:-0.5em;
 
         a{
@@ -327,9 +326,6 @@ ul.listing{
                 opacity:0.7;
             }
         }
-        a{
-            color:auto;
-        }
         .actions{
             margin-top:1em;
         }
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
index 1d73b450230..55e27b067ef 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
@@ -394,11 +394,6 @@ footer{
     .actions{
         width:250px;
         margin-right:$grid-gutter-width/2;
-
-        .button{
-            padding-top:1em;
-            padding-bottom:1em;
-        }
     }
 
     .meta{
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_create.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_create.html
index 4f60050be3c..1809a6510ed 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_create.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_create.html
@@ -1,4 +1,4 @@
-<button class="action-preview button {% if icon %}icon icon-view{% endif %}"
+<button class="action-preview {% if icon %}icon icon-view{% endif %}"
     data-action="{% url 'wagtailadmin_pages_preview_on_create' content_type.app_label content_type.model parent_page.id %}{% if mode %}?mode={{ mode|urlencode }}{% endif %}"
     data-placeholder="{% url 'wagtailadmin_pages_preview' %}"
     data-windowname="wagtail_preview_{{ parent_page.id }}_child">{{ label }}</button>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_edit.html
index a5cd5d24aa3..d24b9b0e961 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_edit.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_edit.html
@@ -1,4 +1,4 @@
-<button class="action-preview button {% if icon %}icon icon-view{% endif %}"
+<button class="action-preview {% if icon %}icon icon-view{% endif %}"
     data-action="{% url 'wagtailadmin_pages_preview_on_edit' page.id %}{% if mode %}?mode={{ mode|urlencode }}{% endif %}"
     data-placeholder="{% url 'wagtailadmin_pages_preview' %}"
     data-windowname="wagtail_preview_{{ page.id }}">{{ label }}</button>

From e85e723f8faee71c591adcb8ae42e8f65c2b7a52 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 27 Jun 2014 11:33:05 +0100
Subject: [PATCH 258/293] Make get_next/prev_siblings take an inclusive flag

---
 wagtail/wagtailcore/models.py                | 9 +++++----
 wagtail/wagtailcore/tests/test_page_model.py | 9 +++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index c3f949667be..dc03f7914a3 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -645,11 +645,12 @@ def get_descendants(self, inclusive=False):
     def get_siblings(self, inclusive=True):
         return Page.objects.sibling_of(self, inclusive)
 
-    def get_next_siblings(self):
-        return self.get_siblings().filter(path__gt=self.path).order_by('path')
+    def get_next_siblings(self, inclusive=False):
+        return self.get_siblings(inclusive).filter(path__gte=self.path).order_by('path')
+
+    def get_prev_siblings(self, inclusive=False):
+        return self.get_siblings(inclusive).filter(path__lte=self.path).order_by('-path')
 
-    def get_prev_siblings(self):
-        return self.get_siblings().filter(path__lt=self.path).order_by('-path')
 
 def get_navigation_menu_items():
     # Get all pages that appear in the navigation menu: ones which have children,
diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py
index 2fc6af5ba98..24eabd8667d 100644
--- a/wagtail/wagtailcore/tests/test_page_model.py
+++ b/wagtail/wagtailcore/tests/test_page_model.py
@@ -233,6 +233,15 @@ def test_get_next_siblings(self):
         christmas_event = Page.objects.get(url_path='/home/events/christmas/')
         self.assertTrue(christmas_event.get_next_siblings().filter(url_path='/home/events/final-event/').exists())
 
+    def test_get_next_siblings_inclusive(self):
+        christmas_event = Page.objects.get(url_path='/home/events/christmas/')
+
+        # First element must always be the current page
+        self.assertEqual(christmas_event.get_next_siblings(inclusive=True).first(), christmas_event)
+
     def test_get_prev_siblings(self):
         final_event = Page.objects.get(url_path='/home/events/final-event/')
         self.assertTrue(final_event.get_prev_siblings().filter(url_path='/home/events/christmas/').exists())
+
+        # First element must always be the current page
+        self.assertEqual(final_event.get_prev_siblings(inclusive=True).first(), final_event)

From 58ee0e97ef3ba5631c13098c03d6c02c9010f2e9 Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Fri, 27 Jun 2014 11:34:27 +0100
Subject: [PATCH 259/293] Tidy up embed tests

---
 wagtail/wagtailembeds/tests.py | 38 +++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py
index 2065e811bf6..e7d040aa69b 100644
--- a/wagtail/wagtailembeds/tests.py
+++ b/wagtail/wagtailembeds/tests.py
@@ -20,7 +20,7 @@
 )
 from wagtail.wagtailembeds.embeds import embedly as wagtail_embedly, oembed as wagtail_oembed
 from wagtail.wagtailembeds.templatetags.embed_filters import embed as embed_filter
-from wagtail.wagtailembeds.templatetags.embed_filters import embed as embedly_filter
+from wagtail.wagtailembeds.templatetags.embed_filters import embedly as embedly_filter
 
 
 class TestEmbeds(TestCase):
@@ -280,17 +280,28 @@ def test_valid_embed(self, loads, urlopen):
 
     @patch('urllib2.urlopen')
     @patch('json.loads')
-    def test_render_embed_filter(self, loads, urlopen):
+    def test_render_filter(self, loads, urlopen):
         urlopen.return_value = self.dummy_response
         loads.return_value = {'type': 'photo',
                               'url': 'http://www.example.com'}
-        temp = template.Template("{% load embed_filters %}{{ 'http://www.youtube.com/watch/'|embed }}")
+        temp = template.Template('{% load embed_filters %}{{ "http://www.youtube.com/watch/"|embed }}')
         context = template.Context()
         result = temp.render(context)
         self.assertEqual(result, '<img src="http://www.example.com" />')
 
+    @patch('urllib2.urlopen')
+    @patch('json.loads')
+    def test_render_filter_nonexistent_type(self, loads, urlopen):
+        urlopen.return_value = self.dummy_response
+        loads.return_value = {'type': 'foo',
+                              'url': 'http://www.example.com'}
+        temp = template.Template('{% load embed_filters %}{{ "http://www.youtube.com/watch/"|embed }}')
+        context = template.Context()
+        result = temp.render(context)
+        self.assertEqual(result, '')
+
 
-class TestEmbedlyFilter(TestCase):
+class TestEmbedlyFilter(TestEmbedFilter):
     def setUp(self):
         class DummyResponse(object):
             def read(self):
@@ -308,33 +319,22 @@ def test_valid_embed(self, loads, urlopen):
 
     @patch('urllib2.urlopen')
     @patch('json.loads')
-    def test_render_embed_filter(self, loads, urlopen):
-        urlopen.return_value = self.dummy_response
-        loads.return_value = {'type': 'photo',
-                              'url': 'http://www.example.com'}
-        temp = template.Template("{% load embed_filters %}{{ 'http://www.youtube.com/watch/'|embed }}")
-        context = template.Context()
-        result = temp.render(context)
-        self.assertEqual(result, '<img src="http://www.example.com" />')
-
-    @patch('urllib2.urlopen')
-    @patch('json.loads')
-    def test_render_embedly_filter(self, loads, urlopen):
+    def test_render_filter(self, loads, urlopen):
         urlopen.return_value = self.dummy_response
         loads.return_value = {'type': 'photo',
                               'url': 'http://www.example.com'}
-        temp = template.Template("{% load embed_filters %}{{ 'http://www.youtube.com/watch/'|embedly }}")
+        temp = template.Template('{% load embed_filters %}{{ "http://www.youtube.com/watch/"|embedly }}')
         context = template.Context()
         result = temp.render(context)
         self.assertEqual(result, '<img src="http://www.example.com" />')
 
     @patch('urllib2.urlopen')
     @patch('json.loads')
-    def test_render_embed_filter_nonexistent_type(self, loads, urlopen):
+    def test_render_filter_nonexistent_type(self, loads, urlopen):
         urlopen.return_value = self.dummy_response
         loads.return_value = {'type': 'foo',
                               'url': 'http://www.example.com'}
-        temp = template.Template("{% load embed_filters %}{{ 'http://www.youtube.com/watch/'|embed }}")
+        temp = template.Template('{% load embed_filters %}{{ "http://www.youtube.com/watch/"|embedly }}')
         context = template.Context()
         result = temp.render(context)
         self.assertEqual(result, '')

From 2dd991af53af6f4afe4ca738ff1941bdc40f32ce Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 27 Jun 2014 11:42:13 +0100
Subject: [PATCH 260/293] updating styling of chooser submit buttons

---
 .../static/wagtailadmin/scss/components/forms.scss          | 5 -----
 .../templates/wagtailadmin/edit_handlers/chooser_panel.html | 6 +++---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index 1bb43e5e81a..efc7f9ea171 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -570,11 +570,6 @@ ul.inline li:first-child, li.inline:first-child{
         .chosen { display: none; }
         .unchosen { display: block; }
     }
-
-    input[type=button]{
-        font-size:0.85em;
-        padding:0.5em 0.5em;
-    }
 }
 
 /* standard way of doing a chooser where the chosen object's title is overlayed */
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html
index a2058cab9ce..85cd368132c 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html
@@ -17,14 +17,14 @@
 
             <div class="actions">
                 {% if not field.field.required %}
-                    <input type="button" class="button-secondary action-clear" value="{% block clear_button_label %}{% trans "Clear choice" %}{% endblock %}">
+                    <input type="button" class="action-clear button-small button-secondary" value="{% block clear_button_label %}{% trans "Clear choice" %}{% endblock %}">
                 {% endif %}
-                <input type="button" class="button-secondary action-choose" value="{% block choose_another_button_label %}{% trans "Choose another item" %}{% endblock %}">
+                <input type="button" class="action-choose button-small button-secondary" value="{% block choose_another_button_label %}{% trans "Choose another item" %}{% endblock %}">
             </div>
         </div>
 
         <div class="unchosen">
-            <input type="button" class="action-choose button-secondary" value="{% block choose_button_label %}{% trans "Choose an item" %}{% endblock %}">
+            <input type="button" class="action-choose button-small button-secondary" value="{% block choose_button_label %}{% trans "Choose an item" %}{% endblock %}">
         </div>
 
     </div>

From 97e815903e0d7cc7356b362308dba7ab35c92b52 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 27 Jun 2014 11:49:55 +0100
Subject: [PATCH 261/293] replacing lines from another botched merge

---
 wagtail/wagtailadmin/views/pages.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 5f722edcae8..3516e6e75c0 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -25,16 +25,14 @@ def index(request, parent_page_id=None):
     pages = parent_page.get_children().prefetch_related('content_type')
 
     # Get page ordering
-    if 'ordering' in request.GET:
-        ordering = request.GET['ordering']
-
-        if ordering in ['title', '-title', 'content_type', '-content_type', 'live', '-live']:
-            pages = pages.order_by(ordering)
-    else:
+    ordering = request.GET.get('ordering', 'title')
+    if ordering not in ['title', '-title', 'content_type', '-content_type', 'live', '-live', 'ord']:
         ordering = 'title'
 
     # Pagination
     if ordering != 'ord':
+        pages = pages.order_by(ordering)
+
         p = request.GET.get('p', 1)
         paginator = Paginator(pages, 50)
         try:
@@ -181,6 +179,7 @@ def clean_slug(slug):
         'parent_page': parent_page,
         'edit_handler': edit_handler,
         'display_modes': page.get_page_modes(),
+        'form': form, # Used in unit tests
     })
 
 
@@ -266,6 +265,7 @@ def clean_slug(slug):
         'edit_handler': edit_handler,
         'errors_debug': errors_debug,
         'display_modes': page.get_page_modes(),
+        'form': form, # Used in unit tests
     })
 
 

From e0fb57d718c544a7b83df612cd879df0ba942401 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 27 Jun 2014 11:52:02 +0100
Subject: [PATCH 262/293] Minor coding style fix

---
 wagtail/wagtailadmin/signals.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/signals.py b/wagtail/wagtailadmin/signals.py
index 53a135584e5..f1c1bcb28a0 100644
--- a/wagtail/wagtailadmin/signals.py
+++ b/wagtail/wagtailadmin/signals.py
@@ -1,3 +1,4 @@
 from django.dispatch import Signal
 
-init_new_page = Signal(providing_args=["page","parent"])
\ No newline at end of file
+
+init_new_page = Signal(providing_args=['page', 'parent'])

From b4dc860287b4f7dc011a697d4493ab70bdd97f9c Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 27 Jun 2014 12:02:34 +0100
Subject: [PATCH 263/293] Changelog entry for #300

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

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index fdb3e3728d9..8ebe93959a0 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,7 @@ Changelog
  * Added 'construct_whitelister_element_rules' hook for customising the HTML whitelist used when saving rich text fields
  * Added 'in_menu' and 'not_in_menu' methods to PageQuerySet
  * Added 'get_next_siblings' and 'get_prev_siblings' to Page
+ * Added init_new_page signal
  * Fix: Animated GIFs are now coalesced before resizing
  * Fix: Wand backend clones images before modifying them
  * Fix: Admin breadcrumb now positioned correctly on mobile

From 10bc40098f55edbf2c0ebb9e814027365977809f Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 27 Jun 2014 12:02:48 +0100
Subject: [PATCH 264/293] tweak to notifications styling

---
 .../wagtailadmin/account/notification_preferences.html        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/notification_preferences.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/notification_preferences.html
index 971ce6f37fa..f267bd8f1b4 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/notification_preferences.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/notification_preferences.html
@@ -7,11 +7,11 @@
     <div class="nice-padding">
         <form action="{% url 'wagtailadmin_account_notification_preferences' %}" method="POST">
             {% csrf_token %}
-            <ul class="listing">
+            <ul class="fields">
                 {% for field in form %}
                     {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
                 {% endfor %}
-                <input type="submit" value="{% trans 'Update' %}" />
+                <li class="submit"><input type="submit" value="{% trans 'Update' %}" /></li>
             </ul>
         </form>
     </div>

From f026bb69115745660e52c161aeb134d5f92a2ac8 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 27 Jun 2014 12:09:00 +0100
Subject: [PATCH 265/293] added missing title tags to account pages

---
 .../wagtailadmin/templates/wagtailadmin/account/account.html    | 2 ++
 .../templates/wagtailadmin/account/change_password.html         | 2 ++
 .../wagtailadmin/account/notification_preferences.html          | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html
index f543d66dc0c..2e1ddda6a6e 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html
@@ -1,5 +1,7 @@
 {% extends "wagtailadmin/base.html" %}
 {% load i18n %}
+
+{% block titletag %}{% trans "Account" %}{% endblock %}
 {% block content %}
     {% trans "Account" as account_str %}
     {% include "wagtailadmin/shared/header.html" with title=account_str %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/change_password.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/change_password.html
index ed7e69fb69e..a684a38fea1 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/change_password.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/change_password.html
@@ -1,5 +1,7 @@
 {% extends "wagtailadmin/base.html" %}
 {% load i18n %}
+
+{% block titletag %}{% trans "Change password" %}{% endblock %}
 {% block content %}
     {% trans "Change password" as change_str %}
     {% include "wagtailadmin/shared/header.html" with title=change_str %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/notification_preferences.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/notification_preferences.html
index f267bd8f1b4..ddd03402c76 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/notification_preferences.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/notification_preferences.html
@@ -1,5 +1,7 @@
 {% extends "wagtailadmin/base.html" %}
 {% load i18n %}
+
+{% block titletag %}{% trans "Notification Preferences" %}{% endblock %}
 {% block content %}
     {% trans "Notification Preferences" as prefs_str %}
     {% include "wagtailadmin/shared/header.html" with title=prefs_str %}

From 749df44e06b28368749e1cebec08f88292ba99ba Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 27 Jun 2014 12:17:57 +0100
Subject: [PATCH 266/293] Revert "Split wagtailforms landing page into separate
 view"

This reverts commit 21ac2e3ab8bb3c52b45b7ae005a5c87a83785def.
---
 wagtail/wagtailforms/models.py | 26 +++++++++-----------------
 wagtail/wagtailforms/tests.py  | 12 +++---------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/wagtail/wagtailforms/models.py b/wagtail/wagtailforms/models.py
index 59941c6abd3..75f0eceee07 100644
--- a/wagtail/wagtailforms/models.py
+++ b/wagtail/wagtailforms/models.py
@@ -1,5 +1,5 @@
 from django.db import models
-from django.shortcuts import render, redirect
+from django.shortcuts import render
 from django.utils.translation import ugettext_lazy as _
 from django.utils.text import slugify
 
@@ -111,7 +111,6 @@ class AbstractForm(Page):
     """A Form Page. Pages implementing a form should inhert from it"""
 
     form_builder = FormBuilder
-    landing_page_path = 'done'
     is_abstract = True  # Don't display me in "Add"
 
     def __init__(self, *args, **kwargs):
@@ -153,8 +152,11 @@ def serve(self, request):
                     form_processor = self.form_processing_backend()
                     form_processor.process(self, form)
 
-                # Redirect to the landing page
-                return redirect(self.url + self.landing_page_path + '/')
+                # render the landing_page
+                # TODO: It is much better to redirect to it
+                return render(request, self.landing_page_template, {
+                    'self': self,
+                })
         else:
             form = form_class(**form_params)
 
@@ -163,18 +165,6 @@ def serve(self, request):
             'form': form,
         })
 
-    def serve_landing(self, request):
-        return render(request, self.landing_page_template, {
-            'self': self,
-        })
-
-    def route(self, request, path_components):
-        # Check if this request is for the landing page
-        if self.live and path_components == [self.landing_page_path]:
-            return self.serve_landing(request)
-
-        return super(AbstractForm, self).route(request, path_components)
-
     def get_page_modes(self):
         return [
             ('form', 'Form'),
@@ -183,7 +173,9 @@ def get_page_modes(self):
 
     def show_as_mode(self, mode):
         if mode == 'landing':
-            return self.serve_landing(self.dummy_request())
+            return render(self.dummy_request(), self.landing_page_template, {
+                'self': self,
+            })
         else:
             return super(AbstractForm, self).show_as_mode(mode)
 
diff --git a/wagtail/wagtailforms/tests.py b/wagtail/wagtailforms/tests.py
index 24bace8c521..0e162e16a69 100644
--- a/wagtail/wagtailforms/tests.py
+++ b/wagtail/wagtailforms/tests.py
@@ -38,7 +38,9 @@ def test_post_valid_form(self):
         })
 
         # Check response
-        self.assertEqual(response.status_code, 302)
+        self.assertContains(response, "Thank you for your feedback.")
+        self.assertTemplateNotUsed(response, 'tests/form_page.html')
+        self.assertTemplateUsed(response, 'tests/form_page_landing.html')
 
         # Check that an email was sent
         self.assertEqual(len(mail.outbox), 1)
@@ -51,14 +53,6 @@ def test_post_valid_form(self):
         form_page = Page.objects.get(url_path='/home/contact-us/')
         self.assertTrue(FormSubmission.objects.filter(page=form_page, form_data__contains='hello world').exists())
 
-    def test_get_landing_page(self):
-        response = self.client.get('/contact-us/done/')
-
-        # Check response
-        self.assertContains(response, "Thank you for your feedback.")
-        self.assertTemplateNotUsed(response, 'tests/form_page.html')
-        self.assertTemplateUsed(response, 'tests/form_page_landing.html')
-
 
 class TestPageModes(TestCase):
     fixtures = ['test.json']

From 77def962a701ae17f9a2e9f58f44c0bab36c9759 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 27 Jun 2014 12:40:36 +0100
Subject: [PATCH 267/293] hallo toolbar buttons reduced in height

---
 .../wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss
index 36db5559a33..8870849606d 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss
@@ -14,6 +14,7 @@
 }
 .hallotoolbar button{
     @include border-radius(0);
+    height:2.4em;
 }
 
 .richtext {

From 1ac20bc76653c3aa0104f70f8bdb91381df2dcc6 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 27 Jun 2014 12:49:22 +0100
Subject: [PATCH 268/293] Change the way we lookup the request port

---
 wagtail/wagtailcore/models.py | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 59742ffb7dc..dd7e5ac8cc6 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -47,27 +47,26 @@ def __unicode__(self):
 
     @staticmethod
     def find_for_request(request):
-        """Find the site object responsible for responding to this HTTP request object"""
+        """
+            Find the site object responsible for responding to this HTTP
+            request object. Try:
+             - unique hostname first
+             - then hostname and port
+             - if there is no matching hostname at all, or no matching
+               hostname:port combination, fall back to the unique default site,
+               or raise an exception
+            NB this means that high-numbered ports on an extant hostname may
+            still be routed to a different hostname which is set as the default
+        """
         try:
-            try:
-                hostname, port = request.META['HTTP_HOST'].split(':')
-            except ValueError:
-                hostname = request.META['HTTP_HOST']
-                port = '443' if request.is_secure() else '80'
-            except KeyError:
-                # explicit routing straight to the final except clause
-                raise
+            hostname = request.META['HTTP_HOST'].split(':')[0] # KeyError here goes to the final except clause
             try:
                 # find a Site matching this specific hostname
-                return Site.objects.get(hostname=hostname)
+                return Site.objects.get(hostname=hostname) # Site.DoesNotExist here goes to the final except clause
             except Site.MultipleObjectsReturned:
-                try:
-                    # as there were more than one, try matching by port too
-                    return Site.objects.get(hostname=hostname, port=int(port))
-                except Site.DoesNotExist:
-                    # explicit acknowledgement that this is another route to
-                    # the final except clause
-                    raise
+                # as there were more than one, try matching by port too
+                port = request.META['SERVER_PORT'] # KeyError here goes to the final except clause
+                return Site.objects.get(hostname=hostname, port=int(port)) # Site.DoesNotExist here goes to the final except clause
         except (Site.DoesNotExist, KeyError):
             # If no matching site exists, or request does not specify an HTTP_HOST (which
             # will often be the case for the Django test client), look for a catch-all Site.

From 7bbde27e83944ed4a4b4e0ac89fa9bdb3026f954 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 27 Jun 2014 14:56:03 +0100
Subject: [PATCH 269/293] fix to dropdown lists

---
 .../static/wagtailadmin/scss/components/dropdowns.scss           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/dropdowns.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/dropdowns.scss
index 9a18c0a22ff..d9e61a2cc16 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/dropdowns.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/dropdowns.scss
@@ -31,6 +31,7 @@
             border-color: rgba(255,255,255,0.2);
             border-style: solid;
             border-width:1px 0 0 0;
+            overflow:hidden;
         }
 
         a{

From e87e9eebc27b3eded788d901024265216ef33887 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 27 Jun 2014 12:50:49 +0100
Subject: [PATCH 270/293] Modify tests to include ports differently, add tests
 for unrecognised ports

---
 wagtail/wagtailcore/tests/test_page_model.py | 41 ++++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py
index cf9a8b7bce7..874b4bed3ef 100644
--- a/wagtail/wagtailcore/tests/test_page_model.py
+++ b/wagtail/wagtailcore/tests/test_page_model.py
@@ -17,6 +17,8 @@ def test_find_site_for_request(self):
         events_page = Page.objects.get(url_path='/home/events/')
         events_site = Site.objects.create(hostname='events.example.com', root_page=events_page)
         alternate_port_events_site = Site.objects.create(hostname='events.example.com', root_page=events_page, port='8765')
+        unrecognised_port = '8000'
+        unrecognised_hostname = 'unknown.site.com'
 
         # requests without a Host: header should be directed to the default site
         request = HttpRequest()
@@ -26,21 +28,54 @@ def test_find_site_for_request(self):
         # requests with a known Host: header should be directed to the specific site
         request = HttpRequest()
         request.path = '/'
-        request.META['HTTP_HOST'] = 'events.example.com'
+        request.META['HTTP_HOST'] = events_site.hostname
+        request.META['SERVER_PORT'] = events_site.port
         self.assertEqual(Site.find_for_request(request), events_site)
 
         # ports in the Host: header should be respected
         request = HttpRequest()
         request.path = '/'
-        request.META['HTTP_HOST'] = 'events.example.com:8765'
+        request.META['HTTP_HOST'] = alternate_port_events_site.hostname
+        request.META['SERVER_PORT'] = alternate_port_events_site.port
         self.assertEqual(Site.find_for_request(request), alternate_port_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'
+        request.META['HTTP_HOST'] = unrecognised_hostname
+        request.META['SERVER_PORT'] = '80'
         self.assertEqual(Site.find_for_request(request), default_site)
 
+        # requests on an unrecognised port should be directed to the default site
+        request = HttpRequest()
+        request.path = '/'
+        request.META['HTTP_HOST'] = default_site.hostname
+        request.META['SERVER_PORT'] = unrecognised_port
+        self.assertEqual(Site.find_for_request(request), default_site)
+
+        # requests with an unrecognised Host: header _and_ an unrecognised port
+        # hould be directed to the default site
+        request = HttpRequest()
+        request.path = '/'
+        request.META['HTTP_HOST'] = unrecognised_hostname
+        request.META['SERVER_PORT'] = unrecognised_port
+        self.assertEqual(Site.find_for_request(request), default_site)
+
+        # requests on an unrecognised port should be directed to the default
+        # site, even if their hostname (but not port) matches another entry
+        request = HttpRequest()
+        request.path = '/'
+        request.META['HTTP_HOST'] = events_site.hostname
+        request.META['SERVER_PORT'] = unrecognised_port
+        self.assertEqual(Site.find_for_request(request), default_site)
+
+        # port in the HTTP_HOST header is ignored
+        request = HttpRequest()
+        request.path = '/'
+        request.META['HTTP_HOST'] = "%s:%s" % (events_site.hostname, events_site.port)
+        request.META['SERVER_PORT'] = alternate_port_events_site.port
+        self.assertEqual(Site.find_for_request(request), alternate_port_events_site)
+
     def test_urls(self):
         default_site = Site.objects.get(is_default_site=True)
         homepage = Page.objects.get(url_path='/home/')

From 2051de4fe029ab257bf0a6caea7b41891ee66485 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 27 Jun 2014 15:45:17 +0100
Subject: [PATCH 271/293] Improved backwards compatibility of template tags
 rationalisation

---
 wagtail/wagtailcore/templatetags/pageurl.py         | 2 +-
 wagtail/wagtailcore/templatetags/rich_text.py       | 2 +-
 wagtail/wagtailembeds/templatetags/embed_filters.py | 2 +-
 wagtail/wagtailimages/templatetags/image_tags.py    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wagtail/wagtailcore/templatetags/pageurl.py b/wagtail/wagtailcore/templatetags/pageurl.py
index b31756c308b..63d2eb45e97 100644
--- a/wagtail/wagtailcore/templatetags/pageurl.py
+++ b/wagtail/wagtailcore/templatetags/pageurl.py
@@ -5,4 +5,4 @@
     "Use {% load wagtailcore_tags %} instead.", DeprecationWarning)
 
 
-from wagtail.wagtailcore.templatetags.wagtailcore_tags import register
+from wagtail.wagtailcore.templatetags.wagtailcore_tags import register, pageurl
diff --git a/wagtail/wagtailcore/templatetags/rich_text.py b/wagtail/wagtailcore/templatetags/rich_text.py
index ed8ac6f0f00..c1db482505a 100644
--- a/wagtail/wagtailcore/templatetags/rich_text.py
+++ b/wagtail/wagtailcore/templatetags/rich_text.py
@@ -5,4 +5,4 @@
     "Use {% load wagtailcore_tags %} instead.", DeprecationWarning)
 
 
-from wagtail.wagtailcore.templatetags.wagtailcore_tags import register
+from wagtail.wagtailcore.templatetags.wagtailcore_tags import register, richtext
diff --git a/wagtail/wagtailembeds/templatetags/embed_filters.py b/wagtail/wagtailembeds/templatetags/embed_filters.py
index 7d3500e5815..cb79ce69afe 100644
--- a/wagtail/wagtailembeds/templatetags/embed_filters.py
+++ b/wagtail/wagtailembeds/templatetags/embed_filters.py
@@ -5,4 +5,4 @@
     "Use {% load wagtailembeds_tags %} instead.", DeprecationWarning)
 
 
-from wagtail.wagtailembeds.templatetags.wagtailembeds_tags import register
+from wagtail.wagtailembeds.templatetags.wagtailembeds_tags import register, embed, embedly
diff --git a/wagtail/wagtailimages/templatetags/image_tags.py b/wagtail/wagtailimages/templatetags/image_tags.py
index 9a96356c9a2..590daa5cd90 100644
--- a/wagtail/wagtailimages/templatetags/image_tags.py
+++ b/wagtail/wagtailimages/templatetags/image_tags.py
@@ -5,4 +5,4 @@
     "Use {% load wagtailimages_tags %} instead.", DeprecationWarning)
 
 
-from wagtail.wagtailimages.templatetags.wagtailimages_tags import register
+from wagtail.wagtailimages.templatetags.wagtailimages_tags import register, image

From f9469b39a0c28d6237bb6e5c7fa10231cba6a676 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 27 Jun 2014 15:46:57 +0100
Subject: [PATCH 272/293] Fixed missing import

---
 wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py b/wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py
index aad751c6a60..1ad63cddf01 100644
--- a/wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py
+++ b/wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py
@@ -1,3 +1,5 @@
+import warnings
+
 from django import template
 from django.utils.safestring import mark_safe
 

From 3cac8ea3875169b34ee7ed854800d1dbcec4320a Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 27 Jun 2014 16:19:10 +0100
Subject: [PATCH 273/293] Add test that requests on unrecognised ports are
 routed to the expected site if no ambiguity

---
 wagtail/wagtailcore/tests/test_page_model.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py
index 874b4bed3ef..a9e9781b107 100644
--- a/wagtail/wagtailcore/tests/test_page_model.py
+++ b/wagtail/wagtailcore/tests/test_page_model.py
@@ -15,8 +15,10 @@ class TestRouting(TestCase):
     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/')
+        about_page = Page.objects.get(url_path='/home/about-us/')
         events_site = Site.objects.create(hostname='events.example.com', root_page=events_page)
         alternate_port_events_site = Site.objects.create(hostname='events.example.com', root_page=events_page, port='8765')
+        about_site = Site.objects.create(hostname='about.example.com', root_page=about_page)
         unrecognised_port = '8000'
         unrecognised_hostname = 'unknown.site.com'
 
@@ -61,8 +63,17 @@ def test_find_site_for_request(self):
         request.META['SERVER_PORT'] = unrecognised_port
         self.assertEqual(Site.find_for_request(request), default_site)
 
+        # requests on an unrecognised port should be directed to the site with
+        # matching hostname if there is no ambiguity
+        request = HttpRequest()
+        request.path = '/'
+        request.META['HTTP_HOST'] = about_site.hostname
+        request.META['SERVER_PORT'] = unrecognised_port
+        self.assertEqual(Site.find_for_request(request), about_site)
+
         # requests on an unrecognised port should be directed to the default
-        # site, even if their hostname (but not port) matches another entry
+        # site, even if their hostname (but not port) matches more than one
+        # other entry
         request = HttpRequest()
         request.path = '/'
         request.META['HTTP_HOST'] = events_site.hostname

From 1aad1e55c287778ccff4d2da7fad24b175b8e30b Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 27 Jun 2014 16:20:09 +0100
Subject: [PATCH 274/293] Refactor port/site tests into new test case and
 individual tests

---
 wagtail/wagtailcore/tests/test_page_model.py | 79 ++++++++++++--------
 1 file changed, 46 insertions(+), 33 deletions(-)

diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py
index a9e9781b107..41d47c4e0e5 100644
--- a/wagtail/wagtailcore/tests/test_page_model.py
+++ b/wagtail/wagtailcore/tests/test_page_model.py
@@ -9,83 +9,96 @@
 from wagtail.tests.models import EventPage, EventIndex, SimplePage
 
 
-class TestRouting(TestCase):
+class TestSiteRouting(TestCase):
     fixtures = ['test.json']
 
-    def test_find_site_for_request(self):
-        default_site = Site.objects.get(is_default_site=True)
+    def setUp(self):
+        self.default_site = Site.objects.get(is_default_site=True)
         events_page = Page.objects.get(url_path='/home/events/')
         about_page = Page.objects.get(url_path='/home/about-us/')
-        events_site = Site.objects.create(hostname='events.example.com', root_page=events_page)
-        alternate_port_events_site = Site.objects.create(hostname='events.example.com', root_page=events_page, port='8765')
-        about_site = Site.objects.create(hostname='about.example.com', root_page=about_page)
-        unrecognised_port = '8000'
-        unrecognised_hostname = 'unknown.site.com'
+        self.events_site = Site.objects.create(hostname='events.example.com', root_page=events_page)
+        self.alternate_port_events_site = Site.objects.create(hostname='events.example.com', root_page=events_page, port='8765')
+        self.about_site = Site.objects.create(hostname='about.example.com', root_page=about_page)
+        self.unrecognised_port = '8000'
+        self.unrecognised_hostname = 'unknown.site.com'
 
+    def test_no_host_header_routes_to_default_site(self):
         # 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)
+        self.assertEqual(Site.find_for_request(request), self.default_site)
 
+    def test_valid_headers_route_to_specific_site(self):
         # requests with a known Host: header should be directed to the specific site
         request = HttpRequest()
         request.path = '/'
-        request.META['HTTP_HOST'] = events_site.hostname
-        request.META['SERVER_PORT'] = events_site.port
-        self.assertEqual(Site.find_for_request(request), events_site)
+        request.META['HTTP_HOST'] = self.events_site.hostname
+        request.META['SERVER_PORT'] = self.events_site.port
+        self.assertEqual(Site.find_for_request(request), self.events_site)
 
+    def test_ports_in_request_headers_are_respected(self):
         # ports in the Host: header should be respected
         request = HttpRequest()
         request.path = '/'
-        request.META['HTTP_HOST'] = alternate_port_events_site.hostname
-        request.META['SERVER_PORT'] = alternate_port_events_site.port
-        self.assertEqual(Site.find_for_request(request), alternate_port_events_site)
+        request.META['HTTP_HOST'] = self.alternate_port_events_site.hostname
+        request.META['SERVER_PORT'] = self.alternate_port_events_site.port
+        self.assertEqual(Site.find_for_request(request), self.alternate_port_events_site)
 
+    def test_unrecognised_host_header_routes_to_default_site(self):
         # requests with an unrecognised Host: header should be directed to the default site
         request = HttpRequest()
         request.path = '/'
-        request.META['HTTP_HOST'] = unrecognised_hostname
+        request.META['HTTP_HOST'] = self.unrecognised_hostname
         request.META['SERVER_PORT'] = '80'
-        self.assertEqual(Site.find_for_request(request), default_site)
+        self.assertEqual(Site.find_for_request(request), self.default_site)
 
-        # requests on an unrecognised port should be directed to the default site
+    def test_unrecognised_port_and_default_host_routes_to_default_site(self):
+        # requests to the default host on an unrecognised port should be directed to the default site
         request = HttpRequest()
         request.path = '/'
-        request.META['HTTP_HOST'] = default_site.hostname
-        request.META['SERVER_PORT'] = unrecognised_port
-        self.assertEqual(Site.find_for_request(request), default_site)
+        request.META['HTTP_HOST'] = self.default_site.hostname
+        request.META['SERVER_PORT'] = self.unrecognised_port
+        self.assertEqual(Site.find_for_request(request), self.default_site)
 
+    def test_unrecognised_port_and_unrecognised_host_routes_to_default_site(self):
         # requests with an unrecognised Host: header _and_ an unrecognised port
         # hould be directed to the default site
         request = HttpRequest()
         request.path = '/'
-        request.META['HTTP_HOST'] = unrecognised_hostname
-        request.META['SERVER_PORT'] = unrecognised_port
-        self.assertEqual(Site.find_for_request(request), default_site)
+        request.META['HTTP_HOST'] = self.unrecognised_hostname
+        request.META['SERVER_PORT'] = self.unrecognised_port
+        self.assertEqual(Site.find_for_request(request), self.default_site)
 
+    def test_unrecognised_port_on_known_hostname_routes_there_if_no_ambiguity(self):
         # requests on an unrecognised port should be directed to the site with
         # matching hostname if there is no ambiguity
         request = HttpRequest()
         request.path = '/'
-        request.META['HTTP_HOST'] = about_site.hostname
-        request.META['SERVER_PORT'] = unrecognised_port
-        self.assertEqual(Site.find_for_request(request), about_site)
+        request.META['HTTP_HOST'] = self.about_site.hostname
+        request.META['SERVER_PORT'] = self.unrecognised_port
+        self.assertEqual(Site.find_for_request(request), self.about_site)
 
+    def test_unrecognised_port_on_known_hostname_routes_to_default_site_if_ambiguity(self):
         # requests on an unrecognised port should be directed to the default
         # site, even if their hostname (but not port) matches more than one
         # other entry
         request = HttpRequest()
         request.path = '/'
-        request.META['HTTP_HOST'] = events_site.hostname
-        request.META['SERVER_PORT'] = unrecognised_port
-        self.assertEqual(Site.find_for_request(request), default_site)
+        request.META['HTTP_HOST'] = self.events_site.hostname
+        request.META['SERVER_PORT'] = self.unrecognised_port
+        self.assertEqual(Site.find_for_request(request), self.default_site)
 
+    def test_port_in_http_host_header_is_ignored(self):
         # port in the HTTP_HOST header is ignored
         request = HttpRequest()
         request.path = '/'
-        request.META['HTTP_HOST'] = "%s:%s" % (events_site.hostname, events_site.port)
-        request.META['SERVER_PORT'] = alternate_port_events_site.port
-        self.assertEqual(Site.find_for_request(request), alternate_port_events_site)
+        request.META['HTTP_HOST'] = "%s:%s" % (self.events_site.hostname, self.events_site.port)
+        request.META['SERVER_PORT'] = self.alternate_port_events_site.port
+        self.assertEqual(Site.find_for_request(request), self.alternate_port_events_site)
+
+
+class TestRouting(TestCase):
+    fixtures = ['test.json']
 
     def test_urls(self):
         default_site = Site.objects.get(is_default_site=True)

From 8315370e63dae973dbecd15c0f1d8ae36528f298 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 27 Jun 2014 16:44:04 +0100
Subject: [PATCH 275/293] Fixed useages of deprecated templatetags

---
 wagtail/tests/templates/tests/event_page.html              | 3 ++-
 wagtail/tests/templates/tests/form_page.html               | 3 ++-
 wagtail/tests/templates/tests/form_page_landing.html       | 3 ++-
 wagtail/tests/templates/tests/includes/event_listing.html  | 2 +-
 wagtail/tests/templates/tests/simple_page.html             | 3 ++-
 .../wagtaildocs/templates/wagtaildocs/documents/add.html   | 2 +-
 .../wagtaildocs/templates/wagtaildocs/documents/edit.html  | 2 +-
 .../templates/wagtailembeds/chooser/chooser.html           | 2 +-
 wagtail/wagtailembeds/tests.py                             | 7 +++----
 .../templates/wagtailimages/chooser/chooser.html           | 2 +-
 .../templates/wagtailimages/chooser/results.html           | 2 +-
 .../templates/wagtailimages/chooser/select_format.html     | 2 +-
 .../wagtailimages/edit_handlers/image_chooser_panel.html   | 2 +-
 .../wagtailimages/templates/wagtailimages/images/add.html  | 2 +-
 .../templates/wagtailimages/images/confirm_delete.html     | 2 +-
 .../wagtailimages/templates/wagtailimages/images/edit.html | 2 +-
 .../templates/wagtailimages/images/index.html              | 2 +-
 .../templates/wagtailimages/images/results.html            | 2 +-
 wagtail/wagtailimages/tests.py                             | 6 +++---
 wagtail/wagtailusers/templates/wagtailusers/create.html    | 2 +-
 wagtail/wagtailusers/templates/wagtailusers/edit.html      | 2 +-
 21 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/wagtail/tests/templates/tests/event_page.html b/wagtail/tests/templates/tests/event_page.html
index b60bc60588e..795b7bf0a7a 100644
--- a/wagtail/tests/templates/tests/event_page.html
+++ b/wagtail/tests/templates/tests/event_page.html
@@ -1,4 +1,5 @@
-{% load pageurl %}
+{% load wagtailcore_tags %}
+
 <!DOCTYPE HTML>
 <html>
     <head>
diff --git a/wagtail/tests/templates/tests/form_page.html b/wagtail/tests/templates/tests/form_page.html
index 5fbd2ae9f24..d908c60a27c 100644
--- a/wagtail/tests/templates/tests/form_page.html
+++ b/wagtail/tests/templates/tests/form_page.html
@@ -1,4 +1,5 @@
-{% load pageurl %}
+{% load wagtailcore_tags %}
+
 <!DOCTYPE HTML>
 <html>
     <head>
diff --git a/wagtail/tests/templates/tests/form_page_landing.html b/wagtail/tests/templates/tests/form_page_landing.html
index e29a6a942f2..d9a6369d479 100644
--- a/wagtail/tests/templates/tests/form_page_landing.html
+++ b/wagtail/tests/templates/tests/form_page_landing.html
@@ -1,4 +1,5 @@
-{% load pageurl %}
+{% load wagtailcore_tags %}
+
 <!DOCTYPE HTML>
 <html>
     <head>
diff --git a/wagtail/tests/templates/tests/includes/event_listing.html b/wagtail/tests/templates/tests/includes/event_listing.html
index 31c0b1b3bab..02f880ec4ea 100644
--- a/wagtail/tests/templates/tests/includes/event_listing.html
+++ b/wagtail/tests/templates/tests/includes/event_listing.html
@@ -1,4 +1,4 @@
-{% load pageurl %}
+{% load wagtailcore_tags %}
 
 <ul>
     {% for event in events %}
diff --git a/wagtail/tests/templates/tests/simple_page.html b/wagtail/tests/templates/tests/simple_page.html
index 3413b3aa273..1f35935147d 100644
--- a/wagtail/tests/templates/tests/simple_page.html
+++ b/wagtail/tests/templates/tests/simple_page.html
@@ -1,4 +1,5 @@
-{% load pageurl %}
+{% load wagtailcore_tags %}
+
 <!DOCTYPE HTML>
 <html>
     <head>
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
index c4466d89769..f9a221bb336 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
@@ -1,6 +1,6 @@
 {% extends "wagtailadmin/base.html" %}
 {% load i18n %}
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% block titletag %}{% trans "Add a document" %}{% endblock %}
 {% block bodyclass %}menu-documents{% endblock %}
 {% block extra_css %}
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
index d27f16155cb..55734fbbd90 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
@@ -1,6 +1,6 @@
 {% extends "wagtailadmin/base.html" %}
 {% load i18n %}
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% block titletag %}{% blocktrans with title=document.title %}Editing {{ title }}{% endblocktrans %}{% endblock %}
 {% block bodyclass %}menu-documents{% endblock %}
 {% block extra_css %}
diff --git a/wagtail/wagtailembeds/templates/wagtailembeds/chooser/chooser.html b/wagtail/wagtailembeds/templates/wagtailembeds/chooser/chooser.html
index b914f9c6b19..fbc28c425c3 100644
--- a/wagtail/wagtailembeds/templates/wagtailembeds/chooser/chooser.html
+++ b/wagtail/wagtailembeds/templates/wagtailembeds/chooser/chooser.html
@@ -1,4 +1,4 @@
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 {% trans "Insert embed" as ins_emb_str %}
 {% include "wagtailadmin/shared/header.html" with title=ins_emb_str merged=1 %}
diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py
index e7d040aa69b..40556698196 100644
--- a/wagtail/wagtailembeds/tests.py
+++ b/wagtail/wagtailembeds/tests.py
@@ -19,8 +19,7 @@
     AccessDeniedEmbedlyException,
 )
 from wagtail.wagtailembeds.embeds import embedly as wagtail_embedly, oembed as wagtail_oembed
-from wagtail.wagtailembeds.templatetags.embed_filters import embed as embed_filter
-from wagtail.wagtailembeds.templatetags.embed_filters import embedly as embedly_filter
+from wagtail.wagtailembeds.templatetags.wagtailembeds_tags import embed as embed_filter, embedly as embedly_filter
 
 
 class TestEmbeds(TestCase):
@@ -284,7 +283,7 @@ def test_render_filter(self, loads, urlopen):
         urlopen.return_value = self.dummy_response
         loads.return_value = {'type': 'photo',
                               'url': 'http://www.example.com'}
-        temp = template.Template('{% load embed_filters %}{{ "http://www.youtube.com/watch/"|embed }}')
+        temp = template.Template('{% load wagtailembeds_tags %}{{ "http://www.youtube.com/watch/"|embed }}')
         context = template.Context()
         result = temp.render(context)
         self.assertEqual(result, '<img src="http://www.example.com" />')
@@ -295,7 +294,7 @@ def test_render_filter_nonexistent_type(self, loads, urlopen):
         urlopen.return_value = self.dummy_response
         loads.return_value = {'type': 'foo',
                               'url': 'http://www.example.com'}
-        temp = template.Template('{% load embed_filters %}{{ "http://www.youtube.com/watch/"|embed }}')
+        temp = template.Template('{% load wagtailembeds_tags %}{{ "http://www.youtube.com/watch/"|embed }}')
         context = template.Context()
         result = temp.render(context)
         self.assertEqual(result, '')
diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html b/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html
index 1fcadb3f994..984f6901010 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html
@@ -1,4 +1,4 @@
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 {% trans "Choose an image" as choose_str %}
 {% include "wagtailadmin/shared/header.html" with title=choose_str merged=1 tabbed=1 icon="image" %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/results.html b/wagtail/wagtailimages/templates/wagtailimages/chooser/results.html
index d4453179123..497211f26df 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/chooser/results.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/chooser/results.html
@@ -1,4 +1,4 @@
-{% load image_tags wagtailadmin_tags %}
+{% load wagtailimages_tags wagtailadmin_tags %}
 {% load i18n %}
 {% if images %}
     {% if is_searching %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.html b/wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.html
index 79eab3f8349..6aed9d005fe 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.html
@@ -1,4 +1,4 @@
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 {% trans "Choose a format" as choose_str %}
 {% include "wagtailadmin/shared/header.html" with title=choose_str %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/edit_handlers/image_chooser_panel.html b/wagtail/wagtailimages/templates/wagtailimages/edit_handlers/image_chooser_panel.html
index d12f075f96c..abae4c9058a 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/edit_handlers/image_chooser_panel.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/edit_handlers/image_chooser_panel.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/edit_handlers/chooser_panel.html" %}
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 
 {% block chooser_class %}image-chooser{% endblock %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/add.html b/wagtail/wagtailimages/templates/wagtailimages/images/add.html
index 12f98b1bd37..33c477fb449 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/add.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/add.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 {% block titletag %}{% trans "Add an image" %}{% endblock %}
 {% block bodyclass %}menu-images{% endblock %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/confirm_delete.html b/wagtail/wagtailimages/templates/wagtailimages/images/confirm_delete.html
index 0b6d6618f0d..ac9915dc8f7 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/confirm_delete.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/confirm_delete.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 {% block titletag %}{% trans "Delete image" %}{% endblock %}
 {% block bodyclass %}menu-images{% endblock %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
index a1574527eef..f75b4e56e8d 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 {% block titletag %}{% blocktrans with title=image.title %}Editing image {{ title }}{% endblocktrans %}{% endblock %}
 {% block bodyclass %}menu-images{% endblock %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/index.html b/wagtail/wagtailimages/templates/wagtailimages/images/index.html
index 9e8d012b82b..ba7465895f6 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/index.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/index.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 
 {% block titletag %}{% trans "Images" %}{% endblock %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/results.html b/wagtail/wagtailimages/templates/wagtailimages/images/results.html
index 006d3cd6966..60380a7d867 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/results.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/results.html
@@ -1,4 +1,4 @@
-{% load image_tags wagtailadmin_tags %}
+{% load wagtailimages_tags wagtailadmin_tags %}
 {% load i18n %}
 {% if images %}
     {% if is_searching %}
diff --git a/wagtail/wagtailimages/tests.py b/wagtail/wagtailimages/tests.py
index 91ed2df6a77..5b7b2fd1429 100644
--- a/wagtail/wagtailimages/tests.py
+++ b/wagtail/wagtailimages/tests.py
@@ -191,7 +191,7 @@ def setUp(self):
         )
 
     def render_image_tag(self, image, filter_spec):
-        temp = template.Template('{% load image_tags %}{% image image_obj ' + filter_spec + '%}')
+        temp = template.Template('{% load wagtailimages_tags %}{% image image_obj ' + filter_spec + '%}')
         context = template.Context({'image_obj': image})
         return temp.render(context)
 
@@ -204,7 +204,7 @@ def test_image_tag(self):
         self.assertTrue('alt="Test image"' in result)
 
     def render_image_tag_as(self, image, filter_spec):
-        temp = template.Template('{% load image_tags %}{% image image_obj ' + filter_spec + ' as test_img %}<img {{ test_img.attrs }} />')
+        temp = template.Template('{% load wagtailimages_tags %}{% image image_obj ' + filter_spec + ' as test_img %}<img {{ test_img.attrs }} />')
         context = template.Context({'image_obj': image})
         return temp.render(context)
 
@@ -217,7 +217,7 @@ def test_image_tag_attrs(self):
         self.assertTrue('alt="Test image"' in result)
 
     def render_image_tag_with_extra_attributes(self, image, title):
-        temp = template.Template('{% load image_tags %}{% image image_obj width-400 class="photo" title=title|lower %}')
+        temp = template.Template('{% load wagtailimages_tags %}{% image image_obj width-400 class="photo" title=title|lower %}')
         context = template.Context({'image_obj': image, 'title': title})
         return temp.render(context)
 
diff --git a/wagtail/wagtailusers/templates/wagtailusers/create.html b/wagtail/wagtailusers/templates/wagtailusers/create.html
index e2f5150c882..91cba6846a7 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/create.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/create.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 {% block titletag %}{% trans "Add user" %}{% endblock %}
 {% block bodyclass %}menu-users{% endblock %}
diff --git a/wagtail/wagtailusers/templates/wagtailusers/edit.html b/wagtail/wagtailusers/templates/wagtailusers/edit.html
index c6c43ce6dd3..1f0cc384fbd 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/edit.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/edit.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 {% block titletag %}{% trans "Editing" %} {{ user.username}}{% endblock %}
 {% block bodyclass %}menu-users{% endblock %}

From 5f450d1f036932fbd503887389d886c2377ceec0 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Mon, 30 Jun 2014 10:16:19 +0100
Subject: [PATCH 276/293] stray > removed

---
 .../wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html
index 583d927443c..50bfb186ea4 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html
@@ -9,6 +9,6 @@
         {% endif %}
     {% endfor %}
     {% if include_self %}
-        <li><a href="{% if choosing %}{% url 'wagtailadmin_choose_page_child' page.id %}?{{ querystring }}{% else %}{% url 'wagtailadmin_explore' page.id %}{% endif %}" {% if choosing %}class="navigate-pages"{% endif %}>>{{ page.title }}</a></li>
+        <li><a href="{% if choosing %}{% url 'wagtailadmin_choose_page_child' page.id %}?{{ querystring }}{% else %}{% url 'wagtailadmin_explore' page.id %}{% endif %}" {% if choosing %}class="navigate-pages"{% endif %}>{{ page.title }}</a></li>
     {% endif %}
 </ul>

From 1736b8173c9cac3a7dac11f671a3dbc506e6764f Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 30 Jun 2014 10:13:08 +0100
Subject: [PATCH 277/293] Put back some missing tests

---
 .../wagtailadmin/tests/test_pages_views.py    | 181 ++++++++++++++++++
 1 file changed, 181 insertions(+)

diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py
index 65a614538db..c069422fa67 100644
--- a/wagtail/wagtailadmin/tests/test_pages_views.py
+++ b/wagtail/wagtailadmin/tests/test_pages_views.py
@@ -1,8 +1,11 @@
+from datetime import timedelta
+
 from django.test import TestCase
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User, Permission
 from django.core import mail
 from django.core.paginator import Paginator
+from django.utils import timezone
 
 from wagtail.tests.models import SimplePage, EventPage, StandardIndex, StandardChild, BusinessIndex, BusinessChild, BusinessSubIndex
 from wagtail.tests.utils import unittest, WagtailTestUtils
@@ -169,6 +172,58 @@ def test_create_simplepage_post(self):
         self.assertIsInstance(page, SimplePage)
         self.assertFalse(page.live)
 
+    def test_create_simplepage_scheduled(self):
+        go_live_at = timezone.now() + timedelta(days=1)
+        expire_at = timezone.now() + timedelta(days=2)
+        post_data = {
+            'title': "New page!",
+            'content': "Some content",
+            'slug': 'hello-world',
+            'go_live_at': str(go_live_at).split('.')[0],
+            'expire_at': str(expire_at).split('.')[0],
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
+
+        # Should be redirected to explorer page
+        self.assertEqual(response.status_code, 302)
+
+        # Find the page and check the scheduled times
+        page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific
+        self.assertEquals(page.go_live_at.date(), go_live_at.date())
+        self.assertEquals(page.expire_at.date(), expire_at.date())
+        self.assertEquals(page.expired, False)
+        self.assertTrue(page.status_string, "draft")
+
+        # No revisions with approved_go_live_at
+        self.assertFalse(PageRevision.objects.filter(page=page).exclude(approved_go_live_at__isnull=True).exists())
+
+    def test_create_simplepage_scheduled_go_live_before_expiry(self):
+        post_data = {
+            'title': "New page!",
+            'content': "Some content",
+            'slug': 'hello-world',
+            'go_live_at': str(timezone.now() + timedelta(days=2)).split('.')[0],
+            'expire_at': str(timezone.now() + timedelta(days=1)).split('.')[0],
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
+
+        # Should be redirected to explorer page
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue(response.context['edit_handler'].form.errors)
+
+    def test_create_simplepage_scheduled_expire_in_the_past(self):
+        post_data = {
+            'title': "New page!",
+            'content': "Some content",
+            'slug': 'hello-world',
+            'expire_at': str(timezone.now() + timedelta(days=-1)).split('.')[0],
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
+
+        # Should be redirected to explorer page
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue(response.context['edit_handler'].form.errors)
+
     def test_create_simplepage_post_publish(self):
         post_data = {
             'title': "New page!",
@@ -187,6 +242,34 @@ def test_create_simplepage_post_publish(self):
         self.assertIsInstance(page, SimplePage)
         self.assertTrue(page.live)
 
+    def test_create_simplepage_post_publish_scheduled(self):
+        go_live_at = timezone.now() + timedelta(days=1)
+        expire_at = timezone.now() + timedelta(days=2)
+        post_data = {
+            'title': "New page!",
+            'content': "Some content",
+            'slug': 'hello-world',
+            'action-publish': "Publish",
+            'go_live_at': str(go_live_at).split('.')[0],
+            'expire_at': str(expire_at).split('.')[0],
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
+
+        # Should be redirected to explorer page
+        self.assertEqual(response.status_code, 302)
+
+        # Find the page and check it
+        page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific
+        self.assertEquals(page.go_live_at.date(), go_live_at.date())
+        self.assertEquals(page.expire_at.date(), expire_at.date())
+        self.assertEquals(page.expired, False)
+
+        # A revision with approved_go_live_at should exist now
+        self.assertTrue(PageRevision.objects.filter(page=page).exclude(approved_go_live_at__isnull=True).exists())
+        # But Page won't be live
+        self.assertFalse(page.live)
+        self.assertTrue(page.status_string, "scheduled")
+
     def test_create_simplepage_post_submit(self):
         # Create a moderator user for testing email
         moderator = User.objects.create_superuser('moderator', 'moderator@email.com', 'password')
@@ -327,6 +410,33 @@ def test_page_edit_post(self):
         child_page_new = SimplePage.objects.get(id=self.child_page.id)
         self.assertTrue(child_page_new.has_unpublished_changes)
 
+    def test_edit_post_scheduled(self):
+        go_live_at = timezone.now() + timedelta(days=1)
+        expire_at = timezone.now() + timedelta(days=2)
+        post_data = {
+            'title': "I've been edited!",
+            'content': "Some content",
+            'slug': 'hello-world',
+            'go_live_at': str(go_live_at).split('.')[0],
+            'expire_at': str(expire_at).split('.')[0],
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
+
+        # Should be redirected to explorer page
+        self.assertEqual(response.status_code, 302)
+
+        child_page_new = SimplePage.objects.get(id=self.child_page.id)
+
+        # The page will still be live
+        self.assertTrue(child_page_new.live)
+
+        # A revision with approved_go_live_at should not exist
+        self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists())
+
+        # But a revision with go_live_at and expire_at in their content json *should* exist
+        self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(go_live_at.date())).exists())
+        self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(expire_at.date())).exists())
+
     def test_page_edit_post_publish(self):
         # Tests publish from edit page
         post_data = {
@@ -347,6 +457,77 @@ def test_page_edit_post_publish(self):
         # The page shouldn't have "has_unpublished_changes" flag set
         self.assertFalse(child_page_new.has_unpublished_changes)
 
+    def test_edit_post_publish_scheduled(self):
+        go_live_at = timezone.now() + timedelta(days=1)
+        expire_at = timezone.now() + timedelta(days=2)
+        post_data = {
+            'title': "I've been edited!",
+            'content': "Some content",
+            'slug': 'hello-world',
+            'action-publish': "Publish",
+            'go_live_at': str(go_live_at).split('.')[0],
+            'expire_at': str(expire_at).split('.')[0],
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
+
+        # Should be redirected to explorer page
+        self.assertEqual(response.status_code, 302)
+
+        child_page_new = SimplePage.objects.get(id=self.child_page.id)
+
+        # The page should not be live anymore
+        self.assertFalse(child_page_new.live)
+
+        # Instead a revision with approved_go_live_at should now exist
+        self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists())
+
+    def test_edit_post_publish_now_an_already_scheduled(self):
+        # First let's publish a page with a go_live_at in the future
+        go_live_at = timezone.now() + timedelta(days=1)
+        expire_at = timezone.now() + timedelta(days=2)
+        post_data = {
+            'title': "I've been edited!",
+            'content': "Some content",
+            'slug': 'hello-world',
+            'action-publish': "Publish",
+            'go_live_at': str(go_live_at).split('.')[0],
+            'expire_at': str(expire_at).split('.')[0],
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
+
+        # Should be redirected to explorer page
+        self.assertEqual(response.status_code, 302)
+
+        child_page_new = SimplePage.objects.get(id=self.child_page.id)
+
+        # The page should not be live anymore
+        self.assertFalse(child_page_new.live)
+
+        # Instead a revision with approved_go_live_at should now exist
+        self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists())
+
+        # Now, let's edit it and publish it right now
+        go_live_at = timezone.now()
+        post_data = {
+            'title': "I've been edited!",
+            'content': "Some content",
+            'slug': 'hello-world',
+            'action-publish': "Publish",
+            'go_live_at': "",
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
+
+        # Should be redirected to explorer page
+        self.assertEqual(response.status_code, 302)
+
+        child_page_new = SimplePage.objects.get(id=self.child_page.id)
+
+        # The page should be live now
+        self.assertTrue(child_page_new.live)
+
+        # And a revision with approved_go_live_at should not exist
+        self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists())
+
     def test_page_edit_post_submit(self):
         # Create a moderator user for testing email
         moderator = User.objects.create_superuser('moderator', 'moderator@email.com', 'password')

From 61599b07dda2196d111985e07074def3da18064f Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 30 Jun 2014 10:17:31 +0100
Subject: [PATCH 278/293] Made scheduled publish errors into field errors

---
 .../wagtailadmin/tests/test_pages_views.py    | 41 +++++++++++++--
 wagtail/wagtailadmin/views/pages.py           | 52 +++++++++++++++++++
 wagtail/wagtailcore/models.py                 | 11 ----
 3 files changed, 89 insertions(+), 15 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py
index c069422fa67..848e1f967fe 100644
--- a/wagtail/wagtailadmin/tests/test_pages_views.py
+++ b/wagtail/wagtailadmin/tests/test_pages_views.py
@@ -207,9 +207,11 @@ def test_create_simplepage_scheduled_go_live_before_expiry(self):
         }
         response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
 
-        # Should be redirected to explorer page
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(response.context['edit_handler'].form.errors)
+
+        # Check that a form error was raised
+        self.assertFormError(response, 'form', 'go_live_at', "Go live date/time must be before expiry date/time")
+        self.assertFormError(response, 'form', 'expire_at', "Go live date/time must be before expiry date/time")
 
     def test_create_simplepage_scheduled_expire_in_the_past(self):
         post_data = {
@@ -220,9 +222,10 @@ def test_create_simplepage_scheduled_expire_in_the_past(self):
         }
         response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
 
-        # Should be redirected to explorer page
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(response.context['edit_handler'].form.errors)
+
+        # Check that a form error was raised
+        self.assertFormError(response, 'form', 'expire_at', "Expiry date/time must be in the future")
 
     def test_create_simplepage_post_publish(self):
         post_data = {
@@ -437,6 +440,36 @@ def test_edit_post_scheduled(self):
         self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(go_live_at.date())).exists())
         self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(expire_at.date())).exists())
 
+    def test_edit_scheduled_go_live_before_expiry(self):
+        post_data = {
+            'title': "I've been edited!",
+            'content': "Some content",
+            'slug': 'hello-world',
+            'go_live_at': str(timezone.now() + timedelta(days=2)).split('.')[0],
+            'expire_at': str(timezone.now() + timedelta(days=1)).split('.')[0],
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
+
+        self.assertEqual(response.status_code, 200)
+
+        # Check that a form error was raised
+        self.assertFormError(response, 'form', 'go_live_at', "Go live date/time must be before expiry date/time")
+        self.assertFormError(response, 'form', 'expire_at', "Go live date/time must be before expiry date/time")
+
+    def test_edit_scheduled_expire_in_the_past(self):
+        post_data = {
+            'title': "I've been edited!",
+            'content': "Some content",
+            'slug': 'hello-world',
+            'expire_at': str(timezone.now() + timedelta(days=-1)).split('.')[0],
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
+
+        self.assertEqual(response.status_code, 200)
+
+        # Check that a form error was raised
+        self.assertFormError(response, 'form', 'expire_at', "Expiry date/time must be in the future")
+
     def test_page_edit_post_publish(self):
         # Tests publish from edit page
         post_data = {
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index e6871b3ce04..29f3b68bb0f 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -137,6 +137,32 @@ def clean_slug(slug):
             return slug
         form.fields['slug'].clean = clean_slug
 
+        # Stick another validator into the form to check that the scheduled publishing settings are set correctly
+        def clean():
+            cleaned_data = form_class.clean(form)
+
+            # Go live must be before expire
+            go_live_at = cleaned_data.get('go_live_at')
+            expire_at = cleaned_data.get('expire_at')
+
+            if go_live_at and expire_at:
+                if go_live_at > expire_at:
+                    msg = _('Go live date/time must be before expiry date/time')
+                    form._errors['go_live_at'] = form.error_class([msg])
+                    form._errors['expire_at'] = form.error_class([msg])
+                    del cleaned_data['go_live_at']
+                    del cleaned_data['expire_at']
+
+            # Expire must be in the future
+            expire_at = cleaned_data.get('expire_at')
+
+            if expire_at and expire_at < timezone.now():
+                form._errors['expire_at'] = form.error_class([_('Expiry date/time must be in the future')])
+                del cleaned_data['expire_at']
+
+            return cleaned_data
+        form.clean = clean
+
         if form.is_valid():
             page = form.save(commit=False)  # don't save yet, as we need treebeard to assign tree params
 
@@ -230,6 +256,32 @@ def clean_slug(slug):
             return slug
         form.fields['slug'].clean = clean_slug
 
+        # Stick another validator into the form to check that the scheduled publishing settings are set correctly
+        def clean():
+            cleaned_data = form_class.clean(form)
+
+            # Go live must be before expire
+            go_live_at = cleaned_data.get('go_live_at')
+            expire_at = cleaned_data.get('expire_at')
+
+            if go_live_at and expire_at:
+                if go_live_at > expire_at:
+                    msg = _('Go live date/time must be before expiry date/time')
+                    form._errors['go_live_at'] = form.error_class([msg])
+                    form._errors['expire_at'] = form.error_class([msg])
+                    del cleaned_data['go_live_at']
+                    del cleaned_data['expire_at']
+
+            # Expire must be in the future
+            expire_at = cleaned_data.get('expire_at')
+
+            if expire_at and expire_at < timezone.now():
+                form._errors['expire_at'] = form.error_class([_('Expiry date/time must be in the future')])
+                del cleaned_data['expire_at']
+
+            return cleaned_data
+        form.clean = clean
+
         if form.is_valid():
             is_publishing = bool(request.POST.get('action-publish')) and page_perms.can_publish()
             is_submitting = bool(request.POST.get('action-submit'))
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 702e1ebb095..19af022fe64 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -8,7 +8,6 @@
 from django.db.models import get_model, Q
 from django.http import Http404
 from django.core.cache import cache
-from django.core.exceptions import ValidationError
 from django.core.handlers.wsgi import WSGIRequest
 from django.core.handlers.base import BaseHandler
 from django.contrib.contenttypes.models import ContentType
@@ -466,16 +465,6 @@ def relative_url(self, current_site):
             if self.url_path.startswith(root_path):
                 return ('' if current_site.id == id else root_url) + self.url_path[len(root_path) - 1:]
 
-    def clean(self):
-        super(Page, self).clean()
-
-        if self.go_live_at and self.expire_at:
-            if self.go_live_at > self.expire_at:
-                raise ValidationError(ugettext('Go live date/time should be before expiry datetime.'))
-
-        if self.expire_at and self.expire_at < timezone.now():
-            raise ValidationError(ugettext('Expiry date/time should be in the future'))
-
     @classmethod
     def search(cls, query_string, show_unpublished=False, search_title_only=False, extra_filters={}, prefetch_related=[], path=None):
         # Filters

From 0cec7587cefb49d12e2a255ea0422ce98b22eea2 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 30 Jun 2014 10:20:43 +0100
Subject: [PATCH 279/293] Removed some unneeded code

---
 wagtail/wagtailadmin/views/pages.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 29f3b68bb0f..84137f36301 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -210,10 +210,7 @@ def clean():
 
             return redirect('wagtailadmin_explore', page.get_parent().id)
         else:
-            if form.errors and form.errors.get('__all__'):
-                messages.error(request, _("The page could not be created: ") + ', '.join(form.errors['__all__']))
-            else:
-                messages.error(request, _("The page could not be created due to errors."))
+            messages.error(request, _("The page could not be created due to validation errors"))
             edit_handler = edit_handler_class(instance=page, form=form)
     else:
         signals.init_new_page.send(sender=create, page=page, parent=parent_page)
@@ -336,10 +333,7 @@ def clean():
 
             return redirect('wagtailadmin_explore', page.get_parent().id)
         else:
-            if form.errors and form.errors.get('__all__'):
-                messages.error(request, _("The page could not be saved: ") + ', '.join(form.errors['__all__']))
-            else:
-                messages.error(request, _("The page could not be saved due to validation errors"))
+            messages.error(request, _("The page could not be saved due to validation errors"))
 
             edit_handler = edit_handler_class(instance=page, form=form)
             errors_debug = (

From 42037419b07c665d5e80213d51160560370056b9 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 30 Jun 2014 10:29:17 +0100
Subject: [PATCH 280/293] Removed duplicate test

---
 .../tests/test_management_commands.py         | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/wagtail/wagtailcore/tests/test_management_commands.py b/wagtail/wagtailcore/tests/test_management_commands.py
index 93315c33e93..ae19167c264 100644
--- a/wagtail/wagtailcore/tests/test_management_commands.py
+++ b/wagtail/wagtailcore/tests/test_management_commands.py
@@ -117,27 +117,6 @@ def test_go_live_page_will_be_published(self):
         self.assertTrue(p.live)
         self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
 
-    def test_go_live_page_will_be_published(self):
-        page = SimplePage(
-            title="Hello world!",
-            slug="hello-world",
-            live=False,
-            go_live_at=timezone.now() - timedelta(days=1),
-        )
-        self.root_page.add_child(instance=page)
-
-        page.save_revision(approved_go_live_at=timezone.now() - timedelta(days=1))
-
-        p = Page.objects.get(slug='hello-world')
-        self.assertFalse(p.live)
-        self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
-
-        management.call_command('publish_scheduled_pages')
-
-        p = Page.objects.get(slug='hello-world')
-        self.assertTrue(p.live)
-        self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists())
-
     def test_future_go_live_page_will_not_be_published(self):
         page = SimplePage(
             title="Hello world!",

From 9c9cb400e75392b85fdd3d52c15d104212c105c3 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Mon, 30 Jun 2014 10:32:06 +0100
Subject: [PATCH 281/293] fixing buttons that were hidden after previous button
 styling work

---
 .../static/wagtailadmin/scss/layouts/page-editor.scss  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
index 5e3120c8248..c65b6021642 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
@@ -240,15 +240,15 @@
             margin:0 0 0 -20px;
             cursor:pointer;
 
-            a{
-                font-size: 0em;
-                line-height: 0;
+            .button{
+                @include border-radius(0);
                 overflow: visible;
-                display:block;
+                display:inline-block;
+                padding:0;
+                width:3.45em;
 
                 &:before{
                     position:relative;
-                    color:white;
                     padding:0;
                     line-height:1.8em; /* specific height required as parent 'a' has no height */
                     font-size:1.4rem;

From 50a5182794b4a4e2336e9e40c471e617da136dac Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 30 Jun 2014 10:37:02 +0100
Subject: [PATCH 282/293] Fixed typos in a couple of deprecation warnings

---
 wagtail/wagtailembeds/templatetags/embed_filters.py | 2 +-
 wagtail/wagtailimages/templatetags/image_tags.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailembeds/templatetags/embed_filters.py b/wagtail/wagtailembeds/templatetags/embed_filters.py
index cb79ce69afe..fcc4c277300 100644
--- a/wagtail/wagtailembeds/templatetags/embed_filters.py
+++ b/wagtail/wagtailembeds/templatetags/embed_filters.py
@@ -1,7 +1,7 @@
 import warnings
 
 warnings.warn(
-    "The embed_filters tag library has been moved to wagtailcore_tags. "
+    "The embed_filters tag library has been moved to wagtailembeds_tags. "
     "Use {% load wagtailembeds_tags %} instead.", DeprecationWarning)
 
 
diff --git a/wagtail/wagtailimages/templatetags/image_tags.py b/wagtail/wagtailimages/templatetags/image_tags.py
index 590daa5cd90..c26729f6cd7 100644
--- a/wagtail/wagtailimages/templatetags/image_tags.py
+++ b/wagtail/wagtailimages/templatetags/image_tags.py
@@ -1,7 +1,7 @@
 import warnings
 
 warnings.warn(
-    "The image_tags tag library has been moved to wagtailcore_tags. "
+    "The image_tags tag library has been moved to wagtailimages_tags. "
     "Use {% load wagtailimages_tags %} instead.", DeprecationWarning)
 
 

From c4c66ba7809cf805c211be9e4e9859ef4310c7c6 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 30 Jun 2014 10:41:10 +0100
Subject: [PATCH 283/293] Added check to page create view to make sure the
 selected class is a descendant of Page

---
 wagtail/wagtailadmin/tests/test_pages_views.py | 1 -
 wagtail/wagtailadmin/views/pages.py            | 9 +++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py
index 65a614538db..aa73e907dd9 100644
--- a/wagtail/wagtailadmin/tests/test_pages_views.py
+++ b/wagtail/wagtailadmin/tests/test_pages_views.py
@@ -245,7 +245,6 @@ def test_create_nonexistantparent(self):
         response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', 100000)))
         self.assertEqual(response.status_code, 404)
 
-    @unittest.expectedFailure # FIXME: Crashes!
     def test_create_nonpagetype(self):
         response = self.client.get(reverse('wagtailadmin_pages_create', args=('wagtailimages', 'image', self.root_page.id)))
         self.assertEqual(response.status_code, 404)
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 0d738d0c2b7..f6490a2244c 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -115,12 +115,17 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_
     except ContentType.DoesNotExist:
         raise Http404
 
+    # Get class
+    page_class = content_type.model_class()
+
+    # Make sure the class is a descendant of Page
+    if not issubclass(page_class, Page):
+        raise Http404
+
     # page must be in the list of allowed subpage types for this parent ID
     if content_type not in parent_page.clean_subpage_types():
         raise PermissionDenied
 
-    page_class = content_type.model_class()
-
     page = page_class(owner=request.user)
     edit_handler_class = get_page_edit_handler(page_class)
     form_class = edit_handler_class.get_form_class(page_class)

From 1142123174b41f28d3e2bf03e9f460866de68fc8 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 30 Jun 2014 13:34:37 +0100
Subject: [PATCH 284/293] Added basic documentation for management commands

---
 docs/management_commands.rst | 59 ++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 docs/management_commands.rst

diff --git a/docs/management_commands.rst b/docs/management_commands.rst
new file mode 100644
index 00000000000..e5f6393f7c9
--- /dev/null
+++ b/docs/management_commands.rst
@@ -0,0 +1,59 @@
+Management commands
+===================
+
+publish_scheduled_pages
+-----------------------
+
+**./manage.py publish_scheduled_pages**
+
+This command publishes/unpublishes pages that have had these actions scheduled by an editor.
+
+It is recommended to run this command once an hour.
+
+
+fixtree
+-------
+
+**./manage.py fixtree**
+
+This command scans for errors in your database and attempts to fix any issues it finds.
+
+
+move_pages
+----------
+
+**./manage.py move_pages from to**
+
+This mass moves a bunch of pages from one section of the tree to another.
+
+Options:
+
+ - **from**
+  This is id of the page to move pages from. All descendants of this page will be moved to the destination. After the operation is complete, this page will have no children.
+
+ - **to**
+  This is the id of the page to move pages to.
+
+
+update_index
+------------
+
+**./manage.py update_index**
+
+This command rebuilds the search index from scratch. It is only required when using ElasticSearch.
+
+It is recommended to run this command once a week and at the following times:
+ - Whenever any pages have been created through a script (eg, import)
+ - Whenever any changes have been made to models or search configuration
+
+While this command is running, the search may not return any results so avoid running this command at peak times.
+
+
+search_garbage_collect
+----------------------
+
+**./manage.py search_garbage_collect**
+
+Wagtail keeps a log of search queries that are popular on your website. On high traffic websites, this log may get big and sometimes you may want to clean out old search queries.
+
+This command cleans out all search query logs that are more than one week old.

From 5f1eee4f46b59a6806e7d9947c8a711456efda79 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Tue, 1 Jul 2014 13:31:55 +0100
Subject: [PATCH 285/293] updated docs re: FieldRowPanel

---
 docs/editing_api.rst | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/docs/editing_api.rst b/docs/editing_api.rst
index 33620fbca43..c32b54d358b 100644
--- a/docs/editing_api.rst
+++ b/docs/editing_api.rst
@@ -1,5 +1,5 @@
 
-Editing API
+Defining models with the Editing API
 ===========
 
 .. note::
@@ -22,18 +22,30 @@ Defining Panels
 
 A "panel" is the basic editing block in Wagtail. Wagtail will automatically pick the appropriate editing widget for most Django field types, you just need to add a panel for each field you want to show in the Wagtail page editor, in the order you want them to appear.
 
-There are three types of panels:
-
+There are four basic types of panels:
+  
   ``FieldPanel( field_name, classname=None )``
     This is the panel used for basic Django field types. ``field_name`` is the name of the class property used in your model definition. ``classname`` is a string of optional CSS classes given to the panel which are used in formatting and scripted interactivity. By default, panels are formatted as inset fields. The CSS class ``full`` can be used to format the panel so it covers the full width of the Wagtail page editor. The CSS class ``title`` can be used to mark a field as the source for auto-generated slug strings.
 
   ``MultiFieldPanel( children, heading="", classname=None )``
     This panel condenses several ``FieldPanel`` s or choosers, from a list or tuple, under a single ``heading`` string.
 
-  ``InlinePanel( base_model, relation_name, panels=None, label='', help_text='' )``
+  ``InlinePanel( base_model, relation_name, panels=None, classname=None, label='', help_text='' )``
     This panel allows for the creation of a "cluster" of related objects over a join to a separate model, such as a list of related links or slides to an image carousel. This is a very powerful, but tricky feature which will take some space to cover, so we'll skip over it for now. For a full explanation on the usage of ``InlinePanel``, see :ref:`inline_panels`.
 
-Wagtail provides a tabbed interface to help organize panels. ``content_panels`` is the main tab, used for the meat of your model content. The other, ``promote_panels``, is suggested for organizing metadata about the content, such as SEO information and other machine-readable information. Since you're writing the panel definitions, you can organize them however you want.
+  ``FieldRowPanel( children, classname=None)``
+    This panel is purely aesthetic. It creates a columnar layout in the editing interface, where each of the child Panels appears alongside each others rather than below. Use of FieldRowPanel particularly helps reduce the "snow-blindness" effect of seeing so many fields on the page, for complex models. It also improves the perceived association between fields of a similar nature. For example if you created a model representing an "Event" which had a starting date and ending date, it would be intuitive to find the start and end date on the same "row".
+
+    FieldRowPanel should be used in combination with ``col*`` classnames added to each of the child Panels of the FieldRowPanel. The Wagtail editing interface is layed out using a grid system, in which the maximum width of the editor is 12 columns wide. Classes ``col1``-``col12`` can be applied to each child of a FieldRowPanel. The class ``col3`` will ensure that field appears 3 columns wide or a quarter the width. ``col4`` would cause the field to be 4 columns wide, or a third the width.
+
+  **(In addition to these four, there are also Chooser Panels, detailed below.)**
+
+
+Wagtail provides a tabbed interface to help organize panels. Three such tabs are provided:
+
+* ``content_panels`` is the main tab, used for the bulk of your model's fields. 
+* ``promote_panels`` is suggested for organizing fields regarding the promotion of the page around the site and the internet e.g A field to dictate whether the page should show in site-wide menus, descriptive text that should appear in site search results, SEO friendly titles, OpenGraph meta tag content and other machine-readable information.
+* ``settings_panels`` is essentially for non-copy fields. By default it contains the page's scheduled publishing fields. Other suggested fields e.g: a field to switch between one layout/style and another.  
 
 Let's look at an example of a panel definition:
 
@@ -55,7 +67,10 @@ Let's look at an example of a panel definition:
   ExamplePage.content_panels = [
     FieldPanel('title', classname="full title"),
     FieldPanel('body', classname="full"),
-    FieldPanel('date'),
+    FieldRowPanel([
+      FieldPanel('start_date', classname="col3"),
+      FieldPanel('end_date', classname="col3"),
+    ]),    
     ImageChooserPanel('splash_image'),
     DocumentChooserPanel('free_download'),
     PageChooserPanel('related_page'),
@@ -254,6 +269,12 @@ Titles
 Use ``classname="title"`` to make Page's built-in title field stand out with more vertical padding.
 
 
+Col*
+------
+
+Fields within a ``FieldRowPanel`` can have their width dictated in terms of the number of columns it should span. The ``FieldRowPanel`` is always considered to be 12 columns wide regardless of browser size or the nesting of ``FieldRowPanel`` in any other type of panel. Specify a number of columns thus: ``col3``, ``col4``, ``col6`` etc (up to 12). The resulting width with be *relative* to the full width of the ``FieldRowPanel``.
+
+
 Required Fields
 ---------------
 

From ebd73184bf0f0d045e975628909940a8b8f7e023 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 1 Jul 2014 14:04:31 +0100
Subject: [PATCH 286/293] Fixed migration conflict

---
 ...ublishing.py => 0004_fields_for_scheduled_publishing.py} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename wagtail/wagtailcore/migrations/{0003_fields_for_scheduled_publishing.py => 0004_fields_for_scheduled_publishing.py} (98%)

diff --git a/wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py b/wagtail/wagtailcore/migrations/0004_fields_for_scheduled_publishing.py
similarity index 98%
rename from wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py
rename to wagtail/wagtailcore/migrations/0004_fields_for_scheduled_publishing.py
index 639068c2b75..40602fa97d2 100644
--- a/wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py
+++ b/wagtail/wagtailcore/migrations/0004_fields_for_scheduled_publishing.py
@@ -91,8 +91,8 @@ def backwards(self, orm):
             'Meta': {'object_name': 'Page'},
             'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}),
             'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'expired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'expire_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'expired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'go_live_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
             'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
@@ -118,8 +118,8 @@ def backwards(self, orm):
             'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
         },
         u'wagtailcore.site': {
-            'Meta': {'object_name': 'Site'},
-            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
+            'Meta': {'unique_together': "(('hostname', 'port'),)", 'object_name': 'Site'},
+            'hostname': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'is_default_site': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'port': ('django.db.models.fields.IntegerField', [], {'default': '80'}),

From eb1e8b0f873696019d0f0c77d86672a29fa811ac Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Tue, 1 Jul 2014 15:39:25 +0100
Subject: [PATCH 287/293] Fixed: 'use strict' caused undeclared variable to
 prevent preview

---
 wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index 37f355e4e2d..4f76ce8a266 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -338,7 +338,7 @@ $(function() {
     /* Set up behaviour of preview button */
     $('.action-preview').click(function(e) {
         e.preventDefault();
-        $this = $(this);
+        var $this = $(this);
 
         var previewWindow = window.open($this.data('placeholder'), $this.data('windowname'));
         

From 83161e324ff2cc5433730cd6d092690d57c863ba Mon Sep 17 00:00:00 2001
From: Tom Dyson <tom@torchbox.com>
Date: Tue, 1 Jul 2014 16:45:44 +0100
Subject: [PATCH 288/293] Updates to management commands docs

With inclusion in index
---
 docs/index.rst               |  1 +
 docs/management_commands.rst | 35 ++++++++++++++---------------------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index a35560f8241..5d2344b1802 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -20,6 +20,7 @@ It supports Django 1.6.2+ on Python 2.6 and 2.7. Django 1.7 and Python 3 support
    deploying
    performance
    static_site_generation
+   management_commands
    contributing
    support
    roadmap
diff --git a/docs/management_commands.rst b/docs/management_commands.rst
index e5f6393f7c9..3f77fc3eff6 100644
--- a/docs/management_commands.rst
+++ b/docs/management_commands.rst
@@ -4,56 +4,49 @@ Management commands
 publish_scheduled_pages
 -----------------------
 
-**./manage.py publish_scheduled_pages**
-
-This command publishes/unpublishes pages that have had these actions scheduled by an editor.
-
-It is recommended to run this command once an hour.
+:code:`./manage.py publish_scheduled_pages`
 
+This command publishes or unpublishes pages that have had these actions scheduled by an editor. It is recommended to run this command once an hour.
 
 fixtree
 -------
 
-**./manage.py fixtree**
+:code:`./manage.py fixtree`
 
 This command scans for errors in your database and attempts to fix any issues it finds.
 
-
 move_pages
 ----------
 
-**./manage.py move_pages from to**
+:code:`manage.py move_pages from to`
 
-This mass moves a bunch of pages from one section of the tree to another.
+This command moves a selection of pages from one section of the tree to another.
 
 Options:
 
  - **from**
-  This is id of the page to move pages from. All descendants of this page will be moved to the destination. After the operation is complete, this page will have no children.
+  This is the **id** of the page to move pages from. All descendants of this page will be moved to the destination. After the operation is complete, this page will have no children.
 
  - **to**
-  This is the id of the page to move pages to.
-
+  This is the **id** of the page to move pages to.
 
 update_index
 ------------
 
-**./manage.py update_index**
+:code:`./manage.py update_index`
 
-This command rebuilds the search index from scratch. It is only required when using ElasticSearch.
+This command rebuilds the search index from scratch. It is only required when using Elasticsearch.
 
 It is recommended to run this command once a week and at the following times:
- - Whenever any pages have been created through a script (eg, import)
- - Whenever any changes have been made to models or search configuration
 
-While this command is running, the search may not return any results so avoid running this command at peak times.
+ - whenever any pages have been created through a script (after an import, for example)
+ - whenever any changes have been made to models or search configuration
 
+The search may not return any results while this command is running, so avoid running it at peak times.
 
 search_garbage_collect
 ----------------------
 
-**./manage.py search_garbage_collect**
-
-Wagtail keeps a log of search queries that are popular on your website. On high traffic websites, this log may get big and sometimes you may want to clean out old search queries.
+:code:`./manage.py search_garbage_collect`
 
-This command cleans out all search query logs that are more than one week old.
+Wagtail keeps a log of search queries that are popular on your website. On high traffic websites, this log may get big and you may want to clean out old search queries. This command cleans out all search query logs that are more than one week old.

From 479dd1edde7061fd722fb8eb9a5da84c6875ca6b Mon Sep 17 00:00:00 2001
From: Tom Dyson <tom@torchbox.com>
Date: Tue, 1 Jul 2014 16:53:47 +0100
Subject: [PATCH 289/293] Minor editing API doc tweaks

---
 docs/editing_api.rst | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/docs/editing_api.rst b/docs/editing_api.rst
index c32b54d358b..609237e76c6 100644
--- a/docs/editing_api.rst
+++ b/docs/editing_api.rst
@@ -4,26 +4,24 @@ Defining models with the Editing API
 
 .. note::
     This documentation is currently being written.
-    
 
 Wagtail provides a highly-customizable editing interface consisting of several components:
 
-  * **Fields** — built-in content types to augment the basic types provided by Django.
+  * **Fields** — built-in content types to augment the basic types provided by Django
   * **Panels** — the basic editing blocks for fields, groups of fields, and related object clusters
   * **Choosers** — interfaces for finding related objects in a ForeignKey relationship
 
-Configuring your models to use these components will shape the Wagtail editor to your needs. Wagtail also provides an API for injecting custom CSS and Javascript for further customization, including extending the hallo.js rich text editor.
+Configuring your models to use these components will shape the Wagtail editor to your needs. Wagtail also provides an API for injecting custom CSS and JavaScript for further customization, including extending the hallo.js rich text editor.
 
 There is also an Edit Handler API for creating your own Wagtail editor components.
 
-
 Defining Panels
 ~~~~~~~~~~~~~~~
 
-A "panel" is the basic editing block in Wagtail. Wagtail will automatically pick the appropriate editing widget for most Django field types, you just need to add a panel for each field you want to show in the Wagtail page editor, in the order you want them to appear.
+A "panel" is the basic editing block in Wagtail. Wagtail will automatically pick the appropriate editing widget for most Django field types; implementors just need to add a panel for each field they want to show in the Wagtail page editor, in the order they want them to appear.
 
 There are four basic types of panels:
-  
+
   ``FieldPanel( field_name, classname=None )``
     This is the panel used for basic Django field types. ``field_name`` is the name of the class property used in your model definition. ``classname`` is a string of optional CSS classes given to the panel which are used in formatting and scripted interactivity. By default, panels are formatted as inset fields. The CSS class ``full`` can be used to format the panel so it covers the full width of the Wagtail page editor. The CSS class ``title`` can be used to mark a field as the source for auto-generated slug strings.
 
@@ -34,18 +32,17 @@ There are four basic types of panels:
     This panel allows for the creation of a "cluster" of related objects over a join to a separate model, such as a list of related links or slides to an image carousel. This is a very powerful, but tricky feature which will take some space to cover, so we'll skip over it for now. For a full explanation on the usage of ``InlinePanel``, see :ref:`inline_panels`.
 
   ``FieldRowPanel( children, classname=None)``
-    This panel is purely aesthetic. It creates a columnar layout in the editing interface, where each of the child Panels appears alongside each others rather than below. Use of FieldRowPanel particularly helps reduce the "snow-blindness" effect of seeing so many fields on the page, for complex models. It also improves the perceived association between fields of a similar nature. For example if you created a model representing an "Event" which had a starting date and ending date, it would be intuitive to find the start and end date on the same "row".
+    This panel is purely aesthetic. It creates a columnar layout in the editing interface, where each of the child Panels appears alongside each other rather than below. Use of FieldRowPanel particularly helps reduce the "snow-blindness" effect of seeing so many fields on the page, for complex models. It also improves the perceived association between fields of a similar nature. For example if you created a model representing an "Event" which had a starting date and ending date, it may be intuitive to find the start and end date on the same "row".
 
     FieldRowPanel should be used in combination with ``col*`` classnames added to each of the child Panels of the FieldRowPanel. The Wagtail editing interface is layed out using a grid system, in which the maximum width of the editor is 12 columns wide. Classes ``col1``-``col12`` can be applied to each child of a FieldRowPanel. The class ``col3`` will ensure that field appears 3 columns wide or a quarter the width. ``col4`` would cause the field to be 4 columns wide, or a third the width.
 
   **(In addition to these four, there are also Chooser Panels, detailed below.)**
 
-
 Wagtail provides a tabbed interface to help organize panels. Three such tabs are provided:
 
-* ``content_panels`` is the main tab, used for the bulk of your model's fields. 
-* ``promote_panels`` is suggested for organizing fields regarding the promotion of the page around the site and the internet e.g A field to dictate whether the page should show in site-wide menus, descriptive text that should appear in site search results, SEO friendly titles, OpenGraph meta tag content and other machine-readable information.
-* ``settings_panels`` is essentially for non-copy fields. By default it contains the page's scheduled publishing fields. Other suggested fields e.g: a field to switch between one layout/style and another.  
+* ``content_panels`` is the main tab, used for the bulk of your model's fields.
+* ``promote_panels`` is suggested for organizing fields regarding the promotion of the page around the site and the Internet. For example, a field to dictate whether the page should show in site-wide menus, descriptive text that should appear in site search results, SEO-friendly titles, OpenGraph meta tag content and other machine-readable information.
+* ``settings_panels`` is essentially for non-copy fields. By default it contains the page's scheduled publishing fields. Other suggested fields could include a field to switch between one layout/style and another.
 
 Let's look at an example of a panel definition:
 
@@ -70,7 +67,7 @@ Let's look at an example of a panel definition:
     FieldRowPanel([
       FieldPanel('start_date', classname="col3"),
       FieldPanel('end_date', classname="col3"),
-    ]),    
+    ]),
     ImageChooserPanel('splash_image'),
     DocumentChooserPanel('free_download'),
     PageChooserPanel('related_page'),
@@ -134,7 +131,7 @@ One of the features of Wagtail is a unified image library, which you can access
       on_delete=models.SET_NULL,
       related_name='+'
     )
-    
+
   BookPage.content_panels = [
     ImageChooserPanel('cover'),
     # ...
@@ -240,7 +237,7 @@ Snippets are vanilla Django models you create yourself without a Wagtail-provide
       on_delete=models.SET_NULL,
       related_name='+'
     )
-    
+
   BookPage.content_panels = [
     SnippetChooserPanel('advert', Advert),
     # ...
@@ -387,11 +384,9 @@ hallo.js plugin names are prefixed with the ``"IKS."`` namespace, but the ``name
 
 For information on developing custom hallo.js plugins, see the project's page: https://github.com/bergie/hallo
 
-
 Edit Handler API
 ~~~~~~~~~~~~~~~~
 
-
 Admin Hooks
 -----------
 
@@ -505,7 +500,7 @@ Where ``'hook'`` is one of the following hook strings and ``function`` is a func
 .. _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. 
+  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
 
@@ -632,4 +627,3 @@ Custom Choosers
 
 Tests
 -----
-

From bdf175ae41ebcd15180aa46ebf305c1dc4c8003d Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 2 Jul 2014 09:52:55 +0100
Subject: [PATCH 290/293] fixed: generated content font size bug in IE

---
 .../wagtailadmin/static/wagtailadmin/scss/components/forms.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index 75f46b262cc..2fa0827b8a9 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -476,7 +476,7 @@ li.focused > .help{
     &.field-small{
         .input{
             &:before, &:after{
-                font-size:1.5em;
+                font-size:1.3rem; /* REMs are necessary here because IE doesn't treat generated content correctly */
                 top:0.3em;
             }
             &:before{

From 7e65a4d578aa39fd8b88e51a7da1c2a0f15f7f9f Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 2 Jul 2014 10:08:31 +0100
Subject: [PATCH 291/293] button metrics at mobile improved

---
 .../wagtailadmin/scss/components/forms.scss    | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index 2fa0827b8a9..aa8968f0471 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -264,7 +264,7 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
             left:0;
             top:0;
             width:2em;
-            line-height:2em;
+            line-height:1.85em;
             height:100%;
             text-align:center;    
             background-color:rgba(0,0,0,0.2);
@@ -278,7 +278,7 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
         &:before{
             width:2em;
             font-size:0.9rem;
-            line-height:2em;
+            line-height:1.65em;
         }
     }
 
@@ -303,13 +303,6 @@ input[type=submit], input[type=reset], input[type=button], button{
     }
 }
 
-button.icon{
-    &:before,
-    &:after{
-        line-height:0;
-    }
-}
-
 .multiple{
     @include transition(max-height 10s ease);
     padding:0;
@@ -778,11 +771,12 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
         }
 
         &.bicolor{
-            padding-left:3.5em;
+            padding-left:3.7em;
 
             &:before{
-                width:2.2em;
-                line-height:2.45em;
+                width:2em;
+                line-height:2.2em;
+                font-size:1.1rem;
             }
         }
 

From 7ddcf0fbaceb32707f547d7580b25af0cc5d5f59 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 2 Jul 2014 10:17:21 +0100
Subject: [PATCH 292/293] Fixing #402, missing chooser button. Field inherited
 wrong template.

---
 .../wagtailsearch/editorspicks/includes/editorspicks_form.html  | 2 +-
 .../templates/wagtailsearch/queries/chooser_field.html          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/includes/editorspicks_form.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/includes/editorspicks_form.html
index 01e891ccd26..9a45dbef043 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/includes/editorspicks_form.html
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/includes/editorspicks_form.html
@@ -17,7 +17,7 @@
                 {% endif %}
             </li>
             <li class="char_field">
-                {% include "wagtailadmin/edit_handlers/field_panel_field.html" with field=form.description only %}
+                {% include "wagtailadmin/shared/field.html" with field=form.description only %}
             </li>
         </ul>
 
diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser_field.html b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser_field.html
index 317ba89d93f..26ffa2959fd 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser_field.html
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser_field.html
@@ -1,4 +1,4 @@
-{% extends "wagtailadmin/edit_handlers/field_panel_field.html" %}
+{% extends "wagtailadmin/shared/field.html" %}
 
 {% block form_field %}
    <div class="chooser searchterm-chooser">

From f3a70c9f297cd5c48c6a4e91429f5999e578f3da Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 2 Jul 2014 10:21:28 +0100
Subject: [PATCH 293/293] correctly formatted query chooser modal content

---
 .../wagtailsearch/queries/chooser/chooser.html  | 17 +++++++++--------
 .../wagtailsearch/queries/chooser/results.html  |  7 +++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html
index b78f94b603c..4859c8c1ca7 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html
@@ -2,15 +2,16 @@
 {% trans "Popular search terms" as pop_str %}
 {% include "wagtailadmin/shared/header.html" with title=pop_str %}
 
-<form class="query-search search-bar full-width" action="{% url 'wagtailsearch_queries_chooserresults' %}" method="GET" autocomplete="off">
-    <ul class="fields">
-        {% for field in searchform %}
-            {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
-        {% endfor %}
-        <li class="submit"><input type="submit" value="{% trans 'Search' %}" /></li>
-    </ul>
-</form>
 <div class="nice-padding">
+    <form class="query-search search-bar full-width" action="{% url 'wagtailsearch_queries_chooserresults' %}" method="GET" autocomplete="off">
+        <ul class="fields">
+            {% for field in searchform %}
+                {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
+            {% endfor %}
+            <li class="submit"><input type="submit" value="{% trans 'Search' %}" /></li>
+        </ul>
+    </form>
+
     <div id="query-results">
         {% include "wagtailsearch/queries/chooser/results.html" %}
     </div>
diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/results.html b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/results.html
index 78de1e937bf..a9e25e641eb 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/results.html
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/results.html
@@ -1,8 +1,7 @@
 {% load i18n %}
 <table class="listing chooser">
-    <col />
-    <col width="40%"/>
-    <col />
+    <col width="50%"/>
+    <col width="50%"/>
     <thead>
         <tr>
             <th class="title">{% trans "Terms" %}</th>
@@ -20,7 +19,7 @@ <h2><a class="choose-query" href="#{{ query.id }}" data-id="{{ query.id }}" data
                 </tr>
             {% endfor %}
         {% else %}
-            <tr><td colspan="3" class="no-results-message"><p>{% trans "No results found" %}</p></td></tr>
+            <tr><td colspan="100%" class="no-results-message"><p>{% trans "No results found" %}</p></td></tr>
         {% endif %}
     </tbody>
 </table>