[Mpuls-commits] r5191 - in wasko/trunk/waskoweb/templates: caselifetime caselifetime/dialogs casemanagement privacy
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Jul 25 15:12:21 CEST 2011
Author: torsten
Date: 2011-07-25 15:12:20 +0200 (Mon, 25 Jul 2011)
New Revision: 5191
Modified:
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/neuaufnahme.mako
wasko/trunk/waskoweb/templates/casemanagement/new.mako
wasko/trunk/waskoweb/templates/casemanagement/wiederaufnahme.mako
wasko/trunk/waskoweb/templates/privacy/list_statements.mako
Log:
Templates verwenden nun zur Generierung von URLs die Funktion "url_for". Dies
sorgt daf?\195?\188r, dass korrekte Links generiert werden. Fixt einen Fehler in
Issue2273, der dazu f?\195?\188hrte das die Links f?\195?\188r den Betrieb der Anwendung in
einem Subpfad nicht mehr korrekt waren und zu einem 404 Fehler f?\195?\188hrten.
Modified: wasko/trunk/waskoweb/templates/caselifetime/abbruch.mako
===================================================================
--- wasko/trunk/waskoweb/templates/caselifetime/abbruch.mako 2011-07-25 07:46:03 UTC (rev 5190)
+++ wasko/trunk/waskoweb/templates/caselifetime/abbruch.mako 2011-07-25 13:12:20 UTC (rev 5191)
@@ -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="/annotations/help/abbruch"><img alt="${_('help icon')}" src="/images/icons/form_help.png" border="0"></a></legend>
+ <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>
% 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 2011-07-25 07:46:03 UTC (rev 5190)
+++ wasko/trunk/waskoweb/templates/caselifetime/dialogs/confirm_reopen.mako 2011-07-25 13:12:20 UTC (rev 5191)
@@ -1,7 +1,7 @@
<%inherit file="../../casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('Selected case documents')}</a></li>
- <li><a href="/case/caselifetime/${session.get('case').id}">${_('Events')}</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='/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 2011-07-25 07:46:03 UTC (rev 5190)
+++ wasko/trunk/waskoweb/templates/caselifetime/dialogs/success_reopen.mako 2011-07-25 13:12:20 UTC (rev 5191)
@@ -2,7 +2,7 @@
<%inherit file="../../casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case">${_('Case Management')}</a></li>
+ <li><a href="${h.url_for('/case')}">${_('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 2011-07-25 07:46:03 UTC (rev 5190)
+++ wasko/trunk/waskoweb/templates/caselifetime/neuaufnahme.mako 2011-07-25 13:12:20 UTC (rev 5191)
@@ -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="/annotations/help/neuaufnahme"><img alt="${_('help icon')}" src="/images/icons/form_help.png" border="0"></a></legend>
+ <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>
% if c.show_neuaufnahme:
<table>
<tr>
Modified: wasko/trunk/waskoweb/templates/caselifetime/overview.mako
===================================================================
--- wasko/trunk/waskoweb/templates/caselifetime/overview.mako 2011-07-25 07:46:03 UTC (rev 5190)
+++ wasko/trunk/waskoweb/templates/caselifetime/overview.mako 2011-07-25 13:12:20 UTC (rev 5191)
@@ -4,8 +4,8 @@
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('Selected case documents')}</a></li>
- <li><a href="/case/caselifetime/${session.get('case').id}">${_('Verwaltung')}</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='/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="/caselifetime/changeLifetime">
+ <form method="POST" action="${h.url_for('/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 2011-07-25 07:46:03 UTC (rev 5190)
+++ wasko/trunk/waskoweb/templates/caselifetime/verlaengerung.mako 2011-07-25 13:12:20 UTC (rev 5191)
@@ -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="/annotations/help/verlaengerung"><img alt="${_('help icon')}" src="/images/icons/form_help.png" border="0"></a></legend>
+ <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>
% 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 2011-07-25 07:46:03 UTC (rev 5190)
+++ wasko/trunk/waskoweb/templates/caselifetime/wiederaufnahme.mako 2011-07-25 13:12:20 UTC (rev 5191)
@@ -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="/annotations/help/wiederaufnahme"><img alt="${_('help icon')}" src="/images/icons/form_help.png" border="0"></a></legend>
+ <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>
% 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/neuaufnahme.mako
===================================================================
--- wasko/trunk/waskoweb/templates/casemanagement/neuaufnahme.mako 2011-07-25 07:46:03 UTC (rev 5190)
+++ wasko/trunk/waskoweb/templates/casemanagement/neuaufnahme.mako 2011-07-25 13:12:20 UTC (rev 5191)
@@ -2,12 +2,12 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/">${_('Case Management')}</a></li>
- <li><a href="/case/">${_('Create new case')}</a></li>
+ <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>
</%def>
<div class="waska_form">
<h1>${_('Reopening after successful reintegration')}</h1>
-<form id="waska_form" action="/case/neuaufnahmeAction" accept-charset="UTF-8" name="waska_form" method="POST">
+<form id="waska_form" action="${h.url_for(controller='/case', actions='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 2011-07-25 07:46:03 UTC (rev 5190)
+++ wasko/trunk/waskoweb/templates/casemanagement/new.mako 2011-07-25 13:12:20 UTC (rev 5191)
@@ -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="/annotations/help/wiederaufnahme">
- <img alt="${_('help icon')}" src="/images/icons/form_help.png" border="0">
+ <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><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="/annotations/help/neuaufnahme">
- <img alt="${_('help icon')}" src="/images/icons/form_help.png" border="0">
+ <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>
</fieldset>
<div style="padding: 1em 0;">
@@ -100,24 +100,24 @@
<table>
<tr>
<td class="table_row_h">
- Arabisch <a href="/documents/ee_ar.pdf">download</a>
+ Arabisch <a href="${h.url_for('/documents/ee_ar.pdf')}">download</a>
</td>
<td class="table_row_h">
- Englisch <a href="/documents/ee_en.pdf">download</a>
+ Englisch <a href="${h.url_for('/documents/ee_en.pdf')}">download</a>
</td>
</tr>
<tr>
- <td>Polnisch <a href="/documents/ee_pl.pdf">download</a></td>
- <td>Russisch <a href="/documents/ee_ru.pdf">download</a></td>
+ <td>Polnisch <a href="${h.url_for('/documents/ee_pl.pdf')}">download</a></td>
+ <td>Russisch <a href="${h.url_for('/documents/ee_ru.pdf')}">download</a></td>
</tr>
<tr>
<td class="table_row_h">
- Türkisch <a href="/documents/ee_tr.pdf">download</a>
+ Türkisch <a href="${h.url_for('/documents/ee_tr.pdf')}">download</a>
</td>
<td class="table_row_h">
Deutsch
(Einwilligungserklärung ohne Hinweise zu Teilnehmernachweisen)
- <a href="/documents/ee_de_ohnetn.pdf">download</a>
+ <a href="${h.url_for('/documents/ee_de_ohnetn.pdf')}">download</a>
</td>
</tr>
</table>
Modified: wasko/trunk/waskoweb/templates/casemanagement/wiederaufnahme.mako
===================================================================
--- wasko/trunk/waskoweb/templates/casemanagement/wiederaufnahme.mako 2011-07-25 07:46:03 UTC (rev 5190)
+++ wasko/trunk/waskoweb/templates/casemanagement/wiederaufnahme.mako 2011-07-25 13:12:20 UTC (rev 5191)
@@ -2,12 +2,12 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/">${_('Case Management')}</a></li>
- <li><a href="/case/">${_('Create new case')}</a></li>
+ <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>
</%def>
<div class="waska_form">
<h1>${_('Reopening after successful reintegration')}</h1>
-<form id="waska_form" action="/case/wiederaufnahmeAction" accept-charset="UTF-8" name="waska_form" method="POST">
+<form id="waska_form" action="${h.url_for(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/list_statements.mako
===================================================================
--- wasko/trunk/waskoweb/templates/privacy/list_statements.mako 2011-07-25 07:46:03 UTC (rev 5190)
+++ wasko/trunk/waskoweb/templates/privacy/list_statements.mako 2011-07-25 13:12:20 UTC (rev 5191)
@@ -23,24 +23,24 @@
<table>
<tr>
<td class="table_row_h">
- ${_('Arabic')} <a href="/documents/ee_ar.pdf">${_('download')}</a>
+ ${_('Arabic')} <a href="${h.url_for('/documents/ee_ar.pdf')}">${_('download')}</a>
</td>
<td class="table_row_h">
- ${_('English')} <a href="/documents/ee_en.pdf">${_('download')}</a>
+ ${_('English')} <a href="${h.url_for('/documents/ee_en.pdf')}">${_('download')}</a>
</td>
</tr>
<tr>
- <td>${_('Polish')} <a href="/documents/ee_pl.pdf">${_('download')}</a></td>
- <td>${_('Russian')} <a href="/documents/ee_ru.pdf">${_('download')}</a></td>
+ <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>
</tr>
<tr>
<td class="table_row_h">
- ${_('Turkish')} <a href="/documents/ee_tr.pdf">${_('download')}</a>
+ ${_('Turkish')} <a href="${h.url_for('/documents/ee_tr.pdf')}">${_('download')}</a>
</td>
<td class="table_row_h">
${_('German')}
(${_('Written consent without details about participants')})
- <a href="/documents/ee_de_ohnetn.pdf">${_('download')}</a>
+ <a href="${h.url_for('/documents/ee_de_ohnetn.pdf')}">${_('download')}</a>
</td>
</tr>
</table>
More information about the Mpuls-commits
mailing list