Merge lp:~cjohnston/loco-team-portal/bugfix-lp-539929 into lp:loco-team-portal

[Chris Johnston]

Changes the list of upcoming events on the team page to a list and adds the start date

[Daniel Holbach (dholbach)]

Can you maybe try to use a bit of indentation? That'd make it a bit easier to read. As far as I can see the nesting of <li> tags is broken (opened in for loop, closed outside of it).

The translators comment seems to refer to "in". Is that still in there somewhere? Does it make sense to have this translated anyway? What about languages where the word ordering changes?

Would it make sense to pull out the template code that generates the link title and stuff it into the model?

[Daniel Holbach (dholbach)]

review: Needs Fixing

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2010-03-16 21:46:16 +0000
+++ loco_directory/templates/teams/team_detail.html	2010-03-21 04:27:26 +0000
@@ -97,12 +97,12 @@
         </tr>
 		<tr>
           <th scope="row"><label>{% trans "Upcoming Events:" %}</label></th>
-		  <td>{% if team.teamevent_set.next_5_events %}
+		  <td><ul>{% if team.teamevent_set.next_5_events %}
 				  {% for team_event in team.teamevent_set.next_5_events %}
 				  {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %}
-				  <a title="{% if team_event.venue %}{% blocktrans with team_event.date_begin|date:"M d" as start_date and team_event.venue.city as city %}{{start_date}} in {{city}}{% endblocktrans %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{% url team-event-detail team_event.id %}">{{ team_event.name }}</a>{% if not forloop.last %},{% endif %} 
-				  {% endfor %} (<a href="{% url team-event-list team.lp_name %}">{% trans "Show detailed Event List" %}</a>)
-				  {% else %}{% trans "None Specified" %}{% endif %}</td>
+				  <li><a title="{% if team_event.venue %}{% blocktrans with team_event.date_begin|date:"M d" as start_date and team_event.venue.city as city %}{{start_date}} in {{city}}{% endblocktrans %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{% url team-event-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on: " %}{{ team_event.date_begin|date}} 
+				  {% endfor %}</li><li><a href="{% url team-event-list team.lp_name %}">{% trans "Show detailed Event List" %}</a></li>
+				  {% else %}{% trans "None Specified" %}{% endif %}</ul></td>
         </tr>
 
       </table>