[Mpuls-commits] r2750 - in base/trunk: . mpulsweb/templates/logbook mpulsweb/templates/logbook/dialogs

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Tue May 25 20:36:29 CEST 2010 

Author: bh
Date: 2010-05-25 20:36:28 +0200 (Tue, 25 May 2010)
New Revision: 2750

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/templates/logbook/dialogs/confirm_delete_logbook_entry.mako
   base/trunk/mpulsweb/templates/logbook/dialogs/failed_create_logbook_entry.mako
   base/trunk/mpulsweb/templates/logbook/dialogs/failed_delete_logbook_entry.mako
   base/trunk/mpulsweb/templates/logbook/dialogs/failed_save_logbook_entry.mako
   base/trunk/mpulsweb/templates/logbook/dialogs/failed_show_logbook_entry.mako
   base/trunk/mpulsweb/templates/logbook/dialogs/success_create_logbook_entry.mako
   base/trunk/mpulsweb/templates/logbook/dialogs/success_delete_logbook_entry.mako
   base/trunk/mpulsweb/templates/logbook/dialogs/success_save_logbook_entry.mako
   base/trunk/mpulsweb/templates/logbook/edit.mako
   base/trunk/mpulsweb/templates/logbook/new.mako
   base/trunk/mpulsweb/templates/logbook/overview.mako
   base/trunk/mpulsweb/templates/logbook/overview_print.mako
   base/trunk/mpulsweb/templates/logbook/show.mako
Log:
* mpulsweb/templates/logbook/dialogs/confirm_delete_logbook_entry.mako,
mpulsweb/templates/logbook/dialogs/failed_create_logbook_entry.mako,
mpulsweb/templates/logbook/dialogs/failed_delete_logbook_entry.mako,
mpulsweb/templates/logbook/dialogs/failed_save_logbook_entry.mako,
mpulsweb/templates/logbook/dialogs/failed_show_logbook_entry.mako,
mpulsweb/templates/logbook/dialogs/success_create_logbook_entry.mako,
mpulsweb/templates/logbook/dialogs/success_delete_logbook_entry.mako,
mpulsweb/templates/logbook/dialogs/success_save_logbook_entry.mako,
mpulsweb/templates/logbook/edit.mako,
mpulsweb/templates/logbook/new.mako,
mpulsweb/templates/logbook/overview.mako,
mpulsweb/templates/logbook/overview_print.mako,
mpulsweb/templates/logbook/show.mako: Use h.url_for consistently
for all-intra application URLs.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-05-25 18:32:34 UTC (rev 2749)
+++ base/trunk/ChangeLog	2010-05-25 18:36:28 UTC (rev 2750)
@@ -1,5 +1,22 @@
 2010-05-25  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/templates/logbook/dialogs/confirm_delete_logbook_entry.mako,
+	mpulsweb/templates/logbook/dialogs/failed_create_logbook_entry.mako,
+	mpulsweb/templates/logbook/dialogs/failed_delete_logbook_entry.mako,
+	mpulsweb/templates/logbook/dialogs/failed_save_logbook_entry.mako,
+	mpulsweb/templates/logbook/dialogs/failed_show_logbook_entry.mako,
+	mpulsweb/templates/logbook/dialogs/success_create_logbook_entry.mako,
+	mpulsweb/templates/logbook/dialogs/success_delete_logbook_entry.mako,
+	mpulsweb/templates/logbook/dialogs/success_save_logbook_entry.mako,
+	mpulsweb/templates/logbook/edit.mako,
+	mpulsweb/templates/logbook/new.mako,
+	mpulsweb/templates/logbook/overview.mako,
+	mpulsweb/templates/logbook/overview_print.mako,
+	mpulsweb/templates/logbook/show.mako: Use h.url_for consistently
+	for all-intra application URLs.
+
+2010-05-25  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/templates/home/caseappointmentlist.mako,
 	mpulsweb/templates/home/globalappointmentlist.mako,
 	mpulsweb/templates/home/remindlist.mako: Use h.url_for

