From 36fbc7678c3437dfe2d70380ab1b153429641bb5 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Wed, 15 Oct 2014 13:35:12 +0100
Subject: [PATCH] Moar form styling

---
 .../templates/rest_framework/base.html        |  2 +-
 .../horizontal/fields/checkbox.html           |  8 +++++++-
 ...t_checkbox.html => checkbox_multiple.html} | 10 ++++++++--
 .../horizontal/fields/fieldset.html           |  4 ++--
 .../horizontal/fields/input.html              | 13 ++++++++----
 .../horizontal/fields/list_fieldset.html      |  2 +-
 .../fields/{select_radio.html => radio.html}  | 10 ++++++++--
 .../horizontal/fields/select.html             |  8 +++++++-
 .../horizontal/fields/select_multiple.html    |  8 +++++++-
 .../horizontal/fields/textarea.html           | 13 ++++++++----
 .../inline/fields/checkbox.html               | 12 ++++++-----
 ...t_checkbox.html => checkbox_multiple.html} |  2 +-
 .../inline/fields/fieldset.html               |  2 +-
 .../rest_framework/inline/fields/input.html   |  4 ++--
 .../fields/{select_radio.html => radio.html}  |  2 +-
 .../rest_framework/inline/fields/select.html  |  2 +-
 .../inline/fields/select_multiple.html        |  2 +-
 .../inline/fields/textarea.html               |  4 ++--
 .../vertical/fields/checkbox.html             | 20 +++++++++++++------
 ...t_checkbox.html => checkbox_multiple.html} | 12 ++++++++---
 .../vertical/fields/fieldset.html             |  4 ++--
 .../rest_framework/vertical/fields/input.html | 13 ++++++++----
 .../vertical/fields/list_fieldset.html        |  4 ++--
 .../fields/{select_radio.html => radio.html}  | 12 ++++++++---
 .../vertical/fields/select.html               | 10 ++++++++--
 .../vertical/fields/select_multiple.html      | 10 ++++++++--
 .../vertical/fields/textarea.html             | 13 ++++++++----
 27 files changed, 145 insertions(+), 61 deletions(-)
 rename rest_framework/templates/rest_framework/horizontal/fields/{select_checkbox.html => checkbox_multiple.html} (66%)
 rename rest_framework/templates/rest_framework/horizontal/fields/{select_radio.html => radio.html} (66%)
 rename rest_framework/templates/rest_framework/inline/fields/{select_checkbox.html => checkbox_multiple.html} (85%)
 rename rest_framework/templates/rest_framework/inline/fields/{select_radio.html => radio.html} (85%)
 rename rest_framework/templates/rest_framework/vertical/fields/{select_checkbox.html => checkbox_multiple.html} (62%)
 rename rest_framework/templates/rest_framework/vertical/fields/{select_radio.html => radio.html} (62%)

diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html
index 2e03dd987..4b6c7fcfc 100644
--- a/rest_framework/templates/rest_framework/base.html
+++ b/rest_framework/templates/rest_framework/base.html
@@ -59,7 +59,7 @@
                 <ul class="breadcrumb">
                     {% for breadcrumb_name, breadcrumb_url in breadcrumblist %}
                         {% if forloop.last %}
-                            <li class="active">{{ breadcrumb_name }}</li>
+                            <li class="active"><a href="{{ breadcrumb_url }}">{{ breadcrumb_name }}</a></li>
                         {% else %}
                             <li><a href="{{ breadcrumb_url }}">{{ breadcrumb_name }}</a></li>
                         {% endif %}
diff --git a/rest_framework/templates/rest_framework/horizontal/fields/checkbox.html b/rest_framework/templates/rest_framework/horizontal/fields/checkbox.html
index ee3bf9366..07a7308f0 100644
--- a/rest_framework/templates/rest_framework/horizontal/fields/checkbox.html
+++ b/rest_framework/templates/rest_framework/horizontal/fields/checkbox.html
@@ -1,4 +1,4 @@
-<div class="form-group">
+<div class="form-group {% if field.errors %}has-error{% endif %}">
     <div class="col-sm-offset-2 col-sm-10">
         <div class="checkbox">
             <label>
@@ -6,5 +6,11 @@
                 {% 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/select_checkbox.html b/rest_framework/templates/rest_framework/horizontal/fields/checkbox_multiple.html
similarity index 66%
rename from rest_framework/templates/rest_framework/horizontal/fields/select_checkbox.html
rename to rest_framework/templates/rest_framework/horizontal/fields/checkbox_multiple.html
index ff3fab573..ec7d59356 100644
--- a/rest_framework/templates/rest_framework/horizontal/fields/select_checkbox.html
+++ b/rest_framework/templates/rest_framework/horizontal/fields/checkbox_multiple.html
@@ -1,9 +1,9 @@
 <div class="form-group">
     {% if field.label %}
-        <label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</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 field.style.inline %}
+    {% 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 %}>
@@ -20,5 +20,11 @@
             </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
