Commit graph

3068 commits

Author SHA1 Message Date
Matt Westcott
c99bada915 rename RenderableStructBlock to StructValue for consistency with StreamValue, and to indicate that it's the core value type handled by StreamBlock, not just a special case for rendering 2015-01-20 10:59:09 +00:00
Matt Westcott
f6d504032b define HeadingBlock to demonstrate the principle of providing renderings for non-smart values 2015-01-20 00:32:24 +00:00
Matt Westcott
5698a0368a reshuffle rendering to go through the block's 'render' method (where subclasses can override it, and non-smart values can be given renderings too) 2015-01-19 23:04:50 +00:00
Matt Westcott
3aaebe3b6d give StreamValue a native HTML rendering 2015-01-16 21:35:06 +00:00
Matt Westcott
160f38bbbb Merge branch 'feature/streamfield' into feature/streamfield-frontend 2015-01-16 14:56:03 +00:00
Matt Westcott
b734f009e2 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
Conflicts:
	wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel_child.html
2015-01-16 14:55:37 +00:00
Matt Westcott
d536fc8315 Merge branch 'master' of github.com:torchbox/wagtail into feature/streamfield
Conflicts:
	wagtail/wagtailadmin/templates/wagtailadmin/shared/field.html
2015-01-16 14:51:09 +00:00
Matt Westcott
440e9a850b Refactor StreamField and the rest of the blocks API to explicitly distinguish between the renderable values that we work with, and their json-serialisable form 2015-01-16 14:01:17 +00:00
Dave Cranwell
a6bab4e649 preliminary styling of streamblock fields 2015-01-15 15:00:21 +00:00
Karl Hobley
fd247e69cd Changelog/release notes for #854 2015-01-15 13:59:54 +00:00
Karl Hobley
c9d4e42b63 Added @jerel to contributors 2015-01-15 13:57:43 +00:00
Karl Hobley
cc0d982bbb Added test for #854 2015-01-15 13:56:37 +00:00
Jerel Unruh
347158cb41 Fixed a bug that prevented sitemap url generation override in a Page subclass
If a developer wants to turn off urls for a specific page as documented in http://docs.wagtail.io/en/latest/contrib_components/sitemap_generation.html#customising they should be able to add:

    def get_sitemap_urls(self):
        return []

