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

[Chris Johnston]

Makes event details page respect newlines

[Adnane Belmadiaf (daker)]

Approve.

=== modified file 'loco_directory/templates/events/team_event_detail.inc.html'
--- loco_directory/templates/events/team_event_detail.inc.html	2012-06-30 19:19:08 +0000
+++ loco_directory/templates/events/team_event_detail.inc.html	2012-06-30 23:43:19 +0000
@@ -5,7 +5,7 @@
         {% if team_event_object.description %}
             <table id="team-event-basic">
                 <tr>
-                    <td class="form-item-value">{{ team_event_object.description|markdown:'safe' }}</td>
+                    <td class="form-item-value">{{ team_event_object.description|markdown:'safe'|linebreaks }}</td>
                 </tr>
             </table>
         {% endif %}

=== modified file 'loco_directory/templates/events/team_event_detail_comments.inc.html'
--- loco_directory/templates/events/team_event_detail_comments.inc.html	2012-04-14 22:10:09 +0000
+++ loco_directory/templates/events/team_event_detail_comments.inc.html	2012-06-30 23:43:19 +0000
@@ -9,7 +9,7 @@
     {% for comment in comment_date.list %}
     <tr>
         <th class="form-item-label" scope="row"><a href="https://launchpad.net/~{{comment.commenter_profile.user.username}}">{{comment.commenter_profile.realname}}</a>:</th>
-        <td class="form-item-value">{{comment.comment}}</td>
+        <td class="form-item-value">{{comment.comment|linebreaks}}</td>
     </tr>
     {% endfor %}
 {% endfor %}