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

Wed Oct 27 09:21:31 CEST 2010

Author: roland
Date: 2010-10-27 09:21:30 +0200 (Wed, 27 Oct 2010)
New Revision: 4034

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/templates/annotations/main.mako
   base/trunk/mpulsweb/templates/base.mako
Log:
load stylesheet to allow applications to overwrite styles

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

--- base/trunk/ChangeLog	2010-10-26 16:55:59 UTC (rev 4033)
+++ base/trunk/ChangeLog	2010-10-27 07:21:30 UTC (rev 4034)
@@ -1,3 +1,9 @@
+2010-10-27  Roland Geider <roland.geider at intevation.de>
+
+	* mpulsweb/templates/annotations/main.mako,
+	  mpulsweb/templates/base.mako: load stylesheet to allow applications
+	  to overwrite styles
+
 2010-10-26  Bernhard Herzog  <bh at intevation.de>
 
 	* mpulsweb/lib/security.py (load_db_mapping_from_file):

Modified: base/trunk/mpulsweb/templates/annotations/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/annotations/main.mako	2010-10-26 16:55:59 UTC (rev 4033)
+++ base/trunk/mpulsweb/templates/annotations/main.mako	2010-10-27 07:21:30 UTC (rev 4034)
@@ -23,6 +23,7 @@
     <link href="${h.url_for('/styles/screen.css')}" media="screen" rel="stylesheet" type="text/css">
     <link href="${h.url_for('/styles/print.css')}" media="print" rel="stylesheet" type="text/css">
     <!--[if gt IE 5]><link href="${h.url_for('/styles/ie6.css')}" media="screen" rel="stylesheet" type="text/css"><![endif]-->
+    <link href="${h.url_for('/styles/local.css')}" media="all" rel="stylesheet" type="text/css">
     % endif
   </head>
   <body>

Modified: base/trunk/mpulsweb/templates/base.mako
===================================================================
--- base/trunk/mpulsweb/templates/base.mako	2010-10-26 16:55:59 UTC (rev 4033)
+++ base/trunk/mpulsweb/templates/base.mako	2010-10-27 07:21:30 UTC (rev 4034)
@@ -46,6 +46,8 @@
             rel="stylesheet" type="text/css">
       <link href="${h.url_for('/styles/menu.css')}" media="screen" 
             rel="stylesheet" type="text/css">
+      <link href="${h.url_for('/styles/local.css')}" media="all" rel="stylesheet"
+            type="text/css">
       <!--[if IE 6]>
         <script defer type="text/javascript" 
                 src="${h.url_for('/js/ie6-png.js')}"></script>

