diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index ded917c9..9b7e566a 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -90,7 +90,6 @@ STATICFILES_FINDERS = [
"django.contrib.staticfiles.finders.AppDirectoriesFinder",
]
-FORM_RENDERER = 'django.forms.renderers.TemplatesSetting'
TEMPLATES = [
{
"BACKEND": "django.template.backends.django.DjangoTemplates",
diff --git a/pinaxcon/templates/_form_snippet.html b/pinaxcon/templates/_form_snippet.html
index 19ba3aa3..7d64b937 100644
--- a/pinaxcon/templates/_form_snippet.html
+++ b/pinaxcon/templates/_form_snippet.html
@@ -1,4 +1,6 @@
{% load pyconau2017_tags %}
+{% load bootstrap %}
+
{% if form.non_field_errors %}
{{ form.non_field_errors }}
@@ -10,4 +12,4 @@
Fields marked with
* are required.
-{% include "forms/render.html" with form=form %}
+{{ form|bootstrap_horizontal }}
diff --git a/pinaxcon/templates/django/forms/widgets/checkbox.html b/pinaxcon/templates/django/forms/widgets/checkbox.html
deleted file mode 100644
index ee66c9c2..00000000
--- a/pinaxcon/templates/django/forms/widgets/checkbox.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/pinaxcon/templates/django/forms/widgets/checkbox_option.html b/pinaxcon/templates/django/forms/widgets/checkbox_option.html
deleted file mode 100644
index fd57f435..00000000
--- a/pinaxcon/templates/django/forms/widgets/checkbox_option.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% if wrap_label %}
{% endif %}
diff --git a/pinaxcon/templates/django/forms/widgets/input.html b/pinaxcon/templates/django/forms/widgets/input.html
deleted file mode 100644
index 87a8c065..00000000
--- a/pinaxcon/templates/django/forms/widgets/input.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/pinaxcon/templates/django/forms/widgets/radio_option.html b/pinaxcon/templates/django/forms/widgets/radio_option.html
deleted file mode 100644
index 323bbbb3..00000000
--- a/pinaxcon/templates/django/forms/widgets/radio_option.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% if wrap_label %}
{% endif %}
diff --git a/pinaxcon/templates/django/forms/widgets/select.html b/pinaxcon/templates/django/forms/widgets/select.html
deleted file mode 100644
index 8a6ecad8..00000000
--- a/pinaxcon/templates/django/forms/widgets/select.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/pinaxcon/templates/django/forms/widgets/text.html b/pinaxcon/templates/django/forms/widgets/text.html
deleted file mode 100644
index 87a8c065..00000000
--- a/pinaxcon/templates/django/forms/widgets/text.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/pinaxcon/templates/django/forms/widgets/textarea.html b/pinaxcon/templates/django/forms/widgets/textarea.html
deleted file mode 100644
index 3cdc0916..00000000
--- a/pinaxcon/templates/django/forms/widgets/textarea.html
+++ /dev/null
@@ -1,2 +0,0 @@
-
diff --git a/pinaxcon/templates/forms/render.html b/pinaxcon/templates/forms/render.html
deleted file mode 100644
index 488303fa..00000000
--- a/pinaxcon/templates/forms/render.html
+++ /dev/null
@@ -1,58 +0,0 @@
-{% load formset_tags %}
-
-{% if form.total_form_count and form.empty_form %}
-
- {% comment %}This is a formset.{% endcomment %}
-
-
-
-{% else %}
- {% include "forms/render_fields.html" %}
-{% endif %}
diff --git a/pinaxcon/templates/forms/render_fields.html b/pinaxcon/templates/forms/render_fields.html
deleted file mode 100644
index 91b7e2b3..00000000
--- a/pinaxcon/templates/forms/render_fields.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% for field in form %}
- {% if not field.is_hidden %}
- {% include "forms/widget.html" %}
- {% endif %}
-{% endfor %}
diff --git a/pinaxcon/templates/forms/widget.html b/pinaxcon/templates/forms/widget.html
deleted file mode 100644
index cf1fc56c..00000000
--- a/pinaxcon/templates/forms/widget.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% load pyconau2017_tags %}
-
-
- {% classname field.field.widget as widget %}
- {% if widget == "CheckboxInput" %}
- {% include "forms/widget_boolean_single.html" %}
- {% elif widget == "RadioSelect" or widget == "CheckboxSelectMultiple" %}
- {% include "forms/widget_boolean_multiple.html" %}
- {% elif widget == "Select" or widget == "SelectMultiple" or widget == "LazySelect" or widget == "CountrySelectWidget" %}
- {% include "forms/widget_basic.html" with widget_class="select" %}
- {% else %}
- {% include "forms/widget_basic.html" %}
- {% endif %}
-
diff --git a/pinaxcon/templates/forms/widget_basic.html b/pinaxcon/templates/forms/widget_basic.html
deleted file mode 100644
index 295dc5f4..00000000
--- a/pinaxcon/templates/forms/widget_basic.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% if field.errors %}
-
- {{ field.errors }}
-
-{% endif %}
-
-
- {{ field }}
- {% if field.help_text %}
- {{ field.help_text|safe }}
- {% endif %}
-
diff --git a/pinaxcon/templates/forms/widget_boolean_multiple.html b/pinaxcon/templates/forms/widget_boolean_multiple.html
deleted file mode 100644
index 4208042f..00000000
--- a/pinaxcon/templates/forms/widget_boolean_multiple.html
+++ /dev/null
@@ -1,18 +0,0 @@
-
- {{ field.label }}{% if field.field.required %} *{% endif %}
-
-{% if field.help_text %}
-
{{ field.help_text|safe }}
-{% endif %}
-
-{% if field.errors %}
-
- {{ field.errors }}
-
-{% endif %}
-
-{% for item in field %}
-
- {{ item }}
-
-{% endfor%}
diff --git a/pinaxcon/templates/forms/widget_boolean_single.html b/pinaxcon/templates/forms/widget_boolean_single.html
deleted file mode 100644
index c00b4102..00000000
--- a/pinaxcon/templates/forms/widget_boolean_single.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
- {{ field.label }}{% if field.field.required %} *{% endif %}
-
-{% if field.errors %}
-
- {{ field.errors }}
-
-{% endif %}
-
-
-
diff --git a/pinaxcon/templates/registrasion/amend_registration.html b/pinaxcon/templates/registrasion/amend_registration.html
index b996bf64..613cf548 100644
--- a/pinaxcon/templates/registrasion/amend_registration.html
+++ b/pinaxcon/templates/registrasion/amend_registration.html
@@ -1,5 +1,4 @@
{% extends "registrasion/base.html" %}
-{% load bootstrap %}
{% load registrasion_tags %}
{% block content %}
diff --git a/pinaxcon/templates/registrasion/checkout_errors.html b/pinaxcon/templates/registrasion/checkout_errors.html
index 5a1bcd4c..8a707a09 100644
--- a/pinaxcon/templates/registrasion/checkout_errors.html
+++ b/pinaxcon/templates/registrasion/checkout_errors.html
@@ -1,5 +1,4 @@
{% extends "registrasion/base.html" %}
-{% load bootstrap %}
{% load registrasion_tags %}
{% block body %}
diff --git a/pinaxcon/templates/registrasion/guided_registration.html b/pinaxcon/templates/registrasion/guided_registration.html
index 5a2302f4..71af3298 100644
--- a/pinaxcon/templates/registrasion/guided_registration.html
+++ b/pinaxcon/templates/registrasion/guided_registration.html
@@ -1,5 +1,4 @@
{% extends "registrasion/base.html" %}
-{% load bootstrap %}
{% load pyconau2017_tags %}
{% block header_title %}Buy Your Ticket{% endblock %}
diff --git a/pinaxcon/templates/registrasion/invoice.html b/pinaxcon/templates/registrasion/invoice.html
index 6f51f569..ebfadd9a 100644
--- a/pinaxcon/templates/registrasion/invoice.html
+++ b/pinaxcon/templates/registrasion/invoice.html
@@ -1,5 +1,4 @@
{% extends "registrasion/base.html" %}
-{% load bootstrap %}
{% load registrasion_tags %}
{% load pyconau2017_tags %}
{% load staticfiles %}
diff --git a/pinaxcon/templates/registrasion/product_category.html b/pinaxcon/templates/registrasion/product_category.html
index db531ab2..0cbd23ce 100644
--- a/pinaxcon/templates/registrasion/product_category.html
+++ b/pinaxcon/templates/registrasion/product_category.html
@@ -1,5 +1,4 @@
{% extends "registrasion/base.html" %}
-{% load bootstrap %}
{% load registrasion_tags %}
{% load pyconau2017_tags %}
diff --git a/pinaxcon/templates/registrasion/profile_form.html b/pinaxcon/templates/registrasion/profile_form.html
index 38c7f14e..5911874d 100644
--- a/pinaxcon/templates/registrasion/profile_form.html
+++ b/pinaxcon/templates/registrasion/profile_form.html
@@ -1,5 +1,4 @@
{% extends "registrasion/base.html" %}
-{% load bootstrap %}
{% load pyconau2017_tags %}
{% block header_title %}Your profile{% endblock %}
diff --git a/pinaxcon/templates/registrasion/reports_list.html b/pinaxcon/templates/registrasion/reports_list.html
index f5883593..0fea9af0 100644
--- a/pinaxcon/templates/registrasion/reports_list.html
+++ b/pinaxcon/templates/registrasion/reports_list.html
@@ -1,5 +1,4 @@
{% extends "site_base.html" %}
-{% load bootstrap %}
{% load registrasion_tags %}
{% block body %}
diff --git a/pinaxcon/templates/registrasion/review.html b/pinaxcon/templates/registrasion/review.html
index 33115f59..f582673b 100644
--- a/pinaxcon/templates/registrasion/review.html
+++ b/pinaxcon/templates/registrasion/review.html
@@ -1,5 +1,4 @@
{% extends "registrasion/base.html" %}
-{% load bootstrap %}
{% load registrasion_tags %}
{% load pyconau2017_tags %}
diff --git a/pinaxcon/templates/registrasion/stripe/credit_card_payment.html b/pinaxcon/templates/registrasion/stripe/credit_card_payment.html
index 25478439..33b1a9e0 100644
--- a/pinaxcon/templates/registrasion/stripe/credit_card_payment.html
+++ b/pinaxcon/templates/registrasion/stripe/credit_card_payment.html
@@ -1,5 +1,4 @@
{% extends "registrasion/base.html" %}
-{% load bootstrap %}
{% load registrasion_tags %}
{% load pyconau2017_tags %}
diff --git a/pinaxcon/templates/symposion/proposals/document_create.html b/pinaxcon/templates/symposion/proposals/document_create.html
index e238b136..96169771 100644
--- a/pinaxcon/templates/symposion/proposals/document_create.html
+++ b/pinaxcon/templates/symposion/proposals/document_create.html
@@ -1,7 +1,5 @@
{% extends "symposion/proposals/base.html" %}
-{% load bootstrap %}
-
{% block page_title %}Upload Document to '{{ proposal.title }}'{% endblock %}
{% block proposals_body %}
diff --git a/pinaxcon/templates/symposion/proposals/proposal_detail.html b/pinaxcon/templates/symposion/proposals/proposal_detail.html
index 163e9096..83f3476e 100644
--- a/pinaxcon/templates/symposion/proposals/proposal_detail.html
+++ b/pinaxcon/templates/symposion/proposals/proposal_detail.html
@@ -1,7 +1,6 @@
{% extends "symposion/proposals/base.html" %}
{% load i18n %}
-{% load bootstrap %}
{% block head_title %}{{ proposal.title }}{% endblock %}
{% block page_title %}#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }}){% endblock %}
diff --git a/pinaxcon/templates/symposion/proposals/proposal_edit.html b/pinaxcon/templates/symposion/proposals/proposal_edit.html
index f9a0e818..55095879 100644
--- a/pinaxcon/templates/symposion/proposals/proposal_edit.html
+++ b/pinaxcon/templates/symposion/proposals/proposal_edit.html
@@ -1,7 +1,5 @@
{% extends "symposion/proposals/base.html" %}
-{% load bootstrap %}
-
{% block head_title %}Editing {{ proposal.title }}{% endblock %}
{% block page_title %}Editing: {{ proposal.title }}{% endblock %}
diff --git a/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html b/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html
index 228b7352..4445933e 100644
--- a/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html
+++ b/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html
@@ -1,7 +1,6 @@
{% extends "symposion/proposals/base.html" %}
{% load i18n %}
-{% load bootstrap %}
{% block page_title %}{% trans 'Proposal:' %} {{ proposal.title }}{% endblock %}
{% block head_title %}{% trans 'Proposal:' %} {{ proposal.title }}{% endblock %}
diff --git a/pinaxcon/templates/symposion/reviews/review_detail.html b/pinaxcon/templates/symposion/reviews/review_detail.html
index 35f3cf9a..aba2aa06 100644
--- a/pinaxcon/templates/symposion/reviews/review_detail.html
+++ b/pinaxcon/templates/symposion/reviews/review_detail.html
@@ -1,7 +1,7 @@
{% extends "symposion/reviews/base.html" %}
-{% load i18n %}
{% load bootstrap %}
+{% load i18n %}
{% block body %}
diff --git a/pinaxcon/templates/symposion/speakers/speaker_create.html b/pinaxcon/templates/symposion/speakers/speaker_create.html
index 699434b9..5086dfe6 100644
--- a/pinaxcon/templates/symposion/speakers/speaker_create.html
+++ b/pinaxcon/templates/symposion/speakers/speaker_create.html
@@ -1,6 +1,5 @@
{% extends "symposion/speakers/base.html" %}
-{% load bootstrap %}
{% load i18n %}
{% block head_title %}{% trans "Create Speaker Profile" %}{% endblock %}
diff --git a/pinaxcon/templates/symposion/speakers/speaker_edit.html b/pinaxcon/templates/symposion/speakers/speaker_edit.html
index e09307b1..a43ef42e 100644
--- a/pinaxcon/templates/symposion/speakers/speaker_edit.html
+++ b/pinaxcon/templates/symposion/speakers/speaker_edit.html
@@ -1,6 +1,5 @@
{% extends "symposion/speakers/base.html" %}
-{% load bootstrap %}
{% load i18n %}
{% block head_title %}{% trans "Edit Speaker Profile" %}{% endblock %}