LoCo Team Portal

Merge lp:~ronnie.vd.c/loco-team-portal/table-style into lp:loco-team-portal

  1. table-style
  2. Merge into 0.2
Proposed by Ronnie
Status: Merged
Approved by: Chris Johnston
Approved revision: 423
Merged at revision: 427
Proposed branch: lp:~ronnie.vd.c/loco-team-portal/table-style
Merge into: lp:loco-team-portal
Diff against target: 272 lines (+144/-77)
5 files modified
loco_directory/media/css/newstyle.css (+4/-0)
loco_directory/templates/events/global_event_list.inc.html (+23/-15)
loco_directory/templates/events/team_event_detail_attendees.inc.html (+49/-30)
loco_directory/templates/events/team_event_list.inc.html (+38/-17)
loco_directory/templates/meetings/team_meeting_list.inc.html (+30/-15)
To merge this branch: bzr merge lp:~ronnie.vd.c/loco-team-portal/table-style
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+56758@code.launchpad.net

Commit message

First the light-django-theme update should be merged
https://code.launchpad.net/~ronnie.vd.c/ubuntu-community-webthemes/django-table-style/+merge/56756

Description of the change

Added Form styling for data tables

To post a comment you must log in.
Revision history for this message
Ronnie (ronnie.vd.c) wrote :

Old light-django-theme merge crashed. new merge url:
https://code.launchpad.net/~ronnie.vd.c/ubuntu-community-webthemes/django-table-style/+merge/56763

Revision history for this message
Chris Johnston (cjohnston) wrote :

