Dave Cranwell
171631c38d
moved streamfield styles to own component and styled to accomodate several common permutations of blocks within blocks, accounting for help text
2015-06-16 13:09:33 +01:00
Matt Westcott
8bd6d65a20
Support overriding form classname and template within StructBlock
2015-06-16 13:09:33 +01:00
Matt Westcott
7c8f14e545
Render help text for structblocks
2015-06-16 13:09:33 +01:00
Matt Westcott
8ee2529bc1
only direct children of streamfield should be made full-width/borderless
2015-06-16 13:09:33 +01:00
Matt Westcott
0d5d50cd12
Make container blocks responsible for rendering the labels of their children
2015-06-16 13:09:32 +01:00
Matt Westcott
5f2574e166
render StructBlock form with a template
2015-06-16 13:09:32 +01:00
Matt Westcott
6226a2bacd
Output human-readable label in the header of a streamfield child block
2015-06-16 13:09:32 +01:00
Matt Westcott
4e64a5f3b9
Introduce id_for_label method on Block
2015-06-16 13:09:32 +01:00
Matt Westcott
f55b7210ca
implement help_text on chooser blocks
2015-06-16 13:08:18 +01:00
Dave Cranwell
3afe8f4f71
translated labels
2015-06-16 13:08:18 +01:00
Dave Cranwell
6f03795e0f
tweaks to streamfield controls
2015-06-16 13:08:18 +01:00
Dave Cranwell
478682051c
tweaks to when labels are output
2015-06-16 13:08:18 +01:00
Dave Cranwell
75f45cc843
first pass of styling
2015-06-16 13:08:17 +01:00
Matt Westcott
6b3ddde533
Use correct template tags for {{ self.intro }}
...
Fixes #1404
2015-06-15 18:42:34 +01:00
Matt Westcott
7e89a8e4a2
changelog entry for #1406
2015-06-15 16:26:08 +01:00
Matt Westcott
183f654472
Merge pull request #1406 from kaedroho/issue-1403
...
Make sure with_metaclass always comes from Django
2015-06-15 16:16:05 +01:00
Karl Hobley
43d3053232
Make sure with_metaclass always comes from Django
...
Fixes #1403
Fixes #1402
2015-06-15 13:26:38 +01:00
Matt Westcott
0d5cd61b01
Merge pull request #1405 from kaedroho/user-without-username-search
...
Fix search on user without username
2015-06-15 09:47:50 +01:00
Karl Hobley
5538b73e9e
Changelog/release note for #1388
2015-06-15 09:20:20 +01:00
Karl Hobley
0e91aa46fd
Merge pull request #1388 from takeflight/feature/no-username
...
Add support for user models with no username
2015-06-13 13:21:25 +01:00
Karl Hobley
3be8091cbe
Merge pull request #1386 from gasman/fix/streamfield-richtext-migration
...
Support for migrating an existing RichTextField to StreamField
2015-06-13 13:20:55 +01:00
Matt Westcott
1cf7457337
Add tests for raw_text and assignment on StreamField
2015-06-12 20:47:27 +01:00
Matt Westcott
fddeb4308b
Documentation for migrating a RichTextField to StreamField
2015-06-12 20:33:19 +01:00
Matt Westcott
31f45a8a63
Add a mechanism for preserving the raw text value of StreamFields when they fail to parse as JSON
2015-06-12 20:33:19 +01:00
Karl Hobley
6479eb80ef
Merge pull request #1395 from gasman/feature/streamfield-system-check
...
Add system check to reject invalid block names in StreamField
2015-06-12 15:26:45 +01:00
Karl Hobley
36c124475c
Changelog/release note for #1400
2015-06-12 15:25:18 +01:00
Karl Hobley
3738a7d678
Merge pull request #1400 from gasman/fix/underscores-in-slugs
...
don't strip out underscores from page slugs
2015-06-12 15:20:51 +01:00
Matt Westcott
1a78b19131
don't strip out underscores from page slugs
2015-06-12 14:44:55 +01:00
Matt Westcott
ac37c7645b
assert that system check errors on blocks return the appropriate field or block
2015-06-12 11:34:09 +01:00
Matt Westcott
dae1cf85e4
+ whitespace
2015-06-11 13:53:41 +01:00
Matt Westcott
f35536ccee
stop InvalidStreamModel from polluting the overall model registry
2015-06-11 13:17:04 +01:00
Matt Westcott
0143787fab
Add system check to reject invalid block names in StreamField - fixes #1154
2015-06-10 17:21:17 +01:00
Matt Westcott
c3c92ebb10
Release note for #1381
2015-06-10 13:43:03 +01:00
Matt Westcott
d8c0592feb
Merge branch 'kaedroho-issue-1324'
2015-06-10 10:15:47 +01:00
Matt Westcott
b456c1fc8a
Merge branch 'issue-1324' of https://github.com/kaedroho/wagtail into kaedroho-issue-1324
2015-06-10 10:14:58 +01:00
Karl Hobley
da9858fc39
Merge pull request #1390 from kaedroho/template-fixes
...
Template fixes
2015-06-09 16:25:07 +01:00
Karl Hobley
c19e35b2d0
Fixed position of quote character
2015-06-09 15:51:07 +01:00
Karl Hobley
3da4d3a17e
Escaped template comments
2015-06-09 15:49:49 +01:00
Karl Hobley
3dd09899ff
Fixed import of compress
2015-06-09 15:46:40 +01:00
Karl Hobley
4a1cdae788
Fix search on user without username
2015-06-09 14:26:08 +01:00
Tim Heap
2a5535e5da
Add support for user models with no username
...
The User forms were the only known sections to fail when using a swapped
User model that did not have a `username` field, using an `email` field
instead for example.
This commit makes the User forms work with `User.USERNAME_FIELD` instead
of hardcoding `"username"`.
Truly strange user models are not yet supported.
The tests do not test this custom user functionality yet, as this is
quite difficult to do. Lots of code does not support dynamically
changing the `AUTH_USER_MODEL` setting for the tests, so only one custom
user model for most of the tests.
Fixes #1345
See #1380
2015-06-09 15:41:50 +10:00
Karl Hobley
4c51d97ae5
Catch all embed exceptions in frontend code
2015-06-06 11:05:58 +01:00
Karl Hobley
0dc4cbcf21
get_embed never returns None
2015-06-06 11:05:58 +01:00
Karl Hobley
00d558c9be
Catch EmbedNotFoundExeception fixes #1324
2015-06-06 11:05:58 +01:00
Karl Hobley
225f54ad6c
Tidy up
...
- Removed catch all blocks
- get_embed never returns None so removed check for that
2015-06-06 11:05:58 +01:00
Karl Hobley
3737e026bc
Failing tests for #1324
2015-06-06 11:05:58 +01:00
Karl Hobley
127dd6cc8e
Tidied embed rich text handler tests
2015-06-06 11:05:58 +01:00
Karl Hobley
9b376e4588
Tidied up embed filter tests
...
Less complicated and a bit more isolated now
2015-06-06 11:05:58 +01:00
Matt Westcott
b0df37d851
Merge pull request #1382 from gasman/cleanup/singlefieldpanel-labels
...
Cleanup - render labels within ObjectList <h2>s
2015-06-05 22:03:47 +01:00
Karl Hobley
2411e75bdd
Pulled new translations from Transifex
2015-06-05 17:10:57 +01:00