[Mpuls-commits] r2557 - in wasko/branches/2.0: . mpulsweb/templates/administration

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-04-29 12:16:14 +0200 (Thu, 29 Apr 2010)
New Revision: 2557

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/mpulsweb/templates/administration/new_user_result.mako
   wasko/branches/2.0/mpulsweb/templates/administration/reset_password.mako
Log:
* mpulsweb/templates/administration/new_user_result.mako, 
	  mpulsweb/templates/administration/reset_password.mako: Wald #1460.
	  Fixed escaping


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-04-29 08:08:58 UTC (rev 2556)
+++ wasko/branches/2.0/ChangeLog	2010-04-29 10:16:14 UTC (rev 2557)
@@ -1,3 +1,9 @@
+2010-04-29  Torsten Irländer <torsten.irlaender at intevation.de>
+
+	* mpulsweb/templates/administration/new_user_result.mako, 
+	  mpulsweb/templates/administration/reset_password.mako: Wald #1460.
+	  Fixed escaping
+
 2010-04-29  Roland Geider <roland.geider at intevation.de>
 	* jmdweb/templates/main.mako: additional filter in list comprehension
 

Modified: wasko/branches/2.0/mpulsweb/templates/administration/new_user_result.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/administration/new_user_result.mako	2010-04-29 08:08:58 UTC (rev 2556)
+++ wasko/branches/2.0/mpulsweb/templates/administration/new_user_result.mako	2010-04-29 10:16:14 UTC (rev 2557)
@@ -51,7 +51,7 @@
   </tr>
   <tr>
     <td class="label">${_('adm_form_label_password')}</td>
-  <td class="table_row_v_2"><span id="newpassword">${h.literal(c.user_password)| F.NA}</span></td>
+  <td class="table_row_v_2"><span id="newpassword">${h.literal(c.user_password)| h}</span></td>
   </tr>
   <tr>
     <td class="label table_header_v">${_('adm_form_label_role')}</td>

Modified: wasko/branches/2.0/mpulsweb/templates/administration/reset_password.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/administration/reset_password.mako	2010-04-29 08:08:58 UTC (rev 2556)
+++ wasko/branches/2.0/mpulsweb/templates/administration/reset_password.mako	2010-04-29 10:16:14 UTC (rev 2557)
@@ -11,6 +11,6 @@
 <div class="dialog">
 <h1><img src="/images/icons/info/confirmation.png" alt="Bestäntigung"</> ${_('adm_header_resetpassword')}</h1>
 <p>${_('adm_con_rp_the_password')} <strong>${c.uo.first_name| F.NA} ${c.uo.last_name| F.NA}</strong> ${_('adm_con_rp_has_been_changed')}<br>
-${_('adm_con_rp_new_pw')} <strong>${h.literal(c.new_password)}</strong></p>
+${_('adm_con_rp_new_pw')} <strong>${h.literal(c.new_password) | h}</strong></p>
 <a class="button" href="/administration/overviewUser">${_('adm_con_rp_to_useroverview')}</a>
 </div>