diff --git a/.pylintrc b/.pylintrc index 62faad9f..0204afb8 100644 --- a/.pylintrc +++ b/.pylintrc @@ -1,4 +1,4 @@ [MASTER] ignore=migrations,south_migrations init-hook='import sys; import os; sys.path.append(os.path.abspath("src"))' - +disable=C, F, I, R, W diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5d57d25c..4a68d667 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -17,9 +17,9 @@ are used for versioning (schema follows below): 0.12 ---- -2017-06-dd (not release yet) +2017-06-28 -- Wagtail integration. +- Wagtail integration (yet experimental). 0.11.13 ------- diff --git a/CREDITS.rst b/CREDITS.rst index 425d2006..79128421 100644 --- a/CREDITS.rst +++ b/CREDITS.rst @@ -25,7 +25,8 @@ Thanks to the following people for their contributions: for his initiative to make `Select multiple with max` plugin. - `Andy Babic `_ - for improvements in the generic integration processor. + for improvements in the generic integration processor and contributions + to the ``wagtail_integration`` contrib app. - `Heldroe `_ for minor fixes. diff --git a/ROADMAP.rst b/ROADMAP.rst index 4c3b6acf..0588d142 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -3,12 +3,6 @@ Roadmap ======= Upcoming releases road-map. -0.12 ----- -yyyy-mm-dd (future). - -- Wagtail integration. - 0.13 ---- yyyy-mm-dd (future). diff --git a/src/fobi/contrib/apps/wagtail_integration/README.rst b/src/fobi/contrib/apps/wagtail_integration/README.rst index cab145ab..2ff2bac6 100644 --- a/src/fobi/contrib/apps/wagtail_integration/README.rst +++ b/src/fobi/contrib/apps/wagtail_integration/README.rst @@ -19,7 +19,7 @@ See the requirements files: your_project/settings.py ######################## See the `example settings file -`_. +`_. .. code-block:: python @@ -111,11 +111,11 @@ example below. 'wagtail_integration': { 'form_template_choices': [ ('fobi/bootstrap3_extras/view_embed_form.html', - "Custom bootstrap3 embed form view template"), + "Custom form view (non-partial) template"), ], 'success_page_template_choices': [ ('fobi/bootstrap3_extras/embed_form_submitted.html', - "Custom bootstrap3 embed form entry submitted template"), + "Custom form entry submitted (non-partial) template"), ], }, }, @@ -123,16 +123,20 @@ example below. 'wagtail_integration': { 'form_template_choices': [ ('fobi/foundation5_extras/view_embed_form.html', - "Custom foundation5 embed form view template"), + "Custom form view (non-partial) template"), ], 'success_page_template_choices': [ ('fobi/foundation5_extras/embed_form_submitted.html', - "Custom foundation5 embed form entry submitted template"), + "Custom form entry submitted (non-partial) template"), ], }, }, } +Disregard the name, both ``view_embed_form.html`` and +``embed_form_submitted.html`` files should be full (non-partial) HTML +templates. + Usage ~~~~~ The ``fobi.contrib.apps.wagtail_integration.models.FobiFormPage`` consists