From 682e85e72c95ff4750ff2c5c0193fdb9ea8ddbf3 Mon Sep 17 00:00:00 2001
From: Jan Weiher <jan@buksy.de>
Date: Thu, 5 Sep 2013 23:31:01 +0200
Subject: [PATCH 1/2] Fix behavior for auto_id=False on form creation

---
 bootstrapform/templates/bootstrapform/field.html | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/bootstrapform/templates/bootstrapform/field.html b/bootstrapform/templates/bootstrapform/field.html
index e59fa6e..8150352 100644
--- a/bootstrapform/templates/bootstrapform/field.html
+++ b/bootstrapform/templates/bootstrapform/field.html
@@ -4,10 +4,11 @@
     {% if field|is_checkbox %}
         <div class="{{ classes.single_value }}">
             <div class="checkbox">
+                {% if field.auto_id %}
                 <label>
                     {{ field }} <span>{{ field.label }}</span>
                 </label>
-
+                {% endif %}
                 {% for error in field.errors %}
                     <span class="help-block">{{ error }}</span>
                 {% endfor %}
@@ -20,8 +21,9 @@
             </div>
         </div>
     {% else %}{% if field|is_radio %}
-        <label class="control-label {{ classes.label }}">{{ field.label }}</label>
-
+        {% if field.auto_id %}
+            <label class="control-label {{ classes.label }}">{{ field.label }}</label>
+        {% endif %}
         <div class="{{ classes.value }}">
             {% for choice in field %}
                 <div class="radio">
@@ -44,8 +46,9 @@
         </div>
 
     {% else %}
-        <label class="control-label {{ classes.label }}" for="{{ field.auto_id }}">{{ field.label }}</label>
-
+        {% if field.auto_id %}
+            <label class="control-label {{ classes.label }}" for="{{ field.auto_id }}">{{ field.label }}</label>
+        {% endif %}
         <div class="{{ classes.value }}">
             {{ field }}
 

From 72f9e7a9de1dd57005d158da8343a74fc8e6b2f2 Mon Sep 17 00:00:00 2001
From: James Tauber <jtauber@jtauber.com>
Date: Mon, 9 Sep 2013 22:44:16 -0400
Subject: [PATCH 2/2] fixed RST for link to Nivl

---
 docs/install.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/install.rst b/docs/install.rst
index 44e03eb..0b62106 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -63,7 +63,7 @@ CHANGELOG
 
 - 2013-8-27:
 
-  Add support for Bootstrap 3, contributed by `Nivl<https://github.com/Nivl>`_
+  Add support for Bootstrap 3, contributed by `Nivl <https://github.com/Nivl>`_
 
 
 - 2013-5-7: