diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_deleteObjectList.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_deleteObjectList.xml index 8654851768a9d6a86bbd24573e275caeec87c946..5b3a28b6dc2cdce6cd94c1947d67d3e85042c40b 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_deleteObjectList.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_deleteObjectList.xml @@ -66,7 +66,11 @@ if uid_list is not None:\n object.setPublicationSection("trash")\n object.delete()\n \n -return context.ERP5Site_redirect(website_url, keep_items={"reset": 1})\n +return context.ERP5Site_redirect(website_url + "/unfoldDomain",\n + keep_items={"domain_url": "ung_domain/all_document_list",\n + "form_id": "erp5_web_ung_layout",\n + "list_selection_name": context.REQUEST.get("list_selection_name"),\n + "domain_depth": 0})\n </string> </value> </item> <item> diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml index 7ecfb8361f9f9cc72772783aa69afd7f90718de9..61f25e7c1123ce3c715ffe5420acd86d0944fdbf 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml @@ -49,11 +49,20 @@ function setObjectPropertyValue(method_name, value, parameter){\n $(document).ready(function(){\n $("a[name=\'document_title\']").html(getObjectPropertyValue("getTitle"));\n if ($("div.gadget-column").length == 1) {\n - blank_space_str = "  ";\n $("a.tree-open, a.tree-closed").each(function(){\n - if ($(this).text() != "Document by Type")\n - $(this).html($(this).text() + blank_space_str);\n - });\n + /* XXX - Try Find a good way to the options don\'t break the css. \n + Insert blank spaces is not a clean way*/\n + if ($(this).text() == "Starred" || $(this).text() == "Hidden" || $(this).text() == "Trash"){\n + blank_space = " " + \n + "  ";\n + $(this).html($(this).text() + blank_space);\n + }\n + if ($(this).text() == "All Documents" || \n + $(this).text() == "Owned by me" || \n + $(this).text() == "Opened by me" || \n + $(this).text() == "Shared by me")\n + $(this).html($(this).text() + "  ");\n + })\n $("body").css("overflow", "hidden");\n navigation_html = $("div.listbox-footer div.listbox-page-navigation").html();\n $("div.listbox-footer div.listbox-page-navigation").remove();\n diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml index fe3a27142ee64a5ebebe7092dcc91492fde6b85e..6668b2159a1cb7f753752d1733fce543c46c81cb 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml @@ -835,7 +835,7 @@ table.listbox-table-domain-tree {\n \n td.listbox-table-domain-tree-cell a {\n padding-bottom: 3px;\n - padding-right: 125.5px;\n + padding-right: 125.3px;\n padding-top: 3px;\n }\n a.tree-open {\n diff --git a/bt5/erp5_web_ung_theme/bt/revision b/bt5/erp5_web_ung_theme/bt/revision index 105d7d9ad3afc7bb78a0dec4d829880831605dfb..97a55e1d749c6ac7c783778b6ea2d19cb770909d 100644 --- a/bt5/erp5_web_ung_theme/bt/revision +++ b/bt5/erp5_web_ung_theme/bt/revision @@ -1 +1 @@ -100 \ No newline at end of file +101 \ No newline at end of file