[Zope-Checkins] SVN: Zope/trunk/ partial fix for #729

[Christian Theune]

Log message for revision 26858:
   partial fix for #729
  


Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/App/dtml/manage_page_header.dtml


-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2004-07-30 18:26:09 UTC (rev 26857)
+++ Zope/trunk/doc/CHANGES.txt	2004-07-30 18:54:48 UTC (rev 26858)
@@ -139,6 +139,10 @@
 
     Bugs fixed
 
+     - Collector #729: manage_main doesn't display the correct page title
+       most of the time. It is not completely fixed but using title_or_id
+       makes folders display the correct id as a fallback.
+
      - Collector #1370: Fixed html generated by Z Search interface.
 
      - Collector #1295: Fixed minor niglet with the Elvis tutorial.

Modified: Zope/trunk/lib/python/App/dtml/manage_page_header.dtml
===================================================================
--- Zope/trunk/lib/python/App/dtml/manage_page_header.dtml	2004-07-30 18:26:09 UTC (rev 26857)
+++ Zope/trunk/lib/python/App/dtml/manage_page_header.dtml	2004-07-30 18:54:48 UTC (rev 26858)
@@ -6,7 +6,7 @@
 </dtml-unless>
 <meta http-equiv="content-type" content="text/html;charset=&dtml-management_page_charset;" />
 <dtml-call "RESPONSE.setHeader('content-type','text/html;charset='+management_page_charset)">
-<title><dtml-if title>&dtml-title;</dtml-if></title>
+<title><dtml-if title_or_id><dtml-var title_or_id><dtml-else>Zope</dtml-if></title>
 <dtml-let ag="REQUEST.get('HTTP_USER_AGENT', '')"
      is_nav4="ag[:9] == 'Mozilla/4' and _.string.find(ag, 'MSIE') < 0"
      use_css="REQUEST.get('zmi_use_css', '1')"