diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml
index c3d77b2733ecdd84f87028e89e4f676e3f5466da..9a5996e2a6e261d8c7d13f8db539390c6322d67a 100644
--- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml
+++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml
@@ -40,8 +40,11 @@
<body>\n
<tal:block metal:define-macro="master">\n
<tal:block tal:define="website here/getWebSiteValue;\n
- portal_path python:website.absolute_url();\n
+ portal_path python: website.absolute_url();\n
dummy python: request.set(\'editable_mode\', 0);\n
+ layout_form_id here/getApplicableLayout | nothing;\n
+ ignore_layout request/ignore_layout | nothing;\n
+ global layout_form python:(not layout_form_id or ignore_layout) or getattr(here, layout_form_id, None);\n
has_no_layout python: layout_form is None;\n
has_editor python: here.absolute_url() != portal_path;\n
aggregate python: has_no_layout or layout_form.Form_getGroupList(\n
@@ -50,7 +53,6 @@
navigation_area python:aggregate.get(\'navigation\', []);\n
header_area python:aggregate.get(\'header\', []);\n
main_area python:aggregate.get(\'main\', []);\n
- has_no_layout python: layout_form is None;\n
global css_list_template css_list_template | python: [];\n
global css_list_ung_template python:css_list_template + [\n
\'ung_theme.css\',\n
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 1ab6f3aea5b857b6f6559b60952c6770054129e1..00018d3220c9073cb3496e1ccee8d66d58a61139 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
@@ -105,6 +105,7 @@ function changeCheckBoxValue(value){\n
}\n
\n
$().ready(function(){\n
+ $("p.clear").remove();\n
if ($("div.gadget-column").length == 0 && window.location.href.split("?").length > 1) {\n
parameterList = getUrlParameterList();\n
if (parameterList.hasOwnProperty("upload_document") == true){\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 0ebd27acf69a0b4d7c9a5686f3a3b4352db85864..1d2a06d02781e85c9c0da26e95b16bd6ab35ce01 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
@@ -327,8 +327,8 @@ div.header-right {\n
}\n
\n
div.main-left, div.main-right, div.main {\n
- margin-top: -1em;\n
- height:45em;\n
+ height: 45em;\n
+ margin-top: -0.6em;\n
}\n
\n
div.main {\n
@@ -415,7 +415,6 @@ div.listbox-body div.main-right tbody {\n
}\n
\n
div.header-left {\n
- height:80%;\n
margin-left:1px;\n
margin-top:-4px;\n
}\n
@@ -733,8 +732,8 @@ div.listbox-navigation {\n
}\n
\n
div.listbox-navigation input {\n
- height:14px;\n
- width:20px;\n
+ height: 18px;\n
+ width: 20px;\n
}\n
\n
div.listbox-header-box {\n
@@ -982,6 +981,17 @@ table#navigation_table div#add_new_gadget_link {\n
\n
div.front_pad div#page_wrapper {\n
margin: -0.5em 0 0 !important;\n
+}\n
+\n
+#add-gadgets{\n
+ font-size: 11px;\n
+}\n
+\n
+form#ung_preference,\n
+ form#system_preference,\n
+ form#erp5_preference {\n
+ margin:0px;\n
+ padding: 0px;\n
}
]]></string> </value>
diff --git a/bt5/erp5_web_ung_theme/bt/revision b/bt5/erp5_web_ung_theme/bt/revision
index 09df927592b612404c098496f5fe35d89418ba17..2efea5198bec85fb12bc22ec549bd4db99be6de5 100644
--- a/bt5/erp5_web_ung_theme/bt/revision
+++ b/bt5/erp5_web_ung_theme/bt/revision
@@ -1 +1 @@
-166
\ No newline at end of file
+167
\ No newline at end of file