Merge pull request #371 from sparkica/search_visuals

Search visuals

Author: ialja

web/templates/endless/show_more.html

@@ -1,8 +1,8 @@
 {% load i18n %}
 {% if querystring %}
-    <div class="endless_container">
-        <a class="endless_more" href="{{ path }}{{ querystring }}" 
-            rel="{{ querystring_key }}">{% if label %}{{ label }}{% else %}{% trans "more" %}{% endif %}</a>
+	<div class="endless_container col-md-6 col-md-offset-3">
+<a class="endless_more btn btn-primary btn-lg btn-block" href="{{ path }}{{ querystring }}" 
+ rel="{{ querystring_key }}">{% if label %}{{ label }}{% else %}{% trans "more" %}{% endif %}</a>
         <div class="endless_loading" style="display: none;">{{ loading|safe }}</div>
     </div>
 {% endif %}

web/templates/pages/ajax_faceted_search_events.html

@@ -1,8 +1,11 @@
 {% load endless %}
 
 {% if events %}
+	{% if not page %}
 	<div class="search-counter">{{ events|length }} {% if events|length > 1 %}events match{% else %}event matches{% endif %} your search criteria:</div>
-	{% lazy_paginate 6 events as pag_events %}
+	{% endif %}
+	
+	{% lazy_paginate 10 events as pag_events %}
 	{% for event in pag_events %}
 		{% include 'layout/event_tile_long.html' %}
 	{% endfor %}

web/templates/pages/search_events.html

@@ -14,9 +14,10 @@
 				<form id="faceted-search-events" method="post" action="{% url 'web.search_events' %}" enctype="multipart/form-data">{% csrf_token %}
 					{{ form.non_field_errors }}
 					<div class="row">
-						<div class="form-group col-md-8">
+						<div class="form-group col-md-9">
 							{{ form.search }}
 						</div>
+						<div class="col-md-3"><input type="submit" class="btn btn-primary btn-lg" value="Search" /></div>
 						<div class="col-md-12"><hr></div>
 					</div>
 					<div class="row">
@@ -41,8 +42,6 @@
 								<label>{{ form.fields.audience.label }}</label>
 								{{ form.audience }}
 							</div>
-							<hr>
-							<input type="submit" class="btn btn-primary btn-lg" value="Search" />
 						</div>
 						<div class="col-md-8">
 							<div id="events-container">

web/views/events.py

@@ -279,6 +279,7 @@ def search_events(request):
 		past_events = True if past and past=='yes' else False
 
 		search_query = request.GET.get('q', '')
+		page = request.GET.get('page', None)
 
 		template = 'pages/search_events.html'
 		page_template = 'pages/ajax_faceted_search_events.html'
@@ -302,7 +303,10 @@ def search_events(request):
 		if request.is_ajax():
 			return render_to_response(
 				page_template, 
-				{'events':events},
+				{
+				'events':events,
+				'page': page
+				},
 				context_instance=RequestContext(request))
 
 		return render_to_response(