Modified: base/trunk/mpulsweb/templates/logbook/dialogs/confirm_delete_logbook_entry.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/dialogs/confirm_delete_logbook_entry.mako	2010-05-25 18:32:34 UTC (rev 2749)
+++ base/trunk/mpulsweb/templates/logbook/dialogs/confirm_delete_logbook_entry.mako	2010-05-25 18:36:28 UTC (rev 2750)
@@ -2,8 +2,8 @@
 <%inherit file="/casemanagement/main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
-	<li><a href="/case/logbook/${session.get('case').id}">Tagebuch</a></li>
+        <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+	<li><a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Tagebuch</a></li>
 	<li><a href="#">Eintrag löschen</a></li>
 </%def>
 <%include file="../../dialogs/confirm.mako" />

Modified: base/trunk/mpulsweb/templates/logbook/dialogs/failed_create_logbook_entry.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/dialogs/failed_create_logbook_entry.mako	2010-05-25 18:32:34 UTC (rev 2749)
+++ base/trunk/mpulsweb/templates/logbook/dialogs/failed_create_logbook_entry.mako	2010-05-25 18:36:28 UTC (rev 2750)
@@ -2,8 +2,8 @@
 <%inherit file="/casemanagement/main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
-	<li><a href="/case/logbook/${session.get('case').id}">Tagebuch</a></li>
+        <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+	<li><a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Tagebuch</a></li>
 	<li><a href="#">Eintrag vornehmen</a></li>
 </%def>
 <%include file="../../dialogs/failed.mako" />

Modified: base/trunk/mpulsweb/templates/logbook/dialogs/failed_delete_logbook_entry.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/dialogs/failed_delete_logbook_entry.mako	2010-05-25 18:32:34 UTC (rev 2749)
+++ base/trunk/mpulsweb/templates/logbook/dialogs/failed_delete_logbook_entry.mako	2010-05-25 18:36:28 UTC (rev 2750)
@@ -2,8 +2,8 @@
 <%inherit file="/casemanagement/main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
-	<li><a href="/case/logbook/${session.get('case').id}">Tagebuch</a></li>
+        <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+	<li><a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Tagebuch</a></li>
 	<li><a href="#">Eintrag löschen fehlgeschlagen</a></li>
 </%def>
 <%include file="../../dialogs/failed.mako" />

Modified: base/trunk/mpulsweb/templates/logbook/dialogs/failed_save_logbook_entry.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/dialogs/failed_save_logbook_entry.mako	2010-05-25 18:32:34 UTC (rev 2749)
+++ base/trunk/mpulsweb/templates/logbook/dialogs/failed_save_logbook_entry.mako	2010-05-25 18:36:28 UTC (rev 2750)
@@ -2,8 +2,8 @@
 <%inherit file="/casemanagement/main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
-	<li><a href="/case/logbook/${session.get('case').id}">Tagebuch</a></li>
+        <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+	<li><a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Tagebuch</a></li>
 	<li><a href="#">Eintrag speichern fehlgeschlagen</a></li>
 </%def>
 <%include file="../../dialogs/failed.mako" />

Modified: base/trunk/mpulsweb/templates/logbook/dialogs/failed_show_logbook_entry.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/dialogs/failed_show_logbook_entry.mako	2010-05-25 18:32:34 UTC (rev 2749)
+++ base/trunk/mpulsweb/templates/logbook/dialogs/failed_show_logbook_entry.mako	2010-05-25 18:36:28 UTC (rev 2750)
@@ -2,8 +2,8 @@
 <%inherit file="/casemanagement/main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
-	<li><a href="/case/logbook/${session.get('case').id}">Tagebuch</a></li>
+        <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+	<li><a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Tagebuch</a></li>
 	<li><a href="#">Eintrag ansehen fehlgeschlagen</a></li>
 </%def>
 <%include file="../../dialogs/failed.mako" />

Modified: base/trunk/mpulsweb/templates/logbook/dialogs/success_create_logbook_entry.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/dialogs/success_create_logbook_entry.mako	2010-05-25 18:32:34 UTC (rev 2749)
+++ base/trunk/mpulsweb/templates/logbook/dialogs/success_create_logbook_entry.mako	2010-05-25 18:36:28 UTC (rev 2750)
@@ -2,8 +2,8 @@
 <%inherit file="/casemanagement/main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
