LoCo Team Portal

Merge lp:~akshaytayal/loco-team-portal/bug723845 into lp:loco-team-portal

  1. bug723845
  2. Merge into 0.2
Proposed by Akshay
Status: Merged
Approved by: Chris Johnston
Approved revision: 412
Merged at revision: 415
Proposed branch: lp:~akshaytayal/loco-team-portal/bug723845
Merge into: lp:loco-team-portal
Diff against target: 47 lines (+4/-4)
2 files modified
loco_directory/templates/events/team_event_list.inc.html (+2/-2)
loco_directory/templates/meetings/team_meeting_list.inc.html (+2/-2)
To merge this branch: bzr merge lp:~akshaytayal/loco-team-portal/bug723845
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+52018@code.launchpad.net

Description of the change

Change order of Column names in Events and Meeting pages.

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

The meetings page looks good.. The order isn't correct on the events page.

review: Needs Fixing
lp:~akshaytayal/loco-team-portal/bug723845 updated
412. By Akshay

Again change of order on Event page only

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/events/team_event_list.inc.html'
2--- loco_directory/templates/events/team_event_list.inc.html 2010-11-19 04:23:16 +0000
3+++ loco_directory/templates/events/team_event_list.inc.html 2011-03-04 04:56:24 +0000
4@@ -2,18 +2,18 @@
5 <table id="team_event_list" class="data_table">
6 <tr id="team_event_list_header">
7 <th class="event_name">{% trans "Event Name" %}</th>
8+<th class="event_teams">{% trans "Teams" %}</th>
9 <th class="event_begin">{% trans "Start" %}</th>
10 <th class="event_end">{% trans "End" %}</th>
11 <th class="event_global">{% trans "Global Event" %}</th>
12-<th class="event_teams">{% trans "Teams" %}</th>
13 </tr>
14 {% for team_event in team_event_list %}
15 <tr class="team_event_list_row {% cycle "odd" "even" %}">
16 <td class="event_name"><a title="{% trans "more information about this event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a></td>
17+<td class="event_teams">{% for team in team_event.teams.all %}<a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% if not forloop.last %}<br/>{% endif %}{% endfor %}</td>
18 <td class="event_begin">{{team_event.local_date_begin|date}} {{ team_event.local_date_begin|date:"H:i T"}}</td>
19 <td class="event_end">{{team_event.local_date_end|date}} {{ team_event.local_date_end|date:"H:i T"}}</td>
20 <td class="event_global">{% if team_event.global_event %}<a href="{{ team_event.global_event.get_absolute_url }}">{{ team_event.global_event.name}}</a>{% else %}--{% endif %}</td>
21-<td class="event_teams">{% for team in team_event.teams.all %}<a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% if not forloop.last %}<br/>{% endif %}{% endfor %}</td>
22 </tr>
23 {% endfor %}
24 </table>
25
26=== modified file 'loco_directory/templates/meetings/team_meeting_list.inc.html'
27--- loco_directory/templates/meetings/team_meeting_list.inc.html 2010-12-06 01:37:43 +0000
28+++ loco_directory/templates/meetings/team_meeting_list.inc.html 2011-03-04 04:56:24 +0000
29@@ -2,16 +2,16 @@
30 <table id="team_meeting_list" class="data_table">
31 <tr id="team_meeting_list_header">
32 <th class="meeting_name">{% trans "Meeting Name" %}</th>
33+<th class="event_teams">{% trans "Teams" %}</th>
34 <th class="meeting_begin">{% trans "Start" %}</th>
35 <th class="meeting_end">{% trans "End" %}</th>
36-<th class="event_teams">{% trans "Teams" %}</th>
37 </tr>
38 {% for team_meeting in team_meeting_list %}
39 <tr class="team_meeting_list_row {% cycle "odd" "even" %}">
40 <td class="meeting_name"><a title="{% trans "more information about this meeting" %}" href="{{ team_meeting.get_absolute_url }}">{{ team_meeting.name }}</a></td>
41+<td class="meeting_teams">{% for team in team_meeting.teams.all %}<a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% if not forloop.last %}<br/>{% endif %}{% endfor %}</td>
42 <td class="meeting_begin">{{team_meeting.date_begin|date}} {{ team_meeting.date_begin|date:"H:i T"}}</td>
43 <td class="meeting_end">{{team_meeting.date_end|date}} {{ team_meeting.date_end|date:"H:i T"}}</td>
44-<td class="meeting_teams">{% for team in team_meeting.teams.all %}<a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% if not forloop.last %}<br/>{% endif %}{% endfor %}</td>
45 </tr>
46 {% endfor %}
47 </table>

Subscribers

People subscribed via source and target branches