Merge lp:~mhall119/loco-team-portal/event-list-as-table into lp:loco-team-portal

[Michael Hall]

Replace lists with tables for displaying upcoming events

[lp:~mhall119/loco-team-portal/event-list-as-table]

111. By Michael Hall on 2010-04-26

Remove misplaced /

[Daniel Holbach (dholbach)]

Good work!

review: Approve

=== modified file 'loco_directory/media/css/events.css'
--- loco_directory/media/css/events.css	2010-04-07 00:24:48 +0000
+++ loco_directory/media/css/events.css	2010-04-26 16:45:34 +0000
@@ -10,6 +10,37 @@
   font-weight: bold;
 }
 
+#team_event_list {
+	width: 80%;
+}
+
+#global_event_list {
+	width: 60%;
+}
+
+#team_event_list TH {
+	white-space: nowrap;
+}
+
+#global_event_list .odd, #team_event_list .odd {
+	background-color: #fcf7e6;
+}
+#global_event_list .even, #team_event_list .even {
+	background-color: #ffffff;
+}
+#team_event_list TD, #global_event_list TD {
+	text-align: center;
+	white-space: nowrap;
+}
+#team_event_list TH.event_name, #global_event_list TH.event_name {
+	text-align: left;
+	white-space: normal;
+}
+#team_event_list TD.event_name, #global_event_list TD.event_name {
+	text-align: left;
+	white-space: normal;
+}
+
 #global-event-attending-teamevents li.col_left {
     float: left;
 	width: 50%;

=== modified file 'loco_directory/templates/events/global_event_list.inc.html'
--- loco_directory/templates/events/global_event_list.inc.html	2010-03-20 11:47:47 +0000
+++ loco_directory/templates/events/global_event_list.inc.html	2010-04-26 16:45:34 +0000
@@ -1,14 +1,19 @@
 {% load i18n %}
-<table width="100%">
-<tr>
-<td width="100%" valign="top" class="col2_container">
-<ul>
+<table id="global_event_list">
+<tr id="global_event_list_header">
+<th class="event_name">{% trans "Event name" %}</th>
+<th class="event_begin">{% trans "Start" %}</th>
+<th class="event_end">{% trans "End" %}</th>
+<th class="event_tems">{% trans "Team Events" %}</th>
+</tr>
 {% for global_event in global_event_list %}
-<li class="{% cycle 'col_left' 'col_right'%}"><a href="{{global_event.get_absolute_url }}">{{ global_event.name }}</a> {% trans "starts on: " %}{{ global_event.date_begin|date}} ({{global_event.teamevent_set.all.count}} {% trans "team events attend." %})</li>
+<tr class="global_event_list_row {% cycle "odd" "even" %}">
+<td class="event_name"><a title="{% trans "more information about this event" %}" href="{{ global_event.get_absolute_url }}">{{ global_event.name }}</a></td>
+<td class="event_begin">{{global_event.date_begin|date}}</td>
+<td class="event_end">{{global_event.date_end|date}}</td>
+<td class="event_teams">{{global_event.teamevent_set.all.count}}</td>
+</tr>
 {% endfor %}
-</ul>
-</td>
-</tr>
 </table>
 
 

=== modified file 'loco_directory/templates/events/team_event_list.inc.html'
--- loco_directory/templates/events/team_event_list.inc.html	2010-03-23 11:16:45 +0000
+++ loco_directory/templates/events/team_event_list.inc.html	2010-04-26 16:45:34 +0000
@@ -1,14 +1,21 @@
 {% load i18n %}
-<table width="100%">
-<tr>
-<td width="100%" valign="top" class="col2_container">
-<ul>
+<table id="team_event_list">
+<tr id="team_event_list_header">
+<th class="event_name">{% trans "Event name" %}</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 %}
-<li class="{% cycle 'col_left' 'col_right'%}"><a title="{% trans "more information about this event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a> {% trans "starts on: " %}{{ team_event.date_begin|date}} ({% for team in team_event.teams.all %}<a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{team.lp_name}}</a>{% if not forloop.last %},{% endif %}{% endfor %})</li>
+<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.date_begin|date}} {{ team_event.date_begin|date:"H:i T"}}</td>
+<td class="event_end">{{team_event.date_end|date}} {{ team_event.date_end|date:"H:i T"}}</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.lp_name}}</a>{% if not forloop.last %}<br/>{% endif %}{% endfor %}</td>
+</tr>
 {% endfor %}
-</ul>
-</td>
-</tr>
 </table>