From 46bb338fadb8e3a6d093a90debd8a47fefb691c6 Mon Sep 17 00:00:00 2001
From: ncannasse <ncannasse@motion-twin.com>
Date: Fri, 25 Nov 2011 13:07:44 +0100
Subject: [PATCH] set page title directly in html and not through js

---
 tpl/en/blog_main.mtt    | 5 +----
 tpl/en/blog_post.mtt    | 5 +----
 tpl/en/design.mtt       | 2 +-
 tpl/en/entry.mtt        | 5 +----
 tpl/en/forum_main.mtt   | 3 ++-
 tpl/en/forum_post.mtt   | 3 ++-
 tpl/en/forum_thread.mtt | 3 ++-
 tpl/tmp/.gitignore      | 2 ++
 8 files changed, 12 insertions(+), 16 deletions(-)
 create mode 100644 tpl/tmp/.gitignore
diff --git a/tpl/en/blog_main.mtt b/tpl/en/blog_main.mtt
index cce246f..12663cd 100644
--- a/tpl/en/blog_main.mtt
+++ b/tpl/en/blog_main.mtt
@@ -1,12 +1,9 @@
 ::use 'design.mtt'::
 <div class="blog main">
 
+::set pageTitle = entry._title::
 <h1 class="title"><a href="/::entry._path::">::entry._title::</a></h1>
 
-<script type="text/javascript">
-	document.title = '::config.title:: - ::entry._title::';
-</script>
-
 <form action="/wiki/edit" class="create" method="GET" ::cond request.exists("create")::>
 	<span class="tfield">Title :</span> <input name="title" class="field" onkeyup="document.getElementById('id_path').value = '::entry._path::/' + Editor.normalize(this.value)"/>
 	<span class="tfield">URL :</span> <input id="id_path" name="path" class="field"/>
diff --git a/tpl/en/blog_post.mtt b/tpl/en/blog_post.mtt
index 049c495..45ee50f 100644
--- a/tpl/en/blog_post.mtt
+++ b/tpl/en/blog_post.mtt
@@ -1,12 +1,9 @@
 ::use 'design.mtt'::
 <div class="blog post">
 
+::set pageTitle = entry._title::
 <h1 class="title"><a href="/::entry._path::">::entry._title::</a></h1>
 
-<script type="text/javascript">
-	document.title = '::config.title:: - ::entry._title::';
-</script>
-
 ::set eparams = 'path='+entry._path+';lang='+entry._lang.code::
 
 ::if version == null::
diff --git a/tpl/en/design.mtt b/tpl/en/design.mtt
index 4d6f866..266d5c2 100644
--- a/tpl/en/design.mtt
+++ b/tpl/en/design.mtt
@@ -2,7 +2,7 @@
 <html>
 	<head>
 		<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-		<title>::config.title::</title>
+		<title>::if pageTitle::::pageTitle:: - ::end::::config.title::</title>
 		<link rel="stylesheet" type="text/css" href="/css/::config.style::.css"/>
 		::raw '<!--[if IE 6]>'::
 		<link rel="stylesheet" type="text/css" href="/css/::config.style::_ie6.css"/>
diff --git a/tpl/en/entry.mtt b/tpl/en/entry.mtt
index a0a90e3..abaa66e 100644
--- a/tpl/en/entry.mtt
+++ b/tpl/en/entry.mtt
@@ -1,11 +1,8 @@
 ::use 'design.mtt'::
 
+::set pageTitle = entry._title::
 <h1 class="title"><a href="/::entry._path::">::entry._title::</a></h1>
 
-<script type="text/javascript">
-	document.title = '::config.title:: - ::entry._title::';
-</script>
-
 <div class="hierarchy">
 	::foreach e entry.getList()::
 	::if !repeat.e.first:: &gt;::end:: <a href="/::e._path::">::e._title::</a>
diff --git a/tpl/en/forum_main.mtt b/tpl/en/forum_main.mtt
index 6d6182b..b98af15 100644
--- a/tpl/en/forum_main.mtt
+++ b/tpl/en/forum_main.mtt
@@ -1,6 +1,7 @@
-﻿::use 'design.mtt'::
+::use 'design.mtt'::
 <div class="forum">
 
+::set pageTitle = entry._title::
 <h1><a href="::path::">::entry._title::</a></h1>
 
 <table class="threads">
diff --git a/tpl/en/forum_post.mtt b/tpl/en/forum_post.mtt
index 95b8898..0df96ea 100644
--- a/tpl/en/forum_post.mtt
+++ b/tpl/en/forum_post.mtt
@@ -1,7 +1,8 @@
-﻿::use 'design.mtt'::
+::use 'design.mtt'::
 
 <div class="forum">
 
+::set pageTitle = entry._title::
 <h1><a href="::path::">::entry._title::</a> &gt; ::if thread:: <a href="::path::/thread/::thread.id::">::thread.title::</a> &gt; Reply::else:: New Topic ::end:: </h1>
 
 <ul class="msg">
diff --git a/tpl/en/forum_thread.mtt b/tpl/en/forum_thread.mtt
index c03424f..7d71b8d 100644
--- a/tpl/en/forum_thread.mtt
+++ b/tpl/en/forum_thread.mtt
@@ -1,7 +1,8 @@
-﻿::use 'design.mtt'::
+::use 'design.mtt'::
 
 <div class="forum">
 
+::set pageTitle = entry._title::
 <h1><a href="::path::">::entry._title::</a> &gt; ::thread.title::</h1>
 
 <ul class="msg">
diff --git a/tpl/tmp/.gitignore b/tpl/tmp/.gitignore
new file mode 100644
index 0000000..f346e38
--- /dev/null
+++ b/tpl/tmp/.gitignore
@@ -0,0 +1,2 @@
+
+*.php
\ No newline at end of file
