Module: check_mk
Branch: master
Commit: 765bd9f1afd2e894787cac29441ba93d32263250
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=765bd9f1afd2e8…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Nov 12 11:38:33 2015 +0100
Fixed styling of folded sidebar
---
web/htdocs/js/sidebar.js | 20 +++++++++++---------
web/htdocs/sidebar.py | 2 +-
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js
index e25c8ea..2d64cf3 100644
--- a/web/htdocs/js/sidebar.js
+++ b/web/htdocs/js/sidebar.js
@@ -24,7 +24,7 @@
var g_content_loc = null;
-var sidebar_folded = false;
+var g_sidebar_folded = false;
//
// Sidebar styling and scrolling stuff
@@ -450,12 +450,12 @@ function startDragScroll(event) {
if (!event)
event = window.event;
- if (sidebar_folded) {
- unfoldSidebar();
+ if (g_sidebar_folded) {
+ unfold_sidebar();
return false;
}
- else if (!sidebar_folded && event.clientX < 10) {
- foldSidebar();
+ else if (!g_sidebar_folded && event.clientX < 10) {
+ fold_sidebar();
return false;
}
@@ -520,11 +520,12 @@ function dragScroll(event) {
return false;
}
-function foldSidebar()
+function fold_sidebar()
{
- sidebar_folded = true;
+ g_sidebar_folded = true;
document.getElementById('check_mk_sidebar').style.position =
"relative";
document.getElementById('check_mk_sidebar').style.left = "-265px";
+ document.getElementById('side_footer').style.display = "none";
if (isWebkit()) {
var oldcols = parent.document.body.cols.split(",");
var oldwidth = parseInt(oldcols[0]);
@@ -537,12 +538,13 @@ function foldSidebar()
}
-function unfoldSidebar()
+function unfold_sidebar()
{
document.getElementById('check_mk_sidebar').style.position = "";
document.getElementById('check_mk_sidebar').style.left = "0";
+ document.getElementById('side_footer').style.display = "";
parent.document.body.cols = "280,*";
- sidebar_folded = false;
+ g_sidebar_folded = false;
get_url('sidebar_fold.py?fold=');
}
diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py
index 0f6c779..05d3bb4 100644
--- a/web/htdocs/sidebar.py
+++ b/web/htdocs/sidebar.py
@@ -229,7 +229,7 @@ def sidebar_foot():
html.write('</div>')
if load_user_config()["fold"]:
- html.final_javascript("foldSidebar();")
+ html.final_javascript("fold_sidebar();")
# Standalone sidebar
def page_side():