Akshay has proposed merging lp:~akshaytayal/loco-directory/bug723845 into
lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#723845 Change order on Event and Meeting pages
https://bugs.launchpad.net/bugs/723845
For more details, see:
https://code.launchpad.net/~akshaytayal/loco-directory/bug723845/+merge/52018
Change order of Column names in Events and Meeting pages.
--
https://code.launchpad.net/~akshaytayal/loco-directory/bug723845/+merge/52018
Your team loco-directory-dev is requested to review the proposed merge of
lp:~akshaytayal/loco-directory/bug723845 into lp:loco-directory.
=== modified file 'loco_directory/templates/events/team_event_list.inc.html'
--- loco_directory/templates/events/team_event_list.inc.html 2010-11-19 04:23:16 +0000
+++ loco_directory/templates/events/team_event_list.inc.html 2011-03-03 08:51:17 +0000
@@ -2,18 +2,18 @@
<table id="team_event_list" class="data_table">
<tr id="team_event_list_header">
<th class="event_name">{% trans "Event Name" %}</th>
+<th class="event_teams">{% trans "Teams" %}</th>
<th class="event_begin">{% trans "Start" %}</th>
<th class="event_end">{% trans "End" %}</th>
<th class="event_global">{% trans "Global Event" %}</th>
-<th class="event_teams">{% trans "Teams" %}</th>
</tr>
{% for team_event in team_event_list %}
<tr class="team_event_list_row {% cycle "odd" "even" %}">
<td class="event_name"><a title="{% trans "more information about this event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a></td>
<td class="event_begin">{{team_event.local_date_begin|date}} {{ team_event.local_date_begin|date:"H:i T"}}</td>
<td class="event_end">{{team_event.local_date_end|date}} {{ team_event.local_date_end|date:"H:i T"}}</td>
+<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>
<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>
-<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>
</tr>
{% endfor %}
</table>
=== modified file 'loco_directory/templates/meetings/team_meeting_list.inc.html'
--- loco_directory/templates/meetings/team_meeting_list.inc.html 2010-12-06 01:37:43 +0000
+++ loco_directory/templates/meetings/team_meeting_list.inc.html 2011-03-03 08:51:17 +0000
@@ -2,16 +2,16 @@
<table id="team_meeting_list" class="data_table">
<tr id="team_meeting_list_header">
<th class="meeting_name">{% trans "Meeting Name" %}</th>
+<th class="event_teams">{% trans "Teams" %}</th>
<th class="meeting_begin">{% trans "Start" %}</th>
<th class="meeting_end">{% trans "End" %}</th>
-<th class="event_teams">{% trans "Teams" %}</th>
</tr>
{% for team_meeting in team_meeting_list %}
<tr class="team_meeting_list_row {% cycle "odd" "even" %}">
<td class="meeting_name"><a title="{% trans "more information about this meeting" %}" href="{{ team_meeting.get_absolute_url }}">{{ team_meeting.name }}</a></td>
+<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>
<td class="meeting_begin">{{team_meeting.date_begin|date}} {{ team_meeting.date_begin|date:"H:i T"}}</td>
<td class="meeting_end">{{team_meeting.date_end|date}} {{ team_meeting.date_end|date:"H:i T"}}</td>
-<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>
</tr>
{% endfor %}
</table>
_______________________________________________
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
