Merge remote-tracking branch 'upstream/master' into paginated_search

Author: Mateja

.travis.yml

@@ -23,8 +23,7 @@ install:
   - pip install -r ./requirements.txt
 
 # command to run tests, e.g. python setup.py test
-script:  python ./manage.py test api web
- --settings=codeweekeu.settings_travis
+script:  python ./manage.py test api web.tests --settings=codeweekeu.settings_travis
 
 notifications:
   email:

api/models/events.py

@@ -38,6 +38,12 @@ class Event(models.Model):
 		('PENDING', 'Pending'),
 	    ('REJECTED', 'Rejected'),
 	)
+
+	CUSTOM_COUNTRY_ENTRIES = (
+		('00',' All countries'),
+		('01','---------------'),
+	)
+
 	status = models.CharField(max_length=50, choices=STATUS_CHOICES, default='PENDING')
 	title = models.CharField(max_length=255, default=None)
 	slug = models.SlugField(max_length=255, null=True, blank=True)

api/processors.py

@@ -50,6 +50,30 @@ def get_pending_events(limit=None, order=None, country_code=None, past=False):
 		events = events[:limit]
 	return events
 
+def get_next_or_previous (event, country_code=None, past=False, direction=True):
+
+	"""
+	Get next or previous pending event
+	"""
+
+	next_event = None
+	events = Event.objects.filter(status='PENDING')
+	
+	if direction:
+		events = events.filter(pk__gt=event.pk).order_by("pk")
+	else:
+		events = events.filter(pk__lt=event.pk).order_by("-pk")
+
+	if not past:
+		events = events.filter(end_date__gte=datetime.datetime.now())
+	if country_code:
+		events = events.filter(country=country_code)
+
+	if events:
+		next_event = events[0]
+
+	return next_event
+
 
 def get_filtered_events(search_filter=None, country_filter=None, theme_filter=None, audience_filter=None):
 
@@ -65,7 +89,7 @@ def get_filtered_events(search_filter=None, country_filter=None, theme_filter=No
 		filter_args = (Q(title__icontains=search_filter) | Q(description__icontains=search_filter) | Q(tags__name__icontains=search_filter) 
 			| Q(organizer__icontains=search_filter) | Q(location__icontains=search_filter),)
 
-	if country_filter:
+	if country_filter and country_filter not in [ custom_country[0] for custom_country in Event.CUSTOM_COUNTRY_ENTRIES ]:
 		filter_kwargs['country'] = country_filter
 
 	if theme_filter:

requirements.txt

@@ -5,7 +5,7 @@ argparse>=1.1
 distribute==0.6.34
 django-appconf==0.6
 django-avatar==2.0
-django-compressor==1.3
+django-compressor==1.4
 django-countries==2.0c1
 django-debug-toolbar==1.0.1
 django-geoposition==0.1.5

static/css/style.css

@@ -5796,14 +5796,15 @@ a {
     -ms-transform: rotate(45deg);
     transform: rotate(45deg); }
 
+
 .btn-directional {
   padding: 15px 120px 15px 30px;
   overflow: hidden; }
   .btn-directional:before {
     left: auto;
     right: 10px;
     z-index: 2;
-    line-height: 2.4; }
+    line-height: 4; }
   .btn-directional:after {
     width: 30%;
     height: 200%;
@@ -5812,6 +5813,7 @@ a {
     right: 0;
     top: 0;
     margin: -5px 0 0 -5px;
+    pointer-events: none;
     -webkit-transform-origin: 0 0;
     -moz-transform-origin: 0 0;
     -ms-transform-origin: 0 0;

static/img/codeweek-logo.jpg

@@ -10,8 +10,8 @@ var Codeweek = window.Codeweek || {};
 		map,
 		markers = {},
 		place,
-		placeinfowindow = null;
-
+		placeinfowindow = null,
+		overlapSpiderifier = null;
 
 	function createMap(events, lat, lng, zoomVal) {
 		var markerData = JSON.parse(events),
@@ -34,6 +34,8 @@ var Codeweek = window.Codeweek || {};
 					position: google.maps.ControlPosition.RIGHT_BOTTOM
 				}
 			});
