[Mpuls-commits] r2741 - in base/trunk: . mpulsweb/templates/annotations mpulsweb/templates/appointments mpulsweb/templates/auth

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Tue May 25 19:52:08 CEST 2010 

Author: bh
Date: 2010-05-25 19:52:05 +0200 (Tue, 25 May 2010)
New Revision: 2741

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/templates/annotations/main.mako
   base/trunk/mpulsweb/templates/appointments/appointment_form.mako
   base/trunk/mpulsweb/templates/appointments/appointmentlist.mako
   base/trunk/mpulsweb/templates/appointments/edit.mako
   base/trunk/mpulsweb/templates/appointments/new.mako
   base/trunk/mpulsweb/templates/appointments/overview.mako
   base/trunk/mpulsweb/templates/appointments/show.mako
   base/trunk/mpulsweb/templates/auth/main.mako
Log:
* mpulsweb/templates/annotations/main.mako,
mpulsweb/templates/appointments/appointment_form.mako,
mpulsweb/templates/appointments/appointmentlist.mako,
mpulsweb/templates/appointments/edit.mako,
mpulsweb/templates/appointments/new.mako,
mpulsweb/templates/appointments/overview.mako,
mpulsweb/templates/appointments/show.mako,
mpulsweb/templates/auth/main.mako: Use h.url_for consistently for
all intra application URLs.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-05-25 17:42:30 UTC (rev 2740)
+++ base/trunk/ChangeLog	2010-05-25 17:52:05 UTC (rev 2741)
@@ -1,5 +1,17 @@
 2010-05-25  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/templates/annotations/main.mako,
+	mpulsweb/templates/appointments/appointment_form.mako,
+	mpulsweb/templates/appointments/appointmentlist.mako,
+	mpulsweb/templates/appointments/edit.mako,
+	mpulsweb/templates/appointments/new.mako,
+	mpulsweb/templates/appointments/overview.mako,
+	mpulsweb/templates/appointments/show.mako,
+	mpulsweb/templates/auth/main.mako: Use h.url_for consistently for
+	all intra application URLs.
+
+2010-05-25  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/templates/administration/show_usergroup.mako,
 	mpulsweb/templates/administration/show_user.mako,
 	mpulsweb/templates/administration/reset_password.mako,

Modified: base/trunk/mpulsweb/templates/annotations/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/annotations/main.mako	2010-05-25 17:42:30 UTC (rev 2740)
+++ base/trunk/mpulsweb/templates/annotations/main.mako	2010-05-25 17:52:05 UTC (rev 2741)
@@ -13,7 +13,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta http-equiv="content-style-type" content="text/css">
     <meta http-equiv="expires" content="0">
-    <link rel="shortcut icon" type="image/x-icon" href="/images/kompetenz3.ico">
+    <link rel="shortcut icon" type="image/x-icon" href="${h.url_for('/images/kompetenz3.ico')}">
     % if c.print_version:
     <link href="${h.url_for('/styles/all.css')}" media="all" rel="stylesheet" type="text/css">
     <link href="${h.url_for('/styles/print.css')}" media="screen" rel="stylesheet" type="text/css">

Modified: base/trunk/mpulsweb/templates/appointments/appointment_form.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/appointment_form.mako	2010-05-25 17:42:30 UTC (rev 2740)
+++ base/trunk/mpulsweb/templates/appointments/appointment_form.mako	2010-05-25 17:52:05 UTC (rev 2741)
@@ -1,6 +1,7 @@
 <div id="appointment">
 <div id="waska_form">
-<form action="/appointment/save" method="post">
+<form action="${h.url_for(controller='/appointment', action='save')}"
+      method="post">
 <div class="w25">
 	<label for="title">${_('app_form_label_title')}</label><br>
 	<input type="text" class="field" name="title" id="title" maxlength="128">

Modified: base/trunk/mpulsweb/templates/appointments/appointmentlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/appointmentlist.mako	2010-05-25 17:42:30 UTC (rev 2740)
+++ base/trunk/mpulsweb/templates/appointments/appointmentlist.mako	2010-05-25 17:52:05 UTC (rev 2741)
@@ -1,7 +1,7 @@
 <%inherit file="/appointments/overview_body.mako" />
 <%def name="showAppointmentActions(appointment)">
-<a href="${h.url_for(controller='/appointment', action='show', id=appointment.id)}"><img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
+<a href="${h.url_for(controller='/appointment', action='show', id=appointment.id)}"><img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
 % if h.hasRole(['admin_ka']):
