[Mpuls-commits] r2062 - in wasko/branches/2.0: . mpulsweb/templates/administration mpulsweb/templates/appointments mpulsweb/templates/casebundle mpulsweb/templates/casemanagement mpulsweb/templates/dialogs mpulsweb/templates/home mpulsweb/templates/phase/dialogs mpulsweb/templates/settings mpulsweb/templates/usersettings
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Mar 23 09:10:12 CET 2010
Author: torsten
Date: 2010-03-23 09:10:10 +0100 (Tue, 23 Mar 2010)
New Revision: 2062
Modified:
wasko/branches/2.0/ChangeLog
wasko/branches/2.0/mpulsweb/templates/administration/edit_user.mako
wasko/branches/2.0/mpulsweb/templates/administration/edit_usergroup.mako
wasko/branches/2.0/mpulsweb/templates/administration/new_user_result.mako
wasko/branches/2.0/mpulsweb/templates/administration/overview_user.mako
wasko/branches/2.0/mpulsweb/templates/administration/overview_usergroups.mako
wasko/branches/2.0/mpulsweb/templates/administration/reset_password.mako
wasko/branches/2.0/mpulsweb/templates/administration/show_user_body.mako
wasko/branches/2.0/mpulsweb/templates/administration/show_usergroup.mako
wasko/branches/2.0/mpulsweb/templates/appointments/overview_body.mako
wasko/branches/2.0/mpulsweb/templates/appointments/remindlist_body.mako
wasko/branches/2.0/mpulsweb/templates/appointments/show_body.mako
wasko/branches/2.0/mpulsweb/templates/casebundle/editor.mako
wasko/branches/2.0/mpulsweb/templates/casebundle/standin.mako
wasko/branches/2.0/mpulsweb/templates/casemanagement/organisation.mako
wasko/branches/2.0/mpulsweb/templates/dialogs/failed.mako
wasko/branches/2.0/mpulsweb/templates/dialogs/success.mako
wasko/branches/2.0/mpulsweb/templates/home/globalappointmentlist.mako
wasko/branches/2.0/mpulsweb/templates/phase/dialogs/success_set_phase.mako
wasko/branches/2.0/mpulsweb/templates/settings/show.mako
wasko/branches/2.0/mpulsweb/templates/usersettings/edit_standin.mako
Log:
Relaced "F.NA | h" with "F.NA". Escaping is now done with default escapping in
mako
Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/ChangeLog 2010-03-23 08:10:10 UTC (rev 2062)
@@ -2,6 +2,9 @@
Enable default html-escaping for mako-rendering.
+ * mpulsweb/templates/*.mako: Relaced "F.NA | h" with "F.NA". Escaping
+ s now done with default escapping in mako
+
* mpulsweb/templates/phase/phase.mako: Do not escape links on phase
page.
* jmdweb/controllers/caseappointment.py: Render already returns
Modified: wasko/branches/2.0/mpulsweb/templates/administration/edit_user.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/administration/edit_user.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/administration/edit_user.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -98,7 +98,7 @@
<div id="admin_edit_user_submit" class="waska_form_element w100">
<input type="submit" value="${_('adm_form_user_submit')}">
</div>
- <input type="hidden" value="${c.form_errors.get('uid', c.uo.id)| F.NA, h}" name="uid">
+ <input type="hidden" value="${c.form_errors.get('uid', c.uo.id)| F.NA}" name="uid">
</form>
</div>
</div>
Modified: wasko/branches/2.0/mpulsweb/templates/administration/edit_usergroup.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/administration/edit_usergroup.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/administration/edit_usergroup.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -55,14 +55,14 @@
<input type="checkbox" name="standin" value="${user.id | h}">
</td>
<td>
- ${user.last_name | F.NA, h}, ${user.first_name | F.NA, h}
+ ${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}">
</td>
<td class="table_row_v_12">
- ${user.last_name | F.NA, h}, ${user.first_name | F.NA, h}
+ ${user.last_name | F.NA}, ${user.first_name | F.NA}
</td>
% endif
</tr>
Modified: wasko/branches/2.0/mpulsweb/templates/administration/new_user_result.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/administration/new_user_result.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/administration/new_user_result.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -24,38 +24,38 @@
<table>
<tr>
<td class="label table_header_v table_width_long">${_('adm_form_label_forename')}</td>
- <td class="table_row_v table_description">${c.uo.first_name| F.NA, h}</td>
+ <td class="table_row_v table_description">${c.uo.first_name| F.NA}</td>
</tr>
<tr>
<td class="label">${_('adm_form_label_name')}</td>
- <td class="table_row_v_2">${c.uo.last_name| F.NA, h}</td>
+ <td class="table_row_v_2">${c.uo.last_name| F.NA}</td>
</tr>
<tr>
<td class="label table_header_v">${_('adm_form_label_phone')}</td>
- <td class="table_row_v table_description">${c.uo.telephone| F.NA, h}</td>
+ <td class="table_row_v table_description">${c.uo.telephone| F.NA}</td>
</tr>
<tr>
<td class="label">${_('adm_form_label_room')}</td>
- <td class="table_row_v_2">${c.uo.room| F.NA, h}</td>
+ <td class="table_row_v_2">${c.uo.room| F.NA}</td>
</tr>
<tr>
<td class="label table_header_v table_width_long">${_('adm_form_label_agency')}</td>
- <td class="table_row_v table_description">${c.uo.branchoffice| F.NA, h}</td>
+ <td class="table_row_v table_description">${c.uo.branchoffice| F.NA}</td>
</tr>
</table>
<h2>${_('adm_form_legend_login')}</h2>
<table>
<tr>
<td class="label table_header_v table_width_long">${_('adm_form_label_login')}</td>
- <td class="table_row_v table_description"><span id="newpassword">${c.uo.getLogin()| F.NA, h}</span></td>
+ <td class="table_row_v table_description"><span id="newpassword">${c.uo.getLogin()| F.NA}</span></td>
</tr>
<tr>
<td class="label">${_('adm_form_label_password')}</td>
- <td class="table_row_v_2"><span id="newpassword">${c.user_password| F.NA, h}</span></td>
+ <td class="table_row_v_2"><span id="newpassword">${c.user_password| F.NA}</span></td>
</tr>
<tr>
<td class="label table_header_v">${_('adm_form_label_role')}</td>
- <td class="table_row_v table_description">${c.uo.role| F.NA, h}</td>
+ <td class="table_row_v table_description">${c.uo.role| F.NA}</td>
</tr>
<tr>
<td class="label">${_('adm_form_label_activated')}</td>
Modified: wasko/branches/2.0/mpulsweb/templates/administration/overview_user.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/administration/overview_user.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/administration/overview_user.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -32,8 +32,8 @@
% if user.login != 'adm':
% if idset==0:
<tr>
- <td>${user.last_name| F.NA, h}</td>
- <td>${user.first_name| F.NA, h}</td>
+ <td>${user.last_name| F.NA}</td>
+ <td>${user.first_name| F.NA}</td>
% if user.getRole() == 'Admin':
<td><img src="/images/icons/admin_grey_tag.gif" alt="Administratorin, Administrator" title="Administrator/in"></td>
% else:
@@ -49,8 +49,8 @@
<% idset = 1 %>
% else:
<tr>
- <td class="table_row_h">${user.last_name| F.NA, h}</td>
- <td class="table_row_h">${user.first_name| F.NA, h}</td>
+ <td class="table_row_h">${user.last_name| F.NA}</td>
+ <td class="table_row_h">${user.first_name| F.NA}</td>
% if user.getRole() == 'Admin':
<td class="table_row_h"><img src="/images/icons/admin_grey_tag.gif" alt="Administratorin, Administrator" title="Administrator/in"></td>
% else:
Modified: wasko/branches/2.0/mpulsweb/templates/administration/overview_usergroups.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/administration/overview_usergroups.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/administration/overview_usergroups.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -29,7 +29,7 @@
% for group in c.group_overview:
% if idset==0:
<tr>
- <td>${group.name| F.NA, h}</td>
+ <td>${group.name| F.NA}</td>
<td>
<a href="/administration/showUserGroup/${group.id}"><img src="/images/icons/view_red.gif" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
<a href="/administration/deleteUserGroup/${group.id}"><img src="/images/icons/delete_red.gif" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
@@ -38,7 +38,7 @@
<% idset = 1 %>
% else:
<tr>
- <td class="table_row_h">${group.name| F.NA, h}</td>
+ <td class="table_row_h">${group.name| F.NA}</td>
<td class="table_row_h">
<a href="/administration/showUserGroup/${group.id}"><img src="/images/icons/view_red.gif" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
<a href="/administration/deleteUserGroup/${group.id}"><img src="/images/icons/delete_red.gif" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
Modified: wasko/branches/2.0/mpulsweb/templates/administration/reset_password.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/administration/reset_password.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/administration/reset_password.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -10,7 +10,7 @@
</%def>
<div class="dialog">
<h1><img src="/images/confirmation.png" alt="Bestäntigung"</> ${_('adm_header_resetpassword')}</h1>
-<p>${_('adm_con_rp_the_password')} <strong>${c.uo.first_name| F.NA, h} ${c.uo.last_name| F.NA, h}</strong> ${_('adm_con_rp_has_been_changed')}<br>
+<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>${c.new_password| h}</strong></p>
<a class="button" href="/administration/overviewUser">${_('adm_con_rp_to_useroverview')}</a>
</div>
Modified: wasko/branches/2.0/mpulsweb/templates/administration/show_user_body.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/administration/show_user_body.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/administration/show_user_body.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -3,27 +3,27 @@
<table>
<tr>
<td class="label table_header_v table_width_long">${_('adm_form_table_forename')}</td>
- <td class="table_row_v table_description">${c.uo.first_name | F.NA, h}</td>
+ <td class="table_row_v table_description">${c.uo.first_name | F.NA}</td>
</tr>
<tr>
<td class="label">${_('adm_form_table_name')}</td>
- <td class="table_row_v_2">${c.uo.last_name | F.NA, h}</td>
+ <td class="table_row_v_2">${c.uo.last_name | F.NA}</td>
</tr>
<tr>
<td class="label table_header_v">${_('adm_form_table_phone')}</td>
- <td class="table_row_v">${c.uo.telephone | F.NA, h}</td>
+ <td class="table_row_v">${c.uo.telephone | F.NA}</td>
</tr>
<tr>
<td class="label">${_('adm_form_table_room')}</td>
- <td class="table_row_v_2">${c.uo.room | F.NA, h}</td>
+ <td class="table_row_v_2">${c.uo.room | F.NA}</td>
</tr>
<tr>
<td class="label table_header_v">${_('adm_form_table_agency')}</td>
- <td class="table_row_v">${c.uo.branchoffice | F.NA, h}</td>
+ <td class="table_row_v">${c.uo.branchoffice | F.NA}</td>
</tr>
<tr>
<td class="label">${_('adm_form_table_replace')}</td>
- <td class="table_row_v_2">${c.vuo.name | F.NA, h}</td>
+ <td class="table_row_v_2">${c.vuo.name | F.NA}</td>
</tr>
</table>
<h2>${_('adm_form_header_login')}</h2>
Modified: wasko/branches/2.0/mpulsweb/templates/administration/show_usergroup.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/administration/show_usergroup.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/administration/show_usergroup.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -24,7 +24,7 @@
<table>
<tr>
<td class="label table_header_v table_width_long">${_('adm_form_usergroup_name')}</td>
- <td class="table_row_v table_description">${c.group.name | F.NA, h}</td>
+ <td class="table_row_v table_description">${c.group.name | F.NA}</td>
</tr>
</table>
<h2>${_('adm_form_legende_groupmember')}</h2>
@@ -37,11 +37,11 @@
<tr>
% if idset:
<td>
- ${user.last_name | F.NA, h}, ${user.first_name | F.NA, h}
+ ${user.last_name | F.NA}, ${user.first_name | F.NA}
</td>
% else:
<td class="table_row_v_12">
- ${user.last_name | F.NA, h}, ${user.first_name | F.NA, h}
+ ${user.last_name | F.NA}, ${user.first_name | F.NA}
</td>
% endif
</tr>
Modified: wasko/branches/2.0/mpulsweb/templates/appointments/overview_body.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/appointments/overview_body.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/appointments/overview_body.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -9,7 +9,7 @@
% for appointment in c.appointmentlist.getDatasets():
<tr>
<td class="date">${h.dd_mm_YYYY(appointment.getStartDate())}</td>
- <td class="title">${appointment.title | F.NA, h}</td>
+ <td class="title">${appointment.title | F.NA}</td>
<td class="action">
${self.showAppointmentActions(appointment)}
</td>
Modified: wasko/branches/2.0/mpulsweb/templates/appointments/remindlist_body.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/appointments/remindlist_body.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/appointments/remindlist_body.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -9,7 +9,7 @@
% for appointment in c.remindlist.getDatasets():
<tr>
<td class="date">${h.dd_mm_YYYY(appointment.getStartDate())}</td>
- <td class="title">${appointment.title | F.NA, h}</td>
+ <td class="title">${appointment.title | F.NA}</td>
<td class="action">
${self.showAppointmentActions(appointment)}
% if h.hasRole(['cm_ka']):
Modified: wasko/branches/2.0/mpulsweb/templates/appointments/show_body.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/appointments/show_body.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/appointments/show_body.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -23,7 +23,7 @@
</tr>
<tr>
<td class="label table_header_v">${_('app_table_title')}</td>
- <td class="table_row_v">${c.appointment.title | F.NA, h}</td>
+ <td class="table_row_v">${c.appointment.title | F.NA}</td>
</tr>
<tr>
<td class="label">${_('app_table_description')}</td>
Modified: wasko/branches/2.0/mpulsweb/templates/casebundle/editor.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/casebundle/editor.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/casebundle/editor.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -15,14 +15,14 @@
<p>${_('cm_bundle_editor_explain')}:</p>
<ul>
% for case in c.case_list:
- <li>${case.last_name | F.NA, h}, ${case.first_name | F.NA, h}</li>
+ <li>${case.last_name | F.NA}, ${case.first_name | F.NA}</li>
% endfor
</ul>
% if h.hasRole(['admin_ka']):
<form action="${h.url_for(controller="case_bundle", action="set_editor")}" method="POST">
<select name="editor">
% for user in c.user_list:
- <option value="${user.id | F.NA, h}">${user.last_name | F.NA, h} ${user.first_name | F.NA, h}</option>
+ <option value="${user.id | F.NA}">${user.last_name | F.NA} ${user.first_name | F.NA}</option>
% endfor
</select>
<input type="submit" value="${_('cm_form_editor_submit')}">
Modified: wasko/branches/2.0/mpulsweb/templates/casebundle/standin.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/casebundle/standin.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/casebundle/standin.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -19,7 +19,7 @@
<ul>
% for case in c.case_list:
% if case.getEditor().id == c.current_user.id or c.current_user.isAdmin():
- <li>${case.last_name | F.NA, h}, ${case.first_name | F.NA, h}</li>
+ <li>${case.last_name | F.NA}, ${case.first_name | F.NA}</li>
% else:
<li class="organisation_not_editor">${case.last_name}, ${case.first_name} (Nicht BearbeiterIn der Akte - Vertretung wird nicht geändert!)</li>
% endif
@@ -38,7 +38,7 @@
<tr>
% if idset:
<td><input type="checkbox" name="standin-${group.id | h}" value="${group.id | h}"></td>
- <td>${group.name | F.NA, h}</td>
+ <td>${group.name | F.NA}</td>
% else:
<td class="table_row_v_12"><input type="checkbox" name="standin-${group.id | h}" value="${group.id | h}"></td>
<td class="table_row_v_12">${group.name}</td>
Modified: wasko/branches/2.0/mpulsweb/templates/casemanagement/organisation.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/casemanagement/organisation.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/casemanagement/organisation.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -16,14 +16,14 @@
<h2>${_('cm_header_organisation_editor')}</h2>
<table>
<tr>
- <td class="label table_header_v table_width_mid_l">${_('cm_organisation_tbl_label_lastname')}</td><td class=" table_row_v table_description">${c.editor.last_name | F.NA, h}</td>
+ <td class="label table_header_v table_width_mid_l">${_('cm_organisation_tbl_label_lastname')}</td><td class=" table_row_v table_description">${c.editor.last_name | F.NA}</td>
</tr>
<tr>
- <td class="label">${_('cm_organisation_tbl_label_firstname')}</td><td class=" table_row_v_2">${c.editor.first_name | F.NA, h}
+ <td class="label">${_('cm_organisation_tbl_label_firstname')}</td><td class=" table_row_v_2">${c.editor.first_name | F.NA}
</td>
</tr>
<tr>
- <td class="label table_header_v">${_('cm_organisation_tbl_label_telephone')}</td><td class=" table_row_v">${c.editor.telephone | F.NA, h}
+ <td class="label table_header_v">${_('cm_organisation_tbl_label_telephone')}</td><td class=" table_row_v">${c.editor.telephone | F.NA}
</td>
</tr>
</table>
@@ -32,7 +32,7 @@
<input type="hidden" name="case_id" value="${session.get('case').id}">
<select name="editor">
% for user in c.user_list:
- <option value="${user.id | F.NA, h}">${user.last_name | F.NA, h}, ${user.first_name | F.NA, h}</option>
+ <option value="${user.id | F.NA}">${user.last_name | F.NA}, ${user.first_name | F.NA}</option>
% endfor
</select>
<input type="submit" value="${_('cm_form_editor_submit')}">
@@ -56,14 +56,14 @@
% else:
<td><input type="checkbox" name="standin-${group.id | h}" value="${group.id | h}"></td>
% endif
- <td>${group.name | F.NA, h}</td>
+ <td>${group.name | F.NA}</td>
% else:
% if group.id in c.standin.getGroups():
<td class="table_row_v_12"><input type="checkbox" name="standin-${group.id | h}" value="${group.id | h}" checked></td>
% else:
<td class="table_row_v_12"><input type="checkbox" name="standin-${group.id | h}" value="${group.id | h}"></td>
% endif
- <td class="table_row_v_12">${group.name | F.NA, h}</td>
+ <td class="table_row_v_12">${group.name | F.NA}</td>
% endif
</tr>
<% idset = not idset %>
@@ -81,12 +81,12 @@
% if group.id in c.standin.getGroups():
% if idset==0:
<tr>
- <td>${group.name | F.NA, h}</td>
+ <td>${group.name | F.NA}</td>
</tr>
<% idset = 1 %>
% else:
<tr>
- <td class="table_row_h">${group.name | F.NA, h}</td>
+ <td class="table_row_h">${group.name | F.NA}</td>
</tr>
<% idset = 0 %>
% endif
Modified: wasko/branches/2.0/mpulsweb/templates/dialogs/failed.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/dialogs/failed.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/dialogs/failed.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -1,7 +1,7 @@
## -*- coding: utf-8 -*-
<%! import mpulsweb.lib.helper.filters as F %>
<div class="dialog" />
-<h1><img src="/images/failure.png" alt="Fehler"/>${c.dialog_title | F.NA, h}</h1>
+<h1><img src="/images/failure.png" alt="Fehler"/>${c.dialog_title | F.NA}</h1>
<p>${c.dialog_text | F.NA}</p>
<a class="button" href="${c.url_ok}">${_('dialog_header_confirm_option_ok')}</a>
</div>
Modified: wasko/branches/2.0/mpulsweb/templates/dialogs/success.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/dialogs/success.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/dialogs/success.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -1,7 +1,7 @@
## -*- coding: utf-8 -*-
<%! import mpulsweb.lib.helper.filters as F %>
<div class="dialog" />
-<h1><img src="/images/confirmation.png" alt="Erledigt"/>${c.dialog_title or c.success_for | F.NA, h}</h1>
-<p>${c.dialog_text or c.success_text | F.NA, h}</p>
+<h1><img src="/images/confirmation.png" alt="Erledigt"/>${c.dialog_title or c.success_for | F.NA}</h1>
+<p>${c.dialog_text or c.success_text | F.NA}</p>
<a class="button" href="${c.url_ok}">${_('dialog_header_confirm_option_ok')}</a>
</div>
Modified: wasko/branches/2.0/mpulsweb/templates/home/globalappointmentlist.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/home/globalappointmentlist.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/home/globalappointmentlist.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -13,7 +13,7 @@
% for appointment in c.globalappointmentlist.getDatasets():
<tr>
<td class="date">${h.format_date(appointment.getStartDate())}</td>
- <td class="title">${appointment.title | F.NA, h}</td>
+ <td class="title">${appointment.title | F.NA}</td>
<td class="action">
${self.showAppointmentActions(appointment)}
</td>
Modified: wasko/branches/2.0/mpulsweb/templates/phase/dialogs/success_set_phase.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/phase/dialogs/success_set_phase.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/phase/dialogs/success_set_phase.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -7,8 +7,8 @@
<li><a href="#">${_('case_cm_phase')}</a></li>
</%def>
<div class="dialog" />
- <h1><img src="/images/confirmation.png" alt="Erledigt"/>${c.dialog_title | F.NA, h}</h1>
- <p>${c.dialog_text | F.NA, h}</p>
+ <h1><img src="/images/confirmation.png" alt="Erledigt"/>${c.dialog_title | F.NA}</h1>
+ <p>${c.dialog_text | F.NA}</p>
<div class="import_box_dialog">
<p>
Beachten Sie, dass bei einem Phasenwechsel die Fallakte in ausgedruckter
Modified: wasko/branches/2.0/mpulsweb/templates/settings/show.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/settings/show.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/settings/show.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -34,16 +34,16 @@
<td class="label table_header_v table_width_name">
${_('adm_form_settings_kaname')}
</td>
- <td class="table_row_v table_description">${c.agency.getName()| F.NA, h}
+ <td class="table_row_v table_description">${c.agency.getName()| F.NA}
</td>
</tr>
<tr>
<td class="label">${_('adm_form_settings_fkz')}</td>
- <td class="table_row_v_2">${c.agency.getFKZ()| F.NA, h}</td>
+ <td class="table_row_v_2">${c.agency.getFKZ()| F.NA}</td>
</tr>
<tr>
<td class="label table_header_v">${_('adm_form_settings_max_savetime')}</td>
- <td class="table_row_v">${c.agency.getMaxSavetime()| F.NA, h}</td>
+ <td class="table_row_v">${c.agency.getMaxSavetime()| F.NA}</td>
</tr>
<tr>
<td class="label table_header">${_('adm_form_settings_anontransfer')}</td>
Modified: wasko/branches/2.0/mpulsweb/templates/usersettings/edit_standin.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/usersettings/edit_standin.mako 2010-03-23 08:04:30 UTC (rev 2061)
+++ wasko/branches/2.0/mpulsweb/templates/usersettings/edit_standin.mako 2010-03-23 08:10:10 UTC (rev 2062)
@@ -24,9 +24,9 @@
<select name="standin" id="standin">
% for g in c.grouplist:
% if g.id == c.uo.standin:
- <option value="${g.id}" selected>${g.name | F.NA, h}</option>
+ <option value="${g.id}" selected>${g.name | F.NA}</option>
% else:
- <option value="${g.id}">${g.name | F.NA, h}</option>
+ <option value="${g.id}">${g.name | F.NA}</option>
% endif
% endfor
% if c.uo.standin is None:
More information about the Mpuls-commits
mailing list