From 343f128fd0f016cfa1e11c945f6acaee0ca46e4e Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Tue, 26 May 2009 21:43:43 +0000
Subject: [PATCH] cleanup toolbox. * for default_page case, 'here' should be a
document not a web section or a web site.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27204 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_web_widget_library/admin_toolbox.xml | 22 ++++++-------------
bt5/erp5_web/bt/revision | 2 +-
2 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml
index 9ecfb2e813..fc032f48ff 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml
@@ -51,14 +51,11 @@
\n
<tal:block\n
tal:define="is_web_mode python: True;\n
- portal_type python: here.getPortalType();\n
actions request/actions | python:\n
here.Base_filterDuplicateActions(\n
here.portal_actions.listFilteredActionsFor(here));\n
dummy python:request.set(\'actions\', actions);\n
- is_default_document_available \n
- python: getattr(here,\'getDefaultDocumentValue\', None) is not None and\n
- here.getDefaultDocumentValue() is not None;">\n
+ portal_type here/getPortalType">\n
\n
<!-- XXX is this really useful - called how many times ?? - tried to removed but failed -->\n
<!-- <tal:block metal:use-macro="here/global_definitions/macros/header_definitions"/> -->\n
@@ -102,17 +99,12 @@
Behaviour should be to create content in section / site\n
-->\n
<div class="adminSection"\n
- tal:condition="python: is_default_document_available or here.isDocument"\n
- tal:define="document python: test(is_default_document_available, \n
- here.getDefaultDocumentValue(), \n
- here);\n
- portal_type document/getPortalType;">\n
+ tal:condition="python: here.isDocument">\n
<h3>\n
<span id="create_new_document_title"></span>\n
<span id="clone_document_title">\n
<tal:block \n
- tal:replace="python: \'Clone %s %s\' % \n
- ((portal_type in [\'Web Site\', \'Web Section\'] and \'Default\') or \'Current\', portal_type)"/>\n
+ tal:replace="python: \'Clone %s\' % portal_type"/>\n
</span>\n
</h3>\n
\n
@@ -123,7 +115,7 @@
<div class="input">\n
<input class="input" size="12" \n
type="text" name="clone_title"\n
- tal:attributes="value document/getTitle | nothing"/>\n
+ tal:attributes="value here/getTitle | nothing"/>\n
</div>\n
</div>\n
\n
@@ -132,7 +124,7 @@
<div class="input">\n
<input class="input" size="12" \n
type="text" name="clone_reference"\n
- tal:attributes="value document/getReference | nothing"/>\n
+ tal:attributes="value here/getReference | nothing"/>\n
</div>\n
</div>\n
\n
@@ -141,7 +133,7 @@
<div class="input">\n
<input class="input" size="5" \n
type="text" name="clone_version"\n
- tal:attributes="value document/getVersion | nothing"/>\n
+ tal:attributes="value here/getVersion | nothing"/>\n
</div>\n
</div>\n
\n
@@ -150,7 +142,7 @@
<div class="input">\n
<input class="input" size="5" \n
type="text" name="clone_language"\n
- tal:attributes="value document/getLanguage | nothing"/>\n
+ tal:attributes="value here/getLanguage | nothing"/>\n
</div>\n
</div>\n
\n
diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision
index ff8ae77e43..f9b0327477 100644
--- a/bt5/erp5_web/bt/revision
+++ b/bt5/erp5_web/bt/revision
@@ -1 +1 @@
-814
\ No newline at end of file
+815
\ No newline at end of file
--
2.30.9