From 0179897dc6dcbc2ef996f699564ce58971f1fdc9 Mon Sep 17 00:00:00 2001
From: Johannes Gehrs <jgehrs@gmail.com>
Date: Mon, 24 Jun 2013 00:20:48 +0200
Subject: [PATCH] fixed some rendering issues with checkbox

solution is imperfect but ok for now
---
 sample/templates/_formhelpers.html           | 17 ++++-------------
 sample/templates/base.html                   |  4 ++--
 sample/templates/wtforms_parsley_sample.html |  2 +-
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/sample/templates/_formhelpers.html b/sample/templates/_formhelpers.html
index 3cd92e1..3ca13bc 100644
--- a/sample/templates/_formhelpers.html
+++ b/sample/templates/_formhelpers.html
@@ -1,12 +1,3 @@
-{% macro render_checkbox(field) %}
-    <div class="control-group {% if field.errors %} error {% endif %}">
-        <div class="controls">
-            <label class="checkbox">{{ field(**kwargs)|safe }} {{ field.label }}</label>
-            {{ render_errors(field) }}
-        </div>
-    </div>
-{% endmacro %}
-
 {% macro render_field(field) %}
     <label class="control-label" for="{{ field.name }}">{{ field.label }}</label>
     <div class="control-group {% if field.errors %} error {% endif %}">
@@ -18,13 +9,13 @@
 {% endmacro %}
 
 {% macro render_errors(field) %}
-    {% if field.errors %}
-        <span class="help-inline">
+    <span class="help-inline">
+            {% if field.errors %}
                 <ul>
                     {% for error in field.errors %}
                         <li>{{ error }}</li>
                     {% endfor %}
                 </ul>
-                </span>
-    {% endif %}
+            {% endif %}
+    </span>
 {% endmacro %}
diff --git a/sample/templates/base.html b/sample/templates/base.html
index d1f2c87..39bccaa 100644
--- a/sample/templates/base.html
+++ b/sample/templates/base.html
@@ -45,8 +45,8 @@
 
 {% block scripts %}
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
-    <script src="{{ url_for('static', filename='scripts/parsley/parsley.js') }}"></script>
-    <script src="{{ url_for('static', filename='scripts/parsley/parsley.extend.js') }}"></script>
+    <script src="{{ url_for('static', filename='scripts/parsleyjs/parsley.js') }}"></script>
+    <script src="{{ url_for('static', filename='scripts/parsleyjs/parsley.extend.js') }}"></script>
     <script>$('form').parsley({ successClass: 'success', errorClass: 'error',
         errors: {
             classHandler: function (element) {
diff --git a/sample/templates/wtforms_parsley_sample.html b/sample/templates/wtforms_parsley_sample.html
index 760613f..a6376cd 100644
--- a/sample/templates/wtforms_parsley_sample.html
+++ b/sample/templates/wtforms_parsley_sample.html
@@ -13,7 +13,7 @@
             {{ render_field(form.number_range) }}
             {{ render_field(form.required_text) }}
             {{ render_field(form.required_select) }}
-            {{ render_checkbox(form.required_checkbox) }}
+            {{ render_field(form.required_checkbox) }}
             {{ render_field(form.regexp) }}
             {{ render_field(form.url) }}
             {{ render_field(form.anyof) }}