Index: _generic.index.html
===================================================================
RCS file: /cvsroot/roundup/roundup/templates/classic/html/_generic.index.html,v
retrieving revision 1.3
diff -u -r1.3 _generic.index.html
--- _generic.index.html	12 Nov 2003 01:00:59 -0000	1.3
+++ _generic.index.html	9 Jan 2004 02:43:59 -0000
@@ -3,9 +3,8 @@
 <tal:block metal:use-macro="templates/page/macros/icing">
 <title metal:fill-slot="head_title"
        tal:content="python:context._classname.capitalize()+' editing'"></title>
-<td class="page-header-top" metal:fill-slot="body_title">
- <h2 tal:content="python:context._classname.capitalize()+' editing'"></h2>
-</td>
+<span metal:fill-slot="body_title" tal:omit-tag="python:1"
+      tal:content="python:context._classname.capitalize()+' editing'"></span>
 <td class="content" metal:fill-slot="content">
 
 <span tal:condition="python:not (context.is_view_ok() or context.is_edit_ok())">
Index: _generic.item.html
===================================================================
RCS file: /cvsroot/roundup/roundup/templates/classic/html/_generic.item.html,v
retrieving revision 1.3
diff -u -r1.3 _generic.item.html
--- _generic.item.html	12 Nov 2003 01:00:59 -0000	1.3
+++ _generic.item.html	9 Jan 2004 02:43:59 -0000
@@ -1,9 +1,8 @@
 <tal:block metal:use-macro="templates/page/macros/icing">
 <title metal:fill-slot="head_title"
        tal:content="python:context._classname.capitalize()+' editing'"></title>
-<td class="page-header-top" metal:fill-slot="body_title">
- <h2 tal:content="python:context._classname.capitalize()+' editing'"></h2>
-</td>
+<span metal:fill-slot="body_title" tal:omit-tag="python:1"
+      tal:content="python:context._classname.capitalize()+' editing'"></span>
 <td class="content" metal:fill-slot="content">
 
 <span tal:condition="python:not (context.is_view_ok() or context.is_edit_ok())">
Index: file.index.html
===================================================================
RCS file: /cvsroot/roundup/roundup/templates/classic/html/file.index.html,v
retrieving revision 1.1
diff -u -r1.1 file.index.html
--- file.index.html	17 Apr 2003 03:27:05 -0000	1.1
+++ file.index.html	9 Jan 2004 02:43:59 -0000
@@ -3,9 +3,7 @@
 <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>
+<span metal:fill-slot="body_title" tal:omit-tag="python:1">List of files</span>
 <td class="content" metal:fill-slot="content">
 
 <table class="otherinfo">
Index: file.item.html
===================================================================
RCS file: /cvsroot/roundup/roundup/templates/classic/html/file.item.html,v
retrieving revision 1.4
diff -u -r1.4 file.item.html
--- file.item.html	12 Nov 2003 01:00:59 -0000	1.4
+++ file.item.html	9 Jan 2004 02:43:59 -0000
@@ -1,8 +1,6 @@
 <tal:block metal:use-macro="templates/page/macros/icing">
 <title metal:fill-slot="head_title">File display</title>
-<td class="page-header-top" metal:fill-slot="body_title">
- <h2>File display</h2>
-</td>
+<span metal:fill-slot="body_title" tal:omit-tag="python:1">File display</span>
 
 <td class="content" metal:fill-slot="content">
 
Index: home.classlist.html
===================================================================
RCS file: /cvsroot/roundup/roundup/templates/classic/html/home.classlist.html,v
retrieving revision 1.1
diff -u -r1.1 home.classlist.html
--- home.classlist.html	17 Apr 2003 03:27:05 -0000	1.1
+++ home.classlist.html	9 Jan 2004 02:43:59 -0000
@@ -1,8 +1,6 @@
 <tal:block metal:use-macro="templates/page/macros/icing">
 <title metal:fill-slot="head_title">List of classes</title>
-<td class="page-header-top" metal:fill-slot="body_title">
- <h2>List of classes</h2>
-</td>
+<span metal:fill-slot="body_title" tal:omit-tag="python:1">List of classes</span>
 <td class="content" metal:fill-slot="content">
 <table class="classlist">
 
Index: issue.index.html
===================================================================
RCS file: /cvsroot/roundup/roundup/templates/classic/html/issue.index.html,v
retrieving revision 1.6
diff -u -r1.6 issue.index.html
--- issue.index.html	12 Nov 2003 01:00:59 -0000	1.6
+++ issue.index.html	9 Jan 2004 02:43:59 -0000
@@ -3,9 +3,7 @@
 <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>
