[Mpuls-commits] r5900 - in waska/branches/waska3/waskaweb/templates: casemanagement info privacy
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Fri Mar 9 14:19:03 CET 2012
Author: ludwig
Date: 2012-03-09 14:19:03 +0100 (Fri, 09 Mar 2012)
New Revision: 5900
Modified:
waska/branches/waska3/waskaweb/templates/casemanagement/aidplan.mako
waska/branches/waska3/waskaweb/templates/casemanagement/new.mako
waska/branches/waska3/waskaweb/templates/info/info.mako
waska/branches/waska3/waskaweb/templates/privacy/list_statements.mako
Log:
Issue 2738: Replace url_for (waska3)
Modified: waska/branches/waska3/waskaweb/templates/casemanagement/aidplan.mako
===================================================================
--- waska/branches/waska3/waskaweb/templates/casemanagement/aidplan.mako 2012-03-09 11:58:05 UTC (rev 5899)
+++ waska/branches/waska3/waskaweb/templates/casemanagement/aidplan.mako 2012-03-09 13:19:03 UTC (rev 5900)
@@ -13,10 +13,10 @@
<meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
<meta http-equiv="content-style-type" content="text/css">
<meta http-equiv="expires" content="0">
-<link href="${h.url_for('/styles/all.css')}" media="all" rel="stylesheet" type="text/css">
-<link href="${h.url_for('/styles/print.css')}" media="screen" rel="stylesheet" type="text/css">
+<link href="${h.url('/styles/all.css')}" media="all" rel="stylesheet" type="text/css">
+<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" type="text/css">
+<link href="${h.url('/styles/print.css')}" media="print" rel="stylesheet" type="text/css">
<style type="text/css">
.statement_content {
margin-bottom: 5em;
Modified: waska/branches/waska3/waskaweb/templates/casemanagement/new.mako
===================================================================
--- waska/branches/waska3/waskaweb/templates/casemanagement/new.mako 2012-03-09 11:58:05 UTC (rev 5899)
+++ waska/branches/waska3/waskaweb/templates/casemanagement/new.mako 2012-03-09 13:19:03 UTC (rev 5900)
@@ -3,12 +3,12 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for('/case/')}">${_('Case Management')}</a></li>
- <li><a href="${h.url_for('/case/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('/case/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>${_('Create new case document')}</h1>
<fieldset>
@@ -125,24 +125,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: waska/branches/waska3/waskaweb/templates/info/info.mako
===================================================================
--- waska/branches/waska3/waskaweb/templates/info/info.mako 2012-03-09 11:58:05 UTC (rev 5899)
+++ waska/branches/waska3/waskaweb/templates/info/info.mako 2012-03-09 13:19:03 UTC (rev 5900)
@@ -15,7 +15,7 @@
Büro Stiftung SPI, Schicklerstr. 5-7, 10179 Berlin<br>
Telefon: + 49 (0) 30 - 390 634 - 70<br>
Telefax: + 49 (0) 30 - 390 634 - 80<br>
- Email: <a href="${h.url_for('mailto:jugendsozialarbeit at esf-regiestelle.eu')}">jugendsozialarbeit at esf-regiestelle.eu</a>
+ Email: <a href="mailto:jugendsozialarbeit at esf-regiestelle.eu'">jugendsozialarbeit at esf-regiestelle.eu</a>
</p>
<p>
<h3>Finanztechnisches Fördermanagement:</h3>
@@ -23,7 +23,7 @@
Oranienburger Straße 65, 10117 Berlin<br>
Telefon: (030) 284 09 - 180<br>
Telefax: (030) 284 09 - 210<br>
- Email: <a href="${h.url_for('mailto:jugendsozialarbeit at esf-regiestelle.eu')}">jugendsozialarbeit at esf-regiestelle.eu</a>
+ Email: <a href="mailto:jugendsozialarbeit at esf-regiestelle.eu">jugendsozialarbeit at esf-regiestelle.eu</a>
</p>
<p>
<h3>ARGE ESF - Regiestelle GbR</h3>
@@ -73,7 +73,7 @@
</div>
<div class="traeger_name_img">
<a href="http://www.intevation.de/" target="_blank">
- <img src="${h.url_for('/images/logos/logo_intevation.png')}" alt="Logo Intevation" style="border:0">
+ <img src="${h.url('/images/logos/logo_intevation.png')}" alt="Logo Intevation" style="border:0">
</a>
</div>
</div>
@@ -89,7 +89,7 @@
</div>
<div class="traeger_name_img">
<a href="http://www.gnu.org/licenses/agpl.html" target="_blank">
- <img src="${h.url_for('/images/logos/agplv3-155x51.png')}" alt="Logo GPL3" style="border:0">
+ <img src="${h.url('/images/logos/agplv3-155x51.png')}" alt="Logo GPL3" style="border:0">
</a>
</div>
</div>
@@ -107,7 +107,7 @@
</div>
<div class="traeger_name_img">
<a href="http://ips.datenschutz-cert.de/bremen/" target="_blank">
- <img src="${h.url_for('/images/logos/datenschutz_nord.jpg')}" alt="Logo DS nord" style="border:0">
+ <img src="${h.url('/images/logos/datenschutz_nord.jpg')}" alt="Logo DS nord" style="border:0">
</a>
</div>
</div>
@@ -121,7 +121,7 @@
</p>
<div class="traeger_name_img">
<a href="http://intevation.de">
- <img src="${h.url_for('/images/logos/logo_intevation.png')}" alt="Logo Intevation GmbH" style="border:0"></a>
+ <img src="${h.url('/images/logos/logo_intevation.png')}" alt="Logo Intevation GmbH" style="border:0"></a>
</div>
</div>
</div>
@@ -139,16 +139,16 @@
<div class="traeger_name_img">
<a href="http://www.bmfsfj.de/" target="_blank">
<img class="" title="Logo bmfsj" alt="Logo bmfsj"
- src="${h.url_for('/images/logos/BMFSFJ_C_M_web.jpg')}" border="0" >
+ src="${h.url('/images/logos/BMFSFJ_C_M_web.jpg')}" border="0" >
</a>
<a href="http://www.esf-regiestelle.eu/content/index_ger.html" target="_blank">
<img class="" title="Logo ESF Deutschland" alt="Logo ESF Deutschland"
- src="${h.url_for('/images/logos/logo__esf__klein.jpg')}" border="0" >
+ src="${h.url('/images/logos/logo__esf__klein.jpg')}" border="0" >
</a>
<a href="http://ec.europa.eu/employment_social/esf2000/index_de.html" target="_blank">
<img class="" title="Logo europäische union - europäischer sozialfonds"
alt="Logo europäische union - europäischer sozialfonds"
- src="${h.url_for('/images/logos/eu_logo_4c_pos_web2.jpg')}" border="0" >
+ src="${h.url('/images/logos/eu_logo_4c_pos_web2.jpg')}" border="0" >
</a>
</div>
</div>
Modified: waska/branches/waska3/waskaweb/templates/privacy/list_statements.mako
===================================================================
--- waska/branches/waska3/waskaweb/templates/privacy/list_statements.mako 2012-03-09 11:58:05 UTC (rev 5899)
+++ waska/branches/waska3/waskaweb/templates/privacy/list_statements.mako 2012-03-09 13:19:03 UTC (rev 5900)
@@ -3,14 +3,14 @@
<%! 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('/privacy/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>
<div class="widget container">
<h2>${_('Acceptance')}</h2>
<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>
@@ -18,16 +18,16 @@
${_('PDF version statements for manual completion')}:
<table>
<tr>
- <td class="table_row_h">${_('Arabic')} <a href="${h.url_for('/documents/ee_ar.pdf')}">${_('download')}</a></td>
- <td class="table_row_h">${_('English')} <a href="${h.url_for('/documents/ee_en.pdf')}">${_('download')}</a></td>
+ <td class="table_row_h">${_('Arabic')} <a href="${h.url('/documents/ee_ar.pdf')}">${_('download')}</a></td>
+ <td class="table_row_h">${_('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></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></td>
+ <td class="table_row_h">${_('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('/documents/ee_de_ohnetn.pdf')}">${_('download')}</a></td>
</tr>
</table>
</p>
@@ -37,7 +37,7 @@
${_('Agreement between a young person and an institution about a supporting plan that was collaborativly elaborated in the context of the case management (social work).If the supporting plan or other information will be sent to another institution, a separate written consent from the young person or guardian has to be obtained.')}
</p>
<p>
- <a href="${h.url_for(controller='/case', action='print_AidplanStatement', id=session.get('case').id)}" target="_blank">
+ <a href="${h.url(controller='case', action='print_AidplanStatement', id=session.get('case').id)}" target="_blank">
${_('Print statement')}
</a>
</p><br>
@@ -46,7 +46,7 @@
${_('Confidentiality release form for confidants with confidentiality according to 203 penal code (StGB) to the institution.')}
</p>
<p>
- <a href="${h.url_for(controller='/privacy', action='printDiscretionStatement', id=session.get('case').id)}" target="_blank">
+ <a href="${h.url(controller='privacy', action='printDiscretionStatement', id=session.get('case').id)}" target="_blank">
${_('Print statement')}
</a>
</p>
More information about the Mpuls-commits
mailing list