[Mpuls-commits] r2744 - in base/trunk: . mpulsweb/templates/casemanagement mpulsweb/templates/casemanagement/dialogs
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue May 25 20:11:47 CEST 2010
Author: bh
Date: 2010-05-25 20:11:41 +0200 (Tue, 25 May 2010)
New Revision: 2744
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/templates/casemanagement/appointmentlist.mako
base/trunk/mpulsweb/templates/casemanagement/appointments.mako
base/trunk/mpulsweb/templates/casemanagement/caselist.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_anonymize.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_export.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_markanonymize.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/failed_markanonymize.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_anonymize.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_create_appointment.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_edit_appointment.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_export.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_markanonymize.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_restore.mako
base/trunk/mpulsweb/templates/casemanagement/digest.mako
base/trunk/mpulsweb/templates/casemanagement/digest_body.mako
base/trunk/mpulsweb/templates/casemanagement/editAppointment.mako
base/trunk/mpulsweb/templates/casemanagement/main.mako
base/trunk/mpulsweb/templates/casemanagement/new.mako
base/trunk/mpulsweb/templates/casemanagement/newAppointment.mako
base/trunk/mpulsweb/templates/casemanagement/organisation.mako
base/trunk/mpulsweb/templates/casemanagement/overview.mako
base/trunk/mpulsweb/templates/casemanagement/reminderlist.mako
base/trunk/mpulsweb/templates/casemanagement/search.mako
base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako
Log:
* mpulsweb/templates/casemanagement/appointmentlist.mako,
mpulsweb/templates/casemanagement/appointments.mako,
mpulsweb/templates/casemanagement/caselist.mako,
mpulsweb/templates/casemanagement/dialogs/confirm.mako,
mpulsweb/templates/casemanagement/dialogs/confirm_anonymize.mako,
mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako,
mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako,
mpulsweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako,
mpulsweb/templates/casemanagement/dialogs/confirm_export.mako,
mpulsweb/templates/casemanagement/dialogs/confirm_markanonymize.mako,
mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako,
mpulsweb/templates/casemanagement/dialogs/failed_markanonymize.mako,
mpulsweb/templates/casemanagement/dialogs/success_anonymize.mako,
mpulsweb/templates/casemanagement/dialogs/success_create_appointment.mako,
mpulsweb/templates/casemanagement/dialogs/success_delete.mako,
mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako,
mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako,
mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako,
mpulsweb/templates/casemanagement/dialogs/success_edit_appointment.mako,
mpulsweb/templates/casemanagement/dialogs/success_export.mako,
mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako,
mpulsweb/templates/casemanagement/dialogs/success_markanonymize.mako,
mpulsweb/templates/casemanagement/dialogs/success_restore.mako,
mpulsweb/templates/casemanagement/digest.mako,
mpulsweb/templates/casemanagement/digest_body.mako,
mpulsweb/templates/casemanagement/editAppointment.mako,
mpulsweb/templates/casemanagement/main.mako,
mpulsweb/templates/casemanagement/new.mako,
mpulsweb/templates/casemanagement/newAppointment.mako,
mpulsweb/templates/casemanagement/organisation.mako,
mpulsweb/templates/casemanagement/overview.mako,
mpulsweb/templates/casemanagement/reminderlist.mako,
mpulsweb/templates/casemanagement/search.mako,
mpulsweb/templates/casemanagement/showAppointment.mako: Use
h.url_for consistently for all-intra application URLs.
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/ChangeLog 2010-05-25 18:11:41 UTC (rev 2744)
@@ -1,5 +1,43 @@
2010-05-25 Bernhard Herzog <bh at intevation.de>
+ * mpulsweb/templates/casemanagement/appointmentlist.mako,
+ mpulsweb/templates/casemanagement/appointments.mako,
+ mpulsweb/templates/casemanagement/caselist.mako,
+ mpulsweb/templates/casemanagement/dialogs/confirm.mako,
+ mpulsweb/templates/casemanagement/dialogs/confirm_anonymize.mako,
+ mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako,
+ mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako,
+ mpulsweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako,
+ mpulsweb/templates/casemanagement/dialogs/confirm_export.mako,
+ mpulsweb/templates/casemanagement/dialogs/confirm_markanonymize.mako,
+ mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako,
+ mpulsweb/templates/casemanagement/dialogs/failed_markanonymize.mako,
+ mpulsweb/templates/casemanagement/dialogs/success_anonymize.mako,
+ mpulsweb/templates/casemanagement/dialogs/success_create_appointment.mako,
+ mpulsweb/templates/casemanagement/dialogs/success_delete.mako,
+ mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako,
+ mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako,
+ mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako,
+ mpulsweb/templates/casemanagement/dialogs/success_edit_appointment.mako,
+ mpulsweb/templates/casemanagement/dialogs/success_export.mako,
+ mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako,
+ mpulsweb/templates/casemanagement/dialogs/success_markanonymize.mako,
+ mpulsweb/templates/casemanagement/dialogs/success_restore.mako,
+ mpulsweb/templates/casemanagement/digest.mako,
+ mpulsweb/templates/casemanagement/digest_body.mako,
+ mpulsweb/templates/casemanagement/editAppointment.mako,
+ mpulsweb/templates/casemanagement/main.mako,
+ mpulsweb/templates/casemanagement/new.mako,
+ mpulsweb/templates/casemanagement/newAppointment.mako,
+ mpulsweb/templates/casemanagement/organisation.mako,
+ mpulsweb/templates/casemanagement/overview.mako,
+ mpulsweb/templates/casemanagement/reminderlist.mako,
+ mpulsweb/templates/casemanagement/search.mako,
+ mpulsweb/templates/casemanagement/showAppointment.mako: Use
+ h.url_for consistently for all-intra application URLs.
+
+2010-05-25 Bernhard Herzog <bh at intevation.de>
+
* mpulsweb/templates/casebundle/dialogs/confirm_anonymize.mako,
mpulsweb/templates/casebundle/dialogs/error.mako,
mpulsweb/templates/casebundle/dialogs/success_anonymize.mako,
Modified: base/trunk/mpulsweb/templates/casemanagement/appointmentlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/appointmentlist.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/appointmentlist.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -3,13 +3,14 @@
<a href="${h.url_for(controller='/caseappointment',
action='show', id=appointment.id,
confirmed='1')}">
- <img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}"
- title="${_('cm_overview_a_show')}">
+ <img src="${h.url_for('/images/icons/open_active_22.png')}" border="0"
+ alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}">
</a>
% if h.hasRole(['cm_ka']):
<a href="${h.url_for(controller='/caseappointment', action='delete',
id=appointment.id, confirmed=0)}">
- <img src="/images/icons/delete_active_22.png" border="0"
+ <img src="${h.url_for('/images/icons/delete_active_22.png')}"
+ border="0"
alt="${_('cm_overview_a_delete')}"
title="${_('cm_overview_a_delete')}">
</a>
Modified: base/trunk/mpulsweb/templates/casemanagement/appointments.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/appointments.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/appointments.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -1,8 +1,8 @@
<%inherit file="main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
- <li><a href="/caseappointment/index/${session.get('case').id}">${_('app_np_list')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('app_np_list')}</a></li>
</%def>
<div id="content_header_small">
Modified: base/trunk/mpulsweb/templates/casemanagement/caselist.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/caselist.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/caselist.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -24,7 +24,7 @@
fn = d.overview_label
fs = d.overview_style
print f
- field = (fn,f,fs, all_roles,
+ field = (fn,f,fs, all_roles,
lambda case, f=f: h.shorten(case.get_value(f), 15))
fields.append(field)
@@ -47,28 +47,29 @@
% for title, urlpart, style, roles, get_value in fields:
% if h.hasRole(roles):
<th class="${style} table_header_h">${title}
- <a href="/case_overview/overview?sort_field=${urlpart}&sort_order=asc">
+ <a href="${h.url_for(controller='case_overview', action='overview',
+ sort_field=urlpart, sort_order='asc')}">
<img class = "sorticon"
%if c.sort_field == urlpart and c.sort_order == 'asc':
- src = "/images/icons/sort_asc_active.png"
+ src = "${h.url_for('/images/icons/sort_asc_active.png')}"
alt = "${_("Sorted by %s in ascending order") % title}"
title = "${_("Sorted by %s in ascending order") % title}"
%else:
- src = "/images/icons/sort_asc.png"
+ src = "${h.url_for('/images/icons/sort_asc.png')}"
alt = "${_("Sort in ascending order")}"
title = "${_("Sort in ascending order")}"
- title = "${c.sort_field} - ${c.sort_order}"
%endif
width = "10"
height = "9"></a>
- <a href="/case_overview/overview?sort_field=${urlpart}&sort_order=desc">
+ <a href="${h.url_for(controller='case_overview', action='overview',
+ sort_field=urlpart, sort_order='desc')}">
<img class = "sorticon"
%if c.sort_field == urlpart and c.sort_order == 'desc':
- src = "/images/icons/sort_desc_active.png"
+ src = "${h.url_for('/images/icons/sort_desc_active.png')}"
alt = "${_("Sorted by %s in descending order") % title}"
title = "${_("Sorted by %s in descending order") % title}"
%else:
- src = "/images/icons/sort_desc.png"
+ src = "${h.url_for('/images/icons/sort_desc.png')}"
alt = "${_("Sort in descending order")}"
title = "${_("Sort in descending order")}"
%endif
@@ -94,11 +95,12 @@
% endif
% for title, urlpart, style, roles, get_value in fields:
% if h.hasRole(roles):
- <td><a href="/case/select/${case.id}/0/">${get_value(case) | F.NA}</a></td>
+ <td><a href="${h.url_for(controller='/case', action='select',
+ id=case.id, confirmed=0)}">${get_value(case) | F.NA}</a></td>
% endif
% endfor
<td>
- ${get_phase_icon(case)}
+ ${get_phase_icon(case)}
</td>
<td>
${get_state_icon(case)}
@@ -143,40 +145,46 @@
<%def name="get_state_icon(case)">
% if h.hasRole(['cm_ka']):
% if str(case.getEditor().id) == str(session.get('USER_AUTHORIZED').id):
- <img src = "/images/icons/edit_editor.png" border="0"
- alt = "${_('cm_overview_img_editor')}"
+ <img src = "${h.url_for('/images/icons/edit_editor.png')}"
+ border = "0"
+ alt = "${_('cm_overview_img_editor')}"
title = "${_('cm_overview_img_editor')}"
width = "22"
height = "22">
% else:
- <img src = "/images/icons/edit_editors_22.png" border="0"
- alt = "${_('cm_overview_img_standin')}"
+ <img src = "${h.url_for('/images/icons/edit_editors_22.png')}"
+ border = "0"
+ alt = "${_('cm_overview_img_standin')}"
title = "${_('cm_overview_img_standin')}"
width = "22"
height = "22">
% endif
% endif
% if case.getState().getState() in (1,2):
- <img src = "/images/icons/edit_22.png" border="0"
- alt = "${_('case_state_label_open')}"
+ <img src = "${h.url_for('/images/icons/edit_22.png')}"
+ border = "0"
+ alt = "${_('case_state_label_open')}"
title = "${_('case_state_label_open')}"
width = "22"
height = "22">
% elif case.getState().getState() == 3:
- <img src = "/images/icons/delete_inactive_22.png" border="0"
- alt = "${_('case_state_label_markdelete')}"
+ <img src = "${h.url_for('/images/icons/delete_inactive_22.png')}"
+ border = "0"
+ alt = "${_('case_state_label_markdelete')}"
title = "${_('case_state_label_markdelete')}"
width = "22"
height = "22">
% elif case.getState().getState() == 4:
- <img src = "/images/icons/anonymise_inactive_22.png" border="0"
- alt = "${_('case_state_label_markanonym')}"
+ <img src = "${h.url_for('/images/icons/anonymise_inactive_22.png')}"
+ border = "0"
+ alt = "${_('case_state_label_markanonym')}"
title = "${_('case_state_label_markanonym')}"
width = "22"
height = "22">
% elif case.getState().getState() == 5:
- <img src = "/images/icons/anonymise_inactive_22.png" border="0"
- alt = "${_('case_state_label_anonym')}"
+ <img src = "${h.url_for('/images/icons/anonymise_inactive_22.png')}"
+ border = "0"
+ alt = "${_('case_state_label_anonym')}"
title = "${_('case_state_label_anonym')}"
width = "22"
height = "22">
@@ -185,48 +193,61 @@
<%def name="get_actions(case)">
% if case.getState().getState() != 5:
- <a href="/case/select/${case.id}/0/">
- <img src = "/images/icons/open_active_22.png" border="0"
- alt = "${_('cm_overview_a_show')}"
+ <a href="${h.url_for(controller='case', action='select', id=case.id,
+ confirm=0)}">
+ <img src = "${h.url_for('/images/icons/open_active_22.png')}"
+ border = "0"
+ alt = "${_('cm_overview_a_show')}"
title = "${_('cm_overview_a_show')}"
width = "22"
height = "22"></a>
% endif
% if h.hasRole(['admin_ka']):
% if case.getState().getState() in (3, 5):
- <a href="/case/delete/${case.id}/0/">
- <img src = "/images/icons/delete_active_22.png" border="0"
- alt = "${_('Delete case')}"
+ <a href="${h.url_for(controller='case', action='delete', id=case.id,
+ confirm=0)}">
+ <img src = "${h.url_for('/images/icons/delete_active_22.png')}"
+ border = "0"
+ alt = "${_('Delete case')}"
title = "${_('Delete case')}"
width = "22"
height = "22"></a>
% endif
% if case.getState().getState() == 4:
- <a href="/case/anonymize/${case.id}/0/">
- <img src = "/images/icons/anonymise_active_22.png" border="0"
- alt = "${_('cm_overview_a_anonymize')}"
+ <a href="${h.url_for(controller='case', action='anonymize', id=case.id,
+ confirm=0)}">
+ <img src = "${h.url_for('/images/icons/anonymise_active_22.png')}"
+ border = "0"
+ alt = "${_('cm_overview_a_anonymize')}"
title = "${_('cm_overview_a_anonymize')}"
width = "22"
height = "22"></a>
% endif
% if case.getState().getState() in (3, 4):
- <a href="/case/restore/${case.id}/0/">
- <img src = "/images/icons/refresh_active_22.png" border="0"
- alt = "${_('cm_overview_a_restore')}"
+ <a href="${h.url_for(controller='case', action='restore', id=case.id,
+ confirm=0)}">
+ <img src = "${h.url_for('/images/icons/refresh_active_22.png')}"
+ border = "0"
+ alt = "${_('cm_overview_a_restore')}"
title = "${_('cm_overview_a_restore')}"
width = "22"
height = "22"></a>
% endif
% elif h.hasRole(['cm_ka']) and case.getState().getState() in (1, 2):
- <a href="/case/markForAnonymizeFromOverview/${case.id}/0/">
- <img src = "/images/icons/anonymise_active_22.png" border="0"
- alt = "${_('cm_overview_a_anonymize')}"
+ <a href="${h.url_for(controller='case',
+ action='markForAnonymizeFromOverview', id=case.id,
+ confirm=0)}">
+ <img src = "${h.url_for('/images/icons/anonymise_active_22.png')}"
+ border = "0"
+ alt = "${_('cm_overview_a_anonymize')}"
title = "${_('cm_overview_a_anonymize')}"
width = "22"
- height = "22"></a>
- <a href="/case/markForDelete/${case.id}/0/">
- <img src = "/images/icons/delete_active_22.png" border="0"
- alt = "${_('cm_overview_a_delete')}"
+ height = "22"></a>
+ <a href="${h.url_for(controller='case', action='markForDelete', id=case.id,
+ confirm=0)}">
+ <img src = "${h.url_for('/images/icons/delete_active_22.png')}"
+ border = "0"
+ alt = "${_('cm_overview_a_delete')}"
title = "${_('cm_overview_a_delete')}"
width = "22"
height = "22"></a>
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -2,7 +2,7 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/">${_('cm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_delete')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_anonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_anonymize.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_anonymize.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -6,9 +6,10 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
%if case:
- <li><a href="/case/select/${case.id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select',
+ id=case.id, confirmed=1)}">${_('cm_np_select')}</a></li>
%else:
- <li><a href="/case_overview">${_('cm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/case_overview')}">${_('cm_np_overview')}</a></li>
%endif
<li><a href="#">${_('cm_np_anonymize')}</a></li>
</%def>
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -2,7 +2,7 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/">${_('cm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_delete')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -1,8 +1,8 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
- <li><a href="/caseappointment/index/${session.get('case').id}">${_('menu_app_link_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('menu_app_link_overview')}</a></li>
<li><a href="#">${_('app_np_delete')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -1,8 +1,8 @@
<%inherit file="../../casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
- <li><a href="/casedocument/index/${session.get('case').id}">${_('cm_np_att_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">${_('cm_np_att_overview')}</a></li>
<li><a href="#">${_('cm_np_attachment_confirm')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_export.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_export.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_export.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -2,12 +2,14 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/">${_('cm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_export')}</a></li>
</%def>
<div class="dialog" />
-<h1><img src="/images/icons/info/question.png" alt="achtung"/>${c.dialog_title or c.confirm_for}</h1>
-<form action="/case_bundle/exportAction" method="GET">
+<h1><img src="${h.url_for('/images/icons/info/question.png')}"
+ alt="achtung"/>${c.dialog_title or c.confirm_for}</h1>
+<form action="${h.url_for(controller='/case_bundle', action='exportAction')}"
+ method="GET">
<% case_bundle = session.get('casebundle') %>
% if case_bundle and len(case_bundle.case_list) > 1:
<h3>Ausgewählte Fallakten</h3>
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_markanonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_markanonymize.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_markanonymize.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -6,9 +6,9 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
%if case:
- <li><a href="/case/select/${case.id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=case.id, confirmed=1)}">${_('cm_np_select')}</a></li>
%else:
- <li><a href="/case_overview">${_('cm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/case_overview')}">${_('cm_np_overview')}</a></li>
%endif
<li><a href="#">${_('cm_np_anonymize')}</a></li>
</%def>
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -2,7 +2,7 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/">${_('cm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_restore')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/failed_markanonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/failed_markanonymize.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/failed_markanonymize.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -2,7 +2,7 @@
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
<li><a href="#">${_('cm_np_anonymize')}</a></li>
</%def>
<%include file="/dialogs/notification.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_anonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_anonymize.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_anonymize.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -6,9 +6,9 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
%if case:
- <li><a href="/case/select/${case.id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=case.id, confirmed=1)}">${_('cm_np_select')}</a></li>
%else:
- <li><a href="/case_overview">${_('cm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/case_overview')}">${_('cm_np_overview')}</a></li>
%endif
<li><a href="#">${_('cm_np_anonymize')}</a></li>
</%def>
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_create_appointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_create_appointment.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_create_appointment.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -2,8 +2,8 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
- <li><a href="/caseappointment/index/${session.get('case').id}">${_('app_np_list')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('app_np_list')}</a></li>
<li><a href="#">${_('app_np_new')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case">${_('cm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_delete_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -2,8 +2,8 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
- <li><a href="/caseappointment/index/${session.get('case').id}">${_('menu_app_link_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('menu_app_link_overview')}</a></li>
<li><a href="#">${_('app_np_delete')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -1,10 +1,10 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case">${_('cm_np_root')}</a></li>
- <li><a href="/case/case_overview">${_('cm_np_overview')}</a></li>
- <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
- <li><a href="/casedocument/index/${session.get('case').id}">${_('cm_np_doc_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='case_overview')}">${_('cm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">${_('cm_np_doc_overview')}</a></li>
<li><a href="#">${_('cm_np_delete_attachment_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case">${_('cm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_delete_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_edit_appointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_edit_appointment.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_edit_appointment.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -2,8 +2,8 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
- <li><a href="/caseappointment/index/${session.get('case').id}">${_('app_np_list')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('app_np_list')}</a></li>
<li><a href="#">${_('app_np_edit')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_export.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_export.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_export.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case">${_('cm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_export_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case">${_('cm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_keepactive_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_markanonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_markanonymize.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_markanonymize.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -6,9 +6,9 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
%if case:
- <li><a href="/case/select/${case.id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=case.id, confirmed=1)}">${_('cm_np_select')}</a></li>
%else:
- <li><a href="/case_overview">${_('cm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/case_overview')}">${_('cm_np_overview')}</a></li>
%endif
<li><a href="#">${_('cm_np_anonymize')}</a></li>
</%def>
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_restore.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_restore.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_restore.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case">${_('cm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_restore_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/digest.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/digest.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/digest.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -3,7 +3,9 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
- <li><a href="/case/digest/${session.get('case').id}">${_('cm_np_digest')}</a></li>
+ <li><a href="${h.url_for(controller='case', action='select',
+ id=session['case'].id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='case', action='digest',
+ id=session['case'].id)}">${_('cm_np_digest')}</a></li>
</%def>
<%include file="digest_body.mako"/>
Modified: base/trunk/mpulsweb/templates/casemanagement/digest_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/digest_body.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/digest_body.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -14,7 +14,8 @@
<div class="dialog">
% if c.finished:
<h1>
- <img src="/images/icons/info/alert.png" alt="achtung"/>
+ <img src="${h.url_for('/images/icons/info/alert.png')}"
+ alt="achtung"/>
Maximale Speicherdauer überschritten!
</h1>
<p>
@@ -27,7 +28,8 @@
</p>
% else:
<h1>
- <img src="/images/icons/info/question.png" alt="achtung"/>Inaktiver Fall?
+ <img src="${h.url_for('/images/icons/info/question.png')}"
+ alt="achtung"/>Inaktiver Fall?
</h1>
<p>
Für die Fallakte konnte seit
@@ -67,7 +69,9 @@
<div class="actions">
<ul>
<li>
- <a href="/case/printdigest/${session['case'].id}" target="_blank"
+ <a href="${h.url_for(controller='case', action='printdigest',
+ id=session['case'].id)}"
+ target="_blank"
onclick="return checkModification();">
${_('cm_actions_link_printout')}
</a>
Modified: base/trunk/mpulsweb/templates/casemanagement/editAppointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/editAppointment.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/editAppointment.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -9,8 +9,8 @@
%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
- <li><a href="/caseappointment/index/${c.appointment.case_id}">${_('app_np_list')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/caseappointment', action='index', id=c.appointment.case_id)}">${_('app_np_list')}</a></li>
<li><a href="#"></a>${_('app_np_edit')}</li>
</%def>
<div id="content_header_small">
Modified: base/trunk/mpulsweb/templates/casemanagement/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/main.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/main.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -5,8 +5,10 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/" onclick="return checkModification();">${_('cm_np_root')}</a></li>
- <li><a href="/case_overview/overview/" onclick="return checkModification();">${_('cm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='case')}"
+ onclick="return checkModification();">${_('cm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='case_overview', action='overview')}"
+ onclick="return checkModification();">${_('cm_np_overview')}</a></li>
</%def>
<%def name="buildModusfield()">
</%def>
@@ -35,26 +37,34 @@
% if session.get('case').getState().getState() not in (3,4,5):
% if not session.get('case').hasPrivacyStatement():
<li>
- <a href="/privacy/set/${session.get('case').id}"
- onclick="return checkModification();">${_('cm_main_set_statement')}
+ <a href="${h.url_for(controller='privacy', action='set',
+ id=session.get('case').id)}"
+ onclick="return checkModification();">${_('cm_main_set_statement')}
</a>
</li>
% elif session.get('case').hasPrivacyStatement():
<li>
- <a href="/privacy/decline/${session.get('case').id}/0"
- onclick="return checkModification();">${_('cm_main_revoke_statement')}
+ <a href="${h.url_for(controller='privacy',
+ action='decline',
+ id=session.get('case').id,
+ confirmed=0)}"
+ onclick="return checkModification();">${_('cm_main_revoke_statement')}
</a>
</li>
% endif
<li>
- <a href="/case/markForAnonymize/${session.get('case').id}/0"
+ <a href="${h.url_for(controller='case',
+ action='markForAnonymize',
+ id=session.get('case').id,
+ confirmed=0)}"
onclick="return checkModification();">${_('cm_main_anonymize_case')}
</a>
</li>
% endif
<li>
- <a href="/privacy/listStatements"
- onclick="return checkModification();"> ${_('statement_list_statement')}
+ <a href="${h.url_for(controller='privacy',
+ action='listStatements')}"
+ onclick="return checkModification();"> ${_('statement_list_statement')}
</a>
</li>
</ul>
@@ -76,14 +86,16 @@
onclick="return checkModification();">${_('cm_menu_link_backtooverview')}</a>
</li>
<li>
- <a href="/case/digest/${session.get('case').id}"
- onclick="return checkModification();">
+ <a href="${h.url_for(controller='case', action='digest',
+ id=session.get('case').id)}"
+ onclick="return checkModification();">
${_('cm_menu_link_digest')}
</a>
</li>
<li>
- <a href="/phase/overview/${session.get('case').id}"
- onclick="return checkModification();">${_('case_cm_phase')}</a>
+ <a href="${h.url_for(controller='phase', action='overview',
+ id=session.get('case').id)}"
+ onclick="return checkModification();">${_('case_cm_phase')}</a>
</li>
</ul>
% endif
@@ -93,35 +105,46 @@
<ul>
% if h.hasRole(['cm_ka', 'admin_ka']):
<li>
- <a href="/case/organisation/${session.get('case').id}"
+ <a href="${h.url_for(controller='case',
+ action='organisation',
+ id=session.get('case').id)}"
onclick="return checkModification();">
${_('cm_menu_link_organisation')}
</a>
</li>
% if g.mpuls_config.is_enabled('case-module', 'tags'):
<li>
- <a href="/tags/overview/${session.get('case').id}"
- onclick="return checkModification();">
+ <a href="${h.url_for(controller='tags',
+ action='overview',
+ id=session.get('case').id)}"
+ onclick="return checkModification();">
${_('Tags')}
</a>
</li>
% endif
% if g.mpuls_config.is_enabled('case-module', 'appointments'):
<li>
- <a href="/caseappointment/index/${session.get('case').id}"
- onclick="return checkModification();">
+ <a href="${h.url_for(controller='caseappointment',
+ action='index',
+ id=session.get('case').id)}"
+ onclick="return checkModification();">
${_('cm_menu_link_appointment')}
</a>
</li>
% endif
% if g.mpuls_config.is_enabled('case-module', 'reminders'):
<li>
- <a href="/caseappointment/newReminder/${session.get('case').id}" onclick="return checkModification();"> ${_('cm_menu_link_create_reminder')}</a>
+ <a href="${h.url_for(controller='caseappointment',
+ action='newReminder',
+ id=session.get('case').id)}"
+ onclick="return checkModification();"> ${_('cm_menu_link_create_reminder')}</a>
</li>
% endif
% if h.hasRole(['cm_ka']) and g.mpuls_config.is_enabled('case-module', 'logbook'):
<li>
- <a href="/logbook/index/${session.get('case').id}"
+ <a href="${h.url_for(controller='logbook',
+ action='index',
+ id=session.get('case').id)}"
onclick="return checkModification();">
Tagebuch
</a>
@@ -129,14 +152,18 @@
% endif
% if g.mpuls_config.is_enabled('case-module', 'documents'):
<li>
- <a href="/casedocument/index/${session.get('case').id}"
- onclick="return checkModification();">
+ <a href="${h.url_for(controller='casedocument',
+ action='index',
+ id=session.get('case').id)}"
+ onclick="return checkModification();">
${_('cm_menu_link_documents')}
</a>
</li>
% endif
<li>
- <a href="/case/printAll/${session.get('case').id}/0"
+ <a href="${h.url_for(controller='case', action='printAll',
+ id=session.get('case').id,
+ confirmed=0)}"
onclick="return checkModification();"
target="_blank">${_('cm_menu_link_print')}</a>
</li>
@@ -151,27 +178,27 @@
<div class="actions">
<ul>
<li>
- <a href="/case/digest/${session.get('case').id}"
+ <a href="${h.url_for(controller='case', action='digest', id=session.get('case').id)}"
onclick="return checkModification();">
${_('cm_menu_link_digest')}
</a>
</li>
% if h.hasRole(['cm_ka', 'admin_ka']):
<li>
- <a href="/phase/overview/${session.get('case').id}"
+ <a href="${h.url_for(controller='phase', action='overview', id=session.get('case').id)}"
onclick="return checkModification();">
${_('case_cm_phase')}
</a>
</li>
<li>
- <a href="/case/organisation/${session.get('case').id}"
+ <a href="${h.url_for(controller='case', action='organisation', id=session.get('case').id)}"
onclick="return checkModification();">
${_('cm_menu_link_organisation')}
</a>
</li>
% if g.mpuls_config.is_enabled('case-module', 'appointments'):
<li>
- <a href="/caseappointment/index/${session.get('case').id}"
+ <a href="${h.url_for(controller='caseappointment', action='index', id=session.get('case').id)}"
onclick="return checkModification();">
${_('cm_menu_link_appointment')}
</a>
@@ -179,7 +206,7 @@
% endif
% if h.hasRole(['cm_ka']) and g.mpuls_config.is_enabled('case-module', 'logbook'):
<li>
- <a href="/logbook/index/${session.get('case').id}"
+ <a href="${h.url_for(controller='logbook', action='index', id=session.get('case').id)}"
onclick="return checkModification();">
Tagebuch
</a>
@@ -187,7 +214,7 @@
% endif
% if g.mpuls_config.is_enabled('case-module', 'documents'):
<li>
- <a href="/casedocument/index/${session.get('case').id}"
+ <a href="${h.url_for(controller='casedocument', action='index', id=session.get('case').id)}"
onclick="return checkModification();">
${_('cm_menu_link_documents')}
</a>
Modified: base/trunk/mpulsweb/templates/casemanagement/new.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/new.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/new.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -3,12 +3,12 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/">${_('cm_np_root')}</a></li>
- <li><a href="/case/new2">${_('cm_np_new')}</a></li>
+ <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='new2')}">${_('cm_np_new')}</a></li>
</%def>
<div class="waska_form">
- <form id="waska_form" action="/case/newAction" accept-charset="UTF-8"
+ <form id="waska_form" action="${h.url_for(controller='/case', action='newAction')}" accept-charset="UTF-8"
name="waska_form" method="POST">
<h1>Neue Fallakte anlegen</h1>
<fieldset>
@@ -84,24 +84,24 @@
## <table>
## <tr>
## <td class="table_row_h">
- ## Arabisch <a href="/documents/ee_ar.pdf">download</a>
+ ## Arabisch <a href="${h.url_for('/documents/ee_ar.pdf')}">download</a>
## </td>
## <td class="table_row_h">
- ## Englisch <a href="/documents/ee_en.pdf">download</a>
+ ## Englisch <a href="${h.url_for('/documents/ee_en.pdf')}">download</a>
## </td>
## </tr>
## <tr>
- ## <td>Polnisch <a href="/documents/ee_pl.pdf">download</a></td>
- ## <td>Russisch <a href="/documents/ee_ru.pdf">download</a></td>
+ ## <td>Polnisch <a href="${h.url_for('/documents/ee_pl.pdf')}">download</a></td>
+ ## <td>Russisch <a href="${h.url_for('/documents/ee_ru.pdf')}">download</a></td>
## </tr>
## <tr>
## <td class="table_row_h">
- ## Türkisch <a href="/documents/ee_tr.pdf">download</a>
+ ## Türkisch <a href="${h.url_for('/documents/ee_tr.pdf')}">download</a>
## </td>
## <td class="table_row_h">
## Deutsch
## (Einwilligungserklärung ohne Hinweise zu Teilnehmernachweisen)
- ## <a href="/documents/ee_de_ohnetn.pdf">download</a>
+ ## <a href="${h.url_for('/documents/ee_de_ohnetn.pdf')}">download</a>
## </td>
## </tr>
## </table>
Modified: base/trunk/mpulsweb/templates/casemanagement/newAppointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/newAppointment.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/newAppointment.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -9,8 +9,8 @@
%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
- <li><a href="/caseappointment/index/${session.get('case').id}">${_('app_np_list')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('app_np_list')}</a></li>
<li><a href="#">${_('app_np_new')}</a></li>
</%def>
<div id="content_header_small">
Modified: base/trunk/mpulsweb/templates/casemanagement/organisation.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/organisation.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/organisation.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -3,8 +3,8 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
- <li><a href="/case/organisation/${session.get('case').id}">${_('cm_np_organisation')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='organisation', id=session.get('case').id)}">${_('cm_np_organisation')}</a></li>
</%def>
<div id="content_header_small">
Modified: base/trunk/mpulsweb/templates/casemanagement/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/overview.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/overview.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -3,8 +3,8 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case">${_('cm_np_root')}</a></li>
- <li><a href="/case_overview">${_('cm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/case_overview')}">${_('cm_np_overview')}</a></li>
</%def>
<h1>${_('cm_header_overview')}</h1>
% if h.hasRole(['admin_ka']):
@@ -17,7 +17,8 @@
<%include file="/casemanagement/search.mako" />
${ungettext('%s case was found.', '%s cases where found.', c.count_all) % c.count_all}
<div class="waska_form">
- <form action="/case_bundle/bundleAction" method="POST">
+ <form action="${h.url_for(controller='/case_bundle', action='bundleAction')}"
+ method="POST">
<%include file="./caselist.mako" />
% if g.mpuls_config.is_enabled('case-module', 'casebundle'):
<div class="waska_form_element">
Modified: base/trunk/mpulsweb/templates/casemanagement/reminderlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/reminderlist.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/reminderlist.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -1,10 +1,16 @@
<%inherit file="/appointments/remindlist_body.mako" />
<%def name="showAppointmentActions(appointment)">
-<a href="${h.url_for(controller='/caseappointment', action='show', id=appointment.id)}">
- <img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
+<a href="${h.url_for(controller='/caseappointment', action='show',
+ id=appointment.id)}">
+ <img src="${h.url_for('/images/icons/open_active_22.png')}" border="0"
+ alt="${_('cm_overview_a_show')}"
+ title="${_('cm_overview_a_show')}"></a>
% if h.hasRole(['cm_ka']):
- <a href="${h.url_for(controller='/caseappointment', action='delete', id=appointment.id, confirmed=0)}">
- <img src="/images/icons/delete_active_22.png" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}">
+ <a href="${h.url_for(controller='/caseappointment', action='delete',
+ id=appointment.id, confirmed=0)}">
+ <img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0"
+ alt="${_('cm_overview_a_delete')}"
+ title="${_('cm_overview_a_delete')}">
</a>
% endif
</%def>
Modified: base/trunk/mpulsweb/templates/casemanagement/search.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/search.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/search.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -1,7 +1,9 @@
## -*- coding: utf-8 -*-
% if g.mpuls_config.is_enabled('case-module', 'search'):
- <form method="post" name="case_search" action="/case_overview/search/" accept-charset="UTF-8">
+ <form method="post" name="case_search"
+ action="${h.url_for(controller='/case_overview', action='search')}"
+ accept-charset="UTF-8">
<div class="widget container">
<table>
<tr>
@@ -27,11 +29,11 @@
<td>
<input type="checkbox" name="own" id="show_own" value="1" checked="checked">
<label for="show_own">
- <img title="Eigene Fallakten" alt="Bearbeiter" src="/images/icons/edit_editor.png">Eigene (${c.count_own})
+ <img title="Eigene Fallakten" alt="Bearbeiter" src="${h.url_for('/images/icons/edit_editor.png')}">Eigene (${c.count_own})
</label><br>
<input type="checkbox" name="standin" id="show_other" value="1" checked="checked">
<label for="show_other">
- <img title="Vertreter Fallakten" alt="Vertreter" src="/images/icons/edit_editors_22.png">Vertretung (${c.count_standin})
+ <img title="Vertreter Fallakten" alt="Vertreter" src="${h.url_for('/images/icons/edit_editors_22.png')}">Vertretung (${c.count_standin})
</label>
</td>
</tr>
@@ -41,18 +43,18 @@
<td>
<input type="checkbox" name="state" id="show_open" value="1">
<label for="show_open">
- <img title="Bearbeitbare Fallakten" alt="Bearbeitbare" src="/images/icons/edit_22.png">Bearbeitbare Fallakten</label><br>
+ <img title="Bearbeitbare Fallakten" alt="Bearbeitbare" src="${h.url_for('/images/icons/edit_22.png')}">Bearbeitbare Fallakten</label><br>
<input type="checkbox" name="state" id="show_markdelete" value="3" checked="checked">
<label for="show_markdelete">
- <img title="Zu löschende Fallakten" alt="Schwebend Gelöscht" src="/images/icons/delete_inactive_22.png">Schwebend gelöscht (${c.count_del})
+ <img title="Zu löschende Fallakten" alt="Schwebend Gelöscht" src="${h.url_for('/images/icons/delete_inactive_22.png')}">Schwebend gelöscht (${c.count_del})
</label><br>
<input type="checkbox" name="state" id="show_markanonymize" value="4" checked="checked">
<label for="show_markanonymize">
- <img title="Schwebend anonymisierte Fallakten" alt="Schwebend anonymisiert" src="/images/icons/anonymise_inactive_22.png">Schwebend anonymisiert (${c.count_markanon})
+ <img title="Schwebend anonymisierte Fallakten" alt="Schwebend anonymisiert" src="${h.url_for('/images/icons/anonymise_inactive_22.png')}">Schwebend anonymisiert (${c.count_markanon})
</label><br>
<input type="checkbox" name="state" id="show_anonymized" value="5" checked="checked">
<label for="show_anonymized">
- <img title="Anonymisierte Fallakten" alt="Anonymisiert" src="/images/icons/anonymise_inactive_22.png">Anonymisiert (${c.count_anon})
+ <img title="Anonymisierte Fallakten" alt="Anonymisiert" src="${h.url_for('/images/icons/anonymise_inactive_22.png')}">Anonymisiert (${c.count_anon})
</label>
</td>
</tr>
@@ -89,12 +91,15 @@
<td>
<input type="submit" value="${_('cm_form_overview_search_submit')}">
% if c.extended_search:
- <a href="/case_overview/overview_extended/">Erweiterte Suche ausblenden</a>
+ <a href="${h.url_for(controller='case_overview',
+ action='overview_extended')}">Erweiterte Suche ausblenden</a>
% else:
- <a href="/case_overview/overview_extended/">Erweiterte Suche einblenden</a>
+ <a href="${h.url_for(controller='case_overview',
+ action='overview_extended')}">Erweiterte Suche einblenden</a>
% endif
${h.getHelp('extended_search')}
- <a href="/case_overview/overview?reset=1">Suche zurücksetzen</a>
+ <a href="${h.url_for(controller='case_overview', action='overview',
+ reset=1)}">Suche zurücksetzen</a>
</td>
</tr>
</table>
@@ -104,14 +109,16 @@
##<div id="search_field">
-## <form method="post" name="case_search" action="/case_overview/search/" accept-charset="UTF-8">
+## <form method="post" name="case_search"
+## action="${h.url_for(controller='/case_overview', action='search')}"
+## accept-charset="UTF-8">
## <div>
## <input type="text" size="30" name="search_str" maxlength="256">
## <input type="submit" value="${_('cm_form_overview_search_submit')}">
## % if c.extended_search:
-## <a href="/case_overview/overview_extended/">Erweiterte Suche ausblenden</a>
+## <a href="${h.url_for(controller='case_overview', action='overview_extended')}">Erweiterte Suche ausblenden</a>
## % else:
-## <a href="/case_overview/overview_extended/">Erweiterte Suche einblenden</a>
+## <a href="${h.url_for(controller='case_overview', action='overview_extended')}">Erweiterte Suche einblenden</a>
## % endif
## ${h.getHelp('extended_search')}
## </div>
@@ -120,26 +127,26 @@
## % if h.hasRole(['cm_ka']):
## <input type="checkbox" name="show_own" id="show_own" value="1" checked="checked">
## <label for="show_own">
-## <img title="Eigene Fallakten" alt="Bearbeiter" src="/images/icons/edit_editor.png">Eigene (${c.count_own})
+## <img title="Eigene Fallakten" alt="Bearbeiter" src="${h.url_for('/images/icons/edit_editor.png')}">Eigene (${c.count_own})
## </label>
## <input type="checkbox" name="show_other" id="show_other" value="1" checked="checked">
## <label for="show_other">
-## <img title="Vertreter Fallakten" alt="Vertreter" src="/images/icons/edit_editors_22.png">Vertretung (${c.count_standin})
+## <img title="Vertreter Fallakten" alt="Vertreter" src="${h.url_for('/images/icons/edit_editors_22.png')}">Vertretung (${c.count_standin})
## </label>
## % endif
## % if h.hasRole(['admin_ka']):
## <input type="checkbox" name="show_markdelete" id="show_markdelete" value="1" checked="checked">
## <label for="show_markdelete">
-## <img title="Zu löschende Fallakten" alt="Schwebend Gelöscht" src="/images/icons/delete_inactive_22.png">Schwebend gelöscht (${c.count_del})
+## <img title="Zu löschende Fallakten" alt="Schwebend Gelöscht" src="${h.url_for('/images/icons/delete_inactive_22.png')}">Schwebend gelöscht (${c.count_del})
## </label>
## <input type="checkbox" name="show_markanonymize" id="show_markanonymize" value="1" checked="checked">
## <label for="show_markanonymize">
-## <img title="Schwebend anonymisierte Fallakten" alt="Schwebend anonymisiert" src="/images/icons/anonymise_inactive_22.png">Schwebend anonymisiert (${c.count_markanon})
+## <img title="Schwebend anonymisierte Fallakten" alt="Schwebend anonymisiert" src="${h.url_for('/images/icons/anonymise_inactive_22.png')}">Schwebend anonymisiert (${c.count_markanon})
## </label>
## % endif
## <input type="checkbox" name="show_anonymized" id="show_anonymized" value="1" checked="checked">
## <label for="show_anonymized">
-## <img title="Anonymisierte Fallakten" alt="Anonymisiert" src="/images/icons/anonymise_inactive_22.png">Anonymisiert (${c.count_anon})
+## <img title="Anonymisierte Fallakten" alt="Anonymisiert" src="${h.url_for('/images/icons/anonymise_inactive_22.png')}">Anonymisiert (${c.count_anon})
## </label>
## </div>
## % if c.extended_search:
@@ -227,12 +234,12 @@
## <td valign="top">
## <input type="checkbox" name="show_open" id="show_open" value="1" checked="checked">
## <label for="show_open">
-## <img title="Bearbeitbare Fallakten" alt="Bearbeitbare" src="/images/icons/edit_22.png">Bearbeitbare Fallakten
+## <img title="Bearbeitbare Fallakten" alt="Bearbeitbare" src="${h.url_for('/images/icons/edit_22.png')}">Bearbeitbare Fallakten
## </label>
## <!--
## <input type="checkbox" name="show_closed" id="show_closed" value="1" checked="checked">
## <label for="show_closed">
-## <img title="Geschlossene Fallakten" alt="Geschlossene" src="/images/icons/done_grey.gif">Geschlossen
+## <img title="Geschlossene Fallakten" alt="Geschlossene" src="${h.url_for('/images/icons/done_grey.gif')}">Geschlossen
## </label>
## -->
## </td>
Modified: base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako 2010-05-25 17:56:51 UTC (rev 2743)
+++ base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako 2010-05-25 18:11:41 UTC (rev 2744)
@@ -1,9 +1,9 @@
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${c.appointment.case_id}/1">${_('cm_np_select')}</a></li>
- <li><a href="/caseappointment/index/${c.appointment.case_id}">${_('app_np_list')}</a></li>
- <li><a href="/caseappointment/show/${c.appointment.id}">${_('app_np_show')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=c.appointment.case_id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/caseappointment', action='index', id=c.appointment.case_id)}">${_('app_np_list')}</a></li>
+ <li><a href="${h.url_for(controller='/caseappointment', action='show', id=c.appointment.id)}">${_('app_np_show')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
More information about the Mpuls-commits
mailing list