[Mpuls-commits] r5878 - in base/trunk/mpulsweb/templates/privacy: . dialogs

scm-commit at wald.intevation.org scm-commit at wald.intevation.org
Thu Mar 8 11:28:13 CET 2012 

Author: ludwig
Date: 2012-03-08 11:28:13 +0100 (Thu, 08 Mar 2012)
New Revision: 5878

Modified:
   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/dialogs/missing_syncpermission.mako
   base/trunk/mpulsweb/templates/privacy/edit_statement.mako
   base/trunk/mpulsweb/templates/privacy/list_statements.mako
Log:
Issue 2738: Replace url_for (templates/privacy)


Modified: base/trunk/mpulsweb/templates/privacy/dialogs/accept_success.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/accept_success.mako	2012-03-08 10:20:30 UTC (rev 5877)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/accept_success.mako	2012-03-08 10:28:13 UTC (rev 5878)
@@ -2,7 +2,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='setStatement', id=session.get('case').id, confirmed=0)}">${_('Edit acceptance statement')}</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='setStatement', id=session.get('case').id, confirmed=0)}">${_('Edit acceptance statement')}</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	2012-03-08 10:20:30 UTC (rev 5877)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/confirm.mako	2012-03-08 10:28:13 UTC (rev 5878)
@@ -2,7 +2,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(controller='case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
   <li><a href="#">${_('Edit acceptance statement')}</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	2012-03-08 10:20:30 UTC (rev 5877)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/decline_failed.mako	2012-03-08 10:28:13 UTC (rev 5878)
@@ -2,7 +2,7 @@
 <%inherit file="../../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='setStatement', id=session.get('case').id, confirmed=0)}">${_('Edit acceptance statement')}</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='setStatement', id=session.get('case').id, confirmed=0)}">${_('Edit acceptance statement')}</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	2012-03-08 10:20:30 UTC (rev 5877)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/decline_success.mako	2012-03-08 10:28:13 UTC (rev 5878)
@@ -2,7 +2,7 @@
 <%inherit file="../../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='setStatement', id=session.get('case').id, confirmed=0)}">${_('Edit acceptance statement')}</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='setStatement', id=session.get('case').id, confirmed=0)}">${_('Edit acceptance statement')}</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	2012-03-08 10:20:30 UTC (rev 5877)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement.mako	2012-03-08 10:28:13 UTC (rev 5878)
@@ -2,8 +2,8 @@
 <%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_overview')}">${_('Case document overview')}</a></li>
