prepare 0.12.1

barseghyanartur · Jul 31, 2017 · 73b3d46 · 73b3d46
1 parent 5af6f5b
commit 73b3d46
Show file tree

Hide file tree

Showing 22 changed files with 530 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -64,6 +64,7 @@ README_PARTS.rst
 /examples/quick_start/db.sqlite3
 /examples/quickstart/
 /examples/static/
+/examples/_static/
 /examples/requirements/wagtail.txt
 #/examples/wagtaildemo/
 /examples/wagtail_example_/

diff --git a/.hgignore b/.hgignore
@@ -31,6 +31,7 @@ syntax: regexp
 ^examples/media/fobi_plugins/content_image/
 ^examples/media/fobi_plugins/file/
 ^examples/static/
+^examples/_static/
 ^examples/simple/settings/local_settings\.py
 ^examples/simple/settings/local_settings_foundation5\.py
 ^examples/mezzanine_example/static/media/fobi_plugins/

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -17,8 +17,9 @@ are used for versioning (schema follows below):
 
 0.12.1
 ------
-yyyy-mm-dd (not released yet)
+2017-07-31
 
+- Reflect form-wizards support changes in the `simple` theme.
 - Fixes in docs.
 
 0.12

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -17,8 +17,9 @@ are used for versioning (schema follows below):
 
 0.12.1
 ------
-yyyy-mm-dd (not released yet)
+2017-07-31
 
+- Reflect form-wizards support changes in the `simple` theme.
 - Fixes in docs.
 
 0.12

diff --git a/examples/requirements/django_1_10.txt b/examples/requirements/django_1_10.txt
@@ -7,4 +7,5 @@ Django>=1.10,<1.11
 django-admin-tools>=0.8.0
 django-debug-toolbar==1.5
 django-registration-redux>=1.4
+django-simple-captcha==0.5.5
 sqlparse==0.2.2
diff --git a/examples/requirements/django_1_5.txt b/examples/requirements/django_1_5.txt
@@ -6,6 +6,5 @@ Django>=1.5,<1.6
 South>=0.8.2
 django-admin-tools==0.5.2
 django-debug-toolbar>=0.11.0
-#django-localeurl>=2.0.2
 django-registration-redux==1.2
 sqlparse==0.1.9
diff --git a/examples/requirements/django_1_6.txt b/examples/requirements/django_1_6.txt
@@ -6,6 +6,5 @@ Django>=1.6,<1.7
 South>=0.8.2
 django-admin-tools==0.5.2
 django-debug-toolbar>=0.11.0
-#django-localeurl>=2.0.2
 django-registration-redux==1.2
 sqlparse==0.1.9
diff --git a/examples/requirements/django_1_7.txt b/examples/requirements/django_1_7.txt
@@ -5,6 +5,5 @@
 Django>=1.7,<1.8
 django-admin-tools>=0.6.0
 django-debug-toolbar==0.11.0
-#django-localeurl>=2.0.2
 django-registration-redux==1.3
-sqlparse==0.1.9
+sqlparse==0.1.9
diff --git a/examples/requirements/django_1_8.txt b/examples/requirements/django_1_8.txt
@@ -5,7 +5,8 @@
 
 Django>=1.8,<1.9
 django-admin-tools>=0.6.0
-django-debug-toolbar==0.11.0
-django-formtools
+django-debug-toolbar==1.4
+#django-formtools
 django-registration-redux>=1.4
+django-simple-captcha==0.5.5
 sqlparse==0.1.9
diff --git a/examples/requirements/django_1_9.txt b/examples/requirements/django_1_9.txt
@@ -8,10 +8,10 @@ django-admin-tools>=0.7.1
 django-autoslug==1.9.3
 django-debug-toolbar==1.5
 django-formtools==1.0
-django-localeurl==2.0.2
 django-nine>=0.1.10
 django-nonefield>=0.1
 django-registration-redux>=1.4
+django-simple-captcha==0.5.5
 easy-thumbnails==2.3
 vishap>=0.1.5
 sqlparse==0.2.2
diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 from distutils.version import LooseVersion
 from setuptools import setup, find_packages
 
-version = '0.12'
+version = '0.12.1'
 
 # ***************************************************************************
 # ************************** Python version *********************************

diff --git a/src/fobi/__init__.py b/src/fobi/__init__.py
@@ -1,6 +1,6 @@
 __title__ = 'django-fobi'
