Commit af173a47 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

fix calculation of path_user for better support of virtual host.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31232 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent f6d1a003
...@@ -50,10 +50,7 @@ ...@@ -50,10 +50,7 @@
portal_url python: site_root.absolute_url();\n portal_url python: site_root.absolute_url();\n
server_url request/BASE0;\n server_url request/BASE0;\n
portal_path python: portal_url.replace(server_url, \'\') + \'/\';\n portal_path python: portal_url.replace(server_url, \'\') + \'/\';\n
isInFactory python: test(\'/portal_factory\'in request.URLPATH0, 1, 0);\n path_user here/getRelativeUrl;\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
cols cols | python: 40;\n cols cols | python: 40;\n
rows rows | python: 18;\n rows rows | python: 18;\n
editor_width width | python: int(cols * 19.5);\n editor_width width | python: int(cols * 19.5);\n
...@@ -68,7 +65,7 @@ ...@@ -68,7 +65,7 @@
<script type="text/javascript" tal:content="structure string:\n <script type="text/javascript" tal:content="structure string:\n
&lt;!--\n &lt;!--\n
var oFCKeditor = new FCKeditor(\'${inputname}\');\n var oFCKeditor = new FCKeditor(\'${inputname}\');\n
var pathUser = \'${path_user}/\';\n var pathUser = \'/${path_user}/\';\n
oFCKeditor.BasePath = \'${portal_url}/\';\n oFCKeditor.BasePath = \'${portal_url}/\';\n
oFCKeditor.Value = \'${cleaninput}\';\n oFCKeditor.Value = \'${cleaninput}\';\n
\n \n
......
852 853
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment