Michael Hall has proposed merging lp:~mhall119/loco-directory/607638 into
lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
CSS fixes to dholbach's branch, plus using colored/uncolored icons to designate
future and past events
--
https://code.launchpad.net/~mhall119/loco-directory/607638/+merge/32835
Your team loco-directory-dev is requested to review the proposed merge of
lp:~mhall119/loco-directory/607638 into lp:loco-directory.
=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py 2010-07-20 04:30:37 +0000
+++ loco_directory/events/models.py 2010-08-17 02:31:39 +0000
@@ -43,6 +43,8 @@
END:VEVENT
''' % {'id':self.id, 'dtstart':dtstart, 'dtend':dtend, 'eventname':self.name, 'description': self.description}
+ def is_past(self):
+ return self.date_end > datetime.datetime.today()
class GlobalEventManager(models.Manager):
""" manager for a global event """
=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py 2010-08-05 16:34:30 +0000
+++ loco_directory/events/views.py 2010-08-17 02:31:39 +0000
@@ -7,7 +7,7 @@
from events.models import TeamEvent
from events.models import GlobalEvent
-from teams.models import Team
+from teams.models import Team, Country, Continent
from events.models import Attendee
from forms import TeamEventForm
@@ -17,7 +17,7 @@
from forms import EventSearchForm
from django.db.models import Q
-from common.utils import redirect
+from common.utils import redirect, simple_iterator
from common import launchpad
import datetime
@@ -358,10 +358,31 @@
add_team_event = (request.user and request.user.is_authenticated() and \
request.user.groups.exclude(name__exact='ubuntu-lococouncil'))
is_on_lc = launchpad.is_user_on_loco_council(request.user)
+
+ events_without_venue = global_event_object.teamevent_set.filter(venue__isnull=True)
+ events_without_continent = global_event_object.teamevent_set.filter(venue__country__continents__isnull=True)
+ country_ids = [a.venue.country.id for a in global_event_object.teamevent_set.filter(venue__isnull=False,
+ venue__country__continents__isnull=False)]
+ country_without_continents_ids = [a.venue.country.id \
+ for a in global_event_object.teamevent_set.filter(venue__isnull=False,
+ venue__country__continents__isnull=True)]
+
+ countries = Country.objects.filter(id__in=country_ids).order_by('name')
+ countries_without_continents = Country.objects.filter(id__in=country_without_continents_ids).order_by('name')
+ continent_ids = []
+ for continent_list in map(lambda a: a.continents.all(), countries):
+ continent_ids += [continent.id for continent in continent_list]
+ continents = Continent.objects.filter(id__in=continent_ids).order_by('name')
+
context = {
'global_event_object': global_event_object,
'add_team_event': add_team_event,
- 'user_is_on_lc': is_on_lc,
+ 'events_without_venue': events_without_venue,
+ 'user_is_on_lc': is_on_lc,
+ 'continents': continents,
+ 'countries': countries,
+ 'countries_without_continents': countries_without_continents,
+ 'colcycle' : simple_iterator('col_left', 'col_right'),
}
return render_to_response('events/global_event_detail.html',
context, RequestContext(request))
=== modified file 'loco_directory/media/css/newstyle.css'
--- loco_directory/media/css/newstyle.css 2010-07-31 17:15:03 +0000
+++ loco_directory/media/css/newstyle.css 2010-08-17 02:31:39 +0000
@@ -27,20 +27,20 @@
#main-content {
margin-right: 20px;
}
- #main-content li.col_left {
+ li.col_left {
float: left;
width: 45%;
clear: left;
}
- #main-content li.col_right {
+ li.col_right {
float: right;
width: 45%;
clear: right;
}
- #main-content li.approved {
+ li.approved {
list-style-image: url(../img/approved.png);
}
- #main-content li.unapproved {
+ li.unapproved {
list-style-image: url(../img/unapproved.png);
}
#main-content br.clear {
=== modified file 'loco_directory/teams/views.py'
--- loco_directory/teams/views.py 2010-08-04 13:25:36 +0000
+++ loco_directory/teams/views.py 2010-08-17 02:31:39 +0000
@@ -68,7 +68,6 @@
"""
team_object = get_object_or_404(Team, lp_name=team_slug)
team_event_list = team_object.teamevent_set.next_events()
- print team_event_list
context = {
'team_object': team_object,
'team_event_list': team_event_list,
@@ -82,7 +81,6 @@
"""
team_object = get_object_or_404(Team, lp_name=team_slug)
team_event_list = team_object.teamevent_set.history_events()
- print team_event_list
context = {
'team_object': team_object,
'team_event_list': team_event_list,
=== modified file 'loco_directory/templates/events/global_event_detail.inc.html'
--- loco_directory/templates/events/global_event_detail.inc.html 2010-08-15 20:35:13 +0000
+++ loco_directory/templates/events/global_event_detail.inc.html 2010-08-17 02:31:39 +0000
@@ -16,8 +16,9 @@
<hr class="divide" />
{% if global_event_object.teamevent_set.all %}
-<article class="main-content alone">
-<h3>{% blocktrans with global_event_object.teamevent_set.all.count as team_count %}Attending Team Events ({{team_count}}){% endblocktrans %}</h3>
+<article id="global-event-attending" class="main-content alone">
+<h2>{% blocktrans with global_event_object.teamevent_set.all.count as team_count %}Attending Team Events ({{team_count}}){% endblocktrans %}</h2>
+<br />
{% include "events/global_event_detail_attending_teamevents.inc.html" %}
</article>
{% endif %}
=== modified file 'loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html'
--- loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html 2010-06-03 17:35:10 +0000
+++ loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html 2010-08-17 02:31:39 +0000
@@ -1,9 +1,46 @@
{% load i18n %}
{% if global_event_object.teamevent_set.all %}
-<ul id="global-event-attending-teamevents">
- {% for team_event in global_event_object.teamevent_set.all %}
- <li class="{% cycle 'col_left' 'col_right' %}"><a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a></li>
- {% endfor %}
-</ul>
+{% for continent in continents %}
+ <h3>{{ continent.name }}</h3>
+ {% for country in countries %}{% for cont in country.continents.all %}{% ifequal cont continent %}
+ <h4>{{ country.name }}</h4>
+ <ul>
+ {{colcycle.reset}}
+ {% for team_event in global_event_object.teamevent_set.all %}{% ifequal country team_event.venue.country %}
+ <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %} {{colcycle.next}}">
+ <a title="{% trans "More Information about Team Event" %}"
+ href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>
+ </li>
+ {% endifequal %}{% endfor %}
+ </ul>
+ {% endifequal %}{% endfor %}{% endfor %}
+{% endfor %}
+
+{% if countries_without_continents %}
+ <h3>{% trans "Events in countries without continents" %}</h3>
+ {% for country in countries_without_continents %}
+ <h4>{{ country.name }}</h4>
+ <ul>{{colcycle.reset}}
+ {% for team_event in global_event_object.teamevent_set.all %}{% ifequal country team_event.venue.country %}
+ <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %} {{colcycle.next}}">
+ <a title="{% trans "More Information about Team Event" %}"
+ href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>
+ </li>
+ {% endifequal %}{% endfor %}
+ </ul>
+ {% endfor %}
+{% endif %}
+
+{% if events_without_venue %}
+ <h3>{% trans "Events without venue" %}</h3>
+ <ul>{{colcycle.reset}}
+ {% for team_event in events_without_venue %}
+ <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %} {{colcycle.next}}">
+ <a title="{% trans "More Information about Team Event" %}"
+ href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>
+ </li>
+ {% endfor %}
+ </ul>
+{% endif %}
<br class="clear" />
{% endif %}
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
