diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml index fb3cd5ce4103967c999e3db485fa3f06990e247f..e0d3c289c07f1f7263cd74b23d21fbc82aee9ab8 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml @@ -106,9 +106,8 @@ def getActionTitleForContext(context, portal_type):\n return edit_title\n \n # Append a button to edit the current document\n -if not request.form.get(\'editable_mode\', 0):\n +if not bool(request.get(\'editable_mode\', 0)):\n # The title is called Edit only if the document can be edited\n -\n if portal_type == \'Web Section\' and context.getDefaultDocumentValue() is not None:\n # try to show link to default page\n default_document = context.getDefaultDocumentValue()\n @@ -129,7 +128,6 @@ if not request.form.get(\'editable_mode\', 0):\n icon = context.getIcon() or \'file_icon.gif\',\n title = edit_title,\n label = "%s Icon" % portal_type,))\n -\n else: \n result.append(dict(\n url = "%s/view?editable_mode:int=0&%s" % (absolute_url, http_parameters),\n @@ -235,6 +233,7 @@ return result\n <string>getattr</string> <string>editable_absolute_url</string> <string>getActionTitleForContext</string> + <string>bool</string> <string>None</string> <string>default_document</string> <string>edit_title</string> 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 d5c99a1c810780d495a8de7d6c1dee58d5e7c394..5ca749eceefc54f9dc25b94ea564ad4c41f13b00 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 @@ -66,7 +66,10 @@ actions request/actions | python:\n here.Base_filterDuplicateActions(\n here.portal_actions.listFilteredActionsFor(here));\n - dummy python:request.set(\'actions\', actions);">\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 \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 @@ -107,64 +110,83 @@ Behaviour should be to create content in section / site\n -->\n <div name="adminSection" class="adminSection"\n - tal:condition="here/isDocument | python: (portal_type in [\'Web Site\', \'Web Section\']\n - and here.getDefaultWebPageValue() is not None)">\n -\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 <h3>\n <span id="create_new_document_title"></span>\n - <span id="clone_document_title"><tal:block tal:replace="python: \'Clone %s %s\' % ((portal_type in [\'Web Site\', \'Web Section\'] and \'Default\') or \'Current\', portal_type)"/></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 + </span>\n </h3>\n \n <fieldset style="display:block;">\n - <!--legend class="group_title">left</legend-->\n \n - <div class="field">\n - <label>Title</label>\n - <div class="input"><input class="input" size="12" type="text" name="clone_title"\n - tal:attributes="value here/getTitle | nothing"/></div>\n + <div class="field">\n + <label>Title</label>\n + <div class="input">\n + <input class="input" size="12" \n + type="text" name="clone_title"\n + tal:attributes="value document/getTitle | nothing"/>\n </div>\n + </div>\n \n - <div class="field">\n - <label>Reference</label>\n - <div class="input"><input class="input" size="12" type="text" name="clone_reference"\n - tal:attributes="value here/getReference | nothing"/></div>\n + <div class="field">\n + <label>Reference</label>\n + <div class="input">\n + <input class="input" size="12" \n + type="text" name="clone_reference"\n + tal:attributes="value document/getReference | nothing"/>\n </div>\n + </div>\n \n - <div class="field">\n - <label>Version</label>\n - <div class="input"><input class="input" size="5" type="text" name="clone_version"\n - tal:attributes="value here/getVersion | nothing"/></div>\n + <div class="field">\n + <label>Version</label>\n + <div class="input">\n + <input class="input" size="5" \n + type="text" name="clone_version"\n + tal:attributes="value document/getVersion | nothing"/>\n </div>\n + </div>\n \n - <div class="field">\n - <label>Language</label>\n - <div class="input"><input class="input" size="5" type="text" name="clone_language"\n - tal:attributes="value here/getLanguage | nothing"/></div>\n + <div class="field">\n + <label>Language</label>\n + <div class="input">\n + <input class="input" size="5" \n + type="text" name="clone_language"\n + tal:attributes="value document/getLanguage | nothing"/>\n </div>\n + </div>\n \n - <div class="field hiddenLabel">\n - <label>Type</label>\n - <div class="input">\n - <select class="input" name="clone_portal_type" size="1" onchange="setCreationMode(this)">\n - <option value="None" selected>— Same as Current —</option>\n - <tal:block tal:repeat="portal_type python: here.getPortalWebDocumentTypeList()">\n - <option tal:content="portal_type"\n - tal:attributes="value portal_type"/>\n - </tal:block>\n - </select>\n - </div>\n + <div class="field hiddenLabel">\n + <label>Type</label>\n + <div class="input">\n + <select class="input" name="clone_portal_type" \n + size="1" onchange="setCreationMode(this)">\n + <option value="None" selected>— Same as Current —</option>\n + <tal:block tal:repeat="portal_type python: here.getPortalWebDocumentTypeList()">\n + <option tal:content="portal_type"\n + tal:attributes="value portal_type"/>\n + </tal:block>\n + </select>\n </div>\n + </div>\n \n - <div class="field hiddenLabel">\n - <label> </label>\n - <div class="input">\n - <button alt=\'Clone & Edit\' id="clone_action_button" title=\'Clone & Edit\'\n - name="Base_cloneContent:method">\n - <img src="admin_toolbox_clone_document.png" id="clone_action_icon"/>\n - <span id="duplicate_document_action">Clone & Edit</span>\n - </button>\n - </div>\n + <div class="field hiddenLabel">\n + <label> </label>\n + <div class="input">\n + <button alt=\'Clone & Edit\' id="clone_action_button" \n + title=\'Clone & Edit\'\n + name="Base_cloneContent:method">\n + <img src="admin_toolbox_clone_document.png" id="clone_action_icon"/>\n + <span id="duplicate_document_action">Clone & Edit</span>\n + </button>\n </div>\n + </div>\n \n </fieldset>\n \n diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision index 38bfa57c0c565322877ca643e61ea7e8e2a64553..0bd049a9634083bb649713736462c9db8aeb8228 100644 --- a/bt5/erp5_web/bt/revision +++ b/bt5/erp5_web/bt/revision @@ -1 +1 @@ -681 \ No newline at end of file +682 \ No newline at end of file