From a3b7259f98caca8e02b8e95f973207b4f66cfe76 Mon Sep 17 00:00:00 2001 From: Serafeim Papastefanos Date: Thu, 20 Mar 2014 15:58:02 +0200 Subject: [PATCH 001/123] Add a basic skeleton for Wagtail form builder --- wagtail/wagtailforms/__init__.py | 0 wagtail/wagtailforms/models.py | 72 ++++++++++++++++++++++++++++++++ wagtail/wagtailforms/tests.py | 19 +++++++++ 3 files changed, 91 insertions(+) create mode 100644 wagtail/wagtailforms/__init__.py create mode 100644 wagtail/wagtailforms/models.py create mode 100644 wagtail/wagtailforms/tests.py diff --git a/wagtail/wagtailforms/__init__.py b/wagtail/wagtailforms/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/wagtail/wagtailforms/models.py b/wagtail/wagtailforms/models.py new file mode 100644 index 000000000..e4be5a379 --- /dev/null +++ b/wagtail/wagtailforms/models.py @@ -0,0 +1,72 @@ +from django.db import models +from django.shortcuts import render +from django.utils.translation import ugettext_lazy as _ + +from wagtail.wagtailcore.models import Page, Orderable +from wagtail.wagtailadmin.edit_handlers import FieldPanel, InlinePanel + +from modelcluster.fields import ParentalKey + +FORM_FIELD_CHOICES = ( + ('SINGLELINE', _('Single line text')), + ('MULTILINE', _('Multi-line text')), + ('EMAIL', _('Email')), + ('NUMBER', _('Number')), + ('URL', _('URL')), + ('CHECKBOX', _('Checkbox')), + ('CHECKBOXES', _('Checkboxes')), + ('DROPDOWN', _('Drop down')), + ('RADIO', _('Radio buttons')), + ('DATE', _('Date')), + ('DATETIME', _('Date/time')), +) + +class AbstractFormFields(models.Model): + #page = ParentalKey('wagtailforms.AbstractForm', related_name='form_fields') + label = models.CharField(max_length=255) + field_type = models.CharField(max_length=16, choices = FORM_FIELD_CHOICES) + required = models.BooleanField( default=True) + choices = models.CharField(max_length=512, blank=True, help_text='Comma seperated list of choices') + default_value = models.CharField(max_length=255, blank=True) + help_text = models.CharField(max_length=255, blank=True) + + panels = [ + FieldPanel('label'), + FieldPanel('field_type'), + FieldPanel('required'), + FieldPanel('choices'), + FieldPanel('default_value'), + FieldPanel('help_text'), + ] + + class Meta: + abstract = True + + + +class AbstractForm(Page): + is_abstract = True #Don't display me in "Add" + + class Meta: + abstract = True + + def serve(self, request): + # Get fields + form_fields = self.form_fields + + return render(request, self.template, { + 'self': self, + }) + + +class ConcreteFormFields(Orderable, AbstractFormFields): + page = ParentalKey('wagtailforms.ConcreteForm', related_name='form_fields') + + +class ConcreteForm(AbstractForm): + pass + +ConcreteForm.content_panels = [ + FieldPanel('title', classname="full title"), + InlinePanel(ConcreteForm, 'form_fields', label="Form Fields"), +] diff --git a/wagtail/wagtailforms/tests.py b/wagtail/wagtailforms/tests.py new file mode 100644 index 000000000..95cbacbf0 --- /dev/null +++ b/wagtail/wagtailforms/tests.py @@ -0,0 +1,19 @@ +""" +This file demonstrates writing tests using the unittest module. These will pass +when you run "manage.py test". + +Replace this with more appropriate tests for your application. +""" + +import unittest + +from django.test import TestCase + + +@unittest.skip("Need real tests") +class SimpleTest(TestCase): + def test_basic_addition(self): + """ + Tests that 1 + 1 always equals 2. + """ + self.assertEqual(1 + 1, 2) From 92563ff53532eb9480139fdc95186085246e22ba Mon Sep 17 00:00:00 2001 From: Serafeim Papastefanos Date: Thu, 20 Mar 2014 23:04:44 +0200 Subject: [PATCH 002/123] Add form builder and the basic form workflow also add the implementation of all form field types. The form will save the submitted data to the database (using the FormSubmission) model. --- wagtail/wagtailforms/forms.py | 67 ++++++++++++++++++++++ wagtail/wagtailforms/models.py | 102 +++++++++++++++++++++++++-------- 2 files changed, 145 insertions(+), 24 deletions(-) create mode 100644 wagtail/wagtailforms/forms.py diff --git a/wagtail/wagtailforms/forms.py b/wagtail/wagtailforms/forms.py new file mode 100644 index 000000000..b444895c5 --- /dev/null +++ b/wagtail/wagtailforms/forms.py @@ -0,0 +1,67 @@ +import django.forms +from django.utils.datastructures import SortedDict +from django.utils.text import slugify +from unidecode import unidecode + +class FormBuilder(): + formfields = SortedDict() + def __init__(self, fields): + for field in fields: + options = self.get_options(field) + f = getattr(self, "create_"+field.field_type+"_field" )(field, options) + # unidecode will return an ascii string while slugify wants a unicode string + # on the other hand, slugify returns a safe-string which will be converted + # to a normal str + field_name = str(slugify(unicode(unidecode(field.label)))) + self.formfields[field_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 + + def create_singleline_field(self, field, options): + # TODO: This is a default value - it may need to be changed + options['max_length'] = 255 + return django.forms.CharField(**options) + + def create_multiline_field(self, field, options): + return django.forms.CharField(widget=django.forms.Textarea, **options) + + def create_date_field(self, field, options): + return django.forms.DateField(**options) + + def create_datetime_field(self, field, options): + return django.forms.DateTimeField(**options) + + def create_email_field(self, field, options): + return django.forms.EmailField(**options) + + def create_url_field(self, field, options): + return django.forms.URLField(**options) + + def create_number_field(self, field, options): + return django.forms.DecimalField(**options) + + def create_dropdown_field(self, field, options): + options['choices'] = map(lambda x: (x.strip(),x.strip()), field.choices.split(',')) + return django.forms.ChoiceField(**options) + + def create_radio_field(self, field, options): + options['choices'] = map(lambda x: (x.strip(),x.strip()), field.choices.split(',')) + return django.forms.ChoiceField(widget=django.forms.RadioSelect, **options) + + def create_checkboxes_field(self, field, options): + options['choices'] = map(lambda x: (x.strip(),x.strip()), field.choices.split(',')) + options['initial'] = field.default_value.split(',') + return django.forms.MultipleChoiceField(widget=django.forms.CheckboxSelectMultiple, **options) + + def create_checkbox_field(self, field, options): + return django.forms.BooleanField(**options) + + def get_form_class(self): + return type('WagtailForm', (django.forms.Form,), self.formfields ) + diff --git a/wagtail/wagtailforms/models.py b/wagtail/wagtailforms/models.py index e4be5a379..ff758497c 100644 --- a/wagtail/wagtailforms/models.py +++ b/wagtail/wagtailforms/models.py @@ -1,32 +1,53 @@ +from django.conf import settings from django.db import models from django.shortcuts import render from django.utils.translation import ugettext_lazy as _ +import json +import re + from wagtail.wagtailcore.models import Page, Orderable from wagtail.wagtailadmin.edit_handlers import FieldPanel, InlinePanel from modelcluster.fields import ParentalKey +from .forms import FormBuilder + FORM_FIELD_CHOICES = ( - ('SINGLELINE', _('Single line text')), - ('MULTILINE', _('Multi-line text')), - ('EMAIL', _('Email')), - ('NUMBER', _('Number')), - ('URL', _('URL')), - ('CHECKBOX', _('Checkbox')), - ('CHECKBOXES', _('Checkboxes')), - ('DROPDOWN', _('Drop down')), - ('RADIO', _('Radio buttons')), - ('DATE', _('Date')), - ('DATETIME', _('Date/time')), + ('singleline', _('Single line text')), + ('multiline', _('Multi-line text')), + ('email', _('Email')), + ('number', _('Number')), + ('url', _('URL')), + ('checkbox', _('Checkbox')), + ('checkboxes', _('Checkboxes')), + ('dropdown', _('Drop down')), + ('radio', _('Radio buttons')), + ('date', _('Date')), + ('datetime', _('Date/time')), ) + +HTML_EXTENSION_RE = re.compile(r"(.*)\.html") + + +class FormSubmission(models.Model): + """Data for a Form submission.""" + form_data = models.TextField() + form_page = models.ForeignKey('wagtailcore.Page',related_name='+') + submit_time = models.DateTimeField(auto_now_add=True) + user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True) + + def __unicode__(self): + return self.form_data + class AbstractFormFields(models.Model): - #page = ParentalKey('wagtailforms.AbstractForm', related_name='form_fields') - label = models.CharField(max_length=255) + """Database Fields required for building a Django Form field.""" + + label = models.CharField(max_length=255, help_text=_('The label of the form field') ) field_type = models.CharField(max_length=16, choices = FORM_FIELD_CHOICES) - required = models.BooleanField( default=True) - choices = models.CharField(max_length=512, blank=True, help_text='Comma seperated list of choices') + required = models.BooleanField(default=True) + choices = models.CharField(max_length=512, blank=True, help_text=_('Comma seperated list of choices')) default_value = models.CharField(max_length=255, blank=True) help_text = models.CharField(max_length=255, blank=True) @@ -42,31 +63,64 @@ class AbstractFormFields(models.Model): class Meta: abstract = True - - + class AbstractForm(Page): - is_abstract = True #Don't display me in "Add" + """A Form Page. Pages with form should inhert from it""" + form_builder = FormBuilder + is_abstract = True # Don't display me in "Add" + + def __init__(self, *args, **kwargs): + super(Page, self).__init__(*args, **kwargs) + if not hasattr(self, 'landing_page_template'): + template_wo_ext = re.match(HTML_EXTENSION_RE, self.template).group(1) + self.landing_page_template = template_wo_ext + '_landing.html' class Meta: abstract = True - + def serve(self, request): - # Get fields - form_fields = self.form_fields + fb = self.form_builder(self.form_fields.all() ) + form_class = fb.get_form_class() + + if request.method == 'POST': + self.form = form_class(request.POST) + + if self.form.is_valid(): + # remove csrf_token from form.data + form_data = dict( + i for i in self.form.data.items() + if i[0] != 'csrfmiddlewaretoken' + ) + FormSubmission.objects.create( + form_data = json.dumps(form_data), + form_page = self.page_ptr, + user = request.user, + ) + # TODO: Do other things like sending email + # render the landing_page + # TODO: It is much better to redirect to it + return render(request, self.landing_page_template, { + 'self': self, + }) + else: + self.form = form_class() return render(request, self.template, { 'self': self, + 'form': self.form, }) - + + +######## TEST class ConcreteFormFields(Orderable, AbstractFormFields): page = ParentalKey('wagtailforms.ConcreteForm', related_name='form_fields') - class ConcreteForm(AbstractForm): - pass + thank_you = models.CharField(max_length=255) ConcreteForm.content_panels = [ FieldPanel('title', classname="full title"), + FieldPanel('thank_you', classname="full"), InlinePanel(ConcreteForm, 'form_fields', label="Form Fields"), ] From b6aca526dac3b2e55c99cea0b1491e6b387314f2 Mon Sep 17 00:00:00 2001 From: Serafeim Papastefanos Date: Fri, 21 Mar 2014 23:44:44 +0200 Subject: [PATCH 003/123] Add generic send_email task in wagtailadmin.tasks This will be used from the send form data to email. It has been added to the wagtailadmin.tasks module to use celery if it has been defined and configured or just send the email if not (just like the send_notification task). --- wagtail/wagtailadmin/tasks.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/wagtail/wagtailadmin/tasks.py b/wagtail/wagtailadmin/tasks.py index 3d6f3e8f1..d63b17f79 100644 --- a/wagtail/wagtailadmin/tasks.py +++ b/wagtail/wagtailadmin/tasks.py @@ -85,3 +85,16 @@ def send_notification(page_revision_id, notification, excluded_user_id): # Send email send_mail(email_subject, email_content, from_email, email_addresses) + + +@task +def send_email_task(email_subject, email_content, from_email, email_addresses): + if not from_email: + if hasattr(settings, 'WAGTAILADMIN_NOTIFICATION_FROM_EMAIL'): + from_email = settings.WAGTAILADMIN_NOTIFICATION_FROM_EMAIL + elif hasattr(settings, 'DEFAULT_FROM_EMAIL'): + from_email = settings.DEFAULT_FROM_EMAIL + else: + from_email = 'webmaster@localhost' + + send_mail(email_subject, email_content, from_email, email_addresses) From 9557bc66050ac70a884584596ca0bcb231180ead Mon Sep 17 00:00:00 2001 From: Serafeim Papastefanos Date: Fri, 21 Mar 2014 23:47:48 +0200 Subject: [PATCH 004/123] Add first version of send form data to email This has been added in a generic way to allow defining form processing backends. Sending the form data to an email is one of these backends - others may include for instance call a web service with the form data (for instance in a customer complains form we'd need to start a customer complains workflow). In any case, if the AbstractForm has a 'form_processing_backend' attribute which should be a class, a new object of that class will be generated and its process method will be called. The process method needs two argumetns: The Page to pass any needed paramaters and the form to actually pass the form data. The form processing backends should inherit from the BaseFormProcessor class (however probably this will be refactored to just use duck-typing since I don't think that a base class offers anything here) and implement the process method. Also, another useful method would be the validate_usage to be called from the Form that uses the backend and actually check that the form defines the correct fields - an example is that for the email processor we need to define an email_to field in the form. The validate_usage would need to raise an ImproperlyConfigured exception if it has not been configured yet, however it has not been yet implemented. --- wagtail/wagtailforms/backends/__init__.py | 0 wagtail/wagtailforms/backends/base.py | 11 ++++++ wagtail/wagtailforms/backends/email.py | 17 +++++++++ wagtail/wagtailforms/forms.py | 4 +-- wagtail/wagtailforms/models.py | 44 +++++++++++++++++++---- 5 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 wagtail/wagtailforms/backends/__init__.py create mode 100644 wagtail/wagtailforms/backends/base.py create mode 100644 wagtail/wagtailforms/backends/email.py diff --git a/wagtail/wagtailforms/backends/__init__.py b/wagtail/wagtailforms/backends/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/wagtail/wagtailforms/backends/base.py b/wagtail/wagtailforms/backends/base.py new file mode 100644 index 000000000..45d0343ae --- /dev/null +++ b/wagtail/wagtailforms/backends/base.py @@ -0,0 +1,11 @@ +from django.core.exceptions import ImproperlyConfigured + +class BaseFormProcessor(object): + def __init__(self): + pass + + def validate_usage(page): + return True + + def process(self, page, form): + return NotImplemented \ No newline at end of file diff --git a/wagtail/wagtailforms/backends/email.py b/wagtail/wagtailforms/backends/email.py new file mode 100644 index 000000000..ec1677318 --- /dev/null +++ b/wagtail/wagtailforms/backends/email.py @@ -0,0 +1,17 @@ +import datetime + +from django.core.exceptions import ImproperlyConfigured +from .base import BaseFormProcessor +from wagtail.wagtailadmin import tasks + + +class EmailFormProcessor(BaseFormProcessor): + def __init__(self): + pass + + def validate_usage(page): + return True + + def process(self, page, form): + content = ', '.join([ x[1].label +': '+ form.data.get(x[0]) for x in form.fields.items() ]) + tasks.send_email_task.delay("New " + page.title+" form submission at " + str(datetime.datetime.now()) , content, page.email_from, [page.email_to] ) diff --git a/wagtail/wagtailforms/forms.py b/wagtail/wagtailforms/forms.py index b444895c5..6e938822d 100644 --- a/wagtail/wagtailforms/forms.py +++ b/wagtail/wagtailforms/forms.py @@ -55,8 +55,8 @@ class FormBuilder(): return django.forms.ChoiceField(widget=django.forms.RadioSelect, **options) def create_checkboxes_field(self, field, options): - options['choices'] = map(lambda x: (x.strip(),x.strip()), field.choices.split(',')) - options['initial'] = field.default_value.split(',') + options['choices'] = [ (x.strip(), x.strip()) for x in field.choices.split(',')] + options['initial'] = [ x.strip() for x in field.default_value.split(',') ] return django.forms.MultipleChoiceField(widget=django.forms.CheckboxSelectMultiple, **options) def create_checkbox_field(self, field, options): diff --git a/wagtail/wagtailforms/models.py b/wagtail/wagtailforms/models.py index ff758497c..9eed4f61b 100644 --- a/wagtail/wagtailforms/models.py +++ b/wagtail/wagtailforms/models.py @@ -9,6 +9,8 @@ import re from wagtail.wagtailcore.models import Page, Orderable from wagtail.wagtailadmin.edit_handlers import FieldPanel, InlinePanel +from wagtail.wagtailforms.backends.email import EmailFormProcessor + from modelcluster.fields import ParentalKey from .forms import FormBuilder @@ -47,8 +49,8 @@ class AbstractFormFields(models.Model): label = models.CharField(max_length=255, help_text=_('The label of the form field') ) field_type = models.CharField(max_length=16, choices = FORM_FIELD_CHOICES) required = models.BooleanField(default=True) - choices = models.CharField(max_length=512, blank=True, help_text=_('Comma seperated list of choices')) - default_value = models.CharField(max_length=255, blank=True) + choices = models.CharField(max_length=512, blank=True, help_text=_('Comma seperated list of choices. Only applicable in checkboxes, radio and dropdown.')) + default_value = models.CharField(max_length=255, blank=True, help_text=_('Default value. Comma seperated values supported for checkboxes.')) help_text = models.CharField(max_length=255, blank=True) panels = [ @@ -65,12 +67,12 @@ class AbstractFormFields(models.Model): class AbstractForm(Page): - """A Form Page. Pages with form should inhert from it""" + """A Form Page. Pages implementing a form should inhert from it""" form_builder = FormBuilder is_abstract = True # Don't display me in "Add" def __init__(self, *args, **kwargs): - super(Page, self).__init__(*args, **kwargs) + super(AbstractForm, self).__init__(*args, **kwargs) if not hasattr(self, 'landing_page_template'): template_wo_ext = re.match(HTML_EXTENSION_RE, self.template).group(1) self.landing_page_template = template_wo_ext + '_landing.html' @@ -93,10 +95,14 @@ class AbstractForm(Page): ) FormSubmission.objects.create( form_data = json.dumps(form_data), - form_page = self.page_ptr, + form_page = self, user = request.user, ) - # TODO: Do other things like sending email + # If we have a form_processing_backend call its process method + if hasattr(self, 'form_processing_backend'): + form_processor = self.form_processing_backend() + form_processor.process(self, self.form) + # render the landing_page # TODO: It is much better to redirect to it return render(request, self.landing_page_template, { @@ -111,6 +117,17 @@ class AbstractForm(Page): }) +class AbstractEmailForm(AbstractForm): + """A Form Page that sends email. Pages implementing a form that should be send to an email should inhert from it""" + is_abstract = True # Don't display me in "Add" + form_processing_backend = EmailFormProcessor + + email_to = models.CharField(max_length=255, ) + email_from = models.CharField(max_length=255, ) + + class Meta: + abstract = True + ######## TEST class ConcreteFormFields(Orderable, AbstractFormFields): @@ -124,3 +141,18 @@ ConcreteForm.content_panels = [ FieldPanel('thank_you', classname="full"), InlinePanel(ConcreteForm, 'form_fields', label="Form Fields"), ] + +######## +class ConcreteEmailFormFields(Orderable, AbstractFormFields): + page = ParentalKey('wagtailforms.ConcreteEmailForm', related_name='form_fields') + +class ConcreteEmailForm(AbstractEmailForm): + thank_you = models.CharField(max_length=255) + +ConcreteEmailForm.content_panels = [ + FieldPanel('title', classname="full title"), + FieldPanel('thank_you', classname="full"), + FieldPanel('email_from', classname="full"), + FieldPanel('email_to', classname="full"), + InlinePanel(ConcreteEmailForm, 'form_fields', label="Form Fields"), +] From 680119dfef425a6cbc8e44f58c471fcb791f1a18 Mon Sep 17 00:00:00 2001 From: Serafeim Papastefanos Date: Sat, 22 Mar 2014 08:18:53 +0200 Subject: [PATCH 005/123] Make from_address optional in send_email_task --- wagtail/wagtailadmin/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagtail/wagtailadmin/tasks.py b/wagtail/wagtailadmin/tasks.py index d63b17f79..59779d36b 100644 --- a/wagtail/wagtailadmin/tasks.py +++ b/wagtail/wagtailadmin/tasks.py @@ -88,7 +88,7 @@ def send_notification(page_revision_id, notification, excluded_user_id): @task -def send_email_task(email_subject, email_content, from_email, email_addresses): +def send_email_task(email_subject, email_content, email_addresses, from_email=None): if not from_email: if hasattr(settings, 'WAGTAILADMIN_NOTIFICATION_FROM_EMAIL'): from_email = settings.WAGTAILADMIN_NOTIFICATION_FROM_EMAIL From 3855da21bf386c821a879339cf55bb2a0094e392 Mon Sep 17 00:00:00 2001 From: Serafeim Papastefanos Date: Sat, 22 Mar 2014 09:40:40 +0200 Subject: [PATCH 006/123] Add metaclass for AbstractForm and validate ... FormEmailProcessor. The metaclass is used to add each non-abstract form in a registry in a similar way as for Pages. It also checks if an form_processing_backend is defined and if it is it will call its validate_usage method. This way, the validate_usage method can throw immediately and ImproperlyConfigured method so the developer would know if he's done something wrong. The validate_usage method of the FormEmailProcessor has been implemented this way. --- wagtail/wagtailforms/backends/email.py | 10 ++++-- wagtail/wagtailforms/models.py | 49 +++++++++++++++++++++----- 2 files changed, 48 insertions(+), 11 deletions(-) diff --git a/wagtail/wagtailforms/backends/email.py b/wagtail/wagtailforms/backends/email.py index ec1677318..063a2ce65 100644 --- a/wagtail/wagtailforms/backends/email.py +++ b/wagtail/wagtailforms/backends/email.py @@ -9,9 +9,15 @@ class EmailFormProcessor(BaseFormProcessor): def __init__(self): pass + @staticmethod def validate_usage(page): - return True + try: + page._meta.get_field('subject') + page._meta.get_field('to_address') + page._meta.get_field('from_address') + except: + raise ImproperlyConfigured("To use the EmailFormProcessor your Page must define the fields: subject, to_address and from_address.") def process(self, page, form): content = ', '.join([ x[1].label +': '+ form.data.get(x[0]) for x in form.fields.items() ]) - tasks.send_email_task.delay("New " + page.title+" form submission at " + str(datetime.datetime.now()) , content, page.email_from, [page.email_to] ) + tasks.send_email_task.delay(page.subject, content, [page.to_address], page.from_address, ) diff --git a/wagtail/wagtailforms/models.py b/wagtail/wagtailforms/models.py index 9eed4f61b..f64f56df7 100644 --- a/wagtail/wagtailforms/models.py +++ b/wagtail/wagtailforms/models.py @@ -1,4 +1,6 @@ + from django.conf import settings +from django.contrib.contenttypes.models import ContentType from django.db import models from django.shortcuts import render from django.utils.translation import ugettext_lazy as _ @@ -6,7 +8,7 @@ from django.utils.translation import ugettext_lazy as _ import json import re -from wagtail.wagtailcore.models import Page, Orderable +from wagtail.wagtailcore.models import PageBase, Page, Orderable from wagtail.wagtailadmin.edit_handlers import FieldPanel, InlinePanel from wagtail.wagtailforms.backends.email import EmailFormProcessor @@ -66,11 +68,39 @@ class AbstractFormFields(models.Model): abstract = True +FORM_MODEL_CLASSES = [] +_FORM_CONTENT_TYPES = [] + +def get_form_types(): + global _FORM_CONTENT_TYPES + if len(_FORM_CONTENT_TYPES) != len(FORM_MODEL_CLASSES): + _FORM_CONTENT_TYPES = [ + ContentType.objects.get_for_model(cls) for cls in FORM_MODEL_CLASSES + ] + return _FORM_CONTENT_TYPES + + +class FormBase(PageBase): + """Metaclass for Forms""" + def __init__(cls, name, bases, dct): + super(FormBase, cls).__init__(name, bases, dct) + + if not cls.is_abstract: + # register this type in the list of page content types + FORM_MODEL_CLASSES.append(cls) + # Check if form_processing_backend is ok + if hasattr(cls, 'form_processing_backend'): + cls.form_processing_backend.validate_usage(cls) + + class AbstractForm(Page): """A Form Page. Pages implementing a form should inhert from it""" + + __metaclass__ = FormBase + form_builder = FormBuilder is_abstract = True # Don't display me in "Add" - + def __init__(self, *args, **kwargs): super(AbstractForm, self).__init__(*args, **kwargs) if not hasattr(self, 'landing_page_template'): @@ -118,17 +148,18 @@ class AbstractForm(Page): class AbstractEmailForm(AbstractForm): - """A Form Page that sends email. Pages implementing a form that should be send to an email should inhert from it""" + """A Form Page that sends email. Pages implementing a form to be send to an email should inherit from it""" is_abstract = True # Don't display me in "Add" form_processing_backend = EmailFormProcessor - - email_to = models.CharField(max_length=255, ) - email_from = models.CharField(max_length=255, ) - + + to_address = models.CharField(max_length=255, ) + from_address = models.CharField(max_length=255, blank=True) + subject = models.CharField(max_length=255, ) + class Meta: abstract = True - - + + ######## TEST class ConcreteFormFields(Orderable, AbstractFormFields): page = ParentalKey('wagtailforms.ConcreteForm', related_name='form_fields') From 49a1ef30791fd9915fbbbea647bdcee2833d029d Mon Sep 17 00:00:00 2001 From: Serafeim Papastefanos Date: Sat, 22 Mar 2014 09:45:49 +0200 Subject: [PATCH 007/123] Add a basic views skeleton for wagtailforms --- .../templates/wagtailforms/index.html | 23 ++++ wagtail/wagtailforms/urls.py | 14 ++ wagtail/wagtailforms/views.py | 125 ++++++++++++++++++ 3 files changed, 162 insertions(+) create mode 100644 wagtail/wagtailforms/templates/wagtailforms/index.html create mode 100644 wagtail/wagtailforms/urls.py create mode 100644 wagtail/wagtailforms/views.py diff --git a/wagtail/wagtailforms/templates/wagtailforms/index.html b/wagtail/wagtailforms/templates/wagtailforms/index.html new file mode 100644 index 000000000..b4928e8e3 --- /dev/null +++ b/wagtail/wagtailforms/templates/wagtailforms/index.html @@ -0,0 +1,23 @@ +{% extends "wagtailadmin/base.html" %} +{% load i18n %} +{% block titletag %}{% trans "Forms" %}{% endblock %} +{% block bodyclass %}menu-forms{% endblock %} +{% block content %} + + {% include "wagtailadmin/shared/header.html" with title="Forms" %} + +
+
    + {% for name, description, content_type in form_types %} +
  • +
    + + {{ name|capfirst }} + + {{ description }} +
    +
    • + {% endfor %} +