index ff93c6baa..f6d5dd9d2 100644
--- a/rest_framework/templates/rest_framework/horizontal/fields/fieldset.html
+++ b/rest_framework/templates/rest_framework/horizontal/fields/fieldset.html
@@ -2,10 +2,10 @@
 <fieldset>
     {% if field.label %}
         <div class="form-group" style="border-bottom: 1px solid #e5e5e5">
-            <legend class="control-label col-sm-2 {% if field.style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">{{ field.label }}</legend>
+            <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 layout=layout renderer=renderer %}
+        {% 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
index 6621c7e60..43ab41512 100644
--- a/rest_framework/templates/rest_framework/horizontal/fields/input.html
+++ b/rest_framework/templates/rest_framework/horizontal/fields/input.html
@@ -1,9 +1,14 @@
-<div class="form-group">
+<div class="form-group {% if field.errors %}has-error{% endif %}">
     {% if field.label %}
-        <label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</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 }}" type="{{ input_type }}" class="form-control" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
-        {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% 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>
 </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
index 68c75d4f8..a30514c68 100644
--- a/rest_framework/templates/rest_framework/horizontal/fields/list_fieldset.html
+++ b/rest_framework/templates/rest_framework/horizontal/fields/list_fieldset.html
@@ -2,7 +2,7 @@
 <fieldset>
     {% if field.label %}
         <div class="form-group" style="border-bottom: 1px solid #e5e5e5">
-            <legend class="control-label col-sm-2 {% if field.style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">{{ field.label }}</legend>
+            <legend class="control-label col-sm-2 {% if style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">{{ field.label }}</legend>
         </div>
     {% endif %}
     <ul>
diff --git a/rest_framework/templates/rest_framework/horizontal/fields/select_radio.html b/rest_framework/templates/rest_framework/horizontal/fields/radio.html
similarity index 66%
rename from rest_framework/templates/rest_framework/horizontal/fields/select_radio.html
rename to rest_framework/templates/rest_framework/horizontal/fields/radio.html
index 6e56afb52..52238bb1a 100644
--- a/rest_framework/templates/rest_framework/horizontal/fields/select_radio.html
+++ b/rest_framework/templates/rest_framework/horizontal/fields/radio.html
@@ -1,9 +1,9 @@
 <div class="form-group">
     {% if field.label %}
-        <label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</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 field.style.inline %}
+    {% 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 %}>
@@ -20,5 +20,11 @@
             </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
index eaa6d575a..1d00f4241 100644
--- a/rest_framework/templates/rest_framework/horizontal/fields/select.html
+++ b/rest_framework/templates/rest_framework/horizontal/fields/select.html
@@ -1,6 +1,6 @@
 <div class="form-group">
     {% if field.label %}
-        <label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</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 }}">
@@ -8,5 +8,11 @@
             <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
index 3ed2874b2..01c251fb0 100644
--- a/rest_framework/templates/rest_framework/horizontal/fields/select_multiple.html
+++ b/rest_framework/templates/rest_framework/horizontal/fields/select_multiple.html
@@ -1,6 +1,6 @@
 <div class="form-group">
     {% if field.label %}
-        <label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</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 }}">
@@ -8,5 +8,11 @@
             <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
index ae263c48c..ec1075495 100644
--- a/rest_framework/templates/rest_framework/horizontal/fields/textarea.html
+++ b/rest_framework/templates/rest_framework/horizontal/fields/textarea.html
@@ -1,9 +1,14 @@
-<div class="form-group">
+<div class="form-group {% if field.errors %}has-error{% endif %}">
     {% if field.label %}
