LoCo Team Portal

Merge lp:~cjohnston/loco-team-portal/global-event-date into lp:loco-team-portal

  1. global-event-date
  2. Merge into 0.2
Proposed by Chris Johnston
Status: Merged
Merged at revision: 350
Proposed branch: lp:~cjohnston/loco-team-portal/global-event-date
Merge into: lp:loco-team-portal
Diff against target: 30 lines (+3/-3)
1 file modified
loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html (+3/-3)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/global-event-date
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+44686@code.launchpad.net

Description of the change

Adds a date to the team events on a global event page. Most useful for events like Ubuntu Hours where the global event spans a year. Will allow users to quickly see relevant team events vs events in the past.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html'
2--- loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html 2010-11-12 01:35:17 +0000
3+++ loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html 2010-12-25 03:46:09 +0000
4@@ -7,7 +7,7 @@
5 <ul>
6 {% for team_event in global_event_object.teamevent_set.all %}{% ifequal country team_event.venue.country %}
7 <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %}">
8- <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>{% for team in team_event.teams.all %}{% if team_event.venue.city %}, {{ team_event.venue.city }}{% endif %} - <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}
9+ <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>{% for team in team_event.teams.all %}{% if team_event.venue.city %}, {{ team_event.venue.city }}{% endif %} - <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a> - {{ team_event.local_date_begin|date:"D, d N" }}{% endfor %}
10 </li>
11 {% endifequal %}{% endfor %}
12 </ul>
13@@ -22,7 +22,7 @@
14 <ul>
15 {% for team_event in global_event_object.teamevent_set.all %}{% ifequal country team_event.venue.country %}
16 <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %}</li>">
17- <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>{% for team in team_event.teams.all %}{% if team_event.venue.city %}, {{ team_event.venue.city }}{% endif %} - <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}
18+ <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>{% for team in team_event.teams.all %}{% if team_event.venue.city %}, {{ team_event.venue.city }}{% endif %} - <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a> - {{ team_event.local_date_begin|date:"D, d N" }}{% endfor %}
19 </li>
20 {% endifequal %}{% endfor %}
21 </ul>
22@@ -35,7 +35,7 @@
23 <ul>
24 {% for team_event in events_without_venue %}
25 <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %}">
26- <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>{% for team in team_event.teams.all %}{% if team_event.venue.city %}, {{ team_event.venue.city }}{% endif %} - <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}
27+ <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>{% for team in team_event.teams.all %}{% if team_event.venue.city %}, {{ team_event.venue.city }}{% endif %} - <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a> - {{ team_event.local_date_begin|date:"D, d N" }}{% endfor %}
28 </li>
29 {% endfor %}
30 </ul>

Subscribers

People subscribed via source and target branches