From 028b1e0858acc46a1e83f4f1653dd3c2f6a295c3 Mon Sep 17 00:00:00 2001 From: Rafael Monnerat <rafael@nexedi.com> Date: Tue, 28 Feb 2012 03:09:14 -0300 Subject: [PATCH] Use simple textarea instead text editor (xinha, fckeditor...) Xinha breaks slideshow edition. --- .../my_embedded_text_content.xml | 5 ++++ .../my_text_content.xml | 5 ++++ .../slide_editor.xml | 5 ++++ .../TestPage_viewSlideCreator.xml | 24 +++++++++---------- .../TestPage_viewSlideEditor.xml | 24 +++++++++---------- .../your_slide_content.xml | 5 ++++ .../your_text_content.xml | 8 ++++++- 7 files changed, 51 insertions(+), 25 deletions(-) diff --git a/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/Base_viewTestPageFieldLibrary/my_embedded_text_content.xml b/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/Base_viewTestPageFieldLibrary/my_embedded_text_content.xml index d0a1f01ac2..96df3ea3fc 100644 --- a/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/Base_viewTestPageFieldLibrary/my_embedded_text_content.xml +++ b/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/Base_viewTestPageFieldLibrary/my_embedded_text_content.xml @@ -14,6 +14,7 @@ <string>description</string> <string>editable</string> <string>height</string> + <string>text_editor</string> <string>title</string> <string>width</string> </list> @@ -120,6 +121,10 @@ Text (<details> tags will be automatically added at the beginning and at the end <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> </item> + <item> + <key> <string>text_editor</string> </key> + <value> <string>text_area</string> </value> + </item> <item> <key> <string>title</string> </key> <value> <string>Text</string> </value> diff --git a/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewEditSlideShow/my_text_content.xml b/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewEditSlideShow/my_text_content.xml index fae9cb7226..8c62d2090c 100644 --- a/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewEditSlideShow/my_text_content.xml +++ b/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewEditSlideShow/my_text_content.xml @@ -14,6 +14,7 @@ <string>description</string> <string>editable</string> <string>height</string> + <string>text_editor</string> <string>title</string> <string>unicode</string> </list> @@ -120,6 +121,10 @@ <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> </item> + <item> + <key> <string>text_editor</string> </key> + <value> <string>text_area</string> </value> + </item> <item> <key> <string>title</string> </key> <value> <string>Page Content</string> </value> diff --git a/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewEditSlideShow/slide_editor.xml b/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewEditSlideShow/slide_editor.xml index 91775f57fa..152dc5bca7 100644 --- a/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewEditSlideShow/slide_editor.xml +++ b/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewEditSlideShow/slide_editor.xml @@ -13,6 +13,7 @@ <string>css_class</string> <string>default</string> <string>enabled</string> + <string>text_editor</string> <string>title</string> <string>whitespace_preserve</string> <string>width</string> @@ -128,6 +129,10 @@ <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> </item> + <item> + <key> <string>text_editor</string> </key> + <value> <string>text_area</string> </value> + </item> <item> <key> <string>title</string> </key> <value> <string>Page Content</string> </value> diff --git a/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewSlideCreator.xml b/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewSlideCreator.xml index 65db32f9e9..750ebcfa6e 100644 --- a/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewSlideCreator.xml +++ b/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewSlideCreator.xml @@ -79,18 +79,6 @@ </item> <item> <key> <string>center</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>left</string> </key> <value> <list> <string>your_chapter_title</string> @@ -106,6 +94,18 @@ </list> </value> </item> + <item> + <key> <string>hidden</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>left</string> </key> + <value> + <list/> + </value> + </item> <item> <key> <string>right</string> </key> <value> diff --git a/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewSlideEditor.xml b/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewSlideEditor.xml index 79fe819890..ea08ee850c 100644 --- a/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewSlideEditor.xml +++ b/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewSlideEditor.xml @@ -79,18 +79,6 @@ </item> <item> <key> <string>center</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>left</string> </key> <value> <list> <string>your_chapter_title</string> @@ -108,6 +96,18 @@ </list> </value> </item> + <item> + <key> <string>hidden</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>left</string> </key> + <value> + <list/> + </value> + </item> <item> <key> <string>right</string> </key> <value> diff --git a/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewSlideEditor/your_slide_content.xml b/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewSlideEditor/your_slide_content.xml index 8cba010395..aaf9f8031e 100644 --- a/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewSlideEditor/your_slide_content.xml +++ b/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewSlideEditor/your_slide_content.xml @@ -11,6 +11,7 @@ <value> <list> <string>description</string> + <string>text_editor</string> <string>title</string> </list> </value> @@ -96,6 +97,10 @@ <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> </item> + <item> + <key> <string>text_editor</string> </key> + <value> <string>text_area</string> </value> + </item> <item> <key> <string>title</string> </key> <value> <string>Slide text</string> </value> diff --git a/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewSlideEditor/your_text_content.xml b/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewSlideEditor/your_text_content.xml index ddc8581829..3572e835bb 100644 --- a/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewSlideEditor/your_text_content.xml +++ b/bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewSlideEditor/your_text_content.xml @@ -9,7 +9,9 @@ <item> <key> <string>delegated_list</string> </key> <value> - <list/> + <list> + <string>text_editor</string> + </list> </value> </item> <item> @@ -81,6 +83,10 @@ <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> </item> + <item> + <key> <string>text_editor</string> </key> + <value> <string>text_area</string> </value> + </item> </dictionary> </value> </item> -- 2.30.9