[Mpuls-commits] r5877 - in base/trunk/mpulsweb/templates/phase: . dialogs
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Thu Mar 8 11:20:30 CET 2012
Author: ludwig
Date: 2012-03-08 11:20:30 +0100 (Thu, 08 Mar 2012)
New Revision: 5877
Modified:
base/trunk/mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako
base/trunk/mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako
base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako
base/trunk/mpulsweb/templates/phase/phase.mako
Log:
Issue 2738: Replace url_for (templates/phase)
Modified: base/trunk/mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako
===================================================================
--- base/trunk/mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako 2012-03-08 10:15:56 UTC (rev 5876)
+++ base/trunk/mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako 2012-03-08 10:20:30 UTC (rev 5877)
@@ -3,20 +3,20 @@
<%inherit file="/casemanagement/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="#">${_('Phase in CM')}</a></li>
</%def>
<div class="dialog">
-<h1><img src="${h.url_for('/images/icons/info/confirmation.png')}" alt="${_('Resolved')}"
+<h1><img src="${h.url('/images/icons/info/confirmation.png')}" alt="${_('Resolved')}"
width="48"
height="48">${c.dialog_title or c.success_for | F.NA}</h1>
<p>${c.dialog_text or c.success_text | F.NA}</p>
<div class="import_box_dialog">
<p>
- ${h.literal(_('Please consider, that the case should be given to the client in printed form after changing the phase. More information can be under %s') % '<a href="%s" target="_blank">%s</a>' % (h.url_for(controller='/annotations', action='help', id='datenschutz_veraenderte_daten'), _('Help')))}
+ ${h.literal(_('Please consider, that the case should be given to the client in printed form after changing the phase. More information can be under %s') % '<a href="%s" target="_blank">%s</a>' % (h.url(controller='annotations', action='help', id='datenschutz_veraenderte_daten'), _('Help')))}
</p>
</div>
<br>
<a class="button" href="${c.url_ok}">${_('OK')}</a>
-<a class="button" href="${h.url_for(controller='/case', action='printAll', id=session.get('case').id, confirmed=0)}" target="_blank">${_('Print')}</a>
+<a class="button" href="${h.url(controller='case', action='printAll', id=session.get('case').id, confirmed=0)}" target="_blank">${_('Print')}</a>
</div>
Modified: base/trunk/mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako
===================================================================
--- base/trunk/mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako 2012-03-08 10:15:56 UTC (rev 5876)
+++ base/trunk/mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako 2012-03-08 10:20:30 UTC (rev 5877)
@@ -3,11 +3,11 @@
<%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)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=session.get('case').id)}">${_('Selected case documents')}</a></li>
<li><a href="#">${_('Phase in CM')}</a></li>
</%def>
<div class="dialog" />
- <h1><img src="${h.url_for('/images/icons/info/confirmation.png')}" alt="Erledigt"/>${c.dialog_title | F.NA}</h1>
+ <h1><img src="${h.url('/images/icons/info/confirmation.png')}" alt="Erledigt"/>${c.dialog_title | F.NA}</h1>
<p>${c.dialog_text | F.NA}</p>
<br>
<a class="button import" href="${c.url_ok}">${_('Yes')}</a>
Modified: base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako
===================================================================
--- base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako 2012-03-08 10:15:56 UTC (rev 5876)
+++ base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako 2012-03-08 10:20:30 UTC (rev 5877)
@@ -3,25 +3,25 @@
<%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)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=session.get('case').id)}">${_('Selected case documents')}</a></li>
<li><a href="#">${_('Phase in CM')}</a></li>
</%def>
<div class="dialog" />
- <h1><img src="${h.url_for('/images/icons/info/confirmation.png')}" alt="Erledigt"/>${c.dialog_title | F.NA}</h1>
+ <h1><img src="${h.url('/images/icons/info/confirmation.png')}" alt="Erledigt"/>${c.dialog_title | F.NA}</h1>
<p>${c.dialog_text | F.NA}</p>
<div class="import_box_dialog">
<ol>
% if c.show_meta_case_hint:
<li>
${_('It is strongly recommended to sync the case with its meta-case after changing the phase as this is a significant change in the support of the client. Please open the meta-case to sync the updated case to the meta-server.')}<br>
- <a class="button import" href="${h.url_for(controller='/meta', action='index', id=session.get('case').id)}">${_('Meta case')}</a>
+ <a class="button import" href="${h.url(controller='meta', action='index', id=session.get('case').id)}">${_('Meta case')}</a>
<br>
<br>
</li>
% endif
<li>
- ${h.literal(_('Please remember: If the modus changes a printed case file has to be delivered to the young person. Further information you will find in <a href="%s" target="_blank">Help</a>.<br>') % h.url_for(controller='/annotations', action='help', id='datenschutz_veraenderte_daten'))}
- <a class="button import" href="${h.url_for(controller='/case', action='printAll', id=session.get('case').id, confirmed=0)}" target="_blank">${_('Print')}</a>
+ ${h.literal(_('Please remember: If the modus changes a printed case file has to be delivered to the young person. Further information you will find in <a href="%s" target="_blank">Help</a>.<br>') % h.url(controller='annotations', action='help', id='datenschutz_veraenderte_daten'))}
+ <a class="button import" href="${h.url(controller='case', action='printAll', id=session.get('case').id, confirmed=0)}" target="_blank">${_('Print')}</a>
</li>
</ol>
</div>
@@ -29,9 +29,9 @@
<div>
% if g.mpuls_config.is_enabled('phases', 'changemode') == 1:
% if session.get('navigation.selectedpage') is not None:
- <a class="button import" href="${h.url_for(controller='/formularpage', action='edit', id=session.get('navigation.selectedpage'))}">${_('Continue editing')}</a>
+ <a class="button import" href="${h.url(controller='formularpage', action='edit', id=session.get('navigation.selectedpage'))}">${_('Continue editing')}</a>
% else:
- <a class="button import" href="${h.url_for(controller='/case', action='digest', id=session.get('case').id)}">${_('Continue editing')}</a>
+ <a class="button import" href="${h.url(controller='case', action='digest', id=session.get('case').id)}">${_('Continue editing')}</a>
% endif
%endif
<a class="button import" href="${c.url_ok}">${_('Back to phase overview')}</a>
Modified: base/trunk/mpulsweb/templates/phase/phase.mako
===================================================================
--- base/trunk/mpulsweb/templates/phase/phase.mako 2012-03-08 10:15:56 UTC (rev 5876)
+++ base/trunk/mpulsweb/templates/phase/phase.mako 2012-03-08 10:20:30 UTC (rev 5877)
@@ -2,8 +2,8 @@
<%inherit file="../casemanagement/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='select', id=session.get('case').id)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='case', action='index')}">${_('Case Management')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=session.get('case').id)}">${_('Selected case documents')}</a></li>
<li><a href="#">${_('Phase in CM')}</a></li>
</%def>
@@ -13,7 +13,7 @@
<h2>${_('Phase in CM')}</h2>
<div class="widget container">
- <form method="POST" action="${h.url_for(controller='/phase', action='editAction')}">
+ <form method="POST" action="${h.url(controller='phase', action='editAction')}">
<input type="hidden" name="case_id" value="${session.get('case').id}">
<table id="cmphases">
<% is_allowed = h.hasRole(('cm',)) %>
@@ -60,12 +60,12 @@
</td>
<td class="middle">
% if p1.is_ok() and (c.phases.is_on_path(p1.id, current_phase,True) or c.phases.is_on_path(current_phase, p1.id, True)):
- <img src="${h.url_for('/images/icons/info/ok_22.png')}"
+ <img src="${h.url('/images/icons/info/ok_22.png')}"
alt="Ok"
width="22"
height="22">
% else:
- <img src="${h.url_for('/images/icons/info/failure_22.png')}"
+ <img src="${h.url('/images/icons/info/failure_22.png')}"
alt="Error"
width="22"
height="22">
@@ -102,12 +102,12 @@
<tr class="${(num%2) and 'hl' or ''}">
<td class="middle">
% if p2.is_ok() and (c.phases.is_on_path(p2.id, current_phase, True) or c.phases.is_on_path(current_phase, p2.id, True)):
- <img src="${h.url_for('/images/icons/info/ok_22.png')}"
+ <img src="${h.url('/images/icons/info/ok_22.png')}"
alt="Ok"
width="22"
height="22">
% else:
- <img src="${h.url_for('/images/icons/info/failure_22.png')}"
+ <img src="${h.url('/images/icons/info/failure_22.png')}"
alt="Error"
width="22"
height="22">
More information about the Mpuls-commits
mailing list