[checkmk-commits] 4144 FIX Sidebar: Bottom of last snapin was not 100% visible

Module: check_mk Branch: master Commit: c7dd077153e6bf03d275d17364381b746b5cc2da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7dd077153e6bf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 20 16:14:05 2016 +0100 4144 FIX Sidebar: Bottom of last snapin was not 100% visible Change-Id: Ic44c004d46913c7f2ebe4f4b1f8aa1a64bf7f43f --- .werks/4144 | 9 +++++++++ ChangeLog | 1 + web/htdocs/js/sidebar.js | 3 ++- web/htdocs/sidebar.css | 1 - web/htdocs/sidebar.py | 2 +- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/4144 b/.werks/4144 new file mode 100644 index 0000000..5ff2d71 --- /dev/null +++ b/.werks/4144 @@ -0,0 +1,9 @@ +Title: Sidebar: Bottom of last snapin was not 100% visible +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1482246812 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 666ffc9..07d2601 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... * 4143 FIX: Fixed possible log spam "MKAuthException: Invalid credentials" in web.log... * 4004 FIX: Fixed exception when viewing availability of BI aggregations... + * 4144 FIX: Sidebar: Bottom of last snapin was not 100% visible WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 157dabc..0251792 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -403,7 +403,8 @@ function set_sidebar_size() { if (height == 0) return; - oContent.style.height = (height - oHeader.clientHeight - oFooter.clientHeight + 4) + 'px'; + // -2 -> take outer border of oHeader and oFooter into account + oContent.style.height = (height - oHeader.clientHeight - oFooter.clientHeight - 2) + 'px'; } var scrolling = true; diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 9307394..1e5b7b0 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -139,7 +139,6 @@ body.side.screenshotmode { height: 500px; overflow: hidden; color: #000000; - padding-top: 5px; position: absolute; top: 50px; } diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index a34d582..83509ec 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -316,9 +316,9 @@ def render_snapin_styles(snapin): def render_snapin(name, state): snapin = sidebar_snapins.get(name) - render_snapin_styles(snapin) html.open_div(id_="snapin_container_%s" % name, class_="snapin") + render_snapin_styles(snapin) # When not permitted to open/close snapins, the snapins are always opened if state == "open" or not config.user.may("general.configure_sidebar"): style = None