-	<li><a href="/case/logbook/${session.get('case').id}">Tagebuch</a></li>
+        <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+	<li><a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Tagebuch</a></li>
 	<li><a href="#">Eintrag vornehmen</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/logbook/dialogs/success_delete_logbook_entry.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/dialogs/success_delete_logbook_entry.mako	2010-05-25 18:32:34 UTC (rev 2749)
+++ base/trunk/mpulsweb/templates/logbook/dialogs/success_delete_logbook_entry.mako	2010-05-25 18:36:28 UTC (rev 2750)
@@ -2,8 +2,8 @@
 <%inherit file="/casemanagement/main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
-	<li><a href="/case/logbook/${session.get('case').id}">Tagebuch</a></li>
+        <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+	<li><a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Tagebuch</a></li>
 	<li><a href="#">Eintrag löschen erfolgreich</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/logbook/dialogs/success_save_logbook_entry.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/dialogs/success_save_logbook_entry.mako	2010-05-25 18:32:34 UTC (rev 2749)
+++ base/trunk/mpulsweb/templates/logbook/dialogs/success_save_logbook_entry.mako	2010-05-25 18:36:28 UTC (rev 2750)
@@ -2,8 +2,8 @@
 <%inherit file="/casemanagement/main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
-	<li><a href="/case/logbook/${session.get('case').id}">Tagebuch</a></li>
+        <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+	<li><a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Tagebuch</a></li>
 	<li><a href="#">Eintrag abspeichern</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/logbook/edit.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/edit.mako	2010-05-25 18:32:34 UTC (rev 2749)
+++ base/trunk/mpulsweb/templates/logbook/edit.mako	2010-05-25 18:36:28 UTC (rev 2750)
@@ -8,8 +8,8 @@
 %>
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
-  <li><a href="/logbook/index/${session.get('case').id}">Tagebuch</a></li>
+  <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+  <li><a href="${h.url_for(controller='/logbook', action='index', id=session.get('case').id)}">Tagebuch</a></li>
   <li><a href="#"></a>Eintrag bearbeiten</li>
 </%def>
 <div id="content_header_small">
@@ -19,7 +19,7 @@
   <div id="modusfield">
     <div class="actions">
       <ul>
-        <li><a href="/logbook/show/${c.entry.id}">Zur&uuml;ck zu: Eintrag ansehen</a></li>
+        <li><a href="${h.url_for(controller='/logbook', action='show', id=c.entry.id)}">Zur&uuml;ck zu: Eintrag ansehen</a></li>
       </ul>
     </div>
   </div>
@@ -27,7 +27,8 @@
 ${self.buildFormErrors(formular_labels)}
 <div id="appointment">
   <div id="waska_form">
-    <form action="/logbook/editAction" accept-charset="UTF-8" method="POST">
+    <form action="${h.url_for(controller='/logbook', action='editAction')}"
+          accept-charset="UTF-8" method="POST">
       <%include file="../logbook/edit_body.mako" />
       <input type="hidden" name="id">
     </form>

Modified: base/trunk/mpulsweb/templates/logbook/new.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/new.mako	2010-05-25 18:32:34 UTC (rev 2749)
+++ base/trunk/mpulsweb/templates/logbook/new.mako	2010-05-25 18:36:28 UTC (rev 2750)
@@ -8,8 +8,8 @@
 %>
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
-  <li><a href="/logbook/index/${session.get('case').id}">Tagebuch</a></li>
+  <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+  <li><a href="${h.url_for(controller='/logbook', action='index', id=session.get('case').id)}">Tagebuch</a></li>
   <li><a href="#"></a>Eintrag vornehmen</li>
 </%def>
 <div id="content_header_small">
@@ -19,7 +19,7 @@
   <div id="modusfield">
     <div class="actions">
       <ul>
