Merge branch 'master' into v0.9

1 files changed, 16 insertions, 5 deletions

diff --git a/ishtar_common/templates/blocks/form_flex_snippet.html b/ishtar_common/templates/blocks/form_flex_snippet.html
index 03d8b15f0..97ac37b44 100644
--- a/ishtar_common/templates/blocks/form_flex_snippet.html
+++ b/ishtar_common/templates/blocks/form_flex_snippet.html
@@ -1,14 +1,25 @@
 {% load i18n %}
-<ul class='form-flex'>
-  {% if form.non_field_errors %}<li class='errors'>
+  {% if form.non_field_errors %}<p class='errors'>
     {{form.non_field_errors}}
-  </li>{%endif%}
-  {% for field in form %}{% if not field.is_hidden %}
+  </p>{%endif%}
+  {% for hidden in form.hidden_fields %}{{ hidden }}{% endfor %}
+  {% for field in form.visible_fields %}
+{% if forloop.counter0 == 0 %}
+<ul class='form-flex head-form'>
+{% endif %}
+{% if forloop.counter0 == 6 %}
+</ul>
+<p class='center'><a href='#' onclick='show_hide_flex(".tail-form");return false'>{% trans "Show / hide advanced search" %}</a></p>
+<ul class='form-flex tail-form hidden'>
+{% endif %}
   <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 %}
+  {%endif%}</li>
+{% if forloop.last %}
 </ul>
+{% endif %}
+{% endfor %}