From 169801b87877795fc8082f43ca609bc510725869 Mon Sep 17 00:00:00 2001
From: richard <richard@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Mon, 19 Jan 2004 23:01:10 +0000
Subject: [PATCH] body_title improvement

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@2044 57a73879-2fb5-44c3-a270-3262357dd7e2
---
 templates/classic/html/_generic.help.html      | 7 +++----
 templates/classic/html/_generic.index.html     | 5 ++---
 templates/classic/html/_generic.item.html      | 5 ++---
 templates/classic/html/file.index.html         | 4 +---
 templates/classic/html/file.item.html          | 4 +---
 templates/classic/html/home.classlist.html     | 4 +---
 templates/classic/html/issue.index.html        | 6 ++----
 templates/classic/html/issue.item.html         | 6 ++----
 templates/classic/html/issue.search.html       | 4 +---
 templates/classic/html/keyword.item.html       | 4 +---
 templates/classic/html/msg.index.html          | 4 +---
 templates/classic/html/msg.item.html           | 6 ++----
 templates/classic/html/page.html               | 4 +++-
 templates/classic/html/user.forgotten.html     | 4 +---
 templates/classic/html/user.index.html         | 4 +---
 templates/classic/html/user.item.html          | 6 ++----
 templates/classic/html/user.register.html      | 5 ++---
 templates/classic/html/user.rego_progress.html | 5 ++---
 templates/minimal/html/_generic.index.html     | 6 +++---
 templates/minimal/html/_generic.item.html      | 5 ++---
 templates/minimal/html/home.classlist.html     | 4 +---
 templates/minimal/html/home.html               | 4 +---
 templates/minimal/html/page.html               | 2 +-
 templates/minimal/html/user.index.html         | 4 +---
 templates/minimal/html/user.item.html          | 7 ++++---
 templates/minimal/html/user.register.html      | 5 ++---
 26 files changed, 45 insertions(+), 79 deletions(-)

diff --git a/templates/classic/html/_generic.help.html b/templates/classic/html/_generic.help.html
index 7887938..88088ce 100644
--- a/templates/classic/html/_generic.help.html
+++ b/templates/classic/html/_generic.help.html
@@ -20,7 +20,7 @@
                    batch python:utils.Batch(context.list(), 500, start);
                    props python:request.form['properties'].value.split(',')">
      
-     <div id="classhelp-controls" tal:condition="python:start==0">
+     <div id="classhelp-controls">
        <!--input type="button" name="btn_clear" 
               value="Clear" onClick="clearList()"/ -->
        <input type="text" name="text_preview" size="24" class="preview"
@@ -41,7 +41,6 @@
              <td>
                  <input type="checkbox" name="check" 
                  onclick="updatePreview();"
-                 tal:condition="python:start==0"
                  tal:attributes="value attr; id string:id_$attr" />
              </td>
              <td tal:repeat="prop props">
@@ -60,14 +59,14 @@
       <tr class="navigation">
        <th>
         <a tal:define="prev batch/previous" tal:condition="prev"
-           tal:attributes="href string:${request/classname}?@template=help&@startwith=${prev/first}&properties=${request/form/properties/value}">&lt;&lt; previous</a>
+            tal:attributes="href string:${request/classname}?@template=help&@startwith=${prev/first}&property=${request/form/property/value}&properties=${request/form/properties/value}">&lt;&lt; previous</a>
         &nbsp;
        </th>
        <th tal:content="python: '%d...%d out of %d'%(batch.start,
                batch.start+batch.length-1, batch.sequence_length)">current</th>
        <th>
         <a tal:define="next batch/next" tal:condition="next"
-           tal:attributes="href string:${request/classname}?@template=help&@startwith=${next/first}&properties=${request/form/properties/value}">next &gt;&gt;</a>
+            tal:attributes="href string:${request/classname}?@template=help&@startwith=${next/first}&property=${request/form/property/value}&properties=${request/form/properties/value}">next &gt;&gt;</a>
         &nbsp;
        </th>
       </tr>
diff --git a/templates/classic/html/_generic.index.html b/templates/classic/html/_generic.index.html
index e39c774..fa5a10e 100644
--- a/templates/classic/html/_generic.index.html
+++ b/templates/classic/html/_generic.index.html
@@ -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())">
diff --git a/templates/classic/html/_generic.item.html b/templates/classic/html/_generic.item.html
index fc35866..ae7d828 100644
--- a/templates/classic/html/_generic.item.html
+++ b/templates/classic/html/_generic.item.html
@@ -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())">
diff --git a/templates/classic/html/file.index.html b/templates/classic/html/file.index.html
index 34dd0cf..cf3cfa9 100644
--- a/templates/classic/html/file.index.html
+++ b/templates/classic/html/file.index.html
@@ -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">
diff --git a/templates/classic/html/file.item.html b/templates/classic/html/file.item.html
index 6f4542d..e87b1df 100644
--- a/templates/classic/html/file.item.html
+++ b/templates/classic/html/file.item.html
@@ -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">
 
diff --git a/templates/classic/html/home.classlist.html b/templates/classic/html/home.classlist.html
index 0b5a244..637f353 100644
--- a/templates/classic/html/home.classlist.html
+++ b/templates/classic/html/home.classlist.html
@@ -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">
 
diff --git a/templates/classic/html/issue.index.html b/templates/classic/html/issue.index.html
index df9f61f..586ea72 100644
--- a/templates/classic/html/issue.index.html
+++ b/templates/classic/html/issue.index.html
@@ -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">
@@ -81,7 +79,7 @@ You are not allowed to view this page.
  </tr>
 </table>
 
