nicer page titles (sf feature 65197)

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1572 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/CHANGES.txt b/CHANGES.txt
index c4407b66f5075ad0a7b57a380badb7ac4b3b5d14..c4c3d4a85a1d6046650839ffbb9375f33a0521d8 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -39,6 +39,8 @@ Feature:
 - added support for last-modified and if-modified-since headers for static
   file serving
 - added Node.get() method
+- nicer page titles (sf feature 65197)
+
 
 Fixed:
 - applied unicode patch. All data is stored in utf-8. Incoming messages

diff --git a/roundup/templates/classic/html/file.index b/roundup/templates/classic/html/file.index
index 23cfda89ee322f76dc630bce25b8101ffefbab9c..34dd0cf971cfba71eca61fe6693cd54aac0137d4 100644 (file)
--- a/roundup/templates/classic/html/file.index
+++ b/roundup/templates/classic/html/file.index
@@ -1,6 +1,8 @@
 <!-- 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">List of files</title>
+<title metal:fill-slot="head_title"> 
+ <span tal:replace="config/TRACKER_NAME" />: List of files
+</title> 
 <td class="page-header-top" metal:fill-slot="body_title">
  <h2>List of files</h2>
 </td>

diff --git a/roundup/templates/classic/html/issue.index b/roundup/templates/classic/html/issue.index
index 4f3e7b87510b5414f990f6241152ee5fcf83a108..9fcf2a7fe0149923447ca29de59f268443786c68 100644 (file)
--- a/roundup/templates/classic/html/issue.index
+++ b/roundup/templates/classic/html/issue.index
@@ -1,6 +1,8 @@
 <!-- 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">List of issues</title>
+<title metal:fill-slot="head_title"> 
+ <span tal:replace="config/TRACKER_NAME" />: List of issues
+</title> 
 <td class="page-header-top" metal:fill-slot="body_title">
  <h2>List of issues</h2>
 </td>

diff --git a/roundup/templates/classic/html/issue.item b/roundup/templates/classic/html/issue.item
index 0fcc722aea9bc31baa093fc9db9cd6e877c6a875..18bb6231c7d0ac2c9448560554ce7a30be9175f5 100644 (file)
--- a/roundup/templates/classic/html/issue.item
+++ b/roundup/templates/classic/html/issue.item
@@ -1,8 +1,11 @@
 <!-- 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">
- Issue<span tal:replace="context/id" /> editing
-</title>
+<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 tal:condition="not:context/id">New Issue</tal:x> 
+</title> 
 <td class="page-header-top" metal:fill-slot="body_title">
  <h2>
   Issue<span tal:replace="context/id" />

diff --git a/roundup/templates/classic/html/msg.index b/roundup/templates/classic/html/msg.index
index 44c025b4bc92b0026067ecef28c9bffabdd53cf9..666344b8a6e01eeecf634f8df993fa5c4e318214 100644 (file)
--- a/roundup/templates/classic/html/msg.index
+++ b/roundup/templates/classic/html/msg.index
@@ -1,5 +1,7 @@
 <tal:block metal:use-macro="templates/page/macros/icing">
-<title metal:fill-slot="head_title">Message listing</title>
+<title metal:fill-slot="head_title"> 
+ <span tal:replace="config/TRACKER_NAME" />: List of messages
+</title> 
 <td class="page-header-top" metal:fill-slot="body_title">
  <h2>Message listing</h2>
 </td>

diff --git a/roundup/templates/classic/html/msg.item b/roundup/templates/classic/html/msg.item
index 5351ef3a1ccb8ec90b517fb375d94ba5c13c603c..49e203a411428a557c24f6dd8548f865daa0e245 100644 (file)
--- a/roundup/templates/classic/html/msg.item
+++ b/roundup/templates/classic/html/msg.item
@@ -1,8 +1,15 @@
 <!-- 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">Message editing</title>
+<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> 
+</title> 
 <td class="page-header-top" metal:fill-slot="body_title">
- <h2>Message editing</h2>
+ <h2>
+  Message<span tal:replace="context/id" />
+   <tal:x tal:condition="context/is_edit_ok">Editing</tal:x>
+ </h2>
 </td>
 <td class="content" metal:fill-slot="content">
 <table class="form">

diff --git a/roundup/templates/classic/html/user.item b/roundup/templates/classic/html/user.item
index 5f6374cc885cd3bc279ce3ea215b180aa23ec933..422d933685050f0a3fd5711ba25dd7abc456e9e5 100644 (file)
--- a/roundup/templates/classic/html/user.item
+++ b/roundup/templates/classic/html/user.item
@@ -1,9 +1,18 @@
 <!-- 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">User editing</title>
+<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> 
+</title> 
 <td class="page-header-top" metal:fill-slot="body_title">
- <h2>User editing</h2>
+ <h2>
+  User<span tal:replace="context/id" />
+   <tal:x tal:condition="context/is_edit_ok">Editing</tal:x>
+ </h2>
 </td>
+
 <td class="content" metal:fill-slot="content">
 <span tal:condition="python:not (context.is_view_ok() or context.is_edit_ok())">
 You are not allowed to view this page.