[Mpuls-commits] r3041 - in base/trunk: . mpulsweb/templates/appointments mpulsweb/templates/logbook

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-06-18 18:51:36 +0200 (Fri, 18 Jun 2010)
New Revision: 3041

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/templates/appointments/show_body.mako
   base/trunk/mpulsweb/templates/logbook/show.mako
Log:
* mpulsweb/templates/appointments/show_body.mako,
mpulsweb/templates/logbook/show.mako: Use nl_to_br to convert
newlines for HTML instead of having the code inline.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-06-18 16:47:41 UTC (rev 3040)
+++ base/trunk/ChangeLog	2010-06-18 16:51:36 UTC (rev 3041)
@@ -1,5 +1,11 @@
 2010-06-18  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/templates/appointments/show_body.mako,
+	mpulsweb/templates/logbook/show.mako: Use nl_to_br to convert
+	newlines for HTML instead of having the code inline.
+
+2010-06-18  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/templates/logbook/overview_print.mako: Use nl_to_br to
 	convert newlines for HTML instead of having the code inline.
 

Modified: base/trunk/mpulsweb/templates/appointments/show_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/show_body.mako	2010-06-18 16:47:41 UTC (rev 3040)
+++ base/trunk/mpulsweb/templates/appointments/show_body.mako	2010-06-18 16:51:36 UTC (rev 3041)
@@ -27,8 +27,8 @@
     </tr>
     <tr>
       <td class="label">${_('app_table_description')}</td>
-      <% description = c.appointment.description.replace('\n', '<br>') %>
-      <td class="table_row_v_2">${description | F.NA}</td>
+      <% description = F.nl_to_br(h.escape(F.NA(c.appointment.description))) %>
+      <td class="table_row_v_2">${description}</td>
     </tr>
   </tbody>
 </table>

Modified: base/trunk/mpulsweb/templates/logbook/show.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/show.mako	2010-06-18 16:47:41 UTC (rev 3040)
+++ base/trunk/mpulsweb/templates/logbook/show.mako	2010-06-18 16:51:36 UTC (rev 3041)
@@ -47,8 +47,8 @@
         </tr>
         <tr>
             <td class="label table_header_v">Notiz</td>
-            <% description = F.no_none(c.entry.notiz).replace('\n', '<br>') %>
-            <td class="table_row_v">${description | F.NA}</td>
+            <% description = F.nl_to_br(h.escape(F.NA(c.entry.notiz))) %>
+            <td class="table_row_v">${description}</td>
         </tr>
     </tbody>
 </table>