2 files changed, 23 insertions, 2 deletions
diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html
index e8647dadf..1639c70f2 100644
--- a/ishtar_common/templates/blocks/JQueryJqGrid.html
+++ b/ishtar_common/templates/blocks/JQueryJqGrid.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-</table>
 
 <button id='search_{{name}}' class='submit'>{% trans "Search" %}</button>
 
@@ -42,7 +41,15 @@ jQuery(document).ready(function(){
     for (idx in query_vars)
     {
         var key = query_vars[idx];
-        var val = jQuery("#id_"+key).val();
+        var item = jQuery("#id_"+key);
+        var val = null;
+        if (item.prop('type') == 'checkbox'){
+            if (item.prop('checked')){
+                var val = item.val();
+            }
+        } else {
+            var val = item.val();
+        }
         if (val){
             if (data) data += "&";
             data += key + "=" + val;
diff --git a/ishtar_common/templates/blocks/form_flex_snippet.html b/ishtar_common/templates/blocks/form_flex_snippet.html
new file mode 100644
index 000000000..03d8b15f0
--- /dev/null
+++ b/ishtar_common/templates/blocks/form_flex_snippet.html
@@ -0,0 +1,14 @@
+{% load i18n %}
+<ul class='form-flex'>
+  {% if form.non_field_errors %}<li class='errors'>
+    {{form.non_field_errors}}
+  </li>{%endif%}
+  {% for field in form %}{% if not field.is_hidden %}
+  <li{% if field.field.required %} class='required'{% endif %}>
+    {{ field.label_tag }}
+    <p class='input'>{{ field.errors }}{{field|safe}}</p>{% if field.help_text %}
+    <a href="#{{field.auto_id}}" class="help_display" title="{% trans "Help"%}">?</a>
+  <div class="help_text" id="{{field.auto_id}}_help">
+    {{field.help_text}}</div>
+  {%endif%}</li>{% else %}{{field}}{% endif %}{% endfor %}
+</ul>