From 062d05189b32aa1a2e54cacd6b4371ea6a519681 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 17 Nov 2017 10:44:34 +0000 Subject: [PATCH] Rename wagtail.wagtailadmin to wagtail.admin Conflicts: docs/advanced_topics/customisation/admin_templates.rst docs/advanced_topics/customisation/page_editing_interface.rst docs/advanced_topics/i18n/duplicate_tree.rst docs/advanced_topics/jinja2.rst docs/advanced_topics/settings.rst docs/getting_started/integrating_into_django.rst docs/getting_started/tutorial.rst docs/reference/hooks.rst docs/reference/pages/panels.rst docs/topics/pages.rst docs/topics/streamfield.rst wagtail/admin/blocks.py wagtail/admin/checks.py wagtail/admin/edit_handlers.py wagtail/admin/forms.py wagtail/admin/rich_text.py wagtail/admin/search.py wagtail/admin/site_summary.py wagtail/admin/templatetags/wagtailadmin_tags.py wagtail/admin/tests/test_admin_search.py wagtail/admin/tests/test_buttons_hooks.py wagtail/admin/tests/test_compare.py wagtail/admin/tests/test_edit_handlers.py wagtail/admin/tests/test_page_chooser.py wagtail/admin/tests/test_pages_views.py wagtail/admin/tests/test_rich_text.py wagtail/admin/tests/test_widgets.py wagtail/admin/tests/tests.py wagtail/admin/urls/__init__.py wagtail/admin/views/account.py wagtail/admin/views/chooser.py wagtail/admin/views/collection_privacy.py wagtail/admin/views/collections.py wagtail/admin/views/home.py wagtail/admin/views/page_privacy.py wagtail/admin/viewsets/model.py wagtail/admin/wagtail_hooks.py wagtail/admin/widgets.py wagtail/contrib/settings/registry.py wagtail/contrib/wagtailsearchpromotions/wagtail_hooks.py wagtail/contrib/wagtailstyleguide/wagtail_hooks.py wagtail/project_template/project_name/settings/base.py wagtail/project_template/project_name/urls.py wagtail/tests/non_root_urls.py wagtail/tests/settings.py wagtail/tests/snippets/models.py wagtail/tests/testapp/models.py wagtail/tests/testapp/wagtail_hooks.py wagtail/tests/urls.py wagtail/wagtaildocs/models.py wagtail/wagtaildocs/views/chooser.py wagtail/wagtaildocs/wagtail_hooks.py wagtail/wagtailembeds/wagtail_hooks.py wagtail/wagtailforms/models.py wagtail/wagtailforms/tests/test_views.py wagtail/wagtailforms/views.py wagtail/wagtailforms/wagtail_hooks.py wagtail/wagtailimages/models.py wagtail/wagtailimages/views/chooser.py wagtail/wagtailimages/wagtail_hooks.py wagtail/wagtailredirects/forms.py wagtail/wagtailredirects/wagtail_hooks.py wagtail/wagtailsites/forms.py wagtail/wagtailsites/views.py wagtail/wagtailsites/wagtail_hooks.py wagtail/wagtailsnippets/tests.py wagtail/wagtailsnippets/wagtail_hooks.py wagtail/wagtailusers/forms.py wagtail/wagtailusers/views/groups.py wagtail/wagtailusers/wagtail_hooks.py --- .tx/config | 4 ++-- .../customisation/admin_templates.rst | 4 ++-- .../customisation/page_editing_interface.rst | 22 +++++++++--------- docs/advanced_topics/i18n/duplicate_tree.rst | 2 +- docs/advanced_topics/i18n/index.rst | 2 +- docs/advanced_topics/jinja2.rst | 2 +- docs/advanced_topics/settings.rst | 8 +++---- .../integrating_into_django.rst | 4 ++-- docs/getting_started/tutorial.rst | 10 ++++---- .../reference/contrib/forms/customisation.rst | 12 +++++----- docs/reference/contrib/forms/index.rst | 2 +- docs/reference/contrib/settings.rst | 2 +- docs/reference/hooks.rst | 12 +++++----- docs/reference/pages/model_reference.rst | 2 +- docs/reference/pages/panels.rst | 14 +++++------ docs/topics/pages.rst | 16 ++++++------- docs/topics/snippets.rst | 2 +- docs/topics/streamfield.rst | 2 +- wagtail/{wagtailadmin => admin}/.gitignore | 0 wagtail/admin/__init__.py | 1 + .../{wagtailadmin => admin}/api/__init__.py | 0 .../{wagtailadmin => admin}/api/endpoints.py | 0 .../{wagtailadmin => admin}/api/filters.py | 0 .../api/serializers.py | 0 wagtail/{wagtailadmin => admin}/api/urls.py | 0 wagtail/{wagtailadmin => admin}/apps.py | 2 +- wagtail/{wagtailadmin => admin}/blocks.py | 2 +- wagtail/{wagtailadmin => admin}/checks.py | 4 ++-- wagtail/{wagtailadmin => admin}/compare.py | 0 .../{wagtailadmin => admin}/datetimepicker.py | 0 wagtail/{wagtailadmin => admin}/decorators.py | 2 +- .../{wagtailadmin => admin}/edit_handlers.py | 2 +- wagtail/{wagtailadmin => admin}/forms.py | 2 +- wagtail/{wagtailadmin => admin}/jinja2tags.py | 0 .../locale/ar/LC_MESSAGES/django.mo | Bin .../locale/ar/LC_MESSAGES/django.po | 0 .../locale/bg/LC_MESSAGES/django.mo | Bin .../locale/bg/LC_MESSAGES/django.po | 0 .../locale/ca/LC_MESSAGES/django.mo | Bin .../locale/ca/LC_MESSAGES/django.po | 0 .../locale/cs/LC_MESSAGES/django.mo | Bin .../locale/cs/LC_MESSAGES/django.po | 0 .../locale/cy/LC_MESSAGES/django.mo | Bin .../locale/cy/LC_MESSAGES/django.po | 0 .../locale/de/LC_MESSAGES/django.mo | Bin .../locale/de/LC_MESSAGES/django.po | 0 .../locale/el/LC_MESSAGES/django.mo | Bin .../locale/el/LC_MESSAGES/django.po | 0 .../locale/en/LC_MESSAGES/django.mo | Bin .../locale/en/LC_MESSAGES/django.po | 0 .../locale/es/LC_MESSAGES/django.mo | Bin .../locale/es/LC_MESSAGES/django.po | 0 .../locale/eu/LC_MESSAGES/django.mo | Bin .../locale/eu/LC_MESSAGES/django.po | 0 .../locale/fa/LC_MESSAGES/django.mo | Bin .../locale/fa/LC_MESSAGES/django.po | 0 .../locale/fi/LC_MESSAGES/django.mo | Bin .../locale/fi/LC_MESSAGES/django.po | 0 .../locale/fr/LC_MESSAGES/django.mo | Bin .../locale/fr/LC_MESSAGES/django.po | 0 .../locale/gl/LC_MESSAGES/django.mo | Bin .../locale/gl/LC_MESSAGES/django.po | 0 .../locale/he_IL/LC_MESSAGES/django.mo | Bin .../locale/he_IL/LC_MESSAGES/django.po | 0 .../locale/hr_HR/LC_MESSAGES/django.mo | Bin .../locale/hr_HR/LC_MESSAGES/django.po | 0 .../locale/hu/LC_MESSAGES/django.mo | Bin .../locale/hu/LC_MESSAGES/django.po | 0 .../locale/id_ID/LC_MESSAGES/django.mo | Bin .../locale/id_ID/LC_MESSAGES/django.po | 0 .../locale/is_IS/LC_MESSAGES/django.mo | Bin .../locale/is_IS/LC_MESSAGES/django.po | 0 .../locale/it/LC_MESSAGES/django.mo | Bin .../locale/it/LC_MESSAGES/django.po | 0 .../locale/ja/LC_MESSAGES/django.mo | Bin .../locale/ja/LC_MESSAGES/django.po | 0 .../locale/ka/LC_MESSAGES/django.mo | Bin .../locale/ka/LC_MESSAGES/django.po | 0 .../locale/ko/LC_MESSAGES/django.mo | Bin .../locale/ko/LC_MESSAGES/django.po | 0 .../locale/lt/LC_MESSAGES/django.mo | Bin .../locale/lt/LC_MESSAGES/django.po | 0 .../locale/lv/LC_MESSAGES/django.mo | Bin .../locale/lv/LC_MESSAGES/django.po | 0 .../locale/mn/LC_MESSAGES/django.mo | Bin .../locale/mn/LC_MESSAGES/django.po | 0 .../locale/nb/LC_MESSAGES/django.mo | Bin .../locale/nb/LC_MESSAGES/django.po | 0 .../locale/nl/LC_MESSAGES/django.mo | Bin .../locale/nl/LC_MESSAGES/django.po | 0 .../locale/nl_NL/LC_MESSAGES/django.mo | Bin .../locale/nl_NL/LC_MESSAGES/django.po | 0 .../locale/pl/LC_MESSAGES/django.mo | Bin .../locale/pl/LC_MESSAGES/django.po | 0 .../locale/pt_BR/LC_MESSAGES/django.mo | Bin .../locale/pt_BR/LC_MESSAGES/django.po | 0 .../locale/pt_PT/LC_MESSAGES/django.mo | Bin .../locale/pt_PT/LC_MESSAGES/django.po | 0 .../locale/ro/LC_MESSAGES/django.mo | Bin .../locale/ro/LC_MESSAGES/django.po | 0 .../locale/ru/LC_MESSAGES/django.mo | Bin .../locale/ru/LC_MESSAGES/django.po | 0 .../locale/sk_SK/LC_MESSAGES/django.mo | Bin .../locale/sk_SK/LC_MESSAGES/django.po | 0 .../locale/sl/LC_MESSAGES/django.mo | Bin .../locale/sl/LC_MESSAGES/django.po | 0 .../locale/sv/LC_MESSAGES/django.mo | Bin .../locale/sv/LC_MESSAGES/django.po | 0 .../locale/tr/LC_MESSAGES/django.mo | Bin .../locale/tr/LC_MESSAGES/django.po | 0 .../locale/uk/LC_MESSAGES/django.mo | Bin .../locale/uk/LC_MESSAGES/django.po | 0 .../locale/zh/LC_MESSAGES/django.mo | Bin .../locale/zh/LC_MESSAGES/django.po | 0 .../locale/zh_CN/LC_MESSAGES/django.mo | Bin .../locale/zh_CN/LC_MESSAGES/django.po | 0 wagtail/{wagtailadmin => admin}/menu.py | 0 wagtail/{wagtailadmin => admin}/messages.py | 0 .../0001_create_admin_access_permissions.py | 0 .../migrations/__init__.py | 0 .../{wagtailadmin => admin}/modal_workflow.py | 0 wagtail/{wagtailadmin => admin}/models.py | 2 +- wagtail/{wagtailadmin => admin}/navigation.py | 0 wagtail/{wagtailadmin => admin}/rich_text.py | 4 ++-- wagtail/{wagtailadmin => admin}/search.py | 2 +- wagtail/{wagtailadmin => admin}/signals.py | 0 .../{wagtailadmin => admin}/site_summary.py | 2 +- .../wagtailadmin/app/wagtailadmin.entry.js | 0 .../app/wagtailadmin.entry.test.js | 0 .../static_src/wagtailadmin/css/normalize.css | 0 .../jquery-ui/images/animated-overlay.gif | Bin .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../images/ui-bg_flat_100_246060_40x100.png | Bin .../images/ui-bg_flat_100_49c0c1_40x100.png | Bin .../images/ui-bg_flat_100_e8f8f9_40x100.png | Bin .../images/ui-bg_flat_100_f7474e_40x100.png | Bin .../images/ui-bg_flat_100_ffffff_40x100.png | Bin .../images/ui-bg_flat_65_49c0c1_40x100.png | Bin .../images/ui-icons_222222_256x240.png | Bin .../images/ui-icons_49c0c1_256x240.png | Bin .../images/ui-icons_555555_256x240.png | Bin .../images/ui-icons_ffffff_256x240.png | Bin .../jquery-ui/jquery-ui-1.10.3.verdant.css | 0 .../wagtailadmin/css/vendor/jquery.tagit.css | 0 .../css/vendor/tagit.ui-zendesk.css | 0 .../wagtailadmin/fonts/opensans-bold.ttf | Bin .../wagtailadmin/fonts/opensans-bold.woff | Bin .../wagtailadmin/fonts/opensans-bold.woff2 | Bin .../fonts/opensans-bolditalic.ttf | Bin .../fonts/opensans-bolditalic.woff | Bin .../fonts/opensans-bolditalic.woff2 | Bin .../wagtailadmin/fonts/opensans-italic.ttf | Bin .../wagtailadmin/fonts/opensans-italic.woff | Bin .../wagtailadmin/fonts/opensans-italic.woff2 | Bin .../wagtailadmin/fonts/opensans-light.ttf | Bin .../wagtailadmin/fonts/opensans-light.woff | Bin .../wagtailadmin/fonts/opensans-light.woff2 | Bin .../fonts/opensans-lightitalic.ttf | Bin .../fonts/opensans-lightitalic.woff | Bin .../fonts/opensans-lightitalic.woff2 | Bin .../wagtailadmin/fonts/opensans-regular.ttf | Bin .../wagtailadmin/fonts/opensans-regular.woff | Bin .../wagtailadmin/fonts/opensans-regular.woff2 | Bin .../wagtailadmin/fonts/opensans-semibold.ttf | Bin .../wagtailadmin/fonts/opensans-semibold.woff | Bin .../fonts/opensans-semibold.woff2 | Bin .../fonts/opensans-semibolditalic.ttf | Bin .../fonts/opensans-semibolditalic.woff | Bin .../fonts/opensans-semibolditalic.woff2 | Bin .../wagtailadmin/fonts/robotoslab-bold.ttf | Bin .../wagtailadmin/fonts/robotoslab-bold.woff | Bin .../wagtailadmin/fonts/robotoslab-bold.woff2 | Bin .../wagtailadmin/fonts/robotoslab-regular.ttf | Bin .../fonts/robotoslab-regular.woff | Bin .../fonts/robotoslab-regular.woff2 | Bin .../wagtailadmin/fonts/wagtail-icomoon.json | 0 .../static_src/wagtailadmin/fonts/wagtail.eot | Bin .../static_src/wagtailadmin/fonts/wagtail.svg | 0 .../static_src/wagtailadmin/fonts/wagtail.ttf | Bin .../wagtailadmin/fonts/wagtail.woff | Bin .../wagtailadmin/images/bg-body.svg | 0 .../wagtailadmin/images/bg-dark-diag.svg | 0 .../wagtailadmin/images/bg-light-diag.svg | 0 .../wagtailadmin/images/email-header.jpg | Bin .../wagtailadmin/images/favicon.ico | Bin .../wagtailadmin/images/logo-body.svg | 0 .../wagtailadmin/images/logo-eyeclosed.svg | 0 .../wagtailadmin/images/logo-eyeopen.svg | 0 .../wagtailadmin/images/logo-tail.svg | 0 .../wagtailadmin/images/spinner.gif | Bin .../wagtailadmin/images/transparency.svg | 0 .../wagtailadmin/images/wagtail-logo.svg | 0 .../static_src/wagtailadmin/js/blocks/list.js | 0 .../wagtailadmin/js/blocks/sequence.js | 0 .../wagtailadmin/js/blocks/stream.js | 0 .../wagtailadmin/js/blocks/struct.js | 0 .../static_src/wagtailadmin/js/core.js | 0 .../wagtailadmin/js/expanding_formset.js | 0 .../wagtailadmin/js/hallo-bootstrap.js | 0 .../wagtailadmin/js/hallo-plugins/hallo-hr.js | 0 .../hallo-plugins/hallo-requireparagraphs.js | 0 .../js/hallo-plugins/hallo-wagtaillink.js | 0 .../wagtailadmin/js/modal-workflow.js | 0 .../wagtailadmin/js/page-chooser.js | 0 .../static_src/wagtailadmin/js/page-editor.js | 0 .../wagtailadmin/js/privacy-switch.js | 0 .../static_src/wagtailadmin/js/submenu.js | 0 .../wagtailadmin/js/upgrade_notify.js | 0 .../static_src/wagtailadmin/js/userbar.js | 0 .../wagtailadmin/js/vendor/bootstrap-modal.js | 0 .../wagtailadmin/js/vendor/bootstrap-tab.js | 0 .../js/vendor/bootstrap-tooltip.js | 0 .../js/vendor/bootstrap-transition.js | 0 .../wagtailadmin/js/vendor/hallo.js | 0 .../js/vendor/jquery-2.2.1.min.js | 0 .../js/vendor/jquery-ui-1.10.3.min.js | 0 .../wagtailadmin/js/vendor/jquery.autosize.js | 0 .../vendor/jquery.ba-throttle-debounce.min.js | 0 .../js/vendor/jquery.datetimepicker.js | 0 .../js/vendor/jquery.fileupload-process.js | 0 .../js/vendor/jquery.fileupload.js | 0 .../js/vendor/jquery.iframe-transport.js | 0 .../js/vendor/modernizr-2.6.2.min.js | 0 .../wagtailadmin/js/vendor/mousetrap.min.js | 0 .../wagtailadmin/js/vendor/rangy-core.js | 0 .../wagtailadmin/js/vendor/tag-it.js | 0 .../wagtailadmin/js/vendor/urlify.js | 0 .../wagtailadmin/js/vendor/xregexp.min.js | 0 .../wagtailadmin/scss/_font-icons.scss | 0 .../static_src/wagtailadmin/scss/_fonts.scss | 0 .../static_src/wagtailadmin/scss/_grid.scss | 0 .../static_src/wagtailadmin/scss/_mixins.scss | 0 .../wagtailadmin/scss/_variables-icons.scss | 0 .../wagtailadmin/scss/_variables.scss | 0 .../scss/components/_datetimepicker.scss | 0 .../scss/components/_dropdowns.scss | 0 .../scss/components/_formatters.scss | 0 .../wagtailadmin/scss/components/_forms.scss | 0 .../wagtailadmin/scss/components/_header.scss | 0 .../wagtailadmin/scss/components/_icons.scss | 0 .../scss/components/_indicator.scss | 0 .../scss/components/_listing.scss | 0 .../wagtailadmin/scss/components/_logo.scss | 0 .../scss/components/_main-nav.scss | 0 .../scss/components/_messages.scss | 0 .../wagtailadmin/scss/components/_modals.scss | 0 .../scss/components/_progressbar.scss | 0 .../scss/components/_streamfield.scss | 0 .../wagtailadmin/scss/components/_tabs.scss | 0 .../scss/components/_tooltips.scss | 0 .../scss/components/_typography.scss | 0 .../static_src/wagtailadmin/scss/core.scss | 0 .../wagtailadmin/scss/layouts/404.scss | 0 .../scss/layouts/compare-revisions.scss | 0 .../wagtailadmin/scss/layouts/home.scss | 0 .../wagtailadmin/scss/layouts/login.scss | 0 .../scss/layouts/page-editor.scss | 0 .../wagtailadmin/scss/panels/rich-text.scss | 0 .../static_src/wagtailadmin/scss/userbar.scss | 0 .../templates/wagtailadmin/404.html | 0 .../wagtailadmin/account/account.html | 0 .../wagtailadmin/account/change_password.html | 0 .../account/language_preferences.html | 0 .../account/notification_preferences.html | 0 .../account/password_reset/complete.html | 0 .../account/password_reset/confirm.html | 0 .../account/password_reset/done.html | 0 .../account/password_reset/email.txt | 0 .../account/password_reset/email_subject.txt | 0 .../account/password_reset/form.html | 0 .../templates/wagtailadmin/admin_base.html | 0 .../templates/wagtailadmin/base.html | 0 .../wagtailadmin/block_forms/field.html | 0 .../wagtailadmin/block_forms/list.html | 0 .../wagtailadmin/block_forms/list_member.html | 0 .../wagtailadmin/block_forms/sequence.html | 0 .../block_forms/sequence_member.html | 0 .../wagtailadmin/block_forms/stream.html | 0 .../block_forms/stream_member.html | 0 .../wagtailadmin/block_forms/stream_menu.html | 0 .../wagtailadmin/block_forms/struct.html | 0 .../wagtailadmin/chooser/_browse_results.html | 0 .../wagtailadmin/chooser/_link_types.html | 0 .../wagtailadmin/chooser/_search_results.html | 0 .../wagtailadmin/chooser/browse.html | 0 .../templates/wagtailadmin/chooser/browse.js | 0 .../wagtailadmin/chooser/email_link.html | 0 .../wagtailadmin/chooser/email_link.js | 0 .../wagtailadmin/chooser/external_link.html | 0 .../wagtailadmin/chooser/external_link.js | 0 .../chooser/external_link_chosen.js | 0 .../collection_privacy/ancestor_privacy.html | 0 .../collection_privacy/set_privacy.html | 0 .../collection_privacy/set_privacy.js | 0 .../collection_privacy/set_privacy_done.js | 0 .../collections/_privacy_switch.html | 0 .../collections/delete_not_empty.html | 0 .../wagtailadmin/collections/edit.html | 0 .../wagtailadmin/collections/index.html | 0 .../edit_handlers/chooser_panel.html | 2 +- .../edit_handlers/field_panel_field.html | 0 .../edit_handlers/field_row_panel.html | 0 .../edit_handlers/inline_panel.html | 0 .../edit_handlers/inline_panel.js | 0 .../edit_handlers/inline_panel_child.html | 0 .../edit_handlers/multi_field_panel.html | 0 .../edit_handlers/object_list.html | 0 .../edit_handlers/page_chooser_panel.html | 0 .../edit_handlers/single_field_panel.html | 0 .../edit_handlers/tabbed_interface.html | 0 .../wagtailadmin/generic/confirm_delete.html | 0 .../wagtailadmin/generic/create.html | 0 .../templates/wagtailadmin/generic/edit.html | 0 .../templates/wagtailadmin/generic/index.html | 0 .../templates/wagtailadmin/home.html | 0 .../home/pages_for_moderation.html | 0 .../wagtailadmin/home/recent_edits.html | 0 .../wagtailadmin/home/site_summary.html | 0 .../wagtailadmin/home/site_summary_pages.html | 0 .../home/upgrade_notification.html | 0 .../templates/wagtailadmin/login.html | 0 .../wagtailadmin/notifications/approved.html | 0 .../wagtailadmin/notifications/approved.txt | 0 .../notifications/approved_subject.txt | 0 .../wagtailadmin/notifications/base.html | 0 .../wagtailadmin/notifications/base.txt | 0 .../wagtailadmin/notifications/rejected.html | 0 .../wagtailadmin/notifications/rejected.txt | 0 .../notifications/rejected_subject.txt | 0 .../wagtailadmin/notifications/submitted.html | 0 .../wagtailadmin/notifications/submitted.txt | 0 .../notifications/submitted_subject.txt | 0 .../page_privacy/ancestor_privacy.html | 0 .../page_privacy/set_privacy.html | 0 .../wagtailadmin/page_privacy/set_privacy.js | 0 .../page_privacy/set_privacy_done.js | 0 .../wagtailadmin/pages/_editor_css.html | 0 .../wagtailadmin/pages/_editor_js.html | 0 .../wagtailadmin/pages/_lock_switch.html | 0 .../pages/_preview_button_on_create.html | 0 .../pages/_preview_button_on_edit.html | 0 .../wagtailadmin/pages/_privacy_switch.html | 0 .../wagtailadmin/pages/add_subpage.html | 0 .../wagtailadmin/pages/confirm_delete.html | 0 .../wagtailadmin/pages/confirm_move.html | 0 .../wagtailadmin/pages/confirm_unpublish.html | 0 .../wagtailadmin/pages/content_type_use.html | 0 .../templates/wagtailadmin/pages/copy.html | 0 .../templates/wagtailadmin/pages/create.html | 0 .../templates/wagtailadmin/pages/edit.html | 0 .../templates/wagtailadmin/pages/index.html | 0 .../pages/listing/_button_with_dropdown.html | 0 .../wagtailadmin/pages/listing/_buttons.html | 0 .../wagtailadmin/pages/listing/_list.html | 0 .../pages/listing/_list_choose.html | 0 .../pages/listing/_list_explore.html | 0 .../pages/listing/_list_move.html | 0 .../pages/listing/_locked_indicator.html | 0 .../pages/listing/_navigation_choose.html | 0 .../pages/listing/_navigation_explore.html | 0 .../pages/listing/_navigation_move.html | 0 .../pages/listing/_page_title_choose.html | 0 .../pages/listing/_page_title_explore.html | 0 .../pages/listing/_page_title_move.html | 0 .../pages/listing/_pagination.html | 0 .../listing/_parent_page_title_explore.html | 0 .../pages/listing/_privacy_indicator.html | 0 .../pages/listing/_table_headers_explore.html | 0 .../pages/move_choose_destination.html | 0 .../wagtailadmin/pages/preview_error.html | 0 .../wagtailadmin/pages/revisions/compare.html | 0 .../wagtailadmin/pages/revisions/index.html | 0 .../wagtailadmin/pages/revisions/list.html | 0 .../wagtailadmin/pages/revisions/results.html | 0 .../templates/wagtailadmin/pages/search.html | 0 .../wagtailadmin/pages/search_results.html | 0 .../wagtailadmin/pages/usage_results.html | 0 .../collection_member_permissions_form.html | 0 ...collection_member_permissions_formset.html | 0 .../wagtailadmin/shared/animated_logo.html | 0 .../wagtailadmin/shared/breadcrumb.html | 0 .../shared/chooser_breadcrumb.html | 0 .../shared/collection_chooser.html | 0 .../shared/datetimepicker_translations.html | 0 .../shared/explorer_menu_item.html | 0 .../templates/wagtailadmin/shared/field.html | 0 .../wagtailadmin/shared/field_as_li.html | 0 .../templates/wagtailadmin/shared/header.html | 0 .../wagtailadmin/shared/main_nav.html | 0 .../wagtailadmin/shared/menu_item.html | 0 .../wagtailadmin/shared/menu_search.html | 0 .../shared/menu_settings_menu_item.html | 0 .../shared/menu_submenu_item.html | 0 .../wagtailadmin/shared/messages.html | 0 .../wagtailadmin/shared/page_status_tag.html | 0 .../wagtailadmin/shared/pagination_nav.html | 0 .../wagtailadmin/shared/search_area.html | 0 .../wagtailadmin/shared/search_other.html | 0 .../wagtailadmin/shared/user_avatar.html | 0 .../templates/wagtailadmin/skeleton.html | 0 .../templates/wagtailadmin/userbar/base.html | 0 .../wagtailadmin/userbar/item_admin.html | 0 .../wagtailadmin/userbar/item_base.html | 0 .../wagtailadmin/userbar/item_page_add.html | 0 .../userbar/item_page_approve.html | 0 .../wagtailadmin/userbar/item_page_edit.html | 0 .../userbar/item_page_explore.html | 0 .../userbar/item_page_reject.html | 0 .../wagtailadmin/widgets/chooser.html | 0 .../wagtailadmin/widgets/page_chooser.html | 0 .../templatetags/__init__.py | 0 .../templatetags/gravatar.py | 0 .../templatetags/wagtailadmin_tags.py | 6 ++--- .../templatetags/wagtailuserbar.py | 2 +- .../{wagtailadmin => admin}/tests/__init__.py | 0 .../tests/api/__init__.py | 0 .../tests/api/test_documents.py | 0 .../tests/api/test_images.py | 0 .../tests/api/test_pages.py | 0 .../tests/api/utils.py | 0 .../tests/test_account_management.py | 2 +- .../tests/test_admin_search.py | 2 +- .../tests/test_buttons_hooks.py | 2 +- .../tests/test_collections_views.py | 0 .../tests/test_compare.py | 2 +- .../tests/test_edit_handlers.py | 10 ++++---- .../tests/test_jinja2.py | 0 .../tests/test_messages.py | 0 .../tests/test_navigation.py | 2 +- .../tests/test_page_chooser.py | 2 +- .../tests/test_pages_views.py | 6 ++--- .../tests/test_password_reset.py | 4 ++-- .../tests/test_privacy.py | 0 .../tests/test_rich_text.py | 14 +++++------ .../tests/test_userbar.py | 0 .../tests/test_widgets.py | 2 +- .../{wagtailadmin => admin}/tests/tests.py | 6 ++--- .../{wagtailadmin => admin}/urls/__init__.py | 12 +++++----- .../urls/collections.py | 2 +- wagtail/{wagtailadmin => admin}/urls/pages.py | 2 +- .../urls/password_reset.py | 4 ++-- wagtail/{wagtailadmin => admin}/userbar.py | 0 wagtail/{wagtailadmin => admin}/utils.py | 2 +- .../{wagtailadmin => admin}/views/__init__.py | 0 .../{wagtailadmin => admin}/views/account.py | 4 ++-- .../{wagtailadmin => admin}/views/chooser.py | 4 ++-- .../views/collection_privacy.py | 4 ++-- .../views/collections.py | 6 ++--- .../{wagtailadmin => admin}/views/generic.py | 4 ++-- wagtail/{wagtailadmin => admin}/views/home.py | 4 ++-- .../{wagtailadmin => admin}/views/mixins.py | 2 +- .../views/page_privacy.py | 4 ++-- .../{wagtailadmin => admin}/views/pages.py | 6 ++--- wagtail/{wagtailadmin => admin}/views/tags.py | 0 .../{wagtailadmin => admin}/views/userbar.py | 2 +- .../viewsets/__init__.py | 0 .../{wagtailadmin => admin}/viewsets/base.py | 0 .../{wagtailadmin => admin}/viewsets/model.py | 2 +- .../{wagtailadmin => admin}/wagtail_hooks.py | 14 +++++------ wagtail/{wagtailadmin => admin}/widgets.py | 2 +- wagtail/contrib/modeladmin/menus.py | 2 +- wagtail/contrib/modeladmin/views.py | 4 ++-- wagtail/contrib/settings/registry.py | 2 +- wagtail/contrib/settings/views.py | 4 ++-- .../contrib/wagtailsearchpromotions/forms.py | 2 +- .../contrib/wagtailsearchpromotions/views.py | 6 ++--- .../wagtailsearchpromotions/wagtail_hooks.py | 2 +- wagtail/contrib/wagtailstyleguide/views.py | 8 +++---- .../wagtailstyleguide/wagtail_hooks.py | 2 +- wagtail/core/blocks/field_block.py | 12 +++++----- wagtail/core/fields.py | 4 ++-- .../project_name/settings/base.py | 2 +- wagtail/project_template/project_name/urls.py | 2 +- wagtail/tests/demosite/models.py | 2 +- wagtail/tests/non_root_urls.py | 2 +- wagtail/tests/settings.py | 6 ++--- wagtail/tests/snippets/forms.py | 2 +- wagtail/tests/snippets/models.py | 2 +- wagtail/tests/testapp/forms.py | 2 +- wagtail/tests/testapp/models.py | 6 ++--- wagtail/tests/testapp/rich_text.py | 2 +- wagtail/tests/testapp/views.py | 4 ++-- wagtail/tests/testapp/wagtail_hooks.py | 6 ++--- wagtail/tests/urls.py | 2 +- wagtail/wagtailadmin/__init__.py | 1 - wagtail/wagtaildocs/edit_handlers.py | 2 +- wagtail/wagtaildocs/forms.py | 4 ++-- wagtail/wagtaildocs/models.py | 2 +- wagtail/wagtaildocs/views/chooser.py | 6 ++--- wagtail/wagtaildocs/views/documents.py | 6 ++--- wagtail/wagtaildocs/views/multiple.py | 2 +- wagtail/wagtaildocs/wagtail_hooks.py | 8 +++---- wagtail/wagtaildocs/widgets.py | 2 +- wagtail/wagtailembeds/views/chooser.py | 2 +- wagtail/wagtailembeds/wagtail_hooks.py | 2 +- wagtail/wagtailforms/edit_handlers.py | 2 +- wagtail/wagtailforms/forms.py | 2 +- wagtail/wagtailforms/models.py | 4 ++-- wagtail/wagtailforms/tests/test_views.py | 4 ++-- wagtail/wagtailforms/views.py | 2 +- wagtail/wagtailforms/wagtail_hooks.py | 2 +- wagtail/wagtailimages/edit_handlers.py | 4 ++-- wagtail/wagtailimages/forms.py | 4 ++-- wagtail/wagtailimages/models.py | 2 +- wagtail/wagtailimages/views/chooser.py | 6 ++--- wagtail/wagtailimages/views/images.py | 6 ++--- wagtail/wagtailimages/views/multiple.py | 2 +- wagtail/wagtailimages/wagtail_hooks.py | 8 +++---- wagtail/wagtailimages/widgets.py | 2 +- wagtail/wagtailredirects/forms.py | 2 +- wagtail/wagtailredirects/views.py | 6 ++--- wagtail/wagtailredirects/wagtail_hooks.py | 2 +- wagtail/wagtailsearch/views/queries.py | 4 ++-- wagtail/wagtailsites/forms.py | 2 +- wagtail/wagtailsites/views.py | 4 ++-- wagtail/wagtailsites/wagtail_hooks.py | 2 +- wagtail/wagtailsnippets/edit_handlers.py | 2 +- wagtail/wagtailsnippets/models.py | 2 +- wagtail/wagtailsnippets/tests.py | 2 +- wagtail/wagtailsnippets/views/chooser.py | 4 ++-- wagtail/wagtailsnippets/views/snippets.py | 8 +++---- wagtail/wagtailsnippets/wagtail_hooks.py | 2 +- wagtail/wagtailsnippets/widgets.py | 2 +- wagtail/wagtailusers/forms.py | 4 ++-- wagtail/wagtailusers/views/groups.py | 4 ++-- wagtail/wagtailusers/views/users.py | 6 ++--- wagtail/wagtailusers/wagtail_hooks.py | 4 ++-- wagtail/wagtailusers/widgets.py | 2 +- 528 files changed, 265 insertions(+), 265 deletions(-) rename wagtail/{wagtailadmin => admin}/.gitignore (100%) create mode 100644 wagtail/admin/__init__.py rename wagtail/{wagtailadmin => admin}/api/__init__.py (100%) rename wagtail/{wagtailadmin => admin}/api/endpoints.py (100%) rename wagtail/{wagtailadmin => admin}/api/filters.py (100%) rename wagtail/{wagtailadmin => admin}/api/serializers.py (100%) rename wagtail/{wagtailadmin => admin}/api/urls.py (100%) rename wagtail/{wagtailadmin => admin}/apps.py (86%) rename wagtail/{wagtailadmin => admin}/blocks.py (52%) rename wagtail/{wagtailadmin => admin}/checks.py (94%) rename wagtail/{wagtailadmin => admin}/compare.py (100%) rename wagtail/{wagtailadmin => admin}/datetimepicker.py (100%) rename wagtail/{wagtailadmin => admin}/decorators.py (96%) rename wagtail/{wagtailadmin => admin}/edit_handlers.py (99%) rename wagtail/{wagtailadmin => admin}/forms.py (99%) rename wagtail/{wagtailadmin => admin}/jinja2tags.py (100%) rename wagtail/{wagtailadmin => admin}/locale/ar/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/ar/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/bg/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/bg/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/ca/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/ca/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/cs/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/cs/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/cy/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/cy/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/de/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/de/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/el/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/el/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/en/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/en/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/es/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/es/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/eu/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/eu/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/fa/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/fa/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/fi/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/fi/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/fr/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/fr/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/gl/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/gl/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/he_IL/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/he_IL/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/hr_HR/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/hr_HR/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/hu/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/hu/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/id_ID/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/id_ID/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/is_IS/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/is_IS/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/it/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/it/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/ja/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/ja/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/ka/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/ka/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/ko/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/ko/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/lt/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/lt/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/lv/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/lv/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/mn/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/mn/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/nb/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/nb/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/nl/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/nl/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/nl_NL/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/nl_NL/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/pl/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/pl/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/pt_BR/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/pt_BR/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/pt_PT/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/pt_PT/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/ro/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/ro/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/ru/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/ru/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/sk_SK/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/sk_SK/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/sl/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/sl/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/sv/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/sv/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/tr/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/tr/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/uk/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/uk/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/zh/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/zh/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/locale/zh_CN/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailadmin => admin}/locale/zh_CN/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailadmin => admin}/menu.py (100%) rename wagtail/{wagtailadmin => admin}/messages.py (100%) rename wagtail/{wagtailadmin => admin}/migrations/0001_create_admin_access_permissions.py (100%) rename wagtail/{wagtailadmin => admin}/migrations/__init__.py (100%) rename wagtail/{wagtailadmin => admin}/modal_workflow.py (100%) rename wagtail/{wagtailadmin => admin}/models.py (85%) rename wagtail/{wagtailadmin => admin}/navigation.py (100%) rename wagtail/{wagtailadmin => admin}/rich_text.py (97%) rename wagtail/{wagtailadmin => admin}/search.py (98%) rename wagtail/{wagtailadmin => admin}/signals.py (100%) rename wagtail/{wagtailadmin => admin}/site_summary.py (96%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/app/wagtailadmin.entry.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/app/wagtailadmin.entry.test.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/css/normalize.css (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/css/vendor/jquery-ui/images/animated-overlay.gif (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_246060_40x100.png (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_49c0c1_40x100.png (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_e8f8f9_40x100.png (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_f7474e_40x100.png (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_ffffff_40x100.png (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_65_49c0c1_40x100.png (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_222222_256x240.png (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_49c0c1_256x240.png (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_555555_256x240.png (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_ffffff_256x240.png (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/css/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/css/vendor/jquery.tagit.css (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/css/vendor/tagit.ui-zendesk.css (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-bold.ttf (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-bold.woff (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-bold.woff2 (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-bolditalic.ttf (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-bolditalic.woff (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-bolditalic.woff2 (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-italic.ttf (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-italic.woff (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-italic.woff2 (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-light.ttf (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-light.woff (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-light.woff2 (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-lightitalic.ttf (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-lightitalic.woff (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-lightitalic.woff2 (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-regular.ttf (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-regular.woff (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-regular.woff2 (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-semibold.ttf (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-semibold.woff (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-semibold.woff2 (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-semibolditalic.ttf (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-semibolditalic.woff (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/opensans-semibolditalic.woff2 (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/robotoslab-bold.ttf (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/robotoslab-bold.woff (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/robotoslab-bold.woff2 (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/robotoslab-regular.ttf (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/robotoslab-regular.woff (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/robotoslab-regular.woff2 (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/wagtail-icomoon.json (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/wagtail.eot (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/wagtail.svg (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/wagtail.ttf (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/fonts/wagtail.woff (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/images/bg-body.svg (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/images/bg-dark-diag.svg (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/images/bg-light-diag.svg (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/images/email-header.jpg (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/images/favicon.ico (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/images/logo-body.svg (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/images/logo-eyeclosed.svg (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/images/logo-eyeopen.svg (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/images/logo-tail.svg (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/images/spinner.gif (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/images/transparency.svg (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/images/wagtail-logo.svg (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/blocks/list.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/blocks/sequence.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/blocks/stream.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/blocks/struct.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/core.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/expanding_formset.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/hallo-bootstrap.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/hallo-plugins/hallo-hr.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/hallo-plugins/hallo-requireparagraphs.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/modal-workflow.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/page-chooser.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/page-editor.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/privacy-switch.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/submenu.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/upgrade_notify.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/userbar.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/vendor/bootstrap-modal.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/vendor/bootstrap-tab.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/vendor/bootstrap-tooltip.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/vendor/bootstrap-transition.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/vendor/hallo.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/vendor/jquery-2.2.1.min.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/vendor/jquery-ui-1.10.3.min.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/vendor/jquery.autosize.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/vendor/jquery.ba-throttle-debounce.min.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/vendor/jquery.datetimepicker.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/vendor/jquery.fileupload-process.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/vendor/jquery.fileupload.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/vendor/jquery.iframe-transport.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/vendor/modernizr-2.6.2.min.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/vendor/mousetrap.min.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/vendor/rangy-core.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/vendor/tag-it.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/vendor/urlify.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/js/vendor/xregexp.min.js (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/_font-icons.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/_fonts.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/_grid.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/_mixins.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/_variables-icons.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/_variables.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/components/_datetimepicker.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/components/_dropdowns.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/components/_formatters.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/components/_forms.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/components/_header.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/components/_icons.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/components/_indicator.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/components/_listing.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/components/_logo.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/components/_main-nav.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/components/_messages.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/components/_modals.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/components/_progressbar.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/components/_streamfield.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/components/_tabs.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/components/_tooltips.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/components/_typography.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/core.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/layouts/404.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/layouts/compare-revisions.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/layouts/home.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/layouts/login.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/layouts/page-editor.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/panels/rich-text.scss (100%) rename wagtail/{wagtailadmin => admin}/static_src/wagtailadmin/scss/userbar.scss (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/404.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/account/account.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/account/change_password.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/account/language_preferences.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/account/notification_preferences.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/account/password_reset/complete.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/account/password_reset/confirm.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/account/password_reset/done.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/account/password_reset/email.txt (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/account/password_reset/email_subject.txt (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/account/password_reset/form.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/admin_base.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/base.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/block_forms/field.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/block_forms/list.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/block_forms/list_member.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/block_forms/sequence.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/block_forms/sequence_member.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/block_forms/stream.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/block_forms/stream_member.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/block_forms/stream_menu.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/block_forms/struct.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/chooser/_browse_results.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/chooser/_link_types.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/chooser/_search_results.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/chooser/browse.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/chooser/browse.js (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/chooser/email_link.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/chooser/email_link.js (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/chooser/external_link.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/chooser/external_link.js (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/chooser/external_link_chosen.js (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/collection_privacy/ancestor_privacy.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/collection_privacy/set_privacy.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/collection_privacy/set_privacy.js (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/collection_privacy/set_privacy_done.js (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/collections/_privacy_switch.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/collections/delete_not_empty.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/collections/edit.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/collections/index.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/edit_handlers/chooser_panel.html (97%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/edit_handlers/field_panel_field.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/edit_handlers/field_row_panel.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/edit_handlers/inline_panel.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/edit_handlers/inline_panel.js (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/edit_handlers/inline_panel_child.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/edit_handlers/multi_field_panel.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/edit_handlers/object_list.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/edit_handlers/page_chooser_panel.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/edit_handlers/single_field_panel.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/edit_handlers/tabbed_interface.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/generic/confirm_delete.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/generic/create.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/generic/edit.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/generic/index.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/home.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/home/pages_for_moderation.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/home/recent_edits.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/home/site_summary.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/home/site_summary_pages.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/home/upgrade_notification.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/login.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/notifications/approved.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/notifications/approved.txt (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/notifications/approved_subject.txt (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/notifications/base.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/notifications/base.txt (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/notifications/rejected.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/notifications/rejected.txt (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/notifications/rejected_subject.txt (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/notifications/submitted.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/notifications/submitted.txt (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/notifications/submitted_subject.txt (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/page_privacy/ancestor_privacy.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/page_privacy/set_privacy.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/page_privacy/set_privacy.js (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/page_privacy/set_privacy_done.js (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/_editor_css.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/_editor_js.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/_lock_switch.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/_preview_button_on_create.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/_preview_button_on_edit.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/_privacy_switch.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/add_subpage.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/confirm_delete.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/confirm_move.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/confirm_unpublish.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/content_type_use.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/copy.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/create.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/edit.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/index.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/listing/_button_with_dropdown.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/listing/_buttons.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/listing/_list.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/listing/_list_choose.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/listing/_list_explore.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/listing/_list_move.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/listing/_locked_indicator.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/listing/_navigation_choose.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/listing/_navigation_explore.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/listing/_navigation_move.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/listing/_page_title_choose.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/listing/_page_title_explore.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/listing/_page_title_move.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/listing/_pagination.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/listing/_privacy_indicator.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/listing/_table_headers_explore.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/move_choose_destination.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/preview_error.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/revisions/compare.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/revisions/index.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/revisions/list.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/revisions/results.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/search.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/search_results.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/pages/usage_results.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/permissions/includes/collection_member_permissions_form.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/permissions/includes/collection_member_permissions_formset.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/animated_logo.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/breadcrumb.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/chooser_breadcrumb.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/collection_chooser.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/datetimepicker_translations.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/explorer_menu_item.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/field.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/field_as_li.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/header.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/main_nav.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/menu_item.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/menu_search.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/menu_settings_menu_item.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/menu_submenu_item.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/messages.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/page_status_tag.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/pagination_nav.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/search_area.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/search_other.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/shared/user_avatar.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/skeleton.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/userbar/base.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/userbar/item_admin.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/userbar/item_base.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/userbar/item_page_add.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/userbar/item_page_approve.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/userbar/item_page_edit.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/userbar/item_page_explore.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/userbar/item_page_reject.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/widgets/chooser.html (100%) rename wagtail/{wagtailadmin => admin}/templates/wagtailadmin/widgets/page_chooser.html (100%) rename wagtail/{wagtailadmin => admin}/templatetags/__init__.py (100%) rename wagtail/{wagtailadmin => admin}/templatetags/gravatar.py (100%) rename wagtail/{wagtailadmin => admin}/templatetags/wagtailadmin_tags.py (98%) rename wagtail/{wagtailadmin => admin}/templatetags/wagtailuserbar.py (98%) rename wagtail/{wagtailadmin => admin}/tests/__init__.py (100%) rename wagtail/{wagtailadmin => admin}/tests/api/__init__.py (100%) rename wagtail/{wagtailadmin => admin}/tests/api/test_documents.py (100%) rename wagtail/{wagtailadmin => admin}/tests/api/test_images.py (100%) rename wagtail/{wagtailadmin => admin}/tests/api/test_pages.py (100%) rename wagtail/{wagtailadmin => admin}/tests/api/utils.py (100%) rename wagtail/{wagtailadmin => admin}/tests/test_account_management.py (99%) rename wagtail/{wagtailadmin => admin}/tests/test_admin_search.py (98%) rename wagtail/{wagtailadmin => admin}/tests/test_buttons_hooks.py (98%) rename wagtail/{wagtailadmin => admin}/tests/test_collections_views.py (100%) rename wagtail/{wagtailadmin => admin}/tests/test_compare.py (99%) rename wagtail/{wagtailadmin => admin}/tests/test_edit_handlers.py (98%) rename wagtail/{wagtailadmin => admin}/tests/test_jinja2.py (100%) rename wagtail/{wagtailadmin => admin}/tests/test_messages.py (100%) rename wagtail/{wagtailadmin => admin}/tests/test_navigation.py (98%) rename wagtail/{wagtailadmin => admin}/tests/test_page_chooser.py (99%) rename wagtail/{wagtailadmin => admin}/tests/test_pages_views.py (99%) rename wagtail/{wagtailadmin => admin}/tests/test_password_reset.py (95%) rename wagtail/{wagtailadmin => admin}/tests/test_privacy.py (100%) rename wagtail/{wagtailadmin => admin}/tests/test_rich_text.py (96%) rename wagtail/{wagtailadmin => admin}/tests/test_userbar.py (100%) rename wagtail/{wagtailadmin => admin}/tests/test_widgets.py (99%) rename wagtail/{wagtailadmin => admin}/tests/tests.py (98%) rename wagtail/{wagtailadmin => admin}/urls/__init__.py (89%) rename wagtail/{wagtailadmin => admin}/urls/collections.py (87%) rename wagtail/{wagtailadmin => admin}/urls/pages.py (97%) rename wagtail/{wagtailadmin => admin}/urls/password_reset.py (92%) rename wagtail/{wagtailadmin => admin}/userbar.py (100%) rename wagtail/{wagtailadmin => admin}/utils.py (99%) rename wagtail/{wagtailadmin => admin}/views/__init__.py (100%) rename wagtail/{wagtailadmin => admin}/views/account.py (98%) rename wagtail/{wagtailadmin => admin}/views/chooser.py (98%) rename wagtail/{wagtailadmin => admin}/views/collection_privacy.py (95%) rename wagtail/{wagtailadmin => admin}/views/collections.py (95%) rename wagtail/{wagtailadmin => admin}/views/generic.py (98%) rename wagtail/{wagtailadmin => admin}/views/home.py (97%) rename wagtail/{wagtailadmin => admin}/views/mixins.py (96%) rename wagtail/{wagtailadmin => admin}/views/page_privacy.py (95%) rename wagtail/{wagtailadmin => admin}/views/pages.py (99%) rename wagtail/{wagtailadmin => admin}/views/tags.py (100%) rename wagtail/{wagtailadmin => admin}/views/userbar.py (97%) rename wagtail/{wagtailadmin => admin}/viewsets/__init__.py (100%) rename wagtail/{wagtailadmin => admin}/viewsets/base.py (100%) rename wagtail/{wagtailadmin => admin}/viewsets/model.py (98%) rename wagtail/{wagtailadmin => admin}/wagtail_hooks.py (94%) rename wagtail/{wagtailadmin => admin}/widgets.py (99%) delete mode 100644 wagtail/wagtailadmin/__init__.py diff --git a/.tx/config b/.tx/config index 04256189d4..2bd2994db6 100644 --- a/.tx/config +++ b/.tx/config @@ -2,8 +2,8 @@ host = https://www.transifex.com [wagtail.wagtailadmin] -file_filter = wagtail/wagtailadmin/locale//LC_MESSAGES/django.po -source_file = wagtail/wagtailadmin/locale/en/LC_MESSAGES/django.po +file_filter = wagtail/admin/locale//LC_MESSAGES/django.po +source_file = wagtail/admin/locale/en/LC_MESSAGES/django.po source_lang = en type = PO diff --git a/docs/advanced_topics/customisation/admin_templates.rst b/docs/advanced_topics/customisation/admin_templates.rst index 253f9e7e2a..4aff3f67c0 100644 --- a/docs/advanced_topics/customisation/admin_templates.rst +++ b/docs/advanced_topics/customisation/admin_templates.rst @@ -4,7 +4,7 @@ Customising admin templates In your projects with Wagtail, you may wish to replace elements such as the Wagtail logo within the admin interface with your own branding. This can be done through Django's template inheritance mechanism. -You need to create a ``templates/wagtailadmin/`` folder within one of your apps - this may be an existing one, or a new one created for this purpose, for example, ``dashboard``. This app must be registered in ``INSTALLED_APPS`` before ``wagtail.wagtailadmin``: +You need to create a ``templates/wagtailadmin/`` folder within one of your apps - this may be an existing one, or a new one created for this purpose, for example, ``dashboard``. This app must be registered in ``INSTALLED_APPS`` before ``wagtail.admin``: .. code-block:: python @@ -14,7 +14,7 @@ You need to create a ``templates/wagtailadmin/`` folder within one of your apps 'dashboard', 'wagtail.core', - 'wagtail.wagtailadmin', + 'wagtail.admin', # ... ) diff --git a/docs/advanced_topics/customisation/page_editing_interface.rst b/docs/advanced_topics/customisation/page_editing_interface.rst index 92dea56218..bbbefb6b52 100644 --- a/docs/advanced_topics/customisation/page_editing_interface.rst +++ b/docs/advanced_topics/customisation/page_editing_interface.rst @@ -10,7 +10,7 @@ As standard, Wagtail organises panels for pages into three tabs: 'Content', 'Pro .. code-block:: python - from wagtail.wagtailadmin.edit_handlers import TabbedInterface, ObjectList + from wagtail.admin.edit_handlers import TabbedInterface, ObjectList class BlogPage(Page): # field definitions omitted @@ -43,7 +43,7 @@ Wagtail provides a general-purpose WYSIWYG editor for creating rich text content .. code-block:: python from wagtail.core.fields import RichTextField - from wagtail.wagtailadmin.edit_handlers import FieldPanel + from wagtail.admin.edit_handlers import FieldPanel class BookPage(Page): @@ -96,7 +96,7 @@ Once the plugin has been created, it should be registered as a rich text feature .. code-block:: python - from wagtail.wagtailadmin.rich_text import HalloPlugin + from wagtail.admin.rich_text import HalloPlugin from wagtail.core import hooks @hooks.register('register_rich_text_features') @@ -178,15 +178,15 @@ To unregister, call ``unregister_image_format`` with the string of the ``name`` Customising generated forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. class:: wagtail.wagtailadmin.forms.WagtailAdminModelForm -.. class:: wagtail.wagtailadmin.forms.WagtailAdminPageForm +.. class:: wagtail.admin.forms.WagtailAdminModelForm +.. class:: wagtail.admin.forms.WagtailAdminPageForm Wagtail automatically generates forms using the panels configured on the model. -By default, this form subclasses :class:`~wagtail.wagtailadmin.forms.WagtailAdminModelForm`, -or :class:`~wagtail.wagtailadmin.forms.WagtailAdminPageForm` for pages. +By default, this form subclasses :class:`~wagtail.admin.forms.WagtailAdminModelForm`, +or :class:`~wagtail.admin.forms.WagtailAdminPageForm` for pages. A custom base form class can be configured by setting the :attr:`base_form_class` attribute on any model. -Custom forms for snippets must subclass :class:`~wagtail.wagtailadmin.forms.WagtailAdminModelForm`, -and custom forms for pages must subclass :class:`~wagtail.wagtailadmin.forms.WagtailAdminPageForm`. +Custom forms for snippets must subclass :class:`~wagtail.admin.forms.WagtailAdminModelForm`, +and custom forms for pages must subclass :class:`~wagtail.admin.forms.WagtailAdminPageForm`. This can be used to add non-model fields to the form, to automatically generate field content, or to add custom validation logic for your models: @@ -195,8 +195,8 @@ or to add custom validation logic for your models: from django import forms import geocoder # not in Wagtail, for example only - http://geocoder.readthedocs.io/ - from wagtail.wagtailadmin.edit_handlers import FieldPanel - from wagtail.wagtailadmin.forms import WagtailAdminPageForm + from wagtail.admin.edit_handlers import FieldPanel + from wagtail.admin.forms import WagtailAdminPageForm from wagtail.core.models import Page diff --git a/docs/advanced_topics/i18n/duplicate_tree.rst b/docs/advanced_topics/i18n/duplicate_tree.rst index 7d6ba0732b..fca9b57a41 100644 --- a/docs/advanced_topics/i18n/duplicate_tree.rst +++ b/docs/advanced_topics/i18n/duplicate_tree.rst @@ -59,7 +59,7 @@ Here's an example of how this could be implemented (with English as the main lan .. code-block:: python from wagtail.core.models import Page - from wagtail.wagtailadmin.edit_handlers import MultiFieldPanel, PageChooserPanel + from wagtail.admin.edit_handlers import MultiFieldPanel, PageChooserPanel class TranslatablePageMixin(models.Model): diff --git a/docs/advanced_topics/i18n/index.rst b/docs/advanced_topics/i18n/index.rst index bdff5c1e21..e496aa1315 100644 --- a/docs/advanced_topics/i18n/index.rst +++ b/docs/advanced_topics/i18n/index.rst @@ -87,7 +87,7 @@ This feature is enabled through the project's root URL configuration. Just put t from django.conf import settings from django.contrib import admin - from wagtail.wagtailadmin import urls as wagtailadmin_urls + from wagtail.admin import urls as wagtailadmin_urls from wagtail.wagtaildocs import urls as wagtaildocs_urls from wagtail.core import urls as wagtail_urls diff --git a/docs/advanced_topics/jinja2.rst b/docs/advanced_topics/jinja2.rst index 00e5139dea..217b5ef00c 100644 --- a/docs/advanced_topics/jinja2.rst +++ b/docs/advanced_topics/jinja2.rst @@ -25,7 +25,7 @@ Django needs to be configured to support Jinja2 templates. As the Wagtail admin 'OPTIONS': { 'extensions': [ 'wagtail.core.jinja2tags.core', - 'wagtail.wagtailadmin.jinja2tags.userbar', + 'wagtail.admin.jinja2tags.userbar', 'wagtail.wagtailimages.jinja2tags.images', ], }, diff --git a/docs/advanced_topics/settings.rst b/docs/advanced_topics/settings.rst index 343606a595..215159b214 100644 --- a/docs/advanced_topics/settings.rst +++ b/docs/advanced_topics/settings.rst @@ -69,7 +69,7 @@ Apps (``settings.py``) 'wagtail.wagtaildocs', 'wagtail.wagtailimages', 'wagtail.wagtailsearch', - 'wagtail.wagtailadmin', + 'wagtail.admin', 'wagtail.core', 'taggit', @@ -448,7 +448,7 @@ URL Patterns from django.contrib import admin from wagtail.core import urls as wagtail_urls - from wagtail.wagtailadmin import urls as wagtailadmin_urls + from wagtail.admin import urls as wagtailadmin_urls from wagtail.wagtaildocs import urls as wagtaildocs_urls from wagtail.wagtailsearch import urls as wagtailsearch_urls @@ -511,7 +511,7 @@ These two files should reside in your project directory (``myproject/myproject/` 'wagtail.wagtaildocs', 'wagtail.wagtailimages', 'wagtail.wagtailsearch', - 'wagtail.wagtailadmin', + 'wagtail.admin', 'wagtail.core', 'taggit', @@ -691,7 +691,7 @@ These two files should reside in your project directory (``myproject/myproject/` import os.path from wagtail.core import urls as wagtail_urls - from wagtail.wagtailadmin import urls as wagtailadmin_urls + from wagtail.admin import urls as wagtailadmin_urls from wagtail.wagtaildocs import urls as wagtaildocs_urls from wagtail.wagtailsearch import urls as wagtailsearch_urls diff --git a/docs/getting_started/integrating_into_django.rst b/docs/getting_started/integrating_into_django.rst index c854f9c3de..c4891dc4fd 100644 --- a/docs/getting_started/integrating_into_django.rst +++ b/docs/getting_started/integrating_into_django.rst @@ -29,7 +29,7 @@ In your settings file, add the following apps to ``INSTALLED_APPS``: 'wagtail.wagtaildocs', 'wagtail.wagtailimages', 'wagtail.wagtailsearch', - 'wagtail.wagtailadmin', + 'wagtail.admin', 'wagtail.core', 'modelcluster', @@ -63,7 +63,7 @@ Now make the following additions to your ``urls.py`` file: .. code-block:: python - from wagtail.wagtailadmin import urls as wagtailadmin_urls + from wagtail.admin import urls as wagtailadmin_urls from wagtail.wagtaildocs import urls as wagtaildocs_urls from wagtail.core import urls as wagtail_urls diff --git a/docs/getting_started/tutorial.rst b/docs/getting_started/tutorial.rst index 1d7263b8a1..8dce552f19 100644 --- a/docs/getting_started/tutorial.rst +++ b/docs/getting_started/tutorial.rst @@ -73,7 +73,7 @@ Edit ``home/models.py`` as follows, to add a ``body`` field to the model: from wagtail.core.models import Page from wagtail.core.fields import RichTextField - from wagtail.wagtailadmin.edit_handlers import FieldPanel + from wagtail.admin.edit_handlers import FieldPanel class HomePage(Page): @@ -166,7 +166,7 @@ Lets start with a simple index page for our blog. In ``blog/models.py``: from wagtail.core.models import Page from wagtail.core.fields import RichTextField - from wagtail.wagtailadmin.edit_handlers import FieldPanel + from wagtail.admin.edit_handlers import FieldPanel class BlogIndexPage(Page): @@ -220,7 +220,7 @@ Now we need a model and template for our blog posts. In ``blog/models.py``: from wagtail.core.models import Page from wagtail.core.fields import RichTextField - from wagtail.wagtailadmin.edit_handlers import FieldPanel + from wagtail.admin.edit_handlers import FieldPanel from wagtail.wagtailsearch import index @@ -411,7 +411,7 @@ Add a new ``BlogPageGalleryImage`` model to ``models.py``: from wagtail.core.models import Page, Orderable from wagtail.core.fields import RichTextField - from wagtail.wagtailadmin.edit_handlers import FieldPanel, InlinePanel + from wagtail.admin.edit_handlers import FieldPanel, InlinePanel from wagtail.wagtailimages.edit_handlers import ImageChooserPanel from wagtail.wagtailsearch import index @@ -574,7 +574,7 @@ First, alter ``models.py`` once more: from wagtail.core.models import Page, Orderable from wagtail.core.fields import RichTextField - from wagtail.wagtailadmin.edit_handlers import FieldPanel, InlinePanel, MultiFieldPanel + from wagtail.admin.edit_handlers import FieldPanel, InlinePanel, MultiFieldPanel from wagtail.wagtailimages.edit_handlers import ImageChooserPanel from wagtail.wagtailsearch import index diff --git a/docs/reference/contrib/forms/customisation.rst b/docs/reference/contrib/forms/customisation.rst index c3c27f35d3..805b4f916d 100644 --- a/docs/reference/contrib/forms/customisation.rst +++ b/docs/reference/contrib/forms/customisation.rst @@ -14,7 +14,7 @@ You can do this as shown below. .. code-block:: python from modelcluster.fields import ParentalKey - from wagtail.wagtailadmin.edit_handlers import ( + from wagtail.admin.edit_handlers import ( FieldPanel, FieldRowPanel, InlinePanel, MultiFieldPanel ) @@ -65,7 +65,7 @@ Example: from django.core.serializers.json import DjangoJSONEncoder from django.db import models from modelcluster.fields import ParentalKey - from wagtail.wagtailadmin.edit_handlers import ( + from wagtail.admin.edit_handlers import ( FieldPanel, FieldRowPanel, InlinePanel, MultiFieldPanel ) @@ -126,7 +126,7 @@ The following example shows how to add a username to the CSV export: from django.core.serializers.json import DjangoJSONEncoder from django.db import models from modelcluster.fields import ParentalKey - from wagtail.wagtailadmin.edit_handlers import ( + from wagtail.admin.edit_handlers import ( FieldPanel, FieldRowPanel, InlinePanel, MultiFieldPanel ) @@ -204,7 +204,7 @@ Example: from django.db import models from django.shortcuts import render from modelcluster.fields import ParentalKey - from wagtail.wagtailadmin.edit_handlers import ( + from wagtail.admin.edit_handlers import ( FieldPanel, FieldRowPanel, InlinePanel, MultiFieldPanel ) @@ -300,7 +300,7 @@ The following example shows how to create a multi-step form. from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage from django.shortcuts import render from modelcluster.fields import ParentalKey - from wagtail.wagtailadmin.edit_handlers import ( + from wagtail.admin.edit_handlers import ( FieldPanel, FieldRowPanel, InlinePanel, MultiFieldPanel ) @@ -451,7 +451,7 @@ First, you need to collect results as shown below: .. code-block:: python from modelcluster.fields import ParentalKey - from wagtail.wagtailadmin.edit_handlers import ( + from wagtail.admin.edit_handlers import ( FieldPanel, FieldRowPanel, InlinePanel, MultiFieldPanel ) diff --git a/docs/reference/contrib/forms/index.rst b/docs/reference/contrib/forms/index.rst index 7dd91288f3..c65d0391a2 100644 --- a/docs/reference/contrib/forms/index.rst +++ b/docs/reference/contrib/forms/index.rst @@ -29,7 +29,7 @@ Within the ``models.py`` of one of your apps, create a model that extends ``wagt .. code-block:: python from modelcluster.fields import ParentalKey - from wagtail.wagtailadmin.edit_handlers import ( + from wagtail.admin.edit_handlers import ( FieldPanel, FieldRowPanel, InlinePanel, MultiFieldPanel ) diff --git a/docs/reference/contrib/settings.rst b/docs/reference/contrib/settings.rst index 630d92f146..c28b5d7628 100644 --- a/docs/reference/contrib/settings.rst +++ b/docs/reference/contrib/settings.rst @@ -64,7 +64,7 @@ with a custom ``edit_handler`` attribute: .. code-block:: python - from wagtail.wagtailadmin.edit_handlers import TabbedInterface, ObjectList + from wagtail.admin.edit_handlers import TabbedInterface, ObjectList @register_setting class MySettings(BaseSetting): diff --git a/docs/reference/hooks.rst b/docs/reference/hooks.rst index d90503378f..8740938092 100644 --- a/docs/reference/hooks.rst +++ b/docs/reference/hooks.rst @@ -126,7 +126,7 @@ Hooks for building new areas of the admin interface (alongside pages, images, do ``register_admin_menu_item`` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Add an item to the Wagtail admin menu. The callable passed to this hook must return an instance of ``wagtail.wagtailadmin.menu.MenuItem``. New items can be constructed from the ``MenuItem`` class by passing in a ``label`` which will be the text in the menu item, and the URL of the admin page you want the menu item to link to (usually by calling ``reverse()`` on the admin view you've set up). Additionally, the following keyword arguments are accepted: + Add an item to the Wagtail admin menu. The callable passed to this hook must return an instance of ``wagtail.admin.menu.MenuItem``. New items can be constructed from the ``MenuItem`` class by passing in a ``label`` which will be the text in the menu item, and the URL of the admin page you want the menu item to link to (usually by calling ``reverse()`` on the admin view you've set up). Additionally, the following keyword arguments are accepted: :name: an internal name used to identify the menu item; defaults to the slugified form of the label. :classnames: additional classnames applied to the link, used to give it an icon @@ -140,7 +140,7 @@ Hooks for building new areas of the admin interface (alongside pages, images, do from django.urls import reverse from wagtail.core import hooks - from wagtail.wagtailadmin.menu import MenuItem + from wagtail.admin.menu import MenuItem @hooks.register('register_admin_menu_item') def register_frank_menu_item(): @@ -196,7 +196,7 @@ Hooks for building new areas of the admin interface (alongside pages, images, do ``register_admin_search_area`` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Add an item to the Wagtail admin search "Other Searches". Behaviour of this hook is similar to ``register_admin_menu_item``. The callable passed to this hook must return an instance of ``wagtail.wagtailadmin.search.SearchArea``. New items can be constructed from the ``SearchArea`` class by passing the following parameters: + Add an item to the Wagtail admin search "Other Searches". Behaviour of this hook is similar to ``register_admin_menu_item``. The callable passed to this hook must return an instance of ``wagtail.admin.search.SearchArea``. New items can be constructed from the ``SearchArea`` class by passing the following parameters: :label: text displayed in the "Other Searches" option box. :name: an internal name used to identify the search option; defaults to the slugified form of the label. @@ -216,7 +216,7 @@ Hooks for building new areas of the admin interface (alongside pages, images, do from django.urls import reverse from wagtail.core import hooks - from wagtail.wagtailadmin.search import SearchArea + from wagtail.admin.search import SearchArea @hooks.register('register_admin_search_area') def register_frank_search_area(): @@ -691,7 +691,7 @@ Page explorer .. code-block:: python - from wagtail.wagtailadmin import widgets as wagtailadmin_widgets + from wagtail.admin import widgets as wagtailadmin_widgets @hooks.register('register_page_listing_buttons') def page_listing_buttons(page, page_perms, is_parent=False): @@ -715,7 +715,7 @@ Page explorer .. code-block:: python - from wagtail.wagtailadmin import widgets as wagtailadmin_widgets + from wagtail.admin import widgets as wagtailadmin_widgets @hooks.register('register_page_listing_more_buttons') def page_listing_more_buttons(page, page_perms, is_parent=False): diff --git a/docs/reference/pages/model_reference.rst b/docs/reference/pages/model_reference.rst index da7afc2d1d..783ef2a3f7 100644 --- a/docs/reference/pages/model_reference.rst +++ b/docs/reference/pages/model_reference.rst @@ -210,7 +210,7 @@ In addition to the model fields provided, ``Page`` has many properties and metho The form class used as a base for editing Pages of this type in the Wagtail page editor. This attribute can be set on a model to customise the Page editor form. - Forms must be a subclass of :class:`~wagtail.wagtailadmin.forms.WagtailAdminPageForm`. + Forms must be a subclass of :class:`~wagtail.admin.forms.WagtailAdminPageForm`. See :ref:`custom_edit_handler_forms` for more information. .. _site-model-ref: diff --git a/docs/reference/pages/panels.rst b/docs/reference/pages/panels.rst index 4d35136bc6..8bf56a567e 100644 --- a/docs/reference/pages/panels.rst +++ b/docs/reference/pages/panels.rst @@ -3,7 +3,7 @@ Available panel types ===================== -.. module:: wagtail.wagtailadmin.edit_handlers +.. module:: wagtail.admin.edit_handlers FieldPanel ---------- @@ -35,7 +35,7 @@ MultiFieldPanel .. class:: MultiFieldPanel(children, heading="", classname=None) - This panel condenses several :class:`~wagtail.wagtailadmin.edit_handlers.FieldPanel` s or choosers, from a ``list`` or ``tuple``, under a single ``heading`` string. + This panel condenses several :class:`~wagtail.admin.edit_handlers.FieldPanel` s or choosers, from a ``list`` or ``tuple``, under a single ``heading`` string. .. attribute:: MultiFieldPanel.children @@ -101,7 +101,7 @@ PageChooserPanel .. code-block:: python from wagtail.core.models import Page - from wagtail.wagtailadmin.edit_handlers import PageChooserPanel + from wagtail.admin.edit_handlers import PageChooserPanel class BookPage(Page): @@ -246,7 +246,7 @@ SnippetChooserPanel Built-in Fields and Choosers ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Django's field types are automatically recognised and provided with an appropriate widget for input. Just define that field the normal Django way and pass the field name into :class:`~wagtail.wagtailadmin.edit_handlers.FieldPanel` when defining your panels. Wagtail will take care of the rest. +Django's field types are automatically recognised and provided with an appropriate widget for input. Just define that field the normal Django way and pass the field name into :class:`~wagtail.admin.edit_handlers.FieldPanel` when defining your panels. Wagtail will take care of the rest. Here are some Wagtail-specific types that you might include as fields in your models. @@ -262,7 +262,7 @@ By adding CSS classes to your panel definitions or adding extra parameters to yo Full-Width Input ---------------- -Use ``classname="full"`` to make a field (input element) stretch the full width of the Wagtail page editor. This will not work if the field is encapsulated in a :class:`~wagtail.wagtailadmin.edit_handlers.MultiFieldPanel`, which places its child fields into a formset. +Use ``classname="full"`` to make a field (input element) stretch the full width of the Wagtail page editor. This will not work if the field is encapsulated in a :class:`~wagtail.admin.edit_handlers.MultiFieldPanel`, which places its child fields into a formset. Titles @@ -327,7 +327,7 @@ Let's look at the example of adding related links to a :class:`~wagtail.core.mod InlinePanel('related_links', label="Related Links"), ] -The ``RelatedLink`` class is a vanilla Django abstract model. The ``BookPageRelatedLinks`` model extends it with capability for being ordered in the Wagtail interface via the ``Orderable`` class as well as adding a ``page`` property which links the model to the ``BookPage`` model we're adding the related links objects to. Finally, in the panel definitions for ``BookPage``, we'll add an :class:`~wagtail.wagtailadmin.edit_handlers.InlinePanel` to provide an interface for it all. Let's look again at the parameters that :class:`~wagtail.wagtailadmin.edit_handlers.InlinePanel` accepts: +The ``RelatedLink`` class is a vanilla Django abstract model. The ``BookPageRelatedLinks`` model extends it with capability for being ordered in the Wagtail interface via the ``Orderable`` class as well as adding a ``page`` property which links the model to the ``BookPage`` model we're adding the related links objects to. Finally, in the panel definitions for ``BookPage``, we'll add an :class:`~wagtail.admin.edit_handlers.InlinePanel` to provide an interface for it all. Let's look again at the parameters that :class:`~wagtail.admin.edit_handlers.InlinePanel` accepts: .. code-block:: python @@ -337,7 +337,7 @@ The ``relation_name`` is the ``related_name`` label given to the cluster's ``Par .. versionchanged:: 1.0 - In previous versions, it was necessary to pass the base model as the first parameter to :class:`~wagtail.wagtailadmin.edit_handlers.InlinePanel`; this is no longer required. + In previous versions, it was necessary to pass the base model as the first parameter to :class:`~wagtail.admin.edit_handlers.InlinePanel`; this is no longer required. For another example of using model clusters, see :ref:`tagging` diff --git a/docs/topics/pages.rst b/docs/topics/pages.rst index c5bd827ff1..81b0df6fd1 100644 --- a/docs/topics/pages.rst +++ b/docs/topics/pages.rst @@ -28,7 +28,7 @@ This example represents a typical blog post: from wagtail.core.models import Page, Orderable from wagtail.core.fields import RichTextField - from wagtail.wagtailadmin.edit_handlers import FieldPanel, MultiFieldPanel, InlinePanel + from wagtail.admin.edit_handlers import FieldPanel, MultiFieldPanel, InlinePanel from wagtail.wagtailimages.edit_handlers import ImageChooserPanel from wagtail.wagtailsearch import index @@ -143,22 +143,22 @@ Here's a summary of the ``EditHandler`` classes that Wagtail provides out of the These allow editing of model fields. The ``FieldPanel`` class will choose the correct widget based on the type of the field, though ``StreamField`` fields need to use a specialised panel class. - - :class:`~wagtail.wagtailadmin.edit_handlers.FieldPanel` - - :class:`~wagtail.wagtailadmin.edit_handlers.StreamFieldPanel` + - :class:`~wagtail.admin.edit_handlers.FieldPanel` + - :class:`~wagtail.admin.edit_handlers.StreamFieldPanel` **Structural** These are used for structuring fields in the interface. - - :class:`~wagtail.wagtailadmin.edit_handlers.MultiFieldPanel` - For grouping similar fields together - - :class:`~wagtail.wagtailadmin.edit_handlers.InlinePanel` - For inlining child models - - :class:`~wagtail.wagtailadmin.edit_handlers.FieldRowPanel` - For organising multiple fields into a single row + - :class:`~wagtail.admin.edit_handlers.MultiFieldPanel` - For grouping similar fields together + - :class:`~wagtail.admin.edit_handlers.InlinePanel` - For inlining child models + - :class:`~wagtail.admin.edit_handlers.FieldRowPanel` - For organising multiple fields into a single row **Chooser** ``ForeignKey`` fields to certain models can use one of the below ``ChooserPanel`` classes. These add a nice modal chooser interface, and the image/document choosers also allow uploading new files without leaving the page editor. - - :class:`~wagtail.wagtailadmin.edit_handlers.PageChooserPanel` + - :class:`~wagtail.admin.edit_handlers.PageChooserPanel` - :class:`~wagtail.wagtailimages.edit_handlers.ImageChooserPanel` - :class:`~wagtail.wagtaildocs.edit_handlers.DocumentChooserPanel` - :class:`~wagtail.wagtailsnippets.edit_handlers.SnippetChooserPanel` @@ -393,7 +393,7 @@ For example, the following inline model can be used to add related links (a list FieldPanel('url'), ] -To add this to the admin interface, use the :class:`~wagtail.wagtailadmin.edit_handlers.InlinePanel` edit panel class: +To add this to the admin interface, use the :class:`~wagtail.admin.edit_handlers.InlinePanel` edit panel class: .. code-block:: python diff --git a/docs/topics/snippets.rst b/docs/topics/snippets.rst index f2e7728a76..a051490cad 100644 --- a/docs/topics/snippets.rst +++ b/docs/topics/snippets.rst @@ -17,7 +17,7 @@ Here's an example snippet model: from django.db import models - from wagtail.wagtailadmin.edit_handlers import FieldPanel + from wagtail.admin.edit_handlers import FieldPanel from wagtail.wagtailsnippets.models import register_snippet ... diff --git a/docs/topics/streamfield.rst b/docs/topics/streamfield.rst index 8ca0e0a7b9..b6be85dea4 100644 --- a/docs/topics/streamfield.rst +++ b/docs/topics/streamfield.rst @@ -22,7 +22,7 @@ Using StreamField from wagtail.core.models import Page from wagtail.core.fields import StreamField from wagtail.core import blocks - from wagtail.wagtailadmin.edit_handlers import FieldPanel, StreamFieldPanel + from wagtail.admin.edit_handlers import FieldPanel, StreamFieldPanel from wagtail.wagtailimages.blocks import ImageChooserBlock class BlogPage(Page): diff --git a/wagtail/wagtailadmin/.gitignore b/wagtail/admin/.gitignore similarity index 100% rename from wagtail/wagtailadmin/.gitignore rename to wagtail/admin/.gitignore diff --git a/wagtail/admin/__init__.py b/wagtail/admin/__init__.py new file mode 100644 index 0000000000..e61cda1985 --- /dev/null +++ b/wagtail/admin/__init__.py @@ -0,0 +1 @@ +default_app_config = 'wagtail.admin.apps.WagtailAdminAppConfig' diff --git a/wagtail/wagtailadmin/api/__init__.py b/wagtail/admin/api/__init__.py similarity index 100% rename from wagtail/wagtailadmin/api/__init__.py rename to wagtail/admin/api/__init__.py diff --git a/wagtail/wagtailadmin/api/endpoints.py b/wagtail/admin/api/endpoints.py similarity index 100% rename from wagtail/wagtailadmin/api/endpoints.py rename to wagtail/admin/api/endpoints.py diff --git a/wagtail/wagtailadmin/api/filters.py b/wagtail/admin/api/filters.py similarity index 100% rename from wagtail/wagtailadmin/api/filters.py rename to wagtail/admin/api/filters.py diff --git a/wagtail/wagtailadmin/api/serializers.py b/wagtail/admin/api/serializers.py similarity index 100% rename from wagtail/wagtailadmin/api/serializers.py rename to wagtail/admin/api/serializers.py diff --git a/wagtail/wagtailadmin/api/urls.py b/wagtail/admin/api/urls.py similarity index 100% rename from wagtail/wagtailadmin/api/urls.py rename to wagtail/admin/api/urls.py diff --git a/wagtail/wagtailadmin/apps.py b/wagtail/admin/apps.py similarity index 86% rename from wagtail/wagtailadmin/apps.py rename to wagtail/admin/apps.py index 5ee4a5f23f..d4ed82eac4 100644 --- a/wagtail/wagtailadmin/apps.py +++ b/wagtail/admin/apps.py @@ -6,6 +6,6 @@ from . import checks # NOQA class WagtailAdminAppConfig(AppConfig): - name = 'wagtail.wagtailadmin' + name = 'wagtail.admin' label = 'wagtailadmin' verbose_name = "Wagtail admin" diff --git a/wagtail/wagtailadmin/blocks.py b/wagtail/admin/blocks.py similarity index 52% rename from wagtail/wagtailadmin/blocks.py rename to wagtail/admin/blocks.py index 3b2ea2266e..e063b32b0a 100644 --- a/wagtail/wagtailadmin/blocks.py +++ b/wagtail/admin/blocks.py @@ -4,4 +4,4 @@ import warnings from wagtail.core.blocks import * # noqa -warnings.warn("wagtail.wagtailadmin.blocks has moved to wagtail.core.blocks", UserWarning, stacklevel=2) +warnings.warn("wagtail.admin.blocks has moved to wagtail.core.blocks", UserWarning, stacklevel=2) diff --git a/wagtail/wagtailadmin/checks.py b/wagtail/admin/checks.py similarity index 94% rename from wagtail/wagtailadmin/checks.py rename to wagtail/admin/checks.py index fe872b7bd9..bfdc64c6cf 100644 --- a/wagtail/wagtailadmin/checks.py +++ b/wagtail/admin/checks.py @@ -34,7 +34,7 @@ def css_install_check(app_configs, **kwargs): @register() def base_form_class_check(app_configs, **kwargs): - from wagtail.wagtailadmin.forms import WagtailAdminPageForm + from wagtail.admin.forms import WagtailAdminPageForm from wagtail.core.models import get_page_models errors = [] @@ -55,7 +55,7 @@ def base_form_class_check(app_configs, **kwargs): @register() def get_form_class_check(app_configs, **kwargs): - from wagtail.wagtailadmin.forms import WagtailAdminPageForm + from wagtail.admin.forms import WagtailAdminPageForm from wagtail.core.models import get_page_models errors = [] diff --git a/wagtail/wagtailadmin/compare.py b/wagtail/admin/compare.py similarity index 100% rename from wagtail/wagtailadmin/compare.py rename to wagtail/admin/compare.py diff --git a/wagtail/wagtailadmin/datetimepicker.py b/wagtail/admin/datetimepicker.py similarity index 100% rename from wagtail/wagtailadmin/datetimepicker.py rename to wagtail/admin/datetimepicker.py diff --git a/wagtail/wagtailadmin/decorators.py b/wagtail/admin/decorators.py similarity index 96% rename from wagtail/wagtailadmin/decorators.py rename to wagtail/admin/decorators.py index 482d7bee0d..0053a96a5e 100644 --- a/wagtail/wagtailadmin/decorators.py +++ b/wagtail/admin/decorators.py @@ -6,7 +6,7 @@ from django.urls import reverse from django.utils.translation import activate as activate_lang from django.utils.translation import ugettext as _ -from wagtail.wagtailadmin import messages +from wagtail.admin import messages def reject_request(request): diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/admin/edit_handlers.py similarity index 99% rename from wagtail/wagtailadmin/edit_handlers.py rename to wagtail/admin/edit_handlers.py index 150a671432..ca7a8f72eb 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/admin/edit_handlers.py @@ -14,7 +14,7 @@ from django.utils.translation import ugettext_lazy from taggit.managers import TaggableManager from wagtail.utils.decorators import cached_classmethod -from wagtail.wagtailadmin import compare, widgets +from wagtail.admin import compare, widgets from wagtail.core.fields import RichTextField from wagtail.core.models import Page from wagtail.core.utils import camelcase_to_underscore, resolve_model_string diff --git a/wagtail/wagtailadmin/forms.py b/wagtail/admin/forms.py similarity index 99% rename from wagtail/wagtailadmin/forms.py rename to wagtail/admin/forms.py index bca042b00b..183b659c7e 100644 --- a/wagtail/wagtailadmin/forms.py +++ b/wagtail/admin/forms.py @@ -18,7 +18,7 @@ from django.utils.translation import ugettext_lazy, ungettext from modelcluster.forms import ClusterForm, ClusterFormMetaclass from taggit.managers import TaggableManager -from wagtail.wagtailadmin import widgets +from wagtail.admin import widgets from wagtail.core.models import ( BaseViewRestriction, Collection, CollectionViewRestriction, GroupCollectionPermission, Page, PageViewRestriction) diff --git a/wagtail/wagtailadmin/jinja2tags.py b/wagtail/admin/jinja2tags.py similarity index 100% rename from wagtail/wagtailadmin/jinja2tags.py rename to wagtail/admin/jinja2tags.py diff --git a/wagtail/wagtailadmin/locale/ar/LC_MESSAGES/django.mo b/wagtail/admin/locale/ar/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/ar/LC_MESSAGES/django.mo rename to wagtail/admin/locale/ar/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/ar/LC_MESSAGES/django.po b/wagtail/admin/locale/ar/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/ar/LC_MESSAGES/django.po rename to wagtail/admin/locale/ar/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/bg/LC_MESSAGES/django.mo b/wagtail/admin/locale/bg/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/bg/LC_MESSAGES/django.mo rename to wagtail/admin/locale/bg/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/bg/LC_MESSAGES/django.po b/wagtail/admin/locale/bg/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/bg/LC_MESSAGES/django.po rename to wagtail/admin/locale/bg/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/ca/LC_MESSAGES/django.mo b/wagtail/admin/locale/ca/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/ca/LC_MESSAGES/django.mo rename to wagtail/admin/locale/ca/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/ca/LC_MESSAGES/django.po b/wagtail/admin/locale/ca/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/ca/LC_MESSAGES/django.po rename to wagtail/admin/locale/ca/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/cs/LC_MESSAGES/django.mo b/wagtail/admin/locale/cs/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/cs/LC_MESSAGES/django.mo rename to wagtail/admin/locale/cs/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/cs/LC_MESSAGES/django.po b/wagtail/admin/locale/cs/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/cs/LC_MESSAGES/django.po rename to wagtail/admin/locale/cs/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/cy/LC_MESSAGES/django.mo b/wagtail/admin/locale/cy/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/cy/LC_MESSAGES/django.mo rename to wagtail/admin/locale/cy/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/cy/LC_MESSAGES/django.po b/wagtail/admin/locale/cy/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/cy/LC_MESSAGES/django.po rename to wagtail/admin/locale/cy/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/de/LC_MESSAGES/django.mo b/wagtail/admin/locale/de/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/de/LC_MESSAGES/django.mo rename to wagtail/admin/locale/de/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/de/LC_MESSAGES/django.po b/wagtail/admin/locale/de/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/de/LC_MESSAGES/django.po rename to wagtail/admin/locale/de/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/el/LC_MESSAGES/django.mo b/wagtail/admin/locale/el/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/el/LC_MESSAGES/django.mo rename to wagtail/admin/locale/el/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/el/LC_MESSAGES/django.po b/wagtail/admin/locale/el/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/el/LC_MESSAGES/django.po rename to wagtail/admin/locale/el/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/en/LC_MESSAGES/django.mo b/wagtail/admin/locale/en/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/en/LC_MESSAGES/django.mo rename to wagtail/admin/locale/en/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/en/LC_MESSAGES/django.po b/wagtail/admin/locale/en/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/en/LC_MESSAGES/django.po rename to wagtail/admin/locale/en/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/es/LC_MESSAGES/django.mo b/wagtail/admin/locale/es/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/es/LC_MESSAGES/django.mo rename to wagtail/admin/locale/es/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/es/LC_MESSAGES/django.po b/wagtail/admin/locale/es/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/es/LC_MESSAGES/django.po rename to wagtail/admin/locale/es/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/eu/LC_MESSAGES/django.mo b/wagtail/admin/locale/eu/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/eu/LC_MESSAGES/django.mo rename to wagtail/admin/locale/eu/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/eu/LC_MESSAGES/django.po b/wagtail/admin/locale/eu/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/eu/LC_MESSAGES/django.po rename to wagtail/admin/locale/eu/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/fa/LC_MESSAGES/django.mo b/wagtail/admin/locale/fa/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/fa/LC_MESSAGES/django.mo rename to wagtail/admin/locale/fa/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/fa/LC_MESSAGES/django.po b/wagtail/admin/locale/fa/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/fa/LC_MESSAGES/django.po rename to wagtail/admin/locale/fa/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/fi/LC_MESSAGES/django.mo b/wagtail/admin/locale/fi/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/fi/LC_MESSAGES/django.mo rename to wagtail/admin/locale/fi/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/fi/LC_MESSAGES/django.po b/wagtail/admin/locale/fi/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/fi/LC_MESSAGES/django.po rename to wagtail/admin/locale/fi/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/fr/LC_MESSAGES/django.mo b/wagtail/admin/locale/fr/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/fr/LC_MESSAGES/django.mo rename to wagtail/admin/locale/fr/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/fr/LC_MESSAGES/django.po b/wagtail/admin/locale/fr/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/fr/LC_MESSAGES/django.po rename to wagtail/admin/locale/fr/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/gl/LC_MESSAGES/django.mo b/wagtail/admin/locale/gl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/gl/LC_MESSAGES/django.mo rename to wagtail/admin/locale/gl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/gl/LC_MESSAGES/django.po b/wagtail/admin/locale/gl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/gl/LC_MESSAGES/django.po rename to wagtail/admin/locale/gl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/he_IL/LC_MESSAGES/django.mo b/wagtail/admin/locale/he_IL/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/he_IL/LC_MESSAGES/django.mo rename to wagtail/admin/locale/he_IL/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/he_IL/LC_MESSAGES/django.po b/wagtail/admin/locale/he_IL/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/he_IL/LC_MESSAGES/django.po rename to wagtail/admin/locale/he_IL/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/hr_HR/LC_MESSAGES/django.mo b/wagtail/admin/locale/hr_HR/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/hr_HR/LC_MESSAGES/django.mo rename to wagtail/admin/locale/hr_HR/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/hr_HR/LC_MESSAGES/django.po b/wagtail/admin/locale/hr_HR/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/hr_HR/LC_MESSAGES/django.po rename to wagtail/admin/locale/hr_HR/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/hu/LC_MESSAGES/django.mo b/wagtail/admin/locale/hu/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/hu/LC_MESSAGES/django.mo rename to wagtail/admin/locale/hu/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/hu/LC_MESSAGES/django.po b/wagtail/admin/locale/hu/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/hu/LC_MESSAGES/django.po rename to wagtail/admin/locale/hu/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/id_ID/LC_MESSAGES/django.mo b/wagtail/admin/locale/id_ID/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/id_ID/LC_MESSAGES/django.mo rename to wagtail/admin/locale/id_ID/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/id_ID/LC_MESSAGES/django.po b/wagtail/admin/locale/id_ID/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/id_ID/LC_MESSAGES/django.po rename to wagtail/admin/locale/id_ID/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/is_IS/LC_MESSAGES/django.mo b/wagtail/admin/locale/is_IS/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/is_IS/LC_MESSAGES/django.mo rename to wagtail/admin/locale/is_IS/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/is_IS/LC_MESSAGES/django.po b/wagtail/admin/locale/is_IS/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/is_IS/LC_MESSAGES/django.po rename to wagtail/admin/locale/is_IS/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/it/LC_MESSAGES/django.mo b/wagtail/admin/locale/it/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/it/LC_MESSAGES/django.mo rename to wagtail/admin/locale/it/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/it/LC_MESSAGES/django.po b/wagtail/admin/locale/it/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/it/LC_MESSAGES/django.po rename to wagtail/admin/locale/it/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/ja/LC_MESSAGES/django.mo b/wagtail/admin/locale/ja/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/ja/LC_MESSAGES/django.mo rename to wagtail/admin/locale/ja/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/ja/LC_MESSAGES/django.po b/wagtail/admin/locale/ja/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/ja/LC_MESSAGES/django.po rename to wagtail/admin/locale/ja/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/ka/LC_MESSAGES/django.mo b/wagtail/admin/locale/ka/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/ka/LC_MESSAGES/django.mo rename to wagtail/admin/locale/ka/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/ka/LC_MESSAGES/django.po b/wagtail/admin/locale/ka/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/ka/LC_MESSAGES/django.po rename to wagtail/admin/locale/ka/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/ko/LC_MESSAGES/django.mo b/wagtail/admin/locale/ko/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/ko/LC_MESSAGES/django.mo rename to wagtail/admin/locale/ko/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/ko/LC_MESSAGES/django.po b/wagtail/admin/locale/ko/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/ko/LC_MESSAGES/django.po rename to wagtail/admin/locale/ko/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/lt/LC_MESSAGES/django.mo b/wagtail/admin/locale/lt/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/lt/LC_MESSAGES/django.mo rename to wagtail/admin/locale/lt/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/lt/LC_MESSAGES/django.po b/wagtail/admin/locale/lt/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/lt/LC_MESSAGES/django.po rename to wagtail/admin/locale/lt/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/lv/LC_MESSAGES/django.mo b/wagtail/admin/locale/lv/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/lv/LC_MESSAGES/django.mo rename to wagtail/admin/locale/lv/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/lv/LC_MESSAGES/django.po b/wagtail/admin/locale/lv/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/lv/LC_MESSAGES/django.po rename to wagtail/admin/locale/lv/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/mn/LC_MESSAGES/django.mo b/wagtail/admin/locale/mn/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/mn/LC_MESSAGES/django.mo rename to wagtail/admin/locale/mn/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/mn/LC_MESSAGES/django.po b/wagtail/admin/locale/mn/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/mn/LC_MESSAGES/django.po rename to wagtail/admin/locale/mn/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/nb/LC_MESSAGES/django.mo b/wagtail/admin/locale/nb/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/nb/LC_MESSAGES/django.mo rename to wagtail/admin/locale/nb/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/nb/LC_MESSAGES/django.po b/wagtail/admin/locale/nb/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/nb/LC_MESSAGES/django.po rename to wagtail/admin/locale/nb/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/nl/LC_MESSAGES/django.mo b/wagtail/admin/locale/nl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/nl/LC_MESSAGES/django.mo rename to wagtail/admin/locale/nl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/nl/LC_MESSAGES/django.po b/wagtail/admin/locale/nl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/nl/LC_MESSAGES/django.po rename to wagtail/admin/locale/nl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/nl_NL/LC_MESSAGES/django.mo b/wagtail/admin/locale/nl_NL/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/nl_NL/LC_MESSAGES/django.mo rename to wagtail/admin/locale/nl_NL/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/nl_NL/LC_MESSAGES/django.po b/wagtail/admin/locale/nl_NL/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/nl_NL/LC_MESSAGES/django.po rename to wagtail/admin/locale/nl_NL/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/pl/LC_MESSAGES/django.mo b/wagtail/admin/locale/pl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/pl/LC_MESSAGES/django.mo rename to wagtail/admin/locale/pl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/pl/LC_MESSAGES/django.po b/wagtail/admin/locale/pl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/pl/LC_MESSAGES/django.po rename to wagtail/admin/locale/pl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/pt_BR/LC_MESSAGES/django.mo b/wagtail/admin/locale/pt_BR/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/pt_BR/LC_MESSAGES/django.mo rename to wagtail/admin/locale/pt_BR/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/pt_BR/LC_MESSAGES/django.po b/wagtail/admin/locale/pt_BR/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/pt_BR/LC_MESSAGES/django.po rename to wagtail/admin/locale/pt_BR/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/pt_PT/LC_MESSAGES/django.mo b/wagtail/admin/locale/pt_PT/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/pt_PT/LC_MESSAGES/django.mo rename to wagtail/admin/locale/pt_PT/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/pt_PT/LC_MESSAGES/django.po b/wagtail/admin/locale/pt_PT/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/pt_PT/LC_MESSAGES/django.po rename to wagtail/admin/locale/pt_PT/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/ro/LC_MESSAGES/django.mo b/wagtail/admin/locale/ro/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/ro/LC_MESSAGES/django.mo rename to wagtail/admin/locale/ro/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/ro/LC_MESSAGES/django.po b/wagtail/admin/locale/ro/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/ro/LC_MESSAGES/django.po rename to wagtail/admin/locale/ro/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/ru/LC_MESSAGES/django.mo b/wagtail/admin/locale/ru/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/ru/LC_MESSAGES/django.mo rename to wagtail/admin/locale/ru/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/ru/LC_MESSAGES/django.po b/wagtail/admin/locale/ru/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/ru/LC_MESSAGES/django.po rename to wagtail/admin/locale/ru/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/sk_SK/LC_MESSAGES/django.mo b/wagtail/admin/locale/sk_SK/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/sk_SK/LC_MESSAGES/django.mo rename to wagtail/admin/locale/sk_SK/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/sk_SK/LC_MESSAGES/django.po b/wagtail/admin/locale/sk_SK/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/sk_SK/LC_MESSAGES/django.po rename to wagtail/admin/locale/sk_SK/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/sl/LC_MESSAGES/django.mo b/wagtail/admin/locale/sl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/sl/LC_MESSAGES/django.mo rename to wagtail/admin/locale/sl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/sl/LC_MESSAGES/django.po b/wagtail/admin/locale/sl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/sl/LC_MESSAGES/django.po rename to wagtail/admin/locale/sl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/sv/LC_MESSAGES/django.mo b/wagtail/admin/locale/sv/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/sv/LC_MESSAGES/django.mo rename to wagtail/admin/locale/sv/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/sv/LC_MESSAGES/django.po b/wagtail/admin/locale/sv/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/sv/LC_MESSAGES/django.po rename to wagtail/admin/locale/sv/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/tr/LC_MESSAGES/django.mo b/wagtail/admin/locale/tr/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/tr/LC_MESSAGES/django.mo rename to wagtail/admin/locale/tr/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/tr/LC_MESSAGES/django.po b/wagtail/admin/locale/tr/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/tr/LC_MESSAGES/django.po rename to wagtail/admin/locale/tr/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/uk/LC_MESSAGES/django.mo b/wagtail/admin/locale/uk/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/uk/LC_MESSAGES/django.mo rename to wagtail/admin/locale/uk/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/uk/LC_MESSAGES/django.po b/wagtail/admin/locale/uk/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/uk/LC_MESSAGES/django.po rename to wagtail/admin/locale/uk/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/zh/LC_MESSAGES/django.mo b/wagtail/admin/locale/zh/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/zh/LC_MESSAGES/django.mo rename to wagtail/admin/locale/zh/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/zh/LC_MESSAGES/django.po b/wagtail/admin/locale/zh/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/zh/LC_MESSAGES/django.po rename to wagtail/admin/locale/zh/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/locale/zh_CN/LC_MESSAGES/django.mo b/wagtail/admin/locale/zh_CN/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailadmin/locale/zh_CN/LC_MESSAGES/django.mo rename to wagtail/admin/locale/zh_CN/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailadmin/locale/zh_CN/LC_MESSAGES/django.po b/wagtail/admin/locale/zh_CN/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailadmin/locale/zh_CN/LC_MESSAGES/django.po rename to wagtail/admin/locale/zh_CN/LC_MESSAGES/django.po diff --git a/wagtail/wagtailadmin/menu.py b/wagtail/admin/menu.py similarity index 100% rename from wagtail/wagtailadmin/menu.py rename to wagtail/admin/menu.py diff --git a/wagtail/wagtailadmin/messages.py b/wagtail/admin/messages.py similarity index 100% rename from wagtail/wagtailadmin/messages.py rename to wagtail/admin/messages.py diff --git a/wagtail/wagtailadmin/migrations/0001_create_admin_access_permissions.py b/wagtail/admin/migrations/0001_create_admin_access_permissions.py similarity index 100% rename from wagtail/wagtailadmin/migrations/0001_create_admin_access_permissions.py rename to wagtail/admin/migrations/0001_create_admin_access_permissions.py diff --git a/wagtail/wagtailadmin/migrations/__init__.py b/wagtail/admin/migrations/__init__.py similarity index 100% rename from wagtail/wagtailadmin/migrations/__init__.py rename to wagtail/admin/migrations/__init__.py diff --git a/wagtail/wagtailadmin/modal_workflow.py b/wagtail/admin/modal_workflow.py similarity index 100% rename from wagtail/wagtailadmin/modal_workflow.py rename to wagtail/admin/modal_workflow.py diff --git a/wagtail/wagtailadmin/models.py b/wagtail/admin/models.py similarity index 85% rename from wagtail/wagtailadmin/models.py rename to wagtail/admin/models.py index da38b397c4..18a2a42a57 100644 --- a/wagtail/wagtailadmin/models.py +++ b/wagtail/admin/models.py @@ -4,4 +4,4 @@ from __future__ import absolute_import, unicode_literals # wagtailadmin (namely, base_form_class and get_edit_handler). Importing this within # wagtailadmin.models ensures that this happens in advance of running wagtailadmin's # system checks. -from wagtail.wagtailadmin import edit_handlers # NOQA +from wagtail.admin import edit_handlers # NOQA diff --git a/wagtail/wagtailadmin/navigation.py b/wagtail/admin/navigation.py similarity index 100% rename from wagtail/wagtailadmin/navigation.py rename to wagtail/admin/navigation.py diff --git a/wagtail/wagtailadmin/rich_text.py b/wagtail/admin/rich_text.py similarity index 97% rename from wagtail/wagtailadmin/rich_text.py rename to wagtail/admin/rich_text.py index 8db904352a..553904f041 100644 --- a/wagtail/wagtailadmin/rich_text.py +++ b/wagtail/admin/rich_text.py @@ -8,7 +8,7 @@ from django.forms import Media, widgets from django.utils.module_loading import import_string from wagtail.utils.widgets import WidgetWithScript -from wagtail.wagtailadmin.edit_handlers import RichTextFieldPanel +from wagtail.admin.edit_handlers import RichTextFieldPanel from wagtail.core.rich_text import DbWhitelister, expand_db_html, features @@ -144,7 +144,7 @@ class HalloRichTextArea(WidgetWithScript, widgets.Textarea): DEFAULT_RICH_TEXT_EDITORS = { 'default': { - 'WIDGET': 'wagtail.wagtailadmin.rich_text.HalloRichTextArea' + 'WIDGET': 'wagtail.admin.rich_text.HalloRichTextArea' } } diff --git a/wagtail/wagtailadmin/search.py b/wagtail/admin/search.py similarity index 98% rename from wagtail/wagtailadmin/search.py rename to wagtail/admin/search.py index 8cd34a722f..dcc799229b 100644 --- a/wagtail/wagtailadmin/search.py +++ b/wagtail/admin/search.py @@ -8,7 +8,7 @@ from django.utils.safestring import mark_safe from django.utils.six import with_metaclass from django.utils.text import slugify -from wagtail.wagtailadmin.forms import SearchForm +from wagtail.admin.forms import SearchForm from wagtail.core import hooks diff --git a/wagtail/wagtailadmin/signals.py b/wagtail/admin/signals.py similarity index 100% rename from wagtail/wagtailadmin/signals.py rename to wagtail/admin/signals.py diff --git a/wagtail/wagtailadmin/site_summary.py b/wagtail/admin/site_summary.py similarity index 96% rename from wagtail/wagtailadmin/site_summary.py rename to wagtail/admin/site_summary.py index 8d9f7e02f2..418d8850ae 100644 --- a/wagtail/wagtailadmin/site_summary.py +++ b/wagtail/admin/site_summary.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.template.loader import render_to_string -from wagtail.wagtailadmin.utils import user_has_any_page_permission +from wagtail.admin.utils import user_has_any_page_permission from wagtail.core import hooks from wagtail.core.models import Page, Site diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/app/wagtailadmin.entry.js b/wagtail/admin/static_src/wagtailadmin/app/wagtailadmin.entry.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/app/wagtailadmin.entry.js rename to wagtail/admin/static_src/wagtailadmin/app/wagtailadmin.entry.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/app/wagtailadmin.entry.test.js b/wagtail/admin/static_src/wagtailadmin/app/wagtailadmin.entry.test.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/app/wagtailadmin.entry.test.js rename to wagtail/admin/static_src/wagtailadmin/app/wagtailadmin.entry.test.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/css/normalize.css b/wagtail/admin/static_src/wagtailadmin/css/normalize.css similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/css/normalize.css rename to wagtail/admin/static_src/wagtailadmin/css/normalize.css diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/animated-overlay.gif b/wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/animated-overlay.gif similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/animated-overlay.gif rename to wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/animated-overlay.gif diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png b/wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png rename to wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_246060_40x100.png b/wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_246060_40x100.png similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_246060_40x100.png rename to wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_246060_40x100.png diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_49c0c1_40x100.png b/wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_49c0c1_40x100.png similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_49c0c1_40x100.png rename to wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_49c0c1_40x100.png diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_e8f8f9_40x100.png b/wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_e8f8f9_40x100.png similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_e8f8f9_40x100.png rename to wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_e8f8f9_40x100.png diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_f7474e_40x100.png b/wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_f7474e_40x100.png similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_f7474e_40x100.png rename to wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_f7474e_40x100.png diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_ffffff_40x100.png b/wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_ffffff_40x100.png similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_ffffff_40x100.png rename to wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_ffffff_40x100.png diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_65_49c0c1_40x100.png b/wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_65_49c0c1_40x100.png similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_65_49c0c1_40x100.png rename to wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_65_49c0c1_40x100.png diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_222222_256x240.png b/wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_222222_256x240.png similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_222222_256x240.png rename to wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_222222_256x240.png diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_49c0c1_256x240.png b/wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_49c0c1_256x240.png similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_49c0c1_256x240.png rename to wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_49c0c1_256x240.png diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_555555_256x240.png b/wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_555555_256x240.png similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_555555_256x240.png rename to wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_555555_256x240.png diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_ffffff_256x240.png b/wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_ffffff_256x240.png similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_ffffff_256x240.png rename to wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_ffffff_256x240.png diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css b/wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css rename to wagtail/admin/static_src/wagtailadmin/css/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery.tagit.css b/wagtail/admin/static_src/wagtailadmin/css/vendor/jquery.tagit.css similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery.tagit.css rename to wagtail/admin/static_src/wagtailadmin/css/vendor/jquery.tagit.css diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/tagit.ui-zendesk.css b/wagtail/admin/static_src/wagtailadmin/css/vendor/tagit.ui-zendesk.css similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/tagit.ui-zendesk.css rename to wagtail/admin/static_src/wagtailadmin/css/vendor/tagit.ui-zendesk.css diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-bold.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-bold.ttf similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-bold.ttf rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-bold.ttf diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-bold.woff b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-bold.woff similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-bold.woff rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-bold.woff diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-bold.woff2 b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-bold.woff2 similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-bold.woff2 rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-bold.woff2 diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-bolditalic.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-bolditalic.ttf similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-bolditalic.ttf rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-bolditalic.ttf diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-bolditalic.woff b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-bolditalic.woff similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-bolditalic.woff rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-bolditalic.woff diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-bolditalic.woff2 b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-bolditalic.woff2 similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-bolditalic.woff2 rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-bolditalic.woff2 diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-italic.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-italic.ttf similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-italic.ttf rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-italic.ttf diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-italic.woff b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-italic.woff similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-italic.woff rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-italic.woff diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-italic.woff2 b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-italic.woff2 similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-italic.woff2 rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-italic.woff2 diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-light.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-light.ttf similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-light.ttf rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-light.ttf diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-light.woff b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-light.woff similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-light.woff rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-light.woff diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-light.woff2 b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-light.woff2 similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-light.woff2 rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-light.woff2 diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-lightitalic.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-lightitalic.ttf similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-lightitalic.ttf rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-lightitalic.ttf diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-lightitalic.woff b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-lightitalic.woff similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-lightitalic.woff rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-lightitalic.woff diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-lightitalic.woff2 b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-lightitalic.woff2 similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-lightitalic.woff2 rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-lightitalic.woff2 diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-regular.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-regular.ttf similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-regular.ttf rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-regular.ttf diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-regular.woff b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-regular.woff similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-regular.woff rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-regular.woff diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-regular.woff2 b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-regular.woff2 similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-regular.woff2 rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-regular.woff2 diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-semibold.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-semibold.ttf similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-semibold.ttf rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-semibold.ttf diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-semibold.woff b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-semibold.woff similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-semibold.woff rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-semibold.woff diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-semibold.woff2 b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-semibold.woff2 similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-semibold.woff2 rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-semibold.woff2 diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-semibolditalic.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-semibolditalic.ttf similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-semibolditalic.ttf rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-semibolditalic.ttf diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-semibolditalic.woff b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-semibolditalic.woff similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-semibolditalic.woff rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-semibolditalic.woff diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-semibolditalic.woff2 b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-semibolditalic.woff2 similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/opensans-semibolditalic.woff2 rename to wagtail/admin/static_src/wagtailadmin/fonts/opensans-semibolditalic.woff2 diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/robotoslab-bold.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/robotoslab-bold.ttf similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/robotoslab-bold.ttf rename to wagtail/admin/static_src/wagtailadmin/fonts/robotoslab-bold.ttf diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/robotoslab-bold.woff b/wagtail/admin/static_src/wagtailadmin/fonts/robotoslab-bold.woff similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/robotoslab-bold.woff rename to wagtail/admin/static_src/wagtailadmin/fonts/robotoslab-bold.woff diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/robotoslab-bold.woff2 b/wagtail/admin/static_src/wagtailadmin/fonts/robotoslab-bold.woff2 similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/robotoslab-bold.woff2 rename to wagtail/admin/static_src/wagtailadmin/fonts/robotoslab-bold.woff2 diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/robotoslab-regular.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/robotoslab-regular.ttf similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/robotoslab-regular.ttf rename to wagtail/admin/static_src/wagtailadmin/fonts/robotoslab-regular.ttf diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/robotoslab-regular.woff b/wagtail/admin/static_src/wagtailadmin/fonts/robotoslab-regular.woff similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/robotoslab-regular.woff rename to wagtail/admin/static_src/wagtailadmin/fonts/robotoslab-regular.woff diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/robotoslab-regular.woff2 b/wagtail/admin/static_src/wagtailadmin/fonts/robotoslab-regular.woff2 similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/robotoslab-regular.woff2 rename to wagtail/admin/static_src/wagtailadmin/fonts/robotoslab-regular.woff2 diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail-icomoon.json b/wagtail/admin/static_src/wagtailadmin/fonts/wagtail-icomoon.json similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail-icomoon.json rename to wagtail/admin/static_src/wagtailadmin/fonts/wagtail-icomoon.json diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.eot b/wagtail/admin/static_src/wagtailadmin/fonts/wagtail.eot similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.eot rename to wagtail/admin/static_src/wagtailadmin/fonts/wagtail.eot diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.svg b/wagtail/admin/static_src/wagtailadmin/fonts/wagtail.svg similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.svg rename to wagtail/admin/static_src/wagtailadmin/fonts/wagtail.svg diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/wagtail.ttf similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.ttf rename to wagtail/admin/static_src/wagtailadmin/fonts/wagtail.ttf diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.woff b/wagtail/admin/static_src/wagtailadmin/fonts/wagtail.woff similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.woff rename to wagtail/admin/static_src/wagtailadmin/fonts/wagtail.woff diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/images/bg-body.svg b/wagtail/admin/static_src/wagtailadmin/images/bg-body.svg similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/images/bg-body.svg rename to wagtail/admin/static_src/wagtailadmin/images/bg-body.svg diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/images/bg-dark-diag.svg b/wagtail/admin/static_src/wagtailadmin/images/bg-dark-diag.svg similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/images/bg-dark-diag.svg rename to wagtail/admin/static_src/wagtailadmin/images/bg-dark-diag.svg diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/images/bg-light-diag.svg b/wagtail/admin/static_src/wagtailadmin/images/bg-light-diag.svg similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/images/bg-light-diag.svg rename to wagtail/admin/static_src/wagtailadmin/images/bg-light-diag.svg diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/images/email-header.jpg b/wagtail/admin/static_src/wagtailadmin/images/email-header.jpg similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/images/email-header.jpg rename to wagtail/admin/static_src/wagtailadmin/images/email-header.jpg diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/images/favicon.ico b/wagtail/admin/static_src/wagtailadmin/images/favicon.ico similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/images/favicon.ico rename to wagtail/admin/static_src/wagtailadmin/images/favicon.ico diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/images/logo-body.svg b/wagtail/admin/static_src/wagtailadmin/images/logo-body.svg similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/images/logo-body.svg rename to wagtail/admin/static_src/wagtailadmin/images/logo-body.svg diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/images/logo-eyeclosed.svg b/wagtail/admin/static_src/wagtailadmin/images/logo-eyeclosed.svg similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/images/logo-eyeclosed.svg rename to wagtail/admin/static_src/wagtailadmin/images/logo-eyeclosed.svg diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/images/logo-eyeopen.svg b/wagtail/admin/static_src/wagtailadmin/images/logo-eyeopen.svg similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/images/logo-eyeopen.svg rename to wagtail/admin/static_src/wagtailadmin/images/logo-eyeopen.svg diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/images/logo-tail.svg b/wagtail/admin/static_src/wagtailadmin/images/logo-tail.svg similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/images/logo-tail.svg rename to wagtail/admin/static_src/wagtailadmin/images/logo-tail.svg diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/images/spinner.gif b/wagtail/admin/static_src/wagtailadmin/images/spinner.gif similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/images/spinner.gif rename to wagtail/admin/static_src/wagtailadmin/images/spinner.gif diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/images/transparency.svg b/wagtail/admin/static_src/wagtailadmin/images/transparency.svg similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/images/transparency.svg rename to wagtail/admin/static_src/wagtailadmin/images/transparency.svg diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/images/wagtail-logo.svg b/wagtail/admin/static_src/wagtailadmin/images/wagtail-logo.svg similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/images/wagtail-logo.svg rename to wagtail/admin/static_src/wagtailadmin/images/wagtail-logo.svg diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/list.js b/wagtail/admin/static_src/wagtailadmin/js/blocks/list.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/list.js rename to wagtail/admin/static_src/wagtailadmin/js/blocks/list.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/sequence.js b/wagtail/admin/static_src/wagtailadmin/js/blocks/sequence.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/sequence.js rename to wagtail/admin/static_src/wagtailadmin/js/blocks/sequence.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/stream.js b/wagtail/admin/static_src/wagtailadmin/js/blocks/stream.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/stream.js rename to wagtail/admin/static_src/wagtailadmin/js/blocks/stream.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/struct.js b/wagtail/admin/static_src/wagtailadmin/js/blocks/struct.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/struct.js rename to wagtail/admin/static_src/wagtailadmin/js/blocks/struct.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/core.js b/wagtail/admin/static_src/wagtailadmin/js/core.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/core.js rename to wagtail/admin/static_src/wagtailadmin/js/core.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/expanding_formset.js b/wagtail/admin/static_src/wagtailadmin/js/expanding_formset.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/expanding_formset.js rename to wagtail/admin/static_src/wagtailadmin/js/expanding_formset.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-bootstrap.js b/wagtail/admin/static_src/wagtailadmin/js/hallo-bootstrap.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-bootstrap.js rename to wagtail/admin/static_src/wagtailadmin/js/hallo-bootstrap.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-plugins/hallo-hr.js b/wagtail/admin/static_src/wagtailadmin/js/hallo-plugins/hallo-hr.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-plugins/hallo-hr.js rename to wagtail/admin/static_src/wagtailadmin/js/hallo-plugins/hallo-hr.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-plugins/hallo-requireparagraphs.js b/wagtail/admin/static_src/wagtailadmin/js/hallo-plugins/hallo-requireparagraphs.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-plugins/hallo-requireparagraphs.js rename to wagtail/admin/static_src/wagtailadmin/js/hallo-plugins/hallo-requireparagraphs.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js b/wagtail/admin/static_src/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js rename to wagtail/admin/static_src/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/modal-workflow.js b/wagtail/admin/static_src/wagtailadmin/js/modal-workflow.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/modal-workflow.js rename to wagtail/admin/static_src/wagtailadmin/js/modal-workflow.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/page-chooser.js b/wagtail/admin/static_src/wagtailadmin/js/page-chooser.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/page-chooser.js rename to wagtail/admin/static_src/wagtailadmin/js/page-chooser.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/page-editor.js b/wagtail/admin/static_src/wagtailadmin/js/page-editor.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/page-editor.js rename to wagtail/admin/static_src/wagtailadmin/js/page-editor.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/privacy-switch.js b/wagtail/admin/static_src/wagtailadmin/js/privacy-switch.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/privacy-switch.js rename to wagtail/admin/static_src/wagtailadmin/js/privacy-switch.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/submenu.js b/wagtail/admin/static_src/wagtailadmin/js/submenu.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/submenu.js rename to wagtail/admin/static_src/wagtailadmin/js/submenu.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/upgrade_notify.js b/wagtail/admin/static_src/wagtailadmin/js/upgrade_notify.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/upgrade_notify.js rename to wagtail/admin/static_src/wagtailadmin/js/upgrade_notify.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/userbar.js b/wagtail/admin/static_src/wagtailadmin/js/userbar.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/userbar.js rename to wagtail/admin/static_src/wagtailadmin/js/userbar.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/bootstrap-modal.js b/wagtail/admin/static_src/wagtailadmin/js/vendor/bootstrap-modal.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/bootstrap-modal.js rename to wagtail/admin/static_src/wagtailadmin/js/vendor/bootstrap-modal.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/bootstrap-tab.js b/wagtail/admin/static_src/wagtailadmin/js/vendor/bootstrap-tab.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/bootstrap-tab.js rename to wagtail/admin/static_src/wagtailadmin/js/vendor/bootstrap-tab.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/bootstrap-tooltip.js b/wagtail/admin/static_src/wagtailadmin/js/vendor/bootstrap-tooltip.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/bootstrap-tooltip.js rename to wagtail/admin/static_src/wagtailadmin/js/vendor/bootstrap-tooltip.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/bootstrap-transition.js b/wagtail/admin/static_src/wagtailadmin/js/vendor/bootstrap-transition.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/bootstrap-transition.js rename to wagtail/admin/static_src/wagtailadmin/js/vendor/bootstrap-transition.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/hallo.js b/wagtail/admin/static_src/wagtailadmin/js/vendor/hallo.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/hallo.js rename to wagtail/admin/static_src/wagtailadmin/js/vendor/hallo.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery-2.2.1.min.js b/wagtail/admin/static_src/wagtailadmin/js/vendor/jquery-2.2.1.min.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery-2.2.1.min.js rename to wagtail/admin/static_src/wagtailadmin/js/vendor/jquery-2.2.1.min.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery-ui-1.10.3.min.js b/wagtail/admin/static_src/wagtailadmin/js/vendor/jquery-ui-1.10.3.min.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery-ui-1.10.3.min.js rename to wagtail/admin/static_src/wagtailadmin/js/vendor/jquery-ui-1.10.3.min.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.autosize.js b/wagtail/admin/static_src/wagtailadmin/js/vendor/jquery.autosize.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.autosize.js rename to wagtail/admin/static_src/wagtailadmin/js/vendor/jquery.autosize.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.ba-throttle-debounce.min.js b/wagtail/admin/static_src/wagtailadmin/js/vendor/jquery.ba-throttle-debounce.min.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.ba-throttle-debounce.min.js rename to wagtail/admin/static_src/wagtailadmin/js/vendor/jquery.ba-throttle-debounce.min.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.datetimepicker.js b/wagtail/admin/static_src/wagtailadmin/js/vendor/jquery.datetimepicker.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.datetimepicker.js rename to wagtail/admin/static_src/wagtailadmin/js/vendor/jquery.datetimepicker.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.fileupload-process.js b/wagtail/admin/static_src/wagtailadmin/js/vendor/jquery.fileupload-process.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.fileupload-process.js rename to wagtail/admin/static_src/wagtailadmin/js/vendor/jquery.fileupload-process.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.fileupload.js b/wagtail/admin/static_src/wagtailadmin/js/vendor/jquery.fileupload.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.fileupload.js rename to wagtail/admin/static_src/wagtailadmin/js/vendor/jquery.fileupload.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.iframe-transport.js b/wagtail/admin/static_src/wagtailadmin/js/vendor/jquery.iframe-transport.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.iframe-transport.js rename to wagtail/admin/static_src/wagtailadmin/js/vendor/jquery.iframe-transport.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/modernizr-2.6.2.min.js b/wagtail/admin/static_src/wagtailadmin/js/vendor/modernizr-2.6.2.min.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/modernizr-2.6.2.min.js rename to wagtail/admin/static_src/wagtailadmin/js/vendor/modernizr-2.6.2.min.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/mousetrap.min.js b/wagtail/admin/static_src/wagtailadmin/js/vendor/mousetrap.min.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/mousetrap.min.js rename to wagtail/admin/static_src/wagtailadmin/js/vendor/mousetrap.min.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/rangy-core.js b/wagtail/admin/static_src/wagtailadmin/js/vendor/rangy-core.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/rangy-core.js rename to wagtail/admin/static_src/wagtailadmin/js/vendor/rangy-core.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/tag-it.js b/wagtail/admin/static_src/wagtailadmin/js/vendor/tag-it.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/tag-it.js rename to wagtail/admin/static_src/wagtailadmin/js/vendor/tag-it.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/urlify.js b/wagtail/admin/static_src/wagtailadmin/js/vendor/urlify.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/urlify.js rename to wagtail/admin/static_src/wagtailadmin/js/vendor/urlify.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/xregexp.min.js b/wagtail/admin/static_src/wagtailadmin/js/vendor/xregexp.min.js similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/xregexp.min.js rename to wagtail/admin/static_src/wagtailadmin/js/vendor/xregexp.min.js diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/_font-icons.scss b/wagtail/admin/static_src/wagtailadmin/scss/_font-icons.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/_font-icons.scss rename to wagtail/admin/static_src/wagtailadmin/scss/_font-icons.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/_fonts.scss b/wagtail/admin/static_src/wagtailadmin/scss/_fonts.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/_fonts.scss rename to wagtail/admin/static_src/wagtailadmin/scss/_fonts.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/_grid.scss b/wagtail/admin/static_src/wagtailadmin/scss/_grid.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/_grid.scss rename to wagtail/admin/static_src/wagtailadmin/scss/_grid.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/_mixins.scss b/wagtail/admin/static_src/wagtailadmin/scss/_mixins.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/_mixins.scss rename to wagtail/admin/static_src/wagtailadmin/scss/_mixins.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/_variables-icons.scss b/wagtail/admin/static_src/wagtailadmin/scss/_variables-icons.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/_variables-icons.scss rename to wagtail/admin/static_src/wagtailadmin/scss/_variables-icons.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/_variables.scss b/wagtail/admin/static_src/wagtailadmin/scss/_variables.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/_variables.scss rename to wagtail/admin/static_src/wagtailadmin/scss/_variables.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_datetimepicker.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_datetimepicker.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_datetimepicker.scss rename to wagtail/admin/static_src/wagtailadmin/scss/components/_datetimepicker.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_dropdowns.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_dropdowns.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_dropdowns.scss rename to wagtail/admin/static_src/wagtailadmin/scss/components/_dropdowns.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_formatters.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_formatters.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_formatters.scss rename to wagtail/admin/static_src/wagtailadmin/scss/components/_formatters.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_forms.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_forms.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_forms.scss rename to wagtail/admin/static_src/wagtailadmin/scss/components/_forms.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_header.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_header.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_header.scss rename to wagtail/admin/static_src/wagtailadmin/scss/components/_header.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_icons.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_icons.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_icons.scss rename to wagtail/admin/static_src/wagtailadmin/scss/components/_icons.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_indicator.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_indicator.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_indicator.scss rename to wagtail/admin/static_src/wagtailadmin/scss/components/_indicator.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_listing.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_listing.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_listing.scss rename to wagtail/admin/static_src/wagtailadmin/scss/components/_listing.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_logo.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_logo.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_logo.scss rename to wagtail/admin/static_src/wagtailadmin/scss/components/_logo.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_main-nav.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_main-nav.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_main-nav.scss rename to wagtail/admin/static_src/wagtailadmin/scss/components/_main-nav.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_messages.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_messages.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_messages.scss rename to wagtail/admin/static_src/wagtailadmin/scss/components/_messages.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_modals.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_modals.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_modals.scss rename to wagtail/admin/static_src/wagtailadmin/scss/components/_modals.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_progressbar.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_progressbar.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_progressbar.scss rename to wagtail/admin/static_src/wagtailadmin/scss/components/_progressbar.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_streamfield.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_streamfield.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_streamfield.scss rename to wagtail/admin/static_src/wagtailadmin/scss/components/_streamfield.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_tabs.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_tabs.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_tabs.scss rename to wagtail/admin/static_src/wagtailadmin/scss/components/_tabs.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_tooltips.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_tooltips.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_tooltips.scss rename to wagtail/admin/static_src/wagtailadmin/scss/components/_tooltips.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_typography.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_typography.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_typography.scss rename to wagtail/admin/static_src/wagtailadmin/scss/components/_typography.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/core.scss b/wagtail/admin/static_src/wagtailadmin/scss/core.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/core.scss rename to wagtail/admin/static_src/wagtailadmin/scss/core.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/404.scss b/wagtail/admin/static_src/wagtailadmin/scss/layouts/404.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/404.scss rename to wagtail/admin/static_src/wagtailadmin/scss/layouts/404.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/compare-revisions.scss b/wagtail/admin/static_src/wagtailadmin/scss/layouts/compare-revisions.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/compare-revisions.scss rename to wagtail/admin/static_src/wagtailadmin/scss/layouts/compare-revisions.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/home.scss b/wagtail/admin/static_src/wagtailadmin/scss/layouts/home.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/home.scss rename to wagtail/admin/static_src/wagtailadmin/scss/layouts/home.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/login.scss b/wagtail/admin/static_src/wagtailadmin/scss/layouts/login.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/login.scss rename to wagtail/admin/static_src/wagtailadmin/scss/layouts/login.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/admin/static_src/wagtailadmin/scss/layouts/page-editor.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/page-editor.scss rename to wagtail/admin/static_src/wagtailadmin/scss/layouts/page-editor.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/panels/rich-text.scss b/wagtail/admin/static_src/wagtailadmin/scss/panels/rich-text.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/panels/rich-text.scss rename to wagtail/admin/static_src/wagtailadmin/scss/panels/rich-text.scss diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/userbar.scss b/wagtail/admin/static_src/wagtailadmin/scss/userbar.scss similarity index 100% rename from wagtail/wagtailadmin/static_src/wagtailadmin/scss/userbar.scss rename to wagtail/admin/static_src/wagtailadmin/scss/userbar.scss diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/404.html b/wagtail/admin/templates/wagtailadmin/404.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/404.html rename to wagtail/admin/templates/wagtailadmin/404.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html b/wagtail/admin/templates/wagtailadmin/account/account.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/account/account.html rename to wagtail/admin/templates/wagtailadmin/account/account.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/change_password.html b/wagtail/admin/templates/wagtailadmin/account/change_password.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/account/change_password.html rename to wagtail/admin/templates/wagtailadmin/account/change_password.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/language_preferences.html b/wagtail/admin/templates/wagtailadmin/account/language_preferences.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/account/language_preferences.html rename to wagtail/admin/templates/wagtailadmin/account/language_preferences.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/notification_preferences.html b/wagtail/admin/templates/wagtailadmin/account/notification_preferences.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/account/notification_preferences.html rename to wagtail/admin/templates/wagtailadmin/account/notification_preferences.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html b/wagtail/admin/templates/wagtailadmin/account/password_reset/complete.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html rename to wagtail/admin/templates/wagtailadmin/account/password_reset/complete.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html b/wagtail/admin/templates/wagtailadmin/account/password_reset/confirm.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html rename to wagtail/admin/templates/wagtailadmin/account/password_reset/confirm.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html b/wagtail/admin/templates/wagtailadmin/account/password_reset/done.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html rename to wagtail/admin/templates/wagtailadmin/account/password_reset/done.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/email.txt b/wagtail/admin/templates/wagtailadmin/account/password_reset/email.txt similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/email.txt rename to wagtail/admin/templates/wagtailadmin/account/password_reset/email.txt diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/email_subject.txt b/wagtail/admin/templates/wagtailadmin/account/password_reset/email_subject.txt similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/email_subject.txt rename to wagtail/admin/templates/wagtailadmin/account/password_reset/email_subject.txt diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html b/wagtail/admin/templates/wagtailadmin/account/password_reset/form.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html rename to wagtail/admin/templates/wagtailadmin/account/password_reset/form.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html b/wagtail/admin/templates/wagtailadmin/admin_base.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html rename to wagtail/admin/templates/wagtailadmin/admin_base.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/base.html b/wagtail/admin/templates/wagtailadmin/base.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/base.html rename to wagtail/admin/templates/wagtailadmin/base.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/field.html b/wagtail/admin/templates/wagtailadmin/block_forms/field.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/block_forms/field.html rename to wagtail/admin/templates/wagtailadmin/block_forms/field.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/list.html b/wagtail/admin/templates/wagtailadmin/block_forms/list.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/block_forms/list.html rename to wagtail/admin/templates/wagtailadmin/block_forms/list.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/list_member.html b/wagtail/admin/templates/wagtailadmin/block_forms/list_member.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/block_forms/list_member.html rename to wagtail/admin/templates/wagtailadmin/block_forms/list_member.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/sequence.html b/wagtail/admin/templates/wagtailadmin/block_forms/sequence.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/block_forms/sequence.html rename to wagtail/admin/templates/wagtailadmin/block_forms/sequence.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/sequence_member.html b/wagtail/admin/templates/wagtailadmin/block_forms/sequence_member.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/block_forms/sequence_member.html rename to wagtail/admin/templates/wagtailadmin/block_forms/sequence_member.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/stream.html b/wagtail/admin/templates/wagtailadmin/block_forms/stream.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/block_forms/stream.html rename to wagtail/admin/templates/wagtailadmin/block_forms/stream.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/stream_member.html b/wagtail/admin/templates/wagtailadmin/block_forms/stream_member.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/block_forms/stream_member.html rename to wagtail/admin/templates/wagtailadmin/block_forms/stream_member.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/stream_menu.html b/wagtail/admin/templates/wagtailadmin/block_forms/stream_menu.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/block_forms/stream_menu.html rename to wagtail/admin/templates/wagtailadmin/block_forms/stream_menu.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/struct.html b/wagtail/admin/templates/wagtailadmin/block_forms/struct.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/block_forms/struct.html rename to wagtail/admin/templates/wagtailadmin/block_forms/struct.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_browse_results.html b/wagtail/admin/templates/wagtailadmin/chooser/_browse_results.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/chooser/_browse_results.html rename to wagtail/admin/templates/wagtailadmin/chooser/_browse_results.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_link_types.html b/wagtail/admin/templates/wagtailadmin/chooser/_link_types.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/chooser/_link_types.html rename to wagtail/admin/templates/wagtailadmin/chooser/_link_types.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_search_results.html b/wagtail/admin/templates/wagtailadmin/chooser/_search_results.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/chooser/_search_results.html rename to wagtail/admin/templates/wagtailadmin/chooser/_search_results.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/browse.html b/wagtail/admin/templates/wagtailadmin/chooser/browse.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/chooser/browse.html rename to wagtail/admin/templates/wagtailadmin/chooser/browse.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/browse.js b/wagtail/admin/templates/wagtailadmin/chooser/browse.js similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/chooser/browse.js rename to wagtail/admin/templates/wagtailadmin/chooser/browse.js diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/email_link.html b/wagtail/admin/templates/wagtailadmin/chooser/email_link.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/chooser/email_link.html rename to wagtail/admin/templates/wagtailadmin/chooser/email_link.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/email_link.js b/wagtail/admin/templates/wagtailadmin/chooser/email_link.js similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/chooser/email_link.js rename to wagtail/admin/templates/wagtailadmin/chooser/email_link.js diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/external_link.html b/wagtail/admin/templates/wagtailadmin/chooser/external_link.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/chooser/external_link.html rename to wagtail/admin/templates/wagtailadmin/chooser/external_link.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/external_link.js b/wagtail/admin/templates/wagtailadmin/chooser/external_link.js similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/chooser/external_link.js rename to wagtail/admin/templates/wagtailadmin/chooser/external_link.js diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/external_link_chosen.js b/wagtail/admin/templates/wagtailadmin/chooser/external_link_chosen.js similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/chooser/external_link_chosen.js rename to wagtail/admin/templates/wagtailadmin/chooser/external_link_chosen.js diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/collection_privacy/ancestor_privacy.html b/wagtail/admin/templates/wagtailadmin/collection_privacy/ancestor_privacy.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/collection_privacy/ancestor_privacy.html rename to wagtail/admin/templates/wagtailadmin/collection_privacy/ancestor_privacy.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/collection_privacy/set_privacy.html b/wagtail/admin/templates/wagtailadmin/collection_privacy/set_privacy.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/collection_privacy/set_privacy.html rename to wagtail/admin/templates/wagtailadmin/collection_privacy/set_privacy.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/collection_privacy/set_privacy.js b/wagtail/admin/templates/wagtailadmin/collection_privacy/set_privacy.js similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/collection_privacy/set_privacy.js rename to wagtail/admin/templates/wagtailadmin/collection_privacy/set_privacy.js diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/collection_privacy/set_privacy_done.js b/wagtail/admin/templates/wagtailadmin/collection_privacy/set_privacy_done.js similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/collection_privacy/set_privacy_done.js rename to wagtail/admin/templates/wagtailadmin/collection_privacy/set_privacy_done.js diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/collections/_privacy_switch.html b/wagtail/admin/templates/wagtailadmin/collections/_privacy_switch.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/collections/_privacy_switch.html rename to wagtail/admin/templates/wagtailadmin/collections/_privacy_switch.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/collections/delete_not_empty.html b/wagtail/admin/templates/wagtailadmin/collections/delete_not_empty.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/collections/delete_not_empty.html rename to wagtail/admin/templates/wagtailadmin/collections/delete_not_empty.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/collections/edit.html b/wagtail/admin/templates/wagtailadmin/collections/edit.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/collections/edit.html rename to wagtail/admin/templates/wagtailadmin/collections/edit.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/collections/index.html b/wagtail/admin/templates/wagtailadmin/collections/index.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/collections/index.html rename to wagtail/admin/templates/wagtailadmin/collections/index.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html b/wagtail/admin/templates/wagtailadmin/edit_handlers/chooser_panel.html similarity index 97% rename from wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html rename to wagtail/admin/templates/wagtailadmin/edit_handlers/chooser_panel.html index 8b73adf3c4..29b125c8a5 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html +++ b/wagtail/admin/templates/wagtailadmin/edit_handlers/chooser_panel.html @@ -3,7 +3,7 @@ {% comment %} ------ DEPRECATED - provided for backwards compatibility with custom (third-party) chooser panels - created prior to Wagtail 0.9. New choosers should subclass wagtail.wagtailadmin.widgets.AdminChooser, + created prior to Wagtail 0.9. New choosers should subclass wagtail.admin.widgets.AdminChooser, with a template that extends wagtailadmin/widgets/chooser.html. ------ diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_field.html b/wagtail/admin/templates/wagtailadmin/edit_handlers/field_panel_field.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_field.html rename to wagtail/admin/templates/wagtailadmin/edit_handlers/field_panel_field.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html b/wagtail/admin/templates/wagtailadmin/edit_handlers/field_row_panel.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html rename to wagtail/admin/templates/wagtailadmin/edit_handlers/field_row_panel.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel.html b/wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel.html rename to wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel.js b/wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel.js similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel.js rename to wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel.js diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel_child.html b/wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel_child.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel_child.html rename to wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel_child.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/multi_field_panel.html b/wagtail/admin/templates/wagtailadmin/edit_handlers/multi_field_panel.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/multi_field_panel.html rename to wagtail/admin/templates/wagtailadmin/edit_handlers/multi_field_panel.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/object_list.html b/wagtail/admin/templates/wagtailadmin/edit_handlers/object_list.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/object_list.html rename to wagtail/admin/templates/wagtailadmin/edit_handlers/object_list.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/page_chooser_panel.html b/wagtail/admin/templates/wagtailadmin/edit_handlers/page_chooser_panel.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/page_chooser_panel.html rename to wagtail/admin/templates/wagtailadmin/edit_handlers/page_chooser_panel.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/single_field_panel.html b/wagtail/admin/templates/wagtailadmin/edit_handlers/single_field_panel.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/single_field_panel.html rename to wagtail/admin/templates/wagtailadmin/edit_handlers/single_field_panel.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html b/wagtail/admin/templates/wagtailadmin/edit_handlers/tabbed_interface.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html rename to wagtail/admin/templates/wagtailadmin/edit_handlers/tabbed_interface.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/generic/confirm_delete.html b/wagtail/admin/templates/wagtailadmin/generic/confirm_delete.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/generic/confirm_delete.html rename to wagtail/admin/templates/wagtailadmin/generic/confirm_delete.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/generic/create.html b/wagtail/admin/templates/wagtailadmin/generic/create.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/generic/create.html rename to wagtail/admin/templates/wagtailadmin/generic/create.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/generic/edit.html b/wagtail/admin/templates/wagtailadmin/generic/edit.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/generic/edit.html rename to wagtail/admin/templates/wagtailadmin/generic/edit.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/generic/index.html b/wagtail/admin/templates/wagtailadmin/generic/index.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/generic/index.html rename to wagtail/admin/templates/wagtailadmin/generic/index.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home.html b/wagtail/admin/templates/wagtailadmin/home.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/home.html rename to wagtail/admin/templates/wagtailadmin/home.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html b/wagtail/admin/templates/wagtailadmin/home/pages_for_moderation.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html rename to wagtail/admin/templates/wagtailadmin/home/pages_for_moderation.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html b/wagtail/admin/templates/wagtailadmin/home/recent_edits.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html rename to wagtail/admin/templates/wagtailadmin/home/recent_edits.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/site_summary.html b/wagtail/admin/templates/wagtailadmin/home/site_summary.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/home/site_summary.html rename to wagtail/admin/templates/wagtailadmin/home/site_summary.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/site_summary_pages.html b/wagtail/admin/templates/wagtailadmin/home/site_summary_pages.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/home/site_summary_pages.html rename to wagtail/admin/templates/wagtailadmin/home/site_summary_pages.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/upgrade_notification.html b/wagtail/admin/templates/wagtailadmin/home/upgrade_notification.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/home/upgrade_notification.html rename to wagtail/admin/templates/wagtailadmin/home/upgrade_notification.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/login.html b/wagtail/admin/templates/wagtailadmin/login.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/login.html rename to wagtail/admin/templates/wagtailadmin/login.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.html b/wagtail/admin/templates/wagtailadmin/notifications/approved.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.html rename to wagtail/admin/templates/wagtailadmin/notifications/approved.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.txt b/wagtail/admin/templates/wagtailadmin/notifications/approved.txt similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.txt rename to wagtail/admin/templates/wagtailadmin/notifications/approved.txt diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved_subject.txt b/wagtail/admin/templates/wagtailadmin/notifications/approved_subject.txt similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved_subject.txt rename to wagtail/admin/templates/wagtailadmin/notifications/approved_subject.txt diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/base.html b/wagtail/admin/templates/wagtailadmin/notifications/base.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/notifications/base.html rename to wagtail/admin/templates/wagtailadmin/notifications/base.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/base.txt b/wagtail/admin/templates/wagtailadmin/notifications/base.txt similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/notifications/base.txt rename to wagtail/admin/templates/wagtailadmin/notifications/base.txt diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.html b/wagtail/admin/templates/wagtailadmin/notifications/rejected.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.html rename to wagtail/admin/templates/wagtailadmin/notifications/rejected.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.txt b/wagtail/admin/templates/wagtailadmin/notifications/rejected.txt similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.txt rename to wagtail/admin/templates/wagtailadmin/notifications/rejected.txt diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected_subject.txt b/wagtail/admin/templates/wagtailadmin/notifications/rejected_subject.txt similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected_subject.txt rename to wagtail/admin/templates/wagtailadmin/notifications/rejected_subject.txt diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.html b/wagtail/admin/templates/wagtailadmin/notifications/submitted.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.html rename to wagtail/admin/templates/wagtailadmin/notifications/submitted.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.txt b/wagtail/admin/templates/wagtailadmin/notifications/submitted.txt similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.txt rename to wagtail/admin/templates/wagtailadmin/notifications/submitted.txt diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted_subject.txt b/wagtail/admin/templates/wagtailadmin/notifications/submitted_subject.txt similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted_subject.txt rename to wagtail/admin/templates/wagtailadmin/notifications/submitted_subject.txt diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html b/wagtail/admin/templates/wagtailadmin/page_privacy/ancestor_privacy.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html rename to wagtail/admin/templates/wagtailadmin/page_privacy/ancestor_privacy.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html b/wagtail/admin/templates/wagtailadmin/page_privacy/set_privacy.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html rename to wagtail/admin/templates/wagtailadmin/page_privacy/set_privacy.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.js b/wagtail/admin/templates/wagtailadmin/page_privacy/set_privacy.js similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.js rename to wagtail/admin/templates/wagtailadmin/page_privacy/set_privacy.js diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy_done.js b/wagtail/admin/templates/wagtailadmin/page_privacy/set_privacy_done.js similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy_done.js rename to wagtail/admin/templates/wagtailadmin/page_privacy/set_privacy_done.js diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html b/wagtail/admin/templates/wagtailadmin/pages/_editor_css.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html rename to wagtail/admin/templates/wagtailadmin/pages/_editor_css.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/admin/templates/wagtailadmin/pages/_editor_js.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html rename to wagtail/admin/templates/wagtailadmin/pages/_editor_js.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_lock_switch.html b/wagtail/admin/templates/wagtailadmin/pages/_lock_switch.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/_lock_switch.html rename to wagtail/admin/templates/wagtailadmin/pages/_lock_switch.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_create.html b/wagtail/admin/templates/wagtailadmin/pages/_preview_button_on_create.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_create.html rename to wagtail/admin/templates/wagtailadmin/pages/_preview_button_on_create.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_edit.html b/wagtail/admin/templates/wagtailadmin/pages/_preview_button_on_edit.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_edit.html rename to wagtail/admin/templates/wagtailadmin/pages/_preview_button_on_edit.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_switch.html b/wagtail/admin/templates/wagtailadmin/pages/_privacy_switch.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_switch.html rename to wagtail/admin/templates/wagtailadmin/pages/_privacy_switch.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/add_subpage.html b/wagtail/admin/templates/wagtailadmin/pages/add_subpage.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/add_subpage.html rename to wagtail/admin/templates/wagtailadmin/pages/add_subpage.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_delete.html b/wagtail/admin/templates/wagtailadmin/pages/confirm_delete.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_delete.html rename to wagtail/admin/templates/wagtailadmin/pages/confirm_delete.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_move.html b/wagtail/admin/templates/wagtailadmin/pages/confirm_move.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_move.html rename to wagtail/admin/templates/wagtailadmin/pages/confirm_move.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_unpublish.html b/wagtail/admin/templates/wagtailadmin/pages/confirm_unpublish.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_unpublish.html rename to wagtail/admin/templates/wagtailadmin/pages/confirm_unpublish.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/content_type_use.html b/wagtail/admin/templates/wagtailadmin/pages/content_type_use.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/content_type_use.html rename to wagtail/admin/templates/wagtailadmin/pages/content_type_use.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/copy.html b/wagtail/admin/templates/wagtailadmin/pages/copy.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/copy.html rename to wagtail/admin/templates/wagtailadmin/pages/copy.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html b/wagtail/admin/templates/wagtailadmin/pages/create.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html rename to wagtail/admin/templates/wagtailadmin/pages/create.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html b/wagtail/admin/templates/wagtailadmin/pages/edit.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html rename to wagtail/admin/templates/wagtailadmin/pages/edit.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html b/wagtail/admin/templates/wagtailadmin/pages/index.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html rename to wagtail/admin/templates/wagtailadmin/pages/index.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_button_with_dropdown.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_button_with_dropdown.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_button_with_dropdown.html rename to wagtail/admin/templates/wagtailadmin/pages/listing/_button_with_dropdown.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_buttons.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_buttons.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_buttons.html rename to wagtail/admin/templates/wagtailadmin/pages/listing/_buttons.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_list.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list.html rename to wagtail/admin/templates/wagtailadmin/pages/listing/_list.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list_choose.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_list_choose.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list_choose.html rename to wagtail/admin/templates/wagtailadmin/pages/listing/_list_choose.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list_explore.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_list_explore.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list_explore.html rename to wagtail/admin/templates/wagtailadmin/pages/listing/_list_explore.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list_move.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_list_move.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list_move.html rename to wagtail/admin/templates/wagtailadmin/pages/listing/_list_move.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_locked_indicator.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_locked_indicator.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_locked_indicator.html rename to wagtail/admin/templates/wagtailadmin/pages/listing/_locked_indicator.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_choose.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_navigation_choose.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_choose.html rename to wagtail/admin/templates/wagtailadmin/pages/listing/_navigation_choose.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_explore.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_navigation_explore.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_explore.html rename to wagtail/admin/templates/wagtailadmin/pages/listing/_navigation_explore.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_move.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_navigation_move.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_move.html rename to wagtail/admin/templates/wagtailadmin/pages/listing/_navigation_move.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_choose.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_page_title_choose.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_choose.html rename to wagtail/admin/templates/wagtailadmin/pages/listing/_page_title_choose.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_explore.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_page_title_explore.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_explore.html rename to wagtail/admin/templates/wagtailadmin/pages/listing/_page_title_explore.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_move.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_page_title_move.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_move.html rename to wagtail/admin/templates/wagtailadmin/pages/listing/_page_title_move.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_pagination.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_pagination.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_pagination.html rename to wagtail/admin/templates/wagtailadmin/pages/listing/_pagination.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html rename to wagtail/admin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_privacy_indicator.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_privacy_indicator.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_privacy_indicator.html rename to wagtail/admin/templates/wagtailadmin/pages/listing/_privacy_indicator.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_table_headers_explore.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_table_headers_explore.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_table_headers_explore.html rename to wagtail/admin/templates/wagtailadmin/pages/listing/_table_headers_explore.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/move_choose_destination.html b/wagtail/admin/templates/wagtailadmin/pages/move_choose_destination.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/move_choose_destination.html rename to wagtail/admin/templates/wagtailadmin/pages/move_choose_destination.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview_error.html b/wagtail/admin/templates/wagtailadmin/pages/preview_error.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/preview_error.html rename to wagtail/admin/templates/wagtailadmin/pages/preview_error.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/revisions/compare.html b/wagtail/admin/templates/wagtailadmin/pages/revisions/compare.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/revisions/compare.html rename to wagtail/admin/templates/wagtailadmin/pages/revisions/compare.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/revisions/index.html b/wagtail/admin/templates/wagtailadmin/pages/revisions/index.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/revisions/index.html rename to wagtail/admin/templates/wagtailadmin/pages/revisions/index.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/revisions/list.html b/wagtail/admin/templates/wagtailadmin/pages/revisions/list.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/revisions/list.html rename to wagtail/admin/templates/wagtailadmin/pages/revisions/list.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/revisions/results.html b/wagtail/admin/templates/wagtailadmin/pages/revisions/results.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/revisions/results.html rename to wagtail/admin/templates/wagtailadmin/pages/revisions/results.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/search.html b/wagtail/admin/templates/wagtailadmin/pages/search.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/search.html rename to wagtail/admin/templates/wagtailadmin/pages/search.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/search_results.html b/wagtail/admin/templates/wagtailadmin/pages/search_results.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/search_results.html rename to wagtail/admin/templates/wagtailadmin/pages/search_results.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/usage_results.html b/wagtail/admin/templates/wagtailadmin/pages/usage_results.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/usage_results.html rename to wagtail/admin/templates/wagtailadmin/pages/usage_results.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/permissions/includes/collection_member_permissions_form.html b/wagtail/admin/templates/wagtailadmin/permissions/includes/collection_member_permissions_form.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/permissions/includes/collection_member_permissions_form.html rename to wagtail/admin/templates/wagtailadmin/permissions/includes/collection_member_permissions_form.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/permissions/includes/collection_member_permissions_formset.html b/wagtail/admin/templates/wagtailadmin/permissions/includes/collection_member_permissions_formset.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/permissions/includes/collection_member_permissions_formset.html rename to wagtail/admin/templates/wagtailadmin/permissions/includes/collection_member_permissions_formset.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/animated_logo.html b/wagtail/admin/templates/wagtailadmin/shared/animated_logo.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/animated_logo.html rename to wagtail/admin/templates/wagtailadmin/shared/animated_logo.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html b/wagtail/admin/templates/wagtailadmin/shared/breadcrumb.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html rename to wagtail/admin/templates/wagtailadmin/shared/breadcrumb.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/chooser_breadcrumb.html b/wagtail/admin/templates/wagtailadmin/shared/chooser_breadcrumb.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/chooser_breadcrumb.html rename to wagtail/admin/templates/wagtailadmin/shared/chooser_breadcrumb.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/collection_chooser.html b/wagtail/admin/templates/wagtailadmin/shared/collection_chooser.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/collection_chooser.html rename to wagtail/admin/templates/wagtailadmin/shared/collection_chooser.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/datetimepicker_translations.html b/wagtail/admin/templates/wagtailadmin/shared/datetimepicker_translations.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/datetimepicker_translations.html rename to wagtail/admin/templates/wagtailadmin/shared/datetimepicker_translations.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/explorer_menu_item.html b/wagtail/admin/templates/wagtailadmin/shared/explorer_menu_item.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/explorer_menu_item.html rename to wagtail/admin/templates/wagtailadmin/shared/explorer_menu_item.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field.html b/wagtail/admin/templates/wagtailadmin/shared/field.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/field.html rename to wagtail/admin/templates/wagtailadmin/shared/field.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html b/wagtail/admin/templates/wagtailadmin/shared/field_as_li.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html rename to wagtail/admin/templates/wagtailadmin/shared/field_as_li.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html b/wagtail/admin/templates/wagtailadmin/shared/header.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html rename to wagtail/admin/templates/wagtailadmin/shared/header.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/main_nav.html b/wagtail/admin/templates/wagtailadmin/shared/main_nav.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/main_nav.html rename to wagtail/admin/templates/wagtailadmin/shared/main_nav.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/menu_item.html b/wagtail/admin/templates/wagtailadmin/shared/menu_item.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/menu_item.html rename to wagtail/admin/templates/wagtailadmin/shared/menu_item.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/menu_search.html b/wagtail/admin/templates/wagtailadmin/shared/menu_search.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/menu_search.html rename to wagtail/admin/templates/wagtailadmin/shared/menu_search.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/menu_settings_menu_item.html b/wagtail/admin/templates/wagtailadmin/shared/menu_settings_menu_item.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/menu_settings_menu_item.html rename to wagtail/admin/templates/wagtailadmin/shared/menu_settings_menu_item.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/menu_submenu_item.html b/wagtail/admin/templates/wagtailadmin/shared/menu_submenu_item.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/menu_submenu_item.html rename to wagtail/admin/templates/wagtailadmin/shared/menu_submenu_item.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/messages.html b/wagtail/admin/templates/wagtailadmin/shared/messages.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/messages.html rename to wagtail/admin/templates/wagtailadmin/shared/messages.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/page_status_tag.html b/wagtail/admin/templates/wagtailadmin/shared/page_status_tag.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/page_status_tag.html rename to wagtail/admin/templates/wagtailadmin/shared/page_status_tag.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/pagination_nav.html b/wagtail/admin/templates/wagtailadmin/shared/pagination_nav.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/pagination_nav.html rename to wagtail/admin/templates/wagtailadmin/shared/pagination_nav.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/search_area.html b/wagtail/admin/templates/wagtailadmin/shared/search_area.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/search_area.html rename to wagtail/admin/templates/wagtailadmin/shared/search_area.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/search_other.html b/wagtail/admin/templates/wagtailadmin/shared/search_other.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/search_other.html rename to wagtail/admin/templates/wagtailadmin/shared/search_other.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/user_avatar.html b/wagtail/admin/templates/wagtailadmin/shared/user_avatar.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/shared/user_avatar.html rename to wagtail/admin/templates/wagtailadmin/shared/user_avatar.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html b/wagtail/admin/templates/wagtailadmin/skeleton.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html rename to wagtail/admin/templates/wagtailadmin/skeleton.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html b/wagtail/admin/templates/wagtailadmin/userbar/base.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html rename to wagtail/admin/templates/wagtailadmin/userbar/base.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_admin.html b/wagtail/admin/templates/wagtailadmin/userbar/item_admin.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_admin.html rename to wagtail/admin/templates/wagtailadmin/userbar/item_admin.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_base.html b/wagtail/admin/templates/wagtailadmin/userbar/item_base.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_base.html rename to wagtail/admin/templates/wagtailadmin/userbar/item_base.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_add.html b/wagtail/admin/templates/wagtailadmin/userbar/item_page_add.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_add.html rename to wagtail/admin/templates/wagtailadmin/userbar/item_page_add.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_approve.html b/wagtail/admin/templates/wagtailadmin/userbar/item_page_approve.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_approve.html rename to wagtail/admin/templates/wagtailadmin/userbar/item_page_approve.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_edit.html b/wagtail/admin/templates/wagtailadmin/userbar/item_page_edit.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_edit.html rename to wagtail/admin/templates/wagtailadmin/userbar/item_page_edit.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_explore.html b/wagtail/admin/templates/wagtailadmin/userbar/item_page_explore.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_explore.html rename to wagtail/admin/templates/wagtailadmin/userbar/item_page_explore.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_reject.html b/wagtail/admin/templates/wagtailadmin/userbar/item_page_reject.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_reject.html rename to wagtail/admin/templates/wagtailadmin/userbar/item_page_reject.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/widgets/chooser.html b/wagtail/admin/templates/wagtailadmin/widgets/chooser.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/widgets/chooser.html rename to wagtail/admin/templates/wagtailadmin/widgets/chooser.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/widgets/page_chooser.html b/wagtail/admin/templates/wagtailadmin/widgets/page_chooser.html similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/widgets/page_chooser.html rename to wagtail/admin/templates/wagtailadmin/widgets/page_chooser.html diff --git a/wagtail/wagtailadmin/templatetags/__init__.py b/wagtail/admin/templatetags/__init__.py similarity index 100% rename from wagtail/wagtailadmin/templatetags/__init__.py rename to wagtail/admin/templatetags/__init__.py diff --git a/wagtail/wagtailadmin/templatetags/gravatar.py b/wagtail/admin/templatetags/gravatar.py similarity index 100% rename from wagtail/wagtailadmin/templatetags/gravatar.py rename to wagtail/admin/templatetags/gravatar.py diff --git a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py b/wagtail/admin/templatetags/wagtailadmin_tags.py similarity index 98% rename from wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py rename to wagtail/admin/templatetags/wagtailadmin_tags.py index 55a1a5bea6..cf88558411 100644 --- a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py +++ b/wagtail/admin/templatetags/wagtailadmin_tags.py @@ -12,9 +12,9 @@ from django.utils.html import conditional_escape from django.utils.safestring import mark_safe from wagtail.utils.pagination import DEFAULT_PAGE_KEY, replace_page_in_query -from wagtail.wagtailadmin.menu import admin_menu -from wagtail.wagtailadmin.navigation import get_explorable_root_page -from wagtail.wagtailadmin.search import admin_search_areas +from wagtail.admin.menu import admin_menu +from wagtail.admin.navigation import get_explorable_root_page +from wagtail.admin.search import admin_search_areas from wagtail.core import hooks from wagtail.core.models import ( CollectionViewRestriction, Page, PageViewRestriction, UserPagePermissionsProxy) diff --git a/wagtail/wagtailadmin/templatetags/wagtailuserbar.py b/wagtail/admin/templatetags/wagtailuserbar.py similarity index 98% rename from wagtail/wagtailadmin/templatetags/wagtailuserbar.py rename to wagtail/admin/templatetags/wagtailuserbar.py index 60e720c0f6..bdae494451 100644 --- a/wagtail/wagtailadmin/templatetags/wagtailuserbar.py +++ b/wagtail/admin/templatetags/wagtailuserbar.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django import template from django.template.loader import render_to_string -from wagtail.wagtailadmin.userbar import ( +from wagtail.admin.userbar import ( AddPageItem, AdminItem, ApproveModerationEditPageItem, EditPageItem, ExplorePageItem, RejectModerationEditPageItem) from wagtail.core import hooks diff --git a/wagtail/wagtailadmin/tests/__init__.py b/wagtail/admin/tests/__init__.py similarity index 100% rename from wagtail/wagtailadmin/tests/__init__.py rename to wagtail/admin/tests/__init__.py diff --git a/wagtail/wagtailadmin/tests/api/__init__.py b/wagtail/admin/tests/api/__init__.py similarity index 100% rename from wagtail/wagtailadmin/tests/api/__init__.py rename to wagtail/admin/tests/api/__init__.py diff --git a/wagtail/wagtailadmin/tests/api/test_documents.py b/wagtail/admin/tests/api/test_documents.py similarity index 100% rename from wagtail/wagtailadmin/tests/api/test_documents.py rename to wagtail/admin/tests/api/test_documents.py diff --git a/wagtail/wagtailadmin/tests/api/test_images.py b/wagtail/admin/tests/api/test_images.py similarity index 100% rename from wagtail/wagtailadmin/tests/api/test_images.py rename to wagtail/admin/tests/api/test_images.py diff --git a/wagtail/wagtailadmin/tests/api/test_pages.py b/wagtail/admin/tests/api/test_pages.py similarity index 100% rename from wagtail/wagtailadmin/tests/api/test_pages.py rename to wagtail/admin/tests/api/test_pages.py diff --git a/wagtail/wagtailadmin/tests/api/utils.py b/wagtail/admin/tests/api/utils.py similarity index 100% rename from wagtail/wagtailadmin/tests/api/utils.py rename to wagtail/admin/tests/api/utils.py diff --git a/wagtail/wagtailadmin/tests/test_account_management.py b/wagtail/admin/tests/test_account_management.py similarity index 99% rename from wagtail/wagtailadmin/tests/test_account_management.py rename to wagtail/admin/tests/test_account_management.py index 7c0585b2b3..ddaabf9a51 100644 --- a/wagtail/wagtailadmin/tests/test_account_management.py +++ b/wagtail/admin/tests/test_account_management.py @@ -8,7 +8,7 @@ from django.test import TestCase, override_settings from django.urls import reverse from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailadmin.utils import ( +from wagtail.admin.utils import ( WAGTAILADMIN_PROVIDED_LANGUAGES, get_available_admin_languages) from wagtail.wagtailusers.models import UserProfile diff --git a/wagtail/wagtailadmin/tests/test_admin_search.py b/wagtail/admin/tests/test_admin_search.py similarity index 98% rename from wagtail/wagtailadmin/tests/test_admin_search.py rename to wagtail/admin/tests/test_admin_search.py index 7f422e87f9..dc4fb8d66b 100644 --- a/wagtail/wagtailadmin/tests/test_admin_search.py +++ b/wagtail/admin/tests/test_admin_search.py @@ -9,7 +9,7 @@ from django.test import RequestFactory, TestCase from django.urls import reverse from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailadmin.utils import user_has_any_page_permission +from wagtail.admin.utils import user_has_any_page_permission from wagtail.core.models import Site diff --git a/wagtail/wagtailadmin/tests/test_buttons_hooks.py b/wagtail/admin/tests/test_buttons_hooks.py similarity index 98% rename from wagtail/wagtailadmin/tests/test_buttons_hooks.py rename to wagtail/admin/tests/test_buttons_hooks.py index 598566640f..b30a7ffa4a 100644 --- a/wagtail/wagtailadmin/tests/test_buttons_hooks.py +++ b/wagtail/admin/tests/test_buttons_hooks.py @@ -4,7 +4,7 @@ from django.test import TestCase from django.urls import reverse from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailadmin import widgets as wagtailadmin_widgets +from wagtail.admin import widgets as wagtailadmin_widgets from wagtail.core import hooks from wagtail.core.models import Page diff --git a/wagtail/wagtailadmin/tests/test_collections_views.py b/wagtail/admin/tests/test_collections_views.py similarity index 100% rename from wagtail/wagtailadmin/tests/test_collections_views.py rename to wagtail/admin/tests/test_collections_views.py diff --git a/wagtail/wagtailadmin/tests/test_compare.py b/wagtail/admin/tests/test_compare.py similarity index 99% rename from wagtail/wagtailadmin/tests/test_compare.py rename to wagtail/admin/tests/test_compare.py index 07ff380c8b..67f5ea91ed 100644 --- a/wagtail/wagtailadmin/tests/test_compare.py +++ b/wagtail/admin/tests/test_compare.py @@ -8,7 +8,7 @@ from django.utils.safestring import SafeText from wagtail.tests.testapp.models import ( EventCategory, EventPage, EventPageSpeaker, SimplePage, StreamPage, TaggedPage) -from wagtail.wagtailadmin import compare +from wagtail.admin import compare from wagtail.core.blocks import StreamValue from wagtail.wagtailimages import get_image_model from wagtail.wagtailimages.tests.utils import get_test_image_file diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/admin/tests/test_edit_handlers.py similarity index 98% rename from wagtail/wagtailadmin/tests/test_edit_handlers.py rename to wagtail/admin/tests/test_edit_handlers.py index a615176af0..1e5410edcf 100644 --- a/wagtail/wagtailadmin/tests/test_edit_handlers.py +++ b/wagtail/admin/tests/test_edit_handlers.py @@ -12,12 +12,12 @@ from wagtail.tests.testapp.forms import ValidatedPageForm from wagtail.tests.testapp.models import ( EventPage, EventPageChooserModel, EventPageSpeaker, PageChooserModel, SimplePage, ValidatedPage) from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailadmin.edit_handlers import ( +from wagtail.admin.edit_handlers import ( FieldPanel, FieldRowPanel, InlinePanel, ObjectList, PageChooserPanel, RichTextFieldPanel, TabbedInterface, extract_panel_definitions_from_model_class, get_form_for_model) -from wagtail.wagtailadmin.forms import WagtailAdminModelForm, WagtailAdminPageForm -from wagtail.wagtailadmin.rich_text import HalloRichTextArea -from wagtail.wagtailadmin.widgets import AdminAutoHeightTextInput, AdminDateInput, AdminPageChooser +from wagtail.admin.forms import WagtailAdminModelForm, WagtailAdminPageForm +from wagtail.admin.rich_text import HalloRichTextArea +from wagtail.admin.widgets import AdminAutoHeightTextInput, AdminDateInput, AdminPageChooser from wagtail.core.models import Page, Site from wagtail.wagtailimages.edit_handlers import ImageChooserPanel @@ -156,7 +156,7 @@ class TestPageEditHandlers(TestCase): invalid_base_form = checks.Error( "ValidatedPage.base_form_class does not extend WagtailAdminPageForm", - hint="Ensure that wagtail.wagtailadmin.tests.test_edit_handlers.BadFormClass extends WagtailAdminPageForm", + hint="Ensure that wagtail.admin.tests.test_edit_handlers.BadFormClass extends WagtailAdminPageForm", obj=ValidatedPage, id='wagtailadmin.E001') diff --git a/wagtail/wagtailadmin/tests/test_jinja2.py b/wagtail/admin/tests/test_jinja2.py similarity index 100% rename from wagtail/wagtailadmin/tests/test_jinja2.py rename to wagtail/admin/tests/test_jinja2.py diff --git a/wagtail/wagtailadmin/tests/test_messages.py b/wagtail/admin/tests/test_messages.py similarity index 100% rename from wagtail/wagtailadmin/tests/test_messages.py rename to wagtail/admin/tests/test_messages.py diff --git a/wagtail/wagtailadmin/tests/test_navigation.py b/wagtail/admin/tests/test_navigation.py similarity index 98% rename from wagtail/wagtailadmin/tests/test_navigation.py rename to wagtail/admin/tests/test_navigation.py index 563719c348..a9289b108c 100644 --- a/wagtail/wagtailadmin/tests/test_navigation.py +++ b/wagtail/admin/tests/test_navigation.py @@ -6,7 +6,7 @@ from django.contrib.auth import get_user_model from django.test import TestCase from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailadmin.navigation import ( +from wagtail.admin.navigation import ( get_explorable_root_page, get_pages_with_direct_explore_permission) diff --git a/wagtail/wagtailadmin/tests/test_page_chooser.py b/wagtail/admin/tests/test_page_chooser.py similarity index 99% rename from wagtail/wagtailadmin/tests/test_page_chooser.py rename to wagtail/admin/tests/test_page_chooser.py index 58af1c69e5..0fbf7f8e35 100644 --- a/wagtail/wagtailadmin/tests/test_page_chooser.py +++ b/wagtail/admin/tests/test_page_chooser.py @@ -7,7 +7,7 @@ from django.utils.http import urlencode from wagtail.tests.testapp.models import EventIndex, EventPage, SimplePage, SingleEventPage from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailadmin.views.chooser import can_choose_page +from wagtail.admin.views.chooser import can_choose_page from wagtail.core.models import Page, UserPagePermissionsProxy diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/admin/tests/test_pages_views.py similarity index 99% rename from wagtail/wagtailadmin/tests/test_pages_views.py rename to wagtail/admin/tests/test_pages_views.py index 76e4b6eb33..bb2cafdd9d 100644 --- a/wagtail/wagtailadmin/tests/test_pages_views.py +++ b/wagtail/admin/tests/test_pages_views.py @@ -26,8 +26,8 @@ from wagtail.tests.testapp.models import ( ManyToManyBlogPage, SimplePage, SingleEventPage, SingletonPage, StandardChild, StandardIndex, TaggedPage) from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailadmin.views.home import RecentEditsPanel -from wagtail.wagtailadmin.views.pages import PreviewOnEdit +from wagtail.admin.views.home import RecentEditsPanel +from wagtail.admin.views.pages import PreviewOnEdit from wagtail.core.models import GroupPagePermission, Page, PageRevision, Site from wagtail.core.signals import page_published, page_unpublished from wagtail.wagtailsearch.index import SearchField @@ -3178,7 +3178,7 @@ class TestNotificationPreferences(TestCase, WagtailTestUtils): self.assertIn(user1.email, email_to) self.assertIn(user2.email, email_to) - @mock.patch('wagtail.wagtailadmin.utils.django_send_mail', side_effect=IOError('Server down')) + @mock.patch('wagtail.admin.utils.django_send_mail', side_effect=IOError('Server down')) def test_email_send_error(self, mock_fn): logging.disable(logging.CRITICAL) # Approve diff --git a/wagtail/wagtailadmin/tests/test_password_reset.py b/wagtail/admin/tests/test_password_reset.py similarity index 95% rename from wagtail/wagtailadmin/tests/test_password_reset.py rename to wagtail/admin/tests/test_password_reset.py index 587bcaaeb9..3b9ed59cde 100644 --- a/wagtail/wagtailadmin/tests/test_password_reset.py +++ b/wagtail/admin/tests/test_password_reset.py @@ -43,7 +43,7 @@ class TestUserPasswordReset(TestCase, WagtailTestUtils): # Check that the user received a 404 self.assertEqual(response.status_code, 404) - @override_settings(ROOT_URLCONF="wagtail.wagtailadmin.urls") + @override_settings(ROOT_URLCONF="wagtail.admin.urls") def test_email_found_default_url(self): response = self.client.post(reverse('wagtailadmin_password_reset'), {'email': 'siteeditor@example.com'}) @@ -51,7 +51,7 @@ class TestUserPasswordReset(TestCase, WagtailTestUtils): self.assertEqual(len(mail.outbox), 1) self.assertIn("testserver", mail.outbox[0].body) - @override_settings(ROOT_URLCONF="wagtail.wagtailadmin.urls", BASE_URL='http://mysite.com') + @override_settings(ROOT_URLCONF="wagtail.admin.urls", BASE_URL='http://mysite.com') def test_email_found_base_url(self): response = self.client.post(reverse('wagtailadmin_password_reset'), {'email': 'siteeditor@example.com'}) diff --git a/wagtail/wagtailadmin/tests/test_privacy.py b/wagtail/admin/tests/test_privacy.py similarity index 100% rename from wagtail/wagtailadmin/tests/test_privacy.py rename to wagtail/admin/tests/test_privacy.py diff --git a/wagtail/wagtailadmin/tests/test_rich_text.py b/wagtail/admin/tests/test_rich_text.py similarity index 96% rename from wagtail/wagtailadmin/tests/test_rich_text.py rename to wagtail/admin/tests/test_rich_text.py index 8bceb744d4..e4b1439b11 100644 --- a/wagtail/wagtailadmin/tests/test_rich_text.py +++ b/wagtail/admin/tests/test_rich_text.py @@ -8,7 +8,7 @@ from django.urls import reverse from wagtail.tests.testapp.models import SingleEventPage from wagtail.tests.testapp.rich_text import CustomRichTextArea from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailadmin.rich_text import HalloRichTextArea, get_rich_text_editor_widget +from wagtail.admin.rich_text import HalloRichTextArea, get_rich_text_editor_widget from wagtail.core.blocks import RichTextBlock from wagtail.core.models import Page, get_page_models from wagtail.core.rich_text import RichText @@ -68,7 +68,7 @@ class TestGetRichTextEditorWidget(TestCase): @override_settings(WAGTAILADMIN_RICH_TEXT_EDITORS={ 'default': { - 'WIDGET': 'wagtail.wagtailadmin.rich_text.HalloRichTextArea' + 'WIDGET': 'wagtail.admin.rich_text.HalloRichTextArea' }, 'custom': { 'WIDGET': 'wagtail.tests.testapp.rich_text.CustomRichTextArea' @@ -166,7 +166,7 @@ class TestOverriddenDefaultRichText(BaseRichTextEditHandlerTestCase, WagtailTest @override_settings(WAGTAILADMIN_RICH_TEXT_EDITORS={ 'default': { - 'WIDGET': 'wagtail.wagtailadmin.rich_text.HalloRichTextArea' + 'WIDGET': 'wagtail.admin.rich_text.HalloRichTextArea' }, 'custom': { 'WIDGET': 'wagtail.tests.testapp.rich_text.CustomRichTextArea' @@ -234,10 +234,10 @@ class TestRichTextValue(TestCase): @override_settings(WAGTAILADMIN_RICH_TEXT_EDITORS={ 'default': { - 'WIDGET': 'wagtail.wagtailadmin.rich_text.HalloRichTextArea' + 'WIDGET': 'wagtail.admin.rich_text.HalloRichTextArea' }, 'custom': { - 'WIDGET': 'wagtail.wagtailadmin.rich_text.HalloRichTextArea', + 'WIDGET': 'wagtail.admin.rich_text.HalloRichTextArea', 'OPTIONS': { 'plugins': { 'halloheadings': {'formatBlocks': ['p', 'h2']}, @@ -327,13 +327,13 @@ class TestHalloJsWithFeaturesKwarg(BaseRichTextEditHandlerTestCase, WagtailTestU @override_settings(WAGTAILADMIN_RICH_TEXT_EDITORS={ 'default': { - 'WIDGET': 'wagtail.wagtailadmin.rich_text.HalloRichTextArea', + 'WIDGET': 'wagtail.admin.rich_text.HalloRichTextArea', 'OPTIONS': { 'features': ['blockquote', 'image'] } }, 'custom': { - 'WIDGET': 'wagtail.wagtailadmin.rich_text.HalloRichTextArea', + 'WIDGET': 'wagtail.admin.rich_text.HalloRichTextArea', 'OPTIONS': { 'features': ['blockquote', 'image'] } diff --git a/wagtail/wagtailadmin/tests/test_userbar.py b/wagtail/admin/tests/test_userbar.py similarity index 100% rename from wagtail/wagtailadmin/tests/test_userbar.py rename to wagtail/admin/tests/test_userbar.py diff --git a/wagtail/wagtailadmin/tests/test_widgets.py b/wagtail/admin/tests/test_widgets.py similarity index 99% rename from wagtail/wagtailadmin/tests/test_widgets.py rename to wagtail/admin/tests/test_widgets.py index 99752970cf..0e5b9e76cb 100644 --- a/wagtail/wagtailadmin/tests/test_widgets.py +++ b/wagtail/admin/tests/test_widgets.py @@ -4,7 +4,7 @@ from django.test import TestCase from django.test.utils import override_settings from wagtail.tests.testapp.models import EventPage, SimplePage -from wagtail.wagtailadmin import widgets +from wagtail.admin import widgets from wagtail.core.models import Page diff --git a/wagtail/wagtailadmin/tests/tests.py b/wagtail/admin/tests/tests.py similarity index 98% rename from wagtail/wagtailadmin/tests/tests.py rename to wagtail/admin/tests/tests.py index 220467da78..0f4eb69f99 100644 --- a/wagtail/wagtailadmin/tests/tests.py +++ b/wagtail/admin/tests/tests.py @@ -13,9 +13,9 @@ from django.utils.translation import ugettext_lazy as _ from taggit.models import Tag from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailadmin.menu import MenuItem -from wagtail.wagtailadmin.site_summary import PagesSummaryItem -from wagtail.wagtailadmin.utils import send_mail, user_has_any_page_permission +from wagtail.admin.menu import MenuItem +from wagtail.admin.site_summary import PagesSummaryItem +from wagtail.admin.utils import send_mail, user_has_any_page_permission from wagtail.core.models import Page, Site diff --git a/wagtail/wagtailadmin/urls/__init__.py b/wagtail/admin/urls/__init__.py similarity index 89% rename from wagtail/wagtailadmin/urls/__init__.py rename to wagtail/admin/urls/__init__.py index dabf9f8449..9f1ae3fad7 100644 --- a/wagtail/wagtailadmin/urls/__init__.py +++ b/wagtail/admin/urls/__init__.py @@ -6,14 +6,14 @@ from django.views.generic import TemplateView from django.http import Http404 from django.views.defaults import page_not_found -from wagtail.wagtailadmin.urls import pages as wagtailadmin_pages_urls -from wagtail.wagtailadmin.urls import collections as wagtailadmin_collections_urls -from wagtail.wagtailadmin.urls import password_reset as wagtailadmin_password_reset_urls -from wagtail.wagtailadmin.views import account, chooser, home, pages, tags, userbar -from wagtail.wagtailadmin.api import urls as api_urls +from wagtail.admin.urls import pages as wagtailadmin_pages_urls +from wagtail.admin.urls import collections as wagtailadmin_collections_urls +from wagtail.admin.urls import password_reset as wagtailadmin_password_reset_urls +from wagtail.admin.views import account, chooser, home, pages, tags, userbar +from wagtail.admin.api import urls as api_urls from wagtail.core import hooks from wagtail.utils.urlpatterns import decorate_urlpatterns -from wagtail.wagtailadmin.decorators import require_admin_access +from wagtail.admin.decorators import require_admin_access urlpatterns = [ diff --git a/wagtail/wagtailadmin/urls/collections.py b/wagtail/admin/urls/collections.py similarity index 87% rename from wagtail/wagtailadmin/urls/collections.py rename to wagtail/admin/urls/collections.py index b885c25a31..fee10588d1 100644 --- a/wagtail/wagtailadmin/urls/collections.py +++ b/wagtail/admin/urls/collections.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import url -from wagtail.wagtailadmin.views import collection_privacy, collections +from wagtail.admin.views import collection_privacy, collections app_name = 'wagtailadmin_collections' urlpatterns = [ diff --git a/wagtail/wagtailadmin/urls/pages.py b/wagtail/admin/urls/pages.py similarity index 97% rename from wagtail/wagtailadmin/urls/pages.py rename to wagtail/admin/urls/pages.py index 910b5c7e09..5af9a2d6af 100644 --- a/wagtail/wagtailadmin/urls/pages.py +++ b/wagtail/admin/urls/pages.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import url -from wagtail.wagtailadmin.views import page_privacy, pages +from wagtail.admin.views import page_privacy, pages app_name = 'wagtailadmin_pages' urlpatterns = [ diff --git a/wagtail/wagtailadmin/urls/password_reset.py b/wagtail/admin/urls/password_reset.py similarity index 92% rename from wagtail/wagtailadmin/urls/password_reset.py rename to wagtail/admin/urls/password_reset.py index ebcec4af76..c33ab81810 100644 --- a/wagtail/wagtailadmin/urls/password_reset.py +++ b/wagtail/admin/urls/password_reset.py @@ -2,8 +2,8 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import url -from wagtail.wagtailadmin.forms import PasswordResetForm -from wagtail.wagtailadmin.views import account +from wagtail.admin.forms import PasswordResetForm +from wagtail.admin.views import account urlpatterns = [ url( diff --git a/wagtail/wagtailadmin/userbar.py b/wagtail/admin/userbar.py similarity index 100% rename from wagtail/wagtailadmin/userbar.py rename to wagtail/admin/userbar.py diff --git a/wagtail/wagtailadmin/utils.py b/wagtail/admin/utils.py similarity index 99% rename from wagtail/wagtailadmin/utils.py rename to wagtail/admin/utils.py index dcc12bb754..727221e310 100644 --- a/wagtail/wagtailadmin/utils.py +++ b/wagtail/admin/utils.py @@ -118,7 +118,7 @@ def permission_denied(request): if request.is_ajax(): raise PermissionDenied - from wagtail.wagtailadmin import messages + from wagtail.admin import messages messages.error(request, _('Sorry, you do not have permission to access this area.')) return redirect('wagtailadmin_home') diff --git a/wagtail/wagtailadmin/views/__init__.py b/wagtail/admin/views/__init__.py similarity index 100% rename from wagtail/wagtailadmin/views/__init__.py rename to wagtail/admin/views/__init__.py diff --git a/wagtail/wagtailadmin/views/account.py b/wagtail/admin/views/account.py similarity index 98% rename from wagtail/wagtailadmin/views/account.py rename to wagtail/admin/views/account.py index 6d9bdfda50..799bb13081 100644 --- a/wagtail/wagtailadmin/views/account.py +++ b/wagtail/admin/views/account.py @@ -14,8 +14,8 @@ from django.utils.translation import activate from django.views.decorators.cache import never_cache from django.views.decorators.debug import sensitive_post_parameters -from wagtail.wagtailadmin import forms -from wagtail.wagtailadmin.utils import get_available_admin_languages +from wagtail.admin import forms +from wagtail.admin.utils import get_available_admin_languages from wagtail.core.models import UserPagePermissionsProxy from wagtail.wagtailusers.forms import NotificationPreferencesForm, PreferredLanguageForm from wagtail.wagtailusers.models import UserProfile diff --git a/wagtail/wagtailadmin/views/chooser.py b/wagtail/admin/views/chooser.py similarity index 98% rename from wagtail/wagtailadmin/views/chooser.py rename to wagtail/admin/views/chooser.py index 08d7db3074..9c3b90321d 100644 --- a/wagtail/wagtailadmin/views/chooser.py +++ b/wagtail/admin/views/chooser.py @@ -6,8 +6,8 @@ from django.http import Http404 from django.shortcuts import get_object_or_404, render from wagtail.utils.pagination import paginate -from wagtail.wagtailadmin.forms import EmailLinkChooserForm, ExternalLinkChooserForm, SearchForm -from wagtail.wagtailadmin.modal_workflow import render_modal_workflow +from wagtail.admin.forms import EmailLinkChooserForm, ExternalLinkChooserForm, SearchForm +from wagtail.admin.modal_workflow import render_modal_workflow from wagtail.core import hooks from wagtail.core.models import Page, UserPagePermissionsProxy from wagtail.core.utils import resolve_model_string diff --git a/wagtail/wagtailadmin/views/collection_privacy.py b/wagtail/admin/views/collection_privacy.py similarity index 95% rename from wagtail/wagtailadmin/views/collection_privacy.py rename to wagtail/admin/views/collection_privacy.py index 48c62a71eb..03be10a795 100644 --- a/wagtail/wagtailadmin/views/collection_privacy.py +++ b/wagtail/admin/views/collection_privacy.py @@ -3,8 +3,8 @@ from __future__ import absolute_import, unicode_literals from django.core.exceptions import PermissionDenied from django.shortcuts import get_object_or_404 -from wagtail.wagtailadmin.forms import CollectionViewRestrictionForm -from wagtail.wagtailadmin.modal_workflow import render_modal_workflow +from wagtail.admin.forms import CollectionViewRestrictionForm +from wagtail.admin.modal_workflow import render_modal_workflow from wagtail.core.models import Collection, CollectionViewRestriction from wagtail.core.permissions import collection_permission_policy diff --git a/wagtail/wagtailadmin/views/collections.py b/wagtail/admin/views/collections.py similarity index 95% rename from wagtail/wagtailadmin/views/collections.py rename to wagtail/admin/views/collections.py index 86b77fe85c..543a440681 100644 --- a/wagtail/wagtailadmin/views/collections.py +++ b/wagtail/admin/views/collections.py @@ -4,9 +4,9 @@ from django.http import HttpResponseForbidden from django.shortcuts import get_object_or_404, redirect from django.utils.translation import ugettext_lazy -from wagtail.wagtailadmin import messages -from wagtail.wagtailadmin.forms import CollectionForm -from wagtail.wagtailadmin.views.generic import CreateView, DeleteView, EditView, IndexView +from wagtail.admin import messages +from wagtail.admin.forms import CollectionForm +from wagtail.admin.views.generic import CreateView, DeleteView, EditView, IndexView from wagtail.core import hooks from wagtail.core.models import Collection from wagtail.core.permissions import collection_permission_policy diff --git a/wagtail/wagtailadmin/views/generic.py b/wagtail/admin/views/generic.py similarity index 98% rename from wagtail/wagtailadmin/views/generic.py rename to wagtail/admin/views/generic.py index 3768f30dba..f6ae82eec2 100644 --- a/wagtail/wagtailadmin/views/generic.py +++ b/wagtail/admin/views/generic.py @@ -8,8 +8,8 @@ from django.views.generic.base import TemplateResponseMixin from django.views.generic.edit import BaseCreateView, BaseDeleteView, BaseUpdateView from django.views.generic.list import BaseListView -from wagtail.wagtailadmin import messages -from wagtail.wagtailadmin.utils import permission_denied +from wagtail.admin import messages +from wagtail.admin.utils import permission_denied class PermissionCheckedMixin(object): diff --git a/wagtail/wagtailadmin/views/home.py b/wagtail/admin/views/home.py similarity index 97% rename from wagtail/wagtailadmin/views/home.py rename to wagtail/admin/views/home.py index 63cecc0f7f..5700eaa825 100644 --- a/wagtail/wagtailadmin/views/home.py +++ b/wagtail/admin/views/home.py @@ -9,8 +9,8 @@ from django.http import Http404 from django.shortcuts import render from django.template.loader import render_to_string -from wagtail.wagtailadmin.navigation import get_explorable_root_page -from wagtail.wagtailadmin.site_summary import SiteSummaryPanel +from wagtail.admin.navigation import get_explorable_root_page +from wagtail.admin.site_summary import SiteSummaryPanel from wagtail.core import hooks from wagtail.core.models import Page, PageRevision, UserPagePermissionsProxy diff --git a/wagtail/wagtailadmin/views/mixins.py b/wagtail/admin/views/mixins.py similarity index 96% rename from wagtail/wagtailadmin/views/mixins.py rename to wagtail/admin/views/mixins.py index 6b1bd6e925..129b61610f 100644 --- a/wagtail/wagtailadmin/views/mixins.py +++ b/wagtail/admin/views/mixins.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.utils.translation import ugettext as _ -from wagtail.wagtailadmin.forms import SearchForm +from wagtail.admin.forms import SearchForm from wagtail.wagtailsearch.backends import get_search_backend from wagtail.wagtailsearch.index import class_is_indexed diff --git a/wagtail/wagtailadmin/views/page_privacy.py b/wagtail/admin/views/page_privacy.py similarity index 95% rename from wagtail/wagtailadmin/views/page_privacy.py rename to wagtail/admin/views/page_privacy.py index b313a7ffee..ecfe216205 100644 --- a/wagtail/wagtailadmin/views/page_privacy.py +++ b/wagtail/admin/views/page_privacy.py @@ -3,8 +3,8 @@ from __future__ import absolute_import, unicode_literals from django.core.exceptions import PermissionDenied from django.shortcuts import get_object_or_404 -from wagtail.wagtailadmin.forms import PageViewRestrictionForm -from wagtail.wagtailadmin.modal_workflow import render_modal_workflow +from wagtail.admin.forms import PageViewRestrictionForm +from wagtail.admin.modal_workflow import render_modal_workflow from wagtail.core.models import Page, PageViewRestriction diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/admin/views/pages.py similarity index 99% rename from wagtail/wagtailadmin/views/pages.py rename to wagtail/admin/views/pages.py index e52c67d59a..0137dd64ca 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/admin/views/pages.py @@ -19,9 +19,9 @@ from django.views.decorators.vary import vary_on_headers from django.views.generic import View from wagtail.utils.pagination import paginate -from wagtail.wagtailadmin import messages, signals -from wagtail.wagtailadmin.forms import CopyForm, SearchForm -from wagtail.wagtailadmin.utils import ( +from wagtail.admin import messages, signals +from wagtail.admin.forms import CopyForm, SearchForm +from wagtail.admin.utils import ( send_notification, user_has_any_page_permission, user_passes_test) from wagtail.core import hooks from wagtail.core.models import Page, PageRevision, UserPagePermissionsProxy diff --git a/wagtail/wagtailadmin/views/tags.py b/wagtail/admin/views/tags.py similarity index 100% rename from wagtail/wagtailadmin/views/tags.py rename to wagtail/admin/views/tags.py diff --git a/wagtail/wagtailadmin/views/userbar.py b/wagtail/admin/views/userbar.py similarity index 97% rename from wagtail/wagtailadmin/views/userbar.py rename to wagtail/admin/views/userbar.py index 93a7d5d880..27ca4e5d58 100644 --- a/wagtail/wagtailadmin/views/userbar.py +++ b/wagtail/admin/views/userbar.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.contrib.auth.decorators import permission_required from django.shortcuts import render -from wagtail.wagtailadmin.userbar import ( +from wagtail.admin.userbar import ( AddPageItem, ApproveModerationEditPageItem, EditPageItem, RejectModerationEditPageItem) from wagtail.core import hooks from wagtail.core.models import Page, PageRevision diff --git a/wagtail/wagtailadmin/viewsets/__init__.py b/wagtail/admin/viewsets/__init__.py similarity index 100% rename from wagtail/wagtailadmin/viewsets/__init__.py rename to wagtail/admin/viewsets/__init__.py diff --git a/wagtail/wagtailadmin/viewsets/base.py b/wagtail/admin/viewsets/base.py similarity index 100% rename from wagtail/wagtailadmin/viewsets/base.py rename to wagtail/admin/viewsets/base.py diff --git a/wagtail/wagtailadmin/viewsets/model.py b/wagtail/admin/viewsets/model.py similarity index 98% rename from wagtail/wagtailadmin/viewsets/model.py rename to wagtail/admin/viewsets/model.py index ff5741160b..5e00901e46 100644 --- a/wagtail/wagtailadmin/viewsets/model.py +++ b/wagtail/admin/viewsets/model.py @@ -4,7 +4,7 @@ from django.conf.urls import url from django.core.exceptions import ImproperlyConfigured from django.forms.models import modelform_factory -from wagtail.wagtailadmin.views import generic +from wagtail.admin.views import generic from wagtail.core.permissions import ModelPermissionPolicy from .base import ViewSet diff --git a/wagtail/wagtailadmin/wagtail_hooks.py b/wagtail/admin/wagtail_hooks.py similarity index 94% rename from wagtail/wagtailadmin/wagtail_hooks.py rename to wagtail/admin/wagtail_hooks.py index ba9f85a2b4..c3d3667a1b 100644 --- a/wagtail/wagtailadmin/wagtail_hooks.py +++ b/wagtail/admin/wagtail_hooks.py @@ -4,14 +4,14 @@ from django.contrib.auth.models import Permission from django.urls import reverse from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin.menu import MenuItem, SubmenuMenuItem, settings_menu -from wagtail.wagtailadmin.navigation import get_explorable_root_page -from wagtail.wagtailadmin.rich_text import ( +from wagtail.admin.menu import MenuItem, SubmenuMenuItem, settings_menu +from wagtail.admin.navigation import get_explorable_root_page +from wagtail.admin.rich_text import ( HalloFormatPlugin, HalloHeadingPlugin, HalloListPlugin, HalloPlugin) -from wagtail.wagtailadmin.search import SearchArea -from wagtail.wagtailadmin.utils import user_has_any_page_permission -from wagtail.wagtailadmin.viewsets import viewsets -from wagtail.wagtailadmin.widgets import Button, ButtonWithDropdownFromHook, PageListingButton +from wagtail.admin.search import SearchArea +from wagtail.admin.utils import user_has_any_page_permission +from wagtail.admin.viewsets import viewsets +from wagtail.admin.widgets import Button, ButtonWithDropdownFromHook, PageListingButton from wagtail.core import hooks from wagtail.core.permissions import collection_permission_policy diff --git a/wagtail/wagtailadmin/widgets.py b/wagtail/admin/widgets.py similarity index 99% rename from wagtail/wagtailadmin/widgets.py rename to wagtail/admin/widgets.py index 05367edb11..714b66f006 100644 --- a/wagtail/wagtailadmin/widgets.py +++ b/wagtail/admin/widgets.py @@ -16,7 +16,7 @@ from django.utils.translation import ugettext_lazy as _ from taggit.forms import TagWidget from wagtail.utils.widgets import WidgetWithScript -from wagtail.wagtailadmin.datetimepicker import to_datetimepicker_format +from wagtail.admin.datetimepicker import to_datetimepicker_format from wagtail.core import hooks from wagtail.core.models import Page diff --git a/wagtail/contrib/modeladmin/menus.py b/wagtail/contrib/modeladmin/menus.py index e2e266f773..6cf1a9f70a 100644 --- a/wagtail/contrib/modeladmin/menus.py +++ b/wagtail/contrib/modeladmin/menus.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, unicode_literals -from wagtail.wagtailadmin.menu import Menu, MenuItem, SubmenuMenuItem +from wagtail.admin.menu import Menu, MenuItem, SubmenuMenuItem class ModelAdminMenuItem(MenuItem): diff --git a/wagtail/contrib/modeladmin/views.py b/wagtail/contrib/modeladmin/views.py index 81e25c210c..13e22251cb 100644 --- a/wagtail/contrib/modeladmin/views.py +++ b/wagtail/contrib/modeladmin/views.py @@ -32,8 +32,8 @@ from django.utils.translation import ugettext as _ from django.views.generic import TemplateView from django.views.generic.edit import FormView -from wagtail.wagtailadmin import messages -from wagtail.wagtailadmin.edit_handlers import ( +from wagtail.admin import messages +from wagtail.admin.edit_handlers import ( ObjectList, extract_panel_definitions_from_model_class) from .forms import ParentChooserForm diff --git a/wagtail/contrib/settings/registry.py b/wagtail/contrib/settings/registry.py index 590f5cbe31..62d396ae09 100644 --- a/wagtail/contrib/settings/registry.py +++ b/wagtail/contrib/settings/registry.py @@ -5,7 +5,7 @@ from django.contrib.auth.models import Permission from django.urls import reverse from django.utils.text import capfirst -from wagtail.wagtailadmin.menu import MenuItem +from wagtail.admin.menu import MenuItem from wagtail.core import hooks from .permissions import user_can_edit_setting_type diff --git a/wagtail/contrib/settings/views.py b/wagtail/contrib/settings/views.py index 05c4fa7ddc..b74c850567 100644 --- a/wagtail/contrib/settings/views.py +++ b/wagtail/contrib/settings/views.py @@ -7,8 +7,8 @@ from django.utils.lru_cache import lru_cache from django.utils.text import capfirst from django.utils.translation import ugettext as _ -from wagtail.wagtailadmin import messages -from wagtail.wagtailadmin.edit_handlers import ( +from wagtail.admin import messages +from wagtail.admin.edit_handlers import ( ObjectList, extract_panel_definitions_from_model_class) from wagtail.core.models import Site diff --git a/wagtail/contrib/wagtailsearchpromotions/forms.py b/wagtail/contrib/wagtailsearchpromotions/forms.py index 6802d7a3fe..b95870016e 100644 --- a/wagtail/contrib/wagtailsearchpromotions/forms.py +++ b/wagtail/contrib/wagtailsearchpromotions/forms.py @@ -5,7 +5,7 @@ from django.forms.models import inlineformset_factory from django.utils.translation import ugettext_lazy as _ from wagtail.contrib.wagtailsearchpromotions.models import SearchPromotion -from wagtail.wagtailadmin.widgets import AdminPageChooser +from wagtail.admin.widgets import AdminPageChooser from wagtail.wagtailsearch.models import Query diff --git a/wagtail/contrib/wagtailsearchpromotions/views.py b/wagtail/contrib/wagtailsearchpromotions/views.py index 1aced116c4..801e7e31ac 100644 --- a/wagtail/contrib/wagtailsearchpromotions/views.py +++ b/wagtail/contrib/wagtailsearchpromotions/views.py @@ -7,9 +7,9 @@ from django.views.decorators.vary import vary_on_headers from wagtail.contrib.wagtailsearchpromotions import forms from wagtail.utils.pagination import paginate -from wagtail.wagtailadmin import messages -from wagtail.wagtailadmin.forms import SearchForm -from wagtail.wagtailadmin.utils import any_permission_required, permission_required +from wagtail.admin import messages +from wagtail.admin.forms import SearchForm +from wagtail.admin.utils import any_permission_required, permission_required from wagtail.wagtailsearch import forms as search_forms from wagtail.wagtailsearch.models import Query diff --git a/wagtail/contrib/wagtailsearchpromotions/wagtail_hooks.py b/wagtail/contrib/wagtailsearchpromotions/wagtail_hooks.py index d4495a916a..a8cc8c9da1 100644 --- a/wagtail/contrib/wagtailsearchpromotions/wagtail_hooks.py +++ b/wagtail/contrib/wagtailsearchpromotions/wagtail_hooks.py @@ -6,7 +6,7 @@ from django.urls import reverse from django.utils.translation import ugettext_lazy as _ from wagtail.contrib.wagtailsearchpromotions import admin_urls -from wagtail.wagtailadmin.menu import MenuItem +from wagtail.admin.menu import MenuItem from wagtail.core import hooks diff --git a/wagtail/contrib/wagtailstyleguide/views.py b/wagtail/contrib/wagtailstyleguide/views.py index 113c2760d7..a4cca94ae8 100644 --- a/wagtail/contrib/wagtailstyleguide/views.py +++ b/wagtail/contrib/wagtailstyleguide/views.py @@ -5,10 +5,10 @@ from django.core.paginator import Paginator from django.shortcuts import render from django.utils.translation import ugettext as _ -from wagtail.wagtailadmin import messages -from wagtail.wagtailadmin.forms import SearchForm -from wagtail.wagtailadmin.rich_text import get_rich_text_editor_widget -from wagtail.wagtailadmin.widgets import ( +from wagtail.admin import messages +from wagtail.admin.forms import SearchForm +from wagtail.admin.rich_text import get_rich_text_editor_widget +from wagtail.admin.widgets import ( AdminAutoHeightTextInput, AdminDateInput, AdminDateTimeInput, AdminPageChooser, AdminTimeInput) from wagtail.core.models import Page from wagtail.wagtaildocs.widgets import AdminDocumentChooser diff --git a/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py b/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py index 4aea6af847..a05fa18b3a 100644 --- a/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py +++ b/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py @@ -4,7 +4,7 @@ from django.conf.urls import url from django.urls import reverse from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin.menu import MenuItem +from wagtail.admin.menu import MenuItem from wagtail.core import hooks from . import views diff --git a/wagtail/core/blocks/field_block.py b/wagtail/core/blocks/field_block.py index 145cb653fa..fb870e18be 100644 --- a/wagtail/core/blocks/field_block.py +++ b/wagtail/core/blocks/field_block.py @@ -127,7 +127,7 @@ class TextBlock(FieldBlock): @cached_property def field(self): - from wagtail.wagtailadmin.widgets import AdminAutoHeightTextInput + from wagtail.admin.widgets import AdminAutoHeightTextInput field_kwargs = {'widget': AdminAutoHeightTextInput(attrs={'rows': self.rows})} field_kwargs.update(self.field_options) return forms.CharField(**field_kwargs) @@ -244,7 +244,7 @@ class DateBlock(FieldBlock): @cached_property def field(self): - from wagtail.wagtailadmin.widgets import AdminDateInput + from wagtail.admin.widgets import AdminDateInput field_kwargs = { 'widget': AdminDateInput(format=self.format), } @@ -272,7 +272,7 @@ class TimeBlock(FieldBlock): @cached_property def field(self): - from wagtail.wagtailadmin.widgets import AdminTimeInput + from wagtail.admin.widgets import AdminTimeInput field_kwargs = {'widget': AdminTimeInput} field_kwargs.update(self.field_options) return forms.TimeField(**field_kwargs) @@ -296,7 +296,7 @@ class DateTimeBlock(FieldBlock): @cached_property def field(self): - from wagtail.wagtailadmin.widgets import AdminDateTimeInput + from wagtail.admin.widgets import AdminDateTimeInput field_kwargs = { 'widget': AdminDateTimeInput(format=self.format), } @@ -475,7 +475,7 @@ class RichTextBlock(FieldBlock): @cached_property def field(self): - from wagtail.wagtailadmin.rich_text import get_rich_text_editor_widget + from wagtail.admin.rich_text import get_rich_text_editor_widget return forms.CharField( widget=get_rich_text_editor_widget(self.editor, features=self.features), **self.field_options @@ -637,7 +637,7 @@ class PageChooserBlock(ChooserBlock): @cached_property def widget(self): - from wagtail.wagtailadmin.widgets import AdminPageChooser + from wagtail.admin.widgets import AdminPageChooser return AdminPageChooser(target_models=self.target_models, can_choose_root=self.can_choose_root) diff --git a/wagtail/core/fields.py b/wagtail/core/fields.py index cc2963078a..8c11560afc 100644 --- a/wagtail/core/fields.py +++ b/wagtail/core/fields.py @@ -16,7 +16,7 @@ class RichTextField(models.TextField): super(RichTextField, self).__init__(*args, **kwargs) def formfield(self, **kwargs): - from wagtail.wagtailadmin.rich_text import get_rich_text_editor_widget + from wagtail.admin.rich_text import get_rich_text_editor_widget defaults = {'widget': get_rich_text_editor_widget(self.editor, features=self.features)} defaults.update(kwargs) return super(RichTextField, self).formfield(**defaults) @@ -53,7 +53,7 @@ class StreamField(models.Field): return 'TextField' def get_panel(self): - from wagtail.wagtailadmin.edit_handlers import StreamFieldPanel + from wagtail.admin.edit_handlers import StreamFieldPanel return StreamFieldPanel def deconstruct(self): diff --git a/wagtail/project_template/project_name/settings/base.py b/wagtail/project_template/project_name/settings/base.py index e98b4a9d90..d20faaba27 100644 --- a/wagtail/project_template/project_name/settings/base.py +++ b/wagtail/project_template/project_name/settings/base.py @@ -38,7 +38,7 @@ INSTALLED_APPS = [ 'wagtail.wagtaildocs', 'wagtail.wagtailimages', 'wagtail.wagtailsearch', - 'wagtail.wagtailadmin', + 'wagtail.admin', 'wagtail.core', 'modelcluster', diff --git a/wagtail/project_template/project_name/urls.py b/wagtail/project_template/project_name/urls.py index 5b94d36183..db387e458a 100644 --- a/wagtail/project_template/project_name/urls.py +++ b/wagtail/project_template/project_name/urls.py @@ -4,7 +4,7 @@ from django.conf import settings from django.conf.urls import include, url from django.contrib import admin -from wagtail.wagtailadmin import urls as wagtailadmin_urls +from wagtail.admin import urls as wagtailadmin_urls from wagtail.core import urls as wagtail_urls from wagtail.wagtaildocs import urls as wagtaildocs_urls diff --git a/wagtail/tests/demosite/models.py b/wagtail/tests/demosite/models.py index ed535ff99e..e027405a99 100644 --- a/wagtail/tests/demosite/models.py +++ b/wagtail/tests/demosite/models.py @@ -9,7 +9,7 @@ from taggit.models import TaggedItemBase from wagtail.api import APIField from wagtail.utils.pagination import paginate -from wagtail.wagtailadmin.edit_handlers import ( +from wagtail.admin.edit_handlers import ( FieldPanel, InlinePanel, MultiFieldPanel, PageChooserPanel) from wagtail.core.fields import RichTextField from wagtail.core.models import Orderable, Page diff --git a/wagtail/tests/non_root_urls.py b/wagtail/tests/non_root_urls.py index ea4265c76c..50683a41b3 100644 --- a/wagtail/tests/non_root_urls.py +++ b/wagtail/tests/non_root_urls.py @@ -5,7 +5,7 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import include, url -from wagtail.wagtailadmin import urls as wagtailadmin_urls +from wagtail.admin import urls as wagtailadmin_urls from wagtail.core import urls as wagtail_urls from wagtail.wagtaildocs import urls as wagtaildocs_urls from wagtail.wagtailimages import urls as wagtailimages_urls diff --git a/wagtail/tests/settings.py b/wagtail/tests/settings.py index 121648453b..a5434f8c7e 100644 --- a/wagtail/tests/settings.py +++ b/wagtail/tests/settings.py @@ -78,7 +78,7 @@ TEMPLATES = [ 'OPTIONS': { 'extensions': [ 'wagtail.core.jinja2tags.core', - 'wagtail.wagtailadmin.jinja2tags.userbar', + 'wagtail.admin.jinja2tags.userbar', 'wagtail.wagtailimages.jinja2tags.images', 'wagtail.contrib.settings.jinja2tags.settings', ], @@ -126,7 +126,7 @@ INSTALLED_APPS = ( 'wagtail.wagtailusers', 'wagtail.wagtailsnippets', 'wagtail.wagtaildocs', - 'wagtail.wagtailadmin', + 'wagtail.admin', 'wagtail.api.v2', 'wagtail.core', @@ -204,7 +204,7 @@ WAGTAIL_USER_CUSTOM_FIELDS = ['country', 'attachment'] WAGTAILADMIN_RICH_TEXT_EDITORS = { 'default': { - 'WIDGET': 'wagtail.wagtailadmin.rich_text.HalloRichTextArea' + 'WIDGET': 'wagtail.admin.rich_text.HalloRichTextArea' }, 'custom': { 'WIDGET': 'wagtail.tests.testapp.rich_text.CustomRichTextArea' diff --git a/wagtail/tests/snippets/forms.py b/wagtail/tests/snippets/forms.py index 15847ebb85..95351359a2 100644 --- a/wagtail/tests/snippets/forms.py +++ b/wagtail/tests/snippets/forms.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, unicode_literals -from wagtail.wagtailadmin.forms import WagtailAdminModelForm +from wagtail.admin.forms import WagtailAdminModelForm class FancySnippetForm(WagtailAdminModelForm): diff --git a/wagtail/tests/snippets/models.py b/wagtail/tests/snippets/models.py index 17d702e102..545fde04d7 100644 --- a/wagtail/tests/snippets/models.py +++ b/wagtail/tests/snippets/models.py @@ -4,7 +4,7 @@ from django.db import models from modelcluster.fields import ParentalKey from modelcluster.models import ClusterableModel -from wagtail.wagtailadmin.edit_handlers import FieldPanel, InlinePanel +from wagtail.admin.edit_handlers import FieldPanel, InlinePanel from wagtail.core.fields import RichTextField from wagtail.wagtailsearch import index from wagtail.wagtailsnippets.models import register_snippet diff --git a/wagtail/tests/testapp/forms.py b/wagtail/tests/testapp/forms.py index e8b196863b..9810dfaac4 100644 --- a/wagtail/tests/testapp/forms.py +++ b/wagtail/tests/testapp/forms.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django import forms -from wagtail.wagtailadmin.forms import WagtailAdminPageForm +from wagtail.admin.forms import WagtailAdminPageForm class ValidatedPageForm(WagtailAdminPageForm): diff --git a/wagtail/tests/testapp/models.py b/wagtail/tests/testapp/models.py index b8e283d3e7..e2fe27f9dd 100644 --- a/wagtail/tests/testapp/models.py +++ b/wagtail/tests/testapp/models.py @@ -19,11 +19,11 @@ from taggit.managers import TaggableManager from taggit.models import TaggedItemBase from wagtail.contrib.settings.models import BaseSetting, register_setting -from wagtail.wagtailadmin.edit_handlers import ( +from wagtail.admin.edit_handlers import ( FieldPanel, InlinePanel, MultiFieldPanel, ObjectList, PageChooserPanel, StreamFieldPanel, TabbedInterface) -from wagtail.wagtailadmin.forms import WagtailAdminPageForm -from wagtail.wagtailadmin.utils import send_mail +from wagtail.admin.forms import WagtailAdminPageForm +from wagtail.admin.utils import send_mail from wagtail.core.blocks import CharBlock, RichTextBlock from wagtail.core.fields import RichTextField, StreamField from wagtail.core.models import Orderable, Page, PageManager, PageQuerySet diff --git a/wagtail/tests/testapp/rich_text.py b/wagtail/tests/testapp/rich_text.py index 2d594e69a6..f1d1391af0 100644 --- a/wagtail/tests/testapp/rich_text.py +++ b/wagtail/tests/testapp/rich_text.py @@ -5,7 +5,7 @@ import json from django.forms import Media, widgets from wagtail.utils.widgets import WidgetWithScript -from wagtail.wagtailadmin.edit_handlers import RichTextFieldPanel +from wagtail.admin.edit_handlers import RichTextFieldPanel class CustomRichTextArea(WidgetWithScript, widgets.Textarea): diff --git a/wagtail/tests/testapp/views.py b/wagtail/tests/testapp/views.py index 3623b935d5..c8c4de2c99 100644 --- a/wagtail/tests/testapp/views.py +++ b/wagtail/tests/testapp/views.py @@ -4,8 +4,8 @@ from django.http import HttpResponse from django.shortcuts import redirect from django.template.response import TemplateResponse -from wagtail.wagtailadmin import messages -from wagtail.wagtailadmin.utils import user_passes_test +from wagtail.admin import messages +from wagtail.admin.utils import user_passes_test def user_is_called_bob(user): diff --git a/wagtail/tests/testapp/wagtail_hooks.py b/wagtail/tests/testapp/wagtail_hooks.py index 74eec1a75c..828ba51054 100644 --- a/wagtail/tests/testapp/wagtail_hooks.py +++ b/wagtail/tests/testapp/wagtail_hooks.py @@ -4,9 +4,9 @@ from django import forms from django.contrib.staticfiles.templatetags.staticfiles import static from django.http import HttpResponse -from wagtail.wagtailadmin.menu import MenuItem -from wagtail.wagtailadmin.rich_text import HalloPlugin -from wagtail.wagtailadmin.search import SearchArea +from wagtail.admin.menu import MenuItem +from wagtail.admin.rich_text import HalloPlugin +from wagtail.admin.search import SearchArea from wagtail.core import hooks from wagtail.core.whitelist import allow_without_attributes, attribute_rule, check_url diff --git a/wagtail/tests/urls.py b/wagtail/tests/urls.py index e10b46b2ae..5cfaedb2df 100644 --- a/wagtail/tests/urls.py +++ b/wagtail/tests/urls.py @@ -7,7 +7,7 @@ from wagtail.api.v2.router import WagtailAPIRouter from wagtail.contrib.wagtailsitemaps import views as sitemaps_views from wagtail.contrib.wagtailsitemaps import Sitemap from wagtail.tests.testapp import urls as testapp_urls -from wagtail.wagtailadmin import urls as wagtailadmin_urls +from wagtail.admin import urls as wagtailadmin_urls from wagtail.core import urls as wagtail_urls from wagtail.wagtaildocs import urls as wagtaildocs_urls from wagtail.wagtaildocs.api.v2.endpoints import DocumentsAPIEndpoint diff --git a/wagtail/wagtailadmin/__init__.py b/wagtail/wagtailadmin/__init__.py deleted file mode 100644 index c0779fd931..0000000000 --- a/wagtail/wagtailadmin/__init__.py +++ /dev/null @@ -1 +0,0 @@ -default_app_config = 'wagtail.wagtailadmin.apps.WagtailAdminAppConfig' diff --git a/wagtail/wagtaildocs/edit_handlers.py b/wagtail/wagtaildocs/edit_handlers.py index 444390342c..852b05b6ea 100644 --- a/wagtail/wagtaildocs/edit_handlers.py +++ b/wagtail/wagtaildocs/edit_handlers.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, unicode_literals -from wagtail.wagtailadmin.edit_handlers import BaseChooserPanel +from wagtail.admin.edit_handlers import BaseChooserPanel from .widgets import AdminDocumentChooser diff --git a/wagtail/wagtaildocs/forms.py b/wagtail/wagtaildocs/forms.py index 4a52366a39..920437ad6a 100644 --- a/wagtail/wagtaildocs/forms.py +++ b/wagtail/wagtaildocs/forms.py @@ -4,8 +4,8 @@ from django import forms from django.forms.models import modelform_factory from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin import widgets -from wagtail.wagtailadmin.forms import ( +from wagtail.admin import widgets +from wagtail.admin.forms import ( BaseCollectionMemberForm, collection_member_permission_formset_factory) from wagtail.wagtaildocs.models import Document from wagtail.wagtaildocs.permissions import permission_policy as documents_permission_policy diff --git a/wagtail/wagtaildocs/models.py b/wagtail/wagtaildocs/models.py index f27031aa06..1bf39e6a0e 100644 --- a/wagtail/wagtaildocs/models.py +++ b/wagtail/wagtaildocs/models.py @@ -10,7 +10,7 @@ from django.urls import reverse from django.utils.translation import ugettext_lazy as _ from taggit.managers import TaggableManager -from wagtail.wagtailadmin.utils import get_object_usage +from wagtail.admin.utils import get_object_usage from wagtail.core.models import CollectionMember from wagtail.wagtailsearch import index from wagtail.wagtailsearch.queryset import SearchableQuerySetMixin diff --git a/wagtail/wagtaildocs/views/chooser.py b/wagtail/wagtaildocs/views/chooser.py index ab902c3e74..51f754f84d 100644 --- a/wagtail/wagtaildocs/views/chooser.py +++ b/wagtail/wagtaildocs/views/chooser.py @@ -6,9 +6,9 @@ from django.shortcuts import get_object_or_404, render from django.urls import reverse from wagtail.utils.pagination import paginate -from wagtail.wagtailadmin.forms import SearchForm -from wagtail.wagtailadmin.modal_workflow import render_modal_workflow -from wagtail.wagtailadmin.utils import PermissionPolicyChecker +from wagtail.admin.forms import SearchForm +from wagtail.admin.modal_workflow import render_modal_workflow +from wagtail.admin.utils import PermissionPolicyChecker from wagtail.core import hooks from wagtail.core.models import Collection from wagtail.wagtaildocs.forms import get_document_form diff --git a/wagtail/wagtaildocs/views/documents.py b/wagtail/wagtaildocs/views/documents.py index 0cf155fba4..c8b5826f98 100644 --- a/wagtail/wagtaildocs/views/documents.py +++ b/wagtail/wagtaildocs/views/documents.py @@ -6,9 +6,9 @@ from django.utils.translation import ugettext as _ from django.views.decorators.vary import vary_on_headers from wagtail.utils.pagination import paginate -from wagtail.wagtailadmin import messages -from wagtail.wagtailadmin.forms import SearchForm -from wagtail.wagtailadmin.utils import ( +from wagtail.admin import messages +from wagtail.admin.forms import SearchForm +from wagtail.admin.utils import ( PermissionPolicyChecker, permission_denied, popular_tags_for_model) from wagtail.core.models import Collection from wagtail.wagtaildocs.forms import get_document_form diff --git a/wagtail/wagtaildocs/views/multiple.py b/wagtail/wagtaildocs/views/multiple.py index 3b02530245..c135e9d51c 100644 --- a/wagtail/wagtaildocs/views/multiple.py +++ b/wagtail/wagtaildocs/views/multiple.py @@ -8,7 +8,7 @@ from django.utils.encoding import force_text from django.views.decorators.http import require_POST from django.views.decorators.vary import vary_on_headers -from wagtail.wagtailadmin.utils import PermissionPolicyChecker +from wagtail.admin.utils import PermissionPolicyChecker from wagtail.wagtailsearch.backends import get_search_backends from ..forms import get_document_form, get_document_multi_form diff --git a/wagtail/wagtaildocs/wagtail_hooks.py b/wagtail/wagtaildocs/wagtail_hooks.py index 3402ed6449..450aa8da98 100644 --- a/wagtail/wagtaildocs/wagtail_hooks.py +++ b/wagtail/wagtaildocs/wagtail_hooks.py @@ -9,10 +9,10 @@ from django.utils.html import format_html, format_html_join from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext -from wagtail.wagtailadmin.menu import MenuItem -from wagtail.wagtailadmin.rich_text import HalloPlugin -from wagtail.wagtailadmin.search import SearchArea -from wagtail.wagtailadmin.site_summary import SummaryItem +from wagtail.admin.menu import MenuItem +from wagtail.admin.rich_text import HalloPlugin +from wagtail.admin.search import SearchArea +from wagtail.admin.site_summary import SummaryItem from wagtail.core import hooks from wagtail.core.models import BaseViewRestriction from wagtail.core.wagtail_hooks import require_wagtail_login diff --git a/wagtail/wagtaildocs/widgets.py b/wagtail/wagtaildocs/widgets.py index 0b94f0c77c..786ffbc6cc 100644 --- a/wagtail/wagtaildocs/widgets.py +++ b/wagtail/wagtaildocs/widgets.py @@ -5,7 +5,7 @@ import json from django.template.loader import render_to_string from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin.widgets import AdminChooser +from wagtail.admin.widgets import AdminChooser from wagtail.wagtaildocs.models import get_document_model diff --git a/wagtail/wagtailembeds/views/chooser.py b/wagtail/wagtailembeds/views/chooser.py index 8b506a36e7..8b6ea69806 100644 --- a/wagtail/wagtailembeds/views/chooser.py +++ b/wagtail/wagtailembeds/views/chooser.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.forms.utils import ErrorList from django.utils.translation import ugettext as _ -from wagtail.wagtailadmin.modal_workflow import render_modal_workflow +from wagtail.admin.modal_workflow import render_modal_workflow from wagtail.wagtailembeds.exceptions import ( EmbedNotFoundException, EmbedUnsupportedProviderException) from wagtail.wagtailembeds.finders.embedly import AccessDeniedEmbedlyException, EmbedlyException diff --git a/wagtail/wagtailembeds/wagtail_hooks.py b/wagtail/wagtailembeds/wagtail_hooks.py index ad17a49d1e..9064a742e2 100644 --- a/wagtail/wagtailembeds/wagtail_hooks.py +++ b/wagtail/wagtailembeds/wagtail_hooks.py @@ -4,7 +4,7 @@ from django.conf.urls import include, url from django.urls import reverse from django.utils.html import format_html -from wagtail.wagtailadmin.rich_text import HalloPlugin +from wagtail.admin.rich_text import HalloPlugin from wagtail.core import hooks from wagtail.wagtailembeds import urls from wagtail.wagtailembeds.rich_text import MediaEmbedHandler diff --git a/wagtail/wagtailforms/edit_handlers.py b/wagtail/wagtailforms/edit_handlers.py index 93c61531d7..ab8c7118e8 100644 --- a/wagtail/wagtailforms/edit_handlers.py +++ b/wagtail/wagtailforms/edit_handlers.py @@ -4,7 +4,7 @@ from django.template.loader import render_to_string from django.utils.safestring import mark_safe from django.utils.translation import ugettext as _ -from wagtail.wagtailadmin.edit_handlers import EditHandler +from wagtail.admin.edit_handlers import EditHandler class BaseFormSubmissionsPanel(EditHandler): diff --git a/wagtail/wagtailforms/forms.py b/wagtail/wagtailforms/forms.py index dc5b40ed2f..f83bc447b5 100644 --- a/wagtail/wagtailforms/forms.py +++ b/wagtail/wagtailforms/forms.py @@ -5,7 +5,7 @@ from collections import OrderedDict import django.forms from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin.forms import WagtailAdminPageForm +from wagtail.admin.forms import WagtailAdminPageForm class BaseForm(django.forms.Form): diff --git a/wagtail/wagtailforms/models.py b/wagtail/wagtailforms/models.py index 2de5d81dc2..2a59d6d520 100644 --- a/wagtail/wagtailforms/models.py +++ b/wagtail/wagtailforms/models.py @@ -11,8 +11,8 @@ from django.utils.text import slugify from django.utils.translation import ugettext_lazy as _ from unidecode import unidecode -from wagtail.wagtailadmin.edit_handlers import FieldPanel -from wagtail.wagtailadmin.utils import send_mail +from wagtail.admin.edit_handlers import FieldPanel +from wagtail.admin.utils import send_mail from wagtail.core import hooks from wagtail.core.models import Orderable, Page, UserPagePermissionsProxy, get_page_models diff --git a/wagtail/wagtailforms/tests/test_views.py b/wagtail/wagtailforms/tests/test_views.py index dd54dd8315..2e34353413 100644 --- a/wagtail/wagtailforms/tests/test_views.py +++ b/wagtail/wagtailforms/tests/test_views.py @@ -10,8 +10,8 @@ from django.urls import reverse from wagtail.tests.testapp.models import ( CustomFormPageSubmission, FormField, FormFieldWithCustomSubmission, FormPage) from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailadmin.edit_handlers import get_form_for_model -from wagtail.wagtailadmin.forms import WagtailAdminPageForm +from wagtail.admin.edit_handlers import get_form_for_model +from wagtail.admin.forms import WagtailAdminPageForm from wagtail.core.models import Page from wagtail.wagtailforms.edit_handlers import FormSubmissionsPanel from wagtail.wagtailforms.models import FormSubmission diff --git a/wagtail/wagtailforms/views.py b/wagtail/wagtailforms/views.py index 4691686f92..4f70cb5a8c 100644 --- a/wagtail/wagtailforms/views.py +++ b/wagtail/wagtailforms/views.py @@ -10,7 +10,7 @@ from django.utils.encoding import smart_str from django.utils.translation import ungettext from wagtail.utils.pagination import paginate -from wagtail.wagtailadmin import messages +from wagtail.admin import messages from wagtail.core.models import Page from wagtail.wagtailforms.forms import SelectDateForm from wagtail.wagtailforms.models import get_forms_for_user diff --git a/wagtail/wagtailforms/wagtail_hooks.py b/wagtail/wagtailforms/wagtail_hooks.py index 9207524ec9..231ff502d6 100644 --- a/wagtail/wagtailforms/wagtail_hooks.py +++ b/wagtail/wagtailforms/wagtail_hooks.py @@ -4,7 +4,7 @@ from django.conf.urls import include, url from django.urls import reverse from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin.menu import MenuItem +from wagtail.admin.menu import MenuItem from wagtail.core import hooks from wagtail.wagtailforms import urls from wagtail.wagtailforms.models import get_forms_for_user diff --git a/wagtail/wagtailimages/edit_handlers.py b/wagtail/wagtailimages/edit_handlers.py index e98a06aea6..dd89c7ed3a 100644 --- a/wagtail/wagtailimages/edit_handlers.py +++ b/wagtail/wagtailimages/edit_handlers.py @@ -2,8 +2,8 @@ from __future__ import absolute_import, unicode_literals from django.template.loader import render_to_string -from wagtail.wagtailadmin.compare import ForeignObjectComparison -from wagtail.wagtailadmin.edit_handlers import BaseChooserPanel +from wagtail.admin.compare import ForeignObjectComparison +from wagtail.admin.edit_handlers import BaseChooserPanel from .widgets import AdminImageChooser diff --git a/wagtail/wagtailimages/forms.py b/wagtail/wagtailimages/forms.py index fe4276c34c..a287c0c6f3 100644 --- a/wagtail/wagtailimages/forms.py +++ b/wagtail/wagtailimages/forms.py @@ -5,8 +5,8 @@ from django.forms.models import modelform_factory from django.utils.text import capfirst from django.utils.translation import ugettext as _ -from wagtail.wagtailadmin import widgets -from wagtail.wagtailadmin.forms import ( +from wagtail.admin import widgets +from wagtail.admin.forms import ( BaseCollectionMemberForm, collection_member_permission_formset_factory) from wagtail.wagtailimages.fields import WagtailImageField from wagtail.wagtailimages.formats import get_image_formats diff --git a/wagtail/wagtailimages/models.py b/wagtail/wagtailimages/models.py index 632b9d4a67..b70e3dea29 100644 --- a/wagtail/wagtailimages/models.py +++ b/wagtail/wagtailimages/models.py @@ -20,7 +20,7 @@ from taggit.managers import TaggableManager from unidecode import unidecode from willow.image import Image as WillowImage -from wagtail.wagtailadmin.utils import get_object_usage +from wagtail.admin.utils import get_object_usage from wagtail.core import hooks from wagtail.core.models import CollectionMember from wagtail.wagtailimages.exceptions import InvalidFilterSpecError diff --git a/wagtail/wagtailimages/views/chooser.py b/wagtail/wagtailimages/views/chooser.py index 09a5e1bd01..ec227799f2 100644 --- a/wagtail/wagtailimages/views/chooser.py +++ b/wagtail/wagtailimages/views/chooser.py @@ -6,9 +6,9 @@ from django.shortcuts import get_object_or_404, render from django.urls import reverse from wagtail.utils.pagination import paginate -from wagtail.wagtailadmin.forms import SearchForm -from wagtail.wagtailadmin.modal_workflow import render_modal_workflow -from wagtail.wagtailadmin.utils import PermissionPolicyChecker, popular_tags_for_model +from wagtail.admin.forms import SearchForm +from wagtail.admin.modal_workflow import render_modal_workflow +from wagtail.admin.utils import PermissionPolicyChecker, popular_tags_for_model from wagtail.core import hooks from wagtail.core.models import Collection from wagtail.wagtailimages import get_image_model diff --git a/wagtail/wagtailimages/views/images.py b/wagtail/wagtailimages/views/images.py index b3d241a30f..cfc14ce7b7 100644 --- a/wagtail/wagtailimages/views/images.py +++ b/wagtail/wagtailimages/views/images.py @@ -10,9 +10,9 @@ from django.utils.translation import ugettext as _ from django.views.decorators.vary import vary_on_headers from wagtail.utils.pagination import paginate -from wagtail.wagtailadmin import messages -from wagtail.wagtailadmin.forms import SearchForm -from wagtail.wagtailadmin.utils import ( +from wagtail.admin import messages +from wagtail.admin.forms import SearchForm +from wagtail.admin.utils import ( PermissionPolicyChecker, permission_denied, popular_tags_for_model) from wagtail.core.models import Collection, Site from wagtail.wagtailimages import get_image_model diff --git a/wagtail/wagtailimages/views/multiple.py b/wagtail/wagtailimages/views/multiple.py index 326e48daf2..36fd33ff6f 100644 --- a/wagtail/wagtailimages/views/multiple.py +++ b/wagtail/wagtailimages/views/multiple.py @@ -8,7 +8,7 @@ from django.utils.encoding import force_text from django.views.decorators.http import require_POST from django.views.decorators.vary import vary_on_headers -from wagtail.wagtailadmin.utils import PermissionPolicyChecker +from wagtail.admin.utils import PermissionPolicyChecker from wagtail.wagtailimages import get_image_model from wagtail.wagtailimages.fields import ALLOWED_EXTENSIONS from wagtail.wagtailimages.forms import get_image_form diff --git a/wagtail/wagtailimages/wagtail_hooks.py b/wagtail/wagtailimages/wagtail_hooks.py index db7a9915d1..3e6f4325fa 100644 --- a/wagtail/wagtailimages/wagtail_hooks.py +++ b/wagtail/wagtailimages/wagtail_hooks.py @@ -7,10 +7,10 @@ from django.utils.html import format_html, format_html_join from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext -from wagtail.wagtailadmin.menu import MenuItem -from wagtail.wagtailadmin.rich_text import HalloPlugin -from wagtail.wagtailadmin.search import SearchArea -from wagtail.wagtailadmin.site_summary import SummaryItem +from wagtail.admin.menu import MenuItem +from wagtail.admin.rich_text import HalloPlugin +from wagtail.admin.search import SearchArea +from wagtail.admin.site_summary import SummaryItem from wagtail.core import hooks from wagtail.wagtailimages import admin_urls, get_image_model, image_operations from wagtail.wagtailimages.api.admin.endpoints import ImagesAdminAPIEndpoint diff --git a/wagtail/wagtailimages/widgets.py b/wagtail/wagtailimages/widgets.py index f10dbb4315..465b23983c 100644 --- a/wagtail/wagtailimages/widgets.py +++ b/wagtail/wagtailimages/widgets.py @@ -5,7 +5,7 @@ import json from django.template.loader import render_to_string from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin.widgets import AdminChooser +from wagtail.admin.widgets import AdminChooser from wagtail.wagtailimages import get_image_model diff --git a/wagtail/wagtailredirects/forms.py b/wagtail/wagtailredirects/forms.py index 32826adbe8..921dff2cee 100644 --- a/wagtail/wagtailredirects/forms.py +++ b/wagtail/wagtailredirects/forms.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django import forms from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin.widgets import AdminPageChooser +from wagtail.admin.widgets import AdminPageChooser from wagtail.core.models import Site from wagtail.wagtailredirects.models import Redirect diff --git a/wagtail/wagtailredirects/views.py b/wagtail/wagtailredirects/views.py index 0129a000c6..3193e13832 100644 --- a/wagtail/wagtailredirects/views.py +++ b/wagtail/wagtailredirects/views.py @@ -6,9 +6,9 @@ from django.utils.translation import ugettext as _ from django.views.decorators.vary import vary_on_headers from wagtail.utils.pagination import paginate -from wagtail.wagtailadmin import messages -from wagtail.wagtailadmin.forms import SearchForm -from wagtail.wagtailadmin.utils import PermissionPolicyChecker, permission_denied +from wagtail.admin import messages +from wagtail.admin.forms import SearchForm +from wagtail.admin.utils import PermissionPolicyChecker, permission_denied from wagtail.wagtailredirects import models from wagtail.wagtailredirects.forms import RedirectForm from wagtail.wagtailredirects.permissions import permission_policy diff --git a/wagtail/wagtailredirects/wagtail_hooks.py b/wagtail/wagtailredirects/wagtail_hooks.py index 5ca93608de..aa99bc227a 100644 --- a/wagtail/wagtailredirects/wagtail_hooks.py +++ b/wagtail/wagtailredirects/wagtail_hooks.py @@ -5,7 +5,7 @@ from django.contrib.auth.models import Permission from django.urls import reverse from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin.menu import MenuItem +from wagtail.admin.menu import MenuItem from wagtail.core import hooks from wagtail.wagtailredirects import urls from wagtail.wagtailredirects.permissions import permission_policy diff --git a/wagtail/wagtailsearch/views/queries.py b/wagtail/wagtailsearch/views/queries.py index 29b67c4ac1..2140d87e46 100644 --- a/wagtail/wagtailsearch/views/queries.py +++ b/wagtail/wagtailsearch/views/queries.py @@ -3,8 +3,8 @@ from __future__ import absolute_import, unicode_literals from django.shortcuts import render from wagtail.utils.pagination import paginate -from wagtail.wagtailadmin.forms import SearchForm -from wagtail.wagtailadmin.modal_workflow import render_modal_workflow +from wagtail.admin.forms import SearchForm +from wagtail.admin.modal_workflow import render_modal_workflow from wagtail.wagtailsearch import models from wagtail.wagtailsearch.utils import normalise_query_string diff --git a/wagtail/wagtailsites/forms.py b/wagtail/wagtailsites/forms.py index 4d8bf6add0..be7a3de256 100644 --- a/wagtail/wagtailsites/forms.py +++ b/wagtail/wagtailsites/forms.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django import forms from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin.widgets import AdminPageChooser +from wagtail.admin.widgets import AdminPageChooser from wagtail.core.models import Site diff --git a/wagtail/wagtailsites/views.py b/wagtail/wagtailsites/views.py index 7c7b61e5d6..a8ee55fc90 100644 --- a/wagtail/wagtailsites/views.py +++ b/wagtail/wagtailsites/views.py @@ -2,8 +2,8 @@ from __future__ import absolute_import, unicode_literals from django.utils.translation import ugettext_lazy -from wagtail.wagtailadmin.views import generic -from wagtail.wagtailadmin.viewsets.model import ModelViewSet +from wagtail.admin.views import generic +from wagtail.admin.viewsets.model import ModelViewSet from wagtail.core.models import Site from wagtail.core.permissions import site_permission_policy from wagtail.wagtailsites.forms import SiteForm diff --git a/wagtail/wagtailsites/wagtail_hooks.py b/wagtail/wagtailsites/wagtail_hooks.py index b9defe63fe..00ff9a8929 100644 --- a/wagtail/wagtailsites/wagtail_hooks.py +++ b/wagtail/wagtailsites/wagtail_hooks.py @@ -4,7 +4,7 @@ from django.contrib.auth.models import Permission from django.urls import reverse from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin.menu import MenuItem +from wagtail.admin.menu import MenuItem from wagtail.core import hooks from wagtail.core.permissions import site_permission_policy diff --git a/wagtail/wagtailsnippets/edit_handlers.py b/wagtail/wagtailsnippets/edit_handlers.py index 4eab9b7b7b..146e07a260 100644 --- a/wagtail/wagtailsnippets/edit_handlers.py +++ b/wagtail/wagtailsnippets/edit_handlers.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.template.loader import render_to_string from django.utils.safestring import mark_safe -from wagtail.wagtailadmin.edit_handlers import BaseChooserPanel +from wagtail.admin.edit_handlers import BaseChooserPanel from .widgets import AdminSnippetChooser diff --git a/wagtail/wagtailsnippets/models.py b/wagtail/wagtailsnippets/models.py index 3b76bb2c5e..10a4bedd9b 100644 --- a/wagtail/wagtailsnippets/models.py +++ b/wagtail/wagtailsnippets/models.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.urls import reverse -from wagtail.wagtailadmin.utils import get_object_usage +from wagtail.admin.utils import get_object_usage SNIPPET_MODELS = [] diff --git a/wagtail/wagtailsnippets/tests.py b/wagtail/wagtailsnippets/tests.py index 30b8d6009f..f74cf95206 100644 --- a/wagtail/wagtailsnippets/tests.py +++ b/wagtail/wagtailsnippets/tests.py @@ -16,7 +16,7 @@ from wagtail.tests.snippets.models import ( SearchableSnippet, StandardSnippet, ZuluSnippet) from wagtail.tests.testapp.models import Advert, AdvertWithTabbedInterface, SnippetChooserModel from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailadmin.forms import WagtailAdminModelForm +from wagtail.admin.forms import WagtailAdminModelForm from wagtail.core.models import Page from wagtail.wagtailsnippets.blocks import SnippetChooserBlock from wagtail.wagtailsnippets.edit_handlers import SnippetChooserPanel diff --git a/wagtail/wagtailsnippets/views/chooser.py b/wagtail/wagtailsnippets/views/chooser.py index 53c20a4593..fec9e11b64 100644 --- a/wagtail/wagtailsnippets/views/chooser.py +++ b/wagtail/wagtailsnippets/views/chooser.py @@ -7,8 +7,8 @@ from django.urls import reverse from django.utils.translation import ugettext as _ from wagtail.utils.pagination import paginate -from wagtail.wagtailadmin.forms import SearchForm -from wagtail.wagtailadmin.modal_workflow import render_modal_workflow +from wagtail.admin.forms import SearchForm +from wagtail.admin.modal_workflow import render_modal_workflow from wagtail.wagtailsearch.backends import get_search_backend from wagtail.wagtailsearch.index import class_is_indexed from wagtail.wagtailsnippets.views.snippets import get_snippet_model_from_url_params diff --git a/wagtail/wagtailsnippets/views/snippets.py b/wagtail/wagtailsnippets/views/snippets.py index 02354fb86c..c54f46a285 100644 --- a/wagtail/wagtailsnippets/views/snippets.py +++ b/wagtail/wagtailsnippets/views/snippets.py @@ -8,11 +8,11 @@ from django.utils.text import capfirst from django.utils.translation import ugettext as _ from wagtail.utils.pagination import paginate -from wagtail.wagtailadmin import messages -from wagtail.wagtailadmin.edit_handlers import ( +from wagtail.admin import messages +from wagtail.admin.edit_handlers import ( ObjectList, extract_panel_definitions_from_model_class) -from wagtail.wagtailadmin.forms import SearchForm -from wagtail.wagtailadmin.utils import permission_denied +from wagtail.admin.forms import SearchForm +from wagtail.admin.utils import permission_denied from wagtail.wagtailsearch.backends import get_search_backend from wagtail.wagtailsearch.index import class_is_indexed from wagtail.wagtailsnippets.models import get_snippet_models diff --git a/wagtail/wagtailsnippets/wagtail_hooks.py b/wagtail/wagtailsnippets/wagtail_hooks.py index 7c7cbbaf6e..3725b01058 100644 --- a/wagtail/wagtailsnippets/wagtail_hooks.py +++ b/wagtail/wagtailsnippets/wagtail_hooks.py @@ -8,7 +8,7 @@ from django.urls import reverse from django.utils.html import format_html from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin.menu import MenuItem +from wagtail.admin.menu import MenuItem from wagtail.core import hooks from wagtail.wagtailsnippets import urls from wagtail.wagtailsnippets.models import get_snippet_models diff --git a/wagtail/wagtailsnippets/widgets.py b/wagtail/wagtailsnippets/widgets.py index 193ec5d268..cd4d1a20bd 100644 --- a/wagtail/wagtailsnippets/widgets.py +++ b/wagtail/wagtailsnippets/widgets.py @@ -5,7 +5,7 @@ import json from django.template.loader import render_to_string from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin.widgets import AdminChooser +from wagtail.admin.widgets import AdminChooser class AdminSnippetChooser(AdminChooser): diff --git a/wagtail/wagtailusers/forms.py b/wagtail/wagtailusers/forms.py index d17e89d4e2..488dcadec2 100644 --- a/wagtail/wagtailusers/forms.py +++ b/wagtail/wagtailusers/forms.py @@ -14,8 +14,8 @@ from django.template.loader import render_to_string from django.utils.html import mark_safe from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin.utils import get_available_admin_languages -from wagtail.wagtailadmin.widgets import AdminPageChooser +from wagtail.admin.utils import get_available_admin_languages +from wagtail.admin.widgets import AdminPageChooser from wagtail.core import hooks from wagtail.core.models import ( PAGE_PERMISSION_TYPE_CHOICES, PAGE_PERMISSION_TYPES, GroupPagePermission, Page, diff --git a/wagtail/wagtailusers/views/groups.py b/wagtail/wagtailusers/views/groups.py index d1228272ae..f3e703a0a5 100644 --- a/wagtail/wagtailusers/views/groups.py +++ b/wagtail/wagtailusers/views/groups.py @@ -3,8 +3,8 @@ from __future__ import absolute_import, unicode_literals from django.contrib.auth.models import Group from django.utils.translation import ugettext as _ -from wagtail.wagtailadmin.views import generic, mixins -from wagtail.wagtailadmin.viewsets.model import ModelViewSet +from wagtail.admin.views import generic, mixins +from wagtail.admin.viewsets.model import ModelViewSet from wagtail.core import hooks from wagtail.wagtailusers.forms import GroupForm, GroupPagePermissionFormSet diff --git a/wagtail/wagtailusers/views/users.py b/wagtail/wagtailusers/views/users.py index dd2f2c3c68..6b81991f3d 100644 --- a/wagtail/wagtailusers/views/users.py +++ b/wagtail/wagtailusers/views/users.py @@ -11,9 +11,9 @@ from django.utils.translation import ugettext as _ from django.views.decorators.vary import vary_on_headers from wagtail.utils.pagination import paginate -from wagtail.wagtailadmin import messages -from wagtail.wagtailadmin.forms import SearchForm -from wagtail.wagtailadmin.utils import ( +from wagtail.admin import messages +from wagtail.admin.forms import SearchForm +from wagtail.admin.utils import ( any_permission_required, permission_denied, permission_required) from wagtail.core import hooks from wagtail.core.compat import AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME diff --git a/wagtail/wagtailusers/wagtail_hooks.py b/wagtail/wagtailusers/wagtail_hooks.py index 514a230384..3a2d64f846 100644 --- a/wagtail/wagtailusers/wagtail_hooks.py +++ b/wagtail/wagtailusers/wagtail_hooks.py @@ -6,8 +6,8 @@ from django.db.models import Q from django.urls import reverse from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin.menu import MenuItem -from wagtail.wagtailadmin.search import SearchArea +from wagtail.admin.menu import MenuItem +from wagtail.admin.search import SearchArea from wagtail.core import hooks from wagtail.core.compat import AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME from wagtail.wagtailusers.urls import users diff --git a/wagtail/wagtailusers/widgets.py b/wagtail/wagtailusers/widgets.py index 8950be0ae3..6c7fa50c30 100644 --- a/wagtail/wagtailusers/widgets.py +++ b/wagtail/wagtailusers/widgets.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, unicode_literals -from wagtail.wagtailadmin.widgets import Button +from wagtail.admin.widgets import Button class UserListingButton(Button):