-        <label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</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 field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.style.rows %}rows="{{ field.style.rows }}"{% endif %}>{% if field.value %}{{ field.value }}{% endif %}</textarea>
-        {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% 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>
 </div>
diff --git a/rest_framework/templates/rest_framework/inline/fields/checkbox.html b/rest_framework/templates/rest_framework/inline/fields/checkbox.html
index 57fa5dc04..71737f15f 100644
--- a/rest_framework/templates/rest_framework/inline/fields/checkbox.html
+++ b/rest_framework/templates/rest_framework/inline/fields/checkbox.html
@@ -1,6 +1,8 @@
-<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 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/select_checkbox.html b/rest_framework/templates/rest_framework/inline/fields/checkbox_multiple.html
similarity index 85%
rename from rest_framework/templates/rest_framework/inline/fields/select_checkbox.html
rename to rest_framework/templates/rest_framework/inline/fields/checkbox_multiple.html
index cca71d689..6caf64403 100644
--- a/rest_framework/templates/rest_framework/inline/fields/select_checkbox.html
+++ b/rest_framework/templates/rest_framework/inline/fields/checkbox_multiple.html
@@ -1,4 +1,4 @@
-<div class="form-group">
+<div class="form-group {% if field.errors %}has-error{% endif %}">
     {% if field.label %}
         <label class="sr-only">{{ field.label }}</label>
     {% endif %}
diff --git a/rest_framework/templates/rest_framework/inline/fields/fieldset.html b/rest_framework/templates/rest_framework/inline/fields/fieldset.html
index ba9f1835a..5ee182a5b 100644
--- a/rest_framework/templates/rest_framework/inline/fields/fieldset.html
+++ b/rest_framework/templates/rest_framework/inline/fields/fieldset.html
@@ -1,4 +1,4 @@
 {% load rest_framework %}
 {% for nested_field in field %}
-    {% render_field nested_field layout=layout renderer=renderer %}
+    {% 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
index bdf25ffe6..0d3eb8845 100644
--- a/rest_framework/templates/rest_framework/inline/fields/input.html
+++ b/rest_framework/templates/rest_framework/inline/fields/input.html
@@ -1,6 +1,6 @@
-<div class="form-group">
+<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="{{ input_type }}" class="form-control" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% 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/select_radio.html b/rest_framework/templates/rest_framework/inline/fields/radio.html
similarity index 85%
rename from rest_framework/templates/rest_framework/inline/fields/select_radio.html
rename to rest_framework/templates/rest_framework/inline/fields/radio.html
index 3fffceac4..1915f4f84 100644
--- a/rest_framework/templates/rest_framework/inline/fields/select_radio.html
+++ b/rest_framework/templates/rest_framework/inline/fields/radio.html
@@ -1,4 +1,4 @@
-<div class="form-group">
+<div class="form-group {% if field.errors %}has-error{% endif %}">
     {% if field.label %}
         <label class="sr-only">{{ field.label }}</label>
     {% endif %}
diff --git a/rest_framework/templates/rest_framework/inline/fields/select.html b/rest_framework/templates/rest_framework/inline/fields/select.html
index 730fcce61..e9fcebb48 100644
--- a/rest_framework/templates/rest_framework/inline/fields/select.html
+++ b/rest_framework/templates/rest_framework/inline/fields/select.html
@@ -1,4 +1,4 @@
-<div class="form-group">
+<div class="form-group {% if field.errors %}has-error{% endif %}">
     {% if field.label %}
         <label class="sr-only">{{ field.label }}</label>
     {% endif %}
diff --git a/rest_framework/templates/rest_framework/inline/fields/select_multiple.html b/rest_framework/templates/rest_framework/inline/fields/select_multiple.html
index 3f9b27017..feddf7abd 100644
--- a/rest_framework/templates/rest_framework/inline/fields/select_multiple.html
+++ b/rest_framework/templates/rest_framework/inline/fields/select_multiple.html
@@ -1,4 +1,4 @@
-<div class="form-group">
+<div class="form-group {% if field.errors %}has-error{% endif %}">
     {% if field.label %}
         <label class="sr-only">{{ field.label }}</label>
     {% endif %}
diff --git a/rest_framework/templates/rest_framework/inline/fields/textarea.html b/rest_framework/templates/rest_framework/inline/fields/textarea.html
index bdf25ffe6..0766a01c5 100644
--- a/rest_framework/templates/rest_framework/inline/fields/textarea.html
+++ b/rest_framework/templates/rest_framework/inline/fields/textarea.html
@@ -1,6 +1,6 @@
-<div class="form-group">
+<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="{{ input_type }}" class="form-control" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% 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/fields/checkbox.html b/rest_framework/templates/rest_framework/vertical/fields/checkbox.html
index 9fd4cdaa2..e21a8e902 100644
--- a/rest_framework/templates/rest_framework/vertical/fields/checkbox.html
+++ b/rest_framework/templates/rest_framework/vertical/fields/checkbox.html
@@ -1,6 +1,14 @@
-<div class="checkbox">
-    <label>
-        <input type="checkbox" name="{{ field.name }}" value="true" {% if value %}checked{% endif %}>
-        {% if field.label %}{{ field.label }}{% endif %}
-    </label>
-</div>
+<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/select_checkbox.html b/rest_framework/templates/rest_framework/vertical/fields/checkbox_multiple.html
similarity index 62%
rename from rest_framework/templates/rest_framework/vertical/fields/select_checkbox.html
rename to rest_framework/templates/rest_framework/vertical/fields/checkbox_multiple.html
index c486b1b39..134cca661 100644
--- a/rest_framework/templates/rest_framework/vertical/fields/select_checkbox.html
+++ b/rest_framework/templates/rest_framework/vertical/fields/checkbox_multiple.html
@@ -1,8 +1,8 @@
-<div class="form-group">
+<div class="form-group {% if field.errors %}has-error{% endif %}">
     {% if field.label %}
-        <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
+        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
     {% endif %}
-    {% if field.style.inline %}
+    {% if style.inline %}
         <div>
         {% for key, text in field.choices.items %}
             <label class="checkbox-inline">
@@ -21,4 +21,10 @@
         </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
index 248fe9044..824e6098f 100644
--- a/rest_framework/templates/rest_framework/vertical/fields/fieldset.html
+++ b/rest_framework/templates/rest_framework/vertical/fields/fieldset.html
@@ -1,7 +1,7 @@
 {% load rest_framework %}
 <fieldset>
-    {% if field.label %}<legend {% if field.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 nested_field in field %}
-        {% render_field nested_field layout=layout renderer=renderer %}
+        {% 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
index 10a576b2a..4f4cb017a 100644
--- a/rest_framework/templates/rest_framework/vertical/fields/input.html
+++ b/rest_framework/templates/rest_framework/vertical/fields/input.html
@@ -1,7 +1,12 @@
-<div class="form-group">
+<div class="form-group  {% if field.errors %}has-error{% endif %}">
     {% if field.label %}
-        <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</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 %}
-    <input name="{{ field.name }}" type="{{ input_type }}" class="form-control" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.style.rows %}rows="{{ field.style.rows }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
-    {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% 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
index 6b99a8349..74bbf4483 100644
--- a/rest_framework/templates/rest_framework/vertical/fields/list_fieldset.html
+++ b/rest_framework/templates/rest_framework/vertical/fields/list_fieldset.html
@@ -1,6 +1,6 @@
 <fieldset>
-    {% if field.label %}<legend {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %}
-<!--     {% if field.label %}<legend {% if field.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 %}
+<!--     {% 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 %} -->
diff --git a/rest_framework/templates/rest_framework/vertical/fields/select_radio.html b/rest_framework/templates/rest_framework/vertical/fields/radio.html
similarity index 62%
rename from rest_framework/templates/rest_framework/vertical/fields/select_radio.html
rename to rest_framework/templates/rest_framework/vertical/fields/radio.html
index d7655b008..ed9f9ddbb 100644
--- a/rest_framework/templates/rest_framework/vertical/fields/select_radio.html
+++ b/rest_framework/templates/rest_framework/vertical/fields/radio.html
@@ -1,8 +1,8 @@
-<div class="form-group">
+<div class="form-group {% if field.errors %}has-error{% endif %}">
     {% if field.label %}
-        <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
+        <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
     {% endif %}
-    {% if field.style.inline %}
+    {% if style.inline %}
         <div>
         {% for key, text in field.choices.items %}
             <label class="radio-inline">
@@ -21,4 +21,10 @@
             </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
index b0545f7e1..7c673ebb5 100644
--- a/rest_framework/templates/rest_framework/vertical/fields/select.html
+++ b/rest_framework/templates/rest_framework/vertical/fields/select.html
@@ -1,10 +1,16 @@
-<div class="form-group">
+<div class="form-group {% if field.errors %}has-error{% endif %}">
     {% if field.label %}
-        <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</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
index ca63192e9..54839294a 100644
--- a/rest_framework/templates/rest_framework/vertical/fields/select_multiple.html
+++ b/rest_framework/templates/rest_framework/vertical/fields/select_multiple.html
@@ -1,10 +1,16 @@
-<div class="form-group">
+<div class="form-group {% if field.errors %}has-error{% endif %}">
     {% if field.label %}
-        <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</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
index 8d9514961..840ea853c 100644
--- a/rest_framework/templates/rest_framework/vertical/fields/textarea.html
+++ b/rest_framework/templates/rest_framework/vertical/fields/textarea.html
@@ -1,7 +1,12 @@
-<div class="form-group">
+<div class="form-group {% if field.errors %}has-error{% endif %}">
     {% if field.label %}
-        <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</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 %}
-    <textarea name="{{ field.name }}" class="form-control" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.style.rows %}rows="{{ field.style.rows }}"{% endif %}>{% if field.value %}{{ field.value }}{% endif %}</textarea>
-    {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% endif %}
 </div>