Merge lp:~daker/loco-team-portal/fix.1164298 into lp:loco-team-portal

Proposed by Adnane Belmadiaf
Status: Merged
Approved by: Chris Johnston
Approved revision: 632
Merged at revision: 632
Proposed branch: lp:~daker/loco-team-portal/fix.1164298
Merge into: lp:loco-team-portal
Diff against target: 33 lines (+4/-4)
1 file modified
loco_directory/templates/profiles/details.html (+4/-4)
To merge this branch: bzr merge lp:~daker/loco-team-portal/fix.1164298
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+157240@code.launchpad.net

Commit message

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/templates/profiles/details.html'
2--- loco_directory/templates/profiles/details.html 2013-01-01 12:52:39 +0000
3+++ loco_directory/templates/profiles/details.html 2013-04-04 21:50:26 +0000
4@@ -25,9 +25,9 @@
5 <h4 class="title">{% trans "Meetings" %}</h4>
6 <ul class="indent">
7 {% if team.teammeeting_set.next_3_meetings %}
8- {% for team_metting in team.teammeeting_set.next_3_meetings %}
9+ {% for team_meeting in team.teammeeting_set.next_3_meetings %}
10 <li>
11- <a title="{{ team_metting.name }}" href="{{ team_metting.get_absolute_url }}">{{ team_metting.name }} {% trans "on" %} {{ team_metting.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_metting.local_date_begin|date:"H:i T" }}</a>
12+ <a title="{{ team_meeting.name }}" href="{{ team_meeting.get_absolute_url }}">{{ team_meeting.name }} {% trans "on" %} {{ team_meeting.local_date_begin|date:"l, d N Y" }} {% trans "at" %} {{ team_meeting.local_date_begin|date:"H:i T" }}</a>
13 </li>
14 {% endfor %}
15 {% else %}
16@@ -40,7 +40,7 @@
17 {% if team.teamevent_set.next_3_events %}
18 {% for team_event in team.teamevent_set.next_3_events %}
19 <li>
20- <a title="{% if team_event.venue %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }} {% trans "on" %} {{ team_event.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.local_date_begin|date:"H:i T" }}</a>
21+ <a title="{% if team_event.venue %}{% else %}{{ team_event.date_begin|date:"M d" }}{% endif %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }} {% trans "on" %} {{ team_event.local_date_begin|date:"l, d N Y" }} {% trans "at" %} {{ team_event.local_date_begin|date:"H:i T" }}</a>
22 </li>
23 {% endfor %}
24 {% else %}
25@@ -54,7 +54,7 @@
26 {% if user == profile.user %}
27 <h2 class="title">{% trans "Events you will be attending" %}</h2>
28 {% for event in my_events %}
29- <a href="{% url team-event-detail event.first_team.lp_name event.id %}" title="{% if event.venue %}{% else %}{{event.date_begin|date:"M d"}}{% endif %}" class="event-meetings">
30+ <a href="{{ event.get_absolute_url }}" title="{{ team_event.name }}" class="event-meetings">
31 <span class="title">{{ event.name }}</span>
32 <small>{{ event.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ event.local_date_begin|date:"H:i T" }}</small>
33 <p>{{ event.description }}</p>

Subscribers

People subscribed via source and target branches