From 2faac791a9fc02971500259416589af5b06d8901 Mon Sep 17 00:00:00 2001
From: richard <richard@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Mon, 5 Apr 2004 23:48:56 +0000
Subject: [PATCH] tracker name at end of page title (sf rfe 926840)

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@2258 57a73879-2fb5-44c3-a270-3262357dd7e2
---
 CHANGES.txt                             | 1 +
 templates/classic/html/file.index.html  | 2 +-
 templates/classic/html/issue.index.html | 2 +-
 templates/classic/html/issue.item.html  | 9 +++++----
 templates/classic/html/msg.index.html   | 3 ++-
 templates/classic/html/msg.item.html    | 2 +-
 templates/classic/html/query.edit.html  | 3 ++-
 templates/classic/html/user.item.html   | 2 +-
 8 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e8b290a..2004074 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ Feature:
 - added url_quote and html_quote methods to the utils object
 - added isset method to HTMLProperty
 - database export now exports full journals too
+- tracker name at end of page title (sf rfe 926840)
 
 Fixed:
 - web CSV export was busted (as was any action returning a result)
diff --git a/templates/classic/html/file.index.html b/templates/classic/html/file.index.html
index cf3cfa9..b34a11c 100644
--- a/templates/classic/html/file.index.html
+++ b/templates/classic/html/file.index.html
@@ -1,7 +1,7 @@
 <!-- dollarId: file.index,v 1.4 2002/01/23 05:10:27 richard Exp dollar-->
 <tal:block metal:use-macro="templates/page/macros/icing">
 <title metal:fill-slot="head_title"> 
- <span tal:replace="config/TRACKER_NAME" />: List of files
+ List of files - <span tal:replace="config/TRACKER_NAME" />
 </title> 
 <span metal:fill-slot="body_title" tal:omit-tag="python:1">List of files</span>
 <td class="content" metal:fill-slot="content">
diff --git a/templates/classic/html/issue.index.html b/templates/classic/html/issue.index.html
index 760a2bd..ea8a6d1 100644
--- a/templates/classic/html/issue.index.html
+++ b/templates/classic/html/issue.index.html
@@ -1,7 +1,7 @@
 <!-- dollarId: issue.index,v 1.2 2001/07/29 04:07:37 richard Exp dollar-->
 <tal:block metal:use-macro="templates/page/macros/icing">
 <title metal:fill-slot="head_title"> 
- <span tal:replace="config/TRACKER_NAME" />: List of issues
+ List of issues - <span tal:replace="config/TRACKER_NAME" />
 </title> 
 <span metal:fill-slot="body_title" tal:omit-tag="python:1">List of issues</span>
 <td class="content" metal:fill-slot="content">
diff --git a/templates/classic/html/issue.item.html b/templates/classic/html/issue.item.html
index bb81430..1cdd14f 100644
--- a/templates/classic/html/issue.item.html
+++ b/templates/classic/html/issue.item.html
@@ -1,13 +1,14 @@
 <!-- dollarId: issue.item,v 1.4 2001/08/03 01:19:43 richard Exp dollar-->
 <tal:block metal:use-macro="templates/page/macros/icing">
 <title metal:fill-slot="head_title"> 
-<span tal:replace="config/TRACKER_NAME" />: 
-<span tal:condition="context/id"
-       tal:replace="string:Issue ${context/id}: ${context/title}" />
+<tal:x condition="context/id"
+       replace="string:Issue ${context/id}: ${context/title}" />
+<tal:x condition="not:context/id">New Issue</tal:x>
+- <tal:x replace="config/TRACKER_NAME" />
 </title> 
 <span metal:fill-slot="body_title" tal:omit-tag="python:1">
  <tal:x tal:condition="not:context/id">New</tal:x> 
-  Issue<span tal:replace="context/id" />
+  Issue<tal:x replace="context/id" />
    <tal:x tal:condition="context/is_edit_ok">Editing</tal:x>
  </span>
 
diff --git a/templates/classic/html/msg.index.html b/templates/classic/html/msg.index.html
index 526e569..a17dfbf 100644
--- a/templates/classic/html/msg.index.html
+++ b/templates/classic/html/msg.index.html
@@ -1,6 +1,7 @@
 <tal:block metal:use-macro="templates/page/macros/icing">
 <title metal:fill-slot="head_title"> 
- <span tal:replace="config/TRACKER_NAME" />: List of messages
+ List of messages - 
+ <span tal:replace="config/TRACKER_NAME" />
 </title> 
 <span metal:fill-slot="body_title" tal:omit-tag="python:1">Message listing</span>
 <td class="content" metal:fill-slot="content">
diff --git a/templates/classic/html/msg.item.html b/templates/classic/html/msg.item.html
index 90f63df..fc5b4ad 100644
--- a/templates/classic/html/msg.item.html
+++ b/templates/classic/html/msg.item.html
@@ -1,9 +1,9 @@
 <!-- dollarId: msg.item,v 1.3 2002/05/22 00:32:34 richard Exp dollar-->
 <tal:block metal:use-macro="templates/page/macros/icing">
 <title metal:fill-slot="head_title"> 
-<span tal:replace="config/TRACKER_NAME" />: 
 <span tal:condition="context/id" tal:replace="string:Message ${context/id}" />
 <tal:x tal:condition="not:context/id">New Message</tal:x> 
+- <span tal:replace="config/TRACKER_NAME" />
 </title> 
 <span metal:fill-slot="body_title" tal:omit-tag="python:1">
   Message<span tal:replace="context/id" />
diff --git a/templates/classic/html/query.edit.html b/templates/classic/html/query.edit.html
index c37a89f..b36559d 100644
--- a/templates/classic/html/query.edit.html
+++ b/templates/classic/html/query.edit.html
@@ -1,7 +1,8 @@
 <!-- dollarId: user.item,v 1.7 2002/08/16 04:29:04 richard Exp dollar-->
 <tal:block metal:use-macro="templates/page/macros/icing">
 <title metal:fill-slot="head_title"> 
-<span tal:replace="config/TRACKER_NAME" />: "Your Queries" Editing
+"Your Queries" Editing
+- <span tal:replace="config/TRACKER_NAME" />
 </title> 
 <span metal:fill-slot="body_title" tal:omit-tag="python:1">
  "Your Queries" Editing
diff --git a/templates/classic/html/user.item.html b/templates/classic/html/user.item.html
index dae4b73..5d89677 100644
--- a/templates/classic/html/user.item.html
+++ b/templates/classic/html/user.item.html
@@ -1,10 +1,10 @@
 <!-- dollarId: user.item,v 1.7 2002/08/16 04:29:04 richard Exp dollar-->
 <tal:block metal:use-macro="templates/page/macros/icing">
 <title metal:fill-slot="head_title"> 
-<span tal:replace="config/TRACKER_NAME" />: 
 <span tal:condition="context/id"
       tal:replace="string:User ${context/id}: ${context/username}" />
 <tal:x tal:condition="not:context/id">New User</tal:x> 
+- <span tal:replace="config/TRACKER_NAME" />
 </title> 
 <span metal:fill-slot="body_title" tal:omit-tag="python:1">
   User<span tal:replace="context/id" />
-- 
2.30.2