-        <li><a href="/logbook/index/${session.get('case').id}">Zur&uuml;ck zu: Tagebuch</a></li>
+        <li><a href="${h.url_for(controller='/logbook', action='index', id=session.get('case').id)}">Zur&uuml;ck zu: Tagebuch</a></li>
       </ul>
     </div>
   </div>
@@ -27,7 +27,8 @@
 ${self.buildFormErrors(formular_labels)}
 <div id="appointment">
 <div id="waska_form">
-  <form action="/logbook/newAction" accept-charset="UTF-8" method="POST">
+  <form action="${h.url_for(controller='/logbook', action='newAction')}"
+        accept-charset="UTF-8" method="POST">
   <%include file="../logbook/edit_body.mako" />
   </form>
 </div>

Modified: base/trunk/mpulsweb/templates/logbook/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/overview.mako	2010-05-25 18:32:34 UTC (rev 2749)
+++ base/trunk/mpulsweb/templates/logbook/overview.mako	2010-05-25 18:36:28 UTC (rev 2750)
@@ -3,8 +3,8 @@
 <%inherit file="/casemanagement/main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
-  <li><a href="/logbook/index/${session.get('case').id}">Tagebuch</a></li>
+  <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+  <li><a href="${h.url_for(controller='/logbook', action='index', id=session.get('case').id)}">Tagebuch</a></li>
 </%def>
 
 <div id="content_header_small">
@@ -25,20 +25,20 @@
 <table class="appointment">
   <tr>
     <th class="date table_header_h">Datum
-      <a href="/logbook/index/${session.get('case').id}?sort_field=datum&sort_order=asc"><img class="sorticon" src="/images/icons/sort_asc.png" alt=""></a> 
-      <a href="/logbook/index/${session.get('case').id}?sort_field=datum&sort_order=desc"><img class="sorticon" src="/images/icons/sort_desc.png" alt=""></a> 
+      <a href="${h.url_for(controller='/logbook', action='index', id='${session.get('case').id}?sort_field=datum&sort_order=asc')}"><img class="sorticon" src="${h.url_for('/images/icons/sort_asc.png')}" alt=""></a> 
+      <a href="${h.url_for(controller='/logbook', action='index', id='${session.get('case').id}?sort_field=datum&sort_order=desc')}"><img class="sorticon" src="${h.url_for('/images/icons/sort_desc.png')}" alt=""></a> 
     </th>
     <th class="title table_header_h">Bearbeiter
-      <a href="/logbook/index/${session.get('case').id}?sort_field=nachname&sort_order=asc"><img class="sorticon" src="/images/icons/sort_asc.png" alt=""></a> 
-      <a href="/logbook/index/${session.get('case').id}?sort_field=nachname&sort_order=desc"><img class="sorticon" src="/images/icons/sort_desc.png" alt=""></a> 
+      <a href="${h.url_for(controller='/logbook', action='index', id='${session.get('case').id}?sort_field=nachname&sort_order=asc')}"><img class="sorticon" src="${h.url_for('/images/icons/sort_asc.png')}" alt=""></a> 
+      <a href="${h.url_for(controller='/logbook', action='index', id='${session.get('case').id}?sort_field=nachname&sort_order=desc')}"><img class="sorticon" src="${h.url_for('/images/icons/sort_desc.png')}" alt=""></a> 
     </th>
     <th class="title table_header_h">Art
-      <a href="/logbook/index/${session.get('case').id}?sort_field=art&sort_order=asc"><img class="sorticon" src="/images/icons/sort_asc.png" alt=""></a> 
-      <a href="/logbook/index/${session.get('case').id}?sort_field=art&sort_order=desc"><img class="sorticon" src="/images/icons/sort_desc.png" alt=""></a> 
+      <a href="${h.url_for(controller='/logbook', action='index', id='${session.get('case').id}?sort_field=art&sort_order=asc')}"><img class="sorticon" src="${h.url_for('/images/icons/sort_asc.png')}" alt=""></a> 
+      <a href="${h.url_for(controller='/logbook', action='index', id='${session.get('case').id}?sort_field=art&sort_order=desc')}"><img class="sorticon" src="${h.url_for('/images/icons/sort_desc.png')}" alt=""></a> 
     </th>
     <th class="title table_header_h">Dauer (min)