-__version__ = '0.12'
-__build__ = 0x000089
+__version__ = '0.12.1'
+__build__ = 0x00008a
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
 __copyright__ = '2014-2017 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'

diff --git a/src/fobi/contrib/themes/bootstrap3/fobi_themes.py b/src/fobi/contrib/themes/bootstrap3/fobi_themes.py
@@ -89,6 +89,7 @@ class Bootstrap3Theme(BaseTheme):
 
     form_wizard_properties_snippet_template_name = \
         'bootstrap3/snippets/form_wizard_properties_snippet.html'
+
     # ***********************************************************************
     # **************************** Form entry CRUD **************************
     # ***********************************************************************

diff --git a/src/fobi/contrib/themes/simple/fobi_themes.py b/src/fobi/contrib/themes/simple/fobi_themes.py
@@ -35,9 +35,11 @@ class SimpleTheme(BaseTheme):
 
     # footer_text = '&copy; django-fobi example site 2014'
 
-    # *************************************************************************
-    # ********************** Form HTML specific *******************************
-    # *************************************************************************
+    # ***********************************************************************
+    # ***********************************************************************
+    # ********************** Form HTML specific *****************************
+    # ***********************************************************************
+    # ***********************************************************************
     form_element_html_class = 'vTextField'
     form_radio_element_html_class = 'radiolist'
     form_element_checkbox_html_class = 'checkbox'
@@ -54,54 +56,107 @@ class SimpleTheme(BaseTheme):
     # Important
     form_list_container_class = 'list-inline'
 
-    # *************************************************************************
-    # ********************** Templates specific *******************************
-    # *************************************************************************
+    # ***********************************************************************
+    # ***********************************************************************
+    # **************************** Templates ********************************
+    # ***********************************************************************
+    # ***********************************************************************
+
+    # ***********************************************************************
+    # *************************** Base templates ****************************
+    # ***********************************************************************
+
     master_base_template = 'simple/_base.html'
     base_template = 'simple/base.html'
     base_view_template = 'simple/base_view.html'
     base_edit_template = 'simple/base_edit.html'
 
-    form_ajax = 'simple/snippets/form_ajax.html'
+    # ***********************************************************************
+    # ***************************** Snippets ********************************
+    # ***********************************************************************
     form_snippet_template_name = 'simple/snippets/form_snippet.html'
-    form_view_snippet_template_name = 'simple/snippets/form_view_snippet.html'
-    form_edit_ajax = 'simple/snippets/form_edit_ajax.html'
-    form_edit_snippet_template_name = 'simple/snippets/form_edit_snippet.html'
     form_properties_snippet_template_name = \
         'simple/snippets/form_properties_snippet.html'
     messages_snippet_template_name = 'simple/snippets/messages_snippet.html'
+    form_ajax = 'simple/snippets/form_ajax.html'
+    form_view_snippet_template_name = 'simple/snippets/form_view_snippet.html'
 
-    add_form_element_entry_template = 'simple/add_form_element_entry.html'
-    add_form_element_entry_ajax_template = \
-        'simple/add_form_element_entry_ajax.html'
+    form_edit_ajax = 'simple/snippets/form_edit_ajax.html'
+    form_edit_snippet_template_name = 'simple/snippets/form_edit_snippet.html'
 
-    add_form_handler_entry_template = 'simple/add_form_handler_entry.html'
-    add_form_handler_entry_ajax_template = \
-        'simple/add_form_handler_entry_ajax.html'
+    form_wizard_snippet_template_name = \
+        'simple/snippets/form_wizard_snippet.html'
+
+    form_wizard_properties_snippet_template_name = \
+        'simple/snippets/form_wizard_properties_snippet.html'
 
+    # ***********************************************************************
+    # **************************** Form entry CRUD **************************
+    # ***********************************************************************
     create_form_entry_template = 'simple/create_form_entry.html'
     create_form_entry_ajax_template = 'simple/create_form_entry_ajax.html'
 
-    dashboard_template = 'simple/dashboard.html'
-    forms_list_template = 'simple/forms_list.html'
+    edit_form_entry_template = 'simple/edit_form_entry.html'
+    edit_form_entry_ajax_template = 'simple/edit_form_entry_ajax.html'
+
+    form_entry_submitted_template = 'simple/form_entry_submitted.html'
+    form_entry_submitted_ajax_template = \
+        'simple/form_entry_submitted_ajax.html'
+
+    view_form_entry_template = 'simple/view_form_entry.html'
+    view_form_entry_ajax_template = 'simple/view_form_entry_ajax.html'
+    # ***********************************************************************
+    # *********************** Form element entry CUD ************************
+    # ***********************************************************************
+    add_form_element_entry_template = 'simple/add_form_element_entry.html'
+    add_form_element_entry_ajax_template = \
+        'simple/add_form_element_entry_ajax.html'
 
     edit_form_element_entry_template = 'simple/edit_form_element_entry.html'
     edit_form_element_entry_ajax_template = \
         'simple/edit_form_element_entry_ajax.html'
-
-    edit_form_entry_template = 'simple/edit_form_entry.html'
-    edit_form_entry_ajax_template = 'simple/edit_form_entry_ajax.html'
+    # ***********************************************************************
+    # *********************** Form handler entry CUD ************************
+    # ***********************************************************************
+    add_form_handler_entry_template = 'simple/add_form_handler_entry.html'
+    add_form_handler_entry_ajax_template = \
+        'simple/add_form_handler_entry_ajax.html'
 
     edit_form_handler_entry_template = 'simple/edit_form_handler_entry.html'
     edit_form_handler_entry_ajax_template = \
         'simple/edit_form_handler_entry_ajax.html'
 
-    form_entry_submitted_template = 'simple/form_entry_submitted.html'
-    form_entry_submitted_ajax_template = \
-        'simple/form_entry_submitted_ajax.html'
+    # ***********************************************************************
+    # ******************* Form wizard handler entry CUD *********************
+    # ***********************************************************************
 
-    view_form_entry_template = 'simple/view_form_entry.html'
-    view_form_entry_ajax_template = 'simple/view_form_entry_ajax.html'
+    # ***********************************************************************
+    # ***************************** Dashboard *******************************
+    # ***********************************************************************
+    dashboard_template = 'simple/dashboard.html'
+    forms_list_template = 'simple/forms_list.html'
+
+    # ***********************************************************************
+    # ************************ Form wizard entry CUD ************************
+    # ***********************************************************************
+    create_form_wizard_entry_template = \
+        'simple/create_form_wizard_entry.html'
+    create_form_wizard_entry_ajax_template = \
+        'simple/create_form_wizard_entry_ajax.html'
+
+    edit_form_wizard_entry_template = \
+        'simple/edit_form_wizard_entry.html'
+    edit_form_wizard_entry_ajax_template = \
+        'simple/edit_form_wizard_entry_ajax.html'
+
+    view_form_wizard_entry_template = \
+        'simple/view_form_wizard_entry.html'
+    view_form_wizard_entry_ajax_template = \
+        'simple/view_form_wizard_entry_ajax.html'
+
+    # ***********************************************************************
+    # ************************* Form importer templates *********************
+    # ***********************************************************************
 
     import_form_entry_template = 'simple/import_form_entry.html'
     import_form_entry_ajax_template = 'simple/import_form_entry_ajax.html'

diff --git a/src/fobi/contrib/themes/simple/templates/simple/dashboard.html b/src/fobi/contrib/themes/simple/templates/simple/dashboard.html
@@ -34,6 +34,9 @@ <h1>{% trans "Your forms" %}</h1>
       <a class="addlink addlink-importer-{{ form_importer_uid }}" href="{{ form_importer_url }}">{{ form_importer_name }}</a>
     </li>
     {% endfor %}
+    <li>
+      <a class="addlink" href="{% url 'fobi.form_wizards_dashboard' %}">{% trans "Wizards"%}</a>
+    </li>
   </ul>
 
   <div id="changelist" class="module">

diff --git a/src/fobi/contrib/themes/simple/templates/simple/edit_form_wizard_entry.html b/src/fobi/contrib/themes/simple/templates/simple/edit_form_wizard_entry.html
@@ -0,0 +1,7 @@
+{% extends "fobi/generic/edit_form_wizard_entry.html" %}
+
+{% load i18n admin_static %}
+
+{% block stylesheets %}
+    <link rel="stylesheet" type="text/css" href="{% static 'admin/css/changelists.css' %}" />
+{% endblock stylesheets %}