[Mpuls-commits] r3013 - in base/trunk: . mpulsweb/templates/administration
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Jun 15 20:00:39 CEST 2010
Author: bh
Date: 2010-06-15 20:00:38 +0200 (Tue, 15 Jun 2010)
New Revision: 3013
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/templates/administration/edit_user.mako
base/trunk/mpulsweb/templates/administration/edit_usergroup.mako
base/trunk/mpulsweb/templates/administration/reset_password.mako
Log:
* mpulsweb/templates/administration/edit_user.mako,
mpulsweb/templates/administration/edit_usergroup.mako,
mpulsweb/templates/administration/new_user_result.mako,
mpulsweb/templates/administration/reset_password.mako: Avoid extra
HTML escaping
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2010-06-15 17:48:19 UTC (rev 3012)
+++ base/trunk/ChangeLog 2010-06-15 18:00:38 UTC (rev 3013)
@@ -1,5 +1,13 @@
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,
+ mpulsweb/templates/administration/reset_password.mako: Avoid extra
+ HTML escaping
+
+2010-06-15 Bernhard Herzog <bh at intevation.de>
+
* mpulsweb/templates/appointments/appointment_form.mako: Removed.
Not used anywhere.
Modified: base/trunk/mpulsweb/templates/administration/edit_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/edit_user.mako 2010-06-15 17:48:19 UTC (rev 3012)
+++ base/trunk/mpulsweb/templates/administration/edit_user.mako 2010-06-15 18:00:38 UTC (rev 3013)
@@ -43,20 +43,20 @@
<td>
% if c.form_errors.get('firstname'):
<label for="firstname" class="error_font">${_('adm_form_user_firstname')}</label><br>
- <input type="text" class="field error_box" id="firstname" name="firstname" value="${c.form_result.get('firstname', c.uo.first_name)| h}" maxlength="64">
+ <input type="text" class="field error_box" id="firstname" name="firstname" value="${c.form_result.get('firstname', c.uo.first_name)}" maxlength="64">
% else:
<label for="firstname">${_('adm_form_user_firstname')}</label><br>
- <input type="text" class="field" id="firstname" name="firstname" value="${c.form_result.get('firstname', c.uo.first_name)| h}" maxlength="64">
+ <input type="text" class="field" id="firstname" name="firstname" value="${c.form_result.get('firstname', c.uo.first_name)}" maxlength="64">
% endif
</td>
<td>
% if c.form_errors.get('lastname'):
<label for="lastname" class="error_font">${_('adm_form_user_lastname')}</label><br>
- <input type="text" class="field error_box" id="lastname" name="lastname" value="${c.form_result.get('lastname', c.uo.last_name)| h}" maxlength="64">
+ <input type="text" class="field error_box" id="lastname" name="lastname" value="${c.form_result.get('lastname', c.uo.last_name)}" maxlength="64">
% else:
<label for="lastname">${_('adm_form_user_lastname')}</label><br>
- <input type="text" class="field" id="lastname" name="lastname" value="${c.form_result.get('lastname', c.uo.last_name)| h}" maxlength="64">
+ <input type="text" class="field" id="lastname" name="lastname" value="${c.form_result.get('lastname', c.uo.last_name)}" maxlength="64">
% endif
</td>
</tr>
@@ -64,17 +64,17 @@
<tr>
<td>
<label for="telephone">${_('adm_form_user_telephone')}</label><br>
- <input type="text" class="field" id="telephone" name="telephone" value="${c.form_result.get('telephone', c.uo.telephone)| h}" maxlength="32">
+ <input type="text" class="field" id="telephone" name="telephone" value="${c.form_result.get('telephone', c.uo.telephone)}" maxlength="32">
</td>
<td>
<label for="room">${_('adm_form_user_roomnumer')}</label><br>
- <input type="text" class="field" id="room" name="room" value="${c.form_result.get('room', c.uo.room)| h}" maxlength="16">
+ <input type="text" class="field" id="room" name="room" value="${c.form_result.get('room', c.uo.room)}" maxlength="16">
</td>
</tr>
<tr>
<td>
<label for="branchoffice">${_('adm_form_user_branchoffice')}</label><br>
- <input type="text" class="field" id="branchoffice" name="branchoffice" value="${c.form_result.get('branchoffice', c.uo.branchoffice)| h}" maxlength="64">
+ <input type="text" class="field" id="branchoffice" name="branchoffice" value="${c.form_result.get('branchoffice', c.uo.branchoffice)}" maxlength="64">
</td>
<td></td>
</tr>
@@ -86,11 +86,11 @@
<table>
<tr>
<td class="label table_header_v table_width_mid_s">Anmeldekennung</td>
- <td class="table_row_v">${c.uo.getLogin()| h}</td>
+ <td class="table_row_v">${c.uo.getLogin()}</td>
</tr>
<tr>
<td class="label">Rolle</td>
- <td class="table_row_v_2">${c.uo.getRole()| h}</td>
+ <td class="table_row_v_2">${c.uo.getRole()}</td>
</tr>
</table>
</fieldset>
Modified: base/trunk/mpulsweb/templates/administration/edit_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/edit_usergroup.mako 2010-06-15 17:48:19 UTC (rev 3012)
+++ base/trunk/mpulsweb/templates/administration/edit_usergroup.mako 2010-06-15 18:00:38 UTC (rev 3013)
@@ -52,14 +52,14 @@
<tr>
% if idset:
<td>
- <input type="checkbox" name="standin" value="${user.id | h}">
+ <input type="checkbox" name="standin" value="${user.id}">
</td>
<td>
${user.last_name | F.NA}, ${user.first_name | F.NA}
</td>
% else:
<td class="table_row_v_12">
- <input type="checkbox" name="standin" value="${user.id | h}">
+ <input type="checkbox" name="standin" value="${user.id}">
</td>
<td class="table_row_v_12">
${user.last_name | F.NA}, ${user.first_name | F.NA}
Modified: base/trunk/mpulsweb/templates/administration/reset_password.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/reset_password.mako 2010-06-15 17:48:19 UTC (rev 3012)
+++ base/trunk/mpulsweb/templates/administration/reset_password.mako 2010-06-15 18:00:38 UTC (rev 3013)
@@ -11,6 +11,6 @@
<div class="dialog">
<h1><img src="${h.url_for('/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) | h}</strong></p>
+${_('adm_con_rp_new_pw')} <strong>${h.literal(c.new_password)}</strong></p>
<a class="button" href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_con_rp_to_useroverview')}</a>
</div>
More information about the Mpuls-commits
mailing list