rearrange error messages in search form so errors do not break design…

… (bug 578293)

apps/search/templates/search/search_form.html

@@ -1,8 +1,8 @@
-{% macro fieldbox(name): %}
+{% macro fieldbox(name, show_errors=True): %}
   {% with field = search_form[name] %}
     <div class="fieldWrapper wrap_{{ field.name }}">
-      {{ field.errors|safe }}
       {{ field.label_tag()|safe }} {{ field|safe }}
+      {% if show_errors %}{{ field.errors|safe }}{% endif %}
     </div>
   {% endwith %}
 {% endmacro %}
@@ -12,12 +12,17 @@
     <div id="search_basic" class="clearfix">
       {{ fieldbox('q') }}
 
-      {{ fieldbox('product') }}
-      {{ fieldbox('version') }}
+      {{ fieldbox('product', show_errors=False) }}
+      {{ fieldbox('version', show_errors=False) }}
 
       <button type="submit">{{ _('Search') }}</button>
     </div>
 
+    <div>
+      {{ search_form.product.errors|safe }}
+      {{ search_form.version.errors|safe }}
+    </div>
+
     <div id="show_search_adv" class="active">
       <a href="#">{{ _('Advanced') }}</a>
     </div>

media/css/reporter.css

@@ -878,6 +878,10 @@ input.placeholder {
     right: 0;
     top: 0;
 }
+#search #search_form #show_search_adv {
+    padding: 0 0 15%;
+}
+
 #search_form #show_search_adv.active {
     background-color: #fff;
 }