+<span metal:fill-slot="body_title" tal:omit-tag="python:1">List of issues</span>
 <td class="content" metal:fill-slot="content">
 
 <tal:block tal:condition="not:context/is_view_ok">
Index: issue.item.html
===================================================================
RCS file: /cvsroot/roundup/roundup/templates/classic/html/issue.item.html,v
retrieving revision 1.8
diff -u -r1.8 issue.item.html
--- issue.item.html	12 Nov 2003 01:00:59 -0000	1.8
+++ issue.item.html	9 Jan 2004 02:44:00 -0000
@@ -6,12 +6,10 @@
        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>
+<span metal:fill-slot="body_title" tal:omit-tag="python:1">
   Issue<span tal:replace="context/id" />
    <tal:x tal:condition="context/is_edit_ok">Editing</tal:x>
- </h2>
-</td>
+ </span>
 
 <td class="content" metal:fill-slot="content">
 
Index: issue.search.html
===================================================================
RCS file: /cvsroot/roundup/roundup/templates/classic/html/issue.search.html,v
retrieving revision 1.5
diff -u -r1.5 issue.search.html
--- issue.search.html	12 Nov 2003 01:00:59 -0000	1.5
+++ issue.search.html	9 Jan 2004 02:44:00 -0000
@@ -1,8 +1,6 @@
 <tal:block metal:use-macro="templates/page/macros/icing">
 <title metal:fill-slot="head_title">Issue searching</title>
-<td class="page-header-top" metal:fill-slot="body_title">
- <h2>Issue searching</h2>
-</td>
+<span metal:fill-slot="body_title" tal:omit-tag="python:1">Issue searching</span>
 <td class="content" metal:fill-slot="content">
 
 <form method="GET" tal:attributes="action request/classname">
Index: keyword.item.html
===================================================================
RCS file: /cvsroot/roundup/roundup/templates/classic/html/keyword.item.html,v
retrieving revision 1.5
diff -u -r1.5 keyword.item.html
--- keyword.item.html	12 Nov 2003 01:00:59 -0000	1.5
+++ keyword.item.html	9 Jan 2004 02:44:00 -0000
@@ -1,9 +1,7 @@
 <!-- dollarId: keyword.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">Keyword editing</title>
-<td class="page-header-top" metal:fill-slot="body_title">
- <h2>Keyword editing</h2>
-</td>
+<span metal:fill-slot="body_title" tal:omit-tag="python:1">Keyword editing</span>
 <td class="content" metal:fill-slot="content">
 
 <table class="otherinfo" tal:define="keywords db/keyword/list"
Index: msg.index.html
===================================================================
RCS file: /cvsroot/roundup/roundup/templates/classic/html/msg.index.html,v
retrieving revision 1.1
diff -u -r1.1 msg.index.html
--- msg.index.html	17 Apr 2003 03:27:05 -0000	1.1
+++ msg.index.html	9 Jan 2004 02:44:00 -0000
@@ -2,9 +2,7 @@
 <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>
+<span metal:fill-slot="body_title" tal:omit-tag="python:1">Message listing</span>
 <td class="content" metal:fill-slot="content">
 <table class="messages" tal:condition="request/filter">
  <tr><th colspan=2 class="header">Messages</th></tr>
Index: msg.item.html
===================================================================
RCS file: /cvsroot/roundup/roundup/templates/classic/html/msg.item.html,v
retrieving revision 1.2
diff -u -r1.2 msg.item.html
--- msg.item.html	3 Oct 2003 16:57:28 -0000	1.2
+++ msg.item.html	9 Jan 2004 02:44:00 -0000
@@ -5,12 +5,10 @@
 <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>
+<span metal:fill-slot="body_title" tal:omit-tag="python:1">
   Message<span tal:replace="context/id" />
    <tal:x tal:condition="context/is_edit_ok">Editing</tal:x>
- </h2>
-</td>
+ </span>
 <td class="content" metal:fill-slot="content">
 <table class="form">
 
Index: page.html
===================================================================
RCS file: /cvsroot/roundup/roundup/templates/classic/html/page.html,v
retrieving revision 1.18
diff -u -r1.18 page.html
--- page.html	10 Dec 2003 01:40:12 -0000	1.18
+++ page.html	9 Jan 2004 02:44:00 -0000
@@ -18,7 +18,7 @@
 
 <tr>
  <td class="page-header-left">&nbsp;</td>