+
+{% endblock %} diff --git a/wagtail/wagtailforms/urls.py b/wagtail/wagtailforms/urls.py new file mode 100644 index 000000000..7de8b003b --- /dev/null +++ b/wagtail/wagtailforms/urls.py @@ -0,0 +1,14 @@ +from django.conf.urls import patterns, url + + +urlpatterns = patterns( + 'wagtail.wagtailforms.views', + url(r'^$', 'index', name='wagtailforms_index'), + + #url(r'^choose/$', 'chooser.choose', name='wagtailsnippets_choose_generic'), + #url(r'^choose/(\w+)/(\w+)/$', 'chooser.choose', name='wagtailsnippets_choose'), + + #url(r'^(\w+)/(\w+)/$', 'snippets.list', name='wagtailsnippets_list'), + #url(r'^(\w+)/(\w+)/new/$', 'snippets.create', name='wagtailsnippets_create'), + #url(r'^(\w+)/(\w+)/(\d+)/$', 'snippets.edit', name='wagtailsnippets_edit'), +) diff --git a/wagtail/wagtailforms/views.py b/wagtail/wagtailforms/views.py new file mode 100644 index 000000000..1814cd814 --- /dev/null +++ b/wagtail/wagtailforms/views.py @@ -0,0 +1,125 @@ +from django.http import Http404 +from django.shortcuts import get_object_or_404, render, redirect +from django.utils.encoding import force_text +from django.utils.text import capfirst +from django.contrib.contenttypes.models import ContentType +from django.contrib import messages +from django.contrib.auth.decorators import permission_required +from django.core.exceptions import PermissionDenied +from django.utils.translation import ugettext as _ + +from wagtail.wagtailadmin.edit_handlers import ObjectList, extract_panel_definitions_from_model_class + + +@permission_required('wagtailadmin.access_admin') +def index(request): + + + return render(request, 'wagtailforms/index.html', { + #'snippet_types': snippet_types, + }) + +""" +@permission_required('wagtailadmin.access_admin') # further permissions are enforced within the view +def list(request, content_type_app_name, content_type_model_name): + content_type = get_content_type_from_url_params(content_type_app_name, content_type_model_name) + if not user_can_edit_snippet_type(request.user, content_type): + raise PermissionDenied + + model = content_type.model_class() + snippet_type_name, snippet_type_name_plural = get_snippet_type_name(content_type) + + items = model.objects.all() + + return render(request, 'wagtailsnippets/snippets/type_index.html', { + 'content_type': content_type, + 'snippet_type_name': snippet_type_name, + 'snippet_type_name_plural': snippet_type_name_plural, + 'items': items, + }) + + +@permission_required('wagtailadmin.access_admin') # further permissions are enforced within the view +def create(request, content_type_app_name, content_type_model_name): + content_type = get_content_type_from_url_params(content_type_app_name, content_type_model_name) + if not user_can_edit_snippet_type(request.user, content_type): + raise PermissionDenied + + model = content_type.model_class() + snippet_type_name = get_snippet_type_name(content_type)[0] + + instance = model() + edit_handler_class = get_snippet_edit_handler(model) + form_class = edit_handler_class.get_form_class(model) + + if request.POST: + form = form_class(request.POST, request.FILES, instance=instance) + + if form.is_valid(): + form.save() + + messages.success( + request, + _("{snippet_type} '{instance}' created.").format( + snippet_type=capfirst(get_snippet_type_name(content_type)[0]), + instance=instance + ) + ) + return redirect('wagtailsnippets_list', content_type.app_label, content_type.model) + else: + messages.error(request, _("The snippet could not be created due to errors.")) + edit_handler = edit_handler_class(instance=instance, form=form) + else: + form = form_class(instance=instance) + edit_handler = edit_handler_class(instance=instance, form=form) + + return render(request, 'wagtailsnippets/snippets/create.html', { + 'content_type': content_type, + 'snippet_type_name': snippet_type_name, + 'edit_handler': edit_handler, + }) + + +@permission_required('wagtailadmin.access_admin') # further permissions are enforced within the view +def edit(request, content_type_app_name, content_type_model_name, id): + content_type = get_content_type_from_url_params(content_type_app_name, content_type_model_name) + if not user_can_edit_snippet_type(request.user, content_type): + raise PermissionDenied + + model = content_type.model_class() + snippet_type_name = get_snippet_type_name(content_type)[0] + + instance = get_object_or_404(model, id=id) + edit_handler_class = get_snippet_edit_handler(model) + form_class = edit_handler_class.get_form_class(model) + + if request.POST: + form = form_class(request.POST, request.FILES, instance=instance) + + if form.is_valid(): + form.save() + + messages.success( + request, + _("{snippet_type} '{instance}' updated.").format( + snippet_type=capfirst(snippet_type_name), + instance=instance + ) + ) + return redirect('wagtailsnippets_list', content_type.app_label, content_type.model) + else: + messages.error(request, _("The snippet could not be saved due to errors.")) + edit_handler = edit_handler_class(instance=instance, form=form) + else: + form = form_class(instance=instance) + edit_handler = edit_handler_class(instance=instance, form=form) + + return render(request, 'wagtailsnippets/snippets/edit.html', { + 'content_type': content_type, + 'snippet_type_name': snippet_type_name, + 'instance': instance, + 'edit_handler': edit_handler, + }) + + +""" \ No newline at end of file From e3cb37ca72e43c2b544a9f1bef10942f47ce154a Mon Sep 17 00:00:00 2001 From: Serafeim Papastefanos Date: Sat, 22 Mar 2014 13:38:37 +0200 Subject: [PATCH 008/123] Add basic form submission views Add two urls: index which lists all different forms that have been defined and submissions which for a specific form will list all its submissions. The index lists each Page seperately (so if we have two different instances of a form they will be listed seperately here), so the submissions view will need the app_label, model_name and id to find out all the submissions of a specific page. --- .../templates/wagtailforms/form_index.html | 25 +++++++++ .../templates/wagtailforms/index.html | 14 ++--- .../templates/wagtailforms/list.html | 28 ++++++++++ wagtail/wagtailforms/urls.py | 7 +-- wagtail/wagtailforms/views.py | 53 ++++++++++++------- 5 files changed, 95 insertions(+), 32 deletions(-) create mode 100644 wagtail/wagtailforms/templates/wagtailforms/form_index.html create mode 100644 wagtail/wagtailforms/templates/wagtailforms/list.html diff --git a/wagtail/wagtailforms/templates/wagtailforms/form_index.html b/wagtail/wagtailforms/templates/wagtailforms/form_index.html new file mode 100644 index 000000000..143542367 --- /dev/null +++ b/wagtail/wagtailforms/templates/wagtailforms/form_index.html @@ -0,0 +1,25 @@ +{% extends "wagtailadmin/base.html" %} +{% load i18n %} +{% block titletag %}{% blocktrans with form_title=form_page.title|capfirst %}Submissions of {{ form_title }}{% endblocktrans %}{% endblock %} +{% block bodyclass %}menu-snippets{% endblock %} +{% block content %} + +
+
+
+

+ {% blocktrans with form_title=form_page.title|capfirst %}Submissions of {{ form_title }}{% endblocktrans %} +

+
+ +
+
+
+
+ {% if submissions %} + {% include "wagtailforms/list.html" %} + {% else %} +

{% blocktrans with title=form_page.title %}No submissions of the '{{ title }}' form.{% endblocktrans %}

+ {% endif %} +
+{% endblock %} diff --git a/wagtail/wagtailforms/templates/wagtailforms/index.html b/wagtail/wagtailforms/templates/wagtailforms/index.html index b4928e8e3..d99fc8d98 100644 --- a/wagtail/wagtailforms/templates/wagtailforms/index.html +++ b/wagtail/wagtailforms/templates/wagtailforms/index.html @@ -3,18 +3,20 @@ {% block titletag %}{% trans "Forms" %}{% endblock %} {% block bodyclass %}menu-forms{% endblock %} {% block content %} - - {% include "wagtailadmin/shared/header.html" with title="Forms" %} + {% trans "Forms" as forms_str %} + {% trans "Please select a form to view its submissions" as select_form_str %} + {% include "wagtailadmin/shared/header.html" with title=forms_str subtitle=select_form_str %}
    - {% for name, description, content_type in form_types %} + {% for fp in form_pages %}
  • - - {{ name|capfirst }} + + {{ fp|capfirst }} - {{ description }} + + {{ fp.content_type.name |capfirst }} ({{ fp.content_type.app_label }}.{{ fp.content_type.model }})
    • {% endfor %} diff --git a/wagtail/wagtailforms/templates/wagtailforms/list.html b/wagtail/wagtailforms/templates/wagtailforms/list.html new file mode 100644 index 000000000..243846615 --- /dev/null +++ b/wagtail/wagtailforms/templates/wagtailforms/list.html @@ -0,0 +1,28 @@ +{% load i18n %} + + + + + + + + + + + + + {% for submission in submissions %} + + + + + + {% endfor %} + +
    {% trans "Submission Date" %}{% trans "User" %}{% trans "Data" %}
    + {{ submission.submit_time }} + + {{ submission.user }} + + {{ submission.form_data }} +
    \ No newline at end of file diff --git a/wagtail/wagtailforms/urls.py b/wagtail/wagtailforms/urls.py index 7de8b003b..afcaaa5a6 100644 --- a/wagtail/wagtailforms/urls.py +++ b/wagtail/wagtailforms/urls.py @@ -4,11 +4,6 @@ from django.conf.urls import patterns, url urlpatterns = patterns( 'wagtail.wagtailforms.views', url(r'^$', 'index', name='wagtailforms_index'), + url(r'^submissions/(\w+)/(\w+)/(\d+)/$', 'list_submissions', name='wagtailforms_list_submissions'), - #url(r'^choose/$', 'chooser.choose', name='wagtailsnippets_choose_generic'), - #url(r'^choose/(\w+)/(\w+)/$', 'chooser.choose', name='wagtailsnippets_choose'), - - #url(r'^(\w+)/(\w+)/$', 'snippets.list', name='wagtailsnippets_list'), - #url(r'^(\w+)/(\w+)/new/$', 'snippets.create', name='wagtailsnippets_create'), - #url(r'^(\w+)/(\w+)/(\d+)/$', 'snippets.edit', name='wagtailsnippets_edit'), ) diff --git a/wagtail/wagtailforms/views.py b/wagtail/wagtailforms/views.py index 1814cd814..a263acaf0 100644 --- a/wagtail/wagtailforms/views.py +++ b/wagtail/wagtailforms/views.py @@ -9,35 +9,48 @@ from django.core.exceptions import PermissionDenied from django.utils.translation import ugettext as _ from wagtail.wagtailadmin.edit_handlers import ObjectList, extract_panel_definitions_from_model_class +from wagtail.wagtailcore.models import Page +from wagtail.wagtailforms.models import FormSubmission, get_form_types + + +def get_form_type_from_url_params(app_name, model_name): + """ + Retrieve a form type from an app_name / model_name combo. + Throw Http404 if not a valid form type + """ + try: + content_type = ContentType.objects.get_by_natural_key(app_name, model_name) + except ContentType.DoesNotExist: + raise Http404 + if content_type not in get_form_types(): + raise Http404 + + return content_type @permission_required('wagtailadmin.access_admin') def index(request): - + form_types = get_form_types() + form_pages = Page.objects.filter(content_type__in=form_types) return render(request, 'wagtailforms/index.html', { - #'snippet_types': snippet_types, + 'form_pages': form_pages, + }) + +@permission_required('wagtailadmin.access_admin') +def list_submissions(request, app_label, model, id): + + model = get_form_type_from_url_params(app_label, model).model_class() + form_page = get_object_or_404(model, id=id) + + submissions = FormSubmission.objects.filter(form_page=form_page) + + return render(request, 'wagtailforms/form_index.html', { + 'form_page': form_page, + 'submissions': submissions, }) """ -@permission_required('wagtailadmin.access_admin') # further permissions are enforced within the view -def list(request, content_type_app_name, content_type_model_name): - content_type = get_content_type_from_url_params(content_type_app_name, content_type_model_name) - if not user_can_edit_snippet_type(request.user, content_type): - raise PermissionDenied - - model = content_type.model_class() - snippet_type_name, snippet_type_name_plural = get_snippet_type_name(content_type) - - items = model.objects.all() - - return render(request, 'wagtailsnippets/snippets/type_index.html', { - 'content_type': content_type, - 'snippet_type_name': snippet_type_name, - 'snippet_type_name_plural': snippet_type_name_plural, - 'items': items, - }) - @permission_required('wagtailadmin.access_admin') # further permissions are enforced within the view def create(request, content_type_app_name, content_type_model_name): From 2a4c371f51b5a53d9fdbab0faa2c07c80fb3921e Mon Sep 17 00:00:00 2001 From: Serafeim Papastefanos Date: Sat, 22 Mar 2014 18:23:16 +0200 Subject: [PATCH 009/123] Change pagination_nav.html to work without linkurl pagination_nav.html received a linkurl parameter which has to be a url name that get resolved to generate the link for next/previous. The thing is that if the url to be resolved had parameters, these wouldn't be passed and an exception would be thrown when trying to resolve it. A quick and dirty fix is to just use {% url linkurl as link_to_use %} so link_to_use will be empty and the currrent page url will be used. --- .../templates/wagtailadmin/shared/pagination_nav.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/pagination_nav.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/pagination_nav.html index 39eb88a15..847b971e0 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/pagination_nav.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/pagination_nav.html @@ -1,4 +1,5 @@ {% load i18n %} +{% url linkurl as url_to_use %}
- -
{% if submissions %} - {% include "wagtailforms/list.html" %} - {% include "wagtailadmin/shared/pagination_nav.html" with items=submissions is_searching=False linkurl='-' %}{# Here we pass an invalid non-empty URL name as linkurl to generate pagination links of the form "?p=123" with the URL path omitted #} + {% include "wagtailforms/list_submissions.html" %} + + {% include "wagtailadmin/shared/pagination_nav.html" with items=submissions is_searching=False linkurl='-' %} + {# Here we pass an invalid non-empty URL name as linkurl to generate pagination links with the URL path omitted #} {% else %}

{% blocktrans with title=form_page.title %}No submissions of the '{{ title }}' form.{% endblocktrans %}

{% endif %} diff --git a/wagtail/wagtailforms/templates/wagtailforms/list_forms.html b/wagtail/wagtailforms/templates/wagtailforms/list_forms.html new file mode 100644 index 000000000..b1958f5b2 --- /dev/null +++ b/wagtail/wagtailforms/templates/wagtailforms/list_forms.html @@ -0,0 +1,23 @@ +{% load i18n %} + + + + + + + + + + + {% for fp in form_pages %} + + + + + {% endfor %} + +
{% trans "Title" %}{% trans "Origin" %}
+

{{ fp|capfirst }}

+ 		+ {{ fp.content_type.name |capfirst }} ({{ fp.content_type.app_label }}.{{ fp.content_type.model }}) +
\ No newline at end of file diff --git a/wagtail/wagtailforms/templates/wagtailforms/list.html b/wagtail/wagtailforms/templates/wagtailforms/list_submissions.html similarity index 90% rename from wagtail/wagtailforms/templates/wagtailforms/list.html rename to wagtail/wagtailforms/templates/wagtailforms/list_submissions.html index 4dea4a61d..0ead37bde 100644 --- a/wagtail/wagtailforms/templates/wagtailforms/list.html +++ b/wagtail/wagtailforms/templates/wagtailforms/list_submissions.html @@ -2,9 +2,9 @@ - + - + {% for heading in data_headings %} diff --git a/wagtail/wagtailforms/templates/wagtailforms/results_forms.html b/wagtail/wagtailforms/templates/wagtailforms/results_forms.html new file mode 100644 index 000000000..6cf198553 --- /dev/null +++ b/wagtail/wagtailforms/templates/wagtailforms/results_forms.html @@ -0,0 +1,8 @@ +{% load i18n %} +{% if form_pages %} + {% include "wagtailforms/list_forms.html" %} + + {% include "wagtailadmin/shared/pagination_nav.html" with items=form_pages linkurl="wagtailforms_index" %} +{% else %} +

{% trans "No form pages have been created." %}

+{% endif %} diff --git a/wagtail/wagtailforms/views.py b/wagtail/wagtailforms/views.py index f5ce0b07a..aa3d525df 100644 --- a/wagtail/wagtailforms/views.py +++ b/wagtail/wagtailforms/views.py @@ -14,8 +14,19 @@ from wagtail.wagtailforms.forms import SelectDateForm @permission_required('wagtailadmin.access_admin') def index(request): + p = request.GET.get("p", 1) + form_pages = get_forms_for_user(request.user) + paginator = Paginator(form_pages, 20) + + try: + form_pages = paginator.page(p) + except PageNotAnInteger: + form_pages = paginator.page(1) + except EmptyPage: + form_pages = paginator.page(paginator.num_pages) + return render(request, 'wagtailforms/index.html', { 'form_pages': form_pages, }) @@ -68,7 +79,7 @@ def list_submissions(request, page_id): return response p = request.GET.get('p', 1) - paginator = Paginator(submissions, 20) + paginator = Paginator(submissions, 1) try: submissions = paginator.page(p) @@ -84,7 +95,7 @@ def list_submissions(request, page_id): data_row = [s.submit_time] + [form_data.get(name) for name, label in data_fields] data_rows.append(data_row) - return render(request, 'wagtailforms/form_index.html', { + return render(request, 'wagtailforms/index_submissions.html', { 'form_page': form_page, 'select_date_form': select_date_form, 'submissions': submissions, From aa41a5e8a9a11e1c7babbcf547b0ea590e414e87 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Tue, 13 May 2014 12:45:49 +0100 Subject: [PATCH 059/123] updating header form style --- .../templates/wagtailforms/index.html | 2 +- .../wagtailforms/index_submissions.html | 47 ++++++++++--------- wagtail/wagtailforms/views.py | 2 +- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/wagtail/wagtailforms/templates/wagtailforms/index.html b/wagtail/wagtailforms/templates/wagtailforms/index.html index e542e596d..c3a831501 100644 --- a/wagtail/wagtailforms/templates/wagtailforms/index.html +++ b/wagtail/wagtailforms/templates/wagtailforms/index.html @@ -4,7 +4,7 @@ {% block bodyclass %}menu-forms{% endblock %} {% block content %} {% trans "Forms" as forms_str %} - {% trans "Data" as select_form_str %} + {% trans "Pages" as select_form_str %} {% include "wagtailadmin/shared/header.html" with title=forms_str subtitle=select_form_str %}
diff --git a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html index 26ed4a7bd..7bba352fb 100644 --- a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html +++ b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html @@ -30,27 +30,32 @@ {% endblock %} {% block content %}
-
-
-

- {% blocktrans with form_title=form_page.title|capfirst %}Submissions of {{ form_title }}{% endblocktrans %} -

-
-
-
    - {% for field in select_date_form %} -
    - {% include "wagtailadmin/shared/field_as_li.html" with field=field %} -
    - {% endfor %} -
    -
  • -
    • + +
    +
    +
    +

    + {% blocktrans with form_title=form_page.title|capfirst %}Form data {{ form_title }}{% endblocktrans %} +

    - -
- -
+
+
    + {% for field in select_date_form %} +
    + {% include "wagtailadmin/shared/field_as_li.html" with field=field %} +
    + {% endfor %} +
  • + +
    • +
+
+
+
+ +
+ +
{% if submissions %} @@ -59,7 +64,7 @@ {% include "wagtailadmin/shared/pagination_nav.html" with items=submissions is_searching=False linkurl='-' %} {# Here we pass an invalid non-empty URL name as linkurl to generate pagination links with the URL path omitted #} {% else %} -

{% blocktrans with title=form_page.title %}No submissions of the '{{ title }}' form.{% endblocktrans %}

+

{% blocktrans with title=form_page.title %}There have been no submissions of the '{{ title }}' form.{% endblocktrans %}

{% endif %}
{% endblock %} diff --git a/wagtail/wagtailforms/views.py b/wagtail/wagtailforms/views.py index aa3d525df..2174642c6 100644 --- a/wagtail/wagtailforms/views.py +++ b/wagtail/wagtailforms/views.py @@ -79,7 +79,7 @@ def list_submissions(request, page_id): return response p = request.GET.get('p', 1) - paginator = Paginator(submissions, 1) + paginator = Paginator(submissions, 20) try: submissions = paginator.page(p) From 6f5203c6fdd052ca8b274246c261c0e5b6437593 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Tue, 13 May 2014 15:51:28 +0100 Subject: [PATCH 060/123] Medium-scale changes to fields to allow 'iconfields' and header refactored into own css file --- .../static/wagtailadmin/js/core.js | 2 +- .../wagtailadmin/scss/components/forms.scss | 63 +++++++- .../wagtailadmin/scss/components/header.scss | 153 ++++++++++++++++++ .../wagtailadmin/scss/components/icons.scss | 10 +- .../static/wagtailadmin/scss/core.scss | 129 +-------------- .../wagtailadmin/scss/fonts/wagtail.eot | Bin 12996 -> 13308 bytes .../wagtailadmin/scss/fonts/wagtail.svg | 4 +- .../wagtailadmin/scss/fonts/wagtail.ttf | Bin 12832 -> 13144 bytes .../wagtailadmin/scss/fonts/wagtail.woff | Bin 9164 -> 9356 bytes .../wagtailadmin/shared/field_as_li.html | 10 +- .../templates/wagtailadmin/shared/header.html | 6 +- .../templates/wagtailforms/index.html | 2 +- .../wagtailforms/index_submissions.html | 12 +- wagtail/wagtailforms/wagtail_hooks.py | 2 +- 14 files changed, 237 insertions(+), 156 deletions(-) create mode 100644 wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/core.js b/wagtail/wagtailadmin/static/wagtailadmin/js/core.js index e5895e34f..380c3d179 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/js/core.js +++ b/wagtail/wagtailadmin/static/wagtailadmin/js/core.js @@ -128,7 +128,7 @@ $(function(){ $(window.headerSearch.termInput).trigger('focus'); function search () { - var workingClasses = "working icon icon-spinner"; + var workingClasses = "icon-spinner"; $(window.headerSearch.termInput).parent().addClass(workingClasses); search_next_index++; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss index 2425458ee..fa35e6226 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss @@ -356,12 +356,6 @@ button.icon{ color:$color-grey-2; } -/* permanently show checkbox/radio help as they have no focus state */ -.boolean_field .help, .radio .help{ - opacity:1; -} - - fieldset:hover > .help, .field.focused + .help, .field:focus + .help, @@ -391,7 +385,58 @@ li.focused > .help{ background-color:$color-input-error-bg; } + +/* Layouts for particular kinds of of fields */ + +/* permanently show checkbox/radio help as they have no focus state */ +.boolean_field .help, .radio .help{ + opacity:1; +} +.iconfield { + position:relative; + + 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; + } + + /* 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; + + } +} + + /* field sizing */ + +.field-small{ + input, textarea, select, .richtext, .tagit{ + @include border-radius(3px); + padding:0.4em 1em; + } +} + .field{ &.col1, &.col2, @@ -568,7 +613,8 @@ ul.tagit li.tagit-choice-editable{ } -/* search bars (search integrated into header area) */ +/* +// search bars (search integrated into header area) .search-bar{ margin-top:-2em; padding-top:1em; @@ -666,12 +712,13 @@ ul.tagit li.tagit-choice-editable{ } } -/* mozilla specific hack */ +// mozilla specific hack @-moz-document url-prefix() { .search-bar .fields .field:after{ line-height:20px; } } +*/ /* Transitions */ fieldset, input, textarea, select{ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss new file mode 100644 index 000000000..1c7f7435a --- /dev/null +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss @@ -0,0 +1,153 @@ +header{ + padding-top:1em; + padding-bottom:1em; + background-color: $color-header-bg; + margin-bottom:2em; + color:white; + + h1, h2{ + margin:0; + color:white; + } + + h1{ + padding:0.2em 0; + + &.icon:before{ + width:1em; + display:none; + margin-right:0.4em; + font-size:1.5em; + } + } + + .col{ + float:left; + margin-right:2em; + } + .left{ + float:left; + + .hasform &:first-child{ + padding-bottom:0.5em; + float:none; + } + } + .right{ + text-align:right; + float:right; + } + + /* For case where content below header should merge with it */ + &.merged{ + margin-bottom:0; + } + &.tab-merged, &.no-border{ + border:0; + } + &.merged.no-border{ + padding-bottom:0; + } + &.no-v-padding{ + padding-top:0; + padding-bottom:0; + } + /* + &.hasform h1{ + margin-top:0.2em; + } + */ + .button{ + background-color:$color-teal-darker; + &:hover{ + background-color:$color-teal-dark; + } + } + + /* necessary on mobile only to make way for hamburger menu */ + &.nice-padding{ + padding-left:4em; + } + + label{ + @include visuallyhidden(); + } + + input[type=text], select{ + border-width:0; + + &:focus{ + background-color:white; + } + } + + .fields{ + margin-top:-0.5em; + + .field{ + padding:0; + } + } +} + +/* mozilla specific hack */ +@-moz-document url-prefix() { + .search-form .fields .field:after{ + line-height:20px; + } +} + +.page-explorer header{ + margin-bottom:0; + padding-bottom:0em; +} + + +@media screen and (min-width: $breakpoint-mobile){ + header{ + padding-top:1.5em; + padding-bottom:1.5em; + + &.nice-padding{ + @include nice-padding(); + } + + .left{ + float:left; + margin-right:0; + + &:first-child{ + padding-bottom:0; + float:left; + } + } + .second{ + clear:none; + + .right, .left{ + float:right; + } + } + + h1.icon:before{ + display:inline-block; + } + + .col3{ + @include column(3); + } + .col3.addbutton{ + width:auto; + } + .col6{ + @include column(6); + } + .col9{ + @include column(9); + } + .breadcrumb{ + margin-left:-($desktop-nice-padding); + margin-right:-($desktop-nice-padding); + } + } +} \ No newline at end of file diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss index 9a1351d9a..4de3aa131 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss @@ -231,14 +231,20 @@ .icon-collapse-up:before{ content:"6"; } +.icon-date:before{ + content:"7"; +} +.icon-success:before{ + content:"9"; +} .icon-help:before{ content:"?"; } .icon-warning:before{ content:"!"; } -.icon-success:before{ - content:"9"; +.icon-form:before{ + content:"$"; } .icon.text-replace{ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss index 8ffaa450a..d2e9e4759 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss @@ -11,6 +11,7 @@ @import "components/listing.scss"; @import "components/messages.scss"; @import "components/formatters.scss"; +@import "components/header.scss"; @import "fonts.scss"; @@ -385,88 +386,6 @@ body.explorer-open { } } -header{ - padding-top:1em; - padding-bottom:1em; - background-color: $color-header-bg; - margin-bottom:2em; - color:white; - - h1, h2{ - margin:0; - color:white; - } - - h1{ - padding:0.2em 0; - - &.icon:before{ - width:1em; - display:none; - margin-right:0.4em; - font-size:1.5em; - } - } - - .col{ - float:left; - margin-right:2em; - } - .left{ - float:left; - - .hasform &:first-child{ - padding-bottom:0.5em; - float:none; - } - } - .search-bar input{ - @include border-radius(3px); - width:auto; - border-width:0; - } - .right{ - text-align:right; - float:right; - } - - /* For case where content below header should merge with it */ - &.merged{ - margin-bottom:0; - } - &.tab-merged, &.no-border{ - border:0; - } - &.merged.no-border{ - padding-bottom:0; - } - &.no-v-padding{ - padding-top:0; - padding-bottom:0; - } - /* - &.hasform h1{ - margin-top:0.2em; - } - */ - .button{ - background-color:$color-teal-darker; - &:hover{ - background-color:$color-teal-dark; - } - } - /* necessary on mobile only to make way for hamburger menu */ - &.nice-padding{ - padding-left:4em; - } -} - -.page-explorer header{ - margin-bottom:0; - padding-bottom:0em; -} - - footer{ @include row(); @include border-radius(3px 3px 0 0); @@ -832,52 +751,6 @@ footer, .logo{ } } - header{ - padding-top:1.5em; - padding-bottom:1.5em; - - &.nice-padding{ - @include nice-padding(); - } - - .left{ - float:left; - margin-right:0; - - &:first-child{ - padding-bottom:0; - float:left; - } - } - .second{ - clear:none; - - .right, .left{ - float:right; - } - } - - h1.icon:before{ - display:inline-block; - } - - .col3{ - @include column(3); - } - .col3.addbutton{ - width:auto; - } - .col6{ - @include column(6); - } - .col9{ - @include column(9); - } - .breadcrumb{ - margin-left:-($desktop-nice-padding); - margin-right:-($desktop-nice-padding); - } - } footer{ width:80%; margin-left:50px; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot index f55be6906a2bfcc05ed4e43273c1ebe331ee1914..6ac63514abbec26479e6a6f827ba9212dd270687 100644 GIT binary patch delta 890 zcmZ8fOH30{6g{t12dgYDL)-R&_rV-G10J48m+J>(gaL^P3s0- zp*RZ@e_^9>;X)~i3nd{@;)bXz;=%#)Okhx0$4PF{TND&r3(dEDaKQ- zb0{@=(epBK5a3<_2g1Y2#08vqc3ZDtLdGrFb5!(%5@%AQ=M%%P$KsS2CI8w;Vj_*} ztd8P@A$Tbt zUD&q3#GRz{9BZ=mupnIeXSSIsL7$Om63uVy0KsevtdnOPAb`U=(ms?CVssJ_LJL}P z2m_d+%?&az$;7&lFfjqugxd<+X58px&<;}uaFler2P)#!N~6Lybm;@uz3h;lwWj!P zGwqjXSK}>OYg^Y%u9Bhxx1hh_rkwn`f7<^&z~_$Jk`4N&=JDLqrYOs}j2d&{D%4{? znxW7E?KEpIjsXpNuczn8aLMK2#v#7Io7SNwG}uo%ftMshHoD{* zqYWD@z~l3I2DLdYSmd=bNh%|z2l%~|6;71G3+!g1ml-4O5>>H^k+2|tZ&+Ad%uln) z{8ctdK3zn7~WTqHB6c+d!*S4@OW5 z^&o^fd9R>1B|Z2D)Pf)s6uqb@>jNJbFTIE*{${$MEWgKm-?zV+Z)g8h*Ijd605Q=t zvwYg~qRryf{#$P!0D=RsPL)qqFb5Mzer~=PNWVWF-UkFG0QRlwEY#a=1c`e`+Ky`N z`jwkMzyAREL*RJVjO$!RX>wH#Fssq|!Td!pJtpDZ+WaNwZ0_7)5>nvKtg}?d3Ohu+ zP3zd4GwYTMFFygJYlPjd&o3;7L?}WVDSj1gzD@%EIktNXr+c*;MkzrLyyt`gUBL}0;X_-JntY0jg;VM z#3ImWZ);A?0J?PUMTP1(GO&@O33-gkncxvtl=p(QUM=y{c*f2Z@?((Qd_U1cd`*7j zOT6z)-*W4s;T~({N7GC`8(EYq$)oXuxaOalBZNnOZy+@3XFN>4 zx^ds{4eY@azc&egEe{Bn*>YJ7h3( - + + + diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf index a401ae2ddd45ba74cf37715cee04a925d9c13915..2006feefbf5c293024c0dcc039aa196fcb4aad67 100644 GIT binary patch delta 967 zcmZ8fOH31C5dQw{_CYI^)@^;T$QG&;G`*5}1j;)`(v!pPcj{??e+`@rrIP9pF1>n0xpmT5DwWKuyv%V_tQQ1R znTecBv@H@|AUvBM8&p#t#^cnWj_}=#n#~;g#vH|m%-BMkBbzZ#{1Y>_!jC00wh_OETTn5A z39>gqd#Z(%B5hEsnk1unw(H$=hQ%h$FCT>q;4G*M2LduDu0b G?)eMGS+v&x delta 698 zcmYLGO=uHA6#jO1vN1`m9$GCLA=N6V&?bv*k~We?V(LMuP*=pC%F?EZlB9tKjUG%v zDcFOcg9mROD(FpVkD?bTcq#~jpdv&IS}$ID5hQ-IS#*|p^Zm@enfKGyq#M z4+E!jxihCK^BBh{hpFcJL@f0}RQOrBj$kN|?*XqG9 z<}dQ+TEKr`f!4d0T1|As)rCc0XvhS3PJy(2n{tS_Gy%rfoKI2q;Gt;m)v|189<|R)rz3 z%5^(GwFl_M5RypaJZ`f1wi0!f3>;SpQ}ng|xSq-Zbhxn#Ij$oZL;`VUNMcyN(f4bk zazihvhWr~NgNb-LIShH#*iC!ESdl4F7u_ej7nWa&{K4gi{YNy}+h3FG(F2XWxaQqj zz>jAh_929~9yY13tBOQ`N+-{0W1YCi!v?a5dRS0@hEzK4hpC-UO@?v zi!obE$Y$&iW2ZGK%T`3o$a_{}Y$toghhkTB_a^G(9=A%x4U94h^7b>iy;_@G{jGNV If3u+d7u{ieXaE2J diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff index fbefc159a6096afaf3cae10fbf91a86aba458210..072c20a1661ce2b507bdde0c196bb483c2f20f94 100644 GIT binary patch delta 9324 zcmYLPRZtwjwp>_zaS!h98r)q0031K00j70+<)S+DIjEe008SE5t0y(w6vxY06=c> zQTp@&BF7k^Oc_Zj=?^X7gA;#%4B!ZWQPE)K_|Wn`xWWfa)LM*M%^gggKeV$CehUCV z{X3$B_6J*z{K};3kXzK7$r_B1`TOXT*(w$uwJ3G0$efao(X#X`O0{{U~URmQl z-f2Yr$=332+OX^5JZToll==virk|MD2H*tEYxjY!Y3A{4WPS3okR#!zxR#36iMH4w zf%@udVJi1iacC%LVJP9xf_KQZOPeu&eLUJC+s!kxiN8fzpO4>_+^zbt*6Wk)rr-KL zPg=QI>hwQS>=1X}Qyj1v8jfZ0xym}84;b3MEHDKO;1TP<-~iK##TCPqxtE>PO84Mec6qHHHS6|9Z}a>~e$mu}`#EyV ziSwQDIkqUb&Gl~G`n}=#I7h%IX8d`qZP=AXKCDr@7Oc=?k z*XDbb(Lb|O7`fT@(n{**ecV=TY{c);zsA_cXp}}8t~NB?rb(ANS{#&B>aG7*zRE?z zb{3I;yD4*AyYgH~l|yXRrGAd-88(A=FHKw^|bJUiQW2_Hs6#Wp1|I5g%@uXDA}Zei%1C$BN#~)P!Bzi>y#xi5J^& zPQk|rGDoenFmy-H!@N*NrSoX3g{cMm6u1FaSFMC;qs7#kvoNGU8~qu$dt`(2Pn4$| z_Ir4Tne|;B7Zym_{(Vsk1hHIN zef#uNs(#AxO5l7QjqhlaP^KXN5Y2Ty>TSC|q{=9a+q24z+PR;pgM48x;B(-)p0M|d zIWtnPt_=?6dP7v9$MQwJi4gHPBJDbjo29yKS}UPeZVv&$Ppa@XRc)o{9!XOzE(up` z71Sb8cXxSHSe$5VSnUN9=6rhpvXhkFtPF7ek84>MXSS3x$wF(N<%yK~v{W(%4xOBwhLKTP6%org(WFSBPBMnf?V- zrHw|WWR1tGh$5Y4_AHkAR&m+8$e7LBn8UQ|8uhv~*97xP4(Yhiu;B{vBvkXO?7arG z=O+t8mxR@~zR=$E*XPX#Btkzn%;xX65O+*t99DA_;%22{{(p$7CfyUpIEMYulwEmU z+5}p1+m~FQWy;7sQwlHyc8K0Wnh} za84G@V&+&e3)EmX2s+Z4hKg~luqO?${^m`&F4@EjUjkn;8g{&UqkH|AOE8QuR>LKV zq+0Y%)LdX)wqVqpgeD&@K_%raA=~HY6_sBoNz(nb#{BWj#`e|r)p}L;lW5iEy4*9k zlcOs!@I=)HKWFCR1Rz3puR(Y91hE6&1}>n_k#1;YR3{vt`0oSUZY_3y(f=DQ{)yJ6 zp^%h@7MsX25}IqdE$vyuRoC~US4wsC*8nv-Q9_r4-;oL z>o&GF;^*+gY>Gih8?4sEn76IaDMJUYXlWkM5IWc(b+3!eW7T^iQK10tOS+<<$d z&V9wNq^qN-h;s{1cvwcR;olI~^<4EBg1o?nvW5ZI)&^m=>;@Li+9MrlssY zpM1(WD2Mv-osmC?TGeH<9`dP{w@SWnhRz!{&-tsf)j%mHWdoHCV{(K+0W4;i9+yG1 zeEUqoAZ7w#gDLN8iOzK}fiis=pSylo2zo)TYh>%;@-b%!{@h2oUVn#Db8Fyy$wH|nEFtvRVd8Xi^EA|) zi`E$p7vKMOfl)Bq7o;-fQ6eNZm^EBZo)qJ?apLj38^t3Vc2Z7@^~;SMesplC3AdaM zT^w&;A+e+2ElavX@o=>)ay`I>)o%HTS=LmK9r{+AtPp> zhw|a(E~UxYmZ?@y6^o+tJ$mzygOcE56qGxL`F|gGsVq9@8^eF2AuPli^Pr0}n)UTRe&}EaOJx=?qZ=3vr!7r(8wYjkz|7khdAs&LcU5xD4_Ch!EbT>eg z^o(>8@QhDV%cfM1NKL7HF=r#T zEtM=2s6|sCdzB$DMSML(AITl>jYyZIYGE7|A)IuC40Zap0V_e}Z(y_u~!X)%e|MfR+We{Wws^&h_)y0(;||yOBBsM-BVc7T6kL zq?&3bAmWQ9#uWiC zXMlm+VAO;!)OO7pEm!@~iX1Gr=z5=)6fGopk{0FNuVTPX6(Wz5ZJ;p%{h^pT*-{Jf z05JN6n!mg#)oa-9N;fZ4I z+@A+_m54l}fSz}u-i=VaE{)AyY>1#eD^no1vzv9d17JVFG=xE-hIU~3<1|FPlY=%o zDWZSoM^Ygl{|=s5LJ@mhxg2_}n(F%-6*ZYD=FvNatZs~?0?9r)_6g!>knp2^mn}E9 zra1i45E_)+v&o72JKSlyOVt#~lFUt!4~0FyUK6pPa5t_!MaNJHG-3ovQPf(BE+<4{ z0oFnH6pu>`3#aa4I)+%aoGe+sxUP#4)60f9c5)`8U!SiGQ%W^oxLL@02WSc(fcb@bvz@aA!L1wx)g|bQn+$cBM=c--b1rdf zhu42-+HXfP-w=ElY)A$T&(R7tV(OwiIA(dsE^ZAH#KxoP^9yHRmZ1&e5$uLphX;KV zhDN?2?%vc1{9Nbj4JQEqQUoFY1#^{TW@925r|sh6je88AXhxYuF<6JqPP~K-KSV{V zV&%*qkUK>VBN|F0(*%`EK5y|jY|oGNMS@PoUwDieD)Rj?^^f6uBaz|xtKqI|*p6$? zAMLj**U3)yeh6g$%N6xIv*W-!HG$E;rq&^qus_y0&rgZ0#BWWfJXMgB*85xEhVOU< z!B>&nR}Ubp`yK|TH}bGJEbX-i@>e*&3|L{VFE30G7-n@A;zPmtPuQbdE*SeU-wtAPuc^rs(o!Lmk)@kfX;JE5I zi<^ym7p<5OKm4|U3o&lT`Qt&^hh((wI78!bgwj~OU@5u>gZ{(VT}+*Ldc?bT0fAaV zv=P}y6c*D=`Zde(+-%iH=^i{D;4VtfTV`5Lqarhwec$w?e?#{pP!BQhI~?mmd)fOo6^hJl4%YBv`t!(BPr2x7DtS z$fko&{5(EDc#CB&V!1A~k-sIU8_|XIvxQhU$7%5_)Ue*xW1T&4mN`~ca+_zHGXW}M zbIEiM*_q$v##RQh+?|2#7baI&49k$ORf~O^Y4ev7L2xle>{-e zb~q>giJ9-FR;R+S(ot8)DANF1zvM)a6~NC z9WR_Vwk+m3O#L&=mcFgaez{7af%1Z9N#1-Rr4txgCpzy;N=ZRGs&|f zag@0@BdbLx=5;CSbHhFWi}VATv{G%7|Dm$Y4FOh}n)ZdTLp^LwgF3ET+)fiYh+V}BfTEfEYGXjO zpINNk49Cz#>hUiC09GDX=-pv6W=b9{ra&_;Zp$caJ&Mb$-0#`e_70-b_Fh=2F^*m6 z>w@GWSl%Nm9-^kACX*z`&h*~oearir$Ii{qE=NNvUApxQbx$S~wH=qfIyLJi1;3R~ zK5Eem$HUA1dBym$=C)aYeoW`M@NeLvA7E2p+AHm7f`0_r*Dn)Pb?ZQSpxSPz{C@h@=KcgGG7-vwmz7>Jt}*D+P*>XK z2p?Twjx^>h(^gi(^Z=ClW|L5$#MVwAkFm@y%Ia=24R?15y2=2UBg6Cs-^TYs2r`j? zCPJP_MZz%Gjle557=9~=rb^!hUQZtOyf72$7e6AdiP3h&=YWy#rk=Ae8#l8j^43!z zCVwCs0zf6YN7+;BQS}?bh<1!o9BM3)eKO&Y?!Zo6yEQD@?8RWt%N4vv&h+^t%KQMg z$9f@&IYs)T2VZuHQ5kn-ullk!1mb~u#?REMi%$-mJ;RqKyDR1)9gWQX_c2F^YqVRQ zyC~(!^*vPnZI}kr+8L`Hdd`zhVj_cN#zH^Y7^y3~LNB8jpxG$%3z9H`lX2jDz;Hpf z&Z?ALDv$NJVB$J8h_I_%-YKX{Fm|}Db&=|!UYB_HthzFyl9X57kV{eo4|#nZFJGAJ zgK5inehscY7TB$BTvx{EQoodnm>qA zAfYhmin_IO)zMg1fyFq{)=UB@_3mY5cG>Yno+zo(&kLOl2i5{67{QOCT%_Vw0IG3R z?*j~lFwTSm=YLh;&n#NsmX#sNODV{NSZEQc|AL)DO<)vA(;O9r2%+Tw$I$-ZkbtE$ zp>S$wjs%M;$nn`Az*3>TST4r#fB0!Y%w*1QM`?@pJcMuf>k>P!_=)LpEBjXEdVjCo z(qd#Sy^5g6XWNXsf`7By2=cjKt3f?D@QW1)uh`7c2NT)63}dV`brs4U5TL zhL&`)mr(5Zk&Mik%N|(*@ap(lswJG7`F7BD>GL)DgEzFBnLkEM%7ZTlOzqd!K2uo% zUswgGI-U-heo`i1slu9fURB{k#|epc&@cT`TBX3yye3+Oz_RWv!Ct0D-bccEcN%;& zF=U6AcZ0|Y&_Qy6MVD{BLxh6kr>yF8x_nwNQ8!EC1#7BDRSUH;eq--2W48& z!{w_5a(fU@fbODIa>8crFgUc+LSsV?*VN>OsSUsMnliCqpvR14%3vqMq#p9jQBhG4}*gLb(vyYivPa#P9)azXkzbD;}6%>y)6SS-)y_ z=>|AL1z2KS!q_PdVTBC$NE)AGJRzL#Mm~xwk9_g2x5qihC^%(0@+1yO3XQ?vXGWZy zWnyL*14lVGYwiGYZXN+s{Px<)ESe1SBNrnJBdKt_DAO2q90~RDFY2K&4lCEi^m$Kr z=^#k6N1=fMe&(`SvB8nhd@{XeMj?ojQ(y)B`y1NqG3C!-Yloy4vRyTmMvE_%$#ytk zKj1)}qIqBcLCk85`j$gZX1mU9!+G7S; za+EFgpVF~^rNa$hCW3>U7+@iFRmxr!AtH~vFv?d<|c*~R}HKFc8%a&hrb2POKxV%G{q2x z$iuQwWs}PtG-27}g(HfQ9VArO&`-vs%s*;k@u;lJzOqJQXgYgn;Zc@NXMry=uhziI z1ah#vyx~P11b#sZ5;(^*@iqRD($@8t1M}Qb&o-ARm9yVEUho1CB?;3d`qHG@csjzB zdJk;YLZVRGTN|*=E72r*CDHnL^Y9@idjn@Mv!?fll98WbJ~L1^Np+645hjYbTC8u;L864pz0t;(Hw`|ac>-t zDn9dvqwk<`^UmNXXJlqiy@@Plb+n2>EUxz$f|PP}M+4n^ind=73T%D>Du-#ju(cPHDpKXshF4iyvFsX*!_g{fOc6rU4jnf-?W|mRU$u>o(k<87M?dJOOrW=SD(he@_22vdi9qdzOw!Uf1LAb?@OA219*h66m=mn<4wLR zqTM+B`;{2G%h%Vp%0}}GYBlgqRE;~a*WXO<=sfd*%8Btc_rP7A$+qCxY|t6d^^V9t+#Z3rQ^Nq7-y`~Qa_L97az-c&*N=tfdp~m{FXdtb=Nfo>)lZWOjx!a@ z_(5eukhxJQ=VaFPW$+ZjSyz38pRbB6hP5rC7GP(Re(=5ppXK>NpSteFbnpJ8^lvry zWv{7SCdOW{oOm+SKz< zfr_84+T}vk*$a5Ea&54sFxgON>vZG-JYEi(7)m33^*WGdd6I>^XuiyiDEjUTOec4i zFc#n>z5Rol3Y?BOqPmxNdo~_yk}&d>5IlUo8o$bYkA2upZNpwCVvRl!%@)b_j$6eU zey$7KVf`xed!WfA!jaF1ik~+}rLY4lj~6~~BWT&@YU9DuaWwu2SMiGZOVhxi)V0mp zJ$f;Q_RHXr(!>p<9B8*=X`-PeLFKY=1Y>g5qHq{3*Y8PiHgF#J+C?n)8~%Pub|Qk` z8(bj}?}UK!2f5#M{3u7m@J`M-IwTQ(b_jbK()u zkuFiQ){>IY-#Uh0uhp|gZl^H6WaAQNdLh#h&i}=o7_s|c5u9zmFE(nE$wY!!dgGn zU*T*b=Y}8r`aHSuuKe!v^uRlme}sA=)$+=A_J>zv-;rAzx!T|P_GJA&ttq2PxytJ; z|4_TL?%DmR<@VoP_+joh$4kZ=_kvF0hkqwnXgRvSAotqxQ5vLM$b#QpEL3_5Ycurf zuMToj0fd~un2b<_1h>I}$rZmBx(i zKlOMfkXK>vHbEm)*M?l&xjI!?hsutL{>SuDUFYY-Yb4k#5aywZ80rH-j6GxZff`5f zVPtjm35Iiy%udzpn$V^%^|i&K&~%;7j^!t}@m@*Byppte{0Gv;J{yN$7n;0yRT0`k zZWKnitj|5eVIQ4`)XZtKAxDBJgrXiP!5M8m4aVFdhRhH|KS)QTmta&38)&_*8f z5GdAFAa8%FL~%*bsUjf&2?`dP4jGsW*ttJZCRQU)n!9b$*OB{uwR-~VF3CJhT~4LbSD}mJrS?6d?g#207T~jL*Vd8S zw*s_=xxN-vJVG-CM>%G1MTbiBC$Aj~h`vMVdDIR@z#_tln9xrs$6Fw)voCM$ltX^Z z1-(}^S6qOsFaSiN8I+*&FVd)+{xjtQ+fr1z9jn*XvbC`Re)iam^%KeF6qQ}QUu)RY zv*#t>)U$Y-*?enf&aflhy+eVWoG-_>%X&MbvuJ;;*U-q`Gv{)yHNxC6@=ogpXw3yTp;53Uda+?L&5Ms6MSz^el$>+s#!Saix3{oQfO@z-z0CA4OB)fXm` zm)479JfTW7LfCC!?(f(`EO$i!SuCOr46N!l?(3SuA2AAr$< zs@;k)1m=-_`C=xVV`rBb-W|MrA8)Q^<~wDps2HDdtHR^h8TO;|KYt}Jz!$&XUNdQ% z6de&3r`_FxYpI*~7B|sqn0w$_Vy4`;;po=eI^WsLp1(V1k(8=@m!T!iTs zz#o&v!!rT4pWqSxy}MPSB;et=<_138jV0xO@N$~m6+ji6h*8Q!JrBr|kW*H-o*ihI z__dKUb>ADpYHyf~<4b>b{wUJ0WF_$NL%}P{+{DDh0uXflbUu zspDAwM@JajI#Qjeo%HtNo4CQb)P{xUa;^EO-WqB_L%AxJRyLf{SNmCvMG`+azGNQcBu`(R-SrHAzCvw0@%jDt RIa`UsMInPfnvMa${s&%0s&N1S delta 9109 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 MuJv=#F(9=60A-IkQUCw| diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html index 131449915..e40e6dbda 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html @@ -1,10 +1,12 @@ {% load wagtailadmin_tags %} -
  • +
  • {{ field.label_tag }} - {% block form_field %} - {{ field }} - {% endblock %} +
    + {% block form_field %} + {{ field }} + {% endblock %} +
    {% if field.errors %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html index 3ea5d4d10..59340d2d8 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html @@ -5,12 +5,12 @@

    {{ title }} {{ subtitle }}

    {% if search_url %} -
    +
      {% for field in search_form %} - {% include "wagtailadmin/shared/field_as_li.html" with field=field %} + {% include "wagtailadmin/shared/field_as_li.html" with field=field input_classes="field-small iconfield icon-search" %} {% endfor %} -
      • +
    {% endif %} diff --git a/wagtail/wagtailforms/templates/wagtailforms/index.html b/wagtail/wagtailforms/templates/wagtailforms/index.html index c3a831501..c5ccc1aa4 100644 --- a/wagtail/wagtailforms/templates/wagtailforms/index.html +++ b/wagtail/wagtailforms/templates/wagtailforms/index.html @@ -5,7 +5,7 @@ {% block content %} {% trans "Forms" as forms_str %} {% trans "Pages" as select_form_str %} - {% include "wagtailadmin/shared/header.html" with title=forms_str subtitle=select_form_str %} + {% include "wagtailadmin/shared/header.html" with title=forms_str subtitle=select_form_str icon="form" %}
    diff --git a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html index 7bba352fb..fa4bfdb13 100644 --- a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html +++ b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html @@ -38,15 +38,13 @@ {% blocktrans with form_title=form_page.title|capfirst %}Form data {{ form_title }}{% endblocktrans %}
    -
    -
      +
      +
        {% for field in select_date_form %} -
        - {% include "wagtailadmin/shared/field_as_li.html" with field=field %} -
        + {% include "wagtailadmin/shared/field_as_li.html" with field=field input_classes="field-small iconfield icon-date" li_classes="col4" %} {% endfor %} -
      • - +
      • +
      diff --git a/wagtail/wagtailforms/wagtail_hooks.py b/wagtail/wagtailforms/wagtail_hooks.py index ba173fd84..b56f633dc 100644 --- a/wagtail/wagtailforms/wagtail_hooks.py +++ b/wagtail/wagtailforms/wagtail_hooks.py @@ -19,6 +19,6 @@ def construct_main_menu(request, menu_items): # show this only if the user has permission to retrieve submissions for at least one form if get_forms_for_user(request.user).exists(): menu_items.append( - MenuItem(_('Forms'), urlresolvers.reverse('wagtailforms_index'), classnames='icon icon-grip', order=700) + MenuItem(_('Forms'), urlresolvers.reverse('wagtailforms_index'), classnames='icon icon-form', order=700) ) hooks.register('construct_main_menu', construct_main_menu) From f4588a36689d99c3e1d41cda26efec0ea16d1e40 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Tue, 13 May 2014 17:03:31 +0100 Subject: [PATCH 061/123] ongoing tweaks to how fields are rendered --- .../wagtailadmin/scss/components/forms.scss | 192 ++++-------------- .../wagtailadmin/scss/components/header.scss | 7 +- .../static/wagtailadmin/scss/variables.scss | 2 +- .../edit_handlers/field_panel_field.html | 23 ++- .../wagtailadmin/shared/field_as_li.html | 32 +-- .../wagtailforms/index_submissions.html | 2 +- 6 files changed, 82 insertions(+), 176 deletions(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss index fa35e6226..7eeb828f6 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss @@ -21,15 +21,6 @@ legend{ @include visuallyhidden(); } -.fields li{ - padding-top:0.5em; - padding-bottom:0.5em; -} - -.field{ - padding:0 0 0.6em 0; -} - label{ font-weight:bold; color:$color-grey-1; @@ -49,8 +40,8 @@ input, textarea, select, .richtext, .tagit{ @include border-box(); width:100%; font-family:Open Sans,Arial,sans-serif; - border:1px dashed $color-input-border; - padding:1.2em; + border:1px solid $color-input-border; + padding:0.9em 1.2em; background-color:$color-fieldset-hover; -webkit-appearance: none; color:$color-text-input; @@ -76,10 +67,9 @@ input, textarea, select, .richtext, .tagit{ } } -input[type=radio],input[type=checkbox]{ +input[type=radio], input[type=checkbox]{ @include border-radius(0); cursor:pointer; - float:left; border:0; } @@ -350,7 +340,10 @@ button.icon{ .help, .error-message{ font-size:0.85em; font-weight:normal; - margin:0.5em 0; + margin:0.5em 0 0 0; +} +.error-message{ + color:$color-red; } .help{ color:$color-grey-2; @@ -374,18 +367,11 @@ li.focused > .help{ font-size:13px; } -.error-message{ - margin:0; - color:$color-red; - clear:both; -} - .error input, .error textarea, .error select, .error .tagit{ border-color:$color-red; background-color:$color-input-error-bg; } - /* Layouts for particular kinds of of fields */ /* permanently show checkbox/radio help as they have no focus state */ @@ -427,6 +413,21 @@ li.focused > .help{ } } +.fields li{ + padding-top:0.5em; + padding-bottom:1em; +} + +.field-content .input li{ + label{ + width:auto; + float:none; + } +} + +.input{ + clear:both; +} /* field sizing */ @@ -498,7 +499,7 @@ ul.inline li:first-child, li.inline:first-child{ display:block; float:left; color:$color-grey-3; - line-height:0.85em; + line-height:1em; font-size:2.5em; margin-right:0.3em; } @@ -612,114 +613,6 @@ ul.tagit li.tagit-choice-editable{ } } - -/* -// search bars (search integrated into header area) -.search-bar{ - margin-top:-2em; - padding-top:1em; - padding-bottom:1em; - margin-bottom:2em; - - &.full-width{ - @include nice-padding(); - background-color:$color-header-bg; - border-bottom:1px solid $color-grey-4; - } - - label{ - display:none; - } - - .fields{ - position:relative; - clear:both; - - .field input{ - padding-left:3em; - - &:focus{ - background-color:white; - } - } - .field:before, .field:after{ - font-family:wagtail; - position:absolute; - top:1em; - font-size:25px; - - } - .field:before{ - left:0.5em; - content:"f"; - color:$color-grey-3; - } - .field:after{ - color:$color-teal; - opacity:0.8; - font-size:20px; - width:20px; - height:20px; - line-height:23px; - text-align:center; - top:0.3em; - right:0.5em; - } - } - .submit{ - display:none; - position:absolute; - right:0; - top:0; - input{ - padding:1.55em 2em; - } - } - .taglist{ - font-size:0.9em; - line-height:2.4em; - h3{ - display:inline; - } - a{ - white-space: nowrap - } - } - - &.small{ - margin:0; - padding:0; - .fields{ - li{ - padding:0; - } - .field{ - padding:0; - } - .field input{ - padding:0.4em 1.4em 0.4em 2em; - - &:focus{ - background-color:white; - } - } - .field:before{ - font-size:1.1rem; - top:0.45em; - } - - } - } -} - -// mozilla specific hack -@-moz-document url-prefix() { - .search-bar .fields .field:after{ - line-height:20px; - } -} -*/ - /* Transitions */ fieldset, input, textarea, select{ @include transition(background-color 0.2s ease); @@ -732,33 +625,20 @@ input[type=submit], input[type=reset], input[type=button], .button, button{ } @media screen and (min-width: $breakpoint-mobile){ - .help{ - opacity:1; - } - .fields{ - max-width:800px; - } - - .field{ - @include row(); - } - label{ @include column(2); - padding-top:1.5em; + padding-top:1.2em; padding-left:0; + .model_multiple_choice_field &, .boolean_field &, - .model_choice_field &{ + .model_choice_field &, + .image_field &, + .file_field &{ padding-top:0; } } - .field-content{ - @include column(10); - padding-right:0; - } - input[type=submit], input[type=reset], input[type=button], .button, button{ font-size:0.95em; padding:0.75em 1.4em; @@ -772,4 +652,20 @@ input[type=submit], input[type=reset], input[type=button], .button, button{ } } } + + .help{ + opacity:1; + } + .fields{ + max-width:800px; + } + + .field{ + @include row(); + } + + .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 1c7f7435a..c45c591d4 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss @@ -88,11 +88,16 @@ header{ padding:0; } } + + .field-content{ + width:auto; + padding:0; + } } /* mozilla specific hack */ @-moz-document url-prefix() { - .search-form .fields .field:after{ + .iconfield.icon-spinner:after{ line-height:20px; } } diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss index 3533bd876..4c06efec8 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss @@ -42,7 +42,7 @@ $color-grey-5: #fafafa; $color-thead-bg: $color-grey-5; $color-header-bg: $color-teal; // #ff6a58; $color-fieldset-hover: $color-grey-5; -$color-input-border: $color-grey-3; +$color-input-border: $color-grey-4; $color-input-focus: #f4fcfc; $color-input-error-bg: #feedee; $color-button: $color-teal; 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 5760a5b1d..49ef50e9a 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_field.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_field.html @@ -1,19 +1,22 @@
      {{ field.label_tag }}
      - {% block form_field %} - {{ field }} - {% endblock %} +
      + {% block form_field %} + {{ field }} + {% endblock %} +
      {% if field.help_text %}

      {{ field.help_text }}

      {% endif %} + + {% if field.errors %} +

      + {% for error in field.errors %} + {{ error }} + {% endfor %} +

      + {% endif %}
      -{% if field.errors %} -

      - {% for error in field.errors %} - {{ error }} - {% endfor %} -

      -{% endif %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html index e40e6dbda..89f2d6fa7 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html @@ -2,21 +2,23 @@
    • {{ field.label_tag }} -
      - {% block form_field %} - {{ field }} - {% endblock %} +
      +
      + {% block form_field %} + {{ field }} + {% endblock %} +
      + {% if field.help_text %} +

      {{ field.help_text }}

      + {% endif %} + + {% if field.errors %} +

      + {% for error in field.errors %} + {{ error|escape }} + {% endfor %} +

      + {% endif %}
      - - {% if field.errors %} -

      - {% for error in field.errors %} - {{ error|escape }} - {% endfor %} -

      - {% endif %} - {% if field.help_text %} -

      {{ field.help_text }}

      - {% endif %}
      • \ No newline at end of file diff --git a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html index fa4bfdb13..a1b45f6d0 100644 --- a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html +++ b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html @@ -39,7 +39,7 @@
    -
      +
        {% 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" %} {% endfor %} From 5474f7ef397d70e8e4c9259727e9492c4a6287dc Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 13 May 2014 17:18:33 +0100 Subject: [PATCH 062/123] Embeds: Catch TypeErrors when casting width and height to integers --- wagtail/wagtailembeds/embeds.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wagtail/wagtailembeds/embeds.py b/wagtail/wagtailembeds/embeds.py index 63f38beb5..f8ab35f16 100644 --- a/wagtail/wagtailembeds/embeds.py +++ b/wagtail/wagtailembeds/embeds.py @@ -155,12 +155,12 @@ def get_embed(url, max_width=None, finder=None): # Make sure width and height are valid integers before inserting into database try: embed_dict['width'] = int(embed_dict['width']) - except ValueError: + except (TypeError, ValueError): embed_dict['width'] = None try: embed_dict['height'] = int(embed_dict['height']) - except ValueError: + except (TypeError, ValueError): embed_dict['height'] = None # Create database record From 49c5f762df74759c0d79e0b6298175b1822c6c41 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Tue, 13 May 2014 17:19:41 +0100 Subject: [PATCH 063/123] fixing height of header --- .../static/wagtailadmin/scss/components/header.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss index c45c591d4..39840abe4 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss @@ -83,7 +83,9 @@ header{ .fields{ margin-top:-0.5em; - + li{ + padding-bottom:0; + } .field{ padding:0; } From a2ed70bd8d862137a955e69a4e8132091c5ba477 Mon Sep 17 00:00:00 2001 From: Jeffrey Hearn Date: Tue, 13 May 2014 22:38:44 -0400 Subject: [PATCH 064/123] Snippets and some reorg --- docs/advanced_topics.rst | 9 +++ docs/building_your_site.rst | 144 +++++++----------------------------- docs/index.rst | 3 + docs/panels.rst | 33 +++++++++ docs/snippets.rst | 140 +++++++++++++++++++++++++++++++++++ docs/wagtail_search.rst | 75 +++++++++---------- 6 files changed, 250 insertions(+), 154 deletions(-) create mode 100644 docs/advanced_topics.rst create mode 100644 docs/panels.rst create mode 100644 docs/snippets.rst diff --git a/docs/advanced_topics.rst b/docs/advanced_topics.rst new file mode 100644 index 000000000..ae0e24015 --- /dev/null +++ b/docs/advanced_topics.rst @@ -0,0 +1,9 @@ +Advanced Topics +~~~~~~~~~~~~~~~~ + +replacing image processing backend + +custom image processing tags? + +wagtail user bar custom CSS option? + diff --git a/docs/building_your_site.rst b/docs/building_your_site.rst index 8912a8158..1b4c9dd09 100644 --- a/docs/building_your_site.rst +++ b/docs/building_your_site.rst @@ -1,22 +1,22 @@ Building your site ================== - - -Model Design with Wagtail -~~~~~~~~~~~~~~~~~~~~~~~~~ - Wagtail manages content internally as a tree of pages. Each node in the tree is an instance of a Django model which subclasses the Wagtail ``Page`` class. You define the structure and interrelationships of your Wagtail site by coding these models and then publishing pages which use the models through the Wagtail admin interface. + +The Page Class +~~~~~~~~~~~~~~ + ``Page`` uses Django's model interface, so you can include any field type and field options that Django allows. Wagtail provides some fields and editing handlers that simplify data entry in the Wagtail admin interface, so you may want to keep those in mind when deciding what properties to add to your models in addition to those already provided by ``Page``. + Built-in Properties of the Page Class ------------------------------------- -Wagtail provides some properties in the Page class which are common to most webpages. Since you'll be subclassing ``Page``, you don't have to worry about implementing them. +Wagtail provides some properties in the ``Page`` class which are common to most webpages. Since you'll be subclassing ``Page``, you don't have to worry about implementing them. -Public Properties Suitable for Inclusion in Templates -````````````````````````````````````````````````````` +Public Properties +````````````````` ``title`` (string, required) Human-readable title for the content @@ -30,32 +30,23 @@ Public Properties Suitable for Inclusion in Templates ``search_description`` (string) A SEO-crafted description of the content, used in both internal search indexing and for the meta description read by search engines -Semi-Private Properties Intended for Use in the Wagtail Admin -````````````````````````````````````````````````````````````` +The ``Page`` class actually has alot more to it, but these are probably the only built-in properties you'll need to worry about when creating templates for your models. + + +Anatomy of a Wagtail Model +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +So what does a Wagtail model definition look like? + + - ``show_in_menus`` (boolean) - Whether a link to this page will appear in automatically generated menus")) - ``live`` (boolean) - Whether the page is in a published, public-visible state - ``has_unpublished_changes`` (boolean) - Whether the page is in a draft state - ``owner`` (User) - Model relation pointing to the user who owns the page. Uses the user model set in ``settings.AUTH_USER_MODEL``. - ``indexed_fields`` (dict) - Describes the properties which should be indexed by search and how they should be weighted for maximum accuracy. See the Search section for usage. -Internal Properties Which Describe The Model Instance -````````````````````````````````````````````````````` - ``content_type`` (ContentType) - A relation to an internal content type model. - ``url_path`` (string) - The full URL path, including the slugs of all parents going back to the site root. Whenever a slug is changed in the tree, all of the node's descendants are updated with the new path. Use the ``pageurl`` template tag for outputting the URL of a page-subclassed object. Introduction to Trees --------------------- @@ -78,10 +69,10 @@ The Wagtail admin interface uses the tree to organize content for editing, letti Nodes and Leaves ---------------- -It might be handy to think of the ``Page``-derived models you want to create as being one of two node types: parents and leaves. +It might be handy to think of the ``Page``-derived models you want to create as being one of two node types: parents and leaves. Wagtail isn't prescriptive in this approach, but it's a good place to start if you're not experienced in structuring your own content types. -Parents -``````` +Nodes +````` Parent nodes on the Wagtail tree probably want to organize and display a browsable index of their descendents. A blog, for instance, needs a way to show a list of individual posts. A Parent node could provide its own function returning its descendant objects. @@ -127,11 +118,12 @@ Other Relationships ``````````````````` Your ``Page``-derived models might have other interrelationships which extend the basic Wagtail tree or depart from it entirely. You could provide functions to navigate between siblings, such as a "Next Post" link on a blog page (``post->post->post``). It might make sense for subtrees to interrelate, such as in a discussion forum (``forum->post->replies``) Skipping across the hierarchy might make sense, too, as all objects of a certain model class might interrelate regardless of their ancestors (``events = EventPage.objects.all``). Since there's no restriction on the combination of model classes that can be used at any point in the tree, and it's largely up to the models to define their interrelations, the possibilities are really endless. + Model Recipes -------------- +~~~~~~~~~~~~~ Overriding the Serve() Method -````````````````````````````` +----------------------------- Wagtail defaults to serving ``Page``-derived models by passing ``self`` to a Django HTML template matching the model's name, but suppose you wanted to serve something other than HTML? You can override the ``serve()`` method provided by the ``Page`` class and handle the Django request and response more directly. @@ -164,7 +156,8 @@ Consider this example from the Wagtail demo site's ``models.py``, which serves a With this strategy, you could use Django or Python utilities to render your model in JSON or XML or any other format you'd like. Tagging -``````` +------- + Wagtail provides tagging capability through the combination of two django modules, ``taggit`` and ``modelcluster``. ``taggit`` provides a model for tags which is extended by ``modelcluster``, which in turn provides some magical database abstraction which makes drafts and revisions possible in Wagtail. It's a tricky recipe, but the net effect is a many-to-many relationship between your model and a tag class reserved for your model. Using an example from the Wagtail demo site, here's what the tag model and the relationship field looks like in ``models.py``: @@ -227,69 +220,6 @@ This is just one possible way of creating a taxonomy for Wagtail objects. With a ParentalKey for storing groups of stuff to a Page-thing - Using or subclassing the site model? - - - -Wagtail Admin API -~~~~~~~~~~~~~~~~~ - -Fields & Edit Handlers ----------------------- - - RichTextField - - Image - - FieldPanel - - MultiFieldPanel - - InlinePanel - - PageChooserPanel - - ImageChooserPanel - - DocumentChooserPanel - -Snippets --------- - -Snippets are pieces of content which do not necessitate a full webpage to render. They could be used for making secondary content, such as headers, footers, and sidebars, editable in the Wagtail admin. Snippets are models which do not inherit the ``Page`` class and are thus not organized into the Wagtail tree, but can still be made editable by assigning panels and identifying the model as a snippet with ``register_snippet()``. - -Here's an example snippet from the Wagtail demo website: - -.. code-block:: python - - class Advert(models.Model): - page = models.ForeignKey( - 'wagtailcore.Page', - related_name='adverts', - null=True, - blank=True - ) - url = models.URLField(null=True, blank=True) - text = models.CharField(max_length=255) - - panels = [ - PageChooserPanel('page'), - FieldPanel('url'), - FieldPanel('text'), - ] - - def __unicode__(self): - return self.text - - register_snippet(Advert) - -The ``Advert`` model uses the basic Django model class and defines three properties: text, url, and page. The editing interface is very close to that provided for ``Page``-derived models, with fields assigned in the panels property. - - - - - - @@ -372,32 +302,14 @@ Template Filters - - - - - Site ~~~~ -Django's built-in admin interface provides the way to map a "site" (hostname or domain) to the root of a wagtail tree. 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. - - -Advanced Wagtail -~~~~~~~~~~~~~~~~ - - replacing image processing backend - - custom image processing methods? - - wagtail user bar custom CSS option? - - - - - +Django's built-in admin interface provides the way to map a "site" (hostname or domain) to any node in the wagtail tree, using that node as the site's root. +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. diff --git a/docs/index.rst b/docs/index.rst index dbfe91f33..defbe99cf 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -10,7 +10,10 @@ It supports Django 1.6.2+ on Python 2.6 and 2.7. Django 1.7 and Python 3 support gettingstarted building_your_site + panels + snippets wagtail_search + advanced_topics deploying performance contributing diff --git a/docs/panels.rst b/docs/panels.rst new file mode 100644 index 000000000..7cf6c1056 --- /dev/null +++ b/docs/panels.rst @@ -0,0 +1,33 @@ + +Panels & Edit Handlers +====================== + +RichTextField +~~~~~~~~~~~~~ + +Image +~~~~~ + +FieldPanel +~~~~~~~~~~ + +MultiFieldPanel +~~~~~~~~~~~~~~~ + +InlinePanel +~~~~~~~~~~~ + +PageChooserPanel +~~~~~~~~~~~~~~~~ + +ImageChooserPanel +~~~~~~~~~~~~~~~~~ + +DocumentChooserPanel +~~~~~~~~~~~~~~~~~~~~ + +SnippetChooserPanel +~~~~~~~~~~~~~~~~~~~ + + + diff --git a/docs/snippets.rst b/docs/snippets.rst new file mode 100644 index 000000000..14d62b793 --- /dev/null +++ b/docs/snippets.rst @@ -0,0 +1,140 @@ +Snippets +======== + +Snippets are pieces of content which do not necessitate a full webpage to render. They could be used for making secondary content, such as headers, footers, and sidebars, editable in the Wagtail admin. Snippets are models which do not inherit the ``Page`` class and are thus not organized into the Wagtail tree, but can still be made editable by assigning panels and identifying the model as a snippet with ``register_snippet()``. + +Snippets are not searchable or orderable in the Wagtail admin, so decide carefully if the content type you would want to build into a snippet might be more suited to a page. + +Snippet Models +-------------- + +Here's an example snippet from the Wagtail demo website: + +.. code-block:: python + + from django.db import models + + from wagtail.wagtailadmin.edit_handlers import FieldPanel + from wagtail.wagtailsnippets.models import register_snippet + + ... + + class Advert(models.Model): + url = models.URLField(null=True, blank=True) + text = models.CharField(max_length=255) + + panels = [ + FieldPanel('url'), + FieldPanel('text'), + ] + + def __unicode__(self): + return self.text + + register_snippet(Advert) + +The ``Advert`` model uses the basic Django model class and defines two properties: text and url. The editing interface is very close to that provided for ``Page``-derived models, with fields assigned in the panels property. Snippets do not use multiple tabs of fields, nor do they provide the "save as draft" or "submit for moderation" features. + +``register_snippet(Advert)`` tells Wagtail to treat the model as a snippet. The ``panels`` list defines the fields to show on the snippet editing page. It's also important to provide a string representation of the class through ``def __unicode__(self):`` so that the snippet objects make sense when listed in the Wagtail admin. + +Including Snippets in Template Tags +----------------------------------- + +The simplest way to make your snippets available to templates is with a template tag. This is mostly done with vanilla Django, so perhaps reviewing Django's documentation for `django custom template tags`_ will be more helpful. We'll go over the basics, though, and make note of any considerations to make for Wagtail. + +First, add a new python file to a ``templatetags`` folder within your app. The demo website, for instance uses the path ``wagtaildemo/demo/templatetags/demo_tags.py``. We'll need to load some Django modules and our app's models and ready the ``register`` decorator: + +.. _django custom template tags: https://docs.djangoproject.com/en/dev/howto/custom-template-tags/ + +.. code-block:: python + + from django import template + from demo.models import * + + register = template.Library() + + ... + + # Advert snippets + @register.inclusion_tag('demo/tags/adverts.html', takes_context=True) + def adverts(context): + return { + 'adverts': Advert.objects.all(), + 'request': context['request'], + } + +``@register.inclusion_tag()`` takes two variables: a template and a boolean on whether that template should be passed a request context. It's a good idea to include request contexts in your custom template tags, since some Wagtail-specific template tags like ``pageurl`` need the context to work properly. The template tag function could take arguments and filter the adverts to return a specific model, but for brevity we'll just use ``Advert.objects.all()``. + +Here's what's in the template used by the template tag: + +.. code-block:: django + + {% for advert in adverts %} +

        + + {{ advert.text }} + +

        + {% endfor %} + +Then in your own page templates, you can include your snippet template tag with: + +.. code-block:: django + + {% block content %} + + ... + + {% adverts %} + + {% endblock %} + +Binding Pages to Snippets +------------------------- + +An alternate strategy for including snippets might involve explicitly binding a specific page object to a specific snippet object. Lets add another snippet class to see how that might work: + +.. code-block:: python + + from django.db import models + + from wagtail.wagtailcore.models import Page + from wagtail.wagtailadmin.edit_handlers import PageChooserPanel + from wagtail.wagtailsnippets.models import register_snippet + from wagtail.wagtailsnippets.edit_handlers import SnippetChooserPanel + + from modelcluster.fields import ParentalKey + + ... + + class AdvertPlacement(models.Model): + page = ParentalKey('wagtailcore.Page', related_name='advert_placements') + advert = models.ForeignKey('demo.Advert', related_name='+') + + class Meta: + verbose_name = "Advert Placement" + verbose_name_plural = "Advert Placements" + + panels = [ + PageChooserPanel('page'), + SnippetChooserPanel('advert', Advert), + ] + + def __unicode__(self): + return self.page.title + " -> " + self.advert.text + + register_snippet(AdvertPlacement) + +The class ``AdvertPlacement`` has two properties, ``page`` and ``advert``, which point to other models. Wagtail provides a ``PageChooserPanel`` and ``SnippetChooserPanel`` to let us make painless selection of those properties in the Wagtail admin. Note also the ``Meta`` class, which you can stock with the ``verbose_name`` and ``verbose_name_plural`` properties to override the snippet labels in the Wagtail admin. The text representation of the class has also gotten fancy, using both properties to construct a compound label showing the relationship it forms between a page and an Advert. + +With this snippet in place, we can use the reverse ``related_name`` lookup label ``advert_placements`` to iterate over any placements within our template files. In the template for a ``Page``-derived model, we could include the following: + +.. code-block:: django + + {% if self.advert_placements %} + {% for advert_placement in self.advert_placements.all %} +

        {{ advert_placement.advert.text }}

        + {% endfor %} + {% endif %} + + diff --git a/docs/wagtail_search.rst b/docs/wagtail_search.rst index 517617272..fff462349 100644 --- a/docs/wagtail_search.rst +++ b/docs/wagtail_search.rst @@ -68,7 +68,43 @@ The search view provides a context with a few useful variables. ``query`` A Wagtail ``Query`` object matching the terms. The ``Query`` model provides several class methods for viewing the statistics of all queries, but exposes only one property for single objects, ``query.hits``, which tracks the number of time the search string has been used over the lifetime of the site. ``Query`` also joins to the Editor's Picks functionality though ``query.editors_picks``. See :ref:`editors-picks`. +Editor's Picks +-------------- +Editor's Picks are a way of explicitly linking relevant content to search terms, so results pages can contain curated content instead of being at the mercy of the search algorithm. In a template using the search results view, editor's picks can be accessed through the variable ``query.editors_picks``. To include editor's picks in your search results template, use the following properties. + +``query.editors_picks.all`` + This gathers all of the editor's picks objects relating to the current query, in order according to their sort order in the Wagtail admin. You can then iterate through them using a ``{% for ... %}`` loop. Each editor's pick object provides these properties: + + ``editors_pick.page`` + The page object associated with the pick. Use ``{% pageurl editors_pick.page %}`` to generate a URL or provide other properties of the page object. + + ``editors_pick.description`` + The description entered when choosing the pick, perhaps explaining why the page is relevant to the search terms. + +Putting this all together, a block of your search results template displaying Editor's Picks might look like this: + +.. code-block:: django + + {% with query.editors_picks.all as editors_picks %} + {% if editors_picks %} +
        +

        Editors picks

        + +
        + {% endif %} + {% endwith %} Asyncronous Search with JSON and AJAX ------------------------------------- @@ -81,7 +117,7 @@ Wagtail's provides JSON search results when queries are made to the ``wagtailsea var wagtailJSONSearchURL = "{% url 'wagtailsearch_suggest' %}"; -Lets also add a simple interface for the search with an ```` element and ``
        `` for the results: +Lets also add a simple interface for the search with a ```` element to gather search terms and a ``
        `` to display the results: .. code-block:: html @@ -162,43 +198,6 @@ In this template, you'll have access to the same context variablies provided to .. _editors-picks: -Editor's Picks --------------- - -Editor's Picks are a way of explicitly linking relevant content to search terms, so results pages can contain curated content instead of being at the mercy of the search algorithm. In a template using the search results view, editor's picks can be accessed through the variable ``query.editors_picks``. To include editor's picks in your search results template, use the following properties. - -``query.editors_picks.all`` - This gathers all of the editor's picks objects relating to the current query, in order according to their sort order in the Wagtail admin. You can then iterate through them using a ``{% for ... %}`` loop. Each editor's pick object provides these properties: - - ``editors_pick.page`` - The page object associated with the pick. Use ``{% pageurl editors_pick.page %}`` to generate a URL or provide other properties of the page object. - - ``editors_pick.description`` - The description entered when choosing the pick, perhaps explaining why the page is relevant to the search terms. - -Putting this all together, a block of your search results template displaying Editor's Picks might look like this: - -.. code-block:: django - - {% with query.editors_picks.all as editors_picks %} - {% if editors_picks %} -
        -

        Editors picks

        - -
        - {% endif %} - {% endwith %} Indexing Custom Fields & Custom Search Views -------------------------------------------- From 09f185b3aa39f3fcef27e6d5b1fd345ea99a201a Mon Sep 17 00:00:00 2001 From: Ben Margolis Date: Thu, 15 May 2014 15:29:23 -0700 Subject: [PATCH 065/123] 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 65b98992699a80390999c11f117068a97222bf2a Mon Sep 17 00:00:00 2001 From: Jeffrey Hearn Date: Thu, 15 May 2014 22:41:13 -0400 Subject: [PATCH 066/123] Routes --- docs/building_your_site.rst | 106 ++++++++++++++++++++++++++++++++++-- 1 file changed, 101 insertions(+), 5 deletions(-) diff --git a/docs/building_your_site.rst b/docs/building_your_site.rst index 1b4c9dd09..04c2e2ae5 100644 --- a/docs/building_your_site.rst +++ b/docs/building_your_site.rst @@ -122,7 +122,7 @@ Your ``Page``-derived models might have other interrelationships which extend th Model Recipes ~~~~~~~~~~~~~ -Overriding the Serve() Method +Overriding the serve() Method ----------------------------- Wagtail defaults to serving ``Page``-derived models by passing ``self`` to a Django HTML template matching the model's name, but suppose you wanted to serve something other than HTML? You can override the ``serve()`` method provided by the ``Page`` class and handle the Django request and response more directly. @@ -155,6 +155,90 @@ Consider this example from the Wagtail demo site's ``models.py``, which serves a With this strategy, you could use Django or Python utilities to render your model in JSON or XML or any other format you'd like. + +Adding Endpoints with Custom route() Methods +-------------------------------------------- + +Wagtail routes requests by iterating over the path components (separated with a forward slash ``/``), finding matching objects based on their slug, and delegating further routing to that object's model class. The Wagtail source is very instructive in figuring out what's happening. This is the default ``route()`` method of the ``Page`` class: + +.. code-block:: python + + class Page(...): + + ... + + def route(self, request, path_components): + if path_components: + # request is for a child of this page + child_slug = path_components[0] + remaining_components = path_components[1:] + + # find a matching child or 404 + try: + subpage = self.get_children().get(slug=child_slug) + except Page.DoesNotExist: + raise Http404 + + # delegate further routing + return subpage.specific.route(request, remaining_components) + + else: + # request is for this very page + if self.live: + # use the serve() method to render the request if the page is published + return self.serve(request) + else: + # the page matches the request, but isn't published, so 404 + raise Http404 + +The contract is pretty simple. ``route()`` takes the current object (``self``), the ``request`` object, and a list of the remaining ``path_components`` from the request URL. It either continues delegating routing by calling ``route()`` again on one of its children in the Wagtail tree, or ends the routing process by serving something -- either normally through the ``self.serve()`` method or by raising a 404 error. + +By overriding the ``route()`` method, we could create custom endpoints for each object in the Wagtail tree. One use case might be using an alternate template when encountering the ``print/`` endpoint in the path. Another might be a REST API which interacts with the current object. Just to see what's involved, lets make a simple model which prints out all of its child path components. + +First, ``models.py``: + +.. code-block:: python + + from django.shortcuts import render + + ... + + class Echoer(Page): + + def route(self, request, path_components): + if path_components: + return render(request, self.template, { + 'self': self, + 'echo': ' '.join(path_components), + }) + else: + if self.live: + return self.serve(request) + else: + raise Http404 + + Echoer.content_panels = [ + FieldPanel('title', classname="full title"), + ] + + Echoer.promote_panels = [ + MultiFieldPanel(COMMON_PANELS, "Common page configuration"), + ] + +This model, ``Echoer``, doesn't define any properties, but does subclass ``Page`` so objects will be able to have a custom title and slug. The template just has to display our ``{{ echo }}`` property. We're skipping the ``serve()`` method entirely, but you could include your render code there to stay consistent with Wagtail's conventions. + +Now, once creating a new ``Echoer`` page in the Wagtail admin titled "Echo Base," requests such as:: + + http://127.0.0.1:8000/echo-base/tauntaun/kennel/bed/and/breakfast/ + +Will return:: + + tauntaun kennel bed and breakfast + +Lovely, huh? (We know.) + + + Tagging ------- @@ -216,10 +300,10 @@ This is just one possible way of creating a taxonomy for Wagtail objects. With a - custom route methods - ParentalKey for storing groups of stuff to a Page-thing +Extended Page Data with ParentalKey +----------------------------------- @@ -229,11 +313,23 @@ Templates Location -------- - Wagtail looks for templates matching your models in... + +For each of your ``Page``-derived models, Wagtail will look for a template in the following location, relative to your project root:: + + project/ + app/ + templates/ + app/ + blog_index_page.html + models.py + +Class names are converted from camel case to underscores. For example, the template for model class ``BlogIndexPage`` would be assumed to be ``blog_index_page.html``. Self ---- - Without a custom rendering function, a ... + +By default, the context passed to a model's template consists of two properties: ``self`` and ``request``. ``self`` is the model object being displayed. ``request`` is the normal Django request object. + Template Tags ------------- From da2c69a5ee3820f5763ae8b2a1f898e4e2190ab0 Mon Sep 17 00:00:00 2001 From: Jeffrey Hearn Date: Thu, 15 May 2014 22:50:26 -0400 Subject: [PATCH 067/123] Routes --- docs/building_your_site.rst | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/building_your_site.rst b/docs/building_your_site.rst index 04c2e2ae5..7cb2f04a5 100644 --- a/docs/building_your_site.rst +++ b/docs/building_your_site.rst @@ -302,9 +302,15 @@ This is just one possible way of creating a taxonomy for Wagtail objects. With a -Extended Page Data with ParentalKey +Page Data Clusters with ParentalKey ----------------------------------- +The ``django-modelcluster`` module allows for streamlined relation of extra models to a Wagtail page. + + + + + From 6092791b864c736a4c443b47780414ee5951fcf2 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 16 May 2014 12:17:07 +0100 Subject: [PATCH 068/123] 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 069/123] 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 04e56198ffc186352b0693f6b8180e7bb37fcd5c Mon Sep 17 00:00:00 2001 From: Jeffrey Hearn Date: Fri, 16 May 2014 12:02:32 -0400 Subject: [PATCH 070/123] placeholders added --- docs/building_your_site.rst | 75 +++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/docs/building_your_site.rst b/docs/building_your_site.rst index 36d264048..28fbd7010 100644 --- a/docs/building_your_site.rst +++ b/docs/building_your_site.rst @@ -178,50 +178,51 @@ Location Self ---- - Without a custom rendering function, a + +Without a custom rendering function, the ``Page`` class will provide a ``self`` variable which a template can use to display Tags Provided by Wagtail ------------------------ - pageurl - Loaded into a template with - {% load pageurl %} - Used like - - Given a Page-derived class, 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. - slugurl - Loaded into a template with - {% load slugurl %} - Used like - - Returns the URL for the page that has the given slug. Like pageurl, will try to provide a relative link if possible, but will default to an absolute link if on a different site. - wagtailuserbar - Loaded into a template with - {% load wagtailuserbar %} - Used like - {% wagtailuserbar %} - This tag provides a Wagtail icon and flyout menu on the top-right of a page for a logged-in user with editing capabilities, with the option of editing the current Page-derived object or adding a new sibling object. - image - Loaded with - {% load image_tags %} - Used with - {% image self.photo max-320x200 %} - {% image self.photo max-320x200 as img %} - This template tag provides a way to process an image with a method and dimensions +``pageurl`` + Loaded into a template with + ``{% load pageurl %}`` + Used like + ```` + Given a Page-derived class, 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. +``slugurl`` + Loaded into a template with + ``{% load slugurl %}`` + Used like + ```` + Returns the URL for the page that has the given slug. Like pageurl, will try to provide a relative link if possible, but will default to an absolute link if on a different site. +``wagtailuserbar`` + Loaded into a template with + ``{% load wagtailuserbar %}`` + Used like + ``{% wagtailuserbar %}`` + This tag provides a Wagtail icon and flyout menu on the top-right of a page for a logged-in user with editing capabilities, with the option of editing the current Page-derived object or adding a new sibling object. +``image`` + Loaded with + ``{% load image_tags %}`` + Used with + ``{% image self.photo max-320x200 %}`` + ``{% image self.photo max-320x200 as img %}`` + This template tag provides a way to process an image with a method and dimensions - 'max': 'resize_to_max', - 'min': 'resize_to_min', - 'width': 'resize_to_width', - 'height': 'resize_to_height', - 'fill': 'resize_to_fill', + 'max': 'resize_to_max', + 'min': 'resize_to_min', + 'width': 'resize_to_width', + 'height': 'resize_to_height', + 'fill': 'resize_to_fill', Filters Provided by Wagtail --------------------------- - rich_text + ``rich_text`` Loaded into template with - {% load rich_text %} + ``{% load rich_text %}`` Used with - {{ body|richtext }} + ``{{ body|richtext }}`` This filter is required for use with any RichTextField, because it will expand internal shorthand references to embeds and links made in the Wagtail editor into fully-baked HTML ready for display. @@ -234,11 +235,11 @@ Advanced Wagtail wagtail user bar custom CSS option? +extending hallo editor plugins with editor_js() +injecting any JS into page edit with editor_js() - - - +Custom content module (same level as docs or images) From 62f3ecaa9ba27393c4173f13aa07e24eb83f3370 Mon Sep 17 00:00:00 2001 From: Jeffrey Hearn Date: Fri, 16 May 2014 12:10:46 -0400 Subject: [PATCH 071/123] another placeholder --- docs/panels.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/panels.rst b/docs/panels.rst index 7cf6c1056..47cd3e1a7 100644 --- a/docs/panels.rst +++ b/docs/panels.rst @@ -29,5 +29,8 @@ DocumentChooserPanel SnippetChooserPanel ~~~~~~~~~~~~~~~~~~~ +Custom Panels +~~~~~~~~~~~~~ + From ed36f25bffd6715bba8ca5a902e51e7757ecb615 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Sat, 17 May 2014 15:12:18 +0200 Subject: [PATCH 072/123] 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 073/123] 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 446c053a170bf5099a64e2e7438033c7d305a7be Mon Sep 17 00:00:00 2001 From: Jeffrey Hearn Date: Sat, 17 May 2014 20:54:36 -0400 Subject: [PATCH 074/123] more model basics --- docs/building_your_site.rst | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/docs/building_your_site.rst b/docs/building_your_site.rst index e49c86360..a6677a88a 100644 --- a/docs/building_your_site.rst +++ b/docs/building_your_site.rst @@ -36,10 +36,44 @@ The ``Page`` class actually has alot more to it, but these are probably the only Anatomy of a Wagtail Model ~~~~~~~~~~~~~~~~~~~~~~~~~~ -So what does a Wagtail model definition look like? +So what does a Wagtail model definition look like? Here's a model representing a typical blog post: +.. code-block:: python + from django.db import models + from wagtail.wagtailcore.models import Page + from wagtail.wagtailcore.fields import RichTextField + from wagtail.wagtailadmin.edit_handlers import FieldPanel + from wagtail.wagtailimages.edit_handlers import ImageChooserPanel + from wagtail.wagtailimages.models import Image + + class BlogPage(Page): + body = RichTextField() + date = models.DateField("Post date") + feed_image = models.ForeignKey( + 'wagtailimages.Image', + null=True, + blank=True, + on_delete=models.SET_NULL, + related_name='+' + ) + + BlogPage.content_panels = [ + FieldPanel('title', classname="full title"), + FieldPanel('date'), + FieldPanel('body', classname="full"), + ] + + BlogPage.promote_panels = [ + FieldPanel('slug'), + FieldPanel('seo_title'), + FieldPanel('show_in_menus'), + FieldPanel('search_description'), + ImageChooserPanel('feed_image'), + ] + +To keep track of your ``Page``-derived models, it might be helpful to include "Page" as the last part of your classname. ``BlogPage`` defines three properties: ``body``, ``date``, and ``feed_image``. These are a mix of basic Django models (``date``) and Wagtail models (``feed_image`` and ``body``). From bfc53dd6ce9c1fc82fa6383b04d42fc3c1d3a54a Mon Sep 17 00:00:00 2001 From: Jeffrey Hearn Date: Sun, 18 May 2014 01:21:17 -0400 Subject: [PATCH 075/123] added request lifestyle introduction --- docs/building_your_site.rst | 38 ++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/docs/building_your_site.rst b/docs/building_your_site.rst index a6677a88a..2768cb9cf 100644 --- a/docs/building_your_site.rst +++ b/docs/building_your_site.rst @@ -1,7 +1,13 @@ Building your site ================== -Wagtail manages content internally as a tree of pages. Each node in the tree is an instance of a Django model which subclasses the Wagtail ``Page`` class. You define the structure and interrelationships of your Wagtail site by coding these models and then publishing pages which use the models through the Wagtail admin interface. +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 contruction 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. + +The presentation of your content, the actual webpages, includes the normal use of the Django template system. We'll cover additional functionality that Wagtail provides at the template level later on. + +But first, we'll take a look at the ``Page`` class and model definitions. The Page Class @@ -73,17 +79,17 @@ So what does a Wagtail model definition look like? Here's a model representing a ImageChooserPanel('feed_image'), ] -To keep track of your ``Page``-derived models, it might be helpful to include "Page" as the last part of your classname. ``BlogPage`` defines three properties: ``body``, ``date``, and ``feed_image``. These are a mix of basic Django models (``date``) and Wagtail models (``feed_image`` and ``body``). - - - +To keep track of your ``Page``-derived models, it might be helpful to include "Page" as the last part of your classname. ``BlogPage`` defines three properties: ``body``, ``date``, and ``feed_image``. These are a mix of basic Django models (``DateField``), Wagtail fields (``RichTextField``), and a pointer to a Wagtail model (``Image``). +Next, the ``content_panels`` and ``promote_panels`` lists define the capabilities and layout of the Wagtail admin page edit interface. The lists are filled with "panels" and "choosers", which will provide a fine-grain interface for inputting the model's content. The ``ImageChooserPanel``, for instance, lets one browse the image library, upload new images, and input image metadata. The ``RichTextField`` is the basic field for creating web-ready website rich text, including text formatting and embedded media like images and video. The Wagtail admin offers other choices for fields, Panels, and Choosers, with the option of creating your own to precisely fit your content without workarounds or other compromises. +Your models may be even more complex, with methods overriding the built-in functionality of the ``Page`` to achieve webdev magic. Or, you can keep your models simple and let Wagtail's built-in functionality do the work. +Now that we have a basic idea of how our content is defined, lets look at relationships between pieces of content. Introduction to Trees ---------------------- +~~~~~~~~~~~~~~~~~~~~~ If you're unfamiliar with trees as an abstract data type, you might want to `review the concepts involved. `_ @@ -105,6 +111,7 @@ Nodes and Leaves It might be handy to think of the ``Page``-derived models you want to create as being one of two node types: parents and leaves. Wagtail isn't prescriptive in this approach, but it's a good place to start if you're not experienced in structuring your own content types. + Nodes ````` Parent nodes on the Wagtail tree probably want to organize and display a browsable index of their descendents. A blog, for instance, needs a way to show a list of individual posts. @@ -125,6 +132,7 @@ A Parent node could provide its own function returning its descendant objects. This example makes sure to limit the returned objects to pieces of content which make sense, specifically ones which have been published through Wagtail's admin interface (``live=True``) and are descendants of this node. Wagtail will allow the "illogical" placement of child nodes under a parent, so it's necessary for a parent model to index only those children which make sense. + Leaves `````` Leaves are the pieces of content itself, a page which is consumable, and might just consist of a bunch of properties. A blog page leaf might have some body text and an image. A person page leaf might have a photo, a name, and an address. @@ -148,6 +156,7 @@ The model for the leaf could provide a function that traverses the tree in the o Since Wagtail doesn't limit what Page-derived classes can be assigned as parents and children, the reverse tree traversal needs to accommodate cases which might not be expected, such as the lack of a "logical" parent to a leaf. + Other Relationships ``````````````````` Your ``Page``-derived models might have other interrelationships which extend the basic Wagtail tree or depart from it entirely. You could provide functions to navigate between siblings, such as a "Next Post" link on a blog page (``post->post->post``). It might make sense for subtrees to interrelate, such as in a discussion forum (``forum->post->replies``) Skipping across the hierarchy might make sense, too, as all objects of a certain model class might interrelate regardless of their ancestors (``events = EventPage.objects.all``). Since there's no restriction on the combination of model classes that can be used at any point in the tree, and it's largely up to the models to define their interrelations, the possibilities are really endless. @@ -155,8 +164,16 @@ Your ``Page``-derived models might have other interrelationships which extend th Anatomy of a Wagtail Request ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -route() -> serve() -> render() -> template +For going beyond the basics of model definition and interrelation, it might help to know how Wagtail handles requests and constructs responses. In short, it goes something like: + + #. Django gets a request and routes through Wagtail's URL dispatcher definitions + #. Starting from the root content piece, Wagtail traverses the page tree, letting the model for each piece of content along the path decide how to ``route()`` the next step in the path. + #. A model class decides that routing is done and it's now time to ``serve()`` content. + #. The model constructs a context, finds a template to pass it to, and renders the content. + #. The templates are rendered and the response object is sent back to the requester. + +You can apply custom behavior to this process by overriding the ``route()`` and ``serve()`` methods of the ``Page`` class in your own models. Model Recipes @@ -339,9 +356,6 @@ Iterating through ``self.tags.all`` will display each tag associated with ``self This is just one possible way of creating a taxonomy for Wagtail objects. With all of the components for a taxonomy available through Wagtail, you should be able to fulfill even the most exotic taxonomic schemes. - - - Page Data Clusters with ParentalKey ----------------------------------- @@ -369,7 +383,9 @@ For each of your ``Page``-derived models, Wagtail will look for a template in th blog_index_page.html models.py -Class names are converted from camel case to underscores. For example, the template for model class ``BlogIndexPage`` would be assumed to be ``blog_index_page.html``. +Class names are converted from camel case to underscores. For example, the template for model class ``BlogIndexPage`` would be assumed to be ``blog_index_page.html``. For more information, see the Django documentation for the `application directories template loader`_. + +.. _application directories template loader: https://docs.djangoproject.com/en/dev/ref/templates/api/ Self From b0c069d44611e9213be1f60e403956d6dd683d35 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 19 May 2014 09:56:49 +0100 Subject: [PATCH 076/123] 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 077/123] 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 078/123] 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 079/123] 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 080/123] 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 081/123] 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 082/123] 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 083/123] 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 084/123] 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 73fa1000b138cfc9b0c8ca4527c392fa685e4f3f Mon Sep 17 00:00:00 2001 From: Jeffrey Hearn Date: Mon, 19 May 2014 21:14:45 -0400 Subject: [PATCH 085/123] editing api started --- docs/editing_api.rst | 119 +++++++++++++++++++++++++++++++++++++++++++ docs/index.rst | 2 +- docs/panels.rst | 36 ------------- 3 files changed, 120 insertions(+), 37 deletions(-) create mode 100644 docs/editing_api.rst delete mode 100644 docs/panels.rst diff --git a/docs/editing_api.rst b/docs/editing_api.rst new file mode 100644 index 000000000..99791c333 --- /dev/null +++ b/docs/editing_api.rst @@ -0,0 +1,119 @@ + +Wagtail Editing API +=================== + +Wagtail provides a highly-customizable editing interface consisting of several components: + + * **Fields** — built-in content types to augment the basic types provided by Django. + * **Field Widgets** — editing widgets which streamline data input + * **Panels** — containers which hold related field widgets + * **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. + +There is also an Edit Handler API for creating your own Wagtail editor components. + + +Fields +~~~~~~ + +Django's field types are automatically recognized and provided with an appropriate widget for input. + + +``RichTextField`` + + body = RichTextField() + +``Image`` + + feed_image = models.ForeignKey( + 'wagtailimages.Image', + null=True, + blank=True, + on_delete=models.SET_NULL, + related_name='+' + ) + +``Document`` + + link_document = models.ForeignKey( + 'wagtaildocs.Document', + null=True, + blank=True, + related_name='+' + ) + +``Page`` + + page = models.ForeignKey( + 'wagtailcore.Page', + related_name='adverts', + null=True, + blank=True + ) + +Can also use more specific models. + + +Snippets + +Snippets are not not subclasses, so you must include the model class directly. A chooser is provided which takes the snippet class. + + advert = models.ForeignKey( + 'demo.Advert', + related_name='+' + ) + + +Panels +~~~~~~ + + + + + + + + + + + +FieldPanel +~~~~~~~~~~ +Takes field_name, classname=None + + +MultiFieldPanel +~~~~~~~~~~~~~~~ +Condenses several ``FieldPanel``s under a single heading and classname. + + +InlinePanel +~~~~~~~~~~~ +Allows for creating/editing a modelcluster of related objects (carousel example). + + + +RichTextFieldPanel +~~~~~~~~~~~~~~~~~~ + + + + +PageChooserPanel +~~~~~~~~~~~~~~~~ + +ImageChooserPanel +~~~~~~~~~~~~~~~~~ + +DocumentChooserPanel +~~~~~~~~~~~~~~~~~~~~ + +SnippetChooserPanel +~~~~~~~~~~~~~~~~~~~ + +Edit Handler API +~~~~~~~~~~~~~~~~ + + + diff --git a/docs/index.rst b/docs/index.rst index defbe99cf..9717326d4 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -10,7 +10,7 @@ It supports Django 1.6.2+ on Python 2.6 and 2.7. Django 1.7 and Python 3 support gettingstarted building_your_site - panels + editing_api snippets wagtail_search advanced_topics diff --git a/docs/panels.rst b/docs/panels.rst deleted file mode 100644 index 47cd3e1a7..000000000 --- a/docs/panels.rst +++ /dev/null @@ -1,36 +0,0 @@ - -Panels & Edit Handlers -====================== - -RichTextField -~~~~~~~~~~~~~ - -Image -~~~~~ - -FieldPanel -~~~~~~~~~~ - -MultiFieldPanel -~~~~~~~~~~~~~~~ - -InlinePanel -~~~~~~~~~~~ - -PageChooserPanel -~~~~~~~~~~~~~~~~ - -ImageChooserPanel -~~~~~~~~~~~~~~~~~ - -DocumentChooserPanel -~~~~~~~~~~~~~~~~~~~~ - -SnippetChooserPanel -~~~~~~~~~~~~~~~~~~~ - -Custom Panels -~~~~~~~~~~~~~ - - - From eb704fc5a9ef2cf84a24c7535535ffcd1800ede8 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Tue, 20 May 2014 10:11:03 +0100 Subject: [PATCH 086/123] added scrollable form submissions tables --- .../static/wagtailadmin/scss/components/formatters.scss | 5 +++++ .../templates/wagtailforms/list_submissions.html | 2 ++ 2 files changed, 7 insertions(+) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss index 569821e10..bc2b02a8c 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss @@ -177,4 +177,9 @@ a.tag:hover{ /* make a block-level element inline */ .inline{ display:inline; +} + +/* utility class to allow things to be scrollable if their contents can't wrap more nicely */ +.overflow{ + overflow:auto; } \ No newline at end of file diff --git a/wagtail/wagtailforms/templates/wagtailforms/list_submissions.html b/wagtail/wagtailforms/templates/wagtailforms/list_submissions.html index 0ead37bde..38b4185c7 100644 --- a/wagtail/wagtailforms/templates/wagtailforms/list_submissions.html +++ b/wagtail/wagtailforms/templates/wagtailforms/list_submissions.html @@ -1,4 +1,5 @@ {% load i18n %} +
    • {% trans "Submission Date" %}{{ heading }}
    @@ -23,3 +24,4 @@ {% endfor %}
    +
    From 4111baf9331bd5aea92da6274a4d5fbae19f1502 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Tue, 20 May 2014 10:25:14 +0100 Subject: [PATCH 087/123] 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 7d88d285cd7891ffb43fa9a74b55755eaf7aa70b Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Tue, 20 May 2014 10:41:08 +0100 Subject: [PATCH 088/123] updated login styles to match new 'iconfield' implementation --- .../wagtailadmin/scss/layouts/login.scss | 38 ++++++++++--------- .../templates/wagtailadmin/login.html | 12 ++++-- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss index 4abf3ae20..3e158e51f 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss @@ -82,7 +82,7 @@ form{ .field{ padding:0; } - .field.icon:before{ + .iconfield:before{ display:none; } @@ -168,25 +168,29 @@ form{ font-size:4em; } - .field.icon:before{ - display:inline-block; - position: absolute; - color:$color-grey-4; - border: 2px solid $color-grey-4; - border-radius: 100%; - width: 1em; - padding: 0.3em; - left: $desktop-nice-padding; - margin-top: -1em; - top: 50%; - font-size:1.5em; - } - .full{ margin:0px (-$desktop-nice-padding); - input{ - padding-left:($desktop-nice-padding + 50px); + .iconfield{ + &:before{ + display:inline-block; + position: absolute; + color:$color-grey-4; + border: 2px solid $color-grey-4; + border-radius: 100%; + width: 1em; + padding: 0.3em; + left: $desktop-nice-padding; + margin-top: -1.1rem; + top: 50%; + font-size:1.3rem; + } + + input{ + padding-left:($desktop-nice-padding + 50px); + } } + + } } \ No newline at end of file diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/login.html b/wagtail/wagtailadmin/templates/wagtailadmin/login.html index 9cb28ed86..012dd32f8 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/login.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/login.html @@ -28,15 +28,19 @@