[Mpuls-commits] r2735 - in base/trunk: . mpulsweb/templates/documents

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-05-25 15:27:42 +0200 (Tue, 25 May 2010)
New Revision: 2735

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/templates/documents/case_overview.mako
   base/trunk/mpulsweb/templates/documents/global_overview.mako
Log:
* mpulsweb/templates/documents/case_overview.mako,
mpulsweb/templates/documents/global_overview.mako: Avoid
unnecessary html-escaping.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-05-25 13:26:09 UTC (rev 2734)
+++ base/trunk/ChangeLog	2010-05-25 13:27:42 UTC (rev 2735)
@@ -1,5 +1,11 @@
 2010-05-25  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/templates/documents/case_overview.mako,
+	mpulsweb/templates/documents/global_overview.mako: Avoid
+	unnecessary html-escaping.
+
+2010-05-25  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/model/document.py (Document.getName): Remove encoding
 	parameter.  No caller used anything but the default value anyway.
 	Also, make non-ascii names actually work by using ensure_unicode

Modified: base/trunk/mpulsweb/templates/documents/case_overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/case_overview.mako	2010-05-25 13:26:09 UTC (rev 2734)
+++ base/trunk/mpulsweb/templates/documents/case_overview.mako	2010-05-25 13:27:42 UTC (rev 2735)
@@ -48,10 +48,10 @@
     %>
     % for num, f in enumerate(c.files):
       <tr class="${num%2 and 'hl' or ''}">
-        <td>${ f.getName() | F.shorten, h}</td>
+        <td>${ f.getName() | F.shorten}</td>
         <td class="number_field">${kb(f.size)} KB</td>
         <td class="actions">
-          <a href="/casedocument/show/${f.id}/${f.getName() | F.H}" 
+          <a href="/casedocument/show/${f.id}/${f.getName()}" 
           target="_blank">
             <img src="/images/icons/open_active_22.png" border="0" 
             alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>

Modified: base/trunk/mpulsweb/templates/documents/global_overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/global_overview.mako	2010-05-25 13:26:09 UTC (rev 2734)
+++ base/trunk/mpulsweb/templates/documents/global_overview.mako	2010-05-25 13:27:42 UTC (rev 2735)
@@ -34,13 +34,13 @@
   % if idset==0:
   <tr>
     <td>
-        <a href="/document/globalShow/${f.id}/${f.getName() | F.H}" target="_blank">${ f.getName() | F.shorten, h}</a>
+        <a href="/document/globalShow/${f.id}/${f.getName()}" target="_blank">${ f.getName() | F.shorten}</a>
     </td>
     <td class="number_field">
         ${kb(f.size)} KB
     </td>
     <td class="table_action">
-        <a href="/document/globalShow/${f.id}/${f.getName() | F.H}" target="_blank"><img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" 
+        <a href="/document/globalShow/${f.id}/${f.getName()}" target="_blank"><img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" 
         title="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
         % if h.hasRole(['admin_ka']):
         <a href="/document/globalDelete/${f.id}"><img src="/images/icons/delete_active_22.png" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
@@ -51,13 +51,13 @@
   % else:
     <tr  class="table_row_h">
       <td>
-        <a href="/document/globalShow/${f.id}/${f.getName() | F.H}" target="_blank">${ f.getName() | F.shorten, h}</a>
+        <a href="/document/globalShow/${f.id}/${f.getName()}" target="_blank">${ f.getName() | F.shorten}</a>
       </td>
       <td class="number_field">
         ${kb(f.size)} KB
       </td>
       <td class="table_action">
-        <a href="/document/globalShow/${f.id}/${f.getName() | F.H}" target="_blank"><img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" 
+        <a href="/document/globalShow/${f.id}/${f.getName()}" target="_blank"><img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" 
         title="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
         % if h.hasRole(['admin_ka']):
           <a href="/document/globalDelete/${f.id}"><img src="/images/icons/delete_active_22.png" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>