but get_urls() calls only the parent class rather than the specific child class. This bug is also mentioned in issue #833
2015-01-15 13:47:14 +00:00
Karl Hobley
d751e76298 get_willow_image now raises SourceImageIOError
... when the source image cannot be found in the filesystem
2015-01-15 11:34:22 +00:00
Karl Hobley
aa9e6ce7bf Merge pull request #777 from kaedroho/willow
Added Willow support
2015-01-15 11:03:32 +00:00
Karl Hobley
f1ebd96c1d Added get_willow_image method to Image 2015-01-15 10:46:37 +00:00
Karl Hobley
4a804967d9 Added Willow to install requirements 2015-01-15 10:46:01 +00:00
Matt Westcott
d43b2057c5 Merge branch 'janrito-fieldpanel-custom-widgets' 2015-01-14 22:06:47 +00:00
Matt Westcott
d73e618e83 docs and release note for #880 2015-01-14 22:06:38 +00:00
Matt Westcott
b4e1791c16 Merge branch 'fieldpanel-custom-widgets' of https://github.com/janrito/wagtail into janrito-fieldpanel-custom-widgets 2015-01-14 21:02:33 +00:00
Matt Westcott
3694756e4e try to implement to_python and get_prep_value; run into awkward discrepancies between renderable and JSON-ish values 2015-01-14 20:55:25 +00:00
Matt Westcott
e1cf9f9196 Add StreamField as a model field type, and implement 'deconstruct' for migration support 2015-01-14 15:41:05 +00:00
Dave Cranwell
1ace03b4ff Merge pull request #904 from coredumperror/page_type_on_editor
Add the page type to the page creator/editor template
2015-01-14 09:28:48 +00:00
Robert Rollins
fb49cd68e3 Add 'model-' prefix to body class. 2015-01-13 10:00:11 -08:00
Matt Westcott
3386ee53e6 replace FieldBlock rendering with a template-based version that tries to replicate our standard form field markup 2015-01-13 14:55:55 +00:00
Robert Rollins
1714f33310 Moved classname from form to body. 2015-01-12 16:05:56 -08:00
Robert Rollins
98f74fcb5a Added class name and UI elements to identify page type while editing. 2015-01-12 15:52:25 -08:00
Matt Westcott
622762f0e2 field.field_classnames and field.input_classnames are never defined (they were removed from python code in ca8d38b4ab) 2015-01-12 20:25:43 +00:00
Dave Cranwell
db03fd8e90 making missed strings translatable 2015-01-09 17:09:15 +00:00
Dave Cranwell
a076ec6cd0 resovling test error 2015-01-09 16:52:42 +00:00
Dave Cranwell
9fe6f04d7b fixed failing test. added more meta information to images and documents 2015-01-09 16:42:20 +00:00
Dave Cranwell
9d7b26a5d4 added link to file for images and documents. also updated styling to file fields, which had become lost in previous field template refactoring. 2015-01-09 15:55:13 +00:00
Matt Westcott
c1a350c374 implement value_from_datadict and thus make saving work 2015-01-09 12:40:35 +00:00
Matt Westcott
006e4709d1 hook up JS initializer code 2015-01-09 12:10:08 +00:00
Matt Westcott
db94ab5756 add a mechanism for edit_handlers to output html declarations, and use that to output the html declarations for StreamField 2015-01-09 11:34:23 +00:00
Matt Westcott
5e70be7ad3 add block JS includes, and media declaration for StreamWidget 2015-01-09 11:19:08 +00:00
Matt Westcott
63be58835f import blocks stuff from https://github.com/gasman/wagtailstreamfield and update StreamWidget to render them 2015-01-09 11:18:39 +00:00
Dave Cranwell
2aa411c041 updated fonts, which had somehow become half quality 2015-01-09 11:09:29 +00:00
Dave Cranwell
551bdcf8ca font smoothing added where it was missing 2015-01-09 10:15:56 +00:00
Dave Cranwell
6e166e03f5 better syntax highlighting 2015-01-08 17:29:24 +00:00
Dave Cranwell
6a36ed7f7e added title tags to inline panel icon-only buttons 2015-01-08 17:28:35 +00:00
Dave Cranwell
101fd1c044 auto-focus on first field in visible content 2015-01-08 17:12:07 +00:00
Dave Cranwell
6ed3303ad0 removed border from images, which conflicted with all other images from external django apps #502 2015-01-08 17:00:34 +00:00
Matt Westcott
59bf2b2ba5 specify a custom widget for StreamFieldPanel (that currently doesn't do very much) 2015-01-07 16:54:04 +00:00
Matt Westcott
d1e36651af define StreamFieldPanel as an edit panel type (that doesn't do anything for now) 2015-01-07 15:47:05 +00:00
Matt Westcott
1fb1db98e3 no longer need South introspection rule for RichTextField 2015-01-07 13:33:39 +00:00
Matt Westcott
2c50f07136 add py34-dj17-sqlite to travis tests 2015-01-06 15:38:32 +00:00
Matt Westcott
50a3eb64f0 Clean up image records created in test_duplicate_filters; we can't rely on the usual transaction logic to do this when using multiple threads. Fixes #892 2015-01-06 15:36:58 +00:00
Matt Westcott
09663a6653 Django 1.7.2 has an apparent regression that breaks django-taggit with sqlite https://github.com/alex/django-taggit/issues/285 - pin sqlite tox tests to 1.7.1 for now 2015-01-06 14:48:49 +00:00
Matt Westcott
af8fee8efa Merge branch 'kaedroho-remove-dj16' 2015-01-06 11:24:27 +00:00