diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Drawing/html_view.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Drawing/html_view.xml index bdc327ac2091902582fd917a5fe69a6805547aa3..1eb4fa65a5a61bb3fc1c3646accdf037be118c62 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Drawing/html_view.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Drawing/html_view.xml @@ -69,7 +69,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${object_url}/Drawing_viewAsWeb</string> </value> + <value> <string>string:${object_url}/OOoDocument_viewAsWeb</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Drawing/web_view.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Drawing/web_view.xml index 213e16cae7ae3460247d9526f6757f1b4e4dede1..a9b66edc09acba0aa00e586c51e3ce181f23e45c 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Drawing/web_view.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Drawing/web_view.xml @@ -71,7 +71,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${object_url}/Drawing_viewAsWeb</string> </value> + <value> <string>string:${object_url}/OOoDocument_viewAsWeb</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/html_view.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/html_view.xml index bdc327ac2091902582fd917a5fe69a6805547aa3..1eb4fa65a5a61bb3fc1c3646accdf037be118c62 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/html_view.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/html_view.xml @@ -69,7 +69,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${object_url}/Drawing_viewAsWeb</string> </value> + <value> <string>string:${object_url}/OOoDocument_viewAsWeb</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Drawing_viewAsWeb.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Drawing_viewAsWeb.xml deleted file mode 100644 index 32c5de5bbe312647d54567238f421a0b68884835..0000000000000000000000000000000000000000 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Drawing_viewAsWeb.xml +++ /dev/null @@ -1,134 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="ERP5Form" module="Products.ERP5Form.Form"/> - <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/> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_objects</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>action</string> </key> - <value> <string>Base_edit</string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>encoding</string> </key> - <value> <string>UTF-8</string> </value> - </item> - <item> - <key> <string>enctype</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>group_list</string> </key> - <value> - <list> - <string>webcontent header bottom</string> - <string>bottom</string> - <string>not_assigned</string> - </list> - </value> - </item> - <item> - <key> <string>groups</string> </key> - <value> - <dictionary> - <item> - <key> <string>bottom</string> </key> - <value> - <list> - <string>your_drawing_preview</string> - <string>your_download_pdf</string> - </list> - </value> - </item> - <item> - <key> <string>not_assigned</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>webcontent header bottom</string> </key> - <value> - <list> - <string>my_title</string> - </list> - </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>Drawing_viewAsWeb</string> </value> - </item> - <item> - <key> <string>method</string> </key> - <value> <string>POST</string> </value> - </item> - <item> - <key> <string>name</string> </key> - <value> <string>WebPage_view</string> </value> - </item> - <item> - <key> <string>pt</string> </key> - <value> <string>form_view</string> </value> - </item> - <item> - <key> <string>row_length</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>stored_encoding</string> </key> - <value> <string>UTF-8</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Preview</string> </value> - </item> - <item> - <key> <string>unicode_mode</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>update_action</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Drawing_viewAsWeb/my_title.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Drawing_viewAsWeb/my_title.xml deleted file mode 100644 index d189870ddc8b1c4e0aff25485ee6dbd48a7f79b8..0000000000000000000000000000000000000000 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Drawing_viewAsWeb/my_title.xml +++ /dev/null @@ -1,112 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>delegated_list</string> </key> - <value> - <list> - <string>css_class</string> - <string>editable</string> - </list> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>my_title</string> </value> - </item> - <item> - <key> <string>message_values</string> </key> - <value> - <dictionary> - <item> - <key> <string>external_validator_failed</string> </key> - <value> <string>The input failed the external validator.</string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>overrides</string> </key> - <value> - <dictionary> - <item> - <key> <string>field_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>tales</string> </key> - <value> - <dictionary> - <item> - <key> <string>field_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>values</string> </key> - <value> - <dictionary> - <item> - <key> <string>css_class</string> </key> - <value> <string>headline</string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string>The title is display as main content title and page title.</string> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>field_id</string> </key> - <value> <string>my_title</string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string>Document_viewFieldLibrary</string> </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string>Click to edit the target</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Title</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Drawing_viewAsWeb/your_download_pdf.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Drawing_viewAsWeb/your_download_pdf.xml deleted file mode 100644 index 49a7af82dabb9f802e3f79961ee161f70390f481..0000000000000000000000000000000000000000 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Drawing_viewAsWeb/your_download_pdf.xml +++ /dev/null @@ -1,184 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="InputButtonField" module="Products.ERP5Form.InputButtonField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>id</string> </key> - <value> <string>your_download_pdf</string> </value> - </item> - <item> - <key> <string>message_values</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>overrides</string> </key> - <value> - <dictionary> - <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>css_class</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>enabled</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>extra</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>tales</string> </key> - <value> - <dictionary> - <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>css_class</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>enabled</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>extra</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>values</string> </key> - <value> - <dictionary> - <item> - <key> <string>alternate_name</string> </key> - <value> <string>Download as PDF</string> </value> - </item> - <item> - <key> <string>css_class</string> </key> - <value> <string>hidden_label right</string> </value> - </item> - <item> - <key> <string>default</string> </key> - <value> <string>Download as PDF</string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>enabled</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>extra</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>name</string> </key> - <value> <string>OOoDocument_downloadAsPDF:method</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Download as PDF</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python:1</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Drawing_viewAsWeb/your_drawing_preview.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Drawing_viewAsWeb/your_drawing_preview.xml deleted file mode 100644 index 3a3a06148c033e2acb69d6c0b5f701fb55b54fcd..0000000000000000000000000000000000000000 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Drawing_viewAsWeb/your_drawing_preview.xml +++ /dev/null @@ -1,320 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="ImageField" module="Products.ERP5Form.ImageField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>id</string> </key> - <value> <string>your_drawing_preview</string> </value> - </item> - <item> - <key> <string>message_values</string> </key> - <value> - <dictionary> - <item> - <key> <string>external_validator_failed</string> </key> - <value> <string>The input failed the external validator.</string> </value> - </item> - <item> - <key> <string>required_not_found</string> </key> - <value> <string>Input is required but no input given.</string> </value> - </item> - <item> - <key> <string>too_long</string> </key> - <value> <string>Too much input was given.</string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>overrides</string> </key> - <value> - <dictionary> - <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>css_class</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>display_maxwidth</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>display_width</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>enabled</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>external_validator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>extra</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>image_display</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>image_format</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>image_resolution</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>truncate</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>unicode</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>tales</string> </key> - <value> - <dictionary> - <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>css_class</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>display_maxwidth</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>display_width</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>enabled</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>external_validator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>extra</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>image_display</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>image_format</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>image_resolution</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>truncate</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>unicode</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>values</string> </key> - <value> - <dictionary> - <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>css_class</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>display_maxwidth</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>display_width</string> </key> - <value> <int>20</int> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>enabled</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>external_validator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>extra</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>image_display</string> </key> - <value> <string>medium</string> </value> - </item> - <item> - <key> <string>image_format</string> </key> - <value> <string>jpg</string> </value> - </item> - <item> - <key> <string>image_resolution</string> </key> - <value> <int>75</int> </value> - </item> - <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Preview</string> </value> - </item> - <item> - <key> <string>truncate</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>unicode</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>here/absolute_url</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_viewAsWeb/iframe_content.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_viewAsWeb/iframe_content.xml index 38a0b777a36e44e6dcfc8f20a0a3f3a92b04710a..c0adeb7ff26ac40415d6564a4b804d4d9c25579d 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_viewAsWeb/iframe_content.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_viewAsWeb/iframe_content.xml @@ -57,6 +57,14 @@ <key> <string>tales</string> </key> <value> <dictionary> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>enabled</string> </key> <value> @@ -123,7 +131,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/getUrlString</string> </value> + <value> <string>python:here.getPortalType() in (\'Drawing\', \'Presentation\')</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_viewAsWeb/text_content.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_viewAsWeb/text_content.xml index c228b8cf2b3313999eaf1bdf7258ceece2ab48e9..2096bb1b77e3ace37d96ec57d82a0582137ae221 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_viewAsWeb/text_content.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_viewAsWeb/text_content.xml @@ -185,7 +185,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>not:here/getUrlString</string> </value> + <value> <string>python:not here.getPortalType() in (\'Drawing\', \'Presentation\')</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/bt/change_log b/bt5/erp5_dms/bt/change_log index 853f59db000fec1a5ed9247313d99983f5116883..ff94145dbdfa4852c9bbecd6a2b4f2dceb040b1b 100644 --- a/bt5/erp5_dms/bt/change_log +++ b/bt5/erp5_dms/bt/change_log @@ -1,3 +1,7 @@ +2009-08-12 Kazuhiko +* use iframe_content in OOoDocument_viewAsWeb for Drawing and Presentation to have better paginations. +* use OOoDocument_viewAsWeb instead of Drawing_viewAsWeb in all preview for Drawing and Presentation. + 2009-07-07 nicolas * add dms_cache_factory to store conversion values in persisent storage like flare To enable it, please update your DMS Preference. diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision index 2478c955ec863d4fb3021c3163ecb196b4fe9b3b..f3d2a1110f10a6949c5e8077800417b2e55fa6d5 100644 --- a/bt5/erp5_dms/bt/revision +++ b/bt5/erp5_dms/bt/revision @@ -1 +1 @@ -1003 \ No newline at end of file +1004 \ No newline at end of file