From 36fbc7678c3437dfe2d70380ab1b153429641bb5 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 15 Oct 2014 13:35:12 +0100
Subject: Moar form styling

---
 rest_framework/templates/rest_framework/base.html  |  2 +-
 .../rest_framework/horizontal/fields/checkbox.html |  8 +++++-
 .../horizontal/fields/checkbox_multiple.html       | 30 ++++++++++++++++++++++
 .../rest_framework/horizontal/fields/fieldset.html |  4 +--
 .../rest_framework/horizontal/fields/input.html    | 13 +++++++---
 .../horizontal/fields/list_fieldset.html           |  2 +-
 .../rest_framework/horizontal/fields/radio.html    | 30 ++++++++++++++++++++++
 .../rest_framework/horizontal/fields/select.html   |  8 +++++-
 .../horizontal/fields/select_checkbox.html         | 24 -----------------
 .../horizontal/fields/select_multiple.html         |  8 +++++-
 .../horizontal/fields/select_radio.html            | 24 -----------------
 .../rest_framework/horizontal/fields/textarea.html | 13 +++++++---
 .../rest_framework/inline/fields/checkbox.html     | 12 +++++----
 .../inline/fields/checkbox_multiple.html           | 13 ++++++++++
 .../rest_framework/inline/fields/fieldset.html     |  2 +-
 .../rest_framework/inline/fields/input.html        |  4 +--
 .../rest_framework/inline/fields/radio.html        | 13 ++++++++++
 .../rest_framework/inline/fields/select.html       |  2 +-
 .../inline/fields/select_checkbox.html             | 13 ----------
 .../inline/fields/select_multiple.html             |  2 +-
 .../rest_framework/inline/fields/select_radio.html | 13 ----------
 .../rest_framework/inline/fields/textarea.html     |  4 +--
 .../rest_framework/vertical/fields/checkbox.html   | 20 ++++++++++-----
 .../vertical/fields/checkbox_multiple.html         | 30 ++++++++++++++++++++++
 .../rest_framework/vertical/fields/fieldset.html   |  4 +--
 .../rest_framework/vertical/fields/input.html      | 13 +++++++---
 .../vertical/fields/list_fieldset.html             |  4 +--
 .../rest_framework/vertical/fields/radio.html      | 30 ++++++++++++++++++++++
 .../rest_framework/vertical/fields/select.html     | 10 ++++++--
 .../vertical/fields/select_checkbox.html           | 24 -----------------
 .../vertical/fields/select_multiple.html           | 10 ++++++--
 .../vertical/fields/select_radio.html              | 24 -----------------
 .../rest_framework/vertical/fields/textarea.html   | 13 +++++++---
 33 files changed, 255 insertions(+), 171 deletions(-)
 create mode 100644 rest_framework/templates/rest_framework/horizontal/fields/checkbox_multiple.html
 create mode 100644 rest_framework/templates/rest_framework/horizontal/fields/radio.html
 delete mode 100644 rest_framework/templates/rest_framework/horizontal/fields/select_checkbox.html
 delete mode 100644 rest_framework/templates/rest_framework/horizontal/fields/select_radio.html
 create mode 100644 rest_framework/templates/rest_framework/inline/fields/checkbox_multiple.html
 create mode 100644 rest_framework/templates/rest_framework/inline/fields/radio.html
 delete mode 100644 rest_framework/templates/rest_framework/inline/fields/select_checkbox.html
 delete mode 100644 rest_framework/templates/rest_framework/inline/fields/select_radio.html
 create mode 100644 rest_framework/templates/rest_framework/vertical/fields/checkbox_multiple.html
 create mode 100644 rest_framework/templates/rest_framework/vertical/fields/radio.html
 delete mode 100644 rest_framework/templates/rest_framework/vertical/fields/select_checkbox.html
 delete mode 100644 rest_framework/templates/rest_framework/vertical/fields/select_radio.html

(limited to 'rest_framework')

diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html
index 2e03dd98..4b6c7fcf 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 ee3bf936..07a7308f 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/checkbox_multiple.html b/rest_framework/templates/rest_framework/horizontal/fields/checkbox_multiple.html
new file mode 100644
index 00000000..ec7d5935
--- /dev/null
+++ b/rest_framework/templates/rest_framework/horizontal/fields/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/fieldset.html b/rest_framework/templates/rest_framework/horizontal/fields/fieldset.html
index ff93c6ba..f6d5dd9d 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 6621c7e6..43ab4151 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 68c75d4f..a30514c6 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/radio.html b/rest_framework/templates/rest_framework/horizontal/fields/radio.html
new file mode 100644
index 00000000..52238bb1
--- /dev/null
+++ b/rest_framework/templates/rest_framework/horizontal/fields/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/fields/select.html b/rest_framework/templates/rest_framework/horizontal/fields/select.html
index eaa6d575..1d00f424 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_checkbox.html b/rest_framework/templates/rest_framework/horizontal/fields/select_checkbox.html
deleted file mode 100644
index ff3fab57..00000000
--- a/rest_framework/templates/rest_framework/horizontal/fields/select_checkbox.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<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>
-    {% endif %}
-    <div class="col-sm-10">
-    {% if field.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 %}
-    </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 3ed2874b..01c251fb 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/select_radio.html b/rest_framework/templates/rest_framework/horizontal/fields/select_radio.html
deleted file mode 100644
index 6e56afb5..00000000
--- a/rest_framework/templates/rest_framework/horizontal/fields/select_radio.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<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>
-    {% endif %}
-    <div class="col-sm-10">
-    {% if field.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 %}
-    </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 ae263c48..ec107549 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 57fa5dc0..71737f15 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/checkbox_multiple.html b/rest_framework/templates/rest_framework/inline/fields/checkbox_multiple.html
new file mode 100644
index 00000000..6caf6440
--- /dev/null
+++ b/rest_framework/templates/rest_framework/inline/fields/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/fieldset.html b/rest_framework/templates/rest_framework/inline/fields/fieldset.html
index ba9f1835..5ee182a5 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 bdf25ffe..0d3eb884 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/radio.html b/rest_framework/templates/rest_framework/inline/fields/radio.html
new file mode 100644
index 00000000..1915f4f8
--- /dev/null
+++ b/rest_framework/templates/rest_framework/inline/fields/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/fields/select.html b/rest_framework/templates/rest_framework/inline/fields/select.html
index 730fcce6..e9fcebb4 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_checkbox.html b/rest_framework/templates/rest_framework/inline/fields/select_checkbox.html
deleted file mode 100644
index cca71d68..00000000
--- a/rest_framework/templates/rest_framework/inline/fields/select_checkbox.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="form-group">
-    {% 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/select_multiple.html b/rest_framework/templates/rest_framework/inline/fields/select_multiple.html
index 3f9b2701..feddf7ab 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/select_radio.html b/rest_framework/templates/rest_framework/inline/fields/select_radio.html
deleted file mode 100644
index 3fffceac..00000000
--- a/rest_framework/templates/rest_framework/inline/fields/select_radio.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="form-group">
-    {% 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/textarea.html b/rest_framework/templates/rest_framework/inline/fields/textarea.html
index bdf25ffe..0766a01c 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 9fd4cdaa..e21a8e90 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/checkbox_multiple.html b/rest_framework/templates/rest_framework/vertical/fields/checkbox_multiple.html
new file mode 100644
index 00000000..134cca66
--- /dev/null
+++ b/rest_framework/templates/rest_framework/vertical/fields/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/fieldset.html b/rest_framework/templates/rest_framework/vertical/fields/fieldset.html
index 248fe904..824e6098 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 10a576b2..4f4cb017 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 6b99a834..74bbf448 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/radio.html b/rest_framework/templates/rest_framework/vertical/fields/radio.html
new file mode 100644
index 00000000..ed9f9ddb
--- /dev/null
+++ b/rest_framework/templates/rest_framework/vertical/fields/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/fields/select.html b/rest_framework/templates/rest_framework/vertical/fields/select.html
index b0545f7e..7c673ebb 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_checkbox.html b/rest_framework/templates/rest_framework/vertical/fields/select_checkbox.html
deleted file mode 100644
index c486b1b3..00000000
--- a/rest_framework/templates/rest_framework/vertical/fields/select_checkbox.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="form-group">
-    {% if field.label %}
-        <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
-    {% endif %}
-    {% if field.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 %}
-</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 ca63192e..54839294 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/select_radio.html b/rest_framework/templates/rest_framework/vertical/fields/select_radio.html
deleted file mode 100644
index d7655b00..00000000
--- a/rest_framework/templates/rest_framework/vertical/fields/select_radio.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="form-group">
-    {% if field.label %}
-        <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
-    {% endif %}
-    {% if field.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 %}
-</div>
diff --git a/rest_framework/templates/rest_framework/vertical/fields/textarea.html b/rest_framework/templates/rest_framework/vertical/fields/textarea.html
index 8d951496..840ea853 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>
-- 
cgit v1.2.3