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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-06-15 20:09:07 +0200 (Tue, 15 Jun 2010)
New Revision: 3015

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/templates/logbook/edit_body.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/logbook/edit_body.mako,
mpulsweb/templates/logbook/overview.mako,
mpulsweb/templates/logbook/overview_print.mako,
mpulsweb/templates/logbook/show.mako: Avoid double HTML escaping


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-06-15 18:01:02 UTC (rev 3014)
+++ base/trunk/ChangeLog	2010-06-15 18:09:07 UTC (rev 3015)
@@ -1,5 +1,12 @@
 2010-06-15  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/templates/logbook/edit_body.mako,
+	mpulsweb/templates/logbook/overview.mako,
+	mpulsweb/templates/logbook/overview_print.mako,
+	mpulsweb/templates/logbook/show.mako: Avoid double HTML escaping
+
+2010-06-15  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/templates/administration/edit_user.mako,
 	mpulsweb/templates/administration/edit_usergroup.mako,
 	mpulsweb/templates/administration/new_user_result.mako,

Modified: base/trunk/mpulsweb/templates/logbook/edit_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/edit_body.mako	2010-06-15 18:01:02 UTC (rev 3014)
+++ base/trunk/mpulsweb/templates/logbook/edit_body.mako	2010-06-15 18:09:07 UTC (rev 3015)
@@ -31,7 +31,7 @@
 </fieldset>
 <fieldset>
 <legend>Eintrag</legend>
-Bearbeiter: ${session.get('USER_AUTHORIZED').shortenedName() | h}
+Bearbeiter: ${session.get('USER_AUTHORIZED').shortenedName()}
 <div class="w100">
   <label for="kind">Art des Eintrags:</label><br>
   <select name='kind' id='kind'>

Modified: base/trunk/mpulsweb/templates/logbook/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/overview.mako	2010-06-15 18:01:02 UTC (rev 3014)
+++ base/trunk/mpulsweb/templates/logbook/overview.mako	2010-06-15 18:09:07 UTC (rev 3015)
@@ -77,10 +77,10 @@
 % if c.logbook.hasEntries():
   % for entry in c.logbook.getEntries():
     <tr>
-    <td class="date">${entry.getDate() | h} ${entry.getTime()}</td>
-    <td class="title">${entry.getEditor() | h}</td>
-    <td class="title">${entry.getKind() | h}</td>
-    <td class="title">${entry.getDuration() | h}</td>
+    <td class="date">${entry.getDate()} ${entry.getTime()}</td>
+    <td class="title">${entry.getEditor()}</td>
+    <td class="title">${entry.getKind()}</td>
+    <td class="title">${entry.getDuration()}</td>
     <td class="action">
         <a href="${h.url_for(controller='/logbook', action='show', id=entry.id)}">
             <img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="Eintrag ansehen" title="Eintrag ansehen"></a>

Modified: base/trunk/mpulsweb/templates/logbook/overview_print.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/overview_print.mako	2010-06-15 18:01:02 UTC (rev 3014)
+++ base/trunk/mpulsweb/templates/logbook/overview_print.mako	2010-06-15 18:09:07 UTC (rev 3015)
@@ -26,19 +26,19 @@
       <tbody>
           <tr>
               <td class="noborder label table_header_v table_width_long">Datum</td>
-              <td class="noborder table_row_v">${entry.getDate() | h} ${entry.getTime() | h}</td>
+              <td class="noborder table_row_v">${entry.getDate()} ${entry.getTime()}</td>
           </tr>
           <tr>
               <td class="noborder label">Bearbeiter</td>
-              <td class="noborder table_row_v_2">${entry.getEditor() | h}</td>
+              <td class="noborder table_row_v_2">${entry.getEditor()}</td>
           </tr>
           <tr>
               <td class="noborder label table_header_v">Art</td>
-              <td class="noborder table_row_v">${entry.getKind() | h}</td>
+              <td class="noborder table_row_v">${entry.getKind()}</td>
           </tr>
           <tr>
               <td class="noborder label">Dauer in Minuten</td>
-              <td class="noborder table_row_v_2">${entry.getDuration('-/-') | h}</td>
+              <td class="noborder table_row_v_2">${entry.getDuration('-/-')}</td>
           </tr>
           <tr>
               <td class="noborder label table_header_v">Notiz</td>

Modified: base/trunk/mpulsweb/templates/logbook/show.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/show.mako	2010-06-15 18:01:02 UTC (rev 3014)
+++ base/trunk/mpulsweb/templates/logbook/show.mako	2010-06-15 18:09:07 UTC (rev 3015)
@@ -31,19 +31,19 @@
     <tbody>
         <tr>
             <td class="label table_header_v table_width_long">Datum</td>
-            <td class="table_row_v">${c.entry.getDate() | h} ${c.entry.getTime() | h}</td>
+            <td class="table_row_v">${c.entry.getDate()} ${c.entry.getTime()}</td>
         </tr>
         <tr>
             <td class="label">Bearbeiter</td>
-            <td class="table_row_v_2">${c.entry.getEditor() | h}</td>
+            <td class="table_row_v_2">${c.entry.getEditor()}</td>
         </tr>
         <tr>
             <td class="label table_header_v">Art</td>
-            <td class="table_row_v">${c.entry.getKind() | h}</td>
+            <td class="table_row_v">${c.entry.getKind()}</td>
         </tr>
         <tr>
             <td class="label">Dauer in Minuten</td>
-            <td class="table_row_v_2">${c.entry.getDuration('-/-') | h}</td>
+            <td class="table_row_v_2">${c.entry.getDuration('-/-')}</td>
         </tr>
         <tr>
             <td class="label table_header_v">Notiz</td>