[Mpuls-commits] r5873 - base/trunk/mpulsweb/templates/formularpage

[scm-commit at wald.intevation.org]

Author: ludwig
Date: 2012-03-08 11:02:00 +0100 (Thu, 08 Mar 2012)
New Revision: 5873

Modified:
   base/trunk/mpulsweb/templates/formularpage/formular.mako
   base/trunk/mpulsweb/templates/formularpage/formular_print.mako
Log:
Issue 2738: Replace url_for with url (templates/formularpage)


Modified: base/trunk/mpulsweb/templates/formularpage/formular.mako
===================================================================
--- base/trunk/mpulsweb/templates/formularpage/formular.mako	2012-03-07 16:12:11 UTC (rev 5872)
+++ base/trunk/mpulsweb/templates/formularpage/formular.mako	2012-03-08 10:02:00 UTC (rev 5873)
@@ -8,15 +8,15 @@
 
 <%def name="buildNavipath()">
       	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/case', action='select',
+	<li><a href="${h.url(controller='case', action='select',
                                  id=session.get('case').id, confirmed=1)}"
                onclick="return checkModification();">${_('Selected case documents')}</a></li>
         % if session.get('render_mode') == 'ro':
-	<li><a href="${h.url_for(controller='/formularpage', action='show',
+	<li><a href="${h.url(controller='formularpage', action='show',
                                  id=c.page_id)}"
                onclick="return checkModification();">${get_pagename(c.page_id)}</a></li>
         % else:
-	<li><a href="${h.url_for(controller='/formularpage', action='edit',
+	<li><a href="${h.url(controller='formularpage', action='edit',
                                  id=c.page_id)}" 
                onclick="return checkModification();">${get_pagename(c.page_id)}</a></li>
         % endif
@@ -35,18 +35,18 @@
       <ul>
         % if h.hasRole(['cm']) and session.get('case').getState().state not in (3,4,5):
           % if session.get('render_mode') == 'ro':
-            <li><a href="${h.url_for(controller='/formularpage', action='edit',
+            <li><a href="${h.url(controller='formularpage', action='edit',
                                      id=c.page_id)}" 
                    onclick="return checkModification();"
                    id="formularPageEdit"> ${_('Edit')}</a></li>
           % else:
-            <li><a href="${h.url_for(controller='/formularpage', action='show',
+            <li><a href="${h.url(controller='formularpage', action='show',
                                      id=c.page_id)}" 
                    onclick="return checkModification();"
                    id="formularPageShow"> ${_('Close editing')}</a></li>
           % endif
         % endif
-        <li><a href="${h.url_for(controller='/formularpage', action='printout',
+        <li><a href="${h.url(controller='formularpage', action='printout',
                                  id=c.page_id)}" 
                target="_blank" onclick="return checkModification();"
                id="formylarPagePrintout"> ${_('Printout')}</a></li>

Modified: base/trunk/mpulsweb/templates/formularpage/formular_print.mako
===================================================================
--- base/trunk/mpulsweb/templates/formularpage/formular_print.mako	2012-03-07 16:12:11 UTC (rev 5872)
+++ base/trunk/mpulsweb/templates/formularpage/formular_print.mako	2012-03-08 10:02:00 UTC (rev 5873)
@@ -15,15 +15,15 @@
 
 <%def name="buildNavipath()">
       	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/case', action='select',
+	<li><a href="${h.url(controller='case', action='select',
                                  id=session.get('case').id, confirmed=1)}"
                onclick="return checkModification();">${_('Selected case documents')}</a></li>
         % if session.get('render_mode') == 'ro':
-	<li><a href="${h.url_for(controller='/formularpage', action='show',
+	<li><a href="${h.url(controller='formularpage', action='show',
                                  id=c.page_id)}"
                onclick="return checkModification();">${get_pagename(c.page_id)}</a></li>
         % else:
-	<li><a href="${h.url_for(controller='/formularpage', action='edit',
+	<li><a href="${h.url(controller='formularpage', action='edit',
                                  id=c.page_id)}" 
                onclick="return checkModification();">${get_pagename(c.page_id)}</a></li>
         % endif
@@ -42,16 +42,16 @@
       <ul>
         % if h.hasRole(['cm']) and session.get('case').getState().state not in (3,4,5):
           % if session.get('render_mode') == 'ro':
-            <li><a href="${h.url_for(controller='/formularpage', action='edit',
+            <li><a href="${h.url(controller='formularpage', action='edit',
                                      id=c.page_id)}" 
                    onclick="return checkModification();"> ${_('Edit')}</a></li>
           % else:
-            <li><a href="${h.url_for(controller='/formularpage', action='show',
+            <li><a href="${h.url(controller='formularpage', action='show',
                                      id=c.page_id)}" 
                    onclick="return checkModification();"> ${_('Close editing')}</a></li>
           % endif
         % endif
-        <li><a href="${h.url_for(controller='/formularpage', action='printout',
+        <li><a href="${h.url(controller='formularpage', action='printout',
                                  id=c.page_id)}" 
                target="_blank" onclick="return checkModification();"> ${_('Printout')}</a></li>
       </ul>