Updated to use Propeller 1.3.1

.coveragerc

@@ -1,7 +1,7 @@
 [run]
 omit =
     docs/*
-    django_propeller_demo/*
+    django2_propeller_demo/*
     manage.py
 
 [report]

.gitignore

@@ -142,3 +142,5 @@ fabric.properties
 db.sqlite3
 docs/_build/
 /MANIFEST
+/*.sublime-project
+/*.sublime-workspace

.landscape.yml

@@ -7,11 +7,10 @@ uses:
 autodetect: yes
 ignore-paths:
   - docs
-  - django_propeller_demo
+  - django2_propeller_demo
 ignore-patterns:
   - ^manage.py$
   - (^|/)docs(/|$)
   - ^tests.py$
 python-targets:
-  - 2
   - 3

.travis.yml

@@ -2,20 +2,19 @@
 sudo: false
 
 # Python versions for matrix
+dist: xenial   # required for Python >= 3.7
 language: python
 python:
-  - "2.7"
-  - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"
+  - "3.7"
 
 # Django versions for matrix
 env:
-  - DJANGO_VERSION='>=1.8,<1.9'
-  - DJANGO_VERSION='>=1.9,<1.10'
-  - DJANGO_VERSION='>=1.10,<1.11'
-  #- DJANGO_VERSION='>=1.11,<1.12'  Django 1.11 coming soon
+  - DJANGO_VERSION='>=2.0,<2.1'
+  - DJANGO_VERSION='>=2.1,<2.2'
+  - DJANGO_VERSION='>=2.2,<3.0'
 
 # Command to install dependencies, e.g. pip install -r requirements.txt
 install:
@@ -26,16 +25,16 @@ install:
 # Command to run tests, e.g. python setup.py test
 script:
   - pip install -r requirements.txt
-  - coverage run --source=django_propeller manage.py test
+  - coverage run --source=django2_propeller manage.py test
   - python manage.py check
 
 matrix:
   exclude:
-    - python: "3.3"
-      env: DJANGO_VERSION='>=1.9,<1.10'
-    - python: "3.3"
-      env: DJANGO_VERSION='>=1.10,<1.11'
+    - python: "3.4"
+      env: DJANGO_VERSION='>=2.1,<2.2'
+    - python: "3.4"
+      env: DJANGO_VERSION='>=2.2,<3.0'
 
 # Report to coveralls
 after_success:
-  - COVERALLS_REPO_TOKEN=zhYHkOdDrdEtPvuCowlDRTzI4kEYmwn1B coveralls
+  - COVERALLS_REPO_TOKEN=ItbtB3pj34SxQaN3kesEg8rYfbCI7GLXv coveralls

CONTRIBUTING.rst

@@ -13,7 +13,7 @@ Types of Contributions
 Report Bugs
 ~~~~~~~~~~~
 
-Report bugs at https://github.com/tfroehlich82/django-propeller/issues.
+Report bugs at https://github.com/RaddishIoW/django2-propeller/issues.
 
 If you are reporting a bug, please include:
 
@@ -43,7 +43,7 @@ articles, and such.
 Submit Feedback
 ~~~~~~~~~~~~~~~
 
-The best way to send feedback is to file an issue at https://github.com/tfroehlich82/django-propeller/issues.
+The best way to send feedback is to file an issue at https://github.com/RaddishIoW/django2-propeller/issues.
 
 If you are proposing a feature:
 

LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
-Copyright (c) 2017 Thorsten Fröhlich
+Original work Copyright (c) 2017 Thorsten Fröhlich  
+Modified work Copyright (c) 2019 Adam Radestock
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

MANIFEST.in

@@ -1,5 +1,5 @@
 include CONTRIBUTING.rst
 include LICENSE
 include README.md
-recursive-include django_propeller *
-recursive-include django_propeller_demo *
+recursive-include django2_propeller *
+recursive-include django2_propeller_demo *

README.md

@@ -1,40 +1,38 @@
-Propeller for Django
+Propeller for Django2
 ====================
 
-Write Django as usual, and let ``django-propeller`` make template output into code based on Google's Material Design Standards & Bootstrap.
+Write Django as usual, and let ``django2-propeller`` make template output into code based on Google's Material Design Standards & Bootstrap.
 
 
-[![Build Status](https://travis-ci.org/tfroehlich82/django-propeller.svg?branch=stable)](https://travis-ci.org/tfroehlich82/django-propeller)
-[![Coverage Status](https://coveralls.io/repos/github/tfroehlich82/django-propeller/badge.svg?branch=stable)](https://coveralls.io/github/tfroehlich82/django-propeller?branch=stable)
-[![Code Health](https://landscape.io/github/tfroehlich82/django-propeller/stable/landscape.svg?style=flat)](https://landscape.io/github/tfroehlich82/django-propeller/stable)
-![PyPI version](http://img.shields.io/pypi/v/django-propeller.svg)
-![PyPI downloads](http://img.shields.io/pypi/dm/django-propeller.svg)
-[![Updates](https://pyup.io/repos/github/tfroehlich82/django-propeller/shield.svg)](https://pyup.io/repos/github/tfroehlich82/django-propeller/)
-[![Python 3](https://pyup.io/repos/github/tfroehlich82/django-propeller/python-3-shield.svg)](https://pyup.io/repos/github/tfroehlich82/django-propeller/)
+[![Build Status](https://travis-ci.com/RaddishIoW/django2-propeller.svg?branch=stable)](https://travis-ci.com/RaddishIoW/django2-propeller)
+[![Documentation Status](https://readthedocs.org/projects/django2-propeller/badge/?version=latest)](https://django2-propeller.readthedocs.io/en/latest/?badge=latest)
+[![Coverage Status](https://coveralls.io/repos/github/RaddishIoW/django2-propeller/badge.svg?branch=stable)](https://coveralls.io/github/RaddishIoW/django2-propeller?branch=stable)
+[![Updates](https://pyup.io/repos/github/RaddishIoW/django2-propeller/shield.svg)](https://pyup.io/repos/github/RaddishIoW/django2-propeller/)
+[![Python 3](https://pyup.io/repos/github/RaddishIoW/django2-propeller/python-3-shield.svg)](https://pyup.io/repos/github/RaddishIoW/django2-propeller/)
 
 
 Requirements
 ------------
 
-- Python 2.7, 3.3, 3.4, 3.5, or 3.6
-- Django >= 1.9
+- Python 3.3, 3.4, 3.5, or 3.6
+- Django >= 2.0
 
 
 Installation
 ------------
 
 1. Install using pip:
 ```
-    pip install django-propeller
+    pip install django2-propeller
 ```
 
 2. Add to INSTALLED_APPS in your ``settings.py``:
 
    ```
-   'django_propeller',
+   'django2_propeller',
    ```
 
-3. In your templates, load the ``django_propeller`` library and use the ``propeller_*`` tags:
+3. In your templates, load the ``django2_propeller`` library and use the ``propeller_*`` tags:
 
 
 
@@ -61,7 +59,7 @@ Example template
 Documentation
 -------------
 
-The full documentation is at http://django-propeller.readthedocs.io/en/stable/
+The full documentation is at https://django2-propeller.readthedocs.io/en/latest/
 
 
 Demo application
@@ -71,11 +69,11 @@ The demo application provides a number of useful examples.
 
 clone the repo:
 
-    $ git clone https://github.com/tfroehlich82/django-propeller.git
+    $ git clone https://github.com/RaddishIoW/django2-propeller.git
 
 cd into the cloned directory:
 
-    $ cd django-propeller
+    $ cd django2-propeller
 
 run the testserver:
 
@@ -91,7 +89,7 @@ Bugs and suggestions
 
 If you have found a bug or if you have a request for additional functionality, please use the issue tracker on GitHub.
 
-https://github.com/tfroehlich82/django-propeller/issues
+https://github.com/RaddishIoW/django2-propeller/issues
 
 
 Further Information
@@ -104,19 +102,6 @@ Bootstrap: http://getbootstrap.com/
 Google Material Design: https://material.io/
 
 
-Donation
---------
-
-[![Donation](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ARFDZCBQTWRSQ)
-
-
-[BTC Donation] 35bfZEE6NknfBVnEd86XZpGgqKeVjmXQxn
-
-[ETH Donation] 0xc9eb5eaed97c94cd47def84fd23a9802fa40384b
-
-[LTC Donation] LW4cbjTYCYuymdCBQRzgkRWMGfLBaG5g4C
-
-
 License
 -------
 
@@ -126,5 +111,6 @@ You can use this under MIT License. See [LICENSE](LICENSE) file for details.
 Author
 ------
 
-Developed and maintained by [Thorsten Fröhlich](https://github.com/tfroehlich82),
+Originally developed and maintained by [Thorsten Fröhlich](https://github.com/tfroehlich82),
 based on the idea of [django-bootstrap3](https://github.com/dyve/django-bootstrap3) from [Dylan Verheul](https://github.com/dyve).
+This package is updated by [Adam Radestock](https://github.com/RaddishIoW) to work with Django 2

django_propeller/__init__.py → django2_propeller/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '1.5.0'
+__version__ = '2.0.1'

django_propeller/apps.py → django2_propeller/apps.py

@@ -2,4 +2,4 @@
 
 
 class DjangoPropellerConfig(AppConfig):
-    name = 'django_propeller'
+    name = 'django2_propeller'

django_propeller/navbar.py → django2_propeller/navbar.py

@@ -38,7 +38,6 @@ class NavBarLinkItem(object):
     def __init__(self, name="", url=None, icon=None):
         """
 
-
         """
         self.name = name
         self.url = url

django_propeller/propeller.py → django2_propeller/propeller.py

@@ -28,14 +28,14 @@
     'error_css_class': 'has-error',
     'success_css_class': 'has-success',
     'formset_renderers': {
-        'default': 'django_propeller.renderers.FormsetRenderer',
+        'default': 'django2_propeller.renderers.FormsetRenderer',
     },
     'form_renderers': {
-        'default': 'django_propeller.renderers.FormRenderer',
+        'default': 'django2_propeller.renderers.FormRenderer',
     },
     'field_renderers': {
-        'default': 'django_propeller.renderers.FieldRenderer',
-        'inline': 'django_propeller.renderers.InlineFieldRenderer',
+        'default': 'django2_propeller.renderers.FieldRenderer',
+        'inline': 'django2_propeller.renderers.InlineFieldRenderer',
     },
 }
 

django_propeller/renderers.py → django2_propeller/renderers.py

@@ -11,7 +11,7 @@
     TextInput, DateInput, FileInput, CheckboxInput, MultiWidget,
     ClearableFileInput, Select, RadioSelect, CheckboxSelectMultiple
 )
-from django.forms.extras import SelectDateWidget
+from django.forms.widgets import SelectDateWidget
 from django.forms.forms import BaseForm, BoundField
 from django.forms.formsets import BaseFormSet
 from django.utils.html import conditional_escape, escape, strip_tags

django_propeller/templates/propeller/propeller.html → django2_propeller/templates/propeller/propeller.html

@@ -6,7 +6,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>{% block propeller_title %}django_propeller template title{% endblock %}</title>
+    <title>{% block propeller_title %}django2_propeller template title{% endblock %}</title>
 
     <!-- Bootstrap css-->
     {% propeller_css %}
@@ -31,7 +31,7 @@
 </head>
 
 <body>
-{% block propeller_content %}django-propeller template content{% endblock %}
+{% block propeller_content %}django2-propeller template content{% endblock %}
 {% if not 'javascript_in_head'|propeller_setting %}
     {% propeller_javascript jquery=True %}
     <script type="text/javascript" src="{% static 'js/propeller.min.js' %}"></script>

django_propeller/templatetags/propeller.py → django2_propeller/templatetags/propeller.py

@@ -793,38 +793,6 @@ def propeller_alert(content, alert_type='info', dismissable=True):
     return render_alert(content, alert_type, dismissable)
 
 
-# @register.tag('buttons')
-# def propeller_buttons(parser, token):
-#     """
-#     Render buttons for form
-#
-#     **Tag name**::
-#
-#         buttons
-#
-#     **Parameters**:
-#
-#         submit
-#             Text for a submit button
-#
-#         reset
-#             Text for a reset button
-#
-#     **Usage**::
-#
-#         {% buttons %}{% endbuttons %}
-#
-#     **Example**::
-#
-#         {% buttons submit='OK' reset="Cancel" %}{% endbuttons %}
-#
-#     """
-#     kwargs = parse_token_contents(parser, token)
-#     kwargs['nodelist'] = parser.parse(('endbuttons',))
-#     parser.delete_first_token()
-#     return ButtonsNode(**kwargs)
-
-
 @register.simple_tag(takes_context=True)
 def propeller_messages(context, *args, **kwargs):
     """