[Mpuls-commits] r2755 - in base/trunk: . mpulsweb/templates/settings mpulsweb/templates/settings/dialogs

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-05-25 20:43:15 +0200 (Tue, 25 May 2010)
New Revision: 2755

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


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-05-25 18:42:05 UTC (rev 2754)
+++ base/trunk/ChangeLog	2010-05-25 18:43:15 UTC (rev 2755)
@@ -1,5 +1,12 @@
 2010-05-25  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/templates/settings/dialogs/success_edit.mako,
+	mpulsweb/templates/settings/edit.mako,
+	mpulsweb/templates/settings/show.mako: Use h.url_for consistently
+	for all-intra application URLs.
+
+2010-05-25  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/templates/repeatgroup/dialogs/confirm_delete_rg_entry.mako:
 	Use h.url_for consistently for all-intra application URLs.
 

Modified: base/trunk/mpulsweb/templates/settings/dialogs/success_edit.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/dialogs/success_edit.mako	2010-05-25 18:42:05 UTC (rev 2754)
+++ base/trunk/mpulsweb/templates/settings/dialogs/success_edit.mako	2010-05-25 18:43:15 UTC (rev 2755)
@@ -2,9 +2,9 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="/administration">${_('adm_np_root')}</a></li>
-	<li><a href="/administration/showSettings">${_('adm_np_showsettings')}</a></li>
-        <li><a href="/administration/editSettings">${_('adm_np_editsettings')}</a></li>
+        <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+	<li><a href="${h.url_for(controller='/administration', action='showSettings')}">${_('adm_np_showsettings')}</a></li>
+        <li><a href="${h.url_for(controller='/administration', action='editSettings')}">${_('adm_np_editsettings')}</a></li>
         <li><a href="#">${_('adm_np_editsettings_success')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/settings/edit.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/edit.mako	2010-05-25 18:42:05 UTC (rev 2754)
+++ base/trunk/mpulsweb/templates/settings/edit.mako	2010-05-25 18:43:15 UTC (rev 2755)
@@ -9,13 +9,13 @@
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
   <li>
-    <a href="/settings">${_('adm_np_root')}</a>
+    <a href="${h.url_for(controller='/settings')}">${_('adm_np_root')}</a>
   </li>
   <li>
-    <a href="/settings/show">${_('adm_np_showsettings')}</a>
+    <a href="${h.url_for(controller='/settings', action='show')}">${_('adm_np_showsettings')}</a>
   </li>
   <li>
-    <a href="/settings/edit">${_('adm_np_editsettings')}</a>
+    <a href="${h.url_for(controller='/settings', action='edit')}">${_('adm_np_editsettings')}</a>
   </li>
 </%def>
 
@@ -41,7 +41,7 @@
 <div id="admin_edit_settings">
   <p>${_('adm_con_es_editsettings')}</p>
   <div class="waska_form">
-    <form action="/settings/editAction" method="POST">
+    <form action="${h.url_for(controller='/settings', action='editAction')}" method="POST">
       <fieldset>
         <legend>Angaben zur Einrichtung</legend>
         <div class="waska_form_element w30">
@@ -106,7 +106,7 @@
         <div class="waska_form_element w100">
           % if c.form_errors.get('anon_transfer'):
             <a href="#error_list">
-              <img class="smallicon" alt="" src="/images/icons/info/failure_22.png">
+              <img class="smallicon" alt="" src="${h.url_for('/images/icons/info/failure_22.png')}">
             </a>
           % endif
           % if c.agency.isAnonTransfer():

Modified: base/trunk/mpulsweb/templates/settings/show.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/show.mako	2010-05-25 18:42:05 UTC (rev 2754)
+++ base/trunk/mpulsweb/templates/settings/show.mako	2010-05-25 18:43:15 UTC (rev 2755)
@@ -4,10 +4,10 @@
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
   <li>
-    <a href="/settings">${_('adm_np_root')}</a>
+    <a href="${h.url_for(controller='/settings')}">${_('adm_np_root')}</a>
   </li>
   <li>
-    <a href="/settings/show">${_('adm_np_showsettings')}</a>
+    <a href="${h.url_for(controller='/settings', action='show')}">${_('adm_np_showsettings')}</a>
   </li>
 </%def>
 
@@ -19,7 +19,7 @@
     <div class="actions">
       <ul>
 	<li>
-          <a href="/settings/edit"> 
+          <a href="${h.url_for(controller='/settings', action='edit')}"> 
             ${_('adm_actions_link_editsettings')}
           </a>
         </li>