changeset 462:6ee508dacc30

respect page title
author Radomir Dopieralski <moindev@sheep.art.pl>
date Sun, 03 Aug 2008 19:02:58 +0200
parents 09cc3c94b281
children 14db7a5064dd
files dandelion/history.py dandelion/templates/page.html
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/dandelion/history.py	Sun Aug 03 18:54:27 2008 +0200
+++ b/dandelion/history.py	Sun Aug 03 19:02:58 2008 +0200
@@ -59,7 +59,7 @@
                 authors.append(changed_page.author)
         change['authors'] = authors
     stream = wiki.template_stream("changes.html", page, days=days)
-    html = wiki.template("page.html", page, content=stream)
+    html = wiki.template("page.html", page, content=stream, title=wiki.config["wiki", "changes_page"])
     return Response(html, mimetype="text/html")
 
 def rss_action(wiki, request, page):
--- a/dandelion/templates/page.html	Sun Aug 03 18:54:27 2008 +0200
+++ b/dandelion/templates/page.html	Sun Aug 03 19:02:58 2008 +0200
@@ -2,7 +2,7 @@
 "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns:py="http://genshi.edgewall.org/"
     xmlns:xi="http://www.w3.org/2001/XInclude"><head>
-<title>$page.title - $wiki.site_name</title>
+<title>$title - $wiki.site_name</title>
 <link rel="stylesheet" type="text/css" charset="utf-8" href="${url('style.css', 'download')}" />
 <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="${url('rss')}" />
 <link rel="alternate" type="application/wiki" title="Edit $page.title" href="${page.get_url('edit')}" />
@@ -26,7 +26,7 @@
         </ul>
     </div>
     <div class="page">
-        <h1 class="title" py:content="page.title">Page title</h1>
+        <h1 class="title" py:content="title">Page title</h1>
         <div class="content text" py:content="content">
 Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy
 nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.  Ut wisi