Merge pull request #369 from codeeu/revert-359-fea_search_get2

Revert "Even more search improvements - 2nd attempt :)"

Author: goranche

api/processors.py

@@ -99,6 +99,7 @@ def get_filtered_events(search_filter=None, country_filter=None, theme_filter=No
 		filter_kwargs['theme__in'] = theme_filter
 
 	if audience_filter:
+		audience = EventAudience.objects.filter()
 		filter_kwargs['audience__in'] = audience_filter
 
 	if len(filter_args) > 0:

static/js/endless_pagination/custom-endless-pagination.js

@@ -0,0 +1,118 @@
+(function ($) {
+    'use strict';
+
+    $.fn.endlessPaginate = function(options) {
+        var defaults = {
+            // Twitter-style pagination container selector.
+            containerSelector: '.endless_container',
+            // Twitter-style pagination loading selector.
+            loadingSelector: '.endless_loading',
+            // Twitter-style pagination link selector.
+            moreSelector: 'a.endless_more',
+            // Digg-style pagination page template selector.
+            pageSelector: '.endless_page_template',
+            // Digg-style pagination link selector.
+            pagesSelector: 'a.endless_page_link',
+            // Callback called when the user clicks to get another page.
+            onClick: function() {},
+            // Callback called when the new page is correctly displayed.
+            onCompleted: function() {},
+            // Set this to true to use the paginate-on-scroll feature.
+            paginateOnScroll: false,
+            // If paginate-on-scroll is on, this margin will be used.
+            paginateOnScrollMargin : 1,
+            // If paginate-on-scroll is on, it is possible to define chunks.
+            paginateOnScrollChunkSize: 0
+        },
+            settings = $.extend(defaults, options);
+
+        var getContext = function(link) {
+            return {
+                key: link.attr('rel').split(' ')[0],
+                url: link.attr('href')
+            };
+        };
+
+        return this.each(function() {
+            var element = $(this),
+                loadedPages = 1;
+
+            // Twitter-style pagination.
+            element.on('click', settings.moreSelector, function() {
+
+                var link = $(this),
+                    html_link = link.get(0),
+                    container = link.closest(settings.containerSelector),
+                    loading = container.find(settings.loadingSelector);
+                // Avoid multiple Ajax calls.
+                if (loading.is(':visible')) {
+                    return false;
+                }
+                link.hide();
+                loading.show();
+                var context = getContext(link);
+                // Fire onClick callback.
+                if (settings.onClick.apply(html_link, [context]) !== false) {
+                    var param = '&querystring_key=' + context.key;
+                    var data = $( "#faceted-search-events" ).serialize()
+
+                    // Send the Ajax request.
+                    $.post(context.url + param, data, function(fragment) {
+                        container.before(fragment);
+                        container.remove();
+                        // Increase the number of loaded pages.
+                        loadedPages += 1;
+                        // Fire onCompleted callback.
+                        settings.onCompleted.apply(
+                            html_link, [context, fragment.trim()]);
+                    });
+                }
+                return false;
+            });
+
+            // On scroll pagination.
+            if (settings.paginateOnScroll) {
+                var win = $(window),
+                    doc = $(document);
+                win.scroll(function(){
+                    if (doc.height() - win.height() -
+                        win.scrollTop() <= settings.paginateOnScrollMargin) {
+                        // Do not paginate on scroll if chunks are used and
+                        // the current chunk is complete.
+                        var chunckSize = settings.paginateOnScrollChunkSize;
+                        if (!chunckSize || loadedPages % chunckSize) {
+                            element.find(settings.moreSelector).click();
+                        }
+                    }
+                });
+            }
+
+            // Digg-style pagination.
+            element.on('click', settings.pagesSelector, function() {
+
+                var link = $(this),
+                    html_link = link.get(0),
+                    context = getContext(link);
+                // Fire onClick callback.
+                if (settings.onClick.apply(html_link, [context]) !== false) {
+                    var page_template = link.closest(settings.pageSelector);
+                    var param = '&querystring_key=' + context.key;
+                    var data = $( "#faceted-search-events" ).serialize()
+
+                    // Send the Ajax request.
+                    page_template.load(context.url + param, data, function(fragment) {
+                        // Fire onCompleted callback.
+                        settings.onCompleted.apply(
+                            html_link, [context, fragment.trim()]);
+                    });
+                }
+                return false;
+            });
+        });
+    };
+
+    $.endlessPaginate = function(options) {
+        return $('body').endlessPaginate(options);
+    };
+
+})(jQuery);

static/js/faceted-search-events.js

@@ -15,16 +15,13 @@ var Codeweek = window.Codeweek || {};
 
 			$('.search-form-element').on('change', function (e) {
 				var container = $('#events-container');
-				var search_counter_container = $('#search-counter-container');
 				var data = $('#faceted-search-events').serialize();
 				var url = $('#faceted-search-events').attr('action');
 
-				if (!Modernizr.history) {
-					document.getElementById('faceted-search-events').submit();
-				} else {
-					$("#events-container").html("<img id='loading-gif' src='/static/img/loading.gif'/>");
-					$('#events-container').load(url + " #events-container", data);
-				}
+				$.post(url, data, function(fragment) {
+					container.empty();
+					container.html(fragment);
+				});
 			});
 		});
 	};

