Chris Johnston has proposed merging
lp:~chrisjohnston/loco-directory/global-event-date into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
For more details, see:
https://code.launchpad.net/~chrisjohnston/loco-directory/global-event-date/+merge/44686
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.
--
https://code.launchpad.net/~chrisjohnston/loco-directory/global-event-date/+merge/44686
Your team loco-directory-dev is requested to review the proposed merge of
lp:~chrisjohnston/loco-directory/global-event-date into lp:loco-directory.
=== 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-11-12 01:35:17 +0000
+++ loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html 2010-12-25 03:46:09 +0000
@@ -7,7 +7,7 @@
<ul>
{% 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 %}">
- <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 %}
+ <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 %}
</li>
{% endifequal %}{% endfor %}
</ul>
@@ -22,7 +22,7 @@
<ul>
{% 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 %}</li>">
- <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 %}
+ <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 %}
</li>
{% endifequal %}{% endfor %}
</ul>
@@ -35,7 +35,7 @@
<ul>
{% for team_event in events_without_venue %}
<li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %}">
- <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 %}
+ <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 %}
</li>
{% endfor %}
</ul>
_______________________________________________
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
