Commit graph

1190 commits

Author SHA1 Message Date
Dave Cranwell
ca8d38b4ab refactored how classes are applied by edit handlers. replaced inconsistent name 'classes' on settings tab. misc tweaks to improve layout. Merged FieldRowPanel concept from davecranwell#327 2014-06-20 12:05:58 +01:00
Dave Cranwell
2c50a49ef6 further tweaks to prevent scrolling of date inputs 2014-06-20 10:34:27 +01:00
Dave Cranwell
91fe81bb9b addressing issue where toolbar was in wrong place. hallo-wagtail-toolbar appeared to override the version provided by hallo, yet removed the one feature from the original version that was essential. 2014-06-20 10:11:10 +01:00
Dave Cranwell
73e7ca0098 removed include of hallo-wagtail-toolbar.js, which only appeared to be broken and was almost identical to the core version 2014-06-19 17:52:36 +01:00
Dave Cranwell
269dfe62f5 refactoring how/where fields get their classes added 2014-06-19 16:58:48 +01:00
Dave Cranwell
62fc679720 further tweaks to colours and form layout 2014-06-19 13:47:09 +01:00
Dave Cranwell
d1b321f859 made red more distinct from salmon 2014-06-19 13:33:48 +01:00
Dave Cranwell
6a33834d29 ongoing styling of tabs an publishing fields, inc introduction of salmon colour 2014-06-19 13:30:39 +01:00
Dave Cranwell
59e161ad9d updates to edit page 2014-06-19 12:25:53 +01:00
Karl Hobley
6c54fc55d1 Merge remote-tracking branch 'torchbox/master' into scheduled-publishing
Conflicts:
	wagtail/wagtailadmin/edit_handlers.py
	wagtail/wagtailadmin/views/pages.py
	wagtail/wagtailcore/models.py
	wagtail/wagtailcore/tests.py
2014-06-19 11:07:36 +01:00
Karl Hobley
9a1da28c38 Changelog entries for #236, #286 and #315 2014-06-18 17:22:46 +01:00
Tom Dyson
e40dea8d28 wagtail -> Wagtail in contributing.rst 2014-06-18 17:17:14 +01:00
Karl Hobley
f53ebfd7a9 Merge pull request #236 from davecranwell/feature/styleguide
Addition of a styleguide, for logged in users only and not publicly linked.
2014-06-18 17:04:44 +01:00
Dave Cranwell
f6eefb02b1 merge conflict resolved 2014-06-18 16:56:05 +01:00
Dave Cranwell
d34c504ba3 Merge pull request #286 from kaedroho/new-datetime-picker
New datetime picker
2014-06-18 16:53:24 +01:00
Dave Cranwell
c14ce44503 Merge pull request #315 from davecranwell/feature/minor-preview-improvement
Aesthetic improvements to preview experience.
2014-06-18 16:53:11 +01:00
Karl Hobley
3577e61880 Raise exception if userbar views are accessed by anonymous user 2014-06-18 15:58:22 +01:00
Karl Hobley
9c0f4212e3 Only allow logged in users to access the userbar views 2014-06-18 15:49:02 +01:00
Dave Cranwell
ace28dd602 move preview css to scss file 2014-06-18 11:26:11 +01:00
Dave Cranwell
01df448796 Merge branch 'master' into feature/minor-preview-improvement 2014-06-18 11:06:12 +01:00
Matt Westcott
8f9298f2b4 Changelog / contributors entry for #243 2014-06-17 22:03:11 +01:00
Matt Westcott
86aa13f066 Merge branch 'master' of github.com:torchbox/wagtail 2014-06-17 21:57:41 +01:00
Matt Westcott
9071a8e004 Tweak subpage_types logic so that subpage_types=None (or undefined) means 'no restriction on subpages', freeing up [] to mean 'no subpages allowed' 2014-06-17 21:48:48 +01:00
Matt Westcott
8d3ac405c4 Deprecate get_leaf_page_content_type_ids and get_navigable_page_content_type_ids, as they have incorrect semantics for page subclasses that don't define subpage_types. Replace them with a naive implementation that doesn't require metaclass hacks 2014-06-17 21:27:26 +01:00
Matt Westcott
a2254148e9 Remove subpage_types logic from is_navigable and get_navigation_menu_items. It's now clear that we will never mandate the use of subpage_types, so we can't use its presence or absence as an indicator of whether or not a page is appropriate to be included in navigation menus. 2014-06-17 20:40:55 +01:00
Dave Cranwell
68da7f0c2c corrected commit ref to kaedroho@5dc7a220f8799a7c6871b119724f7e07cb54f4fb 2014-06-17 17:39:48 +01:00
Dave Cranwell
553e7062b6 added FieldRowPanel from @kaedroho 5dc7a220f8799a7c6871b119724f7e07cb54f4fb 2014-06-17 17:37:28 +01:00
Dave Cranwell
fb9a876e92 moved set_page_edit_hanlder to edit_handlders.py. Still not happy it's invoked the right way though 2014-06-17 17:20:22 +01:00
Dave Cranwell
b95d6a0fab removed partial work from other branch 2014-06-17 16:58:12 +01:00
Dave Cranwell
9efb6a38d7 styling for scenario where tabs run onto multiple lines 2014-06-17 16:37:22 +01:00
Matt Westcott
f2b5e30de4 Merge pull request #321 from kaedroho/issue-320
Set treebeard attributes in preview on create view. Fixes #320
2014-06-17 16:35:46 +01:00
Dave Cranwell
4788144c86 first bash at customisable tabs like in PR #210 2014-06-17 15:09:10 +01:00
Matt Westcott
5987f2843a remove redundant imports from wagtailcore/models.py 2014-06-17 14:56:44 +01:00
Matt Westcott
f56179f8ba Merge branch 'business-rules' of https://github.com/lojack/wagtail into lojack-business-rules
Conflicts:
	wagtail/tests/models.py
	wagtail/wagtailadmin/tests.py
