From af20a61b6b6f673bf05dfcfd9f9feda9147dcddd Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Thu, 8 May 2014 12:31:49 +0100 Subject: [PATCH 01/26] reducing shadow on menu. looked amateurish --- .../wagtailadmin/static/wagtailadmin/scss/core.scss | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss index 8ffaa450a..2c1232091 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss @@ -115,7 +115,7 @@ img{ } .nav-wrapper{ - @include box-shadow(inset -2px 0px 10px 0px rgba(0, 0, 0, 0.5)); + @include box-shadow(inset -5px 0px 5px -3px rgba(0, 0, 0, 0.3)); position:relative; background: $color-grey-1; margin-left: -100%; @@ -404,7 +404,7 @@ header{ width:1em; display:none; margin-right:0.4em; - font-size:1.5em; + font-size:1.3em; } } @@ -904,13 +904,8 @@ footer, .logo{ .wrapper{ max-width:$breakpoint-desktop-larger; } - .nav-wrapper{ - @include box-shadow(inset -6px 0px 4px 0px rgba(0, 0, 0, 0.2)); - - .inner{ - background:$color-grey-1; - @include box-shadow(inset -6px 0px 4px 0px rgba(0, 0, 0, 0.2)); - } + .nav-wrapper .inner{ + background:$color-grey-1; } footer{ From 4786e34a46bb60ca0fc0075311671b0a94c4ed1e Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Sat, 10 May 2014 13:21:21 +0100 Subject: [PATCH 02/26] Import unittest2 from Django --- tox.ini | 1 - wagtail/tests/utils.py | 13 ++++++++++++- wagtail/wagtailadmin/tests.py | 3 +-- wagtail/wagtailimages/tests.py | 4 +--- wagtail/wagtailsearch/tests/test_backends.py | 2 +- wagtail/wagtailsearch/tests/test_queries.py | 3 +-- wagtail/wagtailsnippets/tests.py | 2 +- 7 files changed, 17 insertions(+), 11 deletions(-) diff --git a/tox.ini b/tox.ini index 329c1c407..11b8bb3a2 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,6 @@ dj16= Django>=1.6,<1.7 pyelasticsearch==0.6.1 elasticutils==0.8.2 - unittest2 [tox] envlist = diff --git a/wagtail/tests/utils.py b/wagtail/tests/utils.py index 11cdb369d..7b6557a78 100644 --- a/wagtail/tests/utils.py +++ b/wagtail/tests/utils.py @@ -1,9 +1,20 @@ from django.contrib.auth.models import User +# 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 +try: + # Firstly, try to import unittest from Django + from django.utils import unittest +except ImportError: + # Django doesn't include unittest + # We must be running on Django 1.7+ which doesn't support Python 2.6 so + # the standard unittest library should be unittest2 + import unittest + def login(client): # Create a user User.objects.create_superuser(username='test', email='test@email.com', password='password') # Login - client.login(username='test', password='password') \ No newline at end of file + client.login(username='test', password='password') diff --git a/wagtail/wagtailadmin/tests.py b/wagtail/wagtailadmin/tests.py index 435f29a9c..8d72ef3ad 100644 --- a/wagtail/wagtailadmin/tests.py +++ b/wagtail/wagtailadmin/tests.py @@ -1,7 +1,6 @@ from django.test import TestCase -import unittest2 as unittest from wagtail.tests.models import SimplePage, EventPage -from wagtail.tests.utils import login +from wagtail.tests.utils import login, unittest from wagtail.wagtailcore.models import Page from django.core.urlresolvers import reverse diff --git a/wagtail/wagtailimages/tests.py b/wagtail/wagtailimages/tests.py index 9c4ce6ea9..00d1245e6 100644 --- a/wagtail/wagtailimages/tests.py +++ b/wagtail/wagtailimages/tests.py @@ -4,9 +4,7 @@ from django.contrib.auth.models import User, Group, Permission from django.core.urlresolvers import reverse from django.core.files.uploadedfile import SimpleUploadedFile -import unittest2 as unittest - -from wagtail.tests.utils import login +from wagtail.tests.utils import login, unittest from wagtail.wagtailimages.models import get_image_model from wagtail.wagtailimages.templatetags import image_tags diff --git a/wagtail/wagtailsearch/tests/test_backends.py b/wagtail/wagtailsearch/tests/test_backends.py index b8b6ee3b1..bd4a64926 100644 --- a/wagtail/wagtailsearch/tests/test_backends.py +++ b/wagtail/wagtailsearch/tests/test_backends.py @@ -2,7 +2,7 @@ from django.test import TestCase from django.test.utils import override_settings from django.conf import settings from django.core import management -import unittest2 as unittest +from wagtail.tests.utils import unittest from wagtail.wagtailsearch import models, get_search_backend from wagtail.wagtailsearch.backends.db import DBSearch from wagtail.wagtailsearch.backends import InvalidSearchBackendError diff --git a/wagtail/wagtailsearch/tests/test_queries.py b/wagtail/wagtailsearch/tests/test_queries.py index 2ff2945de..7086d46f4 100644 --- a/wagtail/wagtailsearch/tests/test_queries.py +++ b/wagtail/wagtailsearch/tests/test_queries.py @@ -1,9 +1,8 @@ from django.test import TestCase from django.core import management from wagtail.wagtailsearch import models -from wagtail.tests.utils import login +from wagtail.tests.utils import login, unittest from StringIO import StringIO -import unittest2 as unittest class TestHitCounter(TestCase): diff --git a/wagtail/wagtailsnippets/tests.py b/wagtail/wagtailsnippets/tests.py index 0ba40fac9..782fe9087 100644 --- a/wagtail/wagtailsnippets/tests.py +++ b/wagtail/wagtailsnippets/tests.py @@ -5,7 +5,7 @@ when you run "manage.py test". Replace this with more appropriate tests for your application. """ -import unittest2 as unittest +from wagtail.tests.utils import unittest from django.test import TestCase From 09f185b3aa39f3fcef27e6d5b1fd345ea99a201a Mon Sep 17 00:00:00 2001 From: Ben Margolis Date: Thu, 15 May 2014 15:29:23 -0700 Subject: [PATCH 03/26] Remove all (3) raw SQL statements. This will allow Django to generate the statements, so there aren't any backend issues --- wagtail/wagtailadmin/views/pages.py | 4 +--- wagtail/wagtailcore/models.py | 12 ++---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index 6be731c3b..673f75ece 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -43,9 +43,7 @@ def index(request, parent_page_id=None): @permission_required('wagtailadmin.access_admin') def select_type(request): # Get the list of page types that can be created within the pages that currently exist - existing_page_types = ContentType.objects.raw(""" - SELECT DISTINCT content_type_id AS id FROM wagtailcore_page - """) + existing_page_types = get_page_types() all_page_types = sorted(get_page_types(), key=lambda pagetype: pagetype.name.lower()) page_types = set() diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 441c74a28..462206e21 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -638,17 +638,9 @@ def get_navigation_menu_items(): # 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.raw(""" - SELECT * FROM wagtailcore_page - WHERE numchild > 0 OR content_type_id IN %s OR depth = 2 - ORDER BY path - """, [tuple(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.raw(""" - SELECT * FROM wagtailcore_page - WHERE numchild > 0 OR depth = 2 - 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 6092791b864c736a4c443b47780414ee5951fcf2 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 16 May 2014 12:17:07 +0100 Subject: [PATCH 04/26] Added get_medusa_paths method to Page This is used to find a list of URLs for the entire site to feed into django-medusa If your page requires extra views, you can override this like so: def get_medusa_paths(self): yield '/myextraview/' super(MyPageType, self).get_medusa_paths() --- wagtail/wagtailcore/models.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 441c74a28..ac22ebc92 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -622,6 +622,19 @@ class Page(MP_Node, ClusterableModel, Indexed): """ return self.serve(self.dummy_request()) + def get_medusa_paths(self): + """ + This is a generator of URL paths to feed into django-medusa + Override this if you would like to create static versions of subpages + """ + # Yield paths for this page + yield '/' + + # Yield paths for child pages + for child in self.get_children().live(): + for path in child.get_medusa_paths(): + yield '/' + child.slug + path + def get_ancestors(self, inclusive=False): return Page.objects.ancestor_of(self, inclusive) From d180ad8f089911b3791048ea5f5586880ead5fd3 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 16 May 2014 12:27:05 +0100 Subject: [PATCH 05/26] Added medusa renderer for pages --- wagtail/wagtailcore/renderers.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 wagtail/wagtailcore/renderers.py diff --git a/wagtail/wagtailcore/renderers.py b/wagtail/wagtailcore/renderers.py new file mode 100644 index 000000000..33339581a --- /dev/null +++ b/wagtail/wagtailcore/renderers.py @@ -0,0 +1,17 @@ +from django_medusa.renderers import StaticSiteRenderer +from .models import Site + + +class PageRenderer(StaticSiteRenderer): + def get_paths(self): + # Get site + # TODO: Find way to get this to work with other sites + site = Site.objects.filter(is_default_site=True).first() + if site is None: + return [] + + # Return list of paths + return site.root_page.get_medusa_paths() + + +renderers = [PageRenderer] From ed36f25bffd6715bba8ca5a902e51e7757ecb615 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Sat, 17 May 2014 15:12:18 +0200 Subject: [PATCH 06/26] Add Ben Margolis to contributors --- CHANGELOG.txt | 1 + CONTRIBUTORS.rst | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a0024b6a0..f9f60449c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -24,6 +24,7 @@ Changelog * Fix: Page slugs are now validated on page edit * Fix: Filter objects are cached to avoid a database hit every time an {% image %} tag is compiled * Fix: Moving or changing a site root page no longer causes URLs for subpages to change to 'None' + * Fix: Eliminated raw SQL queries from wagtailcore / wagtailadmin, to ensure cross-database compatibility 0.2 (11.03.2014) ~~~~~~~~~~~~~~~~ diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 38e89a8e1..3549e8407 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -25,6 +25,7 @@ Contributors * Miguel Vieira * Ben Emery * David Smith +* Ben Margolis Translators =========== From 7a9e214fb5501828d7f60bd2ce93c3061aa178cd Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Sat, 17 May 2014 16:00:19 +0200 Subject: [PATCH 07/26] Remove dead code for creating pages by type and then location; it's been unused since wagtail 0.1, hasn't been updated for the page permission model, and needs further spec / discussion (including a working subpage_types implementation) before it can return --- .../wagtailadmin/pages/select_location.html | 13 ----- .../wagtailadmin/pages/select_type.html | 20 ------- .../wagtailadmin/shared/main_nav.html | 4 -- wagtail/wagtailadmin/tests.py | 26 ---------- wagtail/wagtailadmin/urls.py | 2 - wagtail/wagtailadmin/views/pages.py | 52 ------------------- 6 files changed, 117 deletions(-) delete mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/select_location.html delete mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/select_type.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_location.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_location.html deleted file mode 100644 index f5470158a..000000000 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_location.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "wagtailadmin/base.html" %} -{% load i18n %} -{% block titletag %}{% blocktrans with page_type=content_type.model_class.get_verbose_name %}Where do you want to create a {{ page_type }}{% endblocktrans %}{% endblock %} -{% block content %} - {% trans "Where do you want to create this" as where_str %} - {% include "wagtailadmin/shared/header.html" with title=where_str subtitle=content_type.model_class.get_verbose_name icon="doc-empty-inverse" %} - - -{% endblock %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_type.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_type.html deleted file mode 100644 index ada1e5027..000000000 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_type.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "wagtailadmin/base.html" %} -{% load i18n %} -{% block titletag %}{% trans "Create a new page" %}{% endblock %} -{% block bodyclass %}menu-explorer{% endblock %} -{% block content %} - {% trans "Create a new page" as create_str %} - {% include "wagtailadmin/shared/header.html" with title=create_str icon="doc-empty-inverse" %} - -
-

{% trans "Your new page will be saved in the top level of your website. You can move it after saving." %}

- - {% if all_page_types %} - - {% endif %} -
-{% endblock %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/main_nav.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/main_nav.html index b282afe3c..f7eb6528a 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/main_nav.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/main_nav.html @@ -6,10 +6,6 @@ {{ menu_item.render_html }} {% endfor %} - {% comment %} - {# TODO: make this work #} -
  • {% trans 'New page' %}
    • - {% endcomment %}
  • {% if request.user.email %}{% endif %}
    {% trans "Log out" %} diff --git a/wagtail/wagtailadmin/tests.py b/wagtail/wagtailadmin/tests.py index 8d72ef3ad..c6bf6c8e6 100644 --- a/wagtail/wagtailadmin/tests.py +++ b/wagtail/wagtailadmin/tests.py @@ -36,32 +36,6 @@ class TestPageExplorer(TestCase): self.assertTrue(response.context['pages'].filter(id=self.child_page.id).exists()) -class TestPageSelectTypeLocation(TestCase): - def setUp(self): - # Find root page - self.root_page = Page.objects.get(id=2) - - # Login - login(self.client) - - 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... - def test_select_location_testpage(self): - response = self.client.get(reverse('wagtailadmin_pages_select_location', args=('tests', 'eventpage'))) - self.assertEqual(response.status_code, 200) - - def test_select_location_nonexistanttype(self): - response = self.client.get(reverse('wagtailadmin_pages_select_location', args=('notanapp', 'notamodel'))) - self.assertEqual(response.status_code, 404) - - def test_select_location_nonpagetype(self): - response = self.client.get(reverse('wagtailadmin_pages_select_location', args=('wagtailimages', 'image'))) - self.assertEqual(response.status_code, 404) - - class TestPageCreation(TestCase): def setUp(self): # Find root page diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py index 599da20e3..8fbf2f6e7 100644 --- a/wagtail/wagtailadmin/urls.py +++ b/wagtail/wagtailadmin/urls.py @@ -49,8 +49,6 @@ urlpatterns += [ url(r'^pages/$', pages.index, name='wagtailadmin_explore_root'), url(r'^pages/(\d+)/$', pages.index, name='wagtailadmin_explore'), - url(r'^pages/new/$', pages.select_type, name='wagtailadmin_pages_select_type'), - url(r'^pages/new/(\w+)/(\w+)/$', pages.select_location, name='wagtailadmin_pages_select_location'), url(r'^pages/new/(\w+)/(\w+)/(\d+)/$', pages.create, name='wagtailadmin_pages_create'), url(r'^pages/new/(\w+)/(\w+)/(\d+)/preview/$', pages.preview_on_create, name='wagtailadmin_pages_preview_on_create'), url(r'^pages/usage/(\w+)/(\w+)/$', pages.content_type_use, name='wagtailadmin_pages_type_use'), diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index 673f75ece..a827b6cab 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -40,26 +40,6 @@ def index(request, parent_page_id=None): }) -@permission_required('wagtailadmin.access_admin') -def select_type(request): - # Get the list of page types that can be created within the pages that currently exist - existing_page_types = get_page_types() - - all_page_types = sorted(get_page_types(), key=lambda pagetype: pagetype.name.lower()) - page_types = set() - for content_type in existing_page_types: - allowed_subpage_types = content_type.model_class().clean_subpage_types() - for subpage_type in allowed_subpage_types: - subpage_content_type = ContentType.objects.get_for_model(subpage_type) - - page_types.add(subpage_content_type) - - return render(request, 'wagtailadmin/pages/select_type.html', { - 'page_types': page_types, - 'all_page_types': all_page_types - }) - - @permission_required('wagtailadmin.access_admin') def add_subpage(request, parent_page_id): parent_page = get_object_or_404(Page, id=parent_page_id).specific @@ -76,38 +56,6 @@ def add_subpage(request, parent_page_id): }) -@permission_required('wagtailadmin.access_admin') -def select_location(request, content_type_app_name, content_type_model_name): - try: - content_type = ContentType.objects.get_by_natural_key(content_type_app_name, content_type_model_name) - except ContentType.DoesNotExist: - raise Http404 - - page_class = content_type.model_class() - # page_class must be a Page type and not some other random model - if not issubclass(page_class, Page): - raise Http404 - - # find all the valid locations (parent pages) where a page of the chosen type can be added - parent_pages = page_class.allowed_parent_pages() - - if len(parent_pages) == 0: - # user cannot create a page of this type anywhere - fail with an error - messages.error(request, _("Sorry, you do not have access to create a page of type '{0}'.").format(content_type.name)) - return redirect('wagtailadmin_pages_select_type') - elif len(parent_pages) == 1: - # only one possible location - redirect them straight there - messages.warning(request, _("Pages of this type can only be created as children of '{0}'. This new page will be saved there.").format(parent_pages[0].title)) - return redirect('wagtailadmin_pages_create', content_type_app_name, content_type_model_name, parent_pages[0].id) - else: - # prompt them to select a location - return render(request, 'wagtailadmin/pages/select_location.html', { - 'content_type': content_type, - 'page_class': page_class, - 'parent_pages': parent_pages, - }) - - @permission_required('wagtailadmin.access_admin') def content_type_use(request, content_type_app_name, content_type_model_name): try: From b0c069d44611e9213be1f60e403956d6dd683d35 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 19 May 2014 09:56:49 +0100 Subject: [PATCH 08/26] More robust image file validation Previously, it was possible to upload PSD files by simply renaming them to have a '.jpg' extension. This causes issues as wagtailimages cannot resize PSD files causing crashes. This commit fixes this by validating that the internal format of the file matches the extension. --- wagtail/wagtailimages/models.py | 11 ++++------- wagtail/wagtailimages/utils.py | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 wagtail/wagtailimages/utils.py diff --git a/wagtail/wagtailimages/models.py b/wagtail/wagtailimages/models.py index f0be0fe4d..24fd1f0bf 100644 --- a/wagtail/wagtailimages/models.py +++ b/wagtail/wagtailimages/models.py @@ -4,7 +4,7 @@ import os.path from taggit.managers import TaggableManager from django.core.files import File -from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist, ValidationError +from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist from django.db import models from django.db.models.signals import pre_delete from django.dispatch.dispatcher import receiver @@ -17,6 +17,8 @@ from unidecode import unidecode from wagtail.wagtailadmin.taggable import TagSearchable from wagtail.wagtailimages.backends import get_image_backend +from .utils import validate_image_format + class AbstractImage(models.Model, TagSearchable): title = models.CharField(max_length=255, verbose_name=_('Title') ) @@ -34,12 +36,7 @@ class AbstractImage(models.Model, TagSearchable): filename = prefix[:-1] + dot + extension return os.path.join(folder_name, filename) - def file_extension_validator(ffile): - extension = ffile.name.split(".")[-1].lower() - if extension not in ["gif", "jpg", "jpeg", "png"]: - raise ValidationError(_("Not a valid image format. Please use a gif, jpeg or png file instead.")) - - file = models.ImageField(verbose_name=_('File'), upload_to=get_upload_to, width_field='width', height_field='height', validators=[file_extension_validator]) + file = models.ImageField(verbose_name=_('File'), upload_to=get_upload_to, width_field='width', height_field='height', validators=[validate_image_format]) width = models.IntegerField(editable=False) height = models.IntegerField(editable=False) created_at = models.DateTimeField(auto_now_add=True) diff --git a/wagtail/wagtailimages/utils.py b/wagtail/wagtailimages/utils.py new file mode 100644 index 000000000..627a8f121 --- /dev/null +++ b/wagtail/wagtailimages/utils.py @@ -0,0 +1,27 @@ +import os + +from PIL import Image + +from django.core.exceptions import ValidationError +from django.utils.translation import ugettext_lazy as _ + + +def validate_image_format(f): + # Check file extension + extension = os.path.splitext(f.name)[1].lower()[1:] + + if extension == 'jpg': + extension = 'jpeg' + + if extension not in ['gif', 'jpeg', 'png']: + raise ValidationError(_("Not a valid image. Please use a gif, jpeg or png file with the correct file extension.")) + + # Open image file + file_position = f.tell() + f.seek(0) + image = Image.open(f) + f.seek(file_position) + + # Check that the internal format matches the extension + if image.format.upper() != extension.upper(): + raise ValidationError(_("Not a valid %s image. Please use a gif, jpeg or png file with the correct file extension.") % (extension.upper())) From 7d43b1cf6eda74c86209a4cae0d71557ce9bdbc0 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 19 May 2014 10:52:49 +0100 Subject: [PATCH 09/26] Reopen images for validation if they are closed --- wagtail/wagtailimages/utils.py | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/wagtail/wagtailimages/utils.py b/wagtail/wagtailimages/utils.py index 627a8f121..ff8083310 100644 --- a/wagtail/wagtailimages/utils.py +++ b/wagtail/wagtailimages/utils.py @@ -4,6 +4,7 @@ from PIL import Image from django.core.exceptions import ValidationError from django.utils.translation import ugettext_lazy as _ +from django.conf import settings def validate_image_format(f): @@ -16,12 +17,26 @@ def validate_image_format(f): if extension not in ['gif', 'jpeg', 'png']: raise ValidationError(_("Not a valid image. Please use a gif, jpeg or png file with the correct file extension.")) + if f.closed: + # Reopen the file + file = open(os.path.join(settings.MEDIA_ROOT, f.name), 'rb') + close = True + else: + # Seek to first byte but save position to be restored later + file_position = f.tell() + f.seek(0) + file = f + close = False + # Open image file - file_position = f.tell() - f.seek(0) - image = Image.open(f) - f.seek(file_position) + image = Image.open(file) # Check that the internal format matches the extension if image.format.upper() != extension.upper(): raise ValidationError(_("Not a valid %s image. Please use a gif, jpeg or png file with the correct file extension.") % (extension.upper())) + + # Close/restore file + if close: + file.close() + else: + f.seek(file_position) From e4401ba44a5faea7efcd262fde1b5bf1085fbe30 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 19 May 2014 11:37:13 +0100 Subject: [PATCH 10/26] Revert "Reopen images for validation if they are closed" This reverts commit 7d43b1cf6eda74c86209a4cae0d71557ce9bdbc0. --- wagtail/wagtailimages/utils.py | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/wagtail/wagtailimages/utils.py b/wagtail/wagtailimages/utils.py index ff8083310..627a8f121 100644 --- a/wagtail/wagtailimages/utils.py +++ b/wagtail/wagtailimages/utils.py @@ -4,7 +4,6 @@ from PIL import Image from django.core.exceptions import ValidationError from django.utils.translation import ugettext_lazy as _ -from django.conf import settings def validate_image_format(f): @@ -17,26 +16,12 @@ def validate_image_format(f): if extension not in ['gif', 'jpeg', 'png']: raise ValidationError(_("Not a valid image. Please use a gif, jpeg or png file with the correct file extension.")) - if f.closed: - # Reopen the file - file = open(os.path.join(settings.MEDIA_ROOT, f.name), 'rb') - close = True - else: - # Seek to first byte but save position to be restored later - file_position = f.tell() - f.seek(0) - file = f - close = False - # Open image file - image = Image.open(file) + file_position = f.tell() + f.seek(0) + image = Image.open(f) + f.seek(file_position) # Check that the internal format matches the extension if image.format.upper() != extension.upper(): raise ValidationError(_("Not a valid %s image. Please use a gif, jpeg or png file with the correct file extension.") % (extension.upper())) - - # Close/restore file - if close: - file.close() - else: - f.seek(file_position) From 7c99fa664cac6db150f53c8b095e6d729e223473 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 19 May 2014 11:38:22 +0100 Subject: [PATCH 11/26] Don't check internal file formatl if image is closed --- wagtail/wagtailimages/utils.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/wagtail/wagtailimages/utils.py b/wagtail/wagtailimages/utils.py index 627a8f121..2f0c0e676 100644 --- a/wagtail/wagtailimages/utils.py +++ b/wagtail/wagtailimages/utils.py @@ -16,12 +16,13 @@ def validate_image_format(f): if extension not in ['gif', 'jpeg', 'png']: raise ValidationError(_("Not a valid image. Please use a gif, jpeg or png file with the correct file extension.")) - # Open image file - file_position = f.tell() - f.seek(0) - image = Image.open(f) - f.seek(file_position) + if not f.closed: + # Open image file + file_position = f.tell() + f.seek(0) + image = Image.open(f) + f.seek(file_position) - # Check that the internal format matches the extension - if image.format.upper() != extension.upper(): - raise ValidationError(_("Not a valid %s image. Please use a gif, jpeg or png file with the correct file extension.") % (extension.upper())) + # Check that the internal format matches the extension + if image.format.upper() != extension.upper(): + raise ValidationError(_("Not a valid %s image. Please use a gif, jpeg or png file with the correct file extension.") % (extension.upper())) From d364f95413c4f73265525c42a0b3e7d4a668ccb4 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 19 May 2014 14:03:11 +0100 Subject: [PATCH 12/26] Fixed typo --- 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 ac22ebc92..6de87c44c 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -632,7 +632,7 @@ class Page(MP_Node, ClusterableModel, Indexed): # Yield paths for child pages for child in self.get_children().live(): - for path in child.get_medusa_paths(): + for path in child.specific.get_medusa_paths(): yield '/' + child.slug + path def get_ancestors(self, inclusive=False): From e2930ab6bc9e2b522b6e127943efe7e30e645a42 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 19 May 2014 16:45:56 +0100 Subject: [PATCH 13/26] Added contrib folder --- wagtail/contrib/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 wagtail/contrib/__init__.py diff --git a/wagtail/contrib/__init__.py b/wagtail/contrib/__init__.py new file mode 100644 index 000000000..e69de29bb From 4207a0b3b824b3b03d8d708a016b6d5eacbe11f2 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 19 May 2014 16:51:08 +0100 Subject: [PATCH 14/26] Moved medusa renders into their own app in contrib --- wagtail/contrib/wagtailmedusa/__init__.py | 0 wagtail/contrib/wagtailmedusa/models.py | 0 wagtail/{wagtailcore => contrib/wagtailmedusa}/renderers.py | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 wagtail/contrib/wagtailmedusa/__init__.py create mode 100644 wagtail/contrib/wagtailmedusa/models.py rename wagtail/{wagtailcore => contrib/wagtailmedusa}/renderers.py (90%) diff --git a/wagtail/contrib/wagtailmedusa/__init__.py b/wagtail/contrib/wagtailmedusa/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/wagtail/contrib/wagtailmedusa/models.py b/wagtail/contrib/wagtailmedusa/models.py new file mode 100644 index 000000000..e69de29bb diff --git a/wagtail/wagtailcore/renderers.py b/wagtail/contrib/wagtailmedusa/renderers.py similarity index 90% rename from wagtail/wagtailcore/renderers.py rename to wagtail/contrib/wagtailmedusa/renderers.py index 33339581a..a11566b5e 100644 --- a/wagtail/wagtailcore/renderers.py +++ b/wagtail/contrib/wagtailmedusa/renderers.py @@ -1,5 +1,5 @@ from django_medusa.renderers import StaticSiteRenderer -from .models import Site +from wagtail.wagtailcore.models import Site class PageRenderer(StaticSiteRenderer): From f4040a648d0554c9e1c6da00ecbc661a29fdebe3 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 19 May 2014 16:55:48 +0100 Subject: [PATCH 15/26] Added medusa renderer for documents --- wagtail/contrib/wagtailmedusa/renderers.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/wagtail/contrib/wagtailmedusa/renderers.py b/wagtail/contrib/wagtailmedusa/renderers.py index a11566b5e..19c4eb89f 100644 --- a/wagtail/contrib/wagtailmedusa/renderers.py +++ b/wagtail/contrib/wagtailmedusa/renderers.py @@ -1,5 +1,6 @@ from django_medusa.renderers import StaticSiteRenderer from wagtail.wagtailcore.models import Site +from wagtail.wagtaildocs.models import Document class PageRenderer(StaticSiteRenderer): @@ -14,4 +15,10 @@ class PageRenderer(StaticSiteRenderer): return site.root_page.get_medusa_paths() -renderers = [PageRenderer] +class DocumentRenderer(StaticSiteRenderer): + def get_paths(self): + # Return list of paths to documents + return (doc.url for doc in Document.objects.all()) + + +renderers = [PageRenderer, DocumentRenderer] From b5d4c0e78a0e25b8ef49ebdf9bdfa94240ac02e9 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 19 May 2014 17:10:19 +0100 Subject: [PATCH 16/26] Renamed get_medusa_paths to get_staticsite_paths --- wagtail/contrib/wagtailmedusa/renderers.py | 2 +- wagtail/wagtailcore/models.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wagtail/contrib/wagtailmedusa/renderers.py b/wagtail/contrib/wagtailmedusa/renderers.py index 19c4eb89f..ee0ccf4f8 100644 --- a/wagtail/contrib/wagtailmedusa/renderers.py +++ b/wagtail/contrib/wagtailmedusa/renderers.py @@ -12,7 +12,7 @@ class PageRenderer(StaticSiteRenderer): return [] # Return list of paths - return site.root_page.get_medusa_paths() + return site.root_page.get_staticsite_paths() class DocumentRenderer(StaticSiteRenderer): diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 6de87c44c..d453684bd 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -622,9 +622,9 @@ class Page(MP_Node, ClusterableModel, Indexed): """ return self.serve(self.dummy_request()) - def get_medusa_paths(self): + def get_staticsite_paths(self): """ - This is a generator of URL paths to feed into django-medusa + This is a generator of URL paths to feed into a static site generator Override this if you would like to create static versions of subpages """ # Yield paths for this page @@ -632,7 +632,7 @@ class Page(MP_Node, ClusterableModel, Indexed): # Yield paths for child pages for child in self.get_children().live(): - for path in child.specific.get_medusa_paths(): + for path in child.specific.get_staticsite_paths(): yield '/' + child.slug + path def get_ancestors(self, inclusive=False): From 4111baf9331bd5aea92da6274a4d5fbae19f1502 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Tue, 20 May 2014 10:25:14 +0100 Subject: [PATCH 17/26] font size fix for login form icons --- wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss index a8164272d..4abf3ae20 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss @@ -179,6 +179,7 @@ form{ left: $desktop-nice-padding; margin-top: -1em; top: 50%; + font-size:1.5em; } .full{ From 26183e608bb1c4c8df8838879a74c1b43d91a4da Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Tue, 20 May 2014 11:05:19 +0100 Subject: [PATCH 18/26] mention some more optional/required dependencies in 'getting started' docs --- docs/gettingstarted.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/gettingstarted.rst b/docs/gettingstarted.rst index e4d2d6484..626aa42c0 100644 --- a/docs/gettingstarted.rst +++ b/docs/gettingstarted.rst @@ -102,12 +102,17 @@ Required dependencies ===================== - `pip `_ +- `libjpeg `_ +- `libxml2 `_ +- `libxslt `_ +- `zlib `_ Optional dependencies ===================== - `PostgreSQL`_ - `Elasticsearch`_ +- `Redis`_ Installation ============ @@ -137,6 +142,7 @@ with a regular Django project. .. _the Wagtail codebase: https://github.com/torchbox/wagtail .. _PostgreSQL: http://www.postgresql.org .. _Elasticsearch: http://www.elasticsearch.org +.. _Redis: http://redis.io/ _`Remove the demo app` ~~~~~~~~~~~~~~~~~~~~~~ From 9564cbf39f1366dbb0f99f904982c0e50356fc31 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 20 May 2014 11:17:49 +0100 Subject: [PATCH 19/26] Added document describing how to generate a static website --- docs/static_site_generation.rst | 83 +++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 docs/static_site_generation.rst diff --git a/docs/static_site_generation.rst b/docs/static_site_generation.rst new file mode 100644 index 000000000..dbdf40eb2 --- /dev/null +++ b/docs/static_site_generation.rst @@ -0,0 +1,83 @@ +Generating a static site +======================== + +This document describes how to render your Wagtail site into static HTML files using `django medusa`_ and the 'wagtail.contrib.wagtailmedusa' module. + + +Installing django-medusa +~~~~~~~~~~~~~~~~~~~~~~~~ + +Firstly, install django medusa from pip: + +.. code:: + + pip install django-medusa + + +Then add 'django_medusa' and 'wagtail.contrib.wagtailmedusa' to INSTALLED_APPS: + +.. code:: python + + INSTALLED_APPS = [ + ... + 'django_medusa', + 'wagtail.contrib.wagtailmedusa', + ] + + +Replacing GET parameters with custom routing +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Pages which require GET parameters (eg, pagination) don't generate suitable filenames for generated HTML files so they need to be changed to use custom routing instead. + +For example, lets say we have a Blog Index which uses pagination. We can override the 'route' method to make it respond on urls like '/page/1' and pass the page number through to the serve method: + +.. code:: python + + class BlogIndex(Page): + ... + + def serve(self, request, page=1): + ... + + def route(self, request, path_components): + if self.live and len(path_components) == 2 and path_components[0] == 'page': + try: + return self.serve(request, page=int(path_components[1])) + except (TypeError, ValueError): + pass + + return super(BlogIndex, self).route(request, path_components) + + +Rendering pages which use custom routing +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +For page types that override the route method, we need to let django medusa know which URLs it responds on. This is done by overriding the 'get_staticsite_paths' method to make it yield one string per URL path. + +For example, the BlogIndex above would need to yield one URL for each page of results: + +.. code:: python + + def get_staticsite_paths(self): + # Get page count + page_count = ... + + # Yield a path for each page + for page in range(page_count): + yield '/%d/' % (page + 1) + + # Yield from superclass + for path in super(BlogIndex, self).get_staticsite_paths(): + yield path + + +Rendering +~~~~~~~~~ + +To render a site, just run ``./manage.py staticsitegen``. This will render the entire website and place the HTML in a folder called 'medusa_output'. The static and media folders need to be copied into this folder manually after the rendering is complete. + +To test, open the 'medusa_output' folder in a terminal and run ``python -m SimpleHTTPServer``. + + +.. _django medusa: https://github.com/mtigas/django-medusa From c194a55304a5e9b45cf53f133502cfdcb820ec42 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 20 May 2014 12:39:23 +0100 Subject: [PATCH 20/26] Renamed get_staticsite_paths to get_static_site_paths --- docs/static_site_generation.rst | 6 +++--- wagtail/contrib/wagtailmedusa/renderers.py | 2 +- wagtail/wagtailcore/models.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/static_site_generation.rst b/docs/static_site_generation.rst index dbdf40eb2..66bd23ff5 100644 --- a/docs/static_site_generation.rst +++ b/docs/static_site_generation.rst @@ -53,13 +53,13 @@ For example, lets say we have a Blog Index which uses pagination. We can overrid Rendering pages which use custom routing ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -For page types that override the route method, we need to let django medusa know which URLs it responds on. This is done by overriding the 'get_staticsite_paths' method to make it yield one string per URL path. +For page types that override the route method, we need to let django medusa know which URLs it responds on. This is done by overriding the 'get_static_site_paths' method to make it yield one string per URL path. For example, the BlogIndex above would need to yield one URL for each page of results: .. code:: python - def get_staticsite_paths(self): + def get_static_site_paths(self): # Get page count page_count = ... @@ -68,7 +68,7 @@ For example, the BlogIndex above would need to yield one URL for each page of re yield '/%d/' % (page + 1) # Yield from superclass - for path in super(BlogIndex, self).get_staticsite_paths(): + for path in super(BlogIndex, self).get_static_site_paths(): yield path diff --git a/wagtail/contrib/wagtailmedusa/renderers.py b/wagtail/contrib/wagtailmedusa/renderers.py index ee0ccf4f8..950e13a14 100644 --- a/wagtail/contrib/wagtailmedusa/renderers.py +++ b/wagtail/contrib/wagtailmedusa/renderers.py @@ -12,7 +12,7 @@ class PageRenderer(StaticSiteRenderer): return [] # Return list of paths - return site.root_page.get_staticsite_paths() + return site.root_page.get_static_site_paths() class DocumentRenderer(StaticSiteRenderer): diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index d453684bd..17b88198e 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -622,7 +622,7 @@ class Page(MP_Node, ClusterableModel, Indexed): """ return self.serve(self.dummy_request()) - def get_staticsite_paths(self): + def get_static_site_paths(self): """ This is a generator of URL paths to feed into a static site generator Override this if you would like to create static versions of subpages @@ -632,7 +632,7 @@ class Page(MP_Node, ClusterableModel, Indexed): # Yield paths for child pages for child in self.get_children().live(): - for path in child.specific.get_staticsite_paths(): + for path in child.specific.get_static_site_paths(): yield '/' + child.slug + path def get_ancestors(self, inclusive=False): From 61779be5c96f62c0c2e99c99e91b8a6cf9caf4c1 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 20 May 2014 13:04:47 +0100 Subject: [PATCH 21/26] Added unit tests for get_static_site_paths --- wagtail/tests/models.py | 42 ++++++++++++++++++++++++++++++++++-- wagtail/wagtailcore/tests.py | 41 +++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py index 9124cb253..97858df4d 100644 --- a/wagtail/tests/models.py +++ b/wagtail/tests/models.py @@ -1,4 +1,5 @@ from django.db import models +from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from modelcluster.fields import ParentalKey from wagtail.wagtailcore.models import Page, Orderable from wagtail.wagtailcore.fields import RichTextField @@ -187,11 +188,48 @@ class EventIndex(Page): intro = RichTextField(blank=True) ajax_template = 'tests/includes/event_listing.html' - def get_context(self, request): + def get_events(self): + return self.get_children().live().type(EventPage) + + def get_paginator(self): + return Paginator(self.get_events(), 4) + + def get_context(self, request, page=1): + # Pagination + paginator = self.get_paginator() + try: + events = paginator.page(page) + except PageNotAnInteger: + events = paginator.page(1) + except EmptyPage: + events = paginator.page(paginator.num_pages) + + # Update context context = super(EventIndex, self).get_context(request) - context['events'] = EventPage.objects.filter(live=True) + context['events'] = events return context + def route(self, request, path_components): + if self.live and len(path_components) == 1: + try: + return self.serve(request, page=int(path_components[0])) + except (TypeError, ValueError): + pass + + return super(EventIndex, self).route(request, path_components) + + def get_static_site_paths(self): + # Get page count + page_count = self.get_paginator().num_pages + + # Yield a path for each page + for page in range(page_count): + yield '/%d/' % (page + 1) + + # Yield from superclass + for path in super(EventIndex, self).get_static_site_paths(): + yield path + EventIndex.content_panels = [ FieldPanel('title', classname="full title"), FieldPanel('intro', classname="full"), diff --git a/wagtail/wagtailcore/tests.py b/wagtail/wagtailcore/tests.py index 757221a29..db498650a 100644 --- a/wagtail/wagtailcore/tests.py +++ b/wagtail/wagtailcore/tests.py @@ -162,6 +162,47 @@ class TestServeView(TestCase): self.assertContains(response, 'Christmas') +class TestStaticSitePaths(TestCase): + def setUp(self): + self.root_page = Page.objects.get(id=1) + + # For simple tests + self.home_page = self.root_page.add_child(instance=SimplePage(title="Homepage", slug="home")) + self.about_page = self.home_page.add_child(instance=SimplePage(title="About us", slug="about")) + self.contact_page = self.home_page.add_child(instance=SimplePage(title="Contact", slug="contact")) + + # For custom tests + self.event_index = self.root_page.add_child(instance=EventIndex(title="Events", slug="events")) + for i in range(20): + self.event_index.add_child(instance=EventPage(title="Event " + str(i), slug="event" + str(i))) + + def test_local_static_site_paths(self): + paths = list(self.about_page.get_static_site_paths()) + + self.assertEqual(paths, ['/']) + + def test_child_static_site_paths(self): + paths = list(self.home_page.get_static_site_paths()) + + self.assertEqual(paths, ['/', '/about/', '/contact/']) + + def test_custom_static_site_paths(self): + paths = list(self.event_index.get_static_site_paths()) + + # Event index path + expected_paths = ['/'] + + # One path for each page of results + expected_paths.extend(['/' + str(i + 1) + '/' for i in range(5)]) + + # One path for each event page + expected_paths.extend(['/event' + str(i) + '/' for i in range(20)]) + + paths.sort() + expected_paths.sort() + self.assertEqual(paths, expected_paths) + + class TestPageUrlTags(TestCase): fixtures = ['test.json'] From 9d65cf8f12c6374d417cadbb8a3c0fef82340ef4 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 20 May 2014 13:48:02 +0100 Subject: [PATCH 22/26] Added changelog entry --- CHANGELOG.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a0024b6a0..7e5cb1be1 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -5,6 +5,7 @@ Changelog ~~~~~~~~~~~~~~~~ * Added toolbar to allow logged-in users to add and edit pages from the site front-end * Support for alternative image processing backends such as Wand, via the WAGTAILIMAGES_BACKENDS setting + * Added support for generating static sites using django-medusa * Added custom Query set for Pages with some handy methods for querying pages * Editor's guide documentation * Editor interface now outputs form media CSS / JS, to support custom widgets with assets From c349f06d6adcd363d254e9def094ce8043aad18d Mon Sep 17 00:00:00 2001 From: Tom Dyson Date: Tue, 20 May 2014 17:22:19 +0100 Subject: [PATCH 23/26] Missing underline for new static generation docs --- docs/static_site_generation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/static_site_generation.rst b/docs/static_site_generation.rst index 66bd23ff5..fe4b504ea 100644 --- a/docs/static_site_generation.rst +++ b/docs/static_site_generation.rst @@ -26,7 +26,7 @@ Then add 'django_medusa' and 'wagtail.contrib.wagtailmedusa' to INSTALLED_APPS: Replacing GET parameters with custom routing -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Pages which require GET parameters (eg, pagination) don't generate suitable filenames for generated HTML files so they need to be changed to use custom routing instead. From 431931b6a9551d02b642b5abb54f04fd315b6e0e Mon Sep 17 00:00:00 2001 From: Tom Dyson Date: Tue, 20 May 2014 17:24:16 +0100 Subject: [PATCH 24/26] Include static site generation docs in doc index --- docs/index.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/index.rst b/docs/index.rst index dbfe91f33..5b2b62bc4 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -13,6 +13,7 @@ It supports Django 1.6.2+ on Python 2.6 and 2.7. Django 1.7 and Python 3 support wagtail_search deploying performance + static_site_generation contributing support roadmap From 1f8e8a062bb1ea86c4ec73f0ac6e931cd4ab23ef Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 21 May 2014 13:44:21 +0100 Subject: [PATCH 25/26] Removed stray print statement --- wagtail/wagtailadmin/views/pages.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index a827b6cab..308f6fdd4 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -82,8 +82,6 @@ def content_type_use(request, content_type_app_name, content_type_model_name): except EmptyPage: pages = paginator.page(paginator.num_pages) - print page_class - return render(request, 'wagtailadmin/pages/content_type_use.html', { 'pages': pages, 'app_name': content_type_app_name, From 0ad412c343be6fba5c81e7f014bc4355afed5aa6 Mon Sep 17 00:00:00 2001 From: Neal Todd Date: Wed, 21 May 2014 17:49:04 +0100 Subject: [PATCH 26/26] Although the ubuntu/debian install scripts are not meant to produce a generic, secure production environment, nevertheless make Elasticsearch to only listen on localhost rather than the default 0.0.0.0 address. --- scripts/install/debian.sh | 5 +++-- scripts/install/ubuntu.sh | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/install/debian.sh b/scripts/install/debian.sh index 93f513d16..d29d5acdc 100644 --- a/scripts/install/debian.sh +++ b/scripts/install/debian.sh @@ -1,5 +1,5 @@ -# Production-configured Wagtail installation -# (secure services/account for full production use). +# Production-configured Wagtail installation. +# BUT, SECURE SERVICES/ACCOUNT FOR FULL PRODUCTION USE! # Tested on Debian 7.0. # Tom Dyson and Neal Todd @@ -42,6 +42,7 @@ aptitude -y install openjdk-7-jre-headless curl -O https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.0.0.deb dpkg -i elasticsearch-1.0.0.deb rm elasticsearch-1.0.0.deb +perl -pi -e"s/# network.host: 192.168.0.1/network.host: 127.0.0.1/" /etc/elasticsearch/elasticsearch.yml update-rc.d elasticsearch defaults 95 10 service elasticsearch start diff --git a/scripts/install/ubuntu.sh b/scripts/install/ubuntu.sh index 9f60e2e8e..c713cefa9 100644 --- a/scripts/install/ubuntu.sh +++ b/scripts/install/ubuntu.sh @@ -1,5 +1,5 @@ -# Production-configured Wagtail installation -# (secure services/account for full production use). +# Production-configured Wagtail installation. +# BUT, SECURE SERVICES/ACCOUNT FOR FULL PRODUCTION USE! # Tested on Ubuntu 13.04 and 13.10. # Tom Dyson and Neal Todd @@ -40,6 +40,7 @@ aptitude -y install openjdk-7-jre-headless curl -O https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.0.0.deb dpkg -i elasticsearch-1.0.0.deb rm elasticsearch-1.0.0.deb +perl -pi -e"s/# network.host: 192.168.0.1/network.host: 127.0.0.1/" /etc/elasticsearch/elasticsearch.yml update-rc.d elasticsearch defaults 95 10 service elasticsearch start