-<form method="GET" tal:attributes="action request/classname">
+<form method="GET" id="index-controls" tal:attributes="action request/classname">
  
  <table class="form">
   <tr tal:condition="batch">
diff --git a/templates/classic/html/issue.item.html b/templates/classic/html/issue.item.html
index c7f8b64..2c516b4 100644
--- a/templates/classic/html/issue.item.html
+++ b/templates/classic/html/issue.item.html
@@ -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">
 
diff --git a/templates/classic/html/issue.search.html b/templates/classic/html/issue.search.html
index 91f738b..102d721 100644
--- a/templates/classic/html/issue.search.html
+++ b/templates/classic/html/issue.search.html
@@ -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">
diff --git a/templates/classic/html/keyword.item.html b/templates/classic/html/keyword.item.html
index a73c9d2..b15b6cd 100644
--- a/templates/classic/html/keyword.item.html
+++ b/templates/classic/html/keyword.item.html
@@ -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"
diff --git a/templates/classic/html/msg.index.html b/templates/classic/html/msg.index.html
index 666344b..526e569 100644
--- a/templates/classic/html/msg.index.html
+++ b/templates/classic/html/msg.index.html
@@ -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>
diff --git a/templates/classic/html/msg.item.html b/templates/classic/html/msg.item.html
index 4242aae..90f63df 100644
--- a/templates/classic/html/msg.item.html
+++ b/templates/classic/html/msg.item.html
@@ -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">
 
diff --git a/templates/classic/html/page.html b/templates/classic/html/page.html
index 7c467c8..0ed200c 100644
--- a/templates/classic/html/page.html
+++ b/templates/classic/html/page.html
@@ -18,7 +18,9 @@
 
 <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>
diff --git a/templates/classic/html/user.forgotten.html b/templates/classic/html/user.forgotten.html
index aa6b184..121fcc5 100644
--- a/templates/classic/html/user.forgotten.html
+++ b/templates/classic/html/user.forgotten.html
@@ -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 
diff --git a/templates/classic/html/user.index.html b/templates/classic/html/user.index.html
index d9d3c80..b1011bd 100644
--- a/templates/classic/html/user.index.html
+++ b/templates/classic/html/user.index.html
@@ -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">
diff --git a/templates/classic/html/user.item.html b/templates/classic/html/user.item.html
index e0cb51a..2410b2c 100644
--- a/templates/classic/html/user.item.html
+++ b/templates/classic/html/user.item.html
@@ -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())">
diff --git a/templates/classic/html/user.register.html b/templates/classic/html/user.register.html
index 7340887..deda319 100644
--- a/templates/classic/html/user.register.html
+++ b/templates/classic/html/user.register.html
@@ -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
diff --git a/templates/classic/html/user.rego_progress.html b/templates/classic/html/user.rego_progress.html
index 9df2de0..53ea880 100644
--- a/templates/classic/html/user.rego_progress.html
+++ b/templates/classic/html/user.rego_progress.html
@@ -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
diff --git a/templates/minimal/html/_generic.index.html b/templates/minimal/html/_generic.index.html
index ac4f069..e2ddefa 100644
--- a/templates/minimal/html/_generic.index.html
+++ b/templates/minimal/html/_generic.index.html
@@ -3,9 +3,9 @@
 <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())">
diff --git a/templates/minimal/html/_generic.item.html b/templates/minimal/html/_generic.item.html
index 0090c62..8ca8796 100644
--- a/templates/minimal/html/_generic.item.html
+++ b/templates/minimal/html/_generic.item.html
@@ -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())">
diff --git a/templates/minimal/html/home.classlist.html b/templates/minimal/html/home.classlist.html
index 0b5a244..637f353 100644
--- a/templates/minimal/html/home.classlist.html
+++ b/templates/minimal/html/home.classlist.html
@@ -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">
 
diff --git a/templates/minimal/html/home.html b/templates/minimal/html/home.html
index acf6023..9a28ee6 100644
--- a/templates/minimal/html/home.html
+++ b/templates/minimal/html/home.html
@@ -1,8 +1,6 @@
 <tal:block metal:use-macro="templates/page/macros/icing">
 <title metal:fill-slot="head_title">Tracker home</title>
-<td class="page-header-top" metal:fill-slot="body_title">
- <h2>Tracker home</h2>
-</td>
+<span metal:fill-slot="body_title" tal:omit-tag="python:1">Tracker home</span>
 <td class="content" metal:fill-slot="content">
 
 <!--
diff --git a/templates/minimal/html/page.html b/templates/minimal/html/page.html
index b563d76..6afd46f 100644
--- a/templates/minimal/html/page.html
+++ b/templates/minimal/html/page.html
@@ -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>
diff --git a/templates/minimal/html/user.index.html b/templates/minimal/html/user.index.html
index 30312c2..100c4a9 100644
--- a/templates/minimal/html/user.index.html
+++ b/templates/minimal/html/user.index.html
@@ -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">
diff --git a/templates/minimal/html/user.item.html b/templates/minimal/html/user.item.html
index 41b1a02..2592471 100644
--- a/templates/minimal/html/user.item.html
+++ b/templates/minimal/html/user.item.html
@@ -1,9 +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">User editing</title>
-<td class="page-header-top" metal:fill-slot="body_title">
- <h2>User editing</h2>
-</td>
+<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>
+</span>
 <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.
diff --git a/templates/minimal/html/user.register.html b/templates/minimal/html/user.register.html
index a226413..7e66ccc 100644
--- a/templates/minimal/html/user.register.html
+++ b/templates/minimal/html/user.register.html
@@ -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
-- 
2.30.2