Merge pull request #268 from ialja/master

show ambassadors from your country on index

Author: goranche

static/scss/_base.scss

@@ -225,6 +225,7 @@ footer {
 	background-color: $dark-blue;
 	color: $silver;
 	padding-top: 20px;
+	margin-top: 20px;
 
 	a {
 		color: $white;

web/processors/user.py

@@ -9,11 +9,15 @@ def get_user_profile(user_id):
     user = User.objects.get(id=user_id)
     return user.profile
 
-def get_ambassadors():
+def get_ambassadors(country_code=None):
 	ambassadors = []
-	aambassadors = User.objects.filter(groups__name='ambassadors').order_by('date_joined')
-	for ambassador in aambassadors:
-		ambassadors.append(ambassador.profile)
+	all_ambassadors = User.objects.filter(groups__name='ambassadors').order_by('date_joined')
+	for ambassador in all_ambassadors:
+		if country_code:
+			if ambassador.profile.country == country_code:
+				ambassadors.append(ambassador.profile)
+		else:
+			ambassadors.append(ambassador.profile)
 	return ambassadors
 
 def get_ambassadors_for_countries():

web/templates/pages/index.html

@@ -1,6 +1,7 @@
 {% extends 'base.html' %}
 {% load static %}
 {% load compress %}
+{% load avatar_tags %}
 {% block title %}- Map of Events{% endblock title %}
 
 {% block social %}
@@ -62,11 +63,22 @@
 			</div>
 
 			<hr />
-
 			<div class="how-to">
-				<a href="{% url 'web.guide' %}" target="_blank" class="btn btn-sm">
-					How to organize your own event?
+				<p><strong>Get involved:</strong>
+				<a href="{% url 'web.guide' %}" class="btn btn-primary btn-sm">
+					Organize or support events in your city
+				</a></p>
+				<p>or 
+				<a href="{% url 'web.ambassadors' %}{% if country %}#{{ country.country_name }}{% endif %}">
+					contact your <strong>EU Code Week Ambassador{% if ambassadors|length > 1 %}s{% endif %}</strong>
+					{% if country %} 
+						{% for ambassador in ambassadors %}
+							{% avatar ambassador.user.username 45 %} 
+						{% endfor %} 
+					{% endif %} 
 				</a>
+				</p>
+
 			</div>
 		</div>
 	</div>

web/views/events.py

@@ -24,6 +24,7 @@
 from web.processors.event import reject_event_status
 from web.processors.event import create_or_update_event
 from web.processors.user import update_user_email
+from web.processors.user import get_ambassadors
 from web.processors.event import get_client_ip
 from web.processors.event import get_lat_lon_from_user_ip
 from web.processors.event import list_countries
@@ -62,16 +63,19 @@ def index(request):
 		lan_lon = get_lat_lon_from_user_ip(user_ip)
 	except GeoIPException:
 		lan_lon = (58.08695, 5.58121)
-
+	
+	ambassadors = get_ambassadors(country['country_code'])
 	all_countries = list_countries()
+	
 	return render_to_response(
 		template, {
 			'map_events': map_events,
 			'lan_lon': lan_lon,
 			'country': country,
 			# all_countries minus two CUSTOM_COUNTRY_ENTRIES
 			'all_countries': all_countries[2:],
-			'past': past
+			'past': past,
+			'ambassadors': ambassadors,
 		},
 		context_instance=RequestContext(request))