[Mpuls-commits] r5864 - in base/trunk/mpulsweb/templates/appointments: . dialogs

[scm-commit at wald.intevation.org]

Author: ludwig
Date: 2012-03-07 14:05:08 +0100 (Wed, 07 Mar 2012)
New Revision: 5864

Modified:
   base/trunk/mpulsweb/templates/appointments/appointmentlist.mako
   base/trunk/mpulsweb/templates/appointments/dialogs/confirm.mako
   base/trunk/mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako
   base/trunk/mpulsweb/templates/appointments/dialogs/success_create_appointment.mako
   base/trunk/mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako
   base/trunk/mpulsweb/templates/appointments/dialogs/success_edit_appointment.mako
   base/trunk/mpulsweb/templates/appointments/edit.mako
   base/trunk/mpulsweb/templates/appointments/new.mako
   base/trunk/mpulsweb/templates/appointments/overview.mako
   base/trunk/mpulsweb/templates/appointments/show.mako
Log:
Issue 2738: Repalce url_for with url (templates/appointments)


Modified: base/trunk/mpulsweb/templates/appointments/appointmentlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/appointmentlist.mako	2012-03-07 12:55:36 UTC (rev 5863)
+++ base/trunk/mpulsweb/templates/appointments/appointmentlist.mako	2012-03-07 13:05:08 UTC (rev 5864)
@@ -1,7 +1,7 @@
 <%inherit file="/appointments/overview_body.mako" />
 <%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" alt="${_('Show')}" title="${_('Show')}"></a>
+<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>
 % if h.hasRole(['admin']):
-  <a href="${h.url_for(controller='/appointment', action='delete', id=appointment.id, confirmed=0)}"><img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0" alt="${_('Delete')}" title="${_('Delete')}"></a>
+  <a href="${h.url(controller='appointment', action='delete', id=appointment.id, confirmed=0)}"><img src="${h.url('/images/icons/delete_active_22.png')}" border="0" alt="${_('Delete')}" title="${_('Delete')}"></a>
 % endif
 </%def>

Modified: base/trunk/mpulsweb/templates/appointments/dialogs/confirm.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/dialogs/confirm.mako	2012-03-07 12:55:36 UTC (rev 5863)
+++ base/trunk/mpulsweb/templates/appointments/dialogs/confirm.mako	2012-03-07 13:05:08 UTC (rev 5864)
@@ -1,8 +1,8 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="${h.url_for(controller='/appointment')}">${_('Events')}</a></li>
-	<li><a href="${h.url_for(controller='/appointment', action='overview')}">${_('Appointments list')}</a></li>
+        <li><a href="${h.url(controller='appointment'), action='index'}">${_('Events')}</a></li>
+	<li><a href="${h.url(controller='appointment', action='overview')}">${_('Appointments list')}</a></li>
 	<li><a href="#">${_('Delete event')}</a></li>
 </%def>
 <%include file="../../dialogs/confirm.mako" />

Modified: base/trunk/mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako	2012-03-07 12:55:36 UTC (rev 5863)
+++ base/trunk/mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako	2012-03-07 13:05:08 UTC (rev 5864)
@@ -2,8 +2,8 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/case')}">${_('Administration')}</a></li>
-        <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
+	<li><a href="${h.url(controller='case', action='index')}">${_('Administration')}</a></li>
+        <li><a href="${h.url(controller='administration', action='overviewUser')}">${_('User overview')}</a></li>
 	<li><a href="#">${_('User deleted!')}</a></li>
 </%def>
 <%include file="../../dialogs/failed.mako" />

Modified: base/trunk/mpulsweb/templates/appointments/dialogs/success_create_appointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/dialogs/success_create_appointment.mako	2012-03-07 12:55:36 UTC (rev 5863)
+++ base/trunk/mpulsweb/templates/appointments/dialogs/success_create_appointment.mako	2012-03-07 13:05:08 UTC (rev 5864)
@@ -2,7 +2,7 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/appointment',
+	<li><a href="${h.url(controller='appointment',
                                  action='overview')}">${_('Appointments list')}</a></li>
 	<li><a href="#">${_('Create new event')}</a></li>
 </%def>

