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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-06-18 18:15:33 +0200 (Fri, 18 Jun 2010)
New Revision: 3037

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/templates/appointments/remindlist_body.mako
   base/trunk/mpulsweb/templates/appointments/show_body.mako
   base/trunk/mpulsweb/templates/home/globalappointmentlist.mako
   base/trunk/mpulsweb/templates/logbook/overview.mako
   base/trunk/mpulsweb/templates/logbook/overview_print.mako
   base/trunk/mpulsweb/templates/logbook/show.mako
Log:
* mpulsweb/templates/appointments/remindlist_body.mako,
mpulsweb/templates/appointments/show_body.mako,
mpulsweb/templates/home/globalappointmentlist.mako,
mpulsweb/templates/logbook/overview.mako,
mpulsweb/templates/logbook/overview_print.mako,
mpulsweb/templates/logbook/show.mako: Avoid extra HTML escaping


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-06-18 14:59:31 UTC (rev 3036)
+++ base/trunk/ChangeLog	2010-06-18 16:15:33 UTC (rev 3037)
@@ -1,5 +1,15 @@
 2010-06-18  Bernhard Herzog  <bh at intevation.de>
 
+
+	* mpulsweb/templates/appointments/remindlist_body.mako,
+	mpulsweb/templates/appointments/show_body.mako,
+	mpulsweb/templates/home/globalappointmentlist.mako,
+	mpulsweb/templates/logbook/overview.mako,
+	mpulsweb/templates/logbook/overview_print.mako,
+	mpulsweb/templates/logbook/show.mako: Avoid extra HTML escaping
+
+2010-06-18  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/controllers/appointment.py
 	(AppointmentController.createAction): Fix form_result reference
 

Modified: base/trunk/mpulsweb/templates/appointments/remindlist_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/remindlist_body.mako	2010-06-18 14:59:31 UTC (rev 3036)
+++ base/trunk/mpulsweb/templates/appointments/remindlist_body.mako	2010-06-18 16:15:33 UTC (rev 3037)
@@ -18,7 +18,7 @@
     </td>
   </tr>
   <tr>
-    <% description = F.shorten(F.H(appointment.description),120) %>
+    <% description = F.shorten(appointment.description, 120) %>
     <td colspan="3" class="description">${description | F.NA}</td>
   </tr>
   % endfor

Modified: base/trunk/mpulsweb/templates/appointments/show_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/show_body.mako	2010-06-18 14:59:31 UTC (rev 3036)
+++ base/trunk/mpulsweb/templates/appointments/show_body.mako	2010-06-18 16:15:33 UTC (rev 3037)
@@ -27,7 +27,7 @@
     </tr>
     <tr>
       <td class="label">${_('app_table_description')}</td>
-      <% description = F.H(c.appointment.description).replace('\n', '<br>') %>
+      <% description = c.appointment.description.replace('\n', '<br>') %>
       <td class="table_row_v_2">${description | F.NA}</td>
     </tr>
   </tbody>

Modified: base/trunk/mpulsweb/templates/home/globalappointmentlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/home/globalappointmentlist.mako	2010-06-18 14:59:31 UTC (rev 3036)
+++ base/trunk/mpulsweb/templates/home/globalappointmentlist.mako	2010-06-18 16:15:33 UTC (rev 3037)
@@ -21,7 +21,7 @@
     </td>
   </tr>
   <tr>
-    <% description = F.shorten(F.H(appointment.description),120) %>
+    <% description = F.shorten(appointment.description, 120) %>
     <td colspan="3" class="description">${description | F.NA}</td>
   </tr>
   % endfor

Modified: base/trunk/mpulsweb/templates/logbook/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/overview.mako	2010-06-18 14:59:31 UTC (rev 3036)
+++ base/trunk/mpulsweb/templates/logbook/overview.mako	2010-06-18 16:15:33 UTC (rev 3037)
@@ -91,7 +91,7 @@
     </td>
   </tr>
   <tr>
-    <% notice = F.shorten(F.H(entry.getNotice()),120) %>
+    <% notice = F.shorten(entry.getNotice(), 120) %>
     <td colspan="5" class="description">${notice | F.NA}</td>
   </tr>
   % endfor

Modified: base/trunk/mpulsweb/templates/logbook/overview_print.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/overview_print.mako	2010-06-18 14:59:31 UTC (rev 3036)
+++ base/trunk/mpulsweb/templates/logbook/overview_print.mako	2010-06-18 16:15:33 UTC (rev 3037)
@@ -42,7 +42,7 @@
           </tr>
           <tr>
               <td class="noborder label table_header_v">Notiz</td>
-              <% description = F.H(F.no_none(entry.notiz)).replace('\n', '<br>') %>
+              <% description = F.no_none(entry.notiz).replace('\n', '<br>') %>
               <td class="noborder table_row_v">${description | F.NA}</td>
           </tr>
       </tbody>

Modified: base/trunk/mpulsweb/templates/logbook/show.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/show.mako	2010-06-18 14:59:31 UTC (rev 3036)
+++ base/trunk/mpulsweb/templates/logbook/show.mako	2010-06-18 16:15:33 UTC (rev 3037)
@@ -47,7 +47,7 @@
         </tr>
         <tr>
             <td class="label table_header_v">Notiz</td>
-            <% description = F.H(F.no_none(c.entry.notiz)).replace('\n', '<br>') %>
+            <% description = F.no_none(c.entry.notiz).replace('\n', '<br>') %>
             <td class="table_row_v">${description | F.NA}</td>
         </tr>
     </tbody>