:-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/media/css/newstyle.css'
2--- loco_directory/media/css/newstyle.css 2011-03-15 13:08:01 +0000
3+++ loco_directory/media/css/newstyle.css 2011-04-07 13:18:05 +0000
4@@ -24,6 +24,10 @@
5 vertical-align: top;
6 }
7
8+td.no-wrap {
9+ white-space: nowrap;
10+}
11+
12 label {
13 font-weight: bold;
14 white-space: nowrap;
15
16=== modified file 'loco_directory/templates/events/global_event_list.inc.html'
17--- loco_directory/templates/events/global_event_list.inc.html 2010-06-18 02:48:47 +0000
18+++ loco_directory/templates/events/global_event_list.inc.html 2011-04-07 13:18:05 +0000
19@@ -1,19 +1,27 @@
20 {% load i18n %}
21-<table id="global_event_list" class="data_table">
22-<tr id="global_event_list_header">
23-<th class="event_name">{% trans "Event name" %}</th>
24-<th class="event_begin">{% trans "Start" %}</th>
25-<th class="event_end">{% trans "End" %}</th>
26-<th class="event_tems">{% trans "Team Events" %}</th>
27-</tr>
28-{% for global_event in global_event_list %}
29-<tr class="global_event_list_row {% cycle "odd" "even" %}">
30-<td class="event_name"><a title="{% trans "more information about this event" %}" href="{{ global_event.get_absolute_url }}">{{ global_event.name }}</a></td>
31-<td class="event_begin">{{global_event.date_begin|date}}</td>
32-<td class="event_end">{{global_event.date_end|date}}</td>
33-<td class="event_teams">{{global_event.teamevent_set.all.count}}</td>
34-</tr>
35-{% endfor %}
36+<table id="global_event_list" class="basic wide">
37+ <thead>
38+ <tr id="global_event_list_header">
39+ <th class="event_name">{% trans "Event name" %}</th>
40+ <th class="event_begin">{% trans "Start" %}</th>
41+ <th class="event_end">{% trans "End" %}</th>
42+ <th class="event_tems">{% trans "Team Events" %}</th>
43+ </tr>
44+ </thead>
45+ <tfoot>
46+ </tfoot>
47+ <tbody>
48+ {% for global_event in global_event_list %}
49+ <tr>
50+ <td class="event_name">
51+ <a title="{% trans "more information about this event" %}" href="{{ global_event.get_absolute_url }}">{{ global_event.name }}</a>
52+ </td>
53+ <td class="event_begin no-wrap">{{global_event.date_begin|date}}</td>
54+ <td class="event_end no-wrap">{{global_event.date_end|date}}</td>
55+ <td class="event_teams no-wrap">{{global_event.teamevent_set.all.count}}</td>
56+ </tr>
57+ {% endfor %}
58+ </tbody>
59 </table>
60
61
62
63=== modified file 'loco_directory/templates/events/team_event_detail_attendees.inc.html'
64--- loco_directory/templates/events/team_event_detail_attendees.inc.html 2011-03-16 17:20:55 +0000
65+++ loco_directory/templates/events/team_event_detail_attendees.inc.html 2011-04-07 13:18:05 +0000
66@@ -1,41 +1,60 @@
67 {% load i18n %}
68-
69 <table id="team-event-totals" class="data_table">
70- <tr>
71- <td colspan="2">
72- {% if user.is_authenticated %}
73- {% if user_is_attending %}
74- <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Change your Registration Status' %}</a>
75+ <thead>
76+ <tr>
77+ <td colspan="2">
78+ {% if user.is_authenticated %}
79+ {% if user_is_attending %}
80+ <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Change your Registration Status' %}</a>
81+ {% else %}
82+ <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Register for this Event' %}</a>
83+ {% endif %}
84 {% else %}
85 <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Register for this Event' %}</a>
86 {% endif %}
87- {% else %}
88- <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Register for this Event' %}</a>
89- {% endif %}
90- </td>
91- </tr>
92- <tr>
93- <th class="form-item-label">{% trans 'Confirmed attending:' %} {{ team_event_object.total_attending }}</th>
94- <th class="form-item-label">{% trans 'Maybe attending:' %} {{ team_event_object.total_maybe_attending }}</th>
95- </tr>
96+ </td>
97+ </tr>
98+ </thead>
99+ <tfoot>
100+ </tfoot>
101+ <tbody>
102+ <tr>
103+ <th class="form-item-label">{% trans 'Confirmed attending:' %} {{ team_event_object.total_attending }}</th>
104+ <th class="form-item-label">{% trans 'Maybe attending:' %} {{ team_event_object.total_maybe_attending }}</th>
105+ </tr>
106+ </tbody>
107 </table>
108
109 {% if team_event_object.attendee_set.all %}
110-<table id="team-event-attendees" class="data_table">
111- <tr>
112- <th></th>
113- <th>{% trans "Attendees" %}</th>
114- <th>{% trans "Registration Status" %}</th>
115- <th>{% trans "Additional Guests" %}</th>
116- </tr>
117- {% for registration in team_event_object.attendee_set.all %}
118- <tr class="team_event_list_row {% cycle "odd" "even" %}">
119- <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>
120- <td align="center" class="attendee-cell"><a href="https://launchpad.net/~{{registration.attendee_profile.user.username}}" >{{registration.attendee_profile.realname}}</a></td>
121- <td align="center" class="attendee-cell">{{registration.get_promise_display}}</td>
122- <td align="center" class="attendee-cell">{{registration.guests}}</td>
123- </tr>
124- {% endfor %}
125+<table id="team-event-attendees" class="basic">
126+ <thead>
127+ <tr>
128+ <th></th>
129+ <th>{% trans "Attendees" %}</th>
130+ <th>{% trans "Registration Status" %}</th>
131+ <th>{% trans "Additional Guests" %}</th>
132+ </tr>
133+ </thead>
134+ <tfoot>
135+ </tfoot>
136+ <tbody>
137+ {% for registration in team_event_object.attendee_set.all %}
138+ <tr class="team_event_list_row {% cycle "odd" "even" %}">
139+ <td align="center" class="attendee-mugshot">
140+ <a href="https://launchpad.net/~{{registration.attendee_profile.user.username}}" >
141+ {% if registration.attendee_profile.mugshot %}
142+ <img src="{{registration.attendee_profile.mugshot}}" title="{{registration.attendee_profile.realname}}" valign="top" width="32" height="32">
143+ {% endif %}
144+ </a>
145+ </td>
146+ <td align="center" class="attendee-cell">
147+ <a href="https://launchpad.net/~{{registration.attendee_profile.user.username}}" >{{registration.attendee_profile.realname}}</a>
148+ </td>
149+ <td align="center" class="attendee-cell">{{registration.get_promise_display}}</td>
150+ <td align="center" class="attendee-cell">{{registration.guests}}</td>
151+ </tr>
152+ {% endfor %}
153+ </tibdy>
154 </table>
155 {% endif %}
156
157
158=== modified file 'loco_directory/templates/events/team_event_list.inc.html'
159--- loco_directory/templates/events/team_event_list.inc.html 2011-03-04 04:52:19 +0000
160+++ loco_directory/templates/events/team_event_list.inc.html 2011-04-07 13:18:05 +0000
161@@ -1,21 +1,42 @@
162 {% load i18n %}
163-<table id="team_event_list" class="data_table">
164-<tr id="team_event_list_header">
165-<th class="event_name">{% trans "Event Name" %}</th>
166-<th class="event_teams">{% trans "Teams" %}</th>
167-<th class="event_begin">{% trans "Start" %}</th>
168-<th class="event_end">{% trans "End" %}</th>
169-<th class="event_global">{% trans "Global Event" %}</th>
170-</tr>
171-{% for team_event in team_event_list %}
172-<tr class="team_event_list_row {% cycle "odd" "even" %}">
173-<td class="event_name"><a title="{% trans "more information about this event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a></td>
174-<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>
175-<td class="event_begin">{{team_event.local_date_begin|date}} {{ team_event.local_date_begin|date:"H:i T"}}</td>
176-<td class="event_end">{{team_event.local_date_end|date}} {{ team_event.local_date_end|date:"H:i T"}}</td>
177-<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>
178-</tr>
179-{% endfor %}
180+<table id="team_event_list" class="basic wide">
181+ <thead>
182+ <tr id="team_event_list_header">
183+ <th class="event_name">{% trans "Event Name" %}</th>
184+ <th class="event_teams">{% trans "Teams" %}</th>
185+ <th class="event_begin">{% trans "Start" %}</th>
186+ <th class="event_end">{% trans "End" %}</th>
187+ <th class="event_global">{% trans "Global Event" %}</th>
188+ </tr>
189+ </thead>
190+ <tfoot>
191+ </tfoot>
192+ <tbody>
193+ {% for team_event in team_event_list %}
194+ <tr>
195+ <td class="event_name">
196+ <a title="{% trans "more information about this event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>
197+ </td>
198+ <td class="event_teams no-wrap">
199+ {% for team in team_event.teams.all %}
200+ <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>
201+ {% if not forloop.last %}
202+ <br/>
203+ {% endif %}
204+ {% endfor %}
205+ </td>
206+ <td class="event_begin no-wrap">{{team_event.local_date_begin|date}} {{ team_event.local_date_begin|date:"H:i T"}}</td>
207+ <td class="event_end no-wrap">{{team_event.local_date_end|date}} {{ team_event.local_date_end|date:"H:i T"}}</td>
208+ <td class="event_global no-wrap">
209+ {% if team_event.global_event %}
210+ <a href="{{ team_event.global_event.get_absolute_url }}">{{ team_event.global_event.name}}</a>
211+ {% else %}
212+ --
213+ {% endif %}
214+ </td>
215+ </tr>
216+ {% endfor %}
217+ </tbody>
218 </table>
219
220
221
222=== modified file 'loco_directory/templates/meetings/team_meeting_list.inc.html'
223--- loco_directory/templates/meetings/team_meeting_list.inc.html 2011-03-03 00:44:57 +0000
224+++ loco_directory/templates/meetings/team_meeting_list.inc.html 2011-04-07 13:18:05 +0000
225@@ -1,19 +1,34 @@
226 {% load i18n %}
227-<table id="team_meeting_list" class="data_table">
228-<tr id="team_meeting_list_header">
229-<th class="meeting_name">{% trans "Meeting Name" %}</th>
230-<th class="event_teams">{% trans "Teams" %}</th>
231-<th class="meeting_begin">{% trans "Start" %}</th>
232-<th class="meeting_end">{% trans "End" %}</th>
233-</tr>
234-{% for team_meeting in team_meeting_list %}
235-<tr class="team_meeting_list_row {% cycle "odd" "even" %}">
236-<td class="meeting_name"><a title="{% trans "more information about this meeting" %}" href="{{ team_meeting.get_absolute_url }}">{{ team_meeting.name }}</a></td>
237-<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>
238-<td class="meeting_begin">{{team_meeting.date_begin|date}} {{ team_meeting.date_begin|date:"H:i T"}}</td>
239-<td class="meeting_end">{{team_meeting.date_end|date}} {{ team_meeting.date_end|date:"H:i T"}}</td>
240-</tr>
241-{% endfor %}
242+<table id="team_meeting_list" class="basic wide">
243+ <thead>
244+ <tr id="team_meeting_list_header">
245+ <th class="meeting_name">{% trans "Meeting Name" %}</th>
246+ <th class="event_teams">{% trans "Teams" %}</th>
247+ <th class="meeting_begin">{% trans "Start" %}</th>
248+ <th class="meeting_end">{% trans "End" %}</th>
249+ </tr>
250+ </thead>
251+ <tfoot>
252+ </tfoot>
253+ <tbody>
254+ {% for team_meeting in team_meeting_list %}
255+ <tr>
256+ <td class="meeting_name">
257+ <a title="{% trans "more information about this meeting" %}" href="{{ team_meeting.get_absolute_url }}">{{ team_meeting.name }}</a>
258+ </td>
259+ <td class="meeting_teams no-wrap">
260+ {% for team in team_meeting.teams.all %}
261+ <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>
262+ {% if not forloop.last %}
263+ <br/>
264+ {% endif %}
265+ {% endfor %}
266+ </td>
267+ <td class="meeting_begin no-wrap">{{team_meeting.date_begin|date}} {{ team_meeting.date_begin|date:"H:i T"}}</td>
268+ <td class="meeting_end no-wrap">{{team_meeting.date_end|date}} {{ team_meeting.date_end|date:"H:i T"}}</td>
269+ </tr>
270+ {% endfor %}
271+ </tbody>
272 </table>
273
274

Subscribers

People subscribed via source and target branches