[Mpuls-commits] r5866 - in base/trunk/mpulsweb/templates/casebundle: . dialogs
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Wed Mar 7 14:23:15 CET 2012
Author: ludwig
Date: 2012-03-07 14:23:15 +0100 (Wed, 07 Mar 2012)
New Revision: 5866
Modified:
base/trunk/mpulsweb/templates/casebundle/dialogs/confirm_anonymize.mako
base/trunk/mpulsweb/templates/casebundle/dialogs/download_formletter.mako
base/trunk/mpulsweb/templates/casebundle/dialogs/error.mako
base/trunk/mpulsweb/templates/casebundle/dialogs/failure_anonymize.mako
base/trunk/mpulsweb/templates/casebundle/dialogs/failure_delete_admin.mako
base/trunk/mpulsweb/templates/casebundle/dialogs/success_anonymize.mako
base/trunk/mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako
base/trunk/mpulsweb/templates/casebundle/dialogs/success_editor.mako
base/trunk/mpulsweb/templates/casebundle/dialogs/success_markdelete.mako
base/trunk/mpulsweb/templates/casebundle/dialogs/success_markevaluate.mako
base/trunk/mpulsweb/templates/casebundle/dialogs/success_standin.mako
base/trunk/mpulsweb/templates/casebundle/editor.mako
base/trunk/mpulsweb/templates/casebundle/standin.mako
Log:
Issue 2738: Replace url_for with url (template/casebundle)
Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/confirm_anonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/confirm_anonymize.mako 2012-03-07 13:15:34 UTC (rev 5865)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/confirm_anonymize.mako 2012-03-07 13:23:15 UTC (rev 5866)
@@ -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="#">${_('Anonymize case document')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/download_formletter.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/download_formletter.mako 2012-03-07 13:15:34 UTC (rev 5865)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/download_formletter.mako 2012-03-07 13:23:15 UTC (rev 5866)
@@ -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="#">${_('formletter')}</a></li>
</%def>
<div class="dialog">
@@ -10,7 +10,7 @@
alt="${_('Success')}"
width="48"
height="48">${c.dialog_title or c.confirm_for}</h1>
-<form action="${h.url_for(controller='/case_bundle', action='formletterAction')}"
+<form action="${h.url(controller='case_bundle', action='formletterAction')}"
method="GET">
<p>
${c.dialog_text}
Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/error.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/error.mako 2012-03-07 13:15:34 UTC (rev 5865)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/error.mako 2012-03-07 13:23:15 UTC (rev 5866)
@@ -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="#">${_('Do action for more cases')}</a></li>
</%def>
<%include file="../../dialogs/notification.mako" />
Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/failure_anonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/failure_anonymize.mako 2012-03-07 13:15:34 UTC (rev 5865)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/failure_anonymize.mako 2012-03-07 13:23:15 UTC (rev 5866)
@@ -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="#">${_('Anonymize case document')}</a></li>
</%def>
<%include file="../../dialogs/failed.mako" />
Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/failure_delete_admin.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/failure_delete_admin.mako 2012-03-07 13:15:34 UTC (rev 5865)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/failure_delete_admin.mako 2012-03-07 13:23:15 UTC (rev 5866)
@@ -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/casebundle/dialogs/success_anonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/success_anonymize.mako 2012-03-07 13:15:34 UTC (rev 5865)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/success_anonymize.mako 2012-03-07 13:23:15 UTC (rev 5866)
@@ -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="#">${_('Anonymize case document')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako 2012-03-07 13:15:34 UTC (rev 5865)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako 2012-03-07 13:23:15 UTC (rev 5866)
@@ -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/casebundle/dialogs/success_editor.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/success_editor.mako 2012-03-07 13:15:34 UTC (rev 5865)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/success_editor.mako 2012-03-07 13:23:15 UTC (rev 5866)
@@ -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>${_('Editor assigned')}</li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/success_markdelete.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/success_markdelete.mako 2012-03-07 13:15:34 UTC (rev 5865)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/success_markdelete.mako 2012-03-07 13:23:15 UTC (rev 5866)
@@ -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/casebundle/dialogs/success_markevaluate.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/success_markevaluate.mako 2012-03-07 13:15:34 UTC (rev 5865)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/success_markevaluate.mako 2012-03-07 13:23:15 UTC (rev 5866)
@@ -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="#">${_("Mark cases for evaluation")}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/success_standin.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/success_standin.mako 2012-03-07 13:15:34 UTC (rev 5865)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/success_standin.mako 2012-03-07 13:23:15 UTC (rev 5866)
@@ -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>${_('Set standin')}</li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casebundle/editor.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/editor.mako 2012-03-07 13:15:34 UTC (rev 5865)
+++ base/trunk/mpulsweb/templates/casebundle/editor.mako 2012-03-07 13:23:15 UTC (rev 5866)
@@ -3,7 +3,7 @@
<%! 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(controller='case', action='index')}">${_('Case Management')}</a></li>
<li>${_('Editor assigned')}</li>
</%def>
@@ -19,7 +19,7 @@
% endfor
</ul>
% if h.hasRole(['admin']):
-<form action="${h.url_for(controller="case_bundle", action="set_editor")}" method="POST">
+<form action="${h.url(controller="case_bundle", action="set_editor")}" method="POST">
<select name="editor">
% for user in c.user_list:
<option value="${user.id | F.NA}">${user.last_name | F.NA} ${user.first_name | F.NA}</option>
Modified: base/trunk/mpulsweb/templates/casebundle/standin.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/standin.mako 2012-03-07 13:15:34 UTC (rev 5865)
+++ base/trunk/mpulsweb/templates/casebundle/standin.mako 2012-03-07 13:23:15 UTC (rev 5866)
@@ -3,7 +3,7 @@
<%! 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(controller='case', action='index')}">${_('Case Management')}</a></li>
<li>${_('Set standin')}</li>
</%def>
@@ -27,7 +27,7 @@
</ul>
<p><strong>${_('attention')}!</strong> ${_('The existing rules were overwritten')}.</p>
% if (h.hasRole(['admin'])) or True:
-<form action="${h.url_for(controller="case_bundle", action="set_standin")}" method="POST">
+<form action="${h.url(controller="case_bundle", action="set_standin")}" method="POST">
<table>
<tr>
<th class="table_header_h table_checkbox"></th>
More information about the Mpuls-commits
mailing list