From 9b17154cdf5c3770c7f5c44140952c21f759db27 Mon Sep 17 00:00:00 2001 From: Jeffrey Hearn Date: Thu, 5 Jun 2014 21:46:24 -0400 Subject: [PATCH 1/2] Added wagtail and django settings doc more settings stuffs settings stuff settings stuff so many things omg is it really two AM More docs --- docs/building_your_site/djangodevelopers.rst | 17 + .../building_your_site/frontenddevelopers.rst | 3 +- docs/editing_api.rst | 4 +- .../new_pages/inserting_videos.rst | 5 +- docs/form_builder.rst | 3 + docs/images/screen_wagtail_redirects.png | Bin 0 -> 19260 bytes docs/index.rst | 1 + docs/settings.rst | 615 ++++++++++++++++++ docs/wagtail_search.rst | 3 + 9 files changed, 647 insertions(+), 4 deletions(-) create mode 100644 docs/images/screen_wagtail_redirects.png create mode 100644 docs/settings.rst diff --git a/docs/building_your_site/djangodevelopers.rst b/docs/building_your_site/djangodevelopers.rst index b4899d70f..46e24b08f 100644 --- a/docs/building_your_site/djangodevelopers.rst +++ b/docs/building_your_site/djangodevelopers.rst @@ -1,9 +1,15 @@ For Django developers ===================== +.. contents:: Contents + :local: + .. note:: This documentation is currently being written. +Overview +~~~~~~~~ + Wagtail requires a little careful setup to define the types of content that you want to present through your website. The basic unit of content in Wagtail is the ``Page``, and all of your page-level content will inherit basic webpage-related properties from it. But for the most part, you will be defining content yourself, through the construction of Django models using Wagtail's ``Page`` as a base. Wagtail organizes content created from your models in a tree, which can have any structure and combination of model objects in it. Wagtail doesn't prescribe ways to organize and interrelate your content, but here we've sketched out some strategies for organizing your models. @@ -269,6 +275,7 @@ not_type(self, model): return self.get_query_set().not_type(model) +.. _wagtail_site_admin: Site ~~~~ @@ -278,3 +285,13 @@ Django's built-in admin interface provides the way to map a "site" (hostname or Access this by going to ``/django-admin/`` and then "Home › Wagtailcore › Sites." To try out a development site, add a single site with the hostname ``localhost`` at port ``8000`` and map it to one of the pieces of content you have created. Wagtail's developers plan to move the site settings into the Wagtail admin interface. + + +.. _redirects: + +Redirects +~~~~~~~~~ + +Wagtail provides a simple interface for creating arbitrary redirects to and from any URL. + +.. image:: ../images/screen_wagtail_redirects.png diff --git a/docs/building_your_site/frontenddevelopers.rst b/docs/building_your_site/frontenddevelopers.rst index e5f583397..83dbb9e6c 100644 --- a/docs/building_your_site/frontenddevelopers.rst +++ b/docs/building_your_site/frontenddevelopers.rst @@ -1,7 +1,8 @@ For Front End developers ======================== -.. contents:: +.. contents:: Contents + :local: ======================== Overview diff --git a/docs/editing_api.rst b/docs/editing_api.rst index c06370026..60698a74a 100644 --- a/docs/editing_api.rst +++ b/docs/editing_api.rst @@ -346,9 +346,9 @@ The ``RelatedLink`` class is a vanilla Django abstract model. The ``BookPageRela For another example of using model clusters, see :ref:`tagging` -For more on ``django-modelcluster``, visit `the django-modelcluster github project page`_ ). +For more on ``django-modelcluster``, visit `the django-modelcluster github project page`_. -.. _the django-modelcluster github page: https://github.com/torchbox/django-modelcluster +.. _the django-modelcluster github project page: https://github.com/torchbox/django-modelcluster .. _extending_wysiwyg: diff --git a/docs/editor_manual/new_pages/inserting_videos.rst b/docs/editor_manual/new_pages/inserting_videos.rst index 038f3e427..1b32c0d1c 100644 --- a/docs/editor_manual/new_pages/inserting_videos.rst +++ b/docs/editor_manual/new_pages/inserting_videos.rst @@ -1,3 +1,6 @@ + +.. _inserting_videos: + Inserting videos into body content ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -9,4 +12,4 @@ As well as inserting videos into a carousel, Wagtail's rich text fields allow yo .. image:: ../../images/screen21_video_in_editor.png -* A placeholder with the name of the video and a screenshot will be inserted into the text area. Clicking the X in the top corner will remove the video. \ No newline at end of file +* A placeholder with the name of the video and a screenshot will be inserted into the text area. Clicking the X in the top corner will remove the video. diff --git a/docs/form_builder.rst b/docs/form_builder.rst index 9aa220e19..a141cc376 100644 --- a/docs/form_builder.rst +++ b/docs/form_builder.rst @@ -1,3 +1,6 @@ + +.. _form_builder: + Form builder ============ diff --git a/docs/images/screen_wagtail_redirects.png b/docs/images/screen_wagtail_redirects.png new file mode 100644 index 0000000000000000000000000000000000000000..516bdd046551da4edeed93935626850ed0899ca8 GIT binary patch literal 19260 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 Date: Mon, 9 Jun 2014 11:47:12 -0400 Subject: [PATCH 2/2] Settings doc changes based on feedback --- docs/settings.rst | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/docs/settings.rst b/docs/settings.rst index c6e9a4fc0..018af5d01 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -25,7 +25,7 @@ From your app directory, you can safely remove ``admin.py`` and ``views.py``, si .. _Django Settings: https://docs.djangoproject.com/en/dev/topics/settings/ -.. _Django URL Dispatcher:https://docs.djangoproject.com/en/dev/topics/http/urls/ +.. _Django URL Dispatcher: https://docs.djangoproject.com/en/dev/topics/http/urls/ What follows is a settings reference which skips many boilerplate Django settings. If you just want to get your Wagtail install up quickly without fussing with settings at the moment, see :ref:`complete_example_config`. @@ -161,7 +161,7 @@ Authentication .. code-block:: python - LOGIN_URL = 'wagtail.wagtailadmin.views.account.login' + LOGIN_URL = 'wagtailadmin_login' LOGIN_REDIRECT_URL = 'wagtailadmin_home' These settings variables set the Django authentication system to redirect to the Wagtail admin login. If you plan to use the Django authentication module to log in non-privileged users, you should set these variables to your own login views. See `Django User Authentication`_. @@ -243,7 +243,7 @@ Email Notifications WAGTAILADMIN_NOTIFICATION_FROM_EMAIL = 'wagtail@myhost.io' -Wagtail sends email notifications when content is submitted for moderation, and when the content is accepted or rejected. This setting lets you pick which email address these automatic notifications will come from. +Wagtail sends email notifications when content is submitted for moderation, and when the content is accepted or rejected. This setting lets you pick which email address these automatic notifications will come from. If omitted, Django will fall back to using the ``DEFAULT_FROM_EMAIL`` variable if set, and ``webmaster@localhost`` if not. Other Django Settings Used by Wagtail @@ -271,18 +271,6 @@ For information on what these settings do, see `Django Settings`_. .. _Django Settings: https://docs.djangoproject.com/en/dev/ref/settings/ -URL Configuration (urls.py) -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -There's one more setting that must be included in ``settings.py``: - -.. code-block:: python - - ROOT_URLCONF = 'myproject.urls' - -This setting bootstraps your project's URL patterns and views into the Django server. The root urlconf will include URL patterns for Wagtail and any URLs for your own app functionality (developed external to Wagtail). - - Search Signal Handlers ---------------------- @@ -292,7 +280,7 @@ Search Signal Handlers wagtailsearch_register_signal_handlers() -This loads Wagtail's search signal handlers, which need to be loaded very early in the Django life cycle. While not technically a urlconf, this is a convenient place to load them. +This loads Wagtail's search signal handlers, which need to be loaded very early in the Django life cycle. While not technically a urlconf, this is a convenient place to load them. Calling this function registers signal handlers to watch for when indexed models get saved or deleted. This allows wagtailsearch to update ElasticSearch automatically. URL Patterns @@ -437,7 +425,7 @@ settings.py ) # Make this unique, and don't share it with anybody. - SECRET_KEY = 'wq21wtjo3@d_qfjvd-#td!%7gfy2updj2z+nev^k$iy%=m4_tr' + SECRET_KEY = 'change-me' # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( @@ -505,7 +493,7 @@ settings.py ) # Auth settings - LOGIN_URL = 'django.contrib.auth.views.login' + LOGIN_URL = 'wagtailadmin_login' LOGIN_REDIRECT_URL = 'wagtailadmin_home' # A sample logging configuration. The only tangible logging