This repository was archived by the owner on Sep 19, 2018. It is now read-only.
File tree Expand file tree Collapse file tree 3 files changed +29
-9
lines changed Expand file tree Collapse file tree 3 files changed +29
-9
lines changed Original file line number Diff line number Diff line change @@ -9,11 +9,15 @@ def get_user_profile(user_id):
9
9
user = User .objects .get (id = user_id )
10
10
return user .profile
11
11
12
- def get_ambassadors ():
12
+ def get_ambassadors (country_code = None ):
13
13
ambassadors = []
14
- aambassadors = User .objects .filter (groups__name = 'ambassadors' ).order_by ('date_joined' )
15
- for ambassador in aambassadors :
16
- ambassadors .append (ambassador .profile )
14
+ all_ambassadors = User .objects .filter (groups__name = 'ambassadors' ).order_by ('date_joined' )
15
+ for ambassador in all_ambassadors :
16
+ if country_code :
17
+ if ambassador .profile .country == country_code :
18
+ ambassadors .append (ambassador .profile )
19
+ else :
20
+ ambassadors .append (ambassador .profile )
17
21
return ambassadors
18
22
19
23
def get_ambassadors_for_countries ():
Original file line number Diff line number Diff line change 1
1
{% extends 'base.html' %}
2
2
{% load static %}
3
3
{% load compress %}
4
+ {% load avatar_tags %}
4
5
{% block title %}- Map of Events{% endblock title %}
5
6
6
7
{% block social %}
62
63
</ div >
63
64
64
65
< hr />
65
-
66
66
< div class ="how-to ">
67
- < a href ="{% url 'web.guide' %} " target ="_blank " class ="btn btn-sm ">
68
- How to organize your own event?
67
+ < p > < strong > Get involved:</ strong >
68
+ < a href ="{% url 'web.guide' %} " class ="btn btn-primary btn-sm ">
69
+ Organize or support events in your city
70
+ </ a > </ p >
71
+ < p > or
72
+ < a href ="{% url 'web.ambassadors' %}{% if country %}#{{ country.country_name }}{% endif %} ">
73
+ contact your < strong > EU Code Week Ambassador{% if ambassadors|length > 1 %}s{% endif %}</ strong >
74
+ {% if country %}
75
+ {% for ambassador in ambassadors %}
76
+ {% avatar ambassador.user.username 45 %}
77
+ {% endfor %}
78
+ {% endif %}
69
79
</ a >
80
+ </ p >
81
+
70
82
</ div >
71
83
</ div >
72
84
</ div >
Original file line number Diff line number Diff line change 23
23
from web .processors .event import reject_event_status
24
24
from web .processors .event import create_or_update_event
25
25
from web .processors .user import update_user_email
26
+ from web .processors .user import get_ambassadors
26
27
from web .processors .event import get_client_ip
27
28
from web .processors .event import get_lat_lon_from_user_ip
28
29
from web .processors .event import list_countries
@@ -61,16 +62,19 @@ def index(request):
61
62
lan_lon = get_lat_lon_from_user_ip (user_ip )
62
63
except GeoIPException :
63
64
lan_lon = (58.08695 , 5.58121 )
64
-
65
+
66
+ ambassadors = get_ambassadors (country ['country_code' ])
65
67
all_countries = list_countries ()
68
+
66
69
return render_to_response (
67
70
template , {
68
71
'map_events' : map_events ,
69
72
'lan_lon' : lan_lon ,
70
73
'country' : country ,
71
74
# all_countries minus two CUSTOM_COUNTRY_ENTRIES
72
75
'all_countries' : all_countries [2 :],
73
- 'past' : past
76
+ 'past' : past ,
77
+ 'ambassadors' : ambassadors ,
74
78
},
75
79
context_instance = RequestContext (request ))
76
80
You can’t perform that action at this time.
0 commit comments