[Mpuls-commits] r5857 - base/trunk/mpulsweb/templates/home

[scm-commit at wald.intevation.org]

Author: ludwig
Date: 2012-03-05 14:06:52 +0100 (Mon, 05 Mar 2012)
New Revision: 5857

Modified:
   base/trunk/mpulsweb/templates/home/caseappointmentlist.mako
   base/trunk/mpulsweb/templates/home/globalappointmentlist.mako
   base/trunk/mpulsweb/templates/home/remindlist.mako
Log:
Issue 2738: Replace url_for with url (templates/home)


Modified: base/trunk/mpulsweb/templates/home/caseappointmentlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/home/caseappointmentlist.mako	2012-03-05 12:14:25 UTC (rev 5856)
+++ base/trunk/mpulsweb/templates/home/caseappointmentlist.mako	2012-03-05 13:06:52 UTC (rev 5857)
@@ -3,15 +3,15 @@
   %if appointment.case_id:
     ## Ususal appointment
     % if appointment.type == 0:
-      <a href="${h.url_for(controller='/caseappointment', action='show', id=appointment.id, confirmed=0)}">
-        <img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="${_('Show')}" title="${_('Show')}"></a>
+      <a href="${h.url(controller='caseappointment', action='show', id=appointment.id, confirmed=0)}">
+        <img src="${h.url('/images/icons/open_active_22.png')}" border="0" alt="${_('Show')}" title="${_('Show')}"></a>
     ## Reminder
     % else:
-      <a href="${h.url_for(controller='/caseappointment', action='show', id=appointment.id, confirmed=0)}">
-        <img src="${h.url_for('/images/icons/open_active_22.png')}" alt="${_('Show')}" title="${_('Show')}"></a>
+      <a href="${h.url(controller='caseappointment', action='show', id=appointment.id, confirmed=0)}">
+        <img src="${h.url('/images/icons/open_active_22.png')}" alt="${_('Show')}" title="${_('Show')}"></a>
     % endif
   % else:
-    <a href="${h.url_for(controller='/caseappointment', action='show', id=appointment.id)}">
-      <img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="${_('Show')}" title="${_('Show')}"></a>
+    <a href="${h.url(controller='caseappointment', action='show', id=appointment.id)}">
+      <img src="${h.url('/images/icons/open_active_22.png')}" border="0" alt="${_('Show')}" title="${_('Show')}"></a>
   % endif
 </%def>

Modified: base/trunk/mpulsweb/templates/home/globalappointmentlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/home/globalappointmentlist.mako	2012-03-05 12:14:25 UTC (rev 5856)
+++ base/trunk/mpulsweb/templates/home/globalappointmentlist.mako	2012-03-05 13:06:52 UTC (rev 5857)
@@ -1,7 +1,7 @@
 <%!  import mpulsweb.lib.helper.filters as F %>
 <%def name="showAppointmentActions(appointment)">
-  <a href="${h.url_for(controller='/appointment', action='show', id=appointment.id)}">
-    <img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" 
+  <a href="${h.url(controller='appointment', action='show', id=appointment.id)}">
+    <img src="${h.url('/images/icons/open_active_22.png')}" border="0" 
          alt="${_('Show')}" 
          title="${_('Show')}"></a>
 </%def>

Modified: base/trunk/mpulsweb/templates/home/remindlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/home/remindlist.mako	2012-03-05 12:14:25 UTC (rev 5856)
+++ base/trunk/mpulsweb/templates/home/remindlist.mako	2012-03-05 13:06:52 UTC (rev 5857)
@@ -2,18 +2,18 @@
 <%def name="showAppointmentActions(appointment)">
   
     % if appointment.type in [1]:
- 	<a href="${h.url_for(controller='/caseappointment', action='show',
+ 	<a href="${h.url(controller='caseappointment', action='show',
  		id=appointment.id, confirmed=0)}"> 
-	<img src    = "${h.url_for('/images/icons/open_active_22.png')}"
+	<img src    = "${h.url('/images/icons/open_active_22.png')}"
          border = "0"
          alt    = "${_('Show')}" 
          title  = "${_('Show')}"
          width  = "22"
          height = "22"></a>
     % else:
-    	<a href="${h.url_for(controller='/case', action='select',
+    	<a href="${h.url(controller='case', action='select',
                     id=appointment.case_id, confirmed=0)}">
-    	<img src    = "${h.url_for('/images/icons/open_active_22.png')}"
+    	<img src    = "${h.url('/images/icons/open_active_22.png')}"
          border = "0"
          alt    = "${_('Show')}" 
          title  = "${_('Show')}"
@@ -23,8 +23,8 @@
 </%def>
 <%def name="showKeepActiveActions(appointment)">
     % if not appointment.type in [1]:
-  	<a href="${h.url_for(controller='/case', action='keepActive', id=appointment.case_id, confirmed=0)}">
-    <img src    = "${h.url_for('/images/icons/refresh_active_22.png')}"
+  	<a href="${h.url(controller='case', action='keepActive', id=appointment.case_id, confirmed=0)}">
+    <img src    = "${h.url('/images/icons/refresh_active_22.png')}"
          border = "0"
          width  = "22"
          height = "22"