[Mpuls-commits] r2753 - in base/trunk: . mpulsweb/templates/privacy mpulsweb/templates/privacy/default mpulsweb/templates/privacy/dialogs
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue May 25 20:41:17 CEST 2010
Author: bh
Date: 2010-05-25 20:41:15 +0200 (Tue, 25 May 2010)
New Revision: 2753
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/templates/privacy/default/privacy_statement.html
base/trunk/mpulsweb/templates/privacy/dialogs/accept_success.mako
base/trunk/mpulsweb/templates/privacy/dialogs/confirm.mako
base/trunk/mpulsweb/templates/privacy/dialogs/decline_failed.mako
base/trunk/mpulsweb/templates/privacy/dialogs/decline_success.mako
base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement.mako
base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako
base/trunk/mpulsweb/templates/privacy/edit_statement.mako
base/trunk/mpulsweb/templates/privacy/list_statements.mako
Log:
* mpulsweb/templates/privacy/default/privacy_statement.html,
mpulsweb/templates/privacy/dialogs/accept_success.mako,
mpulsweb/templates/privacy/dialogs/confirm.mako,
mpulsweb/templates/privacy/dialogs/decline_failed.mako,
mpulsweb/templates/privacy/dialogs/decline_success.mako,
mpulsweb/templates/privacy/dialogs/missing_statement.mako,
mpulsweb/templates/privacy/dialogs/missing_statement_body.mako,
mpulsweb/templates/privacy/edit_statement.mako,
mpulsweb/templates/privacy/list_statements.mako: Use h.url_for
consistently for all-intra application URLs.
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2010-05-25 18:38:10 UTC (rev 2752)
+++ base/trunk/ChangeLog 2010-05-25 18:41:15 UTC (rev 2753)
@@ -1,5 +1,18 @@
2010-05-25 Bernhard Herzog <bh at intevation.de>
+ * mpulsweb/templates/privacy/default/privacy_statement.html,
+ mpulsweb/templates/privacy/dialogs/accept_success.mako,
+ mpulsweb/templates/privacy/dialogs/confirm.mako,
+ mpulsweb/templates/privacy/dialogs/decline_failed.mako,
+ mpulsweb/templates/privacy/dialogs/decline_success.mako,
+ mpulsweb/templates/privacy/dialogs/missing_statement.mako,
+ mpulsweb/templates/privacy/dialogs/missing_statement_body.mako,
+ mpulsweb/templates/privacy/edit_statement.mako,
+ mpulsweb/templates/privacy/list_statements.mako: Use h.url_for
+ consistently for all-intra application URLs.
+
+2010-05-25 Bernhard Herzog <bh at intevation.de>
+
* mpulsweb/templates/phase/dialogs/success_set_phase.mako,
mpulsweb/templates/phase/phase.mako: Use h.url_for consistently
for all-intra application URLs.
Modified: base/trunk/mpulsweb/templates/privacy/default/privacy_statement.html
===================================================================
--- base/trunk/mpulsweb/templates/privacy/default/privacy_statement.html 2010-05-25 18:38:10 UTC (rev 2752)
+++ base/trunk/mpulsweb/templates/privacy/default/privacy_statement.html 2010-05-25 18:41:15 UTC (rev 2753)
@@ -12,9 +12,12 @@
<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="/styles/all.css" media="all" rel="stylesheet" type="text/css">
-<link href="/styles/print.css" media="screen" rel="stylesheet" type="text/css">
-<link href="/styles/print.css" media="print" rel="stylesheet" type="text/css">
+<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_for('/styles/print.css')}" media="print" rel="stylesheet"
+ type="text/css">
<style type="text/css">
.statement_content {
width: 90%;
Modified: base/trunk/mpulsweb/templates/privacy/dialogs/accept_success.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/accept_success.mako 2010-05-25 18:38:10 UTC (rev 2752)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/accept_success.mako 2010-05-25 18:41:15 UTC (rev 2753)
@@ -2,7 +2,7 @@
<%inherit file="../../casemanagement/main.mako"/>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
- <li><a href="/case/setStatement/${session.get('case').id}/0">${_('statement_np_edit')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='setStatement', id=session.get('case').id, confirmed=0)}">${_('statement_np_edit')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/privacy/dialogs/confirm.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/confirm.mako 2010-05-25 18:38:10 UTC (rev 2752)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/confirm.mako 2010-05-25 18:41:15 UTC (rev 2753)
@@ -2,7 +2,7 @@
<%inherit file="../../casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
<li><a href="#">${_('statement_np_edit')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/privacy/dialogs/decline_failed.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/decline_failed.mako 2010-05-25 18:38:10 UTC (rev 2752)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/decline_failed.mako 2010-05-25 18:41:15 UTC (rev 2753)
@@ -2,7 +2,7 @@
<%inherit file="../../main.mako"/>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
- <li><a href="/case/setStatement/${session.get('case').id}/0">${_('statement_np_edit')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='setStatement', id=session.get('case').id, confirmed=0)}">${_('statement_np_edit')}</a></li>
</%def>
<%include file="../../dialogs/failed.mako" />
Modified: base/trunk/mpulsweb/templates/privacy/dialogs/decline_success.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/decline_success.mako 2010-05-25 18:38:10 UTC (rev 2752)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/decline_success.mako 2010-05-25 18:41:15 UTC (rev 2753)
@@ -2,7 +2,7 @@
<%inherit file="../../main.mako"/>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
- <li><a href="/case/setStatement/${session.get('case').id}/0">${_('statement_np_edit')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='setStatement', id=session.get('case').id, confirmed=0)}">${_('statement_np_edit')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement.mako 2010-05-25 18:38:10 UTC (rev 2752)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement.mako 2010-05-25 18:41:15 UTC (rev 2753)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/">${_('cm_np_root')}</a></li>
- <li><a href="/case_overview">${_('cm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/case_overview')}">${_('cm_np_overview')}</a></li>
<li><a href="#">${_('cm_np_show')}</a></li>
</%def>
<%include file="missing_statement_body.mako" />
Modified: base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako 2010-05-25 18:38:10 UTC (rev 2752)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako 2010-05-25 18:41:15 UTC (rev 2753)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<div class="dialog" />
-<h1><img src="/images/icons/info/info.png" alt="" width="48" height="48" />${_('statement_dialog_header_statement_no')}</h1>
+<h1><img src="${h.url_for('/images/icons/info/info.png')}" alt="" width="48" height="48" />${_('statement_dialog_header_statement_no')}</h1>
<p>${_('statement_dialog_p_statement_no_explanation')}</p>
% if h.hasRole(['cm_ka']):
<p>${h.literal(_('statement_dialog_p_options') % h.link_to(_('statement_edit_a_statement_form_printversion'), h.url_for(controller="/privacy", action="printStatement", id=c.ds_id)))}
@@ -22,7 +22,7 @@
</p>
% else:
<p>
- <a class="button" href="/case/select/${c.ds_id}/1">${_('statement_dialog_a_ok')}</a>
+ <a class="button" href="${h.url_for(controller='/case', action='select', id=c.ds_id, confirmed=1)}">${_('statement_dialog_a_ok')}</a>
</p>
% endif
Modified: base/trunk/mpulsweb/templates/privacy/edit_statement.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/edit_statement.mako 2010-05-25 18:38:10 UTC (rev 2752)
+++ base/trunk/mpulsweb/templates/privacy/edit_statement.mako 2010-05-25 18:41:15 UTC (rev 2753)
@@ -2,7 +2,7 @@
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
<li><a href="#">${_('statement_np_edit')}</a></li>
</%def>
<%include file="dialogs/missing_statement_body.mako" />
Modified: base/trunk/mpulsweb/templates/privacy/list_statements.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/list_statements.mako 2010-05-25 18:38:10 UTC (rev 2752)
+++ base/trunk/mpulsweb/templates/privacy/list_statements.mako 2010-05-25 18:41:15 UTC (rev 2753)
@@ -3,8 +3,8 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
- <li><a href="/privacy/listStatements">${_('statement_np_list_statements')}</a></li>
+ <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="${h.url_for(controller='/privacy', action='listStatements')}">${_('statement_np_list_statements')}</a></li>
</%def>
<h1>${_('Avaliable statements')}</h1>
<div class="widget container">
More information about the Mpuls-commits
mailing list