diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/fckeditor_wysiwyg_support.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/fckeditor_wysiwyg_support.xml index 49a756169cfec8f9e69036739ba78368b2c7079d..54cd4e5cf30156f8f0ccd534123fdb98f24fae62 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/fckeditor_wysiwyg_support.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/fckeditor_wysiwyg_support.xml @@ -50,10 +50,7 @@ portal_url python: site_root.absolute_url();\n server_url request/BASE0;\n portal_path python: portal_url.replace(server_url, \'\') + \'/\';\n - isInFactory python: test(\'/portal_factory\'in request.URLPATH0, 1, 0);\n - isRegisteredFolder python: test(here.Title() and here.isPrincipiaFolderish, 1,0);\n - isRegisteredPA python: test(here.Title() and here.meta_type==\'PloneArticle\', 1,0);\n - path_user python: test(isInFactory or isRegisteredFolder or isRegisteredPA,request.URLPATH1,request.URLPATH2);\n + path_user here/getRelativeUrl;\n cols cols | python: 40;\n rows rows | python: 18;\n editor_width width | python: int(cols * 19.5);\n @@ -68,7 +65,7 @@ <script type="text/javascript" tal:content="structure string:\n <!--\n var oFCKeditor = new FCKeditor(\'${inputname}\');\n -var pathUser = \'${path_user}/\';\n +var pathUser = \'/${path_user}/\';\n oFCKeditor.BasePath = \'${portal_url}/\';\n oFCKeditor.Value = \'${cleaninput}\';\n \n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 2cda7945ff0a2e91f9c61f6c22529ba262a076e5..707e2574997140b593d917b65e5ec20e6e9dea01 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -852 \ No newline at end of file +853 \ No newline at end of file