From e59b12858f09fce218c6e3aeef79780d6db2fc84 Mon Sep 17 00:00:00 2001
From: Halfdan Rump <halfdan-rump@garage.co.jp>
Date: Sun, 29 Jun 2014 10:49:15 +0900
Subject: [PATCH] Fixes id parameter position for quick_form & updates docs

---
 docs/basic-usage.rst                         | 5 +++--
 flask_bootstrap/templates/bootstrap/wtf.html | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/basic-usage.rst b/docs/basic-usage.rst
index d87dbfc3..c4c58136 100644
--- a/docs/basic-usage.rst
+++ b/docs/basic-usage.rst
@@ -200,7 +200,8 @@ Form macro reference
                     form_type="basic",\
                     horizontal_columns=('lg', 2, 10),\
                     enctype=None,\
-                    button_map={})
+                    button_map={},
+                    id="")
 
    Outputs Bootstrap-markup for a complete Flask-WTF_ form.
 
@@ -217,7 +218,7 @@ Form macro reference
    :param button_map: A dictionary, mapping button field names to names such as
    ``primary``, ``danger`` or ``success``. Buttons not found in the
    ``button_map`` will use the ``default`` type of button.
-
+   :param id: The ``<form>`` id attribute.
 
 .. py:function:: form_errors(form, hiddens=True)
 
diff --git a/flask_bootstrap/templates/bootstrap/wtf.html b/flask_bootstrap/templates/bootstrap/wtf.html
index b7c27ef5..633e8b52 100644
--- a/flask_bootstrap/templates/bootstrap/wtf.html
+++ b/flask_bootstrap/templates/bootstrap/wtf.html
@@ -113,14 +113,14 @@
 {# valid form types are "basic", "inline" and "horizontal" #}
 {% macro quick_form(form,
                     action="",
-		    id="",
                     method="post",
                     extra_classes=None,
                     role="form",
                     form_type="basic",
                     horizontal_columns=('lg', 2, 10),
                     enctype=None,
-                    button_map={}) %}
+                    button_map={}, 
+                    id="") %}
 <form
   {%- if action %} action="{{action}}"{% endif -%}
   {%- if id %} id="{{id}}"{% endif -%}