[Mpuls-commits] r5902 - in jmd/trunk/jmdweb/templates: . jmdstruktur privacy privacy/default
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Mon Mar 12 11:05:00 CET 2012
Author: ludwig
Date: 2012-03-12 11:05:00 +0100 (Mon, 12 Mar 2012)
New Revision: 5902
Modified:
jmd/trunk/jmdweb/templates/jmdstruktur/new.mako
jmd/trunk/jmdweb/templates/jmdstruktur/overview.mako
jmd/trunk/jmdweb/templates/jmdstruktur/permission.mako
jmd/trunk/jmdweb/templates/privacy/default/privacy_statement.html
jmd/trunk/jmdweb/templates/privacy/list_statements.mako
jmd/trunk/jmdweb/templates/switch_to_other_datasets.mako
Log:
Issue 2738: Replace url_for (jmdweb/templates part1)
Modified: jmd/trunk/jmdweb/templates/jmdstruktur/new.mako
===================================================================
--- jmd/trunk/jmdweb/templates/jmdstruktur/new.mako 2012-03-09 13:43:59 UTC (rev 5901)
+++ jmd/trunk/jmdweb/templates/jmdstruktur/new.mako 2012-03-12 10:05:00 UTC (rev 5902)
@@ -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')}">${_('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">
<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>Neue Fallakte anlegen</h1>
Modified: jmd/trunk/jmdweb/templates/jmdstruktur/overview.mako
===================================================================
--- jmd/trunk/jmdweb/templates/jmdstruktur/overview.mako 2012-03-09 13:43:59 UTC (rev 5901)
+++ jmd/trunk/jmdweb/templates/jmdstruktur/overview.mako 2012-03-12 10:05:00 UTC (rev 5902)
@@ -3,8 +3,8 @@
<%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>
<h1>Strukturdaten Übersicht</h1>
Modified: jmd/trunk/jmdweb/templates/jmdstruktur/permission.mako
===================================================================
--- jmd/trunk/jmdweb/templates/jmdstruktur/permission.mako 2012-03-09 13:43:59 UTC (rev 5901)
+++ jmd/trunk/jmdweb/templates/jmdstruktur/permission.mako 2012-03-12 10:05:00 UTC (rev 5902)
@@ -23,7 +23,7 @@
<div class="waska_form">
<form id="waska_form"
- action="${h.url_for(controller='/jmdstruktur',
+ action="${h.url(controller='jmdstruktur',
action='permissionAction')}"
accept-charset="UTF-8"
name="waska_form" method="POST">
Modified: jmd/trunk/jmdweb/templates/privacy/default/privacy_statement.html
===================================================================
--- jmd/trunk/jmdweb/templates/privacy/default/privacy_statement.html 2012-03-09 13:43:59 UTC (rev 5901)
+++ jmd/trunk/jmdweb/templates/privacy/default/privacy_statement.html 2012-03-12 10:05:00 UTC (rev 5902)
@@ -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="/jmd/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: jmd/trunk/jmdweb/templates/privacy/list_statements.mako
===================================================================
--- jmd/trunk/jmdweb/templates/privacy/list_statements.mako 2012-03-09 13:43:59 UTC (rev 5901)
+++ jmd/trunk/jmdweb/templates/privacy/list_statements.mako 2012-03-12 10:05:00 UTC (rev 5902)
@@ -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(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>
<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 acceptance')}
</a>
</p>
@@ -19,21 +19,21 @@
<table>
<tr>
<td class="table_row_h">${_('German')}
- <a href="${h.url_for('/documents/ee_de.pdf')}">${_('download')}</a></td>
+ <a href="${h.url('/documents/ee_de.pdf')}">${_('download')}</a></td>
<td class="table_row_h">${_('English')}
- <a href="${h.url_for('/documents/ee_en.pdf')}">${_('download')}</a></td>
+ <a href="${h.url('/documents/ee_en.pdf')}">${_('download')}</a></td>
</tr>
<tr>
<td class="">${_('French')}
- <a href="${h.url_for('/documents/ee_fr.pdf')}">${_('download')}</a></td>
+ <a href="${h.url('/documents/ee_fr.pdf')}">${_('download')}</a></td>
<td class="">${_('Arabic')}
- <a href="${h.url_for('/documents/ee_ar.pdf')}">${_('download')}</a></td>
+ <a href="${h.url('/documents/ee_ar.pdf')}">${_('download')}</a></td>
</tr>
<tr>
<td class="table_row_h">${_('Russian')}
- <a href="${h.url_for('/documents/ee_ru.pdf')}">${_('download')}</a></td>
+ <a href="${h.url('/documents/ee_ru.pdf')}">${_('download')}</a></td>
<td class="table_row_h">${_('Turkish')}
- <a href="${h.url_for('/documents/ee_tr.pdf')}">${_('download')}</a></td>
+ <a href="${h.url('/documents/ee_tr.pdf')}">${_('download')}</a></td>
</tr>
</table>
</p>
Modified: jmd/trunk/jmdweb/templates/switch_to_other_datasets.mako
===================================================================
--- jmd/trunk/jmdweb/templates/switch_to_other_datasets.mako 2012-03-09 13:43:59 UTC (rev 5901)
+++ jmd/trunk/jmdweb/templates/switch_to_other_datasets.mako 2012-03-12 10:05:00 UTC (rev 5902)
@@ -14,7 +14,7 @@
</li>
%if h.hasRole(['admin']):
<li>
- <a href="${h.url_for(controller='/jmdstruktur/permission')}"
+ <a href="${h.url(controller='jmdstruktur', action='permission')}"
class="dataset_permissions">
${_('User permissions')}
</a>
More information about the Mpuls-commits
mailing list