-  <a href="${h.url_for(controller='/appointment', action='delete', id=appointment.id, confirmed=0)}"><img src="/images/icons/delete_active_22.png" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+  <a href="${h.url_for(controller='/appointment', action='delete', id=appointment.id, confirmed=0)}"><img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
 % endif
 </%def>

Modified: base/trunk/mpulsweb/templates/appointments/edit.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/edit.mako	2010-05-25 17:42:30 UTC (rev 2740)
+++ base/trunk/mpulsweb/templates/appointments/edit.mako	2010-05-25 17:52:05 UTC (rev 2741)
@@ -9,7 +9,7 @@
 %>
 <%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>
 <div id="content_header_small">

Modified: base/trunk/mpulsweb/templates/appointments/new.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/new.mako	2010-05-25 17:42:30 UTC (rev 2740)
+++ base/trunk/mpulsweb/templates/appointments/new.mako	2010-05-25 17:52:05 UTC (rev 2741)
@@ -9,8 +9,8 @@
 %>
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="/appointment/overview">${_('app_np_list')}</a></li>
-  <li><a href="/appointment/new/">${_('app_np_new')}</a></li>
+  <li><a href="${h.url_for(controller='/appointment', action='overview')}">${_('app_np_list')}</a></li>
+  <li><a href="${h.url_for(controller='/appointment', action='new')}">${_('app_np_new')}</a></li>
 </%def>
 <div id="content_header_small">
   <div id="content_ueberschrift">

Modified: base/trunk/mpulsweb/templates/appointments/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/overview.mako	2010-05-25 17:42:30 UTC (rev 2740)
+++ base/trunk/mpulsweb/templates/appointments/overview.mako	2010-05-25 17:52:05 UTC (rev 2741)
@@ -1,7 +1,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>
 </%def>
 <div id="content_header_small">
   <div id="content_ueberschrift">
@@ -11,7 +11,7 @@
   <div id="modusfield">
     <div class="actions">
       <ul>
-        <li><a href="/appointment/create"> ${_('app_actions_link_newappointment')}</a></li>
+        <li><a href="${h.url_for(controller='/appointment', action='create')}"> ${_('app_actions_link_newappointment')}</a></li>
       </ul>
     </div>
   </div>

Modified: base/trunk/mpulsweb/templates/appointments/show.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/show.mako	2010-05-25 17:42:30 UTC (rev 2740)
+++ base/trunk/mpulsweb/templates/appointments/show.mako	2010-05-25 17:52:05 UTC (rev 2741)
@@ -1,8 +1,8 @@
 <%inherit file="../main.mako" />
 <%def name="buildNavipath()">
 ${parent.buildNavipath()}
-  <li><a href="/appointment/overview">${_('app_np_list')}</a></li>
-  <li><a href="/appointment/show/"></a>${_('app_np_show')}</li>
+  <li><a href="${h.url_for(controller='/appointment', action='overview')}">${_('app_np_list')}</a></li>
+  <li><a href="${h.url_for(controller='/appointment', action='show')}"></a>${_('app_np_show')}</li>
 </%def>
 <div id="content_header_small">
   <div id="content_ueberschrift">

Modified: base/trunk/mpulsweb/templates/auth/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/auth/main.mako	2010-05-25 17:42:30 UTC (rev 2740)
+++ base/trunk/mpulsweb/templates/auth/main.mako	2010-05-25 17:52:05 UTC (rev 2741)
@@ -12,11 +12,11 @@
   <div id="footer_login">
     <p>${_('main_login_bmf_phrase') % h.get_app_title()}</p>
      <a target="_blank" href="http://www.bmfsfj.de">
-      <img src="/images/logos/BMFSFJ_C_M_web.jpg" 
+      <img src="${h.url_for('/images/logos/BMFSFJ_C_M_web.jpg')}" 
         alt="Logo Bundesministerium f&#252;r Familie, Senioren, Frauen und Jugend" border="0">
     </a>
      <a target="_blank" href="http://ec.europa.eu/employment_social/esf2000/index_de.html">
-      <img src="/images/logos/eu_logo_4c_pos_web2.jpg" 
+      <img src="${h.url_for('/images/logos/eu_logo_4c_pos_web2.jpg')}" 
         alt="Logo Europ&#228;ische Union - Europ&#228;ische Sozialfonds" border="0">
     </a>
   </div>
@@ -40,4 +40,4 @@
     </ul>
   </div>
   % endif
-</%def>
\ No newline at end of file
+</%def>

More information about the Mpuls-commits mailing list