From a9279eae498aa404ca98946f7c28f6c16769524c Mon Sep 17 00:00:00 2001
From: Andrew Hayward <github@andrewhayward.net>
Date: Wed, 5 Jun 2013 13:05:06 +0100
Subject: [PATCH] Fixing filter inputs

Resolves #409
---
 static/media/js/custom_logic.js |  3 --
 views/filter.html               | 50 +++++++++++++++++----------------
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/static/media/js/custom_logic.js b/static/media/js/custom_logic.js
index fc245cd..57309d6 100644
--- a/static/media/js/custom_logic.js
+++ b/static/media/js/custom_logic.js
@@ -12,9 +12,6 @@ if( /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent) ) mob
 			var selectID = ($(this).attr('for'));
 			var selectEle = $('#' + selectID);
 			$('#' + selectID + ' option:first').text($(this).text());
-			var selectWrap = $('<div class="selectWrapper"></div>').append(this,selectEle);
-			$('.navbar.filter form').prepend(selectWrap);
-
 		});
 	}
 
diff --git a/views/filter.html b/views/filter.html
index 322d9d1..f7b48eb 100644
--- a/views/filter.html
+++ b/views/filter.html
@@ -6,30 +6,32 @@
 		{% if filters %}
 			<div class="navbar filter">
 				<form class="navbar-inner navbar-form form-inline text-center" method="get">
-						{% for filter in filters %}
-							<label for="filter-{{ filter.name }}" class="filter-icon filter-{{ filter.name }}">{{ filter.label }}</label>
-							{% if filter.options %}
-								<select id="filter-{{ filter.name }}" name="{{ filter.name }}" class="input-medium{% if filter.class %} {{ filter.class }}{% endif %}">
-									<option></option>
-									{% if filter.is_grouped %}
-										{% for label, options in filter.options %}
-											<optgroup label="{{ label }}">
-												{% for value, label in options %}
-													<option value="{{ value }}"{% if filter.selected == value %} selected="selected"{% endif %}>{{ label }}</option>
-												{% endfor %}
-											</optgroup>
-										{% endfor %}
-									{% else %}
-										{% for item in filter.options %}
-											<option value="{{ item.value }}"{% if filter.selected == item.value %} selected="selected"{% endif %}>{{ item.label }}</option>
-										{% endfor %}
-									{% endif %}
-								</select>
-							{% else %}
-								<input type="{{ filter.type | default('text') }}" id="filter-{{ filter.name }}" name="{{ filter.name }}" class="input-medium{% if filter.class %} {{ filter.class }}{% endif %}"{% if filter.value %} value="{{ filter.value }}"{% endif %}>
-							{% endif %}
-						{% endfor %}
-						<input type="submit" value="Update" class="btn">
+					{% for filter in filters %}
+					    <div class="selectWrapper">
+    						<label for="filter-{{ filter.name }}" class="filter-icon filter-{{ filter.name }}">{{ filter.label }}</label>
+    						{% if filter.options %}
+    							<select id="filter-{{ filter.name }}" name="{{ filter.name }}" class="input-medium{% if filter.class %} {{ filter.class }}{% endif %}">
+    								<option></option>
+    								{% if filter.is_grouped %}
+    									{% for label, options in filter.options %}
+    										<optgroup label="{{ label }}">
+    											{% for value, label in options %}
+    												<option value="{{ value }}"{% if filter.selected == value %} selected="selected"{% endif %}>{{ label }}</option>
+    											{% endfor %}
+    										</optgroup>
+    									{% endfor %}
+    								{% else %}
+    									{% for item in filter.options %}
+    										<option value="{{ item.value }}"{% if filter.selected == item.value %} selected="selected"{% endif %}>{{ item.label }}</option>
+    									{% endfor %}
+    								{% endif %}
+    							</select>
+    						{% else %}
+    							<input type="{{ filter.type | default('text') }}" id="filter-{{ filter.name }}" name="{{ filter.name }}" class="input-medium{% if filter.class %} {{ filter.class }}{% endif %}"{% if filter.value %} value="{{ filter.value }}"{% endif %}>
+    						{% endif %}
+    					</div>
+					{% endfor %}
+					<input type="submit" value="Update" class="btn">
 				</form>
 			</div>
 		{% endif %}