-      <a href="/logbook/index/${session.get('case').id}?sort_field=dauer&sort_order=asc"><img class="sorticon" src="/images/icons/sort_asc.png" alt=""></a> 
-      <a href="/logbook/index/${session.get('case').id}?sort_field=dauer&sort_order=desc"><img class="sorticon" src="/images/icons/sort_desc.png" alt=""></a> 
+      <a href="${h.url_for(controller='/logbook', action='index', id='${session.get('case').id}?sort_field=dauer&sort_order=asc')}"><img class="sorticon" src="${h.url_for('/images/icons/sort_asc.png')}" alt=""></a> 
+      <a href="${h.url_for(controller='/logbook', action='index', id='${session.get('case').id}?sort_field=dauer&sort_order=desc')}"><img class="sorticon" src="${h.url_for('/images/icons/sort_desc.png')}" alt=""></a> 
     </th>
     <th class="action table_header_h">${_('app_overview_tbl_header_actions')}</th>
   </tr>
@@ -51,10 +51,10 @@
     <td class="title">${entry.getDuration() | h}</td>
     <td class="action">
         <a href="${h.url_for(controller='/logbook', action='show', id=entry.id)}">
-            <img src="/images/icons/open_active_22.png" border="0" alt="Eintrag ansehen" title="Eintrag ansehen"></a>
+            <img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="Eintrag ansehen" title="Eintrag ansehen"></a>
         % if h.hasRole(['cm_ka']) and entry.getKindAsInt() != 0:
         <a href="${h.url_for(controller='/logbook', action='delete', id=entry.id, confirmed=0)}">
-            <img src="/images/icons/delete_active_22.png" border="0" alt="Eintrag löschen" title="Eintrag löschen"></a>
+            <img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0" alt="Eintrag löschen" title="Eintrag löschen"></a>
         % endif
     </td>
   </tr>

Modified: base/trunk/mpulsweb/templates/logbook/overview_print.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/overview_print.mako	2010-05-25 18:32:34 UTC (rev 2749)
+++ base/trunk/mpulsweb/templates/logbook/overview_print.mako	2010-05-25 18:36:28 UTC (rev 2750)
@@ -3,8 +3,8 @@
 <%!  import mpulsweb.lib.helper.filters as F %>
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
-  <li><a href="/case/logbook/${session.get('case').id}">Tagebuch</a></li>
+  <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+  <li><a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Tagebuch</a></li>
   <li><a href="#"></a>Einträge</a></li>
 </%def>
 <div id="content_header_small">
@@ -15,7 +15,7 @@
     <div class="actions">
       <ul>
         <li>
-          <a href="/case/logbook/${session.get('case').id}">Zur&uuml;ck zu: Tagebuch</a>
+          <a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Zur&uuml;ck zu: Tagebuch</a>
         </li>
       </ul>
     </div>

Modified: base/trunk/mpulsweb/templates/logbook/show.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/show.mako	2010-05-25 18:32:34 UTC (rev 2749)
+++ base/trunk/mpulsweb/templates/logbook/show.mako	2010-05-25 18:36:28 UTC (rev 2750)
@@ -2,8 +2,8 @@
 <%!  import mpulsweb.lib.helper.filters as F %>
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
-  <li><a href="/logbook/index/${session.get('case').id}">Tagebuch</a></li>
+  <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+  <li><a href="${h.url_for(controller='/logbook', action='index', id=session.get('case').id)}">Tagebuch</a></li>
   <li><a href="#"></a>Tagebucheintrag</a></li>
 </%def>
 <div id="content_header_small">
@@ -21,7 +21,7 @@
         </li>
         % endif
         <li>
-          <a href="/logbook/index/${session.get('case').id}">Zur&uuml;ck zu: Tagebuch</a>
+          <a href="${h.url_for(controller='/logbook', action='index', id=session.get('case').id)}">Zur&uuml;ck zu: Tagebuch</a>
         </li>
       </ul>
     </div>

More information about the Mpuls-commits mailing list