2014-06-17 14:45:25 +01:00
Dave Cranwell
53cfd94484 Merge remote-tracking branch 'upstream/master' into feature/styleguide 2014-06-17 09:51:11 +01:00
Karl Hobley
7bb37d4efb Cleaned up wagtailembeds/tests.py imports 2014-06-17 09:49:57 +01:00
Dave Cranwell
0f6b6784dc fixing incorrect test import 2014-06-17 09:45:42 +01:00
Dave Cranwell
b638cc01e9 Merge branch 'master' into feature/styleguide 2014-06-17 09:36:21 +01:00
Dave Cranwell
7184d6f6d2 font tweaks 2014-06-16 17:28:42 +01:00
Dave Cranwell
2bd1e0076b tweaks to font metrics 2014-06-16 17:10:26 +01:00
Dave Cranwell
506d977950 typo in comment 2014-06-16 15:32:32 +01:00
Karl Hobley
4136bb5053 Added tests for db6bb92 2014-06-16 15:15:38 +01:00
Karl Hobley
db6bb920fb Set treebeard attributes in preview on create view. Fixes #320 2014-06-16 14:57:33 +01:00
Dave Cranwell
7f72bdd917 Merge remote-tracking branch 'upstream/master' into feature/better-modals 2014-06-16 13:19:45 +01:00
Dave Cranwell
bd0a18dc13 tidied image chooser.js 2014-06-16 13:18:27 +01:00
Dave Cranwell
ba15fbead1 added better comments. tweaked when modal is shown 2014-06-16 13:06:02 +01:00
Dave Cranwell
b5dc5a9516 tweaks to make modals fade better 2014-06-16 12:59:43 +01:00
Karl Hobley
5bfa8d6b07 Merge pull request #291 from kaedroho/issue-25
Made login view redirect already logged in users to dashboard.
2014-06-16 12:10:17 +01:00
Karl Hobley
ee222a387b Merge remote-tracking branch 'torchbox/master' into issue-25
Conflicts:
	runtests.py
2014-06-16 10:40:31 +01:00
Karl Hobley
614cd6d028 Merge pull request #281 from kaedroho/tests-changes
Tests changes
2014-06-16 10:38:52 +01:00