[Mpuls-commits] r5853 - base/trunk/mpulsweb/templates/settings

[scm-commit at wald.intevation.org]

Author: ludwig
Date: 2012-03-05 13:03:31 +0100 (Mon, 05 Mar 2012)
New Revision: 5853

Modified:
   base/trunk/mpulsweb/templates/settings/edit.mako
   base/trunk/mpulsweb/templates/settings/show.mako
Log:
Issue 2738: Replace url_for with url (templates/settings)


Modified: base/trunk/mpulsweb/templates/settings/edit.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/edit.mako	2012-03-05 11:50:11 UTC (rev 5852)
+++ base/trunk/mpulsweb/templates/settings/edit.mako	2012-03-05 12:03:31 UTC (rev 5853)
@@ -9,13 +9,13 @@
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
   <li>
-    <a href="${h.url_for(controller='/settings')}">${_('Administration')}</a>
+    <a href="${h.url(controller='settings', action='index')}">${_('Administration')}</a>
   </li>
   <li>
-    <a href="${h.url_for(controller='/settings', action='show')}">${_('Show settings')}</a>
+    <a href="${h.url(controller='settings', action='show')}">${_('Show settings')}</a>
   </li>
   <li>
-    <a href="${h.url_for(controller='/settings', action='edit')}">${_('Edit settings')}</a>
+    <a href="${h.url(controller='settings', action='edit')}">${_('Edit settings')}</a>
   </li>
 </%def>
 
@@ -27,7 +27,7 @@
     <div class="actions">
       <ul>
         <li>
-          <a href="${h.url_for(controller='settings',
+          <a href="${h.url(controller='settings',
                                action='show')}">
             ${_('Back to: institution settings')}
           </a>
@@ -41,7 +41,7 @@
 <div id="admin_edit_settings">
   <p>${_('Edit institution settings.')}</p>
   <div class="waska_form">
-    <form action="${h.url_for(controller='/settings', action='editAction')}" method="POST">
+    <form action="${h.url(controller='settings', action='editAction')}" method="POST">
       <fieldset>
         <legend>${_('Specification for agency')}</legend>
         <div class="waska_form_element w30">
@@ -71,7 +71,7 @@
         <div class="waska_form_element w100">
           % if c.form_errors.get('anon_transfer'):
             <a href="#error_list">
-              <img class="smallicon" alt="" src="${h.url_for('/images/icons/info/failure_22.png')}">
+              <img class="smallicon" alt="" src="${h.url('/images/icons/info/failure_22.png')}">
             </a>
           % endif
           <input id="anon_transfer" name="anon_transfer" type="checkbox"/>

Modified: base/trunk/mpulsweb/templates/settings/show.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/show.mako	2012-03-05 11:50:11 UTC (rev 5852)
+++ base/trunk/mpulsweb/templates/settings/show.mako	2012-03-05 12:03:31 UTC (rev 5853)
@@ -4,10 +4,10 @@
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
   <li>
-    <a href="${h.url_for(controller='/settings')}">${_('Administration')}</a>
+    <a href="${h.url(controller='settings')}">${_('Administration')}</a>
   </li>
   <li>
-    <a href="${h.url_for(controller='/settings', action='show')}">${_('Show settings')}</a>
+    <a href="${h.url(controller='settings', action='show')}">${_('Show settings')}</a>
   </li>
 </%def>
 
@@ -19,7 +19,7 @@
     <div class="actions">
       <ul>
 	<li>
-          <a href="${h.url_for(controller='/settings', action='edit')}"> 
+          <a href="${h.url(controller='settings', action='edit')}"> 
             ${_('Edit settings')}
           </a>
         </li>