- <td class="page-header-top" metal:define-slot="body_title"><h2>name</h2></td>
+ <td class="page-header-top"><h2><span metal:define-slot="body_title">body title</span></h2></td>
 </tr>
 
 <tr>
Index: user.forgotten.html
===================================================================
RCS file: /cvsroot/roundup/roundup/templates/classic/html/user.forgotten.html,v
retrieving revision 1.3
diff -u -r1.3 user.forgotten.html
--- user.forgotten.html	20 Oct 2003 21:14:10 -0000	1.3
+++ user.forgotten.html	9 Jan 2004 02:44:01 -0000
@@ -1,9 +1,7 @@
 <!-- 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">Password reset request</title>
-<td class="page-header-top" metal:fill-slot="body_title">
- <h2>Password reset request</h2>
-</td>
+<span metal:fill-slot="body_title" tal:omit-tag="python:1">Password reset request</span>
 <td class="content" metal:fill-slot="content">
 
 <p>You have two options if you have forgotten your password. If you 
Index: user.index.html
===================================================================
RCS file: /cvsroot/roundup/roundup/templates/classic/html/user.index.html,v
retrieving revision 1.3
diff -u -r1.3 user.index.html
--- user.index.html	12 Nov 2003 01:00:59 -0000	1.3
+++ user.index.html	9 Jan 2004 02:44:01 -0000
@@ -1,9 +1,7 @@
 <!-- dollarId: user.index,v 1.3 2002/07/09 05:29:51 richard Exp dollar-->
 <tal:block metal:use-macro="templates/page/macros/icing">
 <title metal:fill-slot="head_title">User listing</title>
-<td class="page-header-top" metal:fill-slot="body_title">
- <h2>User listing</h2>
-</td>
+<span metal:fill-slot="body_title" tal:omit-tag="python:1">User listing</span>
 <td class="content" metal:fill-slot="content">
 
 <span tal:condition="not:context/is_view_ok">
Index: user.item.html
===================================================================
RCS file: /cvsroot/roundup/roundup/templates/classic/html/user.item.html,v
retrieving revision 1.7
diff -u -r1.7 user.item.html
--- user.item.html	12 Nov 2003 01:00:59 -0000	1.7
+++ user.item.html	9 Jan 2004 02:44:01 -0000
@@ -6,12 +6,10 @@
       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>
+<span metal:fill-slot="body_title" tal:omit-tag="python:1">
   User<span tal:replace="context/id" />
    <tal:x tal:condition="context/is_edit_ok">Editing</tal:x>
- </h2>
-</td>
+ </span>
 
 <td class="content" metal:fill-slot="content">
 <span tal:condition="python:not (context.is_view_ok() or context.is_edit_ok())">
Index: user.register.html
===================================================================
RCS file: /cvsroot/roundup/roundup/templates/classic/html/user.register.html,v
retrieving revision 1.4
diff -u -r1.4 user.register.html
--- user.register.html	12 Nov 2003 01:00:59 -0000	1.4
+++ user.register.html	9 Jan 2004 02:44:01 -0000
@@ -2,9 +2,8 @@
 <tal:block metal:use-macro="templates/page/macros/icing">
 <title metal:fill-slot="head_title"
        tal:content="string:Registering with ${db/config/TRACKER_NAME}"></title>
-<td class="page-header-top" metal:fill-slot="body_title">
- <h2 tal:content="string:Registering with ${db/config/TRACKER_NAME}"></h2>
-</td>
+<span metal:fill-slot="body_title" tal:omit-tag="python:1"
+      tal:content="string:Registering with ${db/config/TRACKER_NAME}"></span>
 <td class="content" metal:fill-slot="content">
 
 <tal:block tal:define=" editok python:request.user.username=='anonymous' and
Index: user.rego_progress.html
===================================================================
RCS file: /cvsroot/roundup/roundup/templates/classic/html/user.rego_progress.html,v
retrieving revision 1.3
diff -u -r1.3 user.rego_progress.html
--- user.rego_progress.html	12 Nov 2003 01:00:59 -0000	1.3
+++ user.rego_progress.html	9 Jan 2004 02:44:01 -0000
@@ -1,9 +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">Registration in progress</title>
-<td class="page-header-top" metal:fill-slot="body_title">
- <h1>Registration in progress...</h1>
-</td>
+<span metal:fill-slot="body_title" tal:omit-tag="python:1">
+  Registration in progress...</span>
 <td class="content" metal:fill-slot="content">
 
 <p>You will shortly receive an email to confirm your registration. To