]> ToastFreeware Gitweb - philipp/winterrodeln/wradmin.git/commitdiff
ToastFreeware / philipp / winterrodeln / wradmin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b877ea5)
Fixed bug that introduced non-valid HTML
authorphilipp <philipp@7aebc617-e5e2-0310-91dc-80fb5f6d2477>
Mon, 6 Apr 2009 20:32:19 +0000 (20:32 +0000)
committerphilipp <philipp@7aebc617-e5e2-0310-91dc-80fb5f6d2477>
Mon, 6 Apr 2009 20:32:19 +0000 (20:32 +0000)
git-svn-id: http://www.winterrodeln.org/svn/servermediawiki/trunk/wradmin@448 7aebc617-e5e2-0310-91dc-80fb5f6d2477

wradmin/wradmin/templates/maptool.html patch | blob | history
wradmin/wradmin/templates/master.html patch | blob | history

diff --git a/wradmin/wradmin/templates/maptool.html b/wradmin/wradmin/templates/maptool.html
index 3d3d249d4e43c23c3da9b03459d997e89256dfc4..587e3fab55e31e0098387d62e26ee4e0354ca9c8 100644 (file)
--- a/wradmin/wradmin/templates/maptool.html
+++ b/wradmin/wradmin/templates/maptool.html
@@ -7,15 +7,12 @@
 <xi:include href="master.html" />
 
 <head>
-<title>Map-Tool</title>
-
-<script type="text/javascript"> </script>
-<script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAVDRl0qsoeYOspQi0txxVEhTO7xxs0m3ls_NApg8LzilP9E0D3hScAc_5O_qu8-pbIbSF5h8xfGEcjA" type="text/javascript"> </script>
-<script src="/yui/yahoo-dom-event/yahoo-dom-event.js" type="text/javascript"> </script>
-<script src="/yui/connection/connection-min.js" type="text/javascript"> </script>
-<script src="/yui/json/json-min.js" type="text/javascript"> </script>
-
-<script type="text/javascript">
+    <title>Map-Tool</title>
+    <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAVDRl0qsoeYOspQi0txxVEhTO7xxs0m3ls_NApg8LzilP9E0D3hScAc_5O_qu8-pbIbSF5h8xfGEcjA" type="text/javascript"> </script>
+    <script src="/yui/yahoo-dom-event/yahoo-dom-event.js" type="text/javascript"> </script>
+    <script src="/yui/connection/connection-min.js" type="text/javascript"> </script>
+    <script src="/yui/json/json-min.js" type="text/javascript"> </script>
+    <script type="text/javascript">
 // <![CDATA[
 
 // Functions for simulated assoziative array
@@ -252,8 +249,7 @@ function initialize() {
 }
 
 // ]]>
-</script>
-
+    </script>
 </head>
 
 <body onload="initialize()" onunload="GUnload()">
diff --git a/wradmin/wradmin/templates/master.html b/wradmin/wradmin/templates/master.html
index 9421e3b38df5ae556d41ce8761b818bf3960ad1e..4134cbcd270faae5faa0eaf0a2f320ecbf5f50b8 100644 (file)
--- a/wradmin/wradmin/templates/master.html
+++ b/wradmin/wradmin/templates/master.html
@@ -6,20 +6,16 @@
     xmlns:xi="http://www.w3.org/2001/XInclude"
     py:strip="True">
 
-<py:match path="head" once="True">
-<head py:attrs="select('@*')">
-    <title py:with="title = list(select('title/text()'))">Winterrodeln<py:if test="title"> - ${title}</py:if></title>
+<head py:match="head" py:attrs="select('@*')">
     <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
     <meta name="robots" content="noindex, nofollow" />
     <link rel="stylesheet" type="text/css" media="screen" href="${h.url_for('/style.css')}" />
     <link rel="shortcut icon" href="${h.url_for('/favicon.png')}" />
-    ${Markup(unicode(select('script')))}
+    <meta py:replace="select('*|text()')" />
 </head>
-</py:match>
 
 
-<py:match path="body" once="true">
-<body py:attrs="select('@*')">
+<body py:match="body" py:attrs="select('@*')">
 <h1 id="header"><img src="${h.url_for('/titlebanner.png')}" alt="Winterrodeln Administration"/></h1>
 
 <ul id="mainmenu">
@@ -37,8 +33,6 @@ ${select('*|text()')}
 </div>
 
 <div id="footer"><img src="${h.url_for('/philipp_spitzer.png')}" alt="Philipp Spitzer"/></div>
-
 </body>
-</py:match>
 
 </html>
wradmin flask web app for Winterrodeln