Ronnie has proposed merging lp:~ronnie.vd.c/loco-directory/table-style into
lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
Bug #644411 in loco-directory: "Making tables better"
https://bugs.launchpad.net/loco-directory/+bug/644411
For more details, see:
https://code.launchpad.net/~ronnie.vd.c/loco-directory/table-style/+merge/56758
Added Form styling for data tables
--
https://code.launchpad.net/~ronnie.vd.c/loco-directory/table-style/+merge/56758
Your team loco-directory-dev is requested to review the proposed merge of
lp:~ronnie.vd.c/loco-directory/table-style into lp:loco-directory.
=== modified file 'loco_directory/media/css/newstyle.css'
--- loco_directory/media/css/newstyle.css 2011-03-15 13:08:01 +0000
+++ loco_directory/media/css/newstyle.css 2011-04-07 13:18:05 +0000
@@ -24,6 +24,10 @@
vertical-align: top;
}
+td.no-wrap {
+ white-space: nowrap;
+}
+
label {
font-weight: bold;
white-space: nowrap;
=== modified file 'loco_directory/templates/events/global_event_list.inc.html'
--- loco_directory/templates/events/global_event_list.inc.html 2010-06-18 02:48:47 +0000
+++ loco_directory/templates/events/global_event_list.inc.html 2011-04-07 13:18:05 +0000
@@ -1,19 +1,27 @@
{% load i18n %}
-<table id="global_event_list" class="data_table">
-<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 %}
-<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 %}
+<table id="global_event_list" class="basic wide">
+ <thead>
+ <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>
+ </thead>
+ <tfoot>
+ </tfoot>
+ <tbody>
+ {% for global_event in global_event_list %}
+ <tr>
+ <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 no-wrap">{{global_event.date_begin|date}}</td>
+ <td class="event_end no-wrap">{{global_event.date_end|date}}</td>
+ <td class="event_teams no-wrap">{{global_event.teamevent_set.all.count}}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
</table>
=== modified file 'loco_directory/templates/events/team_event_detail_attendees.inc.html'
--- loco_directory/templates/events/team_event_detail_attendees.inc.html 2011-03-16 17:20:55 +0000
+++ loco_directory/templates/events/team_event_detail_attendees.inc.html 2011-04-07 13:18:05 +0000
@@ -1,41 +1,60 @@
{% load i18n %}
-
<table id="team-event-totals" class="data_table">
- <tr>
- <td colspan="2">
- {% if user.is_authenticated %}
- {% if user_is_attending %}
- <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Change your Registration Status' %}</a>
+ <thead>
+ <tr>
+ <td colspan="2">
+ {% if user.is_authenticated %}
+ {% if user_is_attending %}
+ <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Change your Registration Status' %}</a>
+ {% else %}
+ <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Register for this Event' %}</a>
+ {% endif %}
{% else %}
<a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Register for this Event' %}</a>
{% endif %}
- {% else %}
- <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Register for this Event' %}</a>
- {% endif %}
- </td>
- </tr>
- <tr>
- <th class="form-item-label">{% trans 'Confirmed attending:' %} {{ team_event_object.total_attending }}</th>
- <th class="form-item-label">{% trans 'Maybe attending:' %} {{ team_event_object.total_maybe_attending }}</th>
- </tr>
+ </td>
+ </tr>
+ </thead>
+ <tfoot>
+ </tfoot>
+ <tbody>
+ <tr>
+ <th class="form-item-label">{% trans 'Confirmed attending:' %} {{ team_event_object.total_attending }}</th>
+ <th class="form-item-label">{% trans 'Maybe attending:' %} {{ team_event_object.total_maybe_attending }}</th>
+ </tr>
+ </tbody>
</table>
{% if team_event_object.attendee_set.all %}
-<table id="team-event-attendees" class="data_table">
- <tr>
- <th></th>
- <th>{% trans "Attendees" %}</th>
- <th>{% trans "Registration Status" %}</th>
- <th>{% trans "Additional Guests" %}</th>
- </tr>
- {% for registration in team_event_object.attendee_set.all %}
- <tr class="team_event_list_row {% cycle "odd" "even" %}">
- <td align="center" class="attendee-mugshot"><a href="https://launchpad.net/~{{registration.attendee_profile.user.username}}"; >{% if registration.attendee_profile.mugshot %}<img src="{{registration.attendee_profile.mugshot}}" title="{{registration.attendee_profile.realname}}" valign="top" width="32" height="32">{% endif %}</a></td>
- <td align="center" class="attendee-cell"><a href="https://launchpad.net/~{{registration.attendee_profile.user.username}}"; >{{registration.attendee_profile.realname}}</a></td>
- <td align="center" class="attendee-cell">{{registration.get_promise_display}}</td>
- <td align="center" class="attendee-cell">{{registration.guests}}</td>
- </tr>
- {% endfor %}
+<table id="team-event-attendees" class="basic">
+ <thead>
+ <tr>
+ <th></th>
+ <th>{% trans "Attendees" %}</th>
+ <th>{% trans "Registration Status" %}</th>
+ <th>{% trans "Additional Guests" %}</th>
+ </tr>
+ </thead>
+ <tfoot>
+ </tfoot>
+ <tbody>
+ {% for registration in team_event_object.attendee_set.all %}
+ <tr class="team_event_list_row {% cycle "odd" "even" %}">
+ <td align="center" class="attendee-mugshot">
+ <a href="https://launchpad.net/~{{registration.attendee_profile.user.username}}"; >
+ {% if registration.attendee_profile.mugshot %}
+ <img src="{{registration.attendee_profile.mugshot}}" title="{{registration.attendee_profile.realname}}" valign="top" width="32" height="32">
+ {% endif %}
+ </a>
+ </td>
+ <td align="center" class="attendee-cell">
+ <a href="https://launchpad.net/~{{registration.attendee_profile.user.username}}"; >{{registration.attendee_profile.realname}}</a>
+ </td>
+ <td align="center" class="attendee-cell">{{registration.get_promise_display}}</td>
+ <td align="center" class="attendee-cell">{{registration.guests}}</td>
+ </tr>
+ {% endfor %}
+ </tibdy>
</table>
{% endif %}
=== modified file 'loco_directory/templates/events/team_event_list.inc.html'
--- loco_directory/templates/events/team_event_list.inc.html 2011-03-04 04:52:19 +0000
+++ loco_directory/templates/events/team_event_list.inc.html 2011-04-07 13:18:05 +0000
@@ -1,21 +1,42 @@
{% load i18n %}
-<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>
-</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_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_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_global">{% if team_event.global_event %}<a href="{{ team_event.global_event.get_absolute_url }}">{{ team_event.global_event.name}}</a>{% else %}--{% endif %}</td>
-</tr>
-{% endfor %}
+<table id="team_event_list" class="basic wide">
+ <thead>
+ <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>
+ </tr>
+ </thead>
+ <tfoot>
+ </tfoot>
+ <tbody>
+ {% for team_event in team_event_list %}
+ <tr>
+ <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_teams no-wrap">
+ {% 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_begin no-wrap">{{team_event.local_date_begin|date}} {{ team_event.local_date_begin|date:"H:i T"}}</td>
+ <td class="event_end no-wrap">{{team_event.local_date_end|date}} {{ team_event.local_date_end|date:"H:i T"}}</td>
+ <td class="event_global no-wrap">
+ {% if team_event.global_event %}
+ <a href="{{ team_event.global_event.get_absolute_url }}">{{ team_event.global_event.name}}</a>
+ {% else %}
+ --
+ {% endif %}
+ </td>
+ </tr>
+ {% endfor %}
+ </tbody>
</table>
=== modified file 'loco_directory/templates/meetings/team_meeting_list.inc.html'
--- loco_directory/templates/meetings/team_meeting_list.inc.html 2011-03-03 00:44:57 +0000
+++ loco_directory/templates/meetings/team_meeting_list.inc.html 2011-04-07 13:18:05 +0000
@@ -1,19 +1,34 @@
{% load i18n %}
-<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>
-</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>
-</tr>
-{% endfor %}
+<table id="team_meeting_list" class="basic wide">
+ <thead>
+ <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>
+ </tr>
+ </thead>
+ <tfoot>
+ </tfoot>
+ <tbody>
+ {% for team_meeting in team_meeting_list %}
+ <tr>
+ <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 no-wrap">
+ {% 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 no-wrap">{{team_meeting.date_begin|date}} {{ team_meeting.date_begin|date:"H:i T"}}</td>
+ <td class="meeting_end no-wrap">{{team_meeting.date_end|date}} {{ team_meeting.date_end|date:"H:i T"}}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
</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
