benjaoming
|
f4b1a3938a
|
Remove unused import Image
Don't see this used anywhere...!?
|
2015-02-06 21:28:34 -08:00 |
|
Dave Cranwell
|
53b854d4cc
|
name used instead of label
|
2015-02-06 17:37:01 +00:00 |
|
Dave Cranwell
|
c5ee808d15
|
Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
|
2015-02-06 17:34:45 +00:00 |
|
Dave Cranwell
|
4b22ede9d5
|
classes on fields now prefixed to avoid pollution
|
2015-02-06 17:34:43 +00:00 |
|
Matt Westcott
|
8f655cd74d
|
make WidgetWithScript explicitly fail in the absence of an ID attribute
|
2015-02-06 17:07:30 +00:00 |
|
Karl Hobley
|
9d9bfc1f08
|
Merge pull request #969 from kaedroho/warnings-fixes
Some warnings fixes
|
2015-02-06 17:06:10 +00:00 |
|
Karl Hobley
|
63c11ff1d1
|
Minor HTML fix
|
2015-02-06 16:50:32 +00:00 |
|
Karl Hobley
|
444328601f
|
Added EmbedBlock
|
2015-02-06 16:49:09 +00:00 |
|
Matt Westcott
|
f56d927be0
|
provide a render_html method on WidgetWithScript so that subclasses can override the HTML part of the rendering too
|
2015-02-06 16:40:51 +00:00 |
|
Dave Cranwell
|
7fd561554a
|
Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
|
2015-02-06 16:12:41 +00:00 |
|
Dave Cranwell
|
2ba563b04c
|
ongoing tweaks to allow text to have formatting
|
2015-02-06 16:12:39 +00:00 |
|
Matt Westcott
|
55c585d03e
|
Update *_chooser_panel.html templates so that they don't have to be passed an is_chosen flag
|
2015-02-06 16:09:28 +00:00 |
|
Karl Hobley
|
8103f5ff8b
|
Fixed block tests
|
2015-02-06 15:56:33 +00:00 |
|
Karl Hobley
|
5b470257e7
|
Put label back the way it was
|
2015-02-06 15:45:21 +00:00 |
|
Karl Hobley
|
570cdc560b
|
Fixed Meta classes on Python 2
|
2015-02-06 15:29:12 +00:00 |
|
Karl Hobley
|
2f0a438502
|
Added meta classes
|
2015-02-06 15:29:11 +00:00 |
|
Dave Cranwell
|
2cb8244810
|
Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
|
2015-02-06 15:14:56 +00:00 |
|
Dave Cranwell
|
185cf42f63
|
styling of fields according to design
|
2015-02-06 15:14:54 +00:00 |
|
Matt Westcott
|
932f532b80
|
Set choose_one_text, choose_another_text and clear_choice_text as overrideable properties on AdminChooser so that we don't have to do template inheritance gymnastics to pass them around
|
2015-02-06 14:43:54 +00:00 |
|
Karl Hobley
|
446a9868dc
|
Removed some stray code
|
2015-02-06 13:04:19 +00:00 |
|
Karl Hobley
|
18a4722b51
|
Tests for html_declarations
|
2015-02-06 12:59:01 +00:00 |
|
Matt Westcott
|
e8246f6c4b
|
introduce a common AdminChooser superclass for all our Admin*Choosers
|
2015-02-06 12:54:09 +00:00 |
|
Matt Westcott
|
e3216fad45
|
now the only call to render_as_field with any parameters whatsoever is where BasePageChooserPanel.render_as_field calls super - so only BaseChooserPanel.render_as_field needs to retain those parameters, and only extra_context
|
2015-02-06 12:21:41 +00:00 |
|
Matt Westcott
|
61bd2511a8
|
Don't bother to pass show_help_text to templates, because no templates ever use it. This means that the show_help_text parameter to render_as_field now has no effect, so we can safely remove it from the one call that uses it
|
2015-02-06 12:15:34 +00:00 |
|
Karl Hobley
|
50e4cdf8b8
|
Replaced SortedDict with OrderedDict
|
2015-02-06 10:44:25 +00:00 |
|
Karl Hobley
|
d0b0d57ca5
|
Ignore PendingDeprecationWarnings
|
2015-02-06 10:44:25 +00:00 |
|
Karl Hobley
|
9cf1a81034
|
Fixed another reference to django.db.get_models
|
2015-02-06 10:28:07 +00:00 |
|
Karl Hobley
|
354a5aaa80
|
Removed reference to django.db.get_models
in resolve_model_string
|
2015-02-06 10:25:42 +00:00 |
|
Karl Hobley
|
cf0e17d94c
|
Added tests for resolve_model_string
To make sure I don't change its behaviour in the next commit
|
2015-02-06 10:22:38 +00:00 |
|
Dave Cranwell
|
a5edb0ce0f
|
tweak to zindex of autocomplete widget
|
2015-02-06 10:03:49 +00:00 |
|
Dave Cranwell
|
98a99b0fe7
|
ongoing layout tweaks
|
2015-02-06 09:58:36 +00:00 |
|
Karl Hobley
|
43641192c2
|
Fixed a couple of references to django.forms.util
|
2015-02-06 09:57:42 +00:00 |
|
Matt Westcott
|
24fa2d5d0c
|
PageChooserBlock WIP: refactor FieldBlock so that the field object can be constructed lazily
|
2015-02-06 09:47:50 +00:00 |
|
Dave Cranwell
|
c0f74d5a5f
|
accidentally discovered a nifty transition effect
|
2015-02-05 17:44:50 +00:00 |
|
Dave Cranwell
|
0938e8c281
|
tweaks to how stream menus show/hide
|
2015-02-05 17:10:27 +00:00 |
|
Dave Cranwell
|
6babbe37f2
|
Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
|
2015-02-05 16:49:51 +00:00 |
|
Dave Cranwell
|
35e9bfc2ce
|
ongoing stream menu work
|
2015-02-05 16:49:49 +00:00 |
|
Matt Westcott
|
91dd196a24
|
Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
|
2015-02-05 16:34:00 +00:00 |
|
Matt Westcott
|
e223cac658
|
call expand_db_html in the native rendering of RichTextBlock
|
2015-02-05 16:33:52 +00:00 |
|
Karl Hobley
|
0cff753544
|
Blocks tests tweaks
|
2015-02-05 16:26:39 +00:00 |
|
Matt Westcott
|
f3a66d34af
|
implement RichTextBlock, and ensure that script tags embedded in html_declarations bodies are properly escaped
|
2015-02-05 16:23:31 +00:00 |
|
Karl Hobley
|
863cffeb36
|
Tests for StreamBlock
|
2015-02-05 16:04:29 +00:00 |
|
Dave Cranwell
|
144a130e44
|
stream menu should use label for the button it creates
|
2015-02-05 15:53:53 +00:00 |
|
Dave Cranwell
|
151a8da6d9
|
Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
|
2015-02-05 15:42:54 +00:00 |
|
Dave Cranwell
|
f04c407ffb
|
add suitable icons to wagtail's own icon set and allowing user to define icon for each streamfield block
|
2015-02-05 15:42:52 +00:00 |
|
Karl Hobley
|
161aa50a9e
|
Test tweaks
|
2015-02-05 15:33:42 +00:00 |
|
Matt Westcott
|
959feec13a
|
Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
|
2015-02-05 15:02:42 +00:00 |
|
Matt Westcott
|
2ad0366fa0
|
make the base Block.render template-aware, so that any subclass can define a 'template' property to override the default rendering (which is now provided by block.render_basic())
|
2015-02-05 15:00:56 +00:00 |
|
Karl Hobley
|
c115addf1a
|
Added tests for ListBlock
|
2015-02-05 13:09:50 +00:00 |
|
Matt Westcott
|
3f82c1bc0b
|
Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield
|
2015-02-05 12:31:34 +00:00 |
|