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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-06-18 16:16:01 +0200 (Fri, 18 Jun 2010)
New Revision: 3035

Modified:
   base/trunk/ChangeLog
   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
Log:
* mpulsweb/templates/appointments/dialogs/confirm.mako,
mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako,
mpulsweb/templates/appointments/dialogs/success_create_appointment.mako,
mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako,
mpulsweb/templates/appointments/dialogs/success_edit_appointment.mako:
Use h.url_for consistently for all-intra application URLs.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-06-18 13:46:39 UTC (rev 3034)
+++ base/trunk/ChangeLog	2010-06-18 14:16:01 UTC (rev 3035)
@@ -1,5 +1,14 @@
 2010-06-18  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/templates/appointments/dialogs/confirm.mako,
+	mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako,
+	mpulsweb/templates/appointments/dialogs/success_create_appointment.mako,
+	mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako,
+	mpulsweb/templates/appointments/dialogs/success_edit_appointment.mako:
+	Use h.url_for consistently for all-intra application URLs.
+
+2010-06-18  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/lib/helpers.py (getHelp): Use tag to generate HTML tags
 	with proper escaping and generate URLs with url_for.
 	(get_export_selector): Escape HTML properly and use tag to

Modified: base/trunk/mpulsweb/templates/appointments/dialogs/confirm.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/dialogs/confirm.mako	2010-06-18 13:46:39 UTC (rev 3034)
+++ base/trunk/mpulsweb/templates/appointments/dialogs/confirm.mako	2010-06-18 14:16:01 UTC (rev 3035)
@@ -1,8 +1,8 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="/appointment">${_('menu_app_link_overview')}</a></li>
-	<li><a href="/appointment/overview">${_('app_np_list')}</a></li>
+        <li><a href="${h.url_for(controller='/appointment')}">${_('menu_app_link_overview')}</a></li>
+	<li><a href="${h.url_for(controller='/appointment', action='overview')}">${_('app_np_list')}</a></li>
 	<li><a href="#">${_('app_np_delete')}</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	2010-06-18 13:46:39 UTC (rev 3034)
+++ base/trunk/mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako	2010-06-18 14:16:01 UTC (rev 3035)
@@ -2,8 +2,8 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="/case/">${_('adm_np_root')}</a></li>
-        <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+	<li><a href="${h.url_for(controller='/case')}">${_('adm_np_root')}</a></li>
+        <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
 	<li><a href="#">${_('adm_np_success_deleteuser')}</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	2010-06-18 13:46:39 UTC (rev 3034)
+++ base/trunk/mpulsweb/templates/appointments/dialogs/success_create_appointment.mako	2010-06-18 14:16:01 UTC (rev 3035)
@@ -2,7 +2,8 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="/appointment/overview">${_('app_np_list')}</a></li>
+	<li><a href="${h.url_for(controller='/appointment',
+                                 action='overview')}">${_('app_np_list')}</a></li>
 	<li><a href="#">${_('app_np_new')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako	2010-06-18 13:46:39 UTC (rev 3034)
+++ base/trunk/mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako	2010-06-18 14:16:01 UTC (rev 3035)
@@ -2,8 +2,8 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="/appointment">${_('menu_app_link_overview')}</a></li>
-	<li><a href="/appointment/overview">${_('app_np_list')}</a></li>
+	<li><a href="${h.url_for(controller='/appointment')}">${_('menu_app_link_overview')}</a></li>
+	<li><a href="${h.url_for(controller='/appointment', action='overview')}">${_('app_np_list')}</a></li>
 	<li><a href="#">${_('app_np_delete')}</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	2010-06-18 13:46:39 UTC (rev 3034)
+++ base/trunk/mpulsweb/templates/appointments/dialogs/success_edit_appointment.mako	2010-06-18 14:16:01 UTC (rev 3035)
@@ -2,7 +2,7 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="/appointment/overview">${_('app_np_list')}</a></li>
+	<li><a href="${h.url_for(controller='/appointment', action='overview')}">${_('app_np_list')}</a></li>
 	<li><a href="#">${_('app_np_edit')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />