[Mpuls-commits] r2752 - in base/trunk: . mpulsweb/templates/phase mpulsweb/templates/phase/dialogs

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-05-25 20:38:10 +0200 (Tue, 25 May 2010)
New Revision: 2752

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako
   base/trunk/mpulsweb/templates/phase/phase.mako
Log:
* mpulsweb/templates/phase/dialogs/success_set_phase.mako,
mpulsweb/templates/phase/phase.mako: Use h.url_for consistently
for all-intra application URLs.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-05-25 18:37:12 UTC (rev 2751)
+++ base/trunk/ChangeLog	2010-05-25 18:38:10 UTC (rev 2752)
@@ -1,5 +1,11 @@
 2010-05-25  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/templates/phase/dialogs/success_set_phase.mako,
+	mpulsweb/templates/phase/phase.mako: Use h.url_for consistently
+	for all-intra application URLs.
+
+2010-05-25  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/templates/main.mako: Use h.url_for consistently for
 	all-intra application URLs.
 

Modified: base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako
===================================================================
--- base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako	2010-05-25 18:37:12 UTC (rev 2751)
+++ base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako	2010-05-25 18:38:10 UTC (rev 2752)
@@ -3,27 +3,27 @@
 <%inherit file="/main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="/case/select/${session.get('case').id}">${_('cm_np_select')}</a></li>
+  <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id)}">${_('cm_np_select')}</a></li>
   <li><a href="#">${_('case_cm_phase')}</a></li>
 </%def>
 <div class="dialog" />
-  <h1><img src="/images/icons/info/confirmation.png" alt="Erledigt"/>${c.dialog_title | F.NA}</h1>
+  <h1><img src="${h.url_for('/images/icons/info/confirmation.png')}" alt="Erledigt"/>${c.dialog_title | F.NA}</h1>
   <p>${c.dialog_text | F.NA}</p>
   <div class="import_box_dialog">
     <p>
       Beachten Sie, dass bei einem Phasenwechsel die Fallakte in ausgedruckter
       Form dem Jugendlichen ausgehändigt werden sollte. Weitere Informationen
       dazu finden Sie in der 
-      <a href="/case/showhelp/datenschutz_veraenderte_daten" target="_blank">Hilfe</a>
+      <a href="${h.url_for(controller='/case', action='showhelp', id='datenschutz_veraenderte_daten')}" target="_blank">Hilfe</a>
     </p>
     <p class="import_p">
       <strong class="import_number">1.</strong> Fallakte drucken:
-      <a class="button import" href="/case/printAll/${session.get('case').id}/0" target="_blank">Drucken</a>
+      <a class="button import" href="${h.url_for(controller='/case', action='printAll', id=session.get('case').id, confirmed=0)}" target="_blank">Drucken</a>
     </p>
     % if g.mpuls_config.is_enabled('case-module', 'phase'):
     <p class="import_p">
       <strong class="export_number">2.</strong> Phasenwechsel im Falltagebuch dokumentieren:
-      <a class="button import" href="/logbook/new/${session.get('case').id}">Falltagebuch</a>
+      <a class="button import" href="${h.url_for(controller='/logbook', action='new', id=session.get('case').id)}">Falltagebuch</a>
     </p>
     % endif
     <p><strong>oder</strong></p>

Modified: base/trunk/mpulsweb/templates/phase/phase.mako
===================================================================
--- base/trunk/mpulsweb/templates/phase/phase.mako	2010-05-25 18:37:12 UTC (rev 2751)
+++ base/trunk/mpulsweb/templates/phase/phase.mako	2010-05-25 18:38:10 UTC (rev 2752)
@@ -2,8 +2,8 @@
 <%inherit file="../casemanagement/main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="/case/">${_('cm_np_root')}</a></li>
-  <li><a href="/case/select/${session.get('case').id}">${_('cm_np_select')}</a></li>
+  <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+  <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id)}">${_('cm_np_select')}</a></li>
   <li><a href="#">${_('case_cm_phase')}</a></li>
 </%def>