Modified: base/trunk/mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako	2012-03-07 12:55:36 UTC (rev 5863)
+++ base/trunk/mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako	2012-03-07 13:05:08 UTC (rev 5864)
@@ -2,8 +2,8 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/appointment')}">${_('Events')}</a></li>
-	<li><a href="${h.url_for(controller='/appointment', action='overview')}">${_('Appointments list')}</a></li>
+	<li><a href="${h.url(controller='appointment', action='index')}">${_('Events')}</a></li>
+	<li><a href="${h.url(controller='appointment', action='overview')}">${_('Appointments list')}</a></li>
 	<li><a href="#">${_('Delete event')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/appointments/dialogs/success_edit_appointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/dialogs/success_edit_appointment.mako	2012-03-07 12:55:36 UTC (rev 5863)
+++ base/trunk/mpulsweb/templates/appointments/dialogs/success_edit_appointment.mako	2012-03-07 13:05:08 UTC (rev 5864)
@@ -2,7 +2,7 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/appointment', action='overview')}">${_('Appointments list')}</a></li>
+	<li><a href="${h.url(controller='appointment', action='overview')}">${_('Appointments list')}</a></li>
 	<li><a href="#">${_('Edit event')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/appointments/edit.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/edit.mako	2012-03-07 12:55:36 UTC (rev 5863)
+++ base/trunk/mpulsweb/templates/appointments/edit.mako	2012-03-07 13:05:08 UTC (rev 5864)
@@ -9,7 +9,7 @@
 %>
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/appointment', action='overview')}">${_('Appointments list')}</a></li>
+  <li><a href="${h.url(controller='appointment', action='overview')}">${_('Appointments list')}</a></li>
   <li><a href="#">${_('Edit event')}</a></li>
 </%def>
 <div id="content_header_small">
@@ -20,7 +20,7 @@
     <div class="actions">
       <ul>
         <li>
-          <a href="${h.url_for(controller='appointment', action='show', id=c.form_result.get('id'))}"> ${_('Back to: Event view')}</a>
+          <a href="${h.url(controller='appointment', action='show', id=c.form_result.get('id'))}"> ${_('Back to: Event view')}</a>
         </li>
       </ul>
     </div>
@@ -29,7 +29,7 @@
 ${self.buildFormErrors(formular_labels)}
 <div id="admin_new_user">
 <div id="waska_form">
-<form action="${h.url_for(controller='appointment', action='editAction')}" method="POST">
+<form action="${h.url(controller='appointment', action='editAction')}" method="POST">
 <%include file="edit_body.mako" />
 </form>
 </div>

Modified: base/trunk/mpulsweb/templates/appointments/new.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/new.mako	2012-03-07 12:55:36 UTC (rev 5863)
+++ base/trunk/mpulsweb/templates/appointments/new.mako	2012-03-07 13:05:08 UTC (rev 5864)
@@ -9,8 +9,8 @@
 %>
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/appointment', action='overview')}">${_('Appointments list')}</a></li>
-  <li><a href="${h.url_for(controller='/appointment', action='new')}">${_('Create new event')}</a></li>
+  <li><a href="${h.url(controller='appointment', action='overview')}">${_('Appointments list')}</a></li>
+  <li><a href="${h.url(controller='appointment', action='new')}">${_('Create new event')}</a></li>
 </%def>
 <div id="content_header_small">
   <div id="content_ueberschrift">
@@ -20,7 +20,7 @@
     <div class="actions">
       <ul>
         <li>
-          <a href="${h.url_for(controller='appointment', action='overview')}"> ${_('Back to: User overview')}</a>
+          <a href="${h.url(controller='appointment', action='overview')}"> ${_('Back to: User overview')}</a>
         </li>
       </ul>
     </div>
@@ -29,7 +29,7 @@
 ${self.buildFormErrors(formular_labels)}
 <div id="admin_new_user">
 <div id="waska_form">
-<form action="${h.url_for(controller='appointment', action='createAction')}" method="POST">
+<form action="${h.url(controller='appointment', action='createAction')}" method="POST">
 <%include file="edit_body.mako" />
 </form>
 </div>

Modified: base/trunk/mpulsweb/templates/appointments/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/overview.mako	2012-03-07 12:55:36 UTC (rev 5863)
+++ base/trunk/mpulsweb/templates/appointments/overview.mako	2012-03-07 13:05:08 UTC (rev 5864)
@@ -1,7 +1,7 @@
 <%inherit file="../main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/appointment', action='overview')}">${_('Appointments list')}</a></li>
+  <li><a href="${h.url(controller='appointment', action='overview')}">${_('Appointments list')}</a></li>
 </%def>
 <div id="content_header_small">
   <div id="content_ueberschrift">
@@ -11,7 +11,7 @@
   <div id="modusfield">
     <div class="actions">
       <ul>
-        <li><a href="${h.url_for(controller='/appointment', action='create')}"> ${_('Create new event')}</a></li>
+        <li><a href="${h.url(controller='appointment', action='create')}"> ${_('Create new event')}</a></li>
       </ul>
     </div>
   </div>

Modified: base/trunk/mpulsweb/templates/appointments/show.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/show.mako	2012-03-07 12:55:36 UTC (rev 5863)
+++ base/trunk/mpulsweb/templates/appointments/show.mako	2012-03-07 13:05:08 UTC (rev 5864)
@@ -1,8 +1,8 @@
 <%inherit file="../main.mako" />
 <%def name="buildNavipath()">
 ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/appointment', action='overview')}">${_('Appointments list')}</a></li>
-  <li><a href="${h.url_for(controller='/appointment', action='show')}"></a>${_('Event view')}</li>
+  <li><a href="${h.url(controller='appointment', action='overview')}">${_('Appointments list')}</a></li>
+  <li><a href="${h.url(controller='appointment', action='show')}"></a>${_('Event view')}</li>
 </%def>
 <div id="content_header_small">
   <div id="content_ueberschrift">
@@ -13,11 +13,11 @@
       <ul>
         % if h.hasRole(['admin']):
         <li>
-          <a href="${h.url_for(controller='/appointment', action='edit', id=c.appointment.id)}">${_('Edit appointment')}</a>
+          <a href="${h.url(controller='appointment', action='edit', id=c.appointment.id)}">${_('Edit appointment')}</a>
         </li>
         % endif
         <li>
-          <a href="${h.url_for(controller='/appointment', action='overview', id=c.appointment.case_id)}">${_('Back to: User overview')}</a>
+          <a href="${h.url(controller='appointment', action='overview', id=c.appointment.case_id)}">${_('Back to: User overview')}</a>
         </li>
       </ul>
     </div>