Fixing setup.py, fixes dyve#4

Author: Dylan Verheul

.gitignore

@@ -8,3 +8,4 @@ doc/*
 MANIFEST
 dist/
 django_bootstrap_toolkit.egg-info/
+build/

MANIFEST.in

@@ -0,0 +1 @@
+recursive-include bootstrap_toolkit/templates *.html

bootstrap_toolkit/templates/bootstrap/field.html

@@ -0,0 +1,11 @@
+{% load bootstrap %}
+
+{% if field|input_type == "checkbox" %}
+    {% include "bootstrap_toolkit/field_checkbox.html" %}
+{% else %}
+    {% if field.field.widget.choices %}
+        {% include "bootstrap_toolkit/field_with_choices.html" %}
+    {% else %}
+        {% include "bootstrap_toolkit/field_default.html" %}
+    {% endif %}
+{% endif %}

bootstrap_toolkit/templates/bootstrap_toolkit/field.html

@@ -11,7 +11,7 @@
         </li>
     </ul>
 
-    {% include "bootstrap/field_errors.html" %}
-    {% include "bootstrap/field_help.html" %}
+    {% include "bootstrap_toolkit/field_errors.html" %}
+    {% include "bootstrap_toolkit/field_help.html" %}
 
 </div> <!-- input -->

bootstrap_toolkit/templates/bootstrap/field_checkbox.html bootstrap_toolkit/templates/bootstrap_toolkit/field_checkbox.html

@@ -6,7 +6,7 @@
 
     {{ field }}
 
-    {% include "bootstrap/field_errors.html" %}
-    {% include "bootstrap/field_help.html" %}
+    {% include "bootstrap_toolkit/field_errors.html" %}
+    {% include "bootstrap_toolkit/field_help.html" %}
 
 </div> <!-- input -->

bootstrap_toolkit/templates/bootstrap/field_default.html bootstrap_toolkit/templates/bootstrap_toolkit/field_default.html

@@ -6,7 +6,7 @@
 
     {{ field|as_bootstrap_choices }}
 
-    {% include "bootstrap/field_errors.html" %}
-    {% include "bootstrap/field_help.html" %}
+    {% include "bootstrap_toolkit/field_errors.html" %}
+    {% include "bootstrap_toolkit/field_help.html" %}
 
 </div> <!-- input -->

bootstrap_toolkit/templates/bootstrap/field_errors.html bootstrap_toolkit/templates/bootstrap_toolkit/field_errors.html

@@ -8,6 +8,6 @@
 
 {% for field in form.visible_fields %}
     <div class="clearfix{% if field.errors %} error{% endif %}{% if field.field.required %} required{% endif %}">
-        {% include "bootstrap/field.html" %}
+        {% include "bootstrap_toolkit/field.html" %}
     </div> <!-- clearfix -->
 {% endfor %}

bootstrap_toolkit/templates/bootstrap/field_help.html bootstrap_toolkit/templates/bootstrap_toolkit/field_help.html

@@ -12,11 +12,11 @@
 )
 
 BOOTSTRAP_BASE_URL = getattr(settings, 'BOOTSTRAP_BASE_URL',
-    '//twitter.github.com/bootstrap/%s/' % BOOTSTRAP_VERSION
+    '//twitter.github.com/bootstrap_toolkit/%s/' % BOOTSTRAP_VERSION
 )
 
 BOOTSTRAP_CSS_URL = getattr(settings, 'BOOTSTRAP_CSS_URL',
-    BOOTSTRAP_BASE_URL + 'bootstrap.min.css'
+    BOOTSTRAP_BASE_URL + 'bootstrap_toolkit.min.css'
 )
 
 register = template.Library()
@@ -34,12 +34,12 @@ def bootstrap_stylesheet_tag():
 @register.simple_tag
 def bootstrap_javascript_url(name):
     # URL to Bootstrap javascript file
-    # http://twitter.github.com/bootstrap/1.3.0/bootstrap-dropdown.js
-    return BOOTSTRAP_BASE_URL + 'bootstrap-' + name + '.js'
+    # http://twitter.github.com/bootstrap_toolkit/1.3.0/bootstrap_toolkit-dropdown.js
+    return BOOTSTRAP_BASE_URL + 'bootstrap_toolkit-' + name + '.js'
 
 @register.simple_tag
 def bootstrap_javascript_tag(name):
-    # HTML tag to insert bootstrap javascript file
+    # HTML tag to insert bootstrap_toolkit javascript file
     return u'<script src="%s"></script>' % bootstrap_javascript_url(name)
 
 @register.simple_tag
@@ -50,7 +50,7 @@ def bootstrap_media():
 @register.filter
 def as_bootstrap(form):
     # Filter to Bootstrap a Django form, analogous to as_p, as_table, as_ul
-    return get_template("bootstrap/form.html").render(
+    return get_template("bootstrap_toolkit/form.html").render(
         Context({
             'form': form
         })
@@ -101,7 +101,7 @@ def pagination(page, range=5):
     current_page = page.number
     range_min = max(current_page - range, 1)
     range_max = min(current_page + range, num_pages)
-    return get_template("bootstrap/pagination.html").render(
+    return get_template("bootstrap_toolkit/pagination.html").render(
         Context({
             'page': page,
             'num_pages': num_pages,

bootstrap_toolkit/templates/bootstrap/field_with_choices.html bootstrap_toolkit/templates/bootstrap_toolkit/field_with_choices.html

@@ -2,14 +2,14 @@
 
 setup(
     name='django-bootstrap-toolkit',
-    version='1.0.3',
+    version='1.0.4',
     url='https://github.com/dyve/django-bootstrap-toolkit',
     author='Dylan Verheul',
     author_email='[email protected]',
     license='Apache License 2.0',
     install_requires=['Django'],
     packages=['bootstrap_toolkit', 'bootstrap_toolkit.templatetags'],
-    package_data={'bootstrap_toolkit': ['templates/bootstrap/*.html']},
+    include_package_data=True,
     description='Bootstrap support for Django projects',
     classifiers=[
         "Development Status :: 4 - Beta",