[Erp5-report] r31232 kazuhiko - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: Sk...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Dec 11 11:26:57 2009
New Revision: 31232

URL: http://svn.erp5.org?rev=31232&view=rev
Log:
fix calculation of path_user for better support of virtual host.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/fckeditor_wysiwyg_support.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/fckeditor_wysiwyg_support.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/fckeditor_wysiwyg_support.xml?rev=31232&r1=31231&r2=31232&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/fckeditor_wysiwyg_support.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/fckeditor_wysiwyg_support.xml [utf8] Fri Dec 11 11:26:57 2009
@@ -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
 &lt;!--\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

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=31232&r1=31231&r2=31232&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] Fri Dec 11 11:26:57 2009
@@ -1,1 +1,1 @@
-852
+853