diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-03 20:17:47 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-03 20:17:47 +0100 |
| commit | 507d9eb44c328e13ffff26e4301d7e80bfc91f4d (patch) | |
| tree | b497011ebb4ea4b899eb3c5ebeae6af15c2816c4 /ishtar_common/templates/blocks | |
| parent | 7522e7a325fb8ebad5f20bbfb5253b4be24e2cd0 (diff) | |
| parent | 4509e950fbe35e6f529c4469dfc7802686fce28e (diff) | |
| download | Ishtar-507d9eb44c328e13ffff26e4301d7e80bfc91f4d.tar.bz2 Ishtar-507d9eb44c328e13ffff26e4301d7e80bfc91f4d.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/templates/blocks')
| -rw-r--r-- | ishtar_common/templates/blocks/JQueryJqGrid.html | 11 | ||||
| -rw-r--r-- | ishtar_common/templates/blocks/form_flex_snippet.html | 14 |
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> |