From 8bf0df3950a173caab55bc93308f3758a77a27f2 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Mon, 26 Jun 2006 12:58:28 +0000 Subject: [PATCH] 2006-06-26 vincent * Remove Base_call[View|List]DialogMethod. Everything has been merged & cleaned in Base_callDialogMethod. * Update forms to comply with erp5_xhtml_style constraints. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8168 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_core/AlarmTool_viewAlarmList.xml | 6 +- .../portal_skins/erp5_core/Alarm_view.xml | 4 +- .../BaseWorkflow_viewWorkflowActionDialog.xml | 14 +- .../erp5_core/Base_FieldLibrary.xml | 4 +- .../erp5_core/Base_callDialogMethod.xml | 313 ++++++++++------- .../erp5_core/Base_callListDialogMethod.xml | 279 --------------- .../erp5_core/Base_callViewDialogMethod.xml | 332 ------------------ .../erp5_core/Base_exportCsvFileForm.xml | 11 +- .../erp5_core/Base_importCsvFileForm.xml | 11 +- .../Base_jumpToRelatedObjectList.xml | 6 +- .../erp5_core/Base_viewDocumentList.xml | 32 +- .../erp5_core/Base_viewMetadata.xml | 7 - .../erp5_core/Base_viewRelatedObjectList.xml | 6 +- .../erp5_core/Base_viewSearchResultList.xml | 6 +- .../erp5_core/Base_viewUIDialog.xml | 2 +- .../erp5_core/Base_viewWorkflowHistory.xml | 28 -- .../erp5_core/BusinessTemplate_view.xml | 42 +-- .../BusinessTemplate_viewCatalog.xml | 7 - .../erp5_core/BusinessTemplate_viewDetail.xml | 14 - ...usinessTemplate_viewInstallationDialog.xml | 25 +- .../BusinessTemplate_viewObjectsDiff.xml | 28 -- .../BusinessTemplate_viewPortalTypes.xml | 21 -- ...BusinessTemplate_viewUnitTestRunDialog.xml | 4 +- .../portal_skins/erp5_core/Career_view.xml | 33 +- .../CategoryTool_importCategoryFileForm.xml | 11 +- .../erp5_core/DeliveryBuilder_view.xml | 7 - ...DeliveryBuilder_viewPredicateGroupList.xml | 7 - .../erp5_core/DeliveryBuilder_viewProfile.xml | 21 -- .../portal_skins/erp5_core/Document_view.xml | 7 - .../erp5_core/Folder_viewContentList.xml | 23 +- .../erp5_core/Folder_viewDeleteDialog.xml | 27 +- .../erp5_core/Folder_viewObjectList.xml | 6 +- .../erp5_core/Folder_viewSearchDialog.xml | 2 +- .../erp5_core/Folder_viewSortOnDialog.xml | 2 +- .../Folder_viewWorkflowActionDialog.xml | 12 +- .../erp5_core/Folder_viewWorkflowReport.xml | 30 +- .../erp5_core/OrderBuilder_view.xml | 7 - .../erp5_core/OrderBuilder_viewProfile.xml | 28 -- .../erp5_core/Periodicity_view.xml | 11 +- .../portal_skins/erp5_core/Predicate_view.xml | 20 +- .../PreferenceTool_viewPreferenceList.xml | 25 +- .../erp5_core/Preference_view.xml | 21 -- .../TemplateTool_viewBusinessTemplateList.xml | 23 +- .../erp5_core/TemplateTool_viewDiff.xml | 6 +- ...ool_viewDownloadBusinessTemplateDialog.xml | 4 +- ...adRepositoryBusinessTemplateListDialog.xml | 21 -- ...eTool_viewImportBusinessTemplateDialog.xml | 4 +- ...llRepositoryBusinessTemplateListDialog.xml | 21 -- ...mplateTool_viewMultiInstallationDialog.xml | 16 +- ...deRepositoryBusinessTemplateListDialog.xml | 21 -- .../erp5_core/TrashBin_viewTrashObject.xml | 7 - .../erp5_core/TrashTool_viewTrashBinList.xml | 25 +- .../ERP5/bootstrap/erp5_core/bt/change_log | 3 + 53 files changed, 302 insertions(+), 1351 deletions(-) delete mode 100644 product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callListDialogMethod.xml delete mode 100644 product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callViewDialogMethod.xml diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AlarmTool_viewAlarmList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AlarmTool_viewAlarmList.xml index c45274f43f..3ba5265a16 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AlarmTool_viewAlarmList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AlarmTool_viewAlarmList.xml @@ -61,7 +61,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>Default</string> + <string>bottom</string> </list> </value> </item> @@ -70,7 +70,7 @@ <value> <dictionary> <item> - <key> <string>Default</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> @@ -94,7 +94,7 @@ </item> <item> <key> <string>pt</string> </key> - <value> <string>form_list</string> </value> + <value> <string>list_main</string> </value> </item> <item> <key> <string>row_length</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_view.xml index c08596e645..1589f948a5 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_view.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_view.xml @@ -62,7 +62,7 @@ <value> <list> <string>left</string> - <string>rigtht</string> + <string>right</string> <string>center</string> <string>bottom</string> </list> @@ -101,7 +101,7 @@ </value> </item> <item> - <key> <string>rigtht</string> </key> + <key> <string>right</string> </key> <value> <list> <string>my_report_method_id</string> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseWorkflow_viewWorkflowActionDialog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseWorkflow_viewWorkflowActionDialog.xml index 75aeaf65c1..4025caa8c8 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseWorkflow_viewWorkflowActionDialog.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseWorkflow_viewWorkflowActionDialog.xml @@ -61,8 +61,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>Default</string> - <string>hidden</string> + <string>left</string> </list> </value> </item> @@ -71,17 +70,10 @@ <value> <dictionary> <item> - <key> <string>Default</string> </key> + <key> <string>left</string> </key> <value> <list> <string>my_comment</string> - </list> - </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> - <list> <string>my_workflow_action</string> </list> </value> @@ -103,7 +95,7 @@ </item> <item> <key> <string>pt</string> </key> - <value> <string>form_view_dialog</string> </value> + <value> <string>form_dialog</string> </value> </item> <item> <key> <string>row_length</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_FieldLibrary.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_FieldLibrary.xml index d3c97eccf5..fbe37bc00f 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_FieldLibrary.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_FieldLibrary.xml @@ -67,7 +67,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>Default</string> + <string>left</string> </list> </value> </item> @@ -76,7 +76,7 @@ <value> <dictionary> <item> - <key> <string>Default</string> </key> + <key> <string>left</string> </key> <value> <list> <string>date</string> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml index 055a34ddac..12538144f3 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml @@ -70,128 +70,194 @@ <key> <string>_body</string> </key> <value> <string encoding="cdata"><![CDATA[ -"""Generic method called when submitting a form in dialog mode.\n +"""\n +Generic method called when submitting a form in dialog mode.\n Responsible for validating form data and redirecting to the form action.\n """\n \n -from Products.Formulator.Errors import ValidationError, FormValidationError\n +from Products.Formulator.Errors import FormValidationError\n from ZTUtils import make_query\n \n -request=context.REQUEST\n +request_form = context.REQUEST.form\n +error_message = \'\'\n +\n +# Make this script work alike wether called from another script or by a request\n +# Reinject parameters in the request\n +request_form[\'dialog_method\'] = dialog_method\n +request_form[\'dialog_id\'] = dialog_id\n +request_form[\'dialog_category\'] = dialog_category\n +request_form[\'enable_pickle\'] = enable_pickle\n +# If we get unused parameters, put them in the request\n +for k, v in kw:\n + request_form[k]=v\n \n -#Exceptions for UI and Sort\n +# Exceptions for UI\n if dialog_method == \'Base_configureUI\':\n - return context.Base_configureUI(form_id=form_id,\n - selection_name=selection_name,\n - field_columns=getattr(request,\'field_columns\'),\n - stat_columns=getattr(request,\'stat_columns\'))\n + return context.Base_configureUI(form_id=request_form[\'form_id\'],\n + selection_name=request_form[\'selection_name\'],\n + field_columns=request_form[\'field_columns\'],\n + stat_columns=request_form[\'stat_columns\'])\n +# Exceptions for Sort\n if dialog_method == \'Base_configureSortOn\':\n - return context.Base_configureSortOn(form_id=form_id,\n - selection_name=selection_name,\n - field_sort_on=getattr(request,\'field_sort_on\'),\n - field_sort_order=getattr(request,\'field_sort_order\'))\n + return context.Base_configureSortOn(form_id=request_form[\'form_id\'],\n + selection_name=request_form[\'selection_name\'],\n + field_sort_on=request_form[\'field_sort_on\'],\n + field_sort_order=request_form[\'field_sort_order\'])\n +# Exceptions for Base_edit\n +# if dialog_method == \'Base_edit\':\n +# return context.Base_edit(form_id=request_form[\'form_id\'],\n +# dialog_id=dialog_id,\n +# selection_name=request_form[\'selection_name\'])\n +# Exceptions for Workflow\n +if dialog_method == \'Workflow_statusModify\':\n + value = context.Workflow_statusModify(form_id=request_form[\'form_id\'],\n + dialog_id=dialog_id)\n + # XXX: This test is related to erp5_web and should not be present in configuration where it is not installed.\n + if not(getattr(context.REQUEST, \'ignore_layout\', 0)) and context.getApplicableLayout() :\n + context.REQUEST.RESPONSE.redirect(context.WebSite_getDocumentPhysicalPath())\n + return value\n +# Exception for edit relation\n +if dialog_method == \'Base_editRelation\':\n + return context.Base_editRelation(form_id=request_form[\'form_id\'],\n + field_id=request_form[\'field_id\'],\n + selection_name=request_form[\'selection_name\'],\n + selection_index=request_form[\'selection_index\'],\n + object_uid=request_form[\'object_uid\'],\n + uids=request_form[\'uids\'],\n + listbox_uid=request_form[\'listbox_uid\'])\n +# Exception for create relation\n +if dialog_method == \'Base_createRelation\':\n + return context.Base_createRelation(form_id=request_form[\'form_id\'],\n + selection_name=request_form[\'selection_name\'],\n + selection_index=request_form[\'selection_index\'],\n + base_category=request_form[\'base_category\'],\n + object_uid=request_form[\'object_uid\'],\n + catalog_index=request_form[\'catalog_index\'],\n + default_module=request_form[\'default_module\'],\n + dialog_id=dialog_id,\n + portal_type=request_form[\'portal_type\'],\n + return_url=request_form[\'cancel_url\'])\n +# Exception for folder delete\n +if dialog_method == \'Folder_delete\':\n + return context.Folder_delete(form_id=request_form[\'form_id\'],\n + selection_name=request_form[\'selection_name\'],\n + uids=request_form[\'listbox_uid\'],\n + md5_object_uid_list=request_form[\'md5_object_uid_list\'])\n +\n +# If the request came with a pickled form, use it as context for form object search.\n +if request_form.has_key(\'pickle_string\'):\n + form_context = context.asContext(context=None,\n + portal_type=context.getPortalType(),\n + **(context.portal_selections.getObjectFromPickle(request_form[\'pickle_string\']))\n + )\n +else:\n + form_context = context\n +form = getattr(form_context, dialog_id)\n +# Validate the form\n +try:\n + form.validate_all_to_request(context.REQUEST)\n +except FormValidationError, validation_errors:\n + # Pack errors into the request\n + field_errors = form.ErrorFields(validation_errors)\n + context.REQUEST.set(\'field_errors\', field_errors)\n + return form(context.REQUEST)\n \n -# we will try to use REQUEST.redirect if possible, it will not be possible if :\n -# * we got an import_file, \n +# Use REQUEST.redirect if possible. It will not be possible if at least one of these is true :\n +# * we got an import_file,\n # * we got a listbox\n # * a value is None or [] or (), because this is not supported by make_query\n -cannot_redirect = 0\n -\n -MARKER = []\n -\n -try:\n - # Validate the form\n - kw = {}\n - if request.has_key(\'pickle_string\'):\n - pickle_string = request.get(\'pickle_string\')\n - kw = context.portal_selections.getObjectFromPickle(pickle_string)\n - #kw = context.portal_selections.getCookieInfo(request,dialog_id)\n - if kw != {}:\n - form = getattr(context.asContext(context=None,portal_type=context.getPortalType(),**kw),dialog_id)\n - else:\n - form = getattr(context,dialog_id)\n - form.validate_all_to_request(request)\n - kw = {\'form_id\': form_id,\n - \'selection_name\': selection_name,\n - \'selection_index\': None} # Missing selection_index\n - has_listbox = 0\n - for f in form.get_fields():\n - k = f.id\n - v = getattr(request, k, MARKER)\n - if v is not MARKER:\n - for prefix in (\'my_\', \'your_\'):\n - if k.startswith(prefix):\n - k = k[len(prefix):]\n - kw[k] = v\n - if v in (None, [], ()) or hasattr(v, \'read\') :\n - cannot_redirect = 1\n - break\n - else:\n - if k in (\'import_file\', \'listbox\'):\n - if f.meta_type == \'ListBox\': has_listbox = 1\n - cannot_redirect = 1\n - kw[k] = v\n - # Add some properties required by UI\n - md5_object_uid_list = getattr(request,\'md5_object_uid_list\',None)\n - kw[\'md5_object_uid_list\'] = md5_object_uid_list\n - kw[\'cancel_url\'] = cancel_url\n - if has_listbox:\n +can_redirect = 1\n +MARKER = [] # A recognisable default value. Use with \'is\', not \'==\'.\n +listbox_id_list = [] # There should not be more than one listbox - but this give us a way to check.\n +file_id_list = [] # For uploaded files.\n +for field in form.get_fields():\n + k = field.id\n + v = context.REQUEST.get(k, MARKER)\n + if v is not MARKER:\n + if field.meta_type == \'ListBox\':\n + listbox_id_list.append(k)\n + elif can_redirect and (v in (None, [], ()) or hasattr(v, \'read\')) : # If we cannot redirect, useless to test it again\n + can_redirect = 0\n + # Cleanup my_ and your_ prefixes\n + splitted = k.split(\'_\', 1)\n + if len(splitted) == 2 and splitted[0] in (\'my\', \'your\'):\n + request_form[splitted[1]] = v\n + else:\n + request_form[k] = v\n +if len(listbox_id_list):\n + can_redirect = 0\n + # Warn if there are more than one listbox in form ...\n + if len(listbox_id_list) > 1:\n + log(\'Base_callDialogMethod\', \'There are %s listboxes in form %s.\' % (len(listbox_id_list), form.id))\n + # ... but handle them anyway.\n + for listbox_id in listbox_id_list:\n listbox_line_list = []\n - listbox = getattr(request,\'listbox\',None)\n + listbox = request_form[listbox_id]\n listbox_keys = listbox.keys()\n listbox_keys.sort()\n for key in listbox_keys:\n listbox_line = listbox[key]\n listbox_line[\'listbox_key\'] = key\n - listbox_line_list.append(listbox[key])\n + listbox_line_list.append(listbox_line)\n listbox_line_list = tuple(listbox_line_list)\n - kw[\'listbox\'] = listbox_line_list\n - if enable_pickle or (form.update_action!=\'\'):\n - pickle_string = context.portal_selections.getPickle(**kw)\n - request.set(\'pickle_string\', pickle_string)\n - \n - # if dialog_category is search, then edit the selection\n - if dialog_category == "object_search" :\n - context.portal_selections.setSelectionParamsFor(selection_name, kw)\n - \n - cleanedup_kw = {}\n - for k, v in kw.items() :\n - if v is not None :\n - cleanedup_kw[k] = v\n + request_form[listbox_id] = listbox_line_list\n \n - # If url is too long, we do not redirecting\n - # to avoir crash <christophe@nexedi.com>\n - if len(make_query(cleanedup_kw)) > 2000:\n - cannot_redirect = 1\n +if enable_pickle or (form.update_action != \'\'):\n + request_form[\'pickle_string\'] = context.portal_selections.getPickle(**request_form)\n \n - # if we cannot redirect, then call the form directly.\n - # XXX we always redirect in report mode to make sure portal_skin\n - # parameter is taken into account by SkinTool.\n - if cannot_redirect and dialog_category != "object_report" :\n - dialog_form = getattr(context, dialog_method, None)\n - for k, v in kw.items() :\n - request.set(k, v)\n - # set the URL in request, so that we can immediatly call method\n - # that depend on it (eg. Show All). This is really related to\n - # current ListBox implementation which edit Selection\'s last_url\n - # with the content of REQUEST.URL\n - request.set(\'URL\', \'%s/%s\' % (context.absolute_url(), dialog_method))\n - return dialog_form(**kw)\n +# Check if the selection changed\n +if hasattr(request_form, \'previous_md5_object_uid_list\'):\n + selection_list = context.portal_selections.callSelectionFor(request_form[\'selection_name\'], context=context)\n + if selection_list is not None:\n + object_uid_list = map(lambda x:x.getObject().getUid(), selection_list)\n + error = context.portal_selections.selectionHasChanged(request_form[\'previous_md5_object_uid_list\'], object_uid_list)\n + if error:\n + error_message = N_("Sorry+your+selection+has+changed")\n \n - # Otherwise, prepare URL to redirect, passing arguments in the URL\n - # (we remove None values, as it doesn\'t work with make_query, which\n - # pass \'None\')\n +# if dialog_category is object_search, then edit the selection\n +if dialog_category == "object_search" :\n + context.portal_selections.setSelectionParamsFor(request_form[\'selection_name\'], request_form)\n +\n +# Remove values which doesn\'t work with make_query.\n +clean_kw = {}\n +for k, v in request_form.items() :\n + if v not in (None, [], ()) :\n + clean_kw[k] = request_form[k]\n +\n +url_params_string = make_query(clean_kw)\n +\n +# XXX: We always redirect in report mode to make sure portal_skin\n +# parameter is taken into account by SkinTool.\n +# If url is too long, we do not redirect to avoid crash.\n +if (not(can_redirect) or len(url_params_string) > 2000) and dialog_category != "object_report": # XXX: 2000 is an arbitrary value resulted from trial and error.\n + # If we cannot redirect, then call the form directly.\n + dialog_form = getattr(context, dialog_method)\n + # XXX: this is a hack that should not be needed anymore with the new listbox.\n + # set the URL in request, so that we can immediatly call method\n + # that depend on it (eg. Show All). This is really related to\n + # current ListBox implementation which edit Selection\'s last_url\n + # with the content of REQUEST.URL\n + context.REQUEST.set(\'URL\', \'%s/%s\' % (context.absolute_url(), dialog_method))\n + return dialog_form(**request_form)\n +\n +if error_message != \'\':\n + redirect_url = \'%s/%s?%s\' % ( context.absolute_url()\n + , dialog_method\n + , \'portal_status_message=%s\' % error_message\n + )\n +elif url_params_string != \'\':\n redirect_url = \'%s/%s?%s\' % ( context.absolute_url()\n + , dialog_method\n + , url_params_string\n + )\n +else:\n + redirect_url = \'%s/%s\' % ( context.absolute_url()\n , dialog_method\n - , make_query(cleanedup_kw)\n )\n - return request.RESPONSE.redirect( redirect_url )\n \n -except FormValidationError, validation_errors:\n - # Pack errors into the request\n - field_errors = form.ErrorFields(validation_errors)\n - request.set(\'field_errors\', field_errors)\n - return form(request)\n +return context.REQUEST.RESPONSE.redirect(redirect_url)\n +\n +# vim: syntax=python\n ]]></string> </value> @@ -214,7 +280,7 @@ except FormValidationError, validation_errors:\n </item> <item> <key> <string>_params</string> </key> - <value> <string>cancel_url, dialog_method, selection_name, dialog_id, dialog_category=\'\', form_id=\'view\', enable_pickle=0, **kw</string> </value> + <value> <string>dialog_method, dialog_id, dialog_category=\'\', enable_pickle=0, **kw</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -234,57 +300,63 @@ except FormValidationError, validation_errors:\n <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>7</int> </value> + <value> <int>4</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> - <string>cancel_url</string> <string>dialog_method</string> - <string>selection_name</string> <string>dialog_id</string> <string>dialog_category</string> - <string>form_id</string> <string>enable_pickle</string> <string>kw</string> <string>Products.Formulator.Errors</string> - <string>ValidationError</string> <string>FormValidationError</string> <string>ZTUtils</string> <string>make_query</string> <string>_getattr_</string> <string>context</string> - <string>request</string> - <string>getattr</string> - <string>cannot_redirect</string> - <string>MARKER</string> - <string>pickle_string</string> - <string>_apply_</string> - <string>None</string> - <string>form</string> - <string>has_listbox</string> + <string>request_form</string> + <string>error_message</string> + <string>_write_</string> <string>_getiter_</string> - <string>f</string> <string>k</string> <string>v</string> - <string>prefix</string> <string>_getitem_</string> - <string>len</string> - <string>_write_</string> + <string>value</string> + <string>getattr</string> + <string>_apply_</string> + <string>None</string> + <string>form_context</string> + <string>form</string> + <string>validation_errors</string> + <string>field_errors</string> + <string>can_redirect</string> + <string>MARKER</string> + <string>listbox_id_list</string> + <string>file_id_list</string> + <string>field</string> <string>hasattr</string> - <string>md5_object_uid_list</string> + <string>splitted</string> + <string>len</string> + <string>log</string> + <string>listbox_id</string> <string>listbox_line_list</string> <string>listbox</string> <string>listbox_keys</string> <string>key</string> <string>listbox_line</string> <string>tuple</string> - <string>cleanedup_kw</string> + <string>selection_list</string> + <string>map</string> + <string>object_uid_list</string> + <string>error</string> + <string>N_</string> + <string>clean_kw</string> + <string>url_params_string</string> <string>dialog_form</string> <string>redirect_url</string> - <string>validation_errors</string> - <string>field_errors</string> </tuple> </value> </item> @@ -298,7 +370,6 @@ except FormValidationError, validation_errors:\n <value> <tuple> <string></string> - <string>view</string> <int>0</int> </tuple> </value> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callListDialogMethod.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callListDialogMethod.xml deleted file mode 100644 index 603120d689..0000000000 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callListDialogMethod.xml +++ /dev/null @@ -1,279 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.PythonScripts.PythonScript</string> - <string>PythonScript</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>Python_magic</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>Script_magic</string> </key> - <value> <int>3</int> </value> - </item> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <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_container</string> </key> - <value> <string>container</string> </value> - </item> - <item> - <key> <string>name_context</string> </key> - <value> <string>context</string> </value> - </item> - <item> - <key> <string>name_m_self</string> </key> - <value> <string>script</string> </value> - </item> - <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>_body</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -# Updates attributes of an Zope document\n -# which is in a class inheriting from ERP5 Base\n -\n -\n -from Products.Formulator.Errors import ValidationError, FormValidationError\n -from string import join\n -\n -request=context.REQUEST\n -\n -#Exceptions for UI and Sort\n -if dialog_method == \'Base_configureUI\':\n - return context.Base_configureUI(form_id=form_id,\n - selection_name=selection_name,\n - field_columns=getattr(request,\'field_columns\'),\n - stat_columns=getattr(request,\'stat_columns\'))\n -if dialog_method == \'Base_configureSortOn\':\n - return context.Base_configureSortOn(form_id=form_id,\n - selection_name=selection_name,\n - field_sort_on=getattr(request,\'field_sort_on\'),\n - field_sort_order=getattr(request,\'field_sort_order\'))\n -if dialog_method == \'Base_editRelation\':\n - return context.Base_editRelation(form_id=form_id,\n - field_id=request.get(\'field_id\'),\n - selection_name=selection_name,\n - selection_index=request.get(\'selection_index\'),\n - object_uid=request.get(\'object_uid\'),\n - uids=request.get(\'uids\'),\n - listbox_uid=request.get(\'listbox_uid\'))\n -if dialog_method == \'Base_createRelation\':\n - return context.Base_createRelation(form_id=form_id,\n - selection_name=selection_name,\n - selection_index=request.get(\'selection_index\'),\n - base_category=request.get(\'base_category\'),\n - object_uid=request.get(\'object_uid\'),\n - catalog_index=request.get(\'catalog_index\'),\n - default_module=request.get(\'default_module\'),\n - dialog_id=dialog_id,\n - portal_type=request.get(\'portal_type\'),\n - return_url=request.get(\'cancel_url\'))\n -if dialog_method == \'Folder_delete\':\n - return context.Folder_delete(form_id=form_id,\n - field_id=request.get(\'field_id\'),\n - selection_name=selection_name,\n - selection_index=request.get(\'selection_index\'),\n - object_uid=request.get(\'object_uid\'),\n - uids=request.get(\'listbox_uid\'),\n - md5_object_uid_list=request.get(\'md5_object_uid_list\'),\n - cancel_url=request.get(\'cancel_url\'))\n -\n -try:\n - MARKER = \'marker\'\n - # Validate the form\n - form = getattr(context,dialog_id)\n - form.validate_all_to_request(request)\n - kw = {}\n - for f in form.get_fields():\n - k = f.id\n - v = getattr(request, k, MARKER)\n - if v is not MARKER:\n - k = k[3:]\n - kw[k] = v\n - url_params = []\n - for (k,v) in kw.items():\n - url_params += [\'%s=%s\' % (k,v)]\n - url_params_string = join(url_params, \'&\')\n -except FormValidationError, validation_errors:\n - # Pack errors into the request\n - field_errors = form.ErrorFields(validation_errors)\n - request.set(\'field_errors\', field_errors)\n - return form(request)\n -\n -if url_params_string != \'\':\n - redirect_url = \'%s/%s?%s\' % ( context.absolute_url()\n - , dialog_method\n - , url_params_string\n - )\n -else:\n - redirect_url = \'%s/%s\' % ( context.absolute_url()\n - , dialog_method\n - )\n -\n -return request.RESPONSE.redirect( redirect_url )\n - - -]]></string> </value> - </item> - <item> - <key> <string>_code</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_dav_writelocks</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>_filepath</string> </key> - <value> <string>Script (Python):/nexedi/portal_skins/local_erp5/Base_callListDialogMethod</string> </value> - </item> - <item> - <key> <string>_params</string> </key> - <value> <string>form_id,cancel_url,dialog_method,selection_name,dialog_id</string> </value> - </item> - <item> - <key> <string>errors</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>func_code</string> </key> - <value> - <object> - <klass> - <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>co_argcount</string> </key> - <value> <int>5</int> </value> - </item> - <item> - <key> <string>co_varnames</string> </key> - <value> - <tuple> - <string>form_id</string> - <string>cancel_url</string> - <string>dialog_method</string> - <string>selection_name</string> - <string>dialog_id</string> - <string>Products.Formulator.Errors</string> - <string>ValidationError</string> - <string>FormValidationError</string> - <string>string</string> - <string>join</string> - <string>_getattr_</string> - <string>context</string> - <string>request</string> - <string>getattr</string> - <string>MARKER</string> - <string>form</string> - <string>kw</string> - <string>_getiter_</string> - <string>f</string> - <string>k</string> - <string>v</string> - <string>_getitem_</string> - <string>_write_</string> - <string>url_params</string> - <string>url_params_string</string> - <string>validation_errors</string> - <string>field_errors</string> - <string>redirect_url</string> - </tuple> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>func_defaults</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>Base_callListDialogMethod</string> </value> - </item> - <item> - <key> <string>warnings</string> </key> - <value> - <tuple/> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_container</string> </key> - <value> - <dictionary/> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callViewDialogMethod.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callViewDialogMethod.xml deleted file mode 100644 index 0ca58efcd0..0000000000 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callViewDialogMethod.xml +++ /dev/null @@ -1,332 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.PythonScripts.PythonScript</string> - <string>PythonScript</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>Python_magic</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>Script_magic</string> </key> - <value> <int>3</int> </value> - </item> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <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_container</string> </key> - <value> <string>container</string> </value> - </item> - <item> - <key> <string>name_context</string> </key> - <value> <string>context</string> </value> - </item> - <item> - <key> <string>name_m_self</string> </key> - <value> <string>script</string> </value> - </item> - <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>_body</string> </key> - <value> <string># Updates attributes of an Zope document\n -# which is in a class inheriting from ERP5 Base\n -\n -\n -from Products.Formulator.Errors import ValidationError, FormValidationError\n -from string import join\n -from ZTUtils import make_query\n -\n -request=context.REQUEST\n -\n -#Exceptions for Base_edit\n -if dialog_method == \'Base_edit\':\n - return context.Base_edit( form_id=form_id\n - , dialog_id=dialog_id\n - , selection_name=selection_name\n - )\n -#Exceptions for Workflow\n -if dialog_method == \'Workflow_statusModify\':\n - value = context.Workflow_statusModify( form_id=form_id\n - , dialog_id=dialog_id\n - )\n - if not(getattr(request, \'ignore_layout\', 0)) and context.getApplicableLayout() :\n - value = request.RESPONSE.redirect(context.WebSite_getDocumentPhysicalPath())\n - return value\n -if dialog_method == \'Base_configureUI\':\n - return context.Base_configureUI( form_id=form_id\n - , selection_name=selection_name\n - , field_columns=getattr(request,\'field_columns\')\n - , stat_columns=getattr(request,\'stat_columns\')\n - )\n -if dialog_method == \'Base_configureSortOn\':\n - return context.Base_configureSortOn( form_id=form_id\n - , selection_name=selection_name\n - , field_sort_on=getattr(request,\'field_sort_on\')\n - , field_sort_order=getattr(request,\'field_sort_order\')\n - )\n -\n -error_message = \'\'\n -MARKER = \'marker\'\n -try:\n - # Validate the form\n - form = getattr(context,dialog_id)\n - form.validate_all_to_request(request)\n - kw = { \'form_id\' : form_id\n - , \'selection_name\' : selection_name \n - , \'selection_index\' : None\n - , \'dialog_id\' : dialog_id\n - } # Missing selection_index\n - has_listbox = 0 \n - for f in form.get_fields():\n - k = f.id\n - v = getattr(request,k, MARKER)\n - if v is not MARKER:\n - for prefix in (\'my_\', \'your_\'):\n - if k.startswith(prefix):\n - k = k[len(prefix):]\n - kw[k] = v\n - if v in (None, [], ()) or hasattr(v, \'read\') :\n - must_redirect = 1\n - break\n - else:\n - if k in (\'import_file\', \'listbox\'):\n - if f.meta_type == \'ListBox\': has_listbox = 1\n - must_redirect = 1\n - kw[k] = v\n - # Add some properties required by UI\n - kw[\'cancel_url\'] = cancel_url\n - # Redirect if possible, or call directly else\n - if kw.has_key(\'import_file\'):\n - # We can not redirect if we do an import\n - import_file = kw[\'import_file\']\n - return getattr(context,dialog_method)(**kw)\n - if has_listbox:\n - listbox_line_list = []\n - listbox = getattr(request,\'listbox\',None)\n - listbox_keys = listbox.keys()\n - listbox_keys.sort()\n - for key in listbox_keys:\n - listbox_line = listbox[key]\n - listbox_line[\'listbox_key\'] = key\n - listbox_line_list.append(listbox[key])\n - listbox_line_list = tuple(listbox_line_list)\n - kw[\'listbox\'] = listbox_line_list\n - return getattr(context,dialog_method)(**kw)\n - url_params_string = make_query(kw)\n - # Check if the selection did not changed\n - if previous_md5_object_uid_list is not None:\n - selection_list = context.portal_selections.callSelectionFor(selection_name, context=context)\n - if selection_list is not None:\n - object_uid_list = map(lambda x:x.getObject().getUid(),selection_list)\n - error = context.portal_selections.selectionHasChanged(previous_md5_object_uid_list,object_uid_list)\n - if error:\n - error_message = \'Sorry+your+selection+has+changed\'\n - url_params_string = make_query(**kw)\n -except FormValidationError, validation_errors:\n - # Pack errors into the request\n - field_errors = form.ErrorFields(validation_errors)\n - request.set(\'field_errors\', field_errors)\n - return form(request)\n -\n -if error_message != \'\':\n - redirect_url = \'%s/%s?%s\' % ( context.absolute_url(), form_id\n - , \'portal_status_message=%s\' % error_message\n - )\n -elif url_params_string != \'\':\n - redirect_url = \'%s/%s?%s\' % ( context.absolute_url()\n - , dialog_method\n - , url_params_string\n - )\n -else:\n - redirect_url = \'%s/%s\' % ( context.absolute_url()\n - , dialog_method\n - )\n -\n -return request.RESPONSE.redirect( redirect_url )\n -</string> </value> - </item> - <item> - <key> <string>_code</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_dav_writelocks</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>_filepath</string> </key> - <value> <string>Script (Python):/nexedi/portal_skins/local_erp5/Base_callViewDialogMethod</string> </value> - </item> - <item> - <key> <string>_params</string> </key> - <value> <string>form_id,cancel_url,dialog_method,selection_name,dialog_id,previous_md5_object_uid_list=None</string> </value> - </item> - <item> - <key> <string>errors</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>func_code</string> </key> - <value> - <object> - <klass> - <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>co_argcount</string> </key> - <value> <int>6</int> </value> - </item> - <item> - <key> <string>co_varnames</string> </key> - <value> - <tuple> - <string>form_id</string> - <string>cancel_url</string> - <string>dialog_method</string> - <string>selection_name</string> - <string>dialog_id</string> - <string>previous_md5_object_uid_list</string> - <string>Products.Formulator.Errors</string> - <string>ValidationError</string> - <string>FormValidationError</string> - <string>string</string> - <string>join</string> - <string>ZTUtils</string> - <string>make_query</string> - <string>_getattr_</string> - <string>context</string> - <string>request</string> - <string>value</string> - <string>getattr</string> - <string>error_message</string> - <string>MARKER</string> - <string>form</string> - <string>None</string> - <string>kw</string> - <string>has_listbox</string> - <string>_getiter_</string> - <string>f</string> - <string>k</string> - <string>v</string> - <string>prefix</string> - <string>_getitem_</string> - <string>len</string> - <string>_write_</string> - <string>hasattr</string> - <string>must_redirect</string> - <string>import_file</string> - <string>_apply_</string> - <string>listbox_line_list</string> - <string>listbox</string> - <string>listbox_keys</string> - <string>key</string> - <string>listbox_line</string> - <string>tuple</string> - <string>url_params_string</string> - <string>selection_list</string> - <string>map</string> - <string>object_uid_list</string> - <string>error</string> - <string>validation_errors</string> - <string>field_errors</string> - <string>redirect_url</string> - </tuple> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>func_defaults</string> </key> - <value> - <tuple> - <none/> - </tuple> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>Base_callViewDialogMethod</string> </value> - </item> - <item> - <key> <string>warnings</string> </key> - <value> - <tuple/> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_container</string> </key> - <value> - <dictionary/> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_exportCsvFileForm.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_exportCsvFileForm.xml index 672abed640..e3e5588c57 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_exportCsvFileForm.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_exportCsvFileForm.xml @@ -61,8 +61,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>Default</string> - <string>hidden</string> + <string>left</string> </list> </value> </item> @@ -71,19 +70,13 @@ <value> <dictionary> <item> - <key> <string>Default</string> </key> + <key> <string>left</string> </key> <value> <list> <string>your_export_only</string> </list> </value> </item> - <item> - <key> <string>hidden</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_importCsvFileForm.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_importCsvFileForm.xml index c8d981ee66..452773f4a5 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_importCsvFileForm.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_importCsvFileForm.xml @@ -61,8 +61,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>Default</string> - <string>hidden</string> + <string>left</string> </list> </value> </item> @@ -71,19 +70,13 @@ <value> <dictionary> <item> - <key> <string>Default</string> </key> + <key> <string>left</string> </key> <value> <list> <string>my_import_file</string> </list> </value> </item> - <item> - <key> <string>hidden</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_jumpToRelatedObjectList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_jumpToRelatedObjectList.xml index 3b855f4431..bed8ba4cd7 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_jumpToRelatedObjectList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_jumpToRelatedObjectList.xml @@ -61,7 +61,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>Default</string> + <string>bottom</string> </list> </value> </item> @@ -70,7 +70,7 @@ <value> <dictionary> <item> - <key> <string>Default</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> @@ -94,7 +94,7 @@ </item> <item> <key> <string>pt</string> </key> - <value> <string>form_list</string> </value> + <value> <string>list_main</string> </value> </item> <item> <key> <string>row_length</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList.xml index 270acc66d1..2f8d54fab6 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList.xml @@ -61,11 +61,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>Left</string> - <string>Right</string> - <string>Center</string> - <string>Bottom</string> - <string>Hidden</string> + <string>bottom</string> </list> </value> </item> @@ -74,37 +70,13 @@ <value> <dictionary> <item> - <key> <string>Bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> </list> </value> </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/> - </value> - </item> - <item> - <key> <string>Right</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewMetadata.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewMetadata.xml index df90743afc..6815f69ef9 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewMetadata.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewMetadata.xml @@ -64,7 +64,6 @@ <string>left</string> <string>right</string> <string>center</string> - <string>bottom</string> </list> </value> </item> @@ -72,12 +71,6 @@ <key> <string>groups</string> </key> <value> <dictionary> - <item> - <key> <string>bottom</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>center</string> </key> <value> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewRelatedObjectList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewRelatedObjectList.xml index 93b528e0f8..47b9b03ff5 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewRelatedObjectList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewRelatedObjectList.xml @@ -61,7 +61,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>Default</string> + <string>bottom</string> </list> </value> </item> @@ -70,7 +70,7 @@ <value> <dictionary> <item> - <key> <string>Default</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> @@ -94,7 +94,7 @@ </item> <item> <key> <string>pt</string> </key> - <value> <string>form_list_relation</string> </value> + <value> <string>form_dialog</string> </value> </item> <item> <key> <string>row_length</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewSearchResultList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewSearchResultList.xml index e592826ed8..8211ee4444 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewSearchResultList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewSearchResultList.xml @@ -61,7 +61,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>left</string> + <string>bottom</string> </list> </value> </item> @@ -70,7 +70,7 @@ <value> <dictionary> <item> - <key> <string>left</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> @@ -94,7 +94,7 @@ </item> <item> <key> <string>pt</string> </key> - <value> <string>form_list</string> </value> + <value> <string>list_main</string> </value> </item> <item> <key> <string>rid</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewUIDialog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewUIDialog.xml index 85ac0c6ac3..22dd42e51b 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewUIDialog.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewUIDialog.xml @@ -102,7 +102,7 @@ </item> <item> <key> <string>pt</string> </key> - <value> <string>form_list_ui</string> </value> + <value> <string>configure_list_dialog</string> </value> </item> <item> <key> <string>row_length</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewWorkflowHistory.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewWorkflowHistory.xml index 2e1c7bb82c..e8b0acec44 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewWorkflowHistory.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewWorkflowHistory.xml @@ -61,11 +61,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>left</string> - <string>right</string> - <string>center</string> <string>bottom</string> - <string>hidden</string> </list> </value> </item> @@ -81,30 +77,6 @@ </list> </value> </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/> - </value> - </item> - <item> - <key> <string>right</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_view.xml index d1a9ba037e..d9b2db40b9 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_view.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_view.xml @@ -69,8 +69,8 @@ <list> <string>left</string> <string>right</string> - <string>left 1</string> - <string>right 1</string> + <string>center_left</string> + <string>center_right</string> <string>bottom</string> </list> </value> @@ -80,13 +80,31 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>my_template_path_list</string> </list> </value> </item> + <item> + <key> <string>center_left</string> </key> + <value> + <list> + <string>my_template_module_id_list</string> + <string>my_template_base_category_list</string> + </list> + </value> + </item> + <item> + <key> <string>center_right</string> </key> + <value> + <list> + <string>my_template_skin_id_list</string> + <string>my_template_workflow_id_list</string> + </list> + </value> + </item> <item> <key> <string>left</string> </key> <value> @@ -101,15 +119,6 @@ </list> </value> </item> - <item> - <key> <string>left 1</string> </key> - <value> - <list> - <string>my_template_module_id_list</string> - <string>my_template_base_category_list</string> - </list> - </value> - </item> <item> <key> <string>right</string> </key> <value> @@ -121,15 +130,6 @@ </list> </value> </item> - <item> - <key> <string>right 1</string> </key> - <value> - <list> - <string>my_template_skin_id_list</string> - <string>my_template_workflow_id_list</string> - </list> - </value> - </item> </dictionary> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewCatalog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewCatalog.xml index 24ba2b5d9d..52f7ade647 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewCatalog.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewCatalog.xml @@ -70,7 +70,6 @@ <string>left</string> <string>right</string> <string>center</string> - <string>bottom</string> </list> </value> </item> @@ -78,12 +77,6 @@ <key> <string>groups</string> </key> <value> <dictionary> - <item> - <key> <string>bottom</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>center</string> </key> <value> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewDetail.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewDetail.xml index 9f53c68a23..43f253694e 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewDetail.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewDetail.xml @@ -69,8 +69,6 @@ <list> <string>left</string> <string>right</string> - <string>center</string> - <string>bottom</string> </list> </value> </item> @@ -78,18 +76,6 @@ <key> <string>groups</string> </key> <value> <dictionary> - <item> - <key> <string>bottom</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>center</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>left</string> </key> <value> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewInstallationDialog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewInstallationDialog.xml index a78bf26006..601c54d1a9 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewInstallationDialog.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewInstallationDialog.xml @@ -67,9 +67,6 @@ <key> <string>group_list</string> </key> <value> <list> - <string>left</string> - <string>right</string> - <string>center</string> <string>bottom</string> <string>hidden</string> </list> @@ -80,7 +77,7 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> @@ -88,12 +85,6 @@ </list> </value> </item> - <item> - <key> <string>center</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>hidden</string> </key> <value> @@ -102,18 +93,6 @@ </list> </value> </item> - <item> - <key> <string>left</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>right</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> @@ -131,7 +110,7 @@ </item> <item> <key> <string>pt</string> </key> - <value> <string>form_view_dialog</string> </value> + <value> <string>form_dialog</string> </value> </item> <item> <key> <string>row_length</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewObjectsDiff.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewObjectsDiff.xml index cc0ac69231..99b2fe6456 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewObjectsDiff.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewObjectsDiff.xml @@ -68,10 +68,6 @@ <value> <list> <string>left</string> - <string>right</string> - <string>center</string> - <string>bottom</string> - <string>hidden</string> </list> </value> </item> @@ -79,24 +75,6 @@ <key> <string>groups</string> </key> <value> <dictionary> - <item> - <key> <string>bottom</string> </key> - <value> - <list/> - </value> - </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> @@ -105,12 +83,6 @@ </list> </value> </item> - <item> - <key> <string>right</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewPortalTypes.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewPortalTypes.xml index 6d844f0e0e..f9931768d8 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewPortalTypes.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewPortalTypes.xml @@ -68,9 +68,6 @@ <value> <list> <string>left</string> - <string>right</string> - <string>center</string> - <string>bottom</string> </list> </value> </item> @@ -78,18 +75,6 @@ <key> <string>groups</string> </key> <value> <dictionary> - <item> - <key> <string>bottom</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>center</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>left</string> </key> <value> @@ -104,12 +89,6 @@ </list> </value> </item> - <item> - <key> <string>right</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewUnitTestRunDialog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewUnitTestRunDialog.xml index be73e202ec..9cbb14fbf8 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewUnitTestRunDialog.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewUnitTestRunDialog.xml @@ -61,7 +61,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>Default</string> + <string>left</string> </list> </value> </item> @@ -70,7 +70,7 @@ <value> <dictionary> <item> - <key> <string>Default</string> </key> + <key> <string>left</string> </key> <value> <list> <string>my_test_list</string> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Career_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Career_view.xml index 98d03e95ac..718b347038 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Career_view.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Career_view.xml @@ -61,10 +61,9 @@ <key> <string>group_list</string> </key> <value> <list> - <string>Left</string> - <string>Right</string> - <string>Middle</string> - <string>List</string> + <string>left</string> + <string>right</string> + <string>center</string> </list> </value> </item> @@ -73,7 +72,15 @@ <value> <dictionary> <item> - <key> <string>Left</string> </key> + <key> <string>center</string> </key> + <value> + <list> + <string>my_description</string> + </list> + </value> + </item> + <item> + <key> <string>left</string> </key> <value> <list> <string>my_id</string> @@ -89,21 +96,7 @@ </value> </item> <item> - <key> <string>List</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>Middle</string> </key> - <value> - <list> - <string>my_description</string> - </list> - </value> - </item> - <item> - <key> <string>Right</string> </key> + <key> <string>right</string> </key> <value> <list> <string>my_collective_agreement_title</string> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFileForm.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFileForm.xml index cb0b4f53d9..c64bed6636 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFileForm.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFileForm.xml @@ -61,8 +61,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>Default</string> - <string>hidden</string> + <string>left</string> </list> </value> </item> @@ -71,7 +70,7 @@ <value> <dictionary> <item> - <key> <string>Default</string> </key> + <key> <string>left</string> </key> <value> <list> <string>my_import_file</string> @@ -79,12 +78,6 @@ </list> </value> </item> - <item> - <key> <string>hidden</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DeliveryBuilder_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DeliveryBuilder_view.xml index d5fbe16b02..0933201cc2 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DeliveryBuilder_view.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DeliveryBuilder_view.xml @@ -64,7 +64,6 @@ <string>left</string> <string>right</string> <string>center</string> - <string>bottom</string> </list> </value> </item> @@ -72,12 +71,6 @@ <key> <string>groups</string> </key> <value> <dictionary> - <item> - <key> <string>bottom</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>center</string> </key> <value> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DeliveryBuilder_viewPredicateGroupList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DeliveryBuilder_viewPredicateGroupList.xml index 8ae3f217c9..54c5bb210f 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DeliveryBuilder_viewPredicateGroupList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DeliveryBuilder_viewPredicateGroupList.xml @@ -63,7 +63,6 @@ <list> <string>left</string> <string>right</string> - <string>center</string> <string>bottom</string> </list> </value> @@ -80,12 +79,6 @@ </list> </value> </item> - <item> - <key> <string>center</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>left</string> </key> <value> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DeliveryBuilder_viewProfile.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DeliveryBuilder_viewProfile.xml index 50c8b15900..716a7090cd 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DeliveryBuilder_viewProfile.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DeliveryBuilder_viewProfile.xml @@ -63,9 +63,6 @@ <list> <string>left</string> <string>right</string> - <string>center</string> - <string>bottom</string> - <string>hidden</string> </list> </value> </item> @@ -73,24 +70,6 @@ <key> <string>groups</string> </key> <value> <dictionary> - <item> - <key> <string>bottom</string> </key> - <value> - <list/> - </value> - </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> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Document_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Document_view.xml index 9a6dd1b69b..fbf664ec8b 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Document_view.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Document_view.xml @@ -64,7 +64,6 @@ <string>left</string> <string>right</string> <string>center</string> - <string>bottom</string> </list> </value> </item> @@ -72,12 +71,6 @@ <key> <string>groups</string> </key> <value> <dictionary> - <item> - <key> <string>bottom</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>center</string> </key> <value> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewContentList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewContentList.xml index 9b2d53387b..98717a11c2 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewContentList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewContentList.xml @@ -61,9 +61,6 @@ <key> <string>group_list</string> </key> <value> <list> - <string>left</string> - <string>right</string> - <string>center</string> <string>bottom</string> </list> </value> @@ -74,30 +71,12 @@ <dictionary> <item> <key> <string>bottom</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>center</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>left</string> </key> <value> <list> <string>listbox</string> </list> </value> </item> - <item> - <key> <string>right</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> @@ -115,7 +94,7 @@ </item> <item> <key> <string>pt</string> </key> - <value> <string>form_list</string> </value> + <value> <string>list_main</string> </value> </item> <item> <key> <string>rid</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewDeleteDialog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewDeleteDialog.xml index 1df3ebd16b..f874ce3fda 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewDeleteDialog.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewDeleteDialog.xml @@ -61,9 +61,6 @@ <key> <string>group_list</string> </key> <value> <list> - <string>left</string> - <string>right</string> - <string>center</string> <string>bottom</string> <string>hidden</string> </list> @@ -77,36 +74,18 @@ <key> <string>bottom</string> </key> <value> <list> - <string>listbox_related_object_list_quantity</string> + <string>listbox</string> </list> </value> </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>listbox</string> + <string>listbox_related_object_list_quantity</string> </list> </value> </item> - <item> - <key> <string>right</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> @@ -124,7 +103,7 @@ </item> <item> <key> <string>pt</string> </key> - <value> <string>form_folder_delete</string> </value> + <value> <string>form_dialog</string> </value> </item> <item> <key> <string>row_length</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewObjectList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewObjectList.xml index f241ead583..d47d127142 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewObjectList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewObjectList.xml @@ -61,7 +61,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>Default</string> + <string>bottom</string> </list> </value> </item> @@ -70,7 +70,7 @@ <value> <dictionary> <item> - <key> <string>Default</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> @@ -94,7 +94,7 @@ </item> <item> <key> <string>pt</string> </key> - <value> <string>form_list</string> </value> + <value> <string>list_main</string> </value> </item> <item> <key> <string>row_length</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewSearchDialog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewSearchDialog.xml index fec6d510db..8c1945f3c3 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewSearchDialog.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewSearchDialog.xml @@ -104,7 +104,7 @@ </item> <item> <key> <string>pt</string> </key> - <value> <string>form_view_dialog</string> </value> + <value> <string>form_dialog</string> </value> </item> <item> <key> <string>row_length</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewSortOnDialog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewSortOnDialog.xml index 7b7d5c7abc..0c2b76f5bc 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewSortOnDialog.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewSortOnDialog.xml @@ -95,7 +95,7 @@ </item> <item> <key> <string>pt</string> </key> - <value> <string>form_sort</string> </value> + <value> <string>sort_list_dialog</string> </value> </item> <item> <key> <string>row_length</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDialog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDialog.xml index b637d08638..dbade6c401 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDialog.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDialog.xml @@ -67,7 +67,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>Default</string> + <string>left</string> <string>hidden</string> </list> </value> @@ -77,18 +77,18 @@ <value> <dictionary> <item> - <key> <string>Default</string> </key> + <key> <string>hidden</string> </key> <value> <list> - <string>my_comment</string> + <string>my_workflow_action</string> </list> </value> </item> <item> - <key> <string>hidden</string> </key> + <key> <string>left</string> </key> <value> <list> - <string>my_workflow_action</string> + <string>my_comment</string> </list> </value> </item> @@ -109,7 +109,7 @@ </item> <item> <key> <string>pt</string> </key> - <value> <string>form_view_dialog</string> </value> + <value> <string>form_dialog</string> </value> </item> <item> <key> <string>row_length</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowReport.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowReport.xml index 25bc7af42d..0db86ce457 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowReport.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowReport.xml @@ -61,11 +61,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>left</string> - <string>right</string> - <string>center</string> <string>bottom</string> - <string>hidden</string> </list> </value> </item> @@ -74,37 +70,13 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> </list> </value> </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/> - </value> - </item> - <item> - <key> <string>right</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OrderBuilder_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OrderBuilder_view.xml index 6a56ea7a55..d176e97dcc 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OrderBuilder_view.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OrderBuilder_view.xml @@ -64,7 +64,6 @@ <string>left</string> <string>right</string> <string>center</string> - <string>bottom</string> </list> </value> </item> @@ -72,12 +71,6 @@ <key> <string>groups</string> </key> <value> <dictionary> - <item> - <key> <string>bottom</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>center</string> </key> <value> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OrderBuilder_viewProfile.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OrderBuilder_viewProfile.xml index b6e6cc0a40..93a0e8cc13 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OrderBuilder_viewProfile.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OrderBuilder_viewProfile.xml @@ -62,10 +62,6 @@ <value> <list> <string>left</string> - <string>right</string> - <string>center</string> - <string>bottom</string> - <string>hidden</string> </list> </value> </item> @@ -73,24 +69,6 @@ <key> <string>groups</string> </key> <value> <dictionary> - <item> - <key> <string>bottom</string> </key> - <value> - <list/> - </value> - </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> @@ -100,12 +78,6 @@ </list> </value> </item> - <item> - <key> <string>right</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view.xml index bc31443140..d6d8a5ba3d 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view.xml @@ -62,9 +62,8 @@ <value> <list> <string>left</string> - <string>rifght</string> + <string>right</string> <string>center</string> - <string>bottom</string> </list> </value> </item> @@ -72,12 +71,6 @@ <key> <string>groups</string> </key> <value> <dictionary> - <item> - <key> <string>bottom</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>center</string> </key> <value> @@ -101,7 +94,7 @@ </value> </item> <item> - <key> <string>rifght</string> </key> + <key> <string>right</string> </key> <value> <list> <string>my_periodicity_week_frequency</string> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view.xml index b3741a6e36..e241487c5a 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view.xml @@ -61,11 +61,11 @@ <key> <string>group_list</string> </key> <value> <list> - <string>Left</string> - <string>Right</string> - <string>Center</string> - <string>Bottom</string> - <string>Hidden</string> + <string>left</string> + <string>right</string> + <string>center</string> + <string>bottom</string> + <string>hidden</string> </list> </value> </item> @@ -74,7 +74,7 @@ <value> <dictionary> <item> - <key> <string>Bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> @@ -82,7 +82,7 @@ </value> </item> <item> - <key> <string>Center</string> </key> + <key> <string>center</string> </key> <value> <list> <string>my_membership_criterion_category_list</string> @@ -90,7 +90,7 @@ </value> </item> <item> - <key> <string>Hidden</string> </key> + <key> <string>hidden</string> </key> <value> <list> <string>listbox_identity</string> @@ -100,7 +100,7 @@ </value> </item> <item> - <key> <string>Left</string> </key> + <key> <string>left</string> </key> <value> <list> <string>my_title</string> @@ -112,7 +112,7 @@ </value> </item> <item> - <key> <string>Right</string> </key> + <key> <string>right</string> </key> <value> <list> <string>my_membership_criterion_base_category_list</string> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList.xml index ad2e4def61..dc5a137f44 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList.xml @@ -61,9 +61,6 @@ <key> <string>group_list</string> </key> <value> <list> - <string>left</string> - <string>right</string> - <string>center</string> <string>bottom</string> </list> </value> @@ -73,31 +70,13 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>center</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>left</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> </list> </value> </item> - <item> - <key> <string>right</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> @@ -115,7 +94,7 @@ </item> <item> <key> <string>pt</string> </key> - <value> <string>form_list</string> </value> + <value> <string>list_main</string> </value> </item> <item> <key> <string>row_length</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view.xml index e8c4227b7d..cc20b9b5a0 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view.xml @@ -63,9 +63,6 @@ <list> <string>left</string> <string>right</string> - <string>center</string> - <string>bottom</string> - <string>hidden</string> </list> </value> </item> @@ -73,24 +70,6 @@ <key> <string>groups</string> </key> <value> <dictionary> - <item> - <key> <string>bottom</string> </key> - <value> - <list/> - </value> - </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> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewBusinessTemplateList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewBusinessTemplateList.xml index d2d85b6323..c5f6976ded 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewBusinessTemplateList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewBusinessTemplateList.xml @@ -61,9 +61,6 @@ <key> <string>group_list</string> </key> <value> <list> - <string>left</string> - <string>right</string> - <string>center</string> <string>bottom</string> </list> </value> @@ -74,30 +71,12 @@ <dictionary> <item> <key> <string>bottom</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>center</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>left</string> </key> <value> <list> <string>listbox</string> </list> </value> </item> - <item> - <key> <string>right</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> @@ -115,7 +94,7 @@ </item> <item> <key> <string>pt</string> </key> - <value> <string>form_list</string> </value> + <value> <string>list_main</string> </value> </item> <item> <key> <string>row_length</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDiff.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDiff.xml index ad7628b61d..54564fb966 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDiff.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDiff.xml @@ -67,7 +67,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>Default</string> + <string>bottom</string> </list> </value> </item> @@ -76,7 +76,7 @@ <value> <dictionary> <item> - <key> <string>Default</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> @@ -100,7 +100,7 @@ </item> <item> <key> <string>pt</string> </key> - <value> <string>form_list</string> </value> + <value> <string>list_main</string> </value> </item> <item> <key> <string>row_length</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDownloadBusinessTemplateDialog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDownloadBusinessTemplateDialog.xml index a430b5ecb0..027f852e81 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDownloadBusinessTemplateDialog.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDownloadBusinessTemplateDialog.xml @@ -61,7 +61,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>Default</string> + <string>left</string> </list> </value> </item> @@ -70,7 +70,7 @@ <value> <dictionary> <item> - <key> <string>Default</string> </key> + <key> <string>left</string> </key> <value> <list> <string>your_url</string> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDownloadRepositoryBusinessTemplateListDialog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDownloadRepositoryBusinessTemplateListDialog.xml index 246845845d..a020bf61e6 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDownloadRepositoryBusinessTemplateListDialog.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDownloadRepositoryBusinessTemplateListDialog.xml @@ -67,9 +67,6 @@ <key> <string>group_list</string> </key> <value> <list> - <string>left</string> - <string>right</string> - <string>center</string> <string>bottom</string> <string>hidden</string> </list> @@ -87,12 +84,6 @@ </list> </value> </item> - <item> - <key> <string>center</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>hidden</string> </key> <value> @@ -101,18 +92,6 @@ </list> </value> </item> - <item> - <key> <string>left</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>right</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewImportBusinessTemplateDialog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewImportBusinessTemplateDialog.xml index 84e4186e18..e0afeaf235 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewImportBusinessTemplateDialog.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewImportBusinessTemplateDialog.xml @@ -61,7 +61,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>Default</string> + <string>left</string> </list> </value> </item> @@ -70,7 +70,7 @@ <value> <dictionary> <item> - <key> <string>Default</string> </key> + <key> <string>left</string> </key> <value> <list> <string>your_import_file</string> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewInstallRepositoryBusinessTemplateListDialog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewInstallRepositoryBusinessTemplateListDialog.xml index dbc1cf8f3a..cf743281d3 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewInstallRepositoryBusinessTemplateListDialog.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewInstallRepositoryBusinessTemplateListDialog.xml @@ -67,9 +67,6 @@ <key> <string>group_list</string> </key> <value> <list> - <string>left</string> - <string>right</string> - <string>center</string> <string>bottom</string> <string>hidden</string> </list> @@ -87,12 +84,6 @@ </list> </value> </item> - <item> - <key> <string>center</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>hidden</string> </key> <value> @@ -101,18 +92,6 @@ </list> </value> </item> - <item> - <key> <string>left</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>right</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewMultiInstallationDialog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewMultiInstallationDialog.xml index aa61926424..8f6f46a642 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewMultiInstallationDialog.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewMultiInstallationDialog.xml @@ -68,8 +68,6 @@ <value> <list> <string>left</string> - <string>right</string> - <string>center</string> <string>bottom</string> <string>hidden</string> </list> @@ -87,12 +85,6 @@ </list> </value> </item> - <item> - <key> <string>center</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>hidden</string> </key> <value> @@ -110,12 +102,6 @@ </list> </value> </item> - <item> - <key> <string>right</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> @@ -133,7 +119,7 @@ </item> <item> <key> <string>pt</string> </key> - <value> <string>form_view_dialog</string> </value> + <value> <string>form_dialog</string> </value> </item> <item> <key> <string>row_length</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewUpgradeRepositoryBusinessTemplateListDialog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewUpgradeRepositoryBusinessTemplateListDialog.xml index 9ce79bad94..a528d0a0ef 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewUpgradeRepositoryBusinessTemplateListDialog.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewUpgradeRepositoryBusinessTemplateListDialog.xml @@ -67,9 +67,6 @@ <key> <string>group_list</string> </key> <value> <list> - <string>left</string> - <string>right</string> - <string>center</string> <string>bottom</string> <string>hidden</string> </list> @@ -87,12 +84,6 @@ </list> </value> </item> - <item> - <key> <string>center</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>hidden</string> </key> <value> @@ -101,18 +92,6 @@ </list> </value> </item> - <item> - <key> <string>left</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>right</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashBin_viewTrashObject.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashBin_viewTrashObject.xml index 408d010099..4739d0242d 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashBin_viewTrashObject.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashBin_viewTrashObject.xml @@ -69,7 +69,6 @@ <list> <string>left</string> <string>right</string> - <string>center</string> <string>bottom</string> <string>hidden</string> </list> @@ -87,12 +86,6 @@ </list> </value> </item> - <item> - <key> <string>center</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>hidden</string> </key> <value> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashTool_viewTrashBinList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashTool_viewTrashBinList.xml index ed6749c42d..be2427ced0 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashTool_viewTrashBinList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashTool_viewTrashBinList.xml @@ -67,9 +67,6 @@ <key> <string>group_list</string> </key> <value> <list> - <string>left</string> - <string>right</string> - <string>center</string> <string>bottom</string> </list> </value> @@ -79,31 +76,13 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>center</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>left</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> </list> </value> </item> - <item> - <key> <string>right</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> @@ -121,7 +100,7 @@ </item> <item> <key> <string>pt</string> </key> - <value> <string>form_list</string> </value> + <value> <string>list_main</string> </value> </item> <item> <key> <string>row_length</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log index 5d38c28ae9..6a3e7bf916 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/change_log +++ b/product/ERP5/bootstrap/erp5_core/bt/change_log @@ -1,3 +1,6 @@ +2006-06-26 vincent +* Remove Base_call[View|List]DialogMethod. Everything has been merged & cleaned in Base_callDialogMethod. + 2006-06-22 Vincent * Add xhtml-style-related scripts. -- 2.30.9