+  <li><a href="${h.url(controller='case', action='index')}">${_('Case Management')}</a></li>
+  <li><a href="${h.url(controller='case_overview', action='index')}">${_('Case document 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	2012-03-08 10:20:30 UTC (rev 5877)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako	2012-03-08 10:28:13 UTC (rev 5878)
@@ -1,9 +1,9 @@
 ## -*- coding: utf-8 -*- 
 <div class="dialog" />
-<h1><img src="${h.url_for('/images/icons/info/info.png')}" alt="" width="48" height="48" />${_('Missing data for the statement')}</h1>
+<h1><img src="${h.url('/images/icons/info/info.png')}" alt="" width="48" height="48" />${_('Missing data for the statement')}</h1>
 <p>${_('The acceptance statement of the youth for work and usage of his data. You are resonsible for this.')}</p>
 % if h.hasRole(['cm']):
-  <p>${h.literal(_('Please notice that the acceptence statement needs to be written. For this use <a href="%s" target="_blank">Printversion of this statement</a>. Please choose:') % h.url_for(controller="/privacy", action="printStatement", id=c.ds_id))}
+  <p>${h.literal(_('Please notice that the acceptence statement needs to be written. For this use <a href="%s" target="_blank">Printversion of this statement</a>. Please choose:') % h.url(controller="privacy", action="printStatement", id=c.ds_id))}
 
     <ol>
       <li>
@@ -17,13 +17,13 @@
     </ol>
   </p>
   <p>
-    <a class="button" href="${h.url_for(controller="privacy", action="accept", id=c.ds_id, confirmed=0)}">${_('Statement accepted')}</a>
+    <a class="button" href="${h.url(controller="privacy", action="accept", id=c.ds_id, confirmed=0)}">${_('Statement accepted')}</a>
     <a class="button" href="${c.targeturl}">${_('Statement unclear')}</a>
-    <a class="button" href="${h.url_for(controller="privacy", action="decline", id=c.ds_id, confirmed=0)}">${_('Statement declined')}</a>
+    <a class="button" href="${h.url(controller="privacy", action="decline", id=c.ds_id, confirmed=0)}">${_('Statement declined')}</a>
   </p>
 % else:
   <p>
-    <a class="button" href="${h.url_for(controller='/case', action='select', id=c.ds_id, confirmed=1)}">${_('OK')}</a>
+    <a class="button" href="${h.url(controller='case', action='select', id=c.ds_id, confirmed=1)}">${_('OK')}</a>
   </p>
 % endif
 

Modified: base/trunk/mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako	2012-03-08 10:20:30 UTC (rev 5877)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako	2012-03-08 10:28:13 UTC (rev 5878)
@@ -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_overview')}">${_('Case document overview')}</a></li>
+  <li><a href="${h.url(controller='case', action='index')}">${_('Case Management')}</a></li>
+  <li><a href="${h.url(controller='case_overview', action='index')}">${_('Case document overview')}</a></li>
   <li><a href="#">${_('cm_np_show')}</a></li>
 </%def>
 <div class="dialog" />
-<h1><img src="${h.url_for('/images/icons/info/info.png')}" alt="" width="48" height="48" />${_('Missing data for the sync persmission')}</h1>
+<h1><img src="${h.url('/images/icons/info/info.png')}" alt="" width="48" height="48" />${_('Missing data for the sync persmission')}</h1>
 <p>${_('The sync permission of the youth to sync data to the meta server. You are resonsible for this.')}</p>
 % if h.hasRole(['cm']):
   <ol>
@@ -21,12 +21,12 @@
     </li>
   </ol>
   <p>
-    <a class="button" href="${h.url_for(controller="meta", action="index", id=c.ds_id, confirmed=0)}">${_('Permission granted')}</a>
+    <a class="button" href="${h.url(controller="meta", action="index", id=c.ds_id, confirmed=0)}">${_('Permission granted')}</a>
     <a class="button" href="${c.targeturl}">${_('Permission unclear')}</a>
-    <a class="button" href="${h.url_for(controller="meta", action="withdraw_only", id=c.ds_id, confirmed=0)}">${_('Permission refused')}</a>
+    <a class="button" href="${h.url(controller="meta", action="withdraw_only", id=c.ds_id, confirmed=0)}">${_('Permission refused')}</a>
   </p>
 % else:
   <p>
-    <a class="button" href="${h.url_for(controller='/case', action='select', id=c.ds_id, confirmed=1)}">${_('OK')}</a>
+    <a class="button" href="${h.url(controller='case', action='select', id=c.ds_id, confirmed=1)}">${_('OK')}</a>
   </p>
 % endif

Modified: base/trunk/mpulsweb/templates/privacy/edit_statement.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/edit_statement.mako	2012-03-08 10:20:30 UTC (rev 5877)
+++ base/trunk/mpulsweb/templates/privacy/edit_statement.mako	2012-03-08 10:28:13 UTC (rev 5878)
@@ -2,7 +2,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(controller='case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
   <li><a href="#">${_('Edit acceptance statement')}</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	2012-03-08 10:20:30 UTC (rev 5877)
+++ base/trunk/mpulsweb/templates/privacy/list_statements.mako	2012-03-08 10:28:13 UTC (rev 5878)
@@ -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>
 <div class="widget container">

More information about the Mpuls-commits mailing list