From 49ae56372a77ef9f38c184771996d97e6b42e728 Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kevin@nexedi.com>
Date: Tue, 20 Jun 2006 16:36:00 +0000
Subject: [PATCH] Render strings from ERP5 as UTF-8. Get portal_url to create
 absolute URL. Simplify tal nesting.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8108 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_web/WebSite_globalDefinition.xml           | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_globalDefinition.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_globalDefinition.xml
index 0f0b2e79a3..92b17c6124 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_globalDefinition.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_globalDefinition.xml
@@ -55,12 +55,13 @@
             <value> <string encoding="cdata"><![CDATA[
 
 <tal:block metal:define-macro="global_definition">\n
-  <tal:block tal:define="document context/WebSite_getDocumentValue">\n
-    <tal:block tal:define="global object_actions python: None;\n
-                           global workflow_actions python: None;\n
-                           global jump_actions python: None;\n
-                           global view_actions python: None;\n
-    "/>\n
+  <tal:block tal:define="global portal_url       python:here.portal_url();\n
+                         document                context/WebSite_getDocumentValue;\n
+                         global object_actions   python: None;\n
+                         global workflow_actions python: None;\n
+                         global jump_actions     python: None;\n
+                         global view_actions     python: None;        \n
+                         dummy                   python: request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n
     <tal:block tal:condition="python: document is not None">\n
       <tal:block tal:define="filtered_actions python:document.portal_actions.listFilteredActionsFor(document);\n
                              object_actions filtered_actions/object_action | nothing;\n
-- 
2.30.9