Skip to content

Commit

Permalink
prepare 0.12
Browse files Browse the repository at this point in the history
  • Loading branch information
barseghyanartur committed Jun 28, 2017
1 parent 9a88fa7 commit ef16fee
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
-------
Expand Down
3 changes: 2 additions & 1 deletion CREDITS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ Thanks to the following people for their contributions:
for his initiative to make `Select multiple with max` plugin.
- `Andy Babic
<https://github.com/barseghyanartur/django-fobi/commits/master?author=ababic>`_
for improvements in the generic integration processor.
for improvements in the generic integration processor and contributions
to the ``wagtail_integration`` contrib app.
- `Heldroe
<https://github.com/barseghyanartur/django-fobi/commits/master?author=Heldroe>`_
for minor fixes.
Expand Down
6 changes: 0 additions & 6 deletions ROADMAP.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@ Roadmap
=======
Upcoming releases road-map.

0.12
----
yyyy-mm-dd (future).

- Wagtail integration.

0.13
----
yyyy-mm-dd (future).
Expand Down
14 changes: 9 additions & 5 deletions src/fobi/contrib/apps/wagtail_integration/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ See the requirements files:
your_project/settings.py
########################
See the `example settings file
<https://github.com/barseghyanartur/django-fobi/blob/stable/examples/wagtaildemo/settings/bootstrap3_theme_wagtail.py>`_.
<https://github.com/barseghyanartur/django-fobi/blob/stable/examples/wagtaildemo/settings/fobi_integration.py>`_.

.. code-block:: python
Expand Down Expand Up @@ -111,28 +111,32 @@ 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"),
],
},
},
'foundation5': {
'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
Expand Down

0 comments on commit ef16fee

Please sign in to comment.