[Mpuls-commits] r5849 - base/trunk/mpulsweb/templates/usersettings

[scm-commit at wald.intevation.org]

Author: ludwig
Date: 2012-03-02 15:39:27 +0100 (Fri, 02 Mar 2012)
New Revision: 5849

Modified:
   base/trunk/mpulsweb/templates/usersettings/change_password.mako
   base/trunk/mpulsweb/templates/usersettings/change_password_login.mako
   base/trunk/mpulsweb/templates/usersettings/edit_standin.mako
   base/trunk/mpulsweb/templates/usersettings/show_settings.mako
Log:
Issue 2738: Replace url_for with url in templates/usersettings


Modified: base/trunk/mpulsweb/templates/usersettings/change_password.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/change_password.mako	2012-03-02 14:01:12 UTC (rev 5848)
+++ base/trunk/mpulsweb/templates/usersettings/change_password.mako	2012-03-02 14:39:27 UTC (rev 5849)
@@ -1,7 +1,7 @@
 ## -*- coding: utf-8 -*-
 <%inherit file="../main.mako" />
 <%def name="buildNavipath()">
-  <li><a href="${h.url_for(controller='/usersettings', action='showSettings')}"
+  <li><a href="${h.url(controller='usersettings', action='showSettings')}"
          onclick="return checkModification();">${_('My Account')}</a></li>
   <li><a href="#" onclick="return checkModification();">${_('Change password')}
 </a></li>
@@ -19,7 +19,7 @@
   <div id="modusfield">
     <div class="actions">
 	<ul>
-		<li><a href="${h.url_for(controller='usersettings', action='showSettings')}"> ${_('Back to: My Account')}</a></li>
+		<li><a href="${h.url(controller='usersettings', action='showSettings')}"> ${_('Back to: My Account')}</a></li>
 	</ul>
     </div>
   </div>
@@ -28,7 +28,7 @@
 <div id="waska_form" class="import_box">
 <p class="import_p">${_('The new password must contain of 12 letter at least and must contain 2 non-character at least. ')}</p>
 <div class="import_box_dialog">
-<form action="${h.url_for(controller="usersettings", action="changePasswordAction")}" method="POST" autocomplete="off">
+<form action="${h.url(controller='usersettings', action='changePasswordAction')}" method="POST" autocomplete="off">
 <table>
   % if c.form_errors.get('oldpasswd'):
     <tr><td>

Modified: base/trunk/mpulsweb/templates/usersettings/change_password_login.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/change_password_login.mako	2012-03-02 14:01:12 UTC (rev 5848)
+++ base/trunk/mpulsweb/templates/usersettings/change_password_login.mako	2012-03-02 14:39:27 UTC (rev 5849)
@@ -13,7 +13,7 @@
 <p>${_('Please insert the new password.')}
 </p>
 <div id="waska_form_login">
-<form action="${h.url_for(controller="/usersettings", action="changePasswordOnLoginAction")}" method="POST" autocomplete="off">
+<form action="${h.url(controller='usersettings', action='changePasswordOnLoginAction')}" method="POST" autocomplete="off">
 	<fieldset><legend>${_('Information about login')}</legend>
 	<div class="waska_form_element w50">
           % if c.form_errors.get('passwd'):

Modified: base/trunk/mpulsweb/templates/usersettings/edit_standin.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/edit_standin.mako	2012-03-02 14:01:12 UTC (rev 5848)
+++ base/trunk/mpulsweb/templates/usersettings/edit_standin.mako	2012-03-02 14:39:27 UTC (rev 5849)
@@ -8,7 +8,7 @@
   <div id="modusfield">
     <div class="actions">
 	<ul>
-		<li><a href="${h.url_for(controller='/usersettings', action='showSettings')}"> ${_('Back to: My Account')}</a></li>
+		<li><a href="${h.url(controller='usersettings', action='showSettings')}"> ${_('Back to: My Account')}</a></li>
 	</ul>
     </div>
   </div>
@@ -17,7 +17,7 @@
 <div id="waska_form">
 <p>${_('Here you can configure, which user at creation of a new case document is your standin. You can select a user or a group of users. These user have also access to this case document. This configuration has no effect on your current cases.')}</p>
 <br>
-<form action="${h.url_for(controller='/usersettings', action='editStandinAction')}" 
+<form action="${h.url(controller='usersettings', action='editStandinAction')}" 
       method="POST">
   <div class="waska_form_element w100">
     <label

Modified: base/trunk/mpulsweb/templates/usersettings/show_settings.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/show_settings.mako	2012-03-02 14:01:12 UTC (rev 5848)
+++ base/trunk/mpulsweb/templates/usersettings/show_settings.mako	2012-03-02 14:39:27 UTC (rev 5849)
@@ -11,11 +11,11 @@
     <div class="actions">
       <ul>
         % if g.mpuls_config.is_enabled('module', 'administration'):
-          <li><a href="${h.url_for(controller='/usersettings', action='changePassword')}"> ${_('Change user password')}</a></li>
+          <li><a href="${h.url(controller='usersettings', action='changePassword')}"> ${_('Change user password')}</a></li>
         % endif
         % if h.hasRole(['cm']):
           % if g.mpuls_config.is_enabled('case-module', 'organisation'):
-            <li><a href="${h.url_for(controller='/usersettings', action='editStandin')}"> ${_('Replace standin')}</a></li>
+            <li><a href="${h.url(controller='usersettings', action='editStandin')}"> ${_('Replace standin')}</a></li>
           % endif
         % endif
       </ul>