static/js/index.js

@@ -232,8 +232,8 @@ var Codeweek = window.Codeweek || {};
 			// Initialize map on front page
 			google.maps.event.addDomListener(window, 'load', function () {
 				var ajaxURL = "/api/event/list/?format=json";
-				if (past == "on")
-					ajaxURL = ajaxURL + "&past=on"
+				if (past == "yes")
+					ajaxURL = ajaxURL + "&past=yes"
 
 				$.ajax({
 					type: "GET",

web/forms/event_form.py

@@ -164,11 +164,11 @@ class SearchEventForm(forms.Form):
 	if not 'Kosovo' in list(dict(countries._countries).values()):
 		countries._countries.append((u'XK', u'Kosovo'))
 
-	q = forms.CharField(
+	search = forms.CharField(
 		required=False,
 		widget=forms.TextInput(attrs={'placeholder': 'Search for event name or tag', 'class': 'form-control'})
 	)
-	past = forms.BooleanField(
+	past_events = forms.BooleanField(
 		label='Include past events',
 		required=False,
 		widget=forms.CheckboxInput(attrs={'class': 'search-form-element'}),
@@ -197,18 +197,15 @@ class SearchEventForm(forms.Form):
 	def __init__(self, *args, **kwargs):
 		country_code = kwargs.pop('country_code', None)
 		past_events = kwargs.pop('past_events', False)
-		search_query = kwargs.pop('q', None)
-		theme = kwargs.pop('theme', None)
-		audience = kwargs.pop('audience', None)
-
+		search_query = kwargs.pop('search', None)
 		super(SearchEventForm, self).__init__(*args, **kwargs)
-
 		if country_code:
 			self.fields['country'].initial = country_code
-		self.fields['past'].initial = past_events
+		self.fields['past_events'].initial = past_events
 		if search_query:
-			self.fields['q'].initial = search_query
-		if theme:
-			self.fields['theme'].initial = theme
-		if audience:
-			self.fields['audience'].initial = audience
+			self.fields['search'].initial = search_query
+
+
+
+
+

web/templates/endless/show_more.html

@@ -1,7 +1,7 @@
 {% load i18n %}
 {% if querystring %}
-    <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 }}" 
+    <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_loading" style="display: none;">{{ loading|safe }}</div>
     </div>

web/templates/pages/faceted_search_results.html renamed to web/templates/pages/ajax_faceted_search_events.html

@@ -1,7 +1,8 @@
 {% load endless %}
 
 {% if events %}
-	{% lazy_paginate 10 events as pag_events %}
+	<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 %}
 	{% for event in pag_events %}
 		{% include 'layout/event_tile_long.html' %}
 	{% endfor %}
@@ -14,3 +15,4 @@ <h3>
 	</h3>
 {% endif %}
 
+

web/templates/pages/index.html

@@ -33,17 +33,17 @@
 
 		<div class="container index-content">
 			<div id="past-events">
-				{% if past == 'on' %}
+				{% if past == 'yes' %}
 				<a id="past-link" href="{% url 'web.index' %}"><i class="fa fa-check-square-o"></i> 
 				{% else %}
-				<a id="past-link" href="{% url 'web.index' %}?past=on"><i class="fa fa-square-o"></i>
+				<a id="past-link" href="{% url 'web.index' %}?past=yes"><i class="fa fa-square-o"></i>
 				{% endif %}
 				Show past events</a>
 			</div>
 			<div class="clearfix">
 				<div id="search-events-link">
 					<a class="btn btn-primary btn-lg"
-					   href="{% url 'web.search_events' %}?country={{ country.country_code }}&amp;past={{ past }}">
+					   href="{% url 'web.search_events' %}?country_code={{ country.country_code }}&amp;past={{ past }}">
 						<i class="fa fa-list"></i> List all events {% if country %}in
 						<span id="country"> {{ country.country_name }}</span>{% endif %}
 					</a>

web/templates/pages/scoreboard.html

@@ -11,7 +11,7 @@ <h1>#codeEU Events Scoreboard</h1>
 				<img src="/static/flags/{{ country.country_code|lower }}.png" alt="{{ country.country_name }}" />
 				<span class="icon-flag">
 					<span class="country-name">{{ country.country_name }}</span> is participating with 
-					 <span class="event-number"><a href="{% url 'web.search_events' %}?country_code={{ country.country_code }}&amp;past=on">{{ country.events }}</span> event{% if country.events != 1 %}s{% endif %}</a>
+					 <span class="event-number"><a href="{% url 'web.search_events' %}?country_code={{ country.country_code }}&amp;past=yes">{{ country.events }}</span> event{% if country.events != 1 %}s{% endif %}</a>
 				</span>
 			</div>
 		{% endfor %}

web/templates/pages/search_events.html

@@ -11,41 +11,41 @@
 	<div class="container">
 		<div class="search-page">
 			<div class="search-options">
-				<form id="faceted-search-events" method="get" action="{% url 'web.search_events' %}" enctype="multipart/form-data">
+				<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-9">
-							{{ form.q }}
+						<div class="form-group col-md-8">
+							{{ 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">
 						<div class="col-md-4">
-							<label for="{{ form.country.id_for_label }}">{{ form.fields.country.label }}</label>
+							<label for="id_country">{{ form.fields.country.label }}</label>
 							{{ form.country }}
+
 							<div class="search-checkbox">
 								<hr>
-								{{ form.past }}
-								<label for="{{ form.past.id_for_label }}">{{ form.past.label }}</label>
+								{{ form.past_events }}
+								<label for="id_include_past">{{ form.past_events.label }}</label> 
 							</div>
+
 							<div class="search-checkbox">
 								<hr>
 								<label>{{ form.fields.theme.label }}</label>
 								{{ form.theme }}
 							</div>
+
 							<div class="search-checkbox">
 								<hr>
 								<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">
-								{% if events %}
-								<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 %}
 								{% include page_template %}
 							</div>
 						</div>
@@ -58,7 +58,7 @@
 
 {% block custom_js %}
 {{ block.super }}
-<script type="text/javascript" src="{% static "js/endless_pagination/endless-pagination.js" %}" ></script>
+<script type="text/javascript" src="{% static "js/endless_pagination/custom-endless-pagination.js" %}" ></script>
 <script type="text/javascript" src="{% static "js/faceted-search-events.js" %}" ></script>
 <script type="text/javascript">
 	Codeweek.FacetedSearch.init();

web/tests/__init__.py

@@ -10,7 +10,7 @@ class Meta:
 		model = Event
 
 	organizer="Event Organizer"
-	creator=factory.LazyAttribute(lambda n: User.objects.get_or_create(username='test_user')[0])
+	creator=factory.LazyAttribute(lambda n: User.objects.get(pk=1))
 	title="My Coding Event"
 	description="Some description"
 	location="Nonexisting location"
@@ -20,9 +20,6 @@ class Meta:
 	country="SI"
 	tags=["tag1", "tag2"]
 
-	audience=[1]
-	theme=[1]
-
 	start_date=factory.LazyAttribute(lambda n: datetime.datetime.now() + datetime.timedelta(days=1, hours=3) )
 	end_date=factory.LazyAttribute(lambda n: datetime.datetime.now() + datetime.timedelta(days=3, hours=3) )