[Mpuls-commits] r5868 - in base/trunk/mpulsweb/templates/casemanagement: . dialogs
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Wed Mar 7 15:00:59 CET 2012
Author: ludwig
Date: 2012-03-07 15:00:58 +0100 (Wed, 07 Mar 2012)
New Revision: 5868
Modified:
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_copy.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_anonymize.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/failed_delete.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_copy.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/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/rename_attachment.mako
base/trunk/mpulsweb/templates/casemanagement/search.mako
base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako
base/trunk/mpulsweb/templates/casemanagement/upload.mako
Log:
Issue 2738: Replace url_for with url (templates/casemanaement)
Modified: base/trunk/mpulsweb/templates/casemanagement/appointmentlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/appointmentlist.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/appointmentlist.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -1,15 +1,15 @@
<%inherit file="/appointments/overview_body.mako" />
<%def name="showAppointmentActions(appointment)">
- <a href="${h.url_for(controller='/caseappointment',
+ <a href="${h.url(controller='caseappointment',
action='show', id=appointment.id,
confirmed='1')}">
- <img src="${h.url_for('/images/icons/open_active_22.png')}" border="0"
+ <img src="${h.url('/images/icons/open_active_22.png')}" border="0"
alt="${_('Show')}" title="${_('Show')}">
</a>
% if h.hasRole(['cm']) and session.get('case').getState().getState() == 1:
- <a href="${h.url_for(controller='/caseappointment', action='delete',
+ <a href="${h.url(controller='caseappointment', action='delete',
id=appointment.id, confirmed=0)}">
- <img src="${h.url_for('/images/icons/delete_active_22.png')}"
+ <img src="${h.url('/images/icons/delete_active_22.png')}"
border="0"
alt="${_('Delete')}"
title="${_('Delete')}">
Modified: base/trunk/mpulsweb/templates/casemanagement/appointments.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/appointments.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/appointments.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -1,8 +1,8 @@
<%inherit file="main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
- <li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('Appointments list')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='caseappointment', action='index', id=session.get('case').id)}">${_('Appointments list')}</a></li>
</%def>
<div id="content_header_small">
@@ -13,7 +13,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='/caseappointment', action='new', id=session.get('case').id)}"> ${_('Create new event')}</a></li>
+ <li><a href="${h.url(controller='caseappointment', action='new', id=session.get('case').id)}"> ${_('Create new event')}</a></li>
</ul>
</div>
</div>
Modified: base/trunk/mpulsweb/templates/casemanagement/caselist.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/caselist.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/caselist.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -57,30 +57,30 @@
% for title, urlpart, style, roles, get_value in fields:
% if h.hasRole(roles):
<th class="${style} table_header_h">${title}
- <a href="${h.url_for(controller='case_overview', action='overview',
+ <a href="${h.url(controller='case_overview', action='overview',
sort_field=urlpart, sort_order='asc')}">
<img class = "sorticon"
%if sort_field == urlpart and sort_order == 'asc':
- src = "${h.url_for('/images/icons/sort_asc_active.png')}"
+ src = "${h.url('/images/icons/sort_asc_active.png')}"
alt = "${_("Sorted by %s in ascending order") % title}"
title = "${_("Sorted by %s in ascending order") % title}"
%else:
- src = "${h.url_for('/images/icons/sort_asc.png')}"
+ src = "${h.url('/images/icons/sort_asc.png')}"
alt = "${_("Sort in ascending order")}"
title = "${_("Sort in ascending order")}"
%endif
width = "10"
height = "9"></a>
- <a href="${h.url_for(controller='case_overview', action='overview',
+ <a href="${h.url(controller='case_overview', action='overview',
sort_field=urlpart, sort_order='desc')}">
<img class = "sorticon"
%if sort_field == urlpart and sort_order == 'desc':
- src = "${h.url_for('/images/icons/sort_desc_active.png')}"
+ src = "${h.url('/images/icons/sort_desc_active.png')}"
alt = "${_("Sorted by %s in descending order") % title}"
title = "${_("Sorted by %s in descending order") % title}"
%else:
- src = "${h.url_for('/images/icons/sort_desc.png')}"
+ src = "${h.url('/images/icons/sort_desc.png')}"
alt = "${_("Sort in descending order")}"
title = "${_("Sort in descending order")}"
%endif
@@ -105,7 +105,7 @@
% if h.hasRole(roles):
% if case.getState().getState() != 5 and case.getState().getState() != 3:
- <td><a href="${h.url_for(controller='/case', action='select',
+ <td><a href="${h.url(controller='case', action='select',
id=case.id, confirmed=0)}">${get_value(case) | F.NA}</a></td>
% else:
<td>${get_value(case) | F.NA}</td>
@@ -127,8 +127,8 @@
<%def name="get_validity_icon(case)">
% for validity in g.mpuls_config.get('validities', 'enabled'):
% if validity['id'] == case.getValidity():
- ##<a href="${h.url_for(controller='tags', action='overview', id=case.id)}">
- <img src="${h.url_for('/images/icons/%s' % validity['icon'])}" alt="${validity['name']}" title="${validity['name']}" width="22" height="22">
+ ##<a href="${h.url(controller='tags', action='overview', id=case.id)}">
+ <img src="${h.url('/images/icons/%s' % validity['icon'])}" alt="${validity['name']}" title="${validity['name']}" width="22" height="22">
##</a>
% endif
% endfor
@@ -139,7 +139,7 @@
<% running = not phase%2 and 'running' or 'finished' %>
<% description = h.literal(c.phases.get_phase(str(phase)).getDescription()) %>
<% icon = c.phases.get_phase(str(phase)).getIcon() %>
- <img src="${h.url_for(str('/images/icons/case_status/%s_%s.png' % (icon, running)) )}" alt="${description}" title="${description}" width="22" height="22">
+ <img src="${h.url(str('/images/icons/case_status/%s_%s.png' % (icon, running)) )}" alt="${description}" title="${description}" width="22" height="22">
</%def>
<%def name="render_phase_legend()">
@@ -150,10 +150,10 @@
${legend.append("%s: %s" % (g.mpuls_config.get('phases', 'shortdescription')[0][p.id], p.getDescription()))}
% endfor
${h.literal(", ".join(legend))}
- | <span style="background-image:url('${h.url_for("/images/icons/phase-running-22.png")}'); background-repeat:no-repeat; background-position:1px -2px">
+ | <span style="background-image:url('${h.url("/images/icons/phase-running-22.png")}'); background-repeat:no-repeat; background-position:1px -2px">
( )
</span>: ${_("Running")},
- <span style="background-image:url('${h.url_for("/images/icons/phase-stop-22.png")}'); background-repeat:no-repeat; background-position:1px -2px">
+ <span style="background-image:url('${h.url("/images/icons/phase-stop-22.png")}'); background-repeat:no-repeat; background-position:1px -2px">
( )
</span>: ${_("Finished")}
</div>
@@ -163,14 +163,14 @@
<%def name="get_state_icon(case)">
% if h.hasRole(['cm']) and g.mpuls_config.is_enabled('case-module', 'organisation'):
% if case.user_is_editor(session.get('USER_AUTHORIZED').id):
- <img src = "${h.url_for('/images/icons/edit_editor.png')}"
+ <img src = "${h.url('/images/icons/edit_editor.png')}"
border = "0"
alt = "${_('Editor')}"
title = "${_('Editor')}"
width = "22"
height = "22">
% else:
- <img src = "${h.url_for('/images/icons/edit_editors_22.png')}"
+ <img src = "${h.url('/images/icons/edit_editors_22.png')}"
border = "0"
alt = "${_('Standin')}"
title = "${_('Standin')}"
@@ -179,28 +179,28 @@
% endif
% endif
% if case.getState().getState() in (1,2):
- <img src = "${h.url_for('/images/icons/edit_22.png')}"
+ <img src = "${h.url('/images/icons/edit_22.png')}"
border = "0"
alt = "${_('Editable')}"
title = "${_('Editable')}"
width = "22"
height = "22">
% elif case.getState().getState() == 3:
- <img src = "${h.url_for('/images/icons/delete_inactive_22.png')}"
+ <img src = "${h.url('/images/icons/delete_inactive_22.png')}"
border = "0"
alt = "${_('Mark delete')}"
title = "${_('Mark delete')}"
width = "22"
height = "22">
% elif case.getState().getState() == 4:
- <img src = "${h.url_for('/images/icons/anonymise_inactive_22.png')}"
+ <img src = "${h.url('/images/icons/anonymise_inactive_22.png')}"
border = "0"
alt = "${_('Mark anonym')}"
title = "${_('Mark anonym')}"
width = "22"
height = "22">
% elif case.getState().getState() == 5:
- <img src = "${h.url_for('/images/icons/anonymise_inactive_22.png')}"
+ <img src = "${h.url('/images/icons/anonymise_inactive_22.png')}"
border = "0"
alt = "${_('Make anonymousym')}"
title = "${_('Make anonymousym')}"
@@ -212,9 +212,9 @@
<%def name="get_actions(case)">
% if h.hasRole(['admin']):
% if case.getState().getState() != 5:
- <a href="${h.url_for(controller='case', action='select', id=case.id,
+ <a href="${h.url(controller='case', action='select', id=case.id,
confirmed=0)}">
- <img src = "${h.url_for('/images/icons/open_active_22.png')}"
+ <img src = "${h.url('/images/icons/open_active_22.png')}"
border = "0"
alt = "${_('Show')}"
title = "${_('Show')}"
@@ -222,9 +222,9 @@
height = "22"></a>
% endif
% if case.getState().getState() in (3, 5):
- <a href="${h.url_for(controller='case', action='delete', id=case.id,
+ <a href="${h.url(controller='case', action='delete', id=case.id,
confirmed=0)}">
- <img src = "${h.url_for('/images/icons/delete_active_22.png')}"
+ <img src = "${h.url('/images/icons/delete_active_22.png')}"
border = "0"
alt = "${_('Delete case')}"
title = "${_('Delete case')}"
@@ -233,9 +233,9 @@
% endif
% if case.getState().getState() == 4:
% if g.mpuls_config.is_enabled('case-module', 'anonymize'):
- <a href="${h.url_for(controller='case', action='anonymize', id=case.id,
+ <a href="${h.url(controller='case', action='anonymize', id=case.id,
confirmed=0)}">
- <img src = "${h.url_for('/images/icons/anonymise_active_22.png')}"
+ <img src = "${h.url('/images/icons/anonymise_active_22.png')}"
border = "0"
alt = "${_('Anonymize case document')}"
title = "${_('Anonymize case document')}"
@@ -244,9 +244,9 @@
% endif
% endif
% if case.getState().getState() in (3, 4):
- <a href="${h.url_for(controller='case', action='restore', id=case.id,
+ <a href="${h.url(controller='case', action='restore', id=case.id,
confirmed=0)}">
- <img src = "${h.url_for('/images/icons/refresh_active_22.png')}"
+ <img src = "${h.url('/images/icons/refresh_active_22.png')}"
border = "0"
alt = "${_('Restore case document')}"
title = "${_('Restore case document')}"
@@ -255,9 +255,9 @@
% endif
% elif h.hasRole(['cm']) and case.getState().getState() in (1, 2):
% if case.getState().getState() != 5 and case.getState().getState() != 4:
- <a href="${h.url_for(controller='case', action='select', id=case.id,
+ <a href="${h.url(controller='case', action='select', id=case.id,
confirmed=0)}">
- <img src = "${h.url_for('/images/icons/open_active_22.png')}"
+ <img src = "${h.url('/images/icons/open_active_22.png')}"
border = "0"
alt = "${_('Show')}"
title = "${_('Show')}"
@@ -265,19 +265,19 @@
height = "22"></a>
% endif
% if g.mpuls_config.is_enabled('case-module', 'anonymize'):
- <a href="${h.url_for(controller='case',
+ <a href="${h.url(controller='case',
action='markForAnonymizeFromOverview', id=case.id,
confirmed=0)}">
- <img src = "${h.url_for('/images/icons/anonymise_active_22.png')}"
+ <img src = "${h.url('/images/icons/anonymise_active_22.png')}"
border = "0"
alt = "${_('Anonymize case document')}"
title = "${_('Anonymize case document')}"
width = "22"
height = "22"></a>
% endif
- <a href="${h.url_for(controller='case', action='markForDelete', id=case.id,
+ <a href="${h.url(controller='case', action='markForDelete', id=case.id,
confirmed=0)}">
- <img src = "${h.url_for('/images/icons/delete_active_22.png')}"
+ <img src = "${h.url('/images/icons/delete_active_22.png')}"
border = "0"
alt = "${_('Delete')}"
title = "${_('Delete')}"
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -2,7 +2,7 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
+ <li><a href="${h.url(controller='case', action='index')}">${_('Case Management')}</a></li>
<li><a href="#">${_('Delete case?')}</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 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_anonymize.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -6,10 +6,10 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
%if case:
- <li><a href="${h.url_for(controller='/case', action='select',
+ <li><a href="${h.url(controller='case', action='select',
id=case.id, confirmed=1)}">${_('Selected case documents')}</a></li>
%else:
- <li><a href="${h.url_for(controller='/case_overview')}">${_('Case document overview')}</a></li>
+ <li><a href="${h.url(controller='case_overview', action='index')}">${_('Case document overview')}</a></li>
%endif
<li><a href="#">${_('Anonymize case document')}</a></li>
</%def>
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_copy.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_copy.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_copy.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -6,10 +6,10 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
%if case:
- <li><a href="${h.url_for(controller='/case', action='select',
+ <li><a href="${h.url(controller='case', action='select',
id=case.id, confirmed=1)}">${_('Selected case documents')}</a></li>
%else:
- <li><a href="${h.url_for(controller='/case_overview')}">${_('Case document overview')}</a></li>
+ <li><a href="${h.url(controller='case_overview', action='index')}">${_('Case document overview')}</a></li>
%endif
<li><a href="#">${_('Copy case')}</a></li>
</%def>
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -2,7 +2,7 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
+ <li><a href="${h.url(controller='case', action='index')}">${_('Case Management')}</a></li>
<li><a href="#">${_('Delete case?')}</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 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -1,8 +1,8 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
- <li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('Events')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='caseappointment', action='index', id=session.get('case').id)}">${_('Events')}</a></li>
<li><a href="#">${_('Delete event')}</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 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -1,8 +1,8 @@
<%inherit file="../../casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
- <li><a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">${_('Attachment overview')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='casedocument', action='index', id=session.get('case').id)}">${_('Attachment overview')}</a></li>
<li><a href="#">${_('Delete attachment?')}</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 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_export.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -2,15 +2,15 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
+ <li><a href="${h.url(controller='case', action='index')}">${_('Case Management')}</a></li>
<li><a href="#">${_('Export case')}</a></li>
</%def>
<div class="dialog">
-<h1><img src="${h.url_for('/images/icons/info/question.png')}"
+<h1><img src="${h.url('/images/icons/info/question.png')}"
alt="${_('attention')}"
width="48"
height="48">${c.dialog_title or c.confirm_for}</h1>
-<form action="${h.url_for(controller='/case_bundle', action='exportAction')}"
+<form action="${h.url(controller='case_bundle', action='exportAction')}"
method="GET">
<% case_bundle = session.get('casebundle') %>
% if case_bundle and len(case_bundle.case_list) > 1 and g.mpuls_config.is_enabled('offline-client', 'enabled'):
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_markanonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_markanonymize.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_markanonymize.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -6,9 +6,9 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
%if case:
- <li><a href="${h.url_for(controller='/case', action='select', id=case.id, confirmed=1)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=case.id, confirmed=1)}">${_('Selected case documents')}</a></li>
%else:
- <li><a href="${h.url_for(controller='/case_overview')}">${_('Case document overview')}</a></li>
+ <li><a href="${h.url(controller='case_overview', action='index')}">${_('Case document overview')}</a></li>
%endif
<li><a href="#">${_('Anonymize case document')}</a></li>
</%def>
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -2,7 +2,7 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
+ <li><a href="${h.url(controller='case', action='index')}">${_('Case Management')}</a></li>
<li><a href="#">${_('Restore case?')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/failed_anonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/failed_anonymize.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/failed_anonymize.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -6,9 +6,9 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
%if case:
- <li><a href="${h.url_for(controller='/case', action='select', id=case.id, confirmed=1)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=case.id, confirmed=1)}">${_('Selected case documents')}</a></li>
%else:
- <li><a href="${h.url_for(controller='/case_overview')}">${_('Case document overview')}</a></li>
+ <li><a href="${h.url(controller='case_overview', action='index')}">${_('Case document overview')}</a></li>
%endif
<li><a href="#">${_('Anonymize case document')}</a></li>
</%def>
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/failed_delete.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/failed_delete.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/failed_delete.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
+ <li><a href="${h.url(controller='case', action='index')}">${_('Case Management')}</a></li>
<li><a href="#">${_('Case document deleted!')}</a></li>
</%def>
<%include file="../../dialogs/failed.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/failed_markanonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/failed_markanonymize.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/failed_markanonymize.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -2,7 +2,7 @@
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
<li><a href="#">${_('Anonymize case document')}</a></li>
</%def>
<%include file="/dialogs/failed.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_anonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_anonymize.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_anonymize.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -6,9 +6,9 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
%if case:
- <li><a href="${h.url_for(controller='/case', action='select', id=case.id, confirmed=1)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=case.id, confirmed=1)}">${_('Selected case documents')}</a></li>
%else:
- <li><a href="${h.url_for(controller='/case_overview')}">${_('Case document overview')}</a></li>
+ <li><a href="${h.url(controller='case_overview', action='index')}">${_('Case document overview')}</a></li>
%endif
<li><a href="#">${_('Anonymize case document')}</a></li>
</%def>
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_copy.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_copy.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_copy.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -6,9 +6,9 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
%if case:
- <li><a href="${h.url_for(controller='/case', action='select', id=case.id, confirmed=1)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=case.id, confirmed=1)}">${_('Selected case documents')}</a></li>
%else:
- <li><a href="${h.url_for(controller='/case_overview')}">${_('Case document overview')}</a></li>
+ <li><a href="${h.url(controller='case_overview', action='index')}">${_('Case document overview')}</a></li>
%endif
<li><a href="#">${_('Copy case')}</a></li>
</%def>
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_create_appointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_create_appointment.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_create_appointment.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -2,8 +2,8 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
- <li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('Appointments list')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='caseappointment', action='index', id=session.get('case').id)}">${_('Appointments list')}</a></li>
<li><a href="#">${_('Create new event')}</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 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
+ <li><a href="${h.url(controller='case', action='index')}">${_('Case Management')}</a></li>
<li><a href="#">${_('Case document deleted!')}</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 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -2,8 +2,8 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
- <li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('Events')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='caseappointment', action='index', id=session.get('case').id)}">${_('Events')}</a></li>
<li><a href="#">${_('Delete event')}</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 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -1,10 +1,10 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='case_overview')}">${_('Case document overview')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
- <li><a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">${_('Documents overview')}</a></li>
+ <li><a href="${h.url(controller='case'), action='index'}">${_('Case Management')}</a></li>
+ <li><a href="${h.url(controller='case', action='case_overview')}">${_('Case document overview')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='casedocument', action='index', id=session.get('case').id)}">${_('Documents overview')}</a></li>
<li><a href="#">${_('Deleted attachment!')}</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 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
+ <li><a href="${h.url(controller='case', action='index')}">${_('Case Management')}</a></li>
<li><a href="#">${_('Case document deleted!')}</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 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_edit_appointment.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -2,8 +2,8 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
- <li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('Appointments list')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='caseappointment', action='index', id=session.get('case').id)}">${_('Appointments list')}</a></li>
<li><a href="#">${_('Edit event')}</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 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_export.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
+ <li><a href="${h.url(controller='case', action='index')}">${_('Case Management')}</a></li>
<li><a href="#">${_('Export successfully!')}</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 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
+ <li><a href="${h.url(controller='case', action='index')}">${_('Case Management')}</a></li>
<li><a href="#">${_('Keep longer active')}</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 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_markanonymize.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -6,9 +6,9 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
%if case:
- <li><a href="${h.url_for(controller='/case', action='select', id=case.id, confirmed=1)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=case.id, confirmed=1)}">${_('Selected case documents')}</a></li>
%else:
- <li><a href="${h.url_for(controller='/case_overview')}">${_('Case document overview')}</a></li>
+ <li><a href="${h.url(controller='case_overview', action='index')}">${_('Case document overview')}</a></li>
%endif
<li><a href="#">${_('Anonymize case document')}</a></li>
</%def>
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_restore.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_restore.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_restore.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
+ <li><a href="${h.url(controller='case', action='index')}">${_('Case Management')}</a></li>
<li><a href="#">${_('Restore successfully!')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/digest.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/digest.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/digest.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -5,9 +5,9 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='case', action='select',
+ <li><a href="${h.url(controller='case', action='select',
id=session['case'].id, confirmed=1)}">${_('Selected case documents')}</a></li>
- <li><a href="${h.url_for(controller='case', action='digest',
+ <li><a href="${h.url(controller='case', action='digest',
id=session['case'].id)}">${_('Summary of the case document')}</a></li>
</%def>
@@ -16,7 +16,7 @@
<div class="actions">
<ul>
<li>
- <a href="${h.url_for(controller='case', action='printdigest',
+ <a href="${h.url(controller='case', action='printdigest',
id=session['case'].id)}"
target="_blank"
onclick="return checkModification();">
@@ -62,7 +62,7 @@
<div class="dialog">
% if c.finished:
<h1>
- <img src="${h.url_for('/images/icons/info/alert.png')}"
+ <img src="${h.url('/images/icons/info/alert.png')}"
alt="${_('attention')}"/>
${_('Max save duration exceeded!')}
</h1>
@@ -77,7 +77,7 @@
% endif
% if not c.finished:
<h1>
- <img src="${h.url_for('/images/icons/info/question.png')}"
+ <img src="${h.url('/images/icons/info/question.png')}"
alt="${_('attention')}"
width="48"
height="48">Inaktiver Fall?
Modified: base/trunk/mpulsweb/templates/casemanagement/editAppointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/editAppointment.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/editAppointment.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -9,8 +9,8 @@
%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
- <li><a href="${h.url_for(controller='/caseappointment', action='index', id=c.appointment.case_id)}">${_('Appointments list')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='caseappointment', action='index', id=c.appointment.case_id)}">${_('Appointments list')}</a></li>
<li><a href="#"></a>${_('Edit event')}</li>
</%def>
<div id="content_header_small">
@@ -21,7 +21,7 @@
<div class="actions">
<ul>
<li>
- <a href="${h.url_for(controller='/caseappointment', action='show', id=c.appointment.id, confirmed='0')}">${_('Back to: Event view')}</a>
+ <a href="${h.url(controller='caseappointment', action='show', id=c.appointment.id, confirmed='0')}">${_('Back to: Event view')}</a>
</li>
</ul>
</div>
@@ -30,7 +30,7 @@
${self.buildFormErrors(formular_labels)}
<div id="admin_new_user">
<div id="waska_form">
-<form action="${h.url_for(controller='caseappointment', action='editAction')}" method="POST">
+<form action="${h.url(controller='caseappointment', action='editAction')}" method="POST">
<%include file="../appointments/edit_body.mako" />
</form>
</div>
Modified: base/trunk/mpulsweb/templates/casemanagement/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/main.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/main.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -8,9 +8,9 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='case')}"
+ <li><a href="${h.url(controller='case', action='index')}"
onclick="return checkModification();">${_('Case Management')}</a></li>
- <li><a href="${h.url_for(controller='case_overview', action='overview')}"
+ <li><a href="${h.url(controller='case_overview', action='overview')}"
onclick="return checkModification();">${_('Case document overview')}</a></li>
</%def>
<%def name="buildModusfield()">
@@ -40,14 +40,14 @@
% if session.get('case').getState().getState() not in (3,4,5):
% if not session.get('case').hasPrivacyStatement():
<li>
- <a href="${h.url_for(controller='privacy', action='set',
+ <a href="${h.url(controller='privacy', action='set',
id=session.get('case').id)}"
onclick="return checkModification();">${_('Set statement')}
</a>
</li>
% elif session.get('case').hasPrivacyStatement():
<li>
- <a href="${h.url_for(controller='privacy',
+ <a href="${h.url(controller='privacy',
action='decline',
id=session.get('case').id,
confirmed=0)}"
@@ -56,7 +56,7 @@
</li>
% endif
<li>
- <a href="${h.url_for(controller='case',
+ <a href="${h.url(controller='case',
action='markForAnonymize',
id=session.get('case').id,
confirmed=0)}"
@@ -65,7 +65,7 @@
</li>
% endif
<li>
- <a href="${h.url_for(controller='privacy',
+ <a href="${h.url(controller='privacy',
action='listStatements')}"
onclick="return checkModification();"> ${_('Available statements')}
</a>
@@ -85,24 +85,24 @@
${self.buildInfofield()}
<ul>
<li>
- <a href="${h.url_for(controller='/case_overview')}"
+ <a href="${h.url(controller='case_overview')}"
onclick="return checkModification();">${_('Back to overview')}</a>
</li>
<li>
- <a href="${h.url_for(controller='case', action='digest',
+ <a href="${h.url(controller='case', action='digest',
id=session.get('case').id)}"
onclick="return checkModification();">
${_('Summary')}
</a>
</li>
<li>
- <a href="${h.url_for(controller='phase', action='overview',
+ <a href="${h.url(controller='phase', action='overview',
id=session.get('case').id)}"
onclick="return checkModification();">${_('Phase in CM')}</a>
</li>
% if h.hasRole(['cm']) and g.mpuls_config.is_enabled('case-module', 'logbook'):
<li>
- <a href="${h.url_for(controller='logbook',
+ <a href="${h.url(controller='logbook',
action='index',
id=session.get('case').id)}"
onclick="return checkModification();">
@@ -112,7 +112,7 @@
% endif
% if g.mpuls_config.is_enabled('case-module', 'meta-server') and session.get('case').getState().getState() == 1 and h.hasRole(['cm']):
<li>
- <a href="${h.url_for(controller='/meta',
+ <a href="${h.url(controller='meta',
action='index',
id=session.get('case').id)}"
onclick="return checkModification();">
@@ -129,7 +129,7 @@
% if h.hasRole(['cm', 'admin']):
% if g.mpuls_config.is_enabled('case-module', 'organisation'):
<li>
- <a href="${h.url_for(controller='case',
+ <a href="${h.url(controller='case',
action='organisation',
id=session.get('case').id)}"
onclick="return checkModification();">
@@ -139,7 +139,7 @@
% endif
% if g.mpuls_config.is_enabled('case-module', 'tags'):
<li>
- <a href="${h.url_for(controller='tags',
+ <a href="${h.url(controller='tags',
action='overview',
id=session.get('case').id)}"
onclick="return checkModification();">
@@ -149,7 +149,7 @@
% endif
% if g.mpuls_config.is_enabled('case-module', 'appointments'):
<li>
- <a href="${h.url_for(controller='caseappointment',
+ <a href="${h.url(controller='caseappointment',
action='index',
id=session.get('case').id)}"
onclick="return checkModification();">
@@ -158,7 +158,7 @@
</li>
% if g.mpuls_config.is_enabled('case-module', 'reminders') and session.get('case').getState().getState() == 1 and h.hasRole(['cm']):
<li>
- <a href="${h.url_for(controller='caseappointment',
+ <a href="${h.url(controller='caseappointment',
action='newReminder',
id=session.get('case').id)}"
onclick="return checkModification();"> ${_('Create reminder')}</a>
@@ -167,7 +167,7 @@
% endif
% if g.mpuls_config.is_enabled('case-module', 'documents'):
<li>
- <a href="${h.url_for(controller='casedocument',
+ <a href="${h.url(controller='casedocument',
action='index',
id=session.get('case').id)}"
onclick="return checkModification();">
@@ -177,14 +177,14 @@
% endif
% if g.mpuls_config.is_enabled('case-module', 'copy') and session.get('case').getState().getState() == 1 and h.hasRole(['cm']):
<li>
- <a href="${h.url_for(controller='case', action='copy',
+ <a href="${h.url(controller='case', action='copy',
id=session.get('case').id,
confirmed=0)}"
onclick="return checkModification()">${_('Copy case')}</a>
</li>
% endif
<li>
- <a href="${h.url_for(controller='case', action='printAll',
+ <a href="${h.url(controller='case', action='printAll',
id=session.get('case').id,
confirmed=0)}"
onclick="return checkModification();"
Modified: base/trunk/mpulsweb/templates/casemanagement/new.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/new.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/new.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -3,12 +3,12 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='new2')}">${_('Create new case')}</a></li>
+ <li><a href="${h.url(controller='case', action='index')}">${_('Case Management')}</a></li>
+ <li><a href="${h.url(controller='case', action='new2')}">${_('Create new case')}</a></li>
</%def>
<div class="waska_form">
- <form id="waska_form" action="${h.url_for(controller='/case', action='newAction')}" accept-charset="UTF-8"
+ <form id="waska_form" action="${h.url(controller='case', action='newAction')}" accept-charset="UTF-8"
name="waska_form" method="POST">
<h1>Neue Fallakte anlegen</h1>
<fieldset>
Modified: base/trunk/mpulsweb/templates/casemanagement/newAppointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/newAppointment.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/newAppointment.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -9,8 +9,8 @@
%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
- <li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('Appointments list')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='caseappointment', action='index', id=session.get('case').id)}">${_('Appointments list')}</a></li>
<li><a href="#">${_('Create new event')}</a></li>
</%def>
<div id="content_header_small">
@@ -21,7 +21,7 @@
<div class="actions">
<ul>
<li>
- <a href="${h.url_for(controller='/caseappointment', action='index', id=session['case'].id)}"> ${_('Back to: User overview')}</a>
+ <a href="${h.url(controller='caseappointment', action='index', id=session['case'].id)}"> ${_('Back to: User overview')}</a>
</li>
</ul>
</div>
@@ -30,7 +30,7 @@
${self.buildFormErrors(formular_labels)}
<div id="admin_new_user">
<div id="waska_form">
-<form action="${h.url_for(controller='caseappointment', action='newAction')}" method="POST">
+<form action="${h.url(controller='caseappointment', action='newAction')}" method="POST">
<%include file="../appointments/edit_body.mako" />
</form>
</div>
Modified: base/trunk/mpulsweb/templates/casemanagement/organisation.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/organisation.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/organisation.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -3,8 +3,8 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='organisation', id=session.get('case').id)}">${_('Organisation')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='case', action='organisation', id=session.get('case').id)}">${_('Organisation')}</a></li>
</%def>
<div id="content_header_small">
@@ -28,7 +28,7 @@
</tr>
</table>
% if h.hasRole(['admin']) and session.get('case').getState().getState() == 1:
-<form action="${h.url_for(controller="case", action="setEditorAction")}" method="POST">
+<form action="${h.url(controller="case", action="setEditorAction")}" method="POST">
<input type="hidden" name="case_id" value="${session.get('case').id}">
<select name="editor">
% for user in c.user_list:
@@ -41,7 +41,7 @@
<h2>${_('Standin')}</h2>
% if ((h.hasRole(['admin']) or (c.current_user.id == c.editor.id))) and session.get('case').getState().getState() == 1:
-<form action="${h.url_for(controller="case", action="setStandinAction")}" method="POST">
+<form action="${h.url(controller="case", action="setStandinAction")}" method="POST">
<input type="hidden" name="case_id" value="${session.get('case').id}">
<table>
<tr>
Modified: base/trunk/mpulsweb/templates/casemanagement/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/overview.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/overview.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -3,8 +3,8 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
- <li><a href="${h.url_for(controller='/case_overview')}">${_('Case document overview')}</a></li>
+ <li><a href="${h.url(controller='case', action='index')}">${_('Case Management')}</a></li>
+ <li><a href="${h.url(controller='case_overview', action='index')}">${_('Case document overview')}</a></li>
</%def>
<h1>${_('Case documents overview')}</h1>
% if h.hasRole(['admin']):
@@ -17,7 +17,7 @@
<%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="${h.url_for(controller='/case_bundle', action='bundleAction')}"
+ <form action="${h.url(controller='case_bundle', action='bundleAction')}"
method="POST">
<%include file="./caselist.mako" />
% if g.mpuls_config.is_enabled('case-module', 'casebundle'):
Modified: base/trunk/mpulsweb/templates/casemanagement/reminderlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/reminderlist.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/reminderlist.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -1,14 +1,14 @@
<%inherit file="/appointments/remindlist_body.mako" />
<%def name="showAppointmentActions(appointment)">
-<a href="${h.url_for(controller='/caseappointment', action='show',
+<a href="${h.url(controller='caseappointment', action='show',
id=appointment.id)}">
- <img src="${h.url_for('/images/icons/open_active_22.png')}" border="0"
+ <img src="${h.url('/images/icons/open_active_22.png')}" border="0"
alt="${_('Show')}"
title="${_('Show')}"></a>
% if h.hasRole(['cm']) and session.get('case').getState().getState() == 1:
- <a href="${h.url_for(controller='/caseappointment', action='delete',
+ <a href="${h.url(controller='caseappointment', action='delete',
id=appointment.id, confirmed=0)}">
- <img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0"
+ <img src="${h.url('/images/icons/delete_active_22.png')}" border="0"
alt="${_('Delete')}"
title="${_('Delete')}">
</a>
Modified: base/trunk/mpulsweb/templates/casemanagement/rename_attachment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/rename_attachment.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/rename_attachment.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -2,7 +2,7 @@
<%inherit file="main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='casedocument', action='index', id=session.get('case').id)}">${_('Document overview')}</a></li>
+ <li><a href="${h.url(controller='casedocument', action='index', id=session.get('case').id)}">${_('Document overview')}</a></li>
</%def>
<div id="content_header_small">
@@ -13,7 +13,7 @@
<div class="actions">
<ul>
<li>
- <a href="${h.url_for(controller='casedocument', action='index', id=session.get('case').id)}">
+ <a href="${h.url(controller='casedocument', action='index', id=session.get('case').id)}">
${_('Back to: user overview')}
</a>
</li>
@@ -23,7 +23,7 @@
</div>
<p class="import_p">
-${h.form(h.url_for(controller="casedocument", action='renameAction', id= c.id),
+${h.form(h.url(controller="casedocument", action='renameAction', id= c.id),
multipart=True)}
<div class="widget container">
<table class="form">
Modified: base/trunk/mpulsweb/templates/casemanagement/search.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/search.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/search.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -2,18 +2,18 @@
<%inherit file="/search/search.mako" />
<%def name="buildFormHeader()">
<form method="post" name="case_search"
- action="${h.url_for(controller='/case_overview', action='search')}"
+ action="${h.url(controller='case_overview', action='search')}"
accept-charset="UTF-8">
</%def>
<%def name="buildSearchReset()">
- <a href="${h.url_for(controller='case_overview', action='overview', reset=1)}">${_('Reset search')}</a>
+ <a href="${h.url(controller='case_overview', action='overview', reset=1)}">${_('Reset search')}</a>
</%def>
<%def name="buildSearchExtend()">
% if c.extended_search:
- <a href="${h.url_for(controller='case_overview',
+ <a href="${h.url(controller='case_overview',
action='overview_extended')}">${_('Hide extended search')}</a>
% else:
- <a href="${h.url_for(controller='case_overview',
+ <a href="${h.url(controller='case_overview',
action='overview_extended')}">${_('Show extended search')}</a>
% endif
${h.getHelp('extended_search')}
Modified: base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -1,9 +1,9 @@
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=c.appointment.case_id, confirmed=1)}">${_('Selected case documents')}</a></li>
- <li><a href="${h.url_for(controller='/caseappointment', action='index', id=c.appointment.case_id)}">${_('Appointments list')}</a></li>
- <li><a href="${h.url_for(controller='/caseappointment', action='show', id=c.appointment.id)}">${_('Event view')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=c.appointment.case_id, confirmed=1)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='caseappointment', action='index', id=c.appointment.case_id)}">${_('Appointments list')}</a></li>
+ <li><a href="${h.url(controller='caseappointment', action='show', id=c.appointment.id)}">${_('Event view')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -14,13 +14,13 @@
<ul>
% if h.hasRole(['cm']) and session.get('case').getState().getState() == 1:
<li>
- <a href="${h.url_for(controller='/caseappointment', action='edit', id=c.appointment.id)}">
+ <a href="${h.url(controller='caseappointment', action='edit', id=c.appointment.id)}">
${_('Edit appointment')}
</a>
</li>
% endif
<li>
- <a href="${h.url_for(controller='/caseappointment', action='index', id=c.appointment.case_id)}">${_('Back to: Event overview')}</a>
+ <a href="${h.url(controller='caseappointment', action='index', id=c.appointment.case_id)}">${_('Back to: Event overview')}</a>
</li>
</ul>
</div>
Modified: base/trunk/mpulsweb/templates/casemanagement/upload.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/upload.mako 2012-03-07 13:24:38 UTC (rev 5867)
+++ base/trunk/mpulsweb/templates/casemanagement/upload.mako 2012-03-07 14:00:58 UTC (rev 5868)
@@ -2,15 +2,15 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='import')}">${_('Import cases')}</a></li>
+ <li><a href="${h.url(controller='case', action='index')}">${_('Case Management')}</a></li>
+ <li><a href="${h.url(controller='case', action='import')}">${_('Import cases')}</a></li>
</%def>
<h1>${_('XML Import')}</h1>
<p>
${h.literal(_('You can add XML files. The size of a file must not exceed 10 MB.'))}
</p>
<br>
-${h.form(h.url(controller='/case', action='importXMLAction'), multipart=True)}
+${h.form(h.url(controller='case', action='importXMLAction'), multipart=True)}
<fieldset>
<legend>${_('Importfile')}</legend>
<table>
More information about the Mpuls-commits
mailing list