Merge branch 'master' into stable

PKG-INFO

@@ -1,30 +1,31 @@
-Metadata-Version: 1.1
-Name: django-propeller
-Version: 1.4.1
-Summary: Propeller support for Django projects
-Home-page: https://github.com/tfroehlich82/django-propeller
-Author: Thorsten Froehlich
-Author-email: tfroehlich82@gmx.ch
-License: MIT License
-Platform: POSIX
-Keywords: Django Design Bootstrap Forms
-Project-URL: Bug Tracker, https://github.com/tfroehlich82/django-propeller/issues
-Project-URL: Repository, https://github.com/tfroehlich82/django-propeller
-Project-URL: Documentation, http://django-propeller.readthedocs.io/en/latest/
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.3
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Operating System :: OS Independent
-Classifier: Topic :: Software Development :: Libraries
-Classifier: Topic :: Internet :: WWW/HTTP
-Classifier: Environment :: Web Environment
-Classifier: Framework :: Django
-Classifier: Framework :: Django :: 1.9
-Classifier: Framework :: Django :: 1.10
+Metadata-Version: 1.1
+Name: django-propeller
+Version: 1.5.0
+Summary: Propeller support for Django projects
+Home-page: https://github.com/tfroehlich82/django-propeller
+Author: Thorsten Froehlich
+Author-email: tfroehlich82@gmx.ch
+License: MIT License
+Platform: POSIX
+Keywords: Django Design Bootstrap Forms
+Project-URL: Bug Tracker, https://github.com/tfroehlich82/django-propeller/issues
+Project-URL: Repository, https://github.com/tfroehlich82/django-propeller
+Project-URL: Documentation, http://django-propeller.readthedocs.io/en/latest/
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Topic :: Internet :: WWW/HTTP
+Classifier: Environment :: Web Environment
+Classifier: Framework :: Django
+Classifier: Framework :: Django :: 1.9
+Classifier: Framework :: Django :: 1.10
+Classifier: Framework :: Django :: 1.11
 Description: Code less Develop more. Propeller for Django

README.md

@@ -1,123 +1,130 @@
-Propeller for Django
-====================
-
-Write Django as usual, and let ``django-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/)
-
-
-Requirements
-------------
-
-- Python 2.7, 3.3, 3.4, 3.5, or 3.6
-- Django >= 1.9
-
-
-Installation
-------------
-
-1. Install using pip:
-```
-    pip install django-propeller
-```
-
-2. Add to INSTALLED_APPS in your ``settings.py``:
-
-   ```
-   'django_propeller',
-   ```
-
-3. In your templates, load the ``django_propeller`` library and use the ``propeller_*`` tags:
-
-
-
-Example template
-----------------
-
-```
-    {% load propeller %}
-
-    {# Display a form #}
-
-    <form action="/url/to/submit/" method="post" class="form">
-        {% csrf_token %}
-        {% propeller_form form %}
-        {% buttons %}
-            <button type="submit" class="btn btn-primary">
-                {% propeller_icon "star" %} Submit
-            </button>
-        {% endbuttons %}
-    </form>
-```
-
-
-Documentation
--------------
-
-The full documentation is at http://django-propeller.readthedocs.io/en/stable/
-
-
-Demo application
-----------------
-
-The demo application provides a number of useful examples.
-
-clone the repo:
-
-    $ git clone https://github.com/tfroehlich82/django-propeller.git
-
-cd into the cloned directory:
-
-    $ cd django-propeller
-
-run the testserver:
-
-    $ python manage.py runserver
-
-open your browser and browse to:
-
-    http://127.0.0.1:8000
-
-
-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
-
-
-Further Information
--------------------
-
-Propeller: http://propeller.in/
-
-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)
-
-
-License
--------
-
-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),
-based on the idea of [django-bootstrap3](https://github.com/dyve/django-bootstrap3) from [Dylan Verheul](https://github.com/dyve).
+Propeller for Django
+====================
+
+Write Django as usual, and let ``django-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/)
+
+
+Requirements
+------------
+
+- Python 2.7, 3.3, 3.4, 3.5, or 3.6
+- Django >= 1.9
+
+
+Installation
+------------
+
+1. Install using pip:
+```
+    pip install django-propeller
+```
+
+2. Add to INSTALLED_APPS in your ``settings.py``:
+
+   ```
+   'django_propeller',
+   ```
+
+3. In your templates, load the ``django_propeller`` library and use the ``propeller_*`` tags:
+
+
+
+Example template
+----------------
+
+```
+    {% load propeller %}
+
+    {# Display a form #}
+
+    <form action="/url/to/submit/" method="post" class="form">
+        {% csrf_token %}
+        {% propeller_form form %}
+        {% buttons %}
+            <button type="submit" class="btn btn-primary">
+                {% propeller_icon "star" %} Submit
+            </button>
+        {% endbuttons %}
+    </form>
+```
+
+
+Documentation
+-------------
+
+The full documentation is at http://django-propeller.readthedocs.io/en/stable/
+
+
+Demo application
+----------------
+
+The demo application provides a number of useful examples.
+
+clone the repo:
+
+    $ git clone https://github.com/tfroehlich82/django-propeller.git
+
+cd into the cloned directory:
+
+    $ cd django-propeller
+
+run the testserver:
+
+    $ python manage.py runserver
+
+open your browser and browse to:
+
+    http://127.0.0.1:8000
+
+
+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
+
+
+Further Information
+-------------------
+
+Propeller: http://propeller.in/
+
+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
+-------
+
+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),
+based on the idea of [django-bootstrap3](https://github.com/dyve/django-bootstrap3) from [Dylan Verheul](https://github.com/dyve).

django_propeller/__init__.py

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

django_propeller/components.py

@@ -3,11 +3,12 @@
 
 from django.utils.safestring import mark_safe
 
-from django_propeller.exceptions import PropellerError
-from django_propeller.utils import render_tag, add_css_class
-
+from .exceptions import PropellerError
+from .utils import render_tag, add_css_class
 from .text import text_value, text_concat
 
+# ToDo: Refactoring
+
 
 def render_icon(icon, size='sm', **kwargs):
     """Render a Google icon"""