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

diff --git a/CHANGES.txt b/CHANGES.txt
index e8b290a3aeaee1125e0df1af08fba1d635935ced..200407483be47c77c38faaf567a2b24342899f8a 100644 (file)
--- 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 cf3cfa906848ba759d7c4af26aa84838917541de..b34a11ce2460ba8678116c4860f56465b8863bdf 100644 (file)
--- 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 760a2bd29172f0031f9b3c50109b15e4e024c29a..ea8a6d11f0ceeda639c13c275bc3fd55f07e3f1f 100644 (file)
--- 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 bb814300907cad544a4ee218c5fd73965ae223ce..1cdd14f51c8f60f30c9be335b4feeb24301e78c5 100644 (file)
--- 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 526e569b496b57d466c5076dfe6a80d7571698fa..a17dfbf09facb5d549ee138bf9362c4ae059ab5f 100644 (file)
--- 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 90f63dfb543b4663298d86247d02bbe1250caa10..fc5b4adb43211541b986de5ecece8beb4dd811b0 100644 (file)
--- 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 c37a89f995999249735382e972e2a803933d5267..b36559d39da4b3a420b251aabbb69534c13a7a55 100644 (file)
--- 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 dae4b7356095b9e0c60a7ade2bbd77ba3322259d..5d89677d17eaa150f5db6c57b7525d67e9bfb3dd 100644 (file)
--- 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" />