Robert Wall has proposed merging lp:~robertwall/loco-directory/510572 into
lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#510572 extend rss entries
https://bugs.launchpad.net/bugs/510572
Adds additional details to team RSS feeds, and fixes a typo I found in
team_event_detail_basic.inc.html while I was at it.
--
https://code.launchpad.net/~robertwall/loco-directory/510572/+merge/32853
Your team loco-directory-dev is requested to review the proposed merge of
lp:~robertwall/loco-directory/510572 into lp:loco-directory.
=== modified file 'loco_directory/templates/events/team_event_detail_basic.inc.html'
--- loco_directory/templates/events/team_event_detail_basic.inc.html 2010-08-16 18:14:57 +0000
+++ loco_directory/templates/events/team_event_detail_basic.inc.html 2010-08-17 09:01:05 +0000
@@ -14,7 +14,7 @@
</tr>
{% endif %}
- {% if team_event_object.date_end %}
+ {% if team_event_object.venue %}
<tr>
<th class="form-item-label" scope="row"><label>{% trans "Where:" %}</label></th>
<td class="form-item-value"><a title="{% trans "show venue details" %}" href="{{ team_event_object.venue.get_absolute_url }}">{{ team_event_object.venue.name }}{% if team_event_object.venue.city %} in {{ team_event_object.venue.city }}{% endif %}</a></td>
=== modified file 'loco_directory/templates/events/team_events_rss.xml'
--- loco_directory/templates/events/team_events_rss.xml 2010-01-20 16:47:30 +0000
+++ loco_directory/templates/events/team_events_rss.xml 2010-08-17 09:01:05 +0000
@@ -9,9 +9,16 @@
<item>
<title> {{ e.name }}</title>
<link>{{base}}{% url team-event-detail e.id %}</link>
- <description>{{ e.description }}</description>
+ <description>{% trans "When:" %} {% spaceless %}
+ {% ifequal e.date_begin|date e.date_end|date %}
+ {{ e.date_begin|date:"D, d N Y H:i" }} - {{ e.date_end|date:"H:i O" }}
+ {% else %}
+ {{ e.date_begin|date:"D, d N Y H:i" }} - {{ e.date_end|date:"D, d N Y H:i O" }}
+ {% endifequal %}
+ {% endspaceless %}{% if e.venue.name %} | {% trans "Where:" %} {{ e.venue.name }}{% endif %}
+ {% if e.description %} | {% trans "Description:" %} {{ e.description }}{% endif %}</description>
<guid>{{base}}{% url team-event-detail e.id %}</guid>
</item>
{% endfor %}
</channel>
-</rss>
\ No newline at end of file
+</rss>
_______________________________________________
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
