Tweaked search results

Author: sparkica

static/js/faceted-search-events.js

@@ -15,7 +15,7 @@ var Codeweek = window.Codeweek || {};
 
 			$('.search-form-element').on('change', function (e) {
 				var container = $('#events-container');
-				var all_results = $('#all-search-results');
+				var search_counter_container = $('#search-counter-container');
 				var data = $('#faceted-search-events').serialize();
 				var url = $('#faceted-search-events').attr('action');
 
@@ -24,9 +24,11 @@ var Codeweek = window.Codeweek || {};
 					container.empty();
 					container.html(fragment);
 					var no_results = $('body').data('all_results');
-					
+					var result_string = '';
+
 					if (no_results > 0 ) {
-						all_results.text(no_results);
+						result_string = (no_results > 1 ? ' events match ' : ' event matches ');
+						search_counter_container.html(no_results + result_string + 'your search criteria: ');
 						$('#all-search-results').show();
 					} else {
 						$('#all-search-results').hide();

web/templates/pages/faceted_search_results.html

@@ -1,7 +1,7 @@
 {% load endless %}
 
 {% if events %}
-	{% lazy_paginate 6 events as pag_events %}
+	{% 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

@@ -43,7 +43,7 @@
 						</div>
 						<div class="col-md-8">
 							{% if events %}
-							<div class="search-counter">Events matching your search criteria: <span id="all-search-results">{{ all_results }}</span></div>
+							<div id="search-counter-container" class="search-counter">{{ all_results }} {% if all_results > 1 %}events match{% else %}event matches{% endif %} your search criteria:</span></div>
 							{% endif %}
 							<div id="events-container">
 								{% include page_template %}