[Erp5-report] r9752 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplate...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Sep  7 20:03:01 2006
New Revision: 9752

URL: http://svn.erp5.org?rev=9752&view=rev
Log:
fix <title>s


Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_view.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/index_html.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.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/form_view.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_view.xml?rev=9752&r1=9751&r2=9752&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_view.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_view.xml Thu Sep  7 20:03:01 2006
@@ -73,9 +73,11 @@
 -->\n
 </tal:block>\n
 <tal:block metal:define-macro="master">\n
-  <tal:block metal:use-macro="here/view_main/macros/master">\n
-    <tal:block metal:fill-slot="main">\n
-      <tal:block metal:use-macro="here/form_render/macros/master" />\n
+ <tal:block tal:define="title string:${template/title_or_id} - ${here/Title}">\n
+   <tal:block metal:use-macro="here/view_main/macros/master">\n
+     <tal:block metal:fill-slot="main">\n
+        <tal:block metal:use-macro="here/form_render/macros/master" />\n
+      </tal:block>\n
     </tal:block>\n
   </tal:block>\n
 </tal:block>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/index_html.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/index_html.xml?rev=9752&r1=9751&r2=9752&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/index_html.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/index_html.xml Thu Sep  7 20:03:01 2006
@@ -72,6 +72,7 @@
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
 -->\n
 </tal:block>\n
+<tal:block tal:define="title here/Title">\n
 <tal:block metal:use-macro="here/main_template/macros/master">\n
   <tal:block metal:fill-slot="main">\n
     <tal:block tal:condition="here/portal_membership/isAnonymousUser">\n
@@ -98,6 +99,7 @@
       </table>\n
     </div>\n
   </tal:block>\n
+</tal:block>\n
 </tal:block>
 
 ]]></string> </value>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml?rev=9752&r1=9751&r2=9752&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml Thu Sep  7 20:03:01 2006
@@ -88,7 +88,7 @@
     <base tal:attributes="href python: \'%s/\' % (url, )"/>\n
     <meta name="generator" content="ERP5"/>\n
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>\n
-    <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui"></title>\n
+    <title tal:content="title | template/title_or_id" i18n:translate="" i18n:domain="ui"></title>\n
     <tal:block tal:repeat="css css_list">\n
       <link tal:attributes="href css" type="text/css" rel="stylesheet"/>\n
     </tal:block>\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=9752&r1=9751&r2=9752&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 Thu Sep  7 20:03:01 2006
@@ -1,3 +1,6 @@
+2006-09-07 jerome
+* fix <title>s
+
 2006-09-07 Kevin
 * Render field CSS classes on the div.field instead on the label for better styling.
 * Fix JP "missing" statement.

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=9752&r1=9751&r2=9752&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision Thu Sep  7 20:03:01 2006
@@ -1,1 +1,1 @@
-166
+167