[Mpuls-commits] r5905 - in jmd/trunk/jmdstrukturweb/templates/phase: . dialogs

[scm-commit at wald.intevation.org]

Author: ludwig
Date: 2012-03-13 11:42:08 +0100 (Tue, 13 Mar 2012)
New Revision: 5905

Modified:
   jmd/trunk/jmdstrukturweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako
   jmd/trunk/jmdstrukturweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako
   jmd/trunk/jmdstrukturweb/templates/phase/dialogs/success_set_phase.mako
   jmd/trunk/jmdstrukturweb/templates/phase/phase.mako
Log:
Issue 2738: Replace url_for (jmdstruktur/templates part2)


Modified: jmd/trunk/jmdstrukturweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako
===================================================================
--- jmd/trunk/jmdstrukturweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako	2012-03-12 10:24:15 UTC (rev 5904)
+++ jmd/trunk/jmdstrukturweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako	2012-03-13 10:42:08 UTC (rev 5905)
@@ -2,7 +2,7 @@
 <%inherit file="/casemanagement/main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
+        <li><a href="${h.url(controller='case', action='index')}">${_('Case Management')}</a></li>
         <li><a href="#">${_('Phase in CM')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: jmd/trunk/jmdstrukturweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako
===================================================================
--- jmd/trunk/jmdstrukturweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako	2012-03-12 10:24:15 UTC (rev 5904)
+++ jmd/trunk/jmdstrukturweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako	2012-03-13 10:42:08 UTC (rev 5905)
@@ -3,11 +3,11 @@
 <%inherit file="/casemanagement/main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id)}">${_('Selected case documents')}</a></li>
+  <li><a href="${h.url(controller='case', action='select', id=session.get('case').id)}">${_('Selected case documents')}</a></li>
   <li><a href="#">${_('Phase in CM')}</a></li>
 </%def>
 <div class="dialog" />
-  <h1><img src="${h.url_for('/images/icons/info/confirmation.png')}" alt="Erledigt"/>${c.dialog_title | F.NA}</h1>
+  <h1><img src="${h.url('/images/icons/info/confirmation.png')}" alt="Erledigt"/>${c.dialog_title | F.NA}</h1>
   <p>${c.dialog_text | F.NA}</p>
   <a class="button import" href="${c.url_ok}">Ja</a>
   <a class="button import" href="${c.url_no}">Nein</a>

Modified: jmd/trunk/jmdstrukturweb/templates/phase/dialogs/success_set_phase.mako
===================================================================
--- jmd/trunk/jmdstrukturweb/templates/phase/dialogs/success_set_phase.mako	2012-03-12 10:24:15 UTC (rev 5904)
+++ jmd/trunk/jmdstrukturweb/templates/phase/dialogs/success_set_phase.mako	2012-03-13 10:42:08 UTC (rev 5905)
@@ -3,11 +3,11 @@
 <%inherit file="/casemanagement/main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id)}">${_('Selected case documents')}</a></li>
+  <li><a href="${h.url(controller='case', action='select', id=session.get('case').id)}">${_('Selected case documents')}</a></li>
   <li><a href="#">${_('Phase in CM')}</a></li>
 </%def>
 <div class="dialog" />
-  <h1><img src="${h.url_for('/images/icons/info/confirmation.png')}" alt="Erledigt"/>Status geändert!</h1>
+  <h1><img src="${h.url('/images/icons/info/confirmation.png')}" alt="Erledigt"/>Status geändert!</h1>
   <p>Der Status konnte erfolgreich geändert werden. Bitte klicken Sie auf "OK", um zur Seite "Status der Erfassung" zu gelangen.</p>
       <a class="button import" href="${c.url_ok}">OK</a>
   </div>

Modified: jmd/trunk/jmdstrukturweb/templates/phase/phase.mako
===================================================================
--- jmd/trunk/jmdstrukturweb/templates/phase/phase.mako	2012-03-12 10:24:15 UTC (rev 5904)
+++ jmd/trunk/jmdstrukturweb/templates/phase/phase.mako	2012-03-13 10:42:08 UTC (rev 5905)
@@ -2,8 +2,8 @@
 <%inherit file="../casemanagement/main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
-  <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id)}">${_('Selected case documents')}</a></li>
+  <li><a href="${h.url(controller='case', action='index')}">${_('Case Management')}</a></li>
+  <li><a href="${h.url(controller='case', action='select', id=session.get('case').id)}">${_('Selected case documents')}</a></li>
   <li><a href="#">${_('Phase in CM')}</a></li>
 </%def>
 
@@ -13,7 +13,7 @@
 
 <h2>${_('Phase in CM')}</h2>
 <div class="widget container">
-  <form method="POST" action="${h.url_for(controller='/phase', action='editAction')}">
+  <form method="POST" action="${h.url(controller='phase', action='editAction')}">
     <input type="hidden" name="case_id" value="${session.get('case').id}">
     <table id="cmphases">
       <% is_allowed = h.hasRole(('cm',)) %>
@@ -60,9 +60,9 @@
           </td>
           <td class="middle">
           % if p1.is_ok() and (c.phases.is_on_path(p1.id, current_phase,True) or c.phases.is_on_path(current_phase, p1.id, True)): 
-            <img src="${h.url_for('/images/icons/info/ok_22.png')}" alt="Ok">
+            <img src="${h.url('/images/icons/info/ok_22.png')}" alt="Ok">
           % else:
-            <img src="${h.url_for('/images/icons/info/failure_22.png')}" alt="Error">
+            <img src="${h.url('/images/icons/info/failure_22.png')}" alt="Error">
           % endif
           </td>
           <td class="note" style="border-bottom: 1pt dotted; border-color: #000;">
@@ -96,9 +96,9 @@
         <tr class="${(num%2) and 'hl' or ''}">
           <td class="middle">
           % if p2.is_ok() and (c.phases.is_on_path(p2.id, current_phase, True) or c.phases.is_on_path(current_phase, p2.id, True)): 
-            <img src="${h.url_for('/images/icons/info/ok_22.png')}" alt="Ok">
+            <img src="${h.url('/images/icons/info/ok_22.png')}" alt="Ok">
           % else:
-            <img src="${h.url_for('/images/icons/info/failure_22.png')}" alt="Error">
+            <img src="${h.url('/images/icons/info/failure_22.png')}" alt="Error">
           % endif
           </td>
           <td class="note">