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
=== 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 @@
24 vertical-align: top;24 vertical-align: top;
25}25}
2626
27td.no-wrap {
28 white-space: nowrap;
29}
30
27label {31label {
28 font-weight: bold;32 font-weight: bold;
29 white-space: nowrap;33 white-space: nowrap;
3034
=== 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 @@
1{% load i18n %}1{% load i18n %}
2<table id="global_event_list" class="data_table">2<table id="global_event_list" class="basic wide">
3<tr id="global_event_list_header">3 <thead>
4<th class="event_name">{% trans "Event name" %}</th>4 <tr id="global_event_list_header">
5<th class="event_begin">{% trans "Start" %}</th>5 <th class="event_name">{% trans "Event name" %}</th>
6<th class="event_end">{% trans "End" %}</th>6 <th class="event_begin">{% trans "Start" %}</th>
7<th class="event_tems">{% trans "Team Events" %}</th>7 <th class="event_end">{% trans "End" %}</th>
8</tr>8 <th class="event_tems">{% trans "Team Events" %}</th>
9{% for global_event in global_event_list %}9 </tr>
10<tr class="global_event_list_row {% cycle "odd" "even" %}">10 </thead>
11<td class="event_name"><a title="{% trans "more information about this event" %}" href="{{ global_event.get_absolute_url }}">{{ global_event.name }}</a></td>11 <tfoot>
12<td class="event_begin">{{global_event.date_begin|date}}</td>12 </tfoot>
13<td class="event_end">{{global_event.date_end|date}}</td>13 <tbody>
14<td class="event_teams">{{global_event.teamevent_set.all.count}}</td>14 {% for global_event in global_event_list %}
15</tr>15 <tr>
16{% endfor %}16 <td class="event_name">
17 <a title="{% trans "more information about this event" %}" href="{{ global_event.get_absolute_url }}">{{ global_event.name }}</a>
18 </td>
19 <td class="event_begin no-wrap">{{global_event.date_begin|date}}</td>
20 <td class="event_end no-wrap">{{global_event.date_end|date}}</td>
21 <td class="event_teams no-wrap">{{global_event.teamevent_set.all.count}}</td>
22 </tr>
23 {% endfor %}
24 </tbody>
17</table>25</table>
1826
1927
2028
=== 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 @@
1{% load i18n %}1{% load i18n %}
2
3<table id="team-event-totals" class="data_table">2<table id="team-event-totals" class="data_table">
4 <tr>3 <thead>
5 <td colspan="2">4 <tr>
6 {% if user.is_authenticated %}5 <td colspan="2">
7 {% if user_is_attending %}6 {% if user.is_authenticated %}
8 <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Change your Registration Status' %}</a>7 {% if user_is_attending %}
8 <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Change your Registration Status' %}</a>
9 {% else %}
10 <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Register for this Event' %}</a>
11 {% endif %}
9 {% else %}12 {% else %}
10 <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Register for this Event' %}</a>13 <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Register for this Event' %}</a>
11 {% endif %}14 {% endif %}
12 {% else %}15 </td>
13 <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Register for this Event' %}</a>16 </tr>
14 {% endif %}17 </thead>
15 </td>18 <tfoot>
16 </tr> 19 </tfoot>
17 <tr>20 <tbody>
18 <th class="form-item-label">{% trans 'Confirmed attending:' %} {{ team_event_object.total_attending }}</th>21 <tr>
19 <th class="form-item-label">{% trans 'Maybe attending:' %} {{ team_event_object.total_maybe_attending }}</th>22 <th class="form-item-label">{% trans 'Confirmed attending:' %} {{ team_event_object.total_attending }}</th>
20 </tr>23 <th class="form-item-label">{% trans 'Maybe attending:' %} {{ team_event_object.total_maybe_attending }}</th>
24 </tr>
25 </tbody>
21</table>26</table>
2227
23{% if team_event_object.attendee_set.all %}28{% if team_event_object.attendee_set.all %}
24<table id="team-event-attendees" class="data_table">29<table id="team-event-attendees" class="basic">
25 <tr>30 <thead>
26 <th></th>31 <tr>
27 <th>{% trans "Attendees" %}</th>32 <th></th>
28 <th>{% trans "Registration Status" %}</th>33 <th>{% trans "Attendees" %}</th>
29 <th>{% trans "Additional Guests" %}</th>34 <th>{% trans "Registration Status" %}</th>
30 </tr>35 <th>{% trans "Additional Guests" %}</th>
31 {% for registration in team_event_object.attendee_set.all %}36 </tr>
32 <tr class="team_event_list_row {% cycle "odd" "even" %}">37 </thead>
33 <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>38 <tfoot>
34 <td align="center" class="attendee-cell"><a href="https://launchpad.net/~{{registration.attendee_profile.user.username}}" >{{registration.attendee_profile.realname}}</a></td>39 </tfoot>
35 <td align="center" class="attendee-cell">{{registration.get_promise_display}}</td>40 <tbody>
36 <td align="center" class="attendee-cell">{{registration.guests}}</td>41 {% for registration in team_event_object.attendee_set.all %}
37 </tr>42 <tr class="team_event_list_row {% cycle "odd" "even" %}">
38 {% endfor %}43 <td align="center" class="attendee-mugshot">
44 <a href="https://launchpad.net/~{{registration.attendee_profile.user.username}}" >
45 {% if registration.attendee_profile.mugshot %}
46 <img src="{{registration.attendee_profile.mugshot}}" title="{{registration.attendee_profile.realname}}" valign="top" width="32" height="32">
47 {% endif %}
48 </a>
49 </td>
50 <td align="center" class="attendee-cell">
51 <a href="https://launchpad.net/~{{registration.attendee_profile.user.username}}" >{{registration.attendee_profile.realname}}</a>
52 </td>
53 <td align="center" class="attendee-cell">{{registration.get_promise_display}}</td>
54 <td align="center" class="attendee-cell">{{registration.guests}}</td>
55 </tr>
56 {% endfor %}
57 </tibdy>
39</table>58</table>
40{% endif %}59{% endif %}
4160
4261
=== 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 @@
1{% load i18n %}1{% load i18n %}
2<table id="team_event_list" class="data_table">2<table id="team_event_list" class="basic wide">
3<tr id="team_event_list_header">3 <thead>
4<th class="event_name">{% trans "Event Name" %}</th>4 <tr id="team_event_list_header">
5<th class="event_teams">{% trans "Teams" %}</th>5 <th class="event_name">{% trans "Event Name" %}</th>
6<th class="event_begin">{% trans "Start" %}</th>6 <th class="event_teams">{% trans "Teams" %}</th>
7<th class="event_end">{% trans "End" %}</th>7 <th class="event_begin">{% trans "Start" %}</th>
8<th class="event_global">{% trans "Global Event" %}</th>8 <th class="event_end">{% trans "End" %}</th>
9</tr>9 <th class="event_global">{% trans "Global Event" %}</th>
10{% for team_event in team_event_list %}10 </tr>
11<tr class="team_event_list_row {% cycle "odd" "even" %}">11 </thead>
12<td class="event_name"><a title="{% trans "more information about this event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a></td>12 <tfoot>
13<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>13 </tfoot>
14<td class="event_begin">{{team_event.local_date_begin|date}} {{ team_event.local_date_begin|date:"H:i T"}}</td>14 <tbody>
15<td class="event_end">{{team_event.local_date_end|date}} {{ team_event.local_date_end|date:"H:i T"}}</td>15 {% for team_event in team_event_list %}
16<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>16 <tr>
17</tr>17 <td class="event_name">
18{% endfor %}18 <a title="{% trans "more information about this event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>
19 </td>
20 <td class="event_teams no-wrap">
21 {% for team in team_event.teams.all %}
22 <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>
23 {% if not forloop.last %}
24 <br/>
25 {% endif %}
26 {% endfor %}
27 </td>
28 <td class="event_begin no-wrap">{{team_event.local_date_begin|date}} {{ team_event.local_date_begin|date:"H:i T"}}</td>
29 <td class="event_end no-wrap">{{team_event.local_date_end|date}} {{ team_event.local_date_end|date:"H:i T"}}</td>
30 <td class="event_global no-wrap">
31 {% if team_event.global_event %}
32 <a href="{{ team_event.global_event.get_absolute_url }}">{{ team_event.global_event.name}}</a>
33 {% else %}
34 --
35 {% endif %}
36 </td>
37 </tr>
38 {% endfor %}
39 </tbody>
19</table>40</table>
2041
2142
2243
=== 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 @@
1{% load i18n %}1{% load i18n %}
2<table id="team_meeting_list" class="data_table">2<table id="team_meeting_list" class="basic wide">
3<tr id="team_meeting_list_header">3 <thead>
4<th class="meeting_name">{% trans "Meeting Name" %}</th>4 <tr id="team_meeting_list_header">
5<th class="event_teams">{% trans "Teams" %}</th>5 <th class="meeting_name">{% trans "Meeting Name" %}</th>
6<th class="meeting_begin">{% trans "Start" %}</th>6 <th class="event_teams">{% trans "Teams" %}</th>
7<th class="meeting_end">{% trans "End" %}</th>7 <th class="meeting_begin">{% trans "Start" %}</th>
8</tr>8 <th class="meeting_end">{% trans "End" %}</th>
9{% for team_meeting in team_meeting_list %}9 </tr>
10<tr class="team_meeting_list_row {% cycle "odd" "even" %}">10 </thead>
11<td class="meeting_name"><a title="{% trans "more information about this meeting" %}" href="{{ team_meeting.get_absolute_url }}">{{ team_meeting.name }}</a></td>11 <tfoot>
12<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>12 </tfoot>
13<td class="meeting_begin">{{team_meeting.date_begin|date}} {{ team_meeting.date_begin|date:"H:i T"}}</td>13 <tbody>
14<td class="meeting_end">{{team_meeting.date_end|date}} {{ team_meeting.date_end|date:"H:i T"}}</td>14 {% for team_meeting in team_meeting_list %}
15</tr>15 <tr>
16{% endfor %}16 <td class="meeting_name">
17 <a title="{% trans "more information about this meeting" %}" href="{{ team_meeting.get_absolute_url }}">{{ team_meeting.name }}</a>
18 </td>
19 <td class="meeting_teams no-wrap">
20 {% for team in team_meeting.teams.all %}
21 <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>
22 {% if not forloop.last %}
23 <br/>
24 {% endif %}
25 {% endfor %}
26 </td>
27 <td class="meeting_begin no-wrap">{{team_meeting.date_begin|date}} {{ team_meeting.date_begin|date:"H:i T"}}</td>
28 <td class="meeting_end no-wrap">{{team_meeting.date_end|date}} {{ team_meeting.date_end|date:"H:i T"}}</td>
29 </tr>
30 {% endfor %}
31 </tbody>
17</table>32</table>
1833
1934

Subscribers

People subscribed via source and target branches