[Erp5-report] r29151 - in /erp5/trunk: bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Sep 23 14:54:46 CEST 2009
Author: kazuhiko
Date: Wed Sep 23 14:54:42 2009
New Revision: 29151
URL: http://svn.erp5.org?rev=29151&view=rev
Log:
* merge erp5_dms's fckeditor_wysiwyg_support into erp5_xhtml_style's one.
* disable upload feature, that should be implemented through portal_contributions.
Removed:
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/fckeditor_wysiwyg_support.xml
Modified:
erp5/trunk/bt5/erp5_dms/bt/revision
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
Removed: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/fckeditor_wysiwyg_support.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/fckeditor_wysiwyg_support.xml?rev=29150&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/fckeditor_wysiwyg_support.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/fckeditor_wysiwyg_support.xml (removed)
@@ -1,135 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>name_subpath</string> </key>
- <value> <string>traverse_subpath</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_text</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<tal:block tal:define="baseHrefUrl here/absolute_url;\n
- cleaninput python: inputvalue;\n
- cleaninput python: cleaninput.replace(\'\\x27\',\'\\x5C\\x27\');\n
- cleaninput python: cleaninput.replace(\'\\r\',\'\\x5C\\x72\');\n
- cleaninput python: cleaninput.replace(\'\\n\',\'\\x5C\\x6E\');\n
- cleaninput python: cleaninput.replace(\'\\xE2\\x80\\xA8\',\'\\\\u2028\');\n
- cleaninput python: cleaninput.replace(\'\\xE2\\x80\\xA9\',\'\\\\u2029\');\n
- site_root python: here.getWebSiteValue() or here.getPortalObject();\n
- 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
- cols cols | python: 40;\n
- rows rows | python: 18;\n
- editor_width width | python: int(cols * 19.5);\n
- editor_height height | python: int(rows * 24);\n
- editor_width python: str(editor_width).replace(\'px\',\'\');\n
- editor_height python: str(editor_height).replace(\'px\',\'\');\n
- editor_width python: test(\'\\x25\' in editor_width, str(int(int(editor_width.replace(\'\\x25\',\'\'))*780/100)), editor_width);\n
- editor_height python: test(\'\\x25\' in editor_height, str(int(int(editor_height.replace(\'\\x25\',\'\'))*780/100)), editor_height);">\n
- <script type="text/javascript" tal:attributes="src string:${portal_url}/fckeditor.js"></script>\n
- <script type="text/javascript" tal:content="structure string:\n
-<!--\n
-var oFCKeditor = new FCKeditor(\'${inputname}\');\n
-var pathUser = \'${path_user}/\';\n
-oFCKeditor.BasePath = \'${portal_url}/\';\n
-oFCKeditor.Value = \'${cleaninput}\';\n
-\n
-// set the base url for relative paths\n
-oFCKeditor.Config[\'BaseHref\'] = \'${baseHrefUrl}/\';\n
-\n
-// set the css for editor area\n
-oFCKeditor.Config[\'EditorAreaCSS\'] = \'${portal_path}erp5_editor.css\';\n
-\n
-// editor appearance\n
-oFCKeditor.ToolbarSet = \'ERP5WebZopeCmf\';\n
-oFCKeditor.Width = \'100%\';\n
-oFCKeditor.Height = ${editor_height};\n
-\n
-// enable Firefox\'s own spell checker\n
-oFCKeditor.Config[\'FirefoxSpellChecker\']\t= true ;\n
-\n
-// browsing for links\n
-oFCKeditor.Config[\'LinkBrowserURL\'] = \'${portal_path}FCKeditor_viewDocumentSelectionDialog\';\n
-\n
-// rapid upload activation for links\n
-//oFCKeditor.Config[\'LinkUpload\'] = false ;\n
-//oFCKeditor.Config[\'LinkUploadURL\'] = \'${portal_path}editor/filemanager/upload/zope/uploadPlone?CurrentPath=\' + pathUser ;\n
-//oFCKeditor.Config[\'LinkUploadURL\'] = \'${portal_url}/\' + pathUser ;\n
-\n
-// browsing for images\n
-oFCKeditor.Config[\'ImageBrowserURL\'] = \'${portal_path}FCKeditor_viewImageSelectionDialog\';\n
-\n
-// rapid upload activation for images\n
-//oFCKeditor.Config[\'ImageUpload\'] = false ;\n
-//oFCKeditor.Config[\'ImageUploadURL\'] = \'${portal_path}editor/filemanager/upload/zope/uploadPlone?CurrentPath=\' + pathUser ;\n
-\n
-// browsing for flash\n
-//oFCKeditor.Config[\'FlashBrowserURL\'] = \'${portal_path}editor/filemanager/browser/zope/browser.html?Type=Flash&Connector=connectors/connectorPlone&ServerPath=/&CurrentPath=\' + pathUser ;\n
-\n
-// rapid upload activation for flash\n
-//oFCKeditor.Config[\'FlashUpload\'] = true ;\n
-//oFCKeditor.Config[\'FlashUploadURL\'] = \'${portal_path}editor/filemanager/upload/zope/uploadPlone?CurrentPath=\' + pathUser ;\n
-\n
-oFCKeditor.Create();\n
--->"></script>\n
-</tal:block>\n
-
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>content_type</string> </key>
- <value> <string>text/html</string> </value>
- </item>
- <item>
- <key> <string>expand</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>fckeditor_wysiwyg_support</string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>XXX contain hard-coded variables</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=29151&r1=29150&r2=29151&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision [utf8] Wed Sep 23 14:54:42 2009
@@ -1,1 +1,1 @@
-1028
+1029
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=29151&r1=29150&r2=29151&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] Wed Sep 23 14:54:42 2009
@@ -61,7 +61,9 @@
editor_width python: str(editor_width).replace(\'px\',\'\');\n
editor_height python: str(editor_height).replace(\'px\',\'\');\n
editor_width python: test(\'\\x25\' in editor_width, str(int(int(editor_width.replace(\'\\x25\',\'\'))*780/100)), editor_width);\n
- editor_height python: test(\'\\x25\' in editor_height, str(int(int(editor_height.replace(\'\\x25\',\'\'))*780/100)), editor_height);">\n
+ editor_height python: test(\'\\x25\' in editor_height, str(int(int(editor_height.replace(\'\\x25\',\'\'))*780/100)), editor_height);\n
+ link_browser python:site_root.restrictedTraverse(\'FCKeditor_viewDocumentSelectionDialog\', None) is not None and \'true\' or \'false\';\n
+ image_browser link_browser;">\n
<script type="text/javascript" tal:attributes="src string:${portal_url}/fckeditor.js"></script>\n
<script type="text/javascript" tal:content="structure string:\n
<!--\n
@@ -85,31 +87,22 @@
oFCKeditor.Config[\'FirefoxSpellChecker\']\t= true ;\n
\n
// browsing for links\n
-oFCKeditor.Config[\'LinkBrowserURL\'] = \'${portal_path}editor/filemanager/browser/zope/browser.html?Connector=connectors/connectorERP5&ServerPath=/&CurrentPath=\' + pathUser ;\n
+oFCKeditor.Config[\'LinkBrowser\'] = ${link_browser};\n
+oFCKeditor.Config[\'LinkBrowserURL\'] = \'${portal_path}FCKeditor_viewDocumentSelectionDialog\';\n
\n
// rapid upload activation for links\n
-//oFCKeditor.Config[\'LinkUpload\'] = true ;\n
-//oFCKeditor.Config[\'LinkUploadURL\'] = \'${portal_path}editor/filemanager/upload/zope/uploadPlone?CurrentPath=\' + pathUser ;\n
-//oFCKeditor.Config[\'LinkUploadURL\'] = \'${portal_url}/\' + pathUser ;\n
+oFCKeditor.Config[\'LinkUpload\'] = false ; // XXX should be implemented using portal_contributions\n
\n
// browsing for images\n
-oFCKeditor.Config[\'ImageBrowserURL\'] = \'${portal_path}editor/filemanager/browser/zope/browser.html?Type=Image&Connector=connectors/connectorERP5&ServerPath=/&CurrentPath=\' + pathUser ;\n
+oFCKeditor.Config[\'ImageBrowser\'] = ${image_browser};\n
+oFCKeditor.Config[\'ImageBrowserURL\'] = \'${portal_path}FCKeditor_viewImageSelectionDialog\';\n
\n
// rapid upload activation for images\n
-//oFCKeditor.Config[\'ImageUpload\'] = true ;\n
-//oFCKeditor.Config[\'ImageUploadURL\'] = \'${portal_path}editor/filemanager/upload/zope/uploadPlone?CurrentPath=\' + pathUser ;\n
-\n
-// browsing for flash\n
-//oFCKeditor.Config[\'FlashBrowserURL\'] = \'${portal_path}editor/filemanager/browser/zope/browser.html?Type=Flash&Connector=connectors/connectorPlone&ServerPath=/&CurrentPath=\' + pathUser ;\n
-\n
-// rapid upload activation for flash\n
-//oFCKeditor.Config[\'FlashUpload\'] = true ;\n
-//oFCKeditor.Config[\'FlashUploadURL\'] = \'${portal_path}editor/filemanager/upload/zope/uploadPlone?CurrentPath=\' + pathUser ;\n
+oFCKeditor.Config[\'ImageUpload\'] = false ; // XXX should be implemented using portal_contributions\n
\n
oFCKeditor.Create();\n
-->"></script>\n
-</tal:block>\n
-
+</tal:block>
]]></string> </value>
</item>
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=29151&r1=29150&r2=29151&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] Wed Sep 23 14:54:42 2009
@@ -1,1 +1,1 @@
-832
+833
More information about the Erp5-report
mailing list