+		overlapSpiderifier = new OverlappingMarkerSpiderfier(map,
+			{markersWontMove: true, markersWontHide: true, keepSpiderfied: true, circleSpiralSwitchover: 5});
 		placeinfowindow = new google.maps.InfoWindow({
 			content: "loading..."
 		});
@@ -96,34 +98,42 @@ var Codeweek = window.Codeweek || {};
 			marker = new google.maps.Marker({
 				position: myLatLng,
 				map: map,
-				title: markTitle
+				title: markTitle,
+				description: markDesc,
+				image: markImg,
+				url: markUrl
 			});
 
-		google.maps.event.addListener(marker, 'click', function () {
+		overlapSpiderifier.addListener('click', function(marker) {
 			placeinfowindow.close();
 
-			var infoWindowContent = placeinfowindow.getContent(),
+			var infoWindowContent = '',
 				buble_content = '',
-				image = '';
+				image = '',
+				description = '';
 
-			if (markImg !== "") {
-				image += '<img src="' + Codeweek.Index.media_url + markImg + '" class="img-polaroid marker-buble-img">';
+			if (marker.image !== "") {
+				image += '<img src="' + Codeweek.Index.media_url + marker.image + '" class="img-polaroid marker-buble-img">';
 			}
 
-			if (markDesc.length > 15) {
-				markDesc = markDesc.substring(0, 150) + '... ';
+			if (marker.description.length > 150) {
+				description = marker.description.substring(0, 150) + '... ';
+			} else {
+				description = marker.description;
 			}
 
-			buble_content += '<div><h4><a href="' + markUrl + '" class="map-marker">' + markTitle + '</a></h4><div>' +
+			buble_content = '<div><h4><a href="' + marker.url + '" class="map-marker">' + marker.title + '</a></h4><div>' +
 							  image +
-							  '<p style="overflow:hidden;">' + markDesc +
-							  '&nbsp;<a href="' + markUrl + '" class="map-marker"><span>More...</span></a></p>';
+							  '<p style="overflow:hidden;">' + description +
+							  '&nbsp;<a href="' + marker.url + '" class="map-marker"><span>More...</span></a></p>';
 
 
 			placeinfowindow.setContent(buble_content);
-			placeinfowindow.open(this.map, this);
+			placeinfowindow.open(marker.map, marker);
 		});
 
+		overlapSpiderifier.addMarker(marker);
+
 		return marker;
 	}
 
@@ -201,6 +211,7 @@ var Codeweek = window.Codeweek || {};
 			$('#country').html(country_name);
 	}
 
+
 	function initialize(events, lon, lan) {
 		map = createMap(events, lon, lan, 3);
 		//setAutocomplete();
@@ -239,6 +250,11 @@ var Codeweek = window.Codeweek || {};
 				document.location.hash = "!" + country_code;
 			});
 
+			$("#past-link").click(function (event) {	
+				var newUrl = $(this).attr('href') + document.location.hash;
+				$(this).attr('href', newUrl);
+			});
+
 			$("#zoomEU").click(function (event) {
 				event.preventDefault();
 

static/img/new_logo_white_tilted.png

@@ -138,10 +138,30 @@ INDEX PAGE STYLES
 	padding-left: 0.5em;
 	padding-right: 0.5em;
 }
+
 #showcountries{
 	background-color: $whitesmoke;
 	padding-bottom: 25px;
 }
+
+#past-events{
+	position: absolute;
+	top: 0;
+	right: 0;
+	padding-top: 15px;
+	padding-bottom: 15px;
+	padding-left: 30px;
+	padding-right: 25px;
+	z-index: 0;
+	border-style: solid;
+	border-color: $primary-color;
+	border-width: 0px 0px 2px 2px;
+	background-color: $whitesmoke;
+	background: rgba($whitesmoke, 0.8);
+	font-size: 14px;
+	@include border-radius(15px);
+}
+
 .country-link {
 	margin: 1em 0;
 	height: 80px;
@@ -427,6 +447,10 @@ ABOUT SITE STYLES
 			padding: 0;
 		}
 	}
+	
+}
+#codeweek-about-logo {
+	margin-bottom: 30px;
 }
 
 .supporters {