[Erp5-report] r21623 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplat...

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Jun 16 16:28:27 2008
New Revision: 21623

URL: http://svn.erp5.org?rev=21623&view=rev
Log:
2008-06-16 jerome
* use getTitle to show title of current document in <title> in view mode.

title_or_id was used, but it was not following the same semantics as getTitle now uses.
Now that getTitle always returns something, we can use getTitle directly.
Note that this is temporary, the plan is to use getTranslatedTitle in view, list and dialog mode and configure correctly on each portal type how translation of title property should behave.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/view_main.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/view_main.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/view_main.xml?rev=21623&r1=21622&r2=21623&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/view_main.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/view_main.xml Mon Jun 16 16:28:27 2008
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -67,7 +64,7 @@
               form_action          python: form and form.action not in (\'\', None) and portal.portal_membership.checkPermission(\'Modify portal content\', here) and form.action or nothing;\n
               local_parameter_list local_parameter_list | python: {};\n
               dummy                python: local_parameter_list.update({\'object_uid\': object_uid, \'object_path\': object_path, \'form_id\': form_id});\n
-              title                python: \'%s - %s\' % (portal.Base_translateString(template.title_or_id()), here.title_or_id());\n
+              title                python: \'%s - %s\' % (portal.Base_translateString(template.title_or_id()), here.getTitle());\n
               ">\n
       <tal:block metal:use-macro="here/main_template/macros/master">\n
         <tal:block metal:fill-slot="context_bar">\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log?rev=21623&r1=21622&r2=21623&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log Mon Jun 16 16:28:27 2008
@@ -1,3 +1,6 @@
+2008-06-16 jerome
+* use getTitle to show title of current document in <title> in view mode.
+
 2008-06-12 ivan
 * Catch pressed Enter key and submit form for top,right fulltext search input field
 

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=21623&r1=21622&r2=21623&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision Mon Jun 16 16:28:27 2008
@@ -1,1 +1,1 @@
-554
+556