LoCo Team Portal

Merge lp:~cjohnston/loco-team-portal/705265 into lp:loco-team-portal

  1. 705265
  2. Merge into 0.2
Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 366
Merged at revision: 367
Proposed branch: lp:~cjohnston/loco-team-portal/705265
Merge into: lp:loco-team-portal
Diff against target: 37 lines (+4/-4)
3 files modified
loco_directory/templates/events/team_event_detail_basic.inc.html (+2/-2)
loco_directory/templates/events/team_event_li.inc.html (+1/-1)
loco_directory/templates/meetings/team_meeting_li.inc.html (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/705265
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+46921@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

Why doesn't team_meeting_li.inc.html use "H:i T" like team_event_li.inc.html does?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/templates/events/team_event_detail_basic.inc.html'
2--- loco_directory/templates/events/team_event_detail_basic.inc.html 2010-11-19 13:39:53 +0000
3+++ loco_directory/templates/events/team_event_detail_basic.inc.html 2011-01-20 14:52:41 +0000
4@@ -6,9 +6,9 @@
5 <th class="form-item-label" scope="row"><label>{% trans "When:" %}</label></th>
6 <td class="form-item-value">
7 {% ifequal team_event_object.local_date_begin|date team_event_object.local_date_end|date %}
8- {{ team_event_object.local_date_begin|date:"D, d N Y H:i" }} - {{ team_event_object.local_date_end|date:"H:i T (O)" }}
9+ {{ team_event_object.local_date_begin|date:"D, d N Y H:i" }} - {{ team_event_object.local_date_end|date:"H:i T" }}
10 {% else %}
11- {{ team_event_object.local_date_begin|date:"D, d N Y H:i" }} - {{ team_event_object.local_date_end|date:"D, d N Y H:i T (O)" }}
12+ {{ team_event_object.local_date_begin|date:"D, d N Y H:i" }} - {{ team_event_object.local_date_end|date:"D, d N Y H:i T" }}
13 {% endifequal %}
14 </td>
15 </tr>
16
17=== modified file 'loco_directory/templates/events/team_event_li.inc.html'
18--- loco_directory/templates/events/team_event_li.inc.html 2011-01-10 16:09:19 +0000
19+++ loco_directory/templates/events/team_event_li.inc.html 2011-01-20 14:52:41 +0000
20@@ -1,5 +1,5 @@
21 {% load i18n %}
22 {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %}
23 <li>
24- <a title="{% if team_event.venue %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{% url team-event-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on: " %}{{ team_event.date_begin|date}}
25+ <a title="{% if team_event.venue %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{% url team-event-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on" %} {{ team_event.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.local_date_begin|date:"H:i T" }}
26 </li>
27
28=== modified file 'loco_directory/templates/meetings/team_meeting_li.inc.html'
29--- loco_directory/templates/meetings/team_meeting_li.inc.html 2011-01-10 16:09:19 +0000
30+++ loco_directory/templates/meetings/team_meeting_li.inc.html 2011-01-20 14:52:41 +0000
31@@ -1,5 +1,5 @@
32 {% load i18n %}
33 {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %}
34 <li>
35- <a title="{{team_event.date_begin|date:"M d"}}" href="{% url team-meeting-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on: " %}{{ team_event.date_begin|date}}
36+ <a title="{{team_event.date_begin|date:"M d"}}" href="{% url team-meeting-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on: " %}{{ team_event.date_begin|date}}
37 </li>

Subscribers

People subscribed via source and target branches