[Mpuls-commits] r2742 - in base/trunk: . mpulsweb/templates

Tue May 25 19:53:48 CEST 2010

Author: bh
Date: 2010-05-25 19:53:47 +0200 (Tue, 25 May 2010)
New Revision: 2742

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


Modified: base/trunk/ChangeLog
===================================================================

--- base/trunk/ChangeLog	2010-05-25 17:52:05 UTC (rev 2741)
+++ base/trunk/ChangeLog	2010-05-25 17:53:47 UTC (rev 2742)
@@ -1,5 +1,10 @@
 2010-05-25  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/templates/base.mako: Use h.url_for consistently for all
+	intra application URLs.
+
+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,

Modified: base/trunk/mpulsweb/templates/base.mako
===================================================================
--- base/trunk/mpulsweb/templates/base.mako	2010-05-25 17:52:05 UTC (rev 2741)
+++ base/trunk/mpulsweb/templates/base.mako	2010-05-25 17:53:47 UTC (rev 2742)
@@ -27,7 +27,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">
@@ -47,8 +47,10 @@
       <link href="${h.url_for('/styles/menu.css')}" media="screen" 
             rel="stylesheet" type="text/css">
       <!--[if IE 6]>
-        <script defer type="text/javascript" src="/js/ie6-png.js"></script>
-        <script defer type="text/javascript" src="/js/ie6-menu.js"></script>
+        <script defer type="text/javascript" 
+                src="${h.url_for('/js/ie6-png.js')}"></script>
+        <script defer type="text/javascript" 
+                src="${h.url_for('/js/ie6-menu.js')}"></script>
         <link href  = "${h.url_for('/styles/ie6.css')}"
               media = "screen" 
               rel   = "stylesheet" type="text/css">
@@ -64,7 +66,7 @@
               rel   = "stylesheet" type="text/css">
       <![endif]-->
     % endif
-    <script src="/js/check.js" type="text/javascript"></script>
+    <script src="${h.url_for('/js/check.js')}" type="text/javascript"></script>
   </head>
   <body onload="clearModification();">
     ${next.body()}

