Matt Westcott
42940e6e4b
implement RawHTMLBlock
2015-02-13 17:17:05 +00:00
Matt Westcott
047ff734ca
Implement equality operator on blocks
...
This prevents the migration autodetector from creating bogus AlterField operations when it encounters block objects that are different instances but functionally equivalent.
2015-02-13 16:49:04 +00:00
Matt Westcott
38b2977e9f
Cast 'order' field to int so that it works with >10 items
2015-02-13 13:50:35 +00:00
Matt Westcott
47f2cb57dd
Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
2015-02-13 13:33:22 +00:00
Matt Westcott
8b81a1675f
Allow StreamField to be passed a block instance or class instead of a list
2015-02-13 13:33:07 +00:00
Dave Cranwell
cca2663a80
tweak to which class causes full-width alignment
2015-02-13 12:29:26 +00:00
Matt Westcott
d5f3d2d12b
implement required=False on ChooserBlocks
2015-02-13 12:01:47 +00:00
Matt Westcott
d641dcb737
Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
2015-02-13 10:45:29 +00:00
Matt Westcott
733378483f
fix classname output on FieldBlock
2015-02-13 10:45:17 +00:00
Dave Cranwell
8d6b9c2ed2
Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
2015-02-13 10:38:54 +00:00
Dave Cranwell
52bda6bedf
new icons added to icon set
2015-02-13 10:38:40 +00:00
Matt Westcott
0d2200222d
silently skip unrecognised block types in StreamBlock values
2015-02-13 10:27:18 +00:00
Matt Westcott
89a54efa66
Fix tests to not pass a field arg to FieldBlock
2015-02-12 20:47:40 +00:00
Matt Westcott
e1d39aa19f
remove obsolete TextInputBlock
2015-02-12 17:35:32 +00:00
Matt Westcott
6912d5398c
support required, help_text, max_length, min_length params on CharBlock
2015-02-12 17:32:33 +00:00
Matt Westcott
1bfac754c4
Drop 'field' param from FieldBlock - always use subclassing instead
2015-02-12 17:23:16 +00:00
Matt Westcott
386a1a138c
fix test_render_form_labels
2015-02-12 16:40:58 +00:00
Matt Westcott
8fd3d78e57
Capitalize name nicely when using it as a fallback label.
...
This stops Multiple_words_with_underscores from creeping into the output, and eliminates the need for CSS text-transforms that Capitalize Every Word Like This.
2015-02-12 16:20:47 +00:00
Matt Westcott
9271e8f2a4
Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
...
Conflicts:
wagtail/wagtailadmin/templates/wagtailadmin/block_forms/field.html
2015-02-12 15:52:39 +00:00
Matt Westcott
23ef2e810b
implement render_with_errors on BlockWidget
2015-02-12 15:51:20 +00:00
Dave Cranwell
dfa18ba131
addressing hallo toolbar appearing in wrong place
2015-02-12 15:39:06 +00:00
Dave Cranwell
a8f4c3296d
labels for streamfield fields don't seem to get capitalized like normal django field labels
2015-02-12 15:24:43 +00:00
Matt Westcott
cdcd0fa8c6
refactor render_form to take an ErrorList rather than a single 'error' param
2015-02-12 15:24:11 +00:00
Dave Cranwell
383bf1e384
tweaks to how specific types of field are rendered
2015-02-12 15:19:00 +00:00
Matt Westcott
31966eab4f
Add template filters to support widgets that implement render_with_errors
2015-02-12 14:07:02 +00:00
Matt Westcott
b912655298
Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
2015-02-12 12:31:49 +00:00
Matt Westcott
246068faa6
Hook up clean() method to BlockField
...
(actual error reporting is a bit rubbish at the moment though)
2015-02-11 17:43:59 +00:00
Dave Cranwell
ac25b027cf
ongoing fighting with list elements
2015-02-11 17:01:40 +00:00
Matt Westcott
be67d70112
Introduce a BlockField form field type for use with the StreamField model field.
...
This uses BlockWidget by default, so we no longer need widget_overrides in the StreamFieldPanel edit handler.
2015-02-11 16:31:03 +00:00
Dave Cranwell
bba8b2cb36
tweak to position of delete button
2015-02-11 16:19:34 +00:00
Matt Westcott
f7e6fcc7b5
move wagtailadmin.widgets.StreamWidget to wagtailadmin.blocks.BlockWidget
...
This keeps all block-API related code in one module, and reflects the fact that BlockWidget is not inherently tied to StreamBlock in particular.
2015-02-11 16:04:14 +00:00
Dave Cranwell
cfd9509b71
Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
2015-02-11 14:10:48 +00:00
Dave Cranwell
659ac2c523
tweak to menu toggle
2015-02-11 14:10:46 +00:00
Matt Westcott
194535120a
New ListBlocks should consist of one empty item by default
2015-02-11 13:38:23 +00:00
Matt Westcott
4603701a59
Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
2015-02-11 13:30:37 +00:00
Matt Westcott
bfefcf3bb1
treat empty string as an empty value on StreamField too
2015-02-11 13:30:26 +00:00
Dave Cranwell
f06e2450ce
Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
2015-02-11 12:52:31 +00:00
Dave Cranwell
450653355b
tweaks to aid keyboard nav
2015-02-11 12:52:29 +00:00
Matt Westcott
85902d111d
implement SnippetChooserBlock
2015-02-11 12:39:44 +00:00
Matt Westcott
dfb2a999f4
Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
2015-02-11 12:20:38 +00:00
Matt Westcott
76b0964c94
add DocumentChooserBlock
2015-02-11 12:20:32 +00:00
Dave Cranwell
b6436f71b8
Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
2015-02-11 11:57:52 +00:00
Dave Cranwell
7a5c77702f
improved way of specifying text styles for individual blocks or fields within blocks
2015-02-11 11:57:50 +00:00
Matt Westcott
628b7947dc
implement ImageChooserBlock
2015-02-11 11:56:43 +00:00
Matt Westcott
887954ec31
Merge branch 'streamfield-chooser-wip' into feature/streamfield
2015-02-11 10:34:35 +00:00
Matt Westcott
e01167ff1f
pull re-usable methods of PageChooserBlock into an abstract superclass
2015-02-11 10:34:11 +00:00
Dave Cranwell
d0bbd644bf
Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
2015-02-11 10:31:43 +00:00
Dave Cranwell
dc6b06e585
tweaks to make menu toggle work cleaner
2015-02-11 10:31:40 +00:00
Matt Westcott
d11205454b
fix PageChooserBlock to return a page object rather than an ID.
...
AdminPageChooser has been tweaked to accept either an ID or an instance as its input value, and FieldBlock now passes the result of value_from_datadict through to_python to deal with the case where the widget doesn't return our expected type.
2015-02-11 01:21:24 +00:00
Matt Westcott
34bd4bd974
first pass at to_python and get_prep_value on PageChooserBlock
2015-02-10 23:29:20 +00:00