[Mpuls-commits] r5889 - in wasko/trunk/waskoweb: controllers templates/caselifetime templates/caselifetime/dialogs templates/casemanagement templates/privacy templates/privacy/default
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Thu Mar 8 15:08:05 CET 2012
Author: ludwig
Date: 2012-03-08 15:08:05 +0100 (Thu, 08 Mar 2012)
New Revision: 5889
Modified:
wasko/trunk/waskoweb/controllers/caselifetime.py
wasko/trunk/waskoweb/controllers/settings.py
wasko/trunk/waskoweb/templates/caselifetime/abbruch.mako
wasko/trunk/waskoweb/templates/caselifetime/dialogs/confirm_reopen.mako
wasko/trunk/waskoweb/templates/caselifetime/dialogs/success_reopen.mako
wasko/trunk/waskoweb/templates/caselifetime/neuaufnahme.mako
wasko/trunk/waskoweb/templates/caselifetime/overview.mako
wasko/trunk/waskoweb/templates/caselifetime/verlaengerung.mako
wasko/trunk/waskoweb/templates/caselifetime/wiederaufnahme.mako
wasko/trunk/waskoweb/templates/casemanagement/main.mako
wasko/trunk/waskoweb/templates/casemanagement/neuaufnahme.mako
wasko/trunk/waskoweb/templates/casemanagement/new.mako
wasko/trunk/waskoweb/templates/casemanagement/wiederaufnahme.mako
wasko/trunk/waskoweb/templates/privacy/default/privacy_statement.html
wasko/trunk/waskoweb/templates/privacy/list_statements.mako
Log:
Issue 2738: Replace url_for (wasko)
Modified: wasko/trunk/waskoweb/controllers/caselifetime.py
===================================================================
--- wasko/trunk/waskoweb/controllers/caselifetime.py 2012-03-08 14:06:43 UTC (rev 5888)
+++ wasko/trunk/waskoweb/controllers/caselifetime.py 2012-03-08 14:08:05 UTC (rev 5889)
@@ -296,7 +296,7 @@
The entry documentation was successfully aborted. The case document was given
to the administration for deletion. Click on OK to get back to the
case documents overview.''')
- c.url_ok = h.url_for(controller="/case_overview")
+ c.url_ok = h.url(controller="/case_overview", action='index')
return render('caselifetime/dialogs/success_reopen.mako')
else:
c.confirm_for = _(u'Do you want to abort the entry documentation?')
@@ -399,7 +399,7 @@
The case document was renewed. Click on OK to open the new case document.
Please check the data and update them, if needed. The old case document
was given to the administration for Anonymizing.''')
- c.url_ok = h.url_for(controller="/case/select/%s" % new_id)
+ c.url_ok = h.url(controller="case/select/%s" % new_id)
return render('caselifetime/dialogs/success_reopen.mako')
else:
c.confirm_for = _(u"Do you want to renew the case?")
@@ -428,7 +428,7 @@
c.success_text = _(u'''\
The not accepted new subscription was documented. Click on OK to get to the
entry documentation of the case document.''')
- c.url_ok = h.url_for(controller="formularpage",
+ c.url_ok = h.url(controller="formularpage",
action="select",
id="page-0:%s" % id)
return render('caselifetime/dialogs/success_reopen.mako')
@@ -513,7 +513,7 @@
c.success_text = _(u'''\
The case document has been successfully reopened. Click on OK to open the
reopened case document.''')
- c.url_ok = h.url_for(controller="/case",
+ c.url_ok = h.url(controller="case",
action="select",
id="%s" % id)
else:
@@ -521,7 +521,7 @@
c.success_text = _(u'''\
The case document has been successfully reopened. Click on OK to get to the
entry documentation of the case document.''')
- c.url_ok = h.url_for(controller="/formularpage",
+ c.url_ok = h.url(controller="formularpage",
action="select",
id="page-0:%s" % id)
return render('caselifetime/dialogs/success_reopen.mako')
@@ -564,7 +564,7 @@
c.success_text = _(u'''\
The not accepted reopening was documented. Click on OK to get to the
entry documentation of the case document.''')
- c.url_ok = h.url_for(controller="/formularpage",
+ c.url_ok = h.url(controller="formularpage",
action="select",
id="page-0:%s" % id)
return render('caselifetime/dialogs/success_reopen.mako')
Modified: wasko/trunk/waskoweb/controllers/settings.py
===================================================================
--- wasko/trunk/waskoweb/controllers/settings.py 2012-03-08 14:06:43 UTC (rev 5888)
+++ wasko/trunk/waskoweb/controllers/settings.py 2012-03-08 14:08:05 UTC (rev 5889)
@@ -5,7 +5,7 @@
from pylons import request, tmpl_context as c
from mpulsweb.lib.translation import _
-from mpulsweb.lib.helpers import url_for
+from mpulsweb.lib.helpers import url
from mpulsweb.lib.base import BaseController, render
from mpulsweb.lib.validators import EditSettingsForm
from mpulsweb.lib.security import checkRole
@@ -59,5 +59,5 @@
c.agency.store(c.form_result)
c.dialog_title = _('Configurations saved!')
c.dialog_text = _('Please click on ok to continue.')
- c.url_ok = url_for(controller='/settings')
+ c.url_ok = url(controller='settings', action='index')
return render ('/settings/dialogs/success_edit.mako')
Modified: wasko/trunk/waskoweb/templates/caselifetime/abbruch.mako
===================================================================
--- wasko/trunk/waskoweb/templates/caselifetime/abbruch.mako 2012-03-08 14:06:43 UTC (rev 5888)
+++ wasko/trunk/waskoweb/templates/caselifetime/abbruch.mako 2012-03-08 14:08:05 UTC (rev 5889)
@@ -1,7 +1,7 @@
## -*- coding: utf-8 -*-
<fieldset class="${not c.show_abort and 'inactive' or ''}">
- <legend>${_('Abort of the initial documentation')}<a target="_blank" href="${h.url_for('/annotations/help/abbruch')}"><img alt="${_('help icon')}" src="${h.url_for('/images/icons/form_help.png')}" border="0"></a></legend>
+ <legend>${_('Abort of the initial documentation')}<a target="_blank" href="${h.url('/annotations/help/abbruch')}"><img alt="${_('help icon')}" src="${h.url('/images/icons/form_help.png')}" border="0"></a></legend>
% if c.show_abort:
<input type="submit" name="abort" value="${_('Execute')}" ${h.hasRole(['admin']) and 'disabled' or ''}>
%else:
Modified: wasko/trunk/waskoweb/templates/caselifetime/dialogs/confirm_reopen.mako
===================================================================
--- wasko/trunk/waskoweb/templates/caselifetime/dialogs/confirm_reopen.mako 2012-03-08 14:06:43 UTC (rev 5888)
+++ wasko/trunk/waskoweb/templates/caselifetime/dialogs/confirm_reopen.mako 2012-03-08 14:08:05 UTC (rev 5889)
@@ -1,7 +1,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_for(controller='/case', action='caselifetime', 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='case', action='caselifetime', id=session.get('case').id)}">${_('Events')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: wasko/trunk/waskoweb/templates/caselifetime/dialogs/success_reopen.mako
===================================================================
--- wasko/trunk/waskoweb/templates/caselifetime/dialogs/success_reopen.mako 2012-03-08 14:06:43 UTC (rev 5888)
+++ wasko/trunk/waskoweb/templates/caselifetime/dialogs/success_reopen.mako 2012-03-08 14:08:05 UTC (rev 5889)
@@ -2,7 +2,7 @@
<%inherit file="../../casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for('/case')}">${_('Case Management')}</a></li>
+ <li><a href="${h.url('case', action='index')}">${_('Case Management')}</a></li>
<li><a href="#">${_('Case document deleted!')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: wasko/trunk/waskoweb/templates/caselifetime/neuaufnahme.mako
===================================================================
--- wasko/trunk/waskoweb/templates/caselifetime/neuaufnahme.mako 2012-03-08 14:06:43 UTC (rev 5888)
+++ wasko/trunk/waskoweb/templates/caselifetime/neuaufnahme.mako 2012-03-08 14:08:05 UTC (rev 5889)
@@ -1,7 +1,7 @@
## -*- coding: utf-8 -*-
<fieldset class="${not c.show_neuaufnahme and 'inactive' or ''}">
- <legend>${_('New subsription after other ending')}<a target="_blank" href="${h.url_for('/annotations/help/neuaufnahme')}"><img alt="${_('help icon')}" src="${h.url_for('/images/icons/form_help.png')}" border="0"></a></legend>
+ <legend>${_('New subsription after other ending')}<a target="_blank" href="${h.url('/annotations/help/neuaufnahme')}"><img alt="${_('help icon')}" src="${h.url('/images/icons/form_help.png')}" border="0"></a></legend>
% if c.show_neuaufnahme:
<table>
<tr>
Modified: wasko/trunk/waskoweb/templates/caselifetime/overview.mako
===================================================================
--- wasko/trunk/waskoweb/templates/caselifetime/overview.mako 2012-03-08 14:06:43 UTC (rev 5888)
+++ wasko/trunk/waskoweb/templates/caselifetime/overview.mako 2012-03-08 14:08:05 UTC (rev 5889)
@@ -4,8 +4,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='/case', action='caselifetime', id=session.get('case').id)}">${_('Verwaltung')}</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='caselifetime', id=session.get('case').id)}">${_('Verwaltung')}</a></li>
</%def>
<div id="content_header_small">
@@ -16,7 +16,7 @@
<h2>${_('Verwaltungsaufgaben')}</h2>
<div class="waska_form">
<p>${_('In the case management process there are different management operations for a case document. Enter the right data and then use the management operation.')} </p>
- <form method="POST" action="${h.url_for('/caselifetime/changeLifetime')}">
+ <form method="POST" action="${h.url('/caselifetime/changeLifetime')}">
## Verlängerung
<br>
<%include file="/caselifetime/verlaengerung.mako" />
Modified: wasko/trunk/waskoweb/templates/caselifetime/verlaengerung.mako
===================================================================
--- wasko/trunk/waskoweb/templates/caselifetime/verlaengerung.mako 2012-03-08 14:06:43 UTC (rev 5888)
+++ wasko/trunk/waskoweb/templates/caselifetime/verlaengerung.mako 2012-03-08 14:08:05 UTC (rev 5889)
@@ -1,7 +1,7 @@
## -*- coding: utf-8 -*-
<fieldset class="${not c.show_verlaengerung and 'inactive' or ''}">
- <legend>${_('extension of the integration process')}<a target="_blank" href="${h.url_for('/annotations/help/verlaengerung')}"><img alt="${_('help icon')}" src="${h.url_for('/images/icons/form_help.png')}" border="0"></a></legend>
+ <legend>${_('extension of the integration process')}<a target="_blank" href="${h.url('/annotations/help/verlaengerung')}"><img alt="${_('help icon')}" src="${h.url('/images/icons/form_help.png')}" border="0"></a></legend>
% if c.show_verlaengerung:
<strong>${_('First extension')}</strong>
<table class="${c.num_verlaengerung >= 1 and 'inactive' or ''}">
Modified: wasko/trunk/waskoweb/templates/caselifetime/wiederaufnahme.mako
===================================================================
--- wasko/trunk/waskoweb/templates/caselifetime/wiederaufnahme.mako 2012-03-08 14:06:43 UTC (rev 5888)
+++ wasko/trunk/waskoweb/templates/caselifetime/wiederaufnahme.mako 2012-03-08 14:08:05 UTC (rev 5889)
@@ -1,7 +1,7 @@
## -*- coding: utf-8 -*-
<fieldset class="${not c.show_wiedervorlage and 'inactive' or ''}">
- <legend>${_('Reopening after successful reintegration')}<a target="_blank" href="${h.url_for('/annotations/help/wiederaufnahme')}"><img alt="${_('help icon')}" src="${h.url_for('/images/icons/form_help.png')}" border="0"></a></legend>
+ <legend>${_('Reopening after successful reintegration')}<a target="_blank" href="${h.url('/annotations/help/wiederaufnahme')}"><img alt="${_('help icon')}" src="${h.url('/images/icons/form_help.png')}" border="0"></a></legend>
% if c.show_wiedervorlage:
<strong>${_('Reopening of the youth case for 3 month')}</strong>
<table class="${c.num_wiederaufnahme >= 1 and 'inactive' or ''}">
Modified: wasko/trunk/waskoweb/templates/casemanagement/main.mako
===================================================================
--- wasko/trunk/waskoweb/templates/casemanagement/main.mako 2012-03-08 14:06:43 UTC (rev 5888)
+++ wasko/trunk/waskoweb/templates/casemanagement/main.mako 2012-03-08 14:08:05 UTC (rev 5889)
@@ -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,31 +85,31 @@
${self.buildInfofield()}
<ul>
<li>
- <a href="${h.url_for(controller='/case_overview')}"
+ <a href="${h.url(controller='case_overview', action='index')}"
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 session.get('case').getState().getState() == 1:
<li>
- <a href="${h.url_for(controller='caselifetime', action='index',
+ <a href="${h.url(controller='caselifetime', action='index',
id=session.get('case').id)}"
onclick="return checkModification();">Verwaltung</a>
</li>
% endif
% 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();">
@@ -119,7 +119,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();">
@@ -136,7 +136,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();">
@@ -146,7 +146,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();">
@@ -156,7 +156,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();">
@@ -166,7 +166,7 @@
% endif
% if g.mpuls_config.is_enabled('case-module', 'appointments') and session.get('case').getState().getState() == 1:
<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>
@@ -174,7 +174,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();">
@@ -184,7 +184,7 @@
% endif
% if g.mpuls_config.is_enabled('case-module', 'copy') and session.get('case').getState().getState() == 1:
<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();"
@@ -192,7 +192,7 @@
</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();"
@@ -209,27 +209,27 @@
<div class="actions">
<ul>
<li>
- <a href="${h.url_for(controller='case', action='digest', id=session.get('case').id)}"
+ <a href="${h.url(controller='case', action='digest', id=session.get('case').id)}"
onclick="return checkModification();">
${_('Summary')}
</a>
</li>
% if h.hasRole(['cm', 'admin']):
<li>
- <a href="${h.url_for(controller='phase', action='overview', id=session.get('case').id)}"
+ <a href="${h.url(controller='phase', action='overview', id=session.get('case').id)}"
onclick="return checkModification();">
${_('Phase in CM')}
</a>
</li>
<li>
- <a href="${h.url_for(controller='case', action='organisation', id=session.get('case').id)}"
+ <a href="${h.url(controller='case', action='organisation', id=session.get('case').id)}"
onclick="return checkModification();">
${_('Organisation')}
</a>
</li>
% if g.mpuls_config.is_enabled('case-module', 'appointments'):
<li>
- <a href="${h.url_for(controller='caseappointment', action='index', id=session.get('case').id)}"
+ <a href="${h.url(controller='caseappointment', action='index', id=session.get('case').id)}"
onclick="return checkModification();">
${_('Appointment')}
</a>
@@ -237,7 +237,7 @@
% endif
% if h.hasRole(['cm']) and g.mpuls_config.is_enabled('case-module', 'logbook'):
<li>
- <a href="${h.url_for(controller='logbook', action='index', id=session.get('case').id)}"
+ <a href="${h.url(controller='logbook', action='index', id=session.get('case').id)}"
onclick="return checkModification();">
Tagebuch
</a>
@@ -245,7 +245,7 @@
% endif
% if g.mpuls_config.is_enabled('case-module', 'documents'):
<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)}"
onclick="return checkModification();">
${_('documents')}
</a>
Modified: wasko/trunk/waskoweb/templates/casemanagement/neuaufnahme.mako
===================================================================
--- wasko/trunk/waskoweb/templates/casemanagement/neuaufnahme.mako 2012-03-08 14:06:43 UTC (rev 5888)
+++ wasko/trunk/waskoweb/templates/casemanagement/neuaufnahme.mako 2012-03-08 14:08:05 UTC (rev 5889)
@@ -2,12 +2,12 @@
<%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')}">${_('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='index')}">${_('Create new case')}</a></li>
</%def>
<div class="waska_form">
<h1>${_('Reopening after successful reintegration')}</h1>
-<form id="waska_form" action="${h.url_for(controller='/case', action='neuaufnahmeAction')}" accept-charset="UTF-8" name="waska_form" method="POST">
+<form id="waska_form" action="${h.url(controller='case', action='neuaufnahmeAction')}" accept-charset="UTF-8" name="waska_form" method="POST">
<fieldset>
<legend>${_('Data of the closing of the support')} </legend>
<table>
Modified: wasko/trunk/waskoweb/templates/casemanagement/new.mako
===================================================================
--- wasko/trunk/waskoweb/templates/casemanagement/new.mako 2012-03-08 14:06:43 UTC (rev 5888)
+++ wasko/trunk/waskoweb/templates/casemanagement/new.mako 2012-03-08 14:08:05 UTC (rev 5889)
@@ -3,13 +3,13 @@
<%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')}"
+ action="${h.url(controller='case', action='newAction')}"
accept-charset="UTF-8"
name="waska_form" method="POST">
<h1>${_('Create new case document')}</h1>
@@ -83,13 +83,13 @@
<label for="type_aufnahme_1">${_('Initial admission')}</label><br>
<input type="radio" name="aufnahme_typ" value="1" id="type_aufnahme_2">
<label for="type_aufnahme_2">${_('Reopening after successful reintegration')}</label>
- <a target="_blank" href="${h.url_for('/annotations/help/wiederaufnahme')}">
- <img alt="${_('help icon')}" src="${h.url_for('/images/icons/form_help.png')}" border="0">
+ <a target="_blank" href="${h.url('/annotations/help/wiederaufnahme')}">
+ <img alt="${_('help icon')}" src="${h.url('/images/icons/form_help.png')}" border="0">
</a><br>
<input type="radio" name="aufnahme_typ" value="2" id="type_aufnahme_3">
<label for="type_aufnahme_3">${_('New admission after other termination')}</label>
- <a target="_blank" href="${h.url_for('/annotations/help/neuaufnahme')}">
- <img alt="${_('help icon')}" src="${h.url_for('/images/icons/form_help.png')}" border="0">
+ <a target="_blank" href="${h.url('/annotations/help/neuaufnahme')}">
+ <img alt="${_('help icon')}" src="${h.url('/images/icons/form_help.png')}" border="0">
</a>
</fieldset>
<div style="padding: 1em 0;">
@@ -100,24 +100,24 @@
<table>
<tr>
<td class="table_row_h">
- Arabisch <a href="${h.url_for('/documents/ee_ar.pdf')}">download</a>
+ Arabisch <a href="${h.url('/documents/ee_ar.pdf')}">download</a>
</td>
<td class="table_row_h">
- Englisch <a href="${h.url_for('/documents/ee_en.pdf')}">download</a>
+ Englisch <a href="${h.url('/documents/ee_en.pdf')}">download</a>
</td>
</tr>
<tr>
- <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>
+ <td>Polnisch <a href="${h.url('/documents/ee_pl.pdf')}">download</a></td>
+ <td>Russisch <a href="${h.url('/documents/ee_ru.pdf')}">download</a></td>
</tr>
<tr>
<td class="table_row_h">
- Türkisch <a href="${h.url_for('/documents/ee_tr.pdf')}">download</a>
+ Türkisch <a href="${h.url('/documents/ee_tr.pdf')}">download</a>
</td>
<td class="table_row_h">
Deutsch
(Einwilligungserklärung ohne Hinweise zu Teilnehmernachweisen)
- <a href="${h.url_for('/documents/ee_de_ohnetn.pdf')}">download</a>
+ <a href="${h.url('/documents/ee_de_ohnetn.pdf')}">download</a>
</td>
</tr>
</table>
Modified: wasko/trunk/waskoweb/templates/casemanagement/wiederaufnahme.mako
===================================================================
--- wasko/trunk/waskoweb/templates/casemanagement/wiederaufnahme.mako 2012-03-08 14:06:43 UTC (rev 5888)
+++ wasko/trunk/waskoweb/templates/casemanagement/wiederaufnahme.mako 2012-03-08 14:08:05 UTC (rev 5889)
@@ -2,12 +2,12 @@
<%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')}">${_('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='index')}">${_('Create new case')}</a></li>
</%def>
<div class="waska_form">
<h1>${_('Reopening after successful reintegration')}</h1>
-<form id="waska_form" action="${h.url_for(controller='/case', action='wiederaufnahmeAction')}" accept-charset="UTF-8" name="waska_form" method="POST">
+<form id="waska_form" action="${h.url(controller='case', action='wiederaufnahmeAction')}" accept-charset="UTF-8" name="waska_form" method="POST">
<fieldset>
<legend>${_('Data of the closing of the support')} </legend>
<table>
Modified: wasko/trunk/waskoweb/templates/privacy/default/privacy_statement.html
===================================================================
--- wasko/trunk/waskoweb/templates/privacy/default/privacy_statement.html 2012-03-08 14:06:43 UTC (rev 5888)
+++ wasko/trunk/waskoweb/templates/privacy/default/privacy_statement.html 2012-03-08 14:08:05 UTC (rev 5889)
@@ -13,11 +13,11 @@
<meta http-equiv="content-style-type" content="text/css">
<meta http-equiv="expires" content="0">
<link rel="shortcut icon" type="image/x-icon" href="/images/mpuls.ico">
-<link href="${h.url_for('/styles/all.css')}" media="all" rel="stylesheet"
+<link href="${h.url('/styles/all.css')}" media="all" rel="stylesheet"
type="text/css">
-<link href="${h.url_for('/styles/print.css')}" media="screen" rel="stylesheet"
+<link href="${h.url('/styles/print.css')}" media="screen" rel="stylesheet"
type="text/css">
-<link href="${h.url_for('/styles/print.css')}" media="print" rel="stylesheet"
+<link href="${h.url('/styles/print.css')}" media="print" rel="stylesheet"
type="text/css">
<style type="text/css">
.statement_content {
Modified: wasko/trunk/waskoweb/templates/privacy/list_statements.mako
===================================================================
--- wasko/trunk/waskoweb/templates/privacy/list_statements.mako 2012-03-08 14:06:43 UTC (rev 5888)
+++ wasko/trunk/waskoweb/templates/privacy/list_statements.mako 2012-03-08 14:08:05 UTC (rev 5889)
@@ -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='/privacy', action='listStatements')}">${_('List statements')}</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='privacy', action='listStatements')}">${_('List statements')}</a></li>
</%def>
<h1>${_('Avaliable statements')}</h1>
<h2>Allgemein</h2>
@@ -15,7 +15,7 @@
${_('The written consent sets up the base for the collection, handling and utilization of personal data. The written consent contains the safekeeping period that is adjustable for each institution. Finished case files are automatically suggested to be anonymized after the elapsed time period.')}
</p>
<p> ${_('German')}:
- <a href="${h.url_for(controller='/privacy', action='printStatement', id=session.get('case').id)}" target="_blank">
+ <a href="${h.url(controller='privacy', action='printStatement', id=session.get('case').id)}" target="_blank">
${_('Print acceptence statement')}
</a>
</p>
@@ -24,24 +24,24 @@
<table>
<tr>
<td class="table_row_h">
- ${_('Arabic')} <a href="${h.url_for('/documents/ee_ar.pdf')}">${_('download')}</a>
+ ${_('Arabic')} <a href="${h.url('/documents/ee_ar.pdf')}">${_('download')}</a>
</td>
<td class="table_row_h">
- ${_('English')} <a href="${h.url_for('/documents/ee_en.pdf')}">${_('download')}</a>
+ ${_('English')} <a href="${h.url('/documents/ee_en.pdf')}">${_('download')}</a>
</td>
</tr>
<tr>
- <td>${_('Polish')} <a href="${h.url_for('/documents/ee_pl.pdf')}">${_('download')}</a></td>
- <td>${_('Russian')} <a href="${h.url_for('/documents/ee_ru.pdf')}">${_('download')}</a></td>
+ <td>${_('Polish')} <a href="${h.url('/documents/ee_pl.pdf')}">${_('download')}</a></td>
+ <td>${_('Russian')} <a href="${h.url('/documents/ee_ru.pdf')}">${_('download')}</a></td>
</tr>
<tr>
<td class="table_row_h">
- ${_('Turkish')} <a href="${h.url_for('/documents/ee_tr.pdf')}">${_('download')}</a>
+ ${_('Turkish')} <a href="${h.url('/documents/ee_tr.pdf')}">${_('download')}</a>
</td>
<td class="table_row_h">
${_('German')}
(${_('Written consent without details about participants')})
- <a href="${h.url_for('/documents/ee_de_ohnetn.pdf')}">${_('download')}</a>
+ <a href="${h.url('/documents/ee_de_ohnetn.pdf')}">${_('download')}</a>
</td>
</tr>
</table>
@@ -56,7 +56,7 @@
Schweigepflichtsentbindung des jungen Menschen. Bitte beachten Sie, dem jungen
Menschen eine Übersicht der bereits über ihn gespeicherten Daten zu übergeben,
sobald Sie die Verknüpfung mit der AiR-Akte durchgeführt haben.</p>
-<p><a href="${h.url_for(controller='/meta', action='print_statement1', id=session.get('case').id)}" target="_blank">${_('Print acceptence statement')}</a></p>
+<p><a href="${h.url(controller='meta', action='print_statement1', id=session.get('case').id)}" target="_blank">${_('Print acceptence statement')}</a></p>
<br>
<h3>Schweigepflichtsentbindung für die Übermittlung und Austausch von Daten mit dem AiR-Server</h3>
<h2>Vereinbarung Förderplan</h2>
@@ -65,7 +65,7 @@
AiR-Server mit anderen Stellen einer besonderen Verschwiegenheitsverpflichtung
(z.B. Arztgeheimnis). Der junge Mensch kann mit dieser Erklärung ausdrücklich
bestätigen, dass diese Daten übertragen werden dürfen.</p>
-<p><a href="${h.url_for(controller='/meta', action='print_statement2', id=session.get('case').id)}" target="_blank">Schweigepflichtsentbindung drucken</a></p>
+<p><a href="${h.url(controller='meta', action='print_statement2', id=session.get('case').id)}" target="_blank">Schweigepflichtsentbindung drucken</a></p>
</div>
% endif
<h2>Weitere</h2>
@@ -75,6 +75,6 @@
Erklärung zur Schweigepflichtsentbindung von Vertrauenspersonen mit Schweigepflicht gemäß § 203 StGB gegenüber der Einrichtung.
</p>
<p>
- <a href="${h.url_for(controller='/privacy', action='printDiscretionStatement', id=session.get('case').id)}" target="_blank">Schweigepflichtsentbindung drucken</a>
+ <a href="${h.url(controller='privacy', action='printDiscretionStatement', id=session.get('case').id)}" target="_blank">Schweigepflichtsentbindung drucken</a>
</p>
</div>
More information about the Mpuls-commits
mailing list