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 09557c7a84edc196d358622c922eac6ea95763b2..b3d693422b7f7e22aaf6af1c4740fa7e9ab041f2 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 @@ -31,11 +31,12 @@ <value> <string encoding="cdata"><![CDATA[ $(document).ready(function(){\n - navigation_html = $("div.listbox-footer div.listbox-page-navigation").html();\n - $("div.listbox-footer div.listbox-page-navigation").remove();\n - navigation_div = "<div class=\'listbox-navigation\'>" + navigation_html + "</div>"\n - $("div.toolbar").append(navigation_div);\n if ($("div.gadget-column").length == 1) {\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 + navigation_div = "<div class=\'listbox-navigation\'>" + navigation_html + "</div>";\n + $("div.toolbar").append(navigation_div);\n var tr_length = $("div.main-right tbody tr").length;\n if (tr_length < 16){\n var height = tr_length * 1.5;\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 89721b4a35c249322a5f475fe9f333017d900535..7ac63158192b0641dfb64dbe5b50008b2f70f13f 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 @@ -336,7 +336,7 @@ div.header-right {\n \n div.main-left, div.main-right, div.main {\n margin-top: -0.5em;\n - height:29.7em;;\n + height:45em;\n }\n \n div.main {\n @@ -417,10 +417,9 @@ div.main-right div.content {\n \n \n div.main-right tbody {\n - height: 24em;\n - -moz-box-sizing:border-box;\n - overflow-y:scroll;\n + height:25.35em;\n overflow-x:hidden;\n + overflow-y:auto;\n }\n \n div.header-left {\n diff --git a/bt5/erp5_web_ung_theme/bt/revision b/bt5/erp5_web_ung_theme/bt/revision index 7730ef7f3e0586b9070623baed6032dff904c9ea..0fa6a7b088051e48b8dc94d598b7e324e6f691c9 100644 --- a/bt5/erp5_web_ung_theme/bt/revision +++ b/bt5/erp5_web_ung_theme/bt/revision @@ -1 +1 @@ -89 \ No newline at end of file +90 \ No newline at end of file