From e8ea365c15b13185efc2ba03e57a3302f783d538 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 15 Oct 2014 15:11:01 +0100
Subject: Moar form styling

---
 rest_framework/templates/rest_framework/base.html  |  4 +--
 .../rest_framework/horizontal/checkbox.html        | 16 ++++++++++++
 .../horizontal/checkbox_multiple.html              | 30 ++++++++++++++++++++++
 .../rest_framework/horizontal/fields/checkbox.html | 16 ------------
 .../horizontal/fields/checkbox_multiple.html       | 30 ----------------------
 .../rest_framework/horizontal/fields/fieldset.html | 11 --------
 .../rest_framework/horizontal/fields/input.html    | 14 ----------
 .../horizontal/fields/list_fieldset.html           | 13 ----------
 .../rest_framework/horizontal/fields/radio.html    | 30 ----------------------
 .../rest_framework/horizontal/fields/select.html   | 18 -------------
 .../horizontal/fields/select_multiple.html         | 18 -------------
 .../rest_framework/horizontal/fields/textarea.html | 14 ----------
 .../rest_framework/horizontal/fieldset.html        | 11 ++++++++
 .../templates/rest_framework/horizontal/form.html  |  4 +--
 .../templates/rest_framework/horizontal/input.html | 14 ++++++++++
 .../rest_framework/horizontal/list_fieldset.html   | 13 ++++++++++
 .../templates/rest_framework/horizontal/radio.html | 30 ++++++++++++++++++++++
 .../rest_framework/horizontal/select.html          | 18 +++++++++++++
 .../rest_framework/horizontal/select_multiple.html | 18 +++++++++++++
 .../rest_framework/horizontal/textarea.html        | 14 ++++++++++
 .../templates/rest_framework/inline/checkbox.html  |  8 ++++++
 .../rest_framework/inline/checkbox_multiple.html   | 13 ++++++++++
 .../rest_framework/inline/fields/checkbox.html     |  8 ------
 .../inline/fields/checkbox_multiple.html           | 13 ----------
 .../rest_framework/inline/fields/fieldset.html     |  4 ---
 .../rest_framework/inline/fields/input.html        |  6 -----
 .../rest_framework/inline/fields/radio.html        | 13 ----------
 .../rest_framework/inline/fields/select.html       | 10 --------
 .../inline/fields/select_multiple.html             | 10 --------
 .../rest_framework/inline/fields/textarea.html     |  6 -----
 .../templates/rest_framework/inline/fieldset.html  |  4 +++
 .../templates/rest_framework/inline/form.html      |  4 +--
 .../templates/rest_framework/inline/input.html     |  6 +++++
 .../templates/rest_framework/inline/radio.html     | 13 ++++++++++
 .../templates/rest_framework/inline/select.html    | 10 ++++++++
 .../rest_framework/inline/select_multiple.html     | 10 ++++++++
 .../templates/rest_framework/inline/textarea.html  |  6 +++++
 .../rest_framework/vertical/checkbox.html          | 14 ++++++++++
 .../rest_framework/vertical/checkbox_multiple.html | 30 ++++++++++++++++++++++
 .../rest_framework/vertical/fields/checkbox.html   | 14 ----------
 .../vertical/fields/checkbox_multiple.html         | 30 ----------------------
 .../rest_framework/vertical/fields/fieldset.html   |  7 -----
 .../rest_framework/vertical/fields/input.html      | 12 ---------
 .../vertical/fields/list_fieldset.html             |  7 -----
 .../rest_framework/vertical/fields/radio.html      | 30 ----------------------
 .../rest_framework/vertical/fields/select.html     | 16 ------------
 .../vertical/fields/select_multiple.html           | 16 ------------
 .../rest_framework/vertical/fields/textarea.html   | 12 ---------
 .../rest_framework/vertical/fieldset.html          |  7 +++++
 .../templates/rest_framework/vertical/form.html    |  4 +--
 .../templates/rest_framework/vertical/input.html   | 12 +++++++++
 .../rest_framework/vertical/list_fieldset.html     |  7 +++++
 .../templates/rest_framework/vertical/radio.html   | 30 ++++++++++++++++++++++
 .../templates/rest_framework/vertical/select.html  | 16 ++++++++++++
 .../rest_framework/vertical/select_multiple.html   | 16 ++++++++++++
 .../rest_framework/vertical/textarea.html          | 12 +++++++++
 56 files changed, 386 insertions(+), 386 deletions(-)
 create mode 100644 rest_framework/templates/rest_framework/horizontal/checkbox.html
 create mode 100644 rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html
 delete mode 100644 rest_framework/templates/rest_framework/horizontal/fields/checkbox.html
 delete mode 100644 rest_framework/templates/rest_framework/horizontal/fields/checkbox_multiple.html
 delete mode 100644 rest_framework/templates/rest_framework/horizontal/fields/fieldset.html
 delete mode 100644 rest_framework/templates/rest_framework/horizontal/fields/input.html
 delete mode 100644 rest_framework/templates/rest_framework/horizontal/fields/list_fieldset.html
 delete mode 100644 rest_framework/templates/rest_framework/horizontal/fields/radio.html
 delete mode 100644 rest_framework/templates/rest_framework/horizontal/fields/select.html
 delete mode 100644 rest_framework/templates/rest_framework/horizontal/fields/select_multiple.html
 delete mode 100644 rest_framework/templates/rest_framework/horizontal/fields/textarea.html
 create mode 100644 rest_framework/templates/rest_framework/horizontal/fieldset.html
 create mode 100644 rest_framework/templates/rest_framework/horizontal/input.html
 create mode 100644 rest_framework/templates/rest_framework/horizontal/list_fieldset.html
 create mode 100644 rest_framework/templates/rest_framework/horizontal/radio.html
 create mode 100644 rest_framework/templates/rest_framework/horizontal/select.html
 create mode 100644 rest_framework/templates/rest_framework/horizontal/select_multiple.html
 create mode 100644 rest_framework/templates/rest_framework/horizontal/textarea.html
 create mode 100644 rest_framework/templates/rest_framework/inline/checkbox.html
 create mode 100644 rest_framework/templates/rest_framework/inline/checkbox_multiple.html
 delete mode 100644 rest_framework/templates/rest_framework/inline/fields/checkbox.html
 delete mode 100644 rest_framework/templates/rest_framework/inline/fields/checkbox_multiple.html
 delete mode 100644 rest_framework/templates/rest_framework/inline/fields/fieldset.html
 delete mode 100644 rest_framework/templates/rest_framework/inline/fields/input.html
 delete mode 100644 rest_framework/templates/rest_framework/inline/fields/radio.html
 delete mode 100644 rest_framework/templates/rest_framework/inline/fields/select.html
 delete mode 100644 rest_framework/templates/rest_framework/inline/fields/select_multiple.html
 delete mode 100644 rest_framework/templates/rest_framework/inline/fields/textarea.html
 create mode 100644 rest_framework/templates/rest_framework/inline/fieldset.html
 create mode 100644 rest_framework/templates/rest_framework/inline/input.html
 create mode 100644 rest_framework/templates/rest_framework/inline/radio.html
 create mode 100644 rest_framework/templates/rest_framework/inline/select.html
 create mode 100644 rest_framework/templates/rest_framework/inline/select_multiple.html
 create mode 100644 rest_framework/templates/rest_framework/inline/textarea.html
 create mode 100644 rest_framework/templates/rest_framework/vertical/checkbox.html
 create mode 100644 rest_framework/templates/rest_framework/vertical/checkbox_multiple.html
 delete mode 100644 rest_framework/templates/rest_framework/vertical/fields/checkbox.html
 delete mode 100644 rest_framework/templates/rest_framework/vertical/fields/checkbox_multiple.html
 delete mode 100644 rest_framework/templates/rest_framework/vertical/fields/fieldset.html
 delete mode 100644 rest_framework/templates/rest_framework/vertical/fields/input.html
 delete mode 100644 rest_framework/templates/rest_framework/vertical/fields/list_fieldset.html
 delete mode 100644 rest_framework/templates/rest_framework/vertical/fields/radio.html
 delete mode 100644 rest_framework/templates/rest_framework/vertical/fields/select.html
 delete mode 100644 rest_framework/templates/rest_framework/vertical/fields/select_multiple.html
 delete mode 100644 rest_framework/templates/rest_framework/vertical/fields/textarea.html
 create mode 100644 rest_framework/templates/rest_framework/vertical/fieldset.html
 create mode 100644 rest_framework/templates/rest_framework/vertical/input.html
 create mode 100644 rest_framework/templates/rest_framework/vertical/list_fieldset.html
 create mode 100644 rest_framework/templates/rest_framework/vertical/radio.html
 create mode 100644 rest_framework/templates/rest_framework/vertical/select.html
 create mode 100644 rest_framework/templates/rest_framework/vertical/select_multiple.html
 create mode 100644 rest_framework/templates/rest_framework/vertical/textarea.html

diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html
index 4b6c7fcf..dcb0da2c 100644
--- a/rest_framework/templates/rest_framework/base.html
+++ b/rest_framework/templates/rest_framework/base.html
@@ -153,7 +153,7 @@
                                     <div class="tab-pane" id="object-form">
                                         {% with form=post_form %}
                                             <form action="{{ request.get_full_path }}"
-                                                  method="POST" enctype="multipart/form-data" class="form-horizontal">
+                                                  method="POST" enctype="multipart/form-data" class="form-horizontal" novalidate>
                                                 <fieldset>
                                                     {{ post_form }}
                                                     <div class="form-actions">
@@ -198,7 +198,7 @@
                                 {% if put_form %}
                                     <div class="tab-pane" id="object-form">
                                         <form action="{{ request.get_full_path }}"
-                                              method="POST" enctype="multipart/form-data" class="form-horizontal">
+                                              method="POST" enctype="multipart/form-data" class="form-horizontal" novalidate>
                                             <fieldset>
                                                 {{ put_form }}
                                                 <div class="form-actions">
diff --git a/rest_framework/templates/rest_framework/horizontal/checkbox.html b/rest_framework/templates/rest_framework/horizontal/checkbox.html
new file mode 100644
index 00000000..07a7308f
--- /dev/null
+++ b/rest_framework/templates/rest_framework/horizontal/checkbox.html
@@ -0,0 +1,16 @@
+<div class="form-group {% if field.errors %}has-error{% endif %}">
+    <div class="col-sm-offset-2 col-sm-10">
+        <div class="checkbox">
+            <label>
+                <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %}>
+                {% if field.label %}{{ field.label }}{% endif %}
+            </label>
+        </div>
+        {% if field.errors %}
+            {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
+        {% endif %}
+        {% if field.help_text %}
+            <span class="help-block">{{ field.help_text }}</span>
+        {% endif %}
+    </div>
+</div>
diff --git a/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html b/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html
new file mode 100644
index 00000000..ec7d5935
--- /dev/null
+++ b/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html
@@ -0,0 +1,30 @@
+<div class="form-group">
+    {% if field.label %}
+        <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>
+    {% endif %}
+    <div class="col-sm-10">
+    {% if style.inline %}
+        {% for key, text in field.choices.items %}
+            <label class="checkbox-inline">
+                <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+                {{ text }}
+            </label>
+        {% endfor %}
+    {% else %}
+        {% for key, text in field.choices.items %}
+            <div class="checkbox">
+                <label>
+                    <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+                    {{ text }}
+                </label>
+            </div>
+        {% endfor %}
+    {% endif %}
+    {% if field.errors %}
+        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
+    {% endif %}
+    {% if field.help_text %}
+        <span class="help-block">{{ field.help_text }}</span>
+    {% endif %}
+    </div>
+</div>
diff --git a/rest_framework/templates/rest_framework/horizontal/fields/checkbox.html b/rest_framework/templates/rest_framework/horizontal/fields/checkbox.html
deleted file mode 100644
index 07a7308f..00000000
--- a/rest_framework/templates/rest_framework/horizontal/fields/checkbox.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
-    <div class="col-sm-offset-2 col-sm-10">
-        <div class="checkbox">
-            <label>
-                <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %}>
-                {% if field.label %}{{ field.label }}{% endif %}
-            </label>
-        </div>
-        {% if field.errors %}
-            {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-        {% endif %}
-        {% if field.help_text %}
-            <span class="help-block">{{ field.help_text }}</span>
-        {% endif %}
-    </div>
-</div>
diff --git a/rest_framework/templates/rest_framework/horizontal/fields/checkbox_multiple.html b/rest_framework/templates/rest_framework/horizontal/fields/checkbox_multiple.html
deleted file mode 100644
index ec7d5935..00000000
--- a/rest_framework/templates/rest_framework/horizontal/fields/checkbox_multiple.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="form-group">
-    {% if field.label %}
-        <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>
-    {% endif %}
-    <div class="col-sm-10">
-    {% if style.inline %}
-        {% for key, text in field.choices.items %}
-            <label class="checkbox-inline">
-                <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
-                {{ text }}
-            </label>
-        {% endfor %}
-    {% else %}
-        {% for key, text in field.choices.items %}
-            <div class="checkbox">
-                <label>
-                    <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
-                    {{ text }}
-                </label>
-            </div>
-        {% endfor %}
-    {% endif %}
-    {% if field.errors %}
-        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-    {% endif %}
-    {% if field.help_text %}
-        <span class="help-block">{{ field.help_text }}</span>
-    {% endif %}
-    </div>
-</div>
diff --git a/rest_framework/templates/rest_framework/horizontal/fields/fieldset.html b/rest_framework/templates/rest_framework/horizontal/fields/fieldset.html
deleted file mode 100644
index f6d5dd9d..00000000
--- a/rest_framework/templates/rest_framework/horizontal/fields/fieldset.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% load rest_framework %}
-<fieldset>
-    {% if field.label %}
-        <div class="form-group" style="border-bottom: 1px solid #e5e5e5">
-            <legend class="control-label col-sm-2 {% if style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">{{ field.label }}</legend>
-        </div>
-    {% endif %}
-    {% for nested_field in field %}
-        {% render_field nested_field template_pack=template_pack renderer=renderer %}
-    {% endfor %}
-</fieldset>
diff --git a/rest_framework/templates/rest_framework/horizontal/fields/input.html b/rest_framework/templates/rest_framework/horizontal/fields/input.html
deleted file mode 100644
index 43ab4151..00000000
--- a/rest_framework/templates/rest_framework/horizontal/fields/input.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>
-    {% endif %}
-    <div class="col-sm-10">
-        <input name="{{ field.name }}" class="form-control" type="{{ style.input_type }}" novalidate {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
-        {% if field.errors %}
-            {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-        {% endif %}
-        {% if field.help_text %}
-            <span class="help-block">{{ field.help_text }}</span>
-        {% endif %}
-    </div>
-</div>
diff --git a/rest_framework/templates/rest_framework/horizontal/fields/list_fieldset.html b/rest_framework/templates/rest_framework/horizontal/fields/list_fieldset.html
deleted file mode 100644
index a30514c6..00000000
--- a/rest_framework/templates/rest_framework/horizontal/fields/list_fieldset.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% load rest_framework %}
-<fieldset>
-    {% if field.label %}
-        <div class="form-group" style="border-bottom: 1px solid #e5e5e5">
-            <legend class="control-label col-sm-2 {% if style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">{{ field.label }}</legend>
-        </div>
-    {% endif %}
-    <ul>
-    {% for child in field.value %}
-        <li>TODO</li>
-    {% endfor %}
-    </ul>
-</fieldset>
diff --git a/rest_framework/templates/rest_framework/horizontal/fields/radio.html b/rest_framework/templates/rest_framework/horizontal/fields/radio.html
deleted file mode 100644
index 52238bb1..00000000
--- a/rest_framework/templates/rest_framework/horizontal/fields/radio.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="form-group">
-    {% if field.label %}
-        <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>
-    {% endif %}
-    <div class="col-sm-10">
-    {% if style.inline %}
-        {% for key, text in field.choices.items %}
-            <label class="radio-inline">
-                <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
-                {{ text }}
-            </label>
-        {% endfor %}
-    {% else %}
-        {% for key, text in field.choices.items %}
-            <div class="radio">
-                <label>
-                    <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
-                    {{ text }}
-                </label>
-            </div>
-        {% endfor %}
-    {% endif %}
-    {% if field.errors %}
-        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-    {% endif %}
-    {% if field.help_text %}
-        <span class="help-block">{{ field.help_text }}</span>
-    {% endif %}
-    </div>
-</div>
diff --git a/rest_framework/templates/rest_framework/horizontal/fields/select.html b/rest_framework/templates/rest_framework/horizontal/fields/select.html
deleted file mode 100644
index 1d00f424..00000000
--- a/rest_framework/templates/rest_framework/horizontal/fields/select.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="form-group">
-    {% if field.label %}
-        <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>
-    {% endif %}
-    <div class="col-sm-10">
-        <select class="form-control" name="{{ field.name }}">
-        {% for key, text in field.choices.items %}
-            <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option>
-        {% endfor %}
-        </select>
-        {% if field.errors %}
-            {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-        {% endif %}
-        {% if field.help_text %}
-            <span class="help-block">{{ field.help_text }}</span>
-        {% endif %}
-    </div>
-</div>
diff --git a/rest_framework/templates/rest_framework/horizontal/fields/select_multiple.html b/rest_framework/templates/rest_framework/horizontal/fields/select_multiple.html
deleted file mode 100644
index 01c251fb..00000000
--- a/rest_framework/templates/rest_framework/horizontal/fields/select_multiple.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="form-group">
-    {% if field.label %}
-        <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>
-    {% endif %}
-    <div class="col-sm-10">
-        <select multiple class="form-control" name="{{ field.name }}">
-            {% for key, text in field.choices.items %}
-            <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option>
-            {% endfor %}
-        </select>
-        {% if field.errors %}
-            {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-        {% endif %}
-        {% if field.help_text %}
-            <span class="help-block">{{ field.help_text }}</span>
-        {% endif %}
-    </div>
-</div>
diff --git a/rest_framework/templates/rest_framework/horizontal/fields/textarea.html b/rest_framework/templates/rest_framework/horizontal/fields/textarea.html
deleted file mode 100644
index ec107549..00000000
--- a/rest_framework/templates/rest_framework/horizontal/fields/textarea.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>
-    {% endif %}
-    <div class="col-sm-10">
-        <textarea name="{{ field.name }}" class="form-control" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if style.rows %}rows="{{ style.rows }}"{% endif %}>{% if field.value %}{{ field.value }}{% endif %}</textarea>
-        {% if field.errors %}
-            {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-        {% endif %}
-        {% if field.help_text %}
-            <span class="help-block">{{ field.help_text }}</span>
-        {% endif %}
-    </div>
-</div>
diff --git a/rest_framework/templates/rest_framework/horizontal/fieldset.html b/rest_framework/templates/rest_framework/horizontal/fieldset.html
new file mode 100644
index 00000000..f6d5dd9d
--- /dev/null
+++ b/rest_framework/templates/rest_framework/horizontal/fieldset.html
@@ -0,0 +1,11 @@
+{% load rest_framework %}
+<fieldset>
+    {% if field.label %}
+        <div class="form-group" style="border-bottom: 1px solid #e5e5e5">
+            <legend class="control-label col-sm-2 {% if style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">{{ field.label }}</legend>
+        </div>
+    {% endif %}
+    {% for nested_field in field %}
+        {% render_field nested_field template_pack=template_pack renderer=renderer %}
+    {% endfor %}
+</fieldset>
diff --git a/rest_framework/templates/rest_framework/horizontal/form.html b/rest_framework/templates/rest_framework/horizontal/form.html
index 7560d8a2..fd15b626 100644
--- a/rest_framework/templates/rest_framework/horizontal/form.html
+++ b/rest_framework/templates/rest_framework/horizontal/form.html
@@ -1,9 +1,9 @@
 {% load rest_framework %}
-<form class="form-horizontal" role="form" action="." method="POST">
+<form class="form-horizontal" role="form" action="." method="POST" novalidate>
     {% csrf_token %}
     {% for field in form %}
         {% if not field.read_only %}
-            {% render_field field template_pack=template_pack renderer=renderer %}
+            {% render_field field style=style %}
         {% endif %}
     {% endfor %}
     <!-- form.non_field_errors -->
diff --git a/rest_framework/templates/rest_framework/horizontal/input.html b/rest_framework/templates/rest_framework/horizontal/input.html
new file mode 100644
index 00000000..df4aa40f
--- /dev/null
+++ b/rest_framework/templates/rest_framework/horizontal/input.html
@@ -0,0 +1,14 @@
+<div class="form-group {% if field.errors %}has-error{% endif %}">
+    {% if field.label %}
+        <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>
+    {% endif %}
+    <div class="col-sm-10">
+        <input name="{{ field.name }}" class="form-control" type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
+        {% if field.errors %}
+            {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
+        {% endif %}
+        {% if field.help_text %}
+            <span class="help-block">{{ field.help_text }}</span>
+        {% endif %}
+    </div>
+</div>
diff --git a/rest_framework/templates/rest_framework/horizontal/list_fieldset.html b/rest_framework/templates/rest_framework/horizontal/list_fieldset.html
new file mode 100644
index 00000000..a30514c6
--- /dev/null
+++ b/rest_framework/templates/rest_framework/horizontal/list_fieldset.html
@@ -0,0 +1,13 @@
+{% load rest_framework %}
+<fieldset>
+    {% if field.label %}
+        <div class="form-group" style="border-bottom: 1px solid #e5e5e5">
+            <legend class="control-label col-sm-2 {% if style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">{{ field.label }}</legend>
+        </div>
+    {% endif %}
+    <ul>
+    {% for child in field.value %}
+        <li>TODO</li>
+    {% endfor %}
+    </ul>
+</fieldset>
diff --git a/rest_framework/templates/rest_framework/horizontal/radio.html b/rest_framework/templates/rest_framework/horizontal/radio.html
new file mode 100644
index 00000000..52238bb1
--- /dev/null
+++ b/rest_framework/templates/rest_framework/horizontal/radio.html
@@ -0,0 +1,30 @@
+<div class="form-group">
+    {% if field.label %}
+        <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>
+    {% endif %}
+    <div class="col-sm-10">
+    {% if style.inline %}
+        {% for key, text in field.choices.items %}
+            <label class="radio-inline">
+                <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
+                {{ text }}
+            </label>
+        {% endfor %}
+    {% else %}
+        {% for key, text in field.choices.items %}
+            <div class="radio">
+                <label>
+                    <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
+                    {{ text }}
+                </label>
+            </div>
+        {% endfor %}
+    {% endif %}
+    {% if field.errors %}
+        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
+    {% endif %}
+    {% if field.help_text %}
+        <span class="help-block">{{ field.help_text }}</span>
+    {% endif %}
+    </div>
+</div>
diff --git a/rest_framework/templates/rest_framework/horizontal/select.html b/rest_framework/templates/rest_framework/horizontal/select.html
new file mode 100644
index 00000000..1d00f424
--- /dev/null
+++ b/rest_framework/templates/rest_framework/horizontal/select.html
@@ -0,0 +1,18 @@
+<div class="form-group">
+    {% if field.label %}
+        <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>
+    {% endif %}
+    <div class="col-sm-10">
+        <select class="form-control" name="{{ field.name }}">
+        {% for key, text in field.choices.items %}
+            <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option>
+        {% endfor %}
+        </select>
+        {% if field.errors %}
+            {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
+        {% endif %}
+        {% if field.help_text %}
+            <span class="help-block">{{ field.help_text }}</span>
+        {% endif %}
+    </div>
+</div>
diff --git a/rest_framework/templates/rest_framework/horizontal/select_multiple.html b/rest_framework/templates/rest_framework/horizontal/select_multiple.html
new file mode 100644
index 00000000..01c251fb
--- /dev/null
+++ b/rest_framework/templates/rest_framework/horizontal/select_multiple.html
@@ -0,0 +1,18 @@
+<div class="form-group">
+    {% if field.label %}
+        <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>
+    {% endif %}
+    <div class="col-sm-10">
+        <select multiple class="form-control" name="{{ field.name }}">
+            {% for key, text in field.choices.items %}
+            <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option>
+            {% endfor %}
+        </select>
+        {% if field.errors %}
+            {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
+        {% endif %}
+        {% if field.help_text %}
+            <span class="help-block">{{ field.help_text }}</span>
+        {% endif %}
+    </div>
+</div>
diff --git a/rest_framework/templates/rest_framework/horizontal/textarea.html b/rest_framework/templates/rest_framework/horizontal/textarea.html
new file mode 100644
index 00000000..ec107549
--- /dev/null
+++ b/rest_framework/templates/rest_framework/horizontal/textarea.html
@@ -0,0 +1,14 @@
+<div class="form-group {% if field.errors %}has-error{% endif %}">
+    {% if field.label %}
+        <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>
+    {% endif %}
+    <div class="col-sm-10">
+        <textarea name="{{ field.name }}" class="form-control" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if style.rows %}rows="{{ style.rows }}"{% endif %}>{% if field.value %}{{ field.value }}{% endif %}</textarea>
+        {% if field.errors %}
+            {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
+        {% endif %}
+        {% if field.help_text %}
+            <span class="help-block">{{ field.help_text }}</span>
+        {% endif %}
+    </div>
+</div>
diff --git a/rest_framework/templates/rest_framework/inline/checkbox.html b/rest_framework/templates/rest_framework/inline/checkbox.html
new file mode 100644
index 00000000..71737f15
--- /dev/null
+++ b/rest_framework/templates/rest_framework/inline/checkbox.html
@@ -0,0 +1,8 @@
+<div class="form-group {% if field.errors %}has-error{% endif %}">
+    <div class="checkbox">
+        <label>
+            <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %}>
+            {% if field.label %}{{ field.label }}{% endif %}
+        </label>
+    </div>
+</div>
diff --git a/rest_framework/templates/rest_framework/inline/checkbox_multiple.html b/rest_framework/templates/rest_framework/inline/checkbox_multiple.html
new file mode 100644
index 00000000..6caf6440
--- /dev/null
+++ b/rest_framework/templates/rest_framework/inline/checkbox_multiple.html
@@ -0,0 +1,13 @@
+<div class="form-group {% if field.errors %}has-error{% endif %}">
+    {% if field.label %}
+        <label class="sr-only">{{ field.label }}</label>
+    {% endif %}
+    {% for key, text in field.choices.items %}
+    <div class="checkbox">
+        <label>
+            <input type="checkbox" name="{{ rest_framework/field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+            {{ text }}
+        </label>
+    </div>
+    {% endfor %}
+</div>
diff --git a/rest_framework/templates/rest_framework/inline/fields/checkbox.html b/rest_framework/templates/rest_framework/inline/fields/checkbox.html
deleted file mode 100644
index 71737f15..00000000
--- a/rest_framework/templates/rest_framework/inline/fields/checkbox.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
-    <div class="checkbox">
-        <label>
-            <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %}>
-            {% if field.label %}{{ field.label }}{% endif %}
-        </label>
-    </div>
-</div>
diff --git a/rest_framework/templates/rest_framework/inline/fields/checkbox_multiple.html b/rest_framework/templates/rest_framework/inline/fields/checkbox_multiple.html
deleted file mode 100644
index 6caf6440..00000000
--- a/rest_framework/templates/rest_framework/inline/fields/checkbox_multiple.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label class="sr-only">{{ field.label }}</label>
-    {% endif %}
-    {% for key, text in field.choices.items %}
-    <div class="checkbox">
-        <label>
-            <input type="checkbox" name="{{ rest_framework/field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
-            {{ text }}
-        </label>
-    </div>
-    {% endfor %}
-</div>
diff --git a/rest_framework/templates/rest_framework/inline/fields/fieldset.html b/rest_framework/templates/rest_framework/inline/fields/fieldset.html
deleted file mode 100644
index 5ee182a5..00000000
--- a/rest_framework/templates/rest_framework/inline/fields/fieldset.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% load rest_framework %}
-{% for nested_field in field %}
-    {% render_field nested_field template_pack=template_pack renderer=renderer %}
-{% endfor %}
diff --git a/rest_framework/templates/rest_framework/inline/fields/input.html b/rest_framework/templates/rest_framework/inline/fields/input.html
deleted file mode 100644
index 0d3eb884..00000000
--- a/rest_framework/templates/rest_framework/inline/fields/input.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label class="sr-only">{{ field.label }}</label>
-    {% endif %}
-    <input name="{{ field.name }}" class="form-control" type="{{ style.input_type }}" novalidate {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
-</div>
diff --git a/rest_framework/templates/rest_framework/inline/fields/radio.html b/rest_framework/templates/rest_framework/inline/fields/radio.html
deleted file mode 100644
index 1915f4f8..00000000
--- a/rest_framework/templates/rest_framework/inline/fields/radio.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label class="sr-only">{{ field.label }}</label>
-    {% endif %}
-    {% for key, text in field.choices.items %}
-        <div class="radio">
-            <label>
-                <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
-                {{ text }}
-            </label>
-        </div>
-    {% endfor %}
-</div>
diff --git a/rest_framework/templates/rest_framework/inline/fields/select.html b/rest_framework/templates/rest_framework/inline/fields/select.html
deleted file mode 100644
index e9fcebb4..00000000
--- a/rest_framework/templates/rest_framework/inline/fields/select.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label class="sr-only">{{ field.label }}</label>
-    {% endif %}
-    <select class="form-control" name="{{ field.name }}">
-        {% for key, text in field.choices.items %}
-        <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option>
-        {% endfor %}
-    </select>
-</div>
diff --git a/rest_framework/templates/rest_framework/inline/fields/select_multiple.html b/rest_framework/templates/rest_framework/inline/fields/select_multiple.html
deleted file mode 100644
index feddf7ab..00000000
--- a/rest_framework/templates/rest_framework/inline/fields/select_multiple.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label class="sr-only">{{ field.label }}</label>
-    {% endif %}
-    <select multiple class="form-control" name="{{ field.name }}">
-        {% for key, text in field.choices.items %}
-        <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option>
-        {% endfor %}
-    </select>
-</div>
diff --git a/rest_framework/templates/rest_framework/inline/fields/textarea.html b/rest_framework/templates/rest_framework/inline/fields/textarea.html
deleted file mode 100644
index 0766a01c..00000000
--- a/rest_framework/templates/rest_framework/inline/fields/textarea.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label class="sr-only">{{ field.label }}</label>
-    {% endif %}
-    <input name="{{ field.name }}" type="text" class="form-control" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
-</div>
diff --git a/rest_framework/templates/rest_framework/inline/fieldset.html b/rest_framework/templates/rest_framework/inline/fieldset.html
new file mode 100644
index 00000000..5ee182a5
--- /dev/null
+++ b/rest_framework/templates/rest_framework/inline/fieldset.html
@@ -0,0 +1,4 @@
+{% load rest_framework %}
+{% for nested_field in field %}
+    {% render_field nested_field template_pack=template_pack renderer=renderer %}
+{% endfor %}
diff --git a/rest_framework/templates/rest_framework/inline/form.html b/rest_framework/templates/rest_framework/inline/form.html
index b13d1661..6a0ea81d 100644
--- a/rest_framework/templates/rest_framework/inline/form.html
+++ b/rest_framework/templates/rest_framework/inline/form.html
@@ -1,9 +1,9 @@
 {% load rest_framework %}
-<form class="form-inline" role="form" action="." method="POST">
+<form class="form-inline" role="form" action="." method="POST" novalidate>
     {% csrf_token %}
     {% for field in form %}
         {% if not field.read_only %}
-            {% render_field field template_pack=template_pack renderer=renderer %}
+            {% render_field field style=style %}
         {% endif %}
     {% endfor %}
     <!-- form.non_field_errors -->
diff --git a/rest_framework/templates/rest_framework/inline/input.html b/rest_framework/templates/rest_framework/inline/input.html
new file mode 100644
index 00000000..f8ec4faf
--- /dev/null
+++ b/rest_framework/templates/rest_framework/inline/input.html
@@ -0,0 +1,6 @@
+<div class="form-group {% if field.errors %}has-error{% endif %}">
+    {% if field.label %}
+        <label class="sr-only">{{ field.label }}</label>
+    {% endif %}
+    <input name="{{ field.name }}" class="form-control" type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
+</div>
diff --git a/rest_framework/templates/rest_framework/inline/radio.html b/rest_framework/templates/rest_framework/inline/radio.html
new file mode 100644
index 00000000..1915f4f8
--- /dev/null
+++ b/rest_framework/templates/rest_framework/inline/radio.html
@@ -0,0 +1,13 @@
+<div class="form-group {% if field.errors %}has-error{% endif %}">
+    {% if field.label %}
+        <label class="sr-only">{{ field.label }}</label>
+    {% endif %}
+    {% for key, text in field.choices.items %}
+        <div class="radio">
+            <label>
+                <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
+                {{ text }}
+            </label>
+        </div>
+    {% endfor %}
+</div>
diff --git a/rest_framework/templates/rest_framework/inline/select.html b/rest_framework/templates/rest_framework/inline/select.html
new file mode 100644
index 00000000..e9fcebb4
--- /dev/null
+++ b/rest_framework/templates/rest_framework/inline/select.html
@@ -0,0 +1,10 @@
+<div class="form-group {% if field.errors %}has-error{% endif %}">
+    {% if field.label %}
+        <label class="sr-only">{{ field.label }}</label>
+    {% endif %}
+    <select class="form-control" name="{{ field.name }}">
+        {% for key, text in field.choices.items %}
+        <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option>
+        {% endfor %}
+    </select>
+</div>
diff --git a/rest_framework/templates/rest_framework/inline/select_multiple.html b/rest_framework/templates/rest_framework/inline/select_multiple.html
new file mode 100644
index 00000000..feddf7ab
--- /dev/null
+++ b/rest_framework/templates/rest_framework/inline/select_multiple.html
@@ -0,0 +1,10 @@
+<div class="form-group {% if field.errors %}has-error{% endif %}">
+    {% if field.label %}
+        <label class="sr-only">{{ field.label }}</label>
+    {% endif %}
+    <select multiple class="form-control" name="{{ field.name }}">
+        {% for key, text in field.choices.items %}
+        <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option>
+        {% endfor %}
+    </select>
+</div>
diff --git a/rest_framework/templates/rest_framework/inline/textarea.html b/rest_framework/templates/rest_framework/inline/textarea.html
new file mode 100644
index 00000000..0766a01c
--- /dev/null
+++ b/rest_framework/templates/rest_framework/inline/textarea.html
@@ -0,0 +1,6 @@
+<div class="form-group {% if field.errors %}has-error{% endif %}">
+    {% if field.label %}
+        <label class="sr-only">{{ field.label }}</label>
+    {% endif %}
+    <input name="{{ field.name }}" type="text" class="form-control" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
+</div>
diff --git a/rest_framework/templates/rest_framework/vertical/checkbox.html b/rest_framework/templates/rest_framework/vertical/checkbox.html
new file mode 100644
index 00000000..e21a8e90
--- /dev/null
+++ b/rest_framework/templates/rest_framework/vertical/checkbox.html
@@ -0,0 +1,14 @@
+<div class="form-group {% if field.errors %}has-error{% endif %}">
+    <div class="checkbox">
+        <label>
+            <input type="checkbox" name="{{ field.name }}" value="true" {% if value %}checked{% endif %}>
+            {% if field.label %}{{ field.label }}{% endif %}
+        </label>
+    </div>
+    {% if field.errors %}
+        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
+    {% endif %}
+    {% if field.help_text %}
+        <span class="help-block">{{ field.help_text }}</span>
+    {% endif %}
+</div>
\ No newline at end of file
diff --git a/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html b/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html
new file mode 100644
index 00000000..134cca66
--- /dev/null
+++ b/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html
@@ -0,0 +1,30 @@
+<div class="form-group {% if field.errors %}has-error{% endif %}">
+    {% if field.label %}
+        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
+    {% endif %}
+    {% if style.inline %}
+        <div>
+        {% for key, text in field.choices.items %}
+            <label class="checkbox-inline">
+                <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+                {{ text }}
+            </label>
+        {% endfor %}
+        </div>
+    {% else %}
+        {% for key, text in field.choices.items %}
+        <div class="checkbox">
+            <label>
+                <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+                {{ text }}
+            </label>
+        </div>
+        {% endfor %}
+    {% endif %}
+    {% if field.errors %}
+        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
+    {% endif %}
+    {% if field.help_text %}
+        <span class="help-block">{{ field.help_text }}</span>
+    {% endif %}
+</div>
diff --git a/rest_framework/templates/rest_framework/vertical/fields/checkbox.html b/rest_framework/templates/rest_framework/vertical/fields/checkbox.html
deleted file mode 100644
index e21a8e90..00000000
--- a/rest_framework/templates/rest_framework/vertical/fields/checkbox.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
-    <div class="checkbox">
-        <label>
-            <input type="checkbox" name="{{ field.name }}" value="true" {% if value %}checked{% endif %}>
-            {% if field.label %}{{ field.label }}{% endif %}
-        </label>
-    </div>
-    {% if field.errors %}
-        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-    {% endif %}
-    {% if field.help_text %}
-        <span class="help-block">{{ field.help_text }}</span>
-    {% endif %}
-</div>
\ No newline at end of file
diff --git a/rest_framework/templates/rest_framework/vertical/fields/checkbox_multiple.html b/rest_framework/templates/rest_framework/vertical/fields/checkbox_multiple.html
deleted file mode 100644
index 134cca66..00000000
--- a/rest_framework/templates/rest_framework/vertical/fields/checkbox_multiple.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
-    {% endif %}
-    {% if style.inline %}
-        <div>
-        {% for key, text in field.choices.items %}
-            <label class="checkbox-inline">
-                <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
-                {{ text }}
-            </label>
-        {% endfor %}
-        </div>
-    {% else %}
-        {% for key, text in field.choices.items %}
-        <div class="checkbox">
-            <label>
-                <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
-                {{ text }}
-            </label>
-        </div>
-        {% endfor %}
-    {% endif %}
-    {% if field.errors %}
-        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-    {% endif %}
-    {% if field.help_text %}
-        <span class="help-block">{{ field.help_text }}</span>
-    {% endif %}
-</div>
diff --git a/rest_framework/templates/rest_framework/vertical/fields/fieldset.html b/rest_framework/templates/rest_framework/vertical/fields/fieldset.html
deleted file mode 100644
index 824e6098..00000000
--- a/rest_framework/templates/rest_framework/vertical/fields/fieldset.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% load rest_framework %}
-<fieldset>
-    {% if field.label %}<legend {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %}
-    {% for nested_field in field %}
-        {% render_field nested_field template_pack=template_pack renderer=renderer %}
-    {% endfor %}
-</fieldset>
diff --git a/rest_framework/templates/rest_framework/vertical/fields/input.html b/rest_framework/templates/rest_framework/vertical/fields/input.html
deleted file mode 100644
index 4f4cb017..00000000
--- a/rest_framework/templates/rest_framework/vertical/fields/input.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="form-group  {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
-    {% endif %}
-    <input name="{{ field.name }}" class="form-control" type="{{ style.input_type }}" novalidate {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
-    {% if field.errors %}
-        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-    {% endif %}
-    {% if field.help_text %}
-        <span class="help-block">{{ field.help_text }}</span>
-    {% endif %}
-</div>
diff --git a/rest_framework/templates/rest_framework/vertical/fields/list_fieldset.html b/rest_framework/templates/rest_framework/vertical/fields/list_fieldset.html
deleted file mode 100644
index 74bbf448..00000000
--- a/rest_framework/templates/rest_framework/vertical/fields/list_fieldset.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<fieldset>
-    {% if field.label %}<legend {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %}
-<!--     {% if field.label %}<legend {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %}
-    {% for field_item in field.value.field_items.values() %}
-        {{ renderer.render_field(field_item, layout=layout) }}
-    {% endfor %} -->
-</fieldset>
diff --git a/rest_framework/templates/rest_framework/vertical/fields/radio.html b/rest_framework/templates/rest_framework/vertical/fields/radio.html
deleted file mode 100644
index ed9f9ddb..00000000
--- a/rest_framework/templates/rest_framework/vertical/fields/radio.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
-    {% endif %}
-    {% if style.inline %}
-        <div>
-        {% for key, text in field.choices.items %}
-            <label class="radio-inline">
-                <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
-                {{ text }}
-            </label>
-        {% endfor %}
-        </div>
-    {% else %}
-        {% for key, text in field.choices.items %}
-            <div class="radio">
-                <label>
-                    <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
-                    {{ text }}
-                </label>
-            </div>
-        {% endfor %}
-    {% endif %}
-    {% if field.errors %}
-        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-    {% endif %}
-    {% if field.help_text %}
-        <span class="help-block">{{ field.help_text }}</span>
-    {% endif %}
-</div>
diff --git a/rest_framework/templates/rest_framework/vertical/fields/select.html b/rest_framework/templates/rest_framework/vertical/fields/select.html
deleted file mode 100644
index 7c673ebb..00000000
--- a/rest_framework/templates/rest_framework/vertical/fields/select.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
-    {% endif %}
-    <select class="form-control" name="{{ field.name }}">
-        {% for key, text in field.choices.items %}
-        <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option>
-        {% endfor %}
-    </select>
-    {% if field.errors %}
-        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-    {% endif %}
-    {% if field.help_text %}
-        <span class="help-block">{{ field.help_text }}</span>
-    {% endif %}
-</div>
diff --git a/rest_framework/templates/rest_framework/vertical/fields/select_multiple.html b/rest_framework/templates/rest_framework/vertical/fields/select_multiple.html
deleted file mode 100644
index 54839294..00000000
--- a/rest_framework/templates/rest_framework/vertical/fields/select_multiple.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
-    {% endif %}
-    <select multiple class="form-control" name="{{ field.name }}">
-        {% for key, text in field.choices.items %}
-        <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option>
-        {% endfor %}
-    </select>
-    {% if field.errors %}
-        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-    {% endif %}
-    {% if field.help_text %}
-        <span class="help-block">{{ field.help_text }}</span>
-    {% endif %}
-</div>
diff --git a/rest_framework/templates/rest_framework/vertical/fields/textarea.html b/rest_framework/templates/rest_framework/vertical/fields/textarea.html
deleted file mode 100644
index 840ea853..00000000
--- a/rest_framework/templates/rest_framework/vertical/fields/textarea.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
-    {% if field.label %}
-        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
-    {% endif %}
-    <textarea name="{{ field.name }}" class="form-control" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if style.rows %}rows="{{ style.rows }}"{% endif %}>{% if field.value %}{{ field.value }}{% endif %}</textarea>
-    {% if field.errors %}
-        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
-    {% endif %}
-    {% if field.help_text %}
-        <span class="help-block">{{ field.help_text }}</span>
-    {% endif %}
-</div>
diff --git a/rest_framework/templates/rest_framework/vertical/fieldset.html b/rest_framework/templates/rest_framework/vertical/fieldset.html
new file mode 100644
index 00000000..824e6098
--- /dev/null
+++ b/rest_framework/templates/rest_framework/vertical/fieldset.html
@@ -0,0 +1,7 @@
+{% load rest_framework %}
+<fieldset>
+    {% if field.label %}<legend {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %}
+    {% for nested_field in field %}
+        {% render_field nested_field template_pack=template_pack renderer=renderer %}
+    {% endfor %}
+</fieldset>
diff --git a/rest_framework/templates/rest_framework/vertical/form.html b/rest_framework/templates/rest_framework/vertical/form.html
index fe908af0..e68835c0 100644
--- a/rest_framework/templates/rest_framework/vertical/form.html
+++ b/rest_framework/templates/rest_framework/vertical/form.html
@@ -1,9 +1,9 @@
 {% load rest_framework %}
-<form role="form" action="." method="POST">
+<form role="form" action="." method="POST" novalidate>
     {% csrf_token %}
     {% for field in form %}
         {% if not field.read_only %}
-            {% render_field field template_pack=template_pack renderer=renderer %}
+            {% render_field field style=style %}
         {% endif %}
     {% endfor %}
     <!-- form.non_field_errors -->
diff --git a/rest_framework/templates/rest_framework/vertical/input.html b/rest_framework/templates/rest_framework/vertical/input.html
new file mode 100644
index 00000000..e1e21ca1
--- /dev/null
+++ b/rest_framework/templates/rest_framework/vertical/input.html
@@ -0,0 +1,12 @@
+<div class="form-group  {% if field.errors %}has-error{% endif %}">
+    {% if field.label %}
+        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
+    {% endif %}
+    <input name="{{ field.name }}" class="form-control" type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
+    {% if field.errors %}
+        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
+    {% endif %}
+    {% if field.help_text %}
+        <span class="help-block">{{ field.help_text }}</span>
+    {% endif %}
+</div>
diff --git a/rest_framework/templates/rest_framework/vertical/list_fieldset.html b/rest_framework/templates/rest_framework/vertical/list_fieldset.html
new file mode 100644
index 00000000..74bbf448
--- /dev/null
+++ b/rest_framework/templates/rest_framework/vertical/list_fieldset.html
@@ -0,0 +1,7 @@
+<fieldset>
+    {% if field.label %}<legend {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %}
+<!--     {% if field.label %}<legend {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %}
+    {% for field_item in field.value.field_items.values() %}
+        {{ renderer.render_field(field_item, layout=layout) }}
+    {% endfor %} -->
+</fieldset>
diff --git a/rest_framework/templates/rest_framework/vertical/radio.html b/rest_framework/templates/rest_framework/vertical/radio.html
new file mode 100644
index 00000000..ed9f9ddb
--- /dev/null
+++ b/rest_framework/templates/rest_framework/vertical/radio.html
@@ -0,0 +1,30 @@
+<div class="form-group {% if field.errors %}has-error{% endif %}">
+    {% if field.label %}
+        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
+    {% endif %}
+    {% if style.inline %}
+        <div>
+        {% for key, text in field.choices.items %}
+            <label class="radio-inline">
+                <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
+                {{ text }}
+            </label>
+        {% endfor %}
+        </div>
+    {% else %}
+        {% for key, text in field.choices.items %}
+            <div class="radio">
+                <label>
+                    <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
+                    {{ text }}
+                </label>
+            </div>
+        {% endfor %}
+    {% endif %}
+    {% if field.errors %}
+        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
+    {% endif %}
+    {% if field.help_text %}
+        <span class="help-block">{{ field.help_text }}</span>
+    {% endif %}
+</div>
diff --git a/rest_framework/templates/rest_framework/vertical/select.html b/rest_framework/templates/rest_framework/vertical/select.html
new file mode 100644
index 00000000..7c673ebb
--- /dev/null
+++ b/rest_framework/templates/rest_framework/vertical/select.html
@@ -0,0 +1,16 @@
+<div class="form-group {% if field.errors %}has-error{% endif %}">
+    {% if field.label %}
+        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
+    {% endif %}
+    <select class="form-control" name="{{ field.name }}">
+        {% for key, text in field.choices.items %}
+        <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option>
+        {% endfor %}
+    </select>
+    {% if field.errors %}
+        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
+    {% endif %}
+    {% if field.help_text %}
+        <span class="help-block">{{ field.help_text }}</span>
+    {% endif %}
+</div>
diff --git a/rest_framework/templates/rest_framework/vertical/select_multiple.html b/rest_framework/templates/rest_framework/vertical/select_multiple.html
new file mode 100644
index 00000000..54839294
--- /dev/null
+++ b/rest_framework/templates/rest_framework/vertical/select_multiple.html
@@ -0,0 +1,16 @@
+<div class="form-group {% if field.errors %}has-error{% endif %}">
+    {% if field.label %}
+        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
+    {% endif %}
+    <select multiple class="form-control" name="{{ field.name }}">
+        {% for key, text in field.choices.items %}
+        <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option>
+        {% endfor %}
+    </select>
+    {% if field.errors %}
+        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
+    {% endif %}
+    {% if field.help_text %}
+        <span class="help-block">{{ field.help_text }}</span>
+    {% endif %}
+</div>
diff --git a/rest_framework/templates/rest_framework/vertical/textarea.html b/rest_framework/templates/rest_framework/vertical/textarea.html
new file mode 100644
index 00000000..840ea853
--- /dev/null
+++ b/rest_framework/templates/rest_framework/vertical/textarea.html
@@ -0,0 +1,12 @@
+<div class="form-group {% if field.errors %}has-error{% endif %}">
+    {% if field.label %}
+        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
+    {% endif %}
+    <textarea name="{{ field.name }}" class="form-control" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if style.rows %}rows="{{ style.rows }}"{% endif %}>{% if field.value %}{{ field.value }}{% endif %}</textarea>
+    {% if field.errors %}
+        {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %}
+    {% endif %}
+    {% if field.help_text %}
+        <span class="help-block">{{ field.help_text }}</span>
+    {% endif %}
+</div>
-- 
cgit v1.2.3