[checkmk-commits] Replaced some more images with simple CSS definitions

Module: check_mk Branch: master Commit: 70cb918a9c6177a313aea577fc6080e197a11a57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70cb918a9c6177… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon Aug 22 13:14:56 2016 +0200 Replaced some more images with simple CSS definitions --- web/htdocs/images/sidebar_bottom.png | Bin 409 -> 0 bytes web/htdocs/images/sidebar_top.png | Bin 18195 -> 18000 bytes web/htdocs/images/snapin_background.png | Bin 143 -> 0 bytes web/htdocs/images/snapin_closed.png | Bin 720 -> 0 bytes web/htdocs/images/snapin_footer.png | Bin 402 -> 0 bytes web/htdocs/images/snapin_header.png | Bin 438 -> 0 bytes web/htdocs/images/snapinfooter_addsnapin_down.png | Bin 839 -> 0 bytes .../images/snapinfooter_einstellungen_down.png | Bin 1080 -> 0 bytes web/htdocs/images/snapinfooter_logout_down.png | Bin 1178 -> 0 bytes web/htdocs/js/sidebar.js | 5 - web/htdocs/sidebar.css | 96 +++++++++----------- web/htdocs/sidebar.py | 2 +- 12 files changed, 46 insertions(+), 57 deletions(-) diff --git a/web/htdocs/images/sidebar_bottom.png b/web/htdocs/images/sidebar_bottom.png deleted file mode 100644 index 1257ff4..0000000 Binary files a/web/htdocs/images/sidebar_bottom.png and /dev/null differ diff --git a/web/htdocs/images/sidebar_top.png b/web/htdocs/images/sidebar_top.png index 43fa2ab..cdab624 100644 Binary files a/web/htdocs/images/sidebar_top.png and b/web/htdocs/images/sidebar_top.png differ diff --git a/web/htdocs/images/snapin_background.png b/web/htdocs/images/snapin_background.png deleted file mode 100644 index 197eb87..0000000 Binary files a/web/htdocs/images/snapin_background.png and /dev/null differ diff --git a/web/htdocs/images/snapin_closed.png b/web/htdocs/images/snapin_closed.png deleted file mode 100644 index a338dbf..0000000 Binary files a/web/htdocs/images/snapin_closed.png and /dev/null differ diff --git a/web/htdocs/images/snapin_footer.png b/web/htdocs/images/snapin_footer.png deleted file mode 100644 index bde4972..0000000 Binary files a/web/htdocs/images/snapin_footer.png and /dev/null differ diff --git a/web/htdocs/images/snapin_header.png b/web/htdocs/images/snapin_header.png deleted file mode 100644 index 378c2f5..0000000 Binary files a/web/htdocs/images/snapin_header.png and /dev/null differ diff --git a/web/htdocs/images/snapinfooter_addsnapin_down.png b/web/htdocs/images/snapinfooter_addsnapin_down.png deleted file mode 100644 index f099384..0000000 Binary files a/web/htdocs/images/snapinfooter_addsnapin_down.png and /dev/null differ diff --git a/web/htdocs/images/snapinfooter_einstellungen_down.png b/web/htdocs/images/snapinfooter_einstellungen_down.png deleted file mode 100644 index 88d58d9..0000000 Binary files a/web/htdocs/images/snapinfooter_einstellungen_down.png and /dev/null differ diff --git a/web/htdocs/images/snapinfooter_logout_down.png b/web/htdocs/images/snapinfooter_logout_down.png deleted file mode 100644 index c136422..0000000 Binary files a/web/htdocs/images/snapinfooter_logout_down.png and /dev/null differ diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 134281e..07745fd 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -659,8 +659,6 @@ function toggle_sidebar_snapin(oH2, url) { var oContent = child; else if (child.tagName == 'DIV' && (child.className == 'head open' || child.className == "head closed")) var oHead = child; - else if (child.tagName == 'DIV' && child.className == 'foot') - var oFoot = child; } var oImgMini = oHead.childNodes[0].childNodes[0].childNodes[0]; @@ -668,13 +666,11 @@ function toggle_sidebar_snapin(oH2, url) { var closed = oContent.style.display == "none"; if (closed) { oContent.style.display = "block"; - oFoot.style.display = "block"; oHead.className = "head open"; oImgMini.src = "images/button_minisnapin.png"; } else { oContent.style.display = "none"; - oFoot.style.display = "none"; oHead.className = "head closed"; oImgMini.src = "images/button_maxisnapin.png"; } @@ -682,7 +678,6 @@ function toggle_sidebar_snapin(oH2, url) { get_url(url + (closed ? "open" : "closed")); oContent = null; oHead = null; - oFoot = null; childs = null; } diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index e6d3f4a..70b3caa 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -56,10 +56,16 @@ body.side.screenshotmode { position: relative; top: 0px; left: 0px; - width: 100%; - height: 55px; + width: 274px; + height: 49px; z-index: 10; - background-repeat: no-repeat; + + border: 1px solid #264755; + border-top: 0; + border-left: 0; + border-bottom-right-radius: 5px; + box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.50); + background: #498aa6; } #side_bg { @@ -86,18 +92,19 @@ body.side.screenshotmode { width: 10px; height: 55px; z-index: 15; + cursor: pointer; } + #side_fold:hover { background-repeat: no-repeat; background-position: -3px 7px; background-image: url("images/side_fold.png"); } - #side_version { position: absolute; top: 12px; - right: 20px; + right: 10px; z-index: 54; color: #fff; text-align: right; @@ -146,16 +153,22 @@ body.side.screenshotmode { position: absolute; bottom: 0; left: 0; - height: 44px; - width: 100%; + height: 38px; + width: 274px; z-index: 10; - background-repeat: no-repeat; - background-image: url("images/sidebar_bottom.png"); + margin: 0; + + border-color: #86b1c4 #264755; + border-width: 1px 1px 0 0; + border-style: solid; + border-top-right-radius: 5px; + box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.50); + background: #498aa6; } #side_footer img.iconbutton { position: relative; - top: 10px; + top: 4px; left: 9px; margin-right: 3px; width: 33px; @@ -164,10 +177,9 @@ body.side.screenshotmode { #side_footer div.copyright { color: #fff; - position: relative; - left: 141px; - top: -5px; - width: 122px; + position: absolute; + right: 10px; + bottom: 5px; text-align: right; } @@ -181,10 +193,16 @@ body.side.screenshotmode { /* General layout of snapins */ div.snapin { - width: 1555px; - margin: 0 0 0 5px; padding: 0; overflow: hidden; + border-color: #8ab1c0 #294753 #294753 #8ab1c0; + border-width: 1px; + border-style: solid; + width: 248px; + margin: 5px 10px; + border-radius: 5px; + box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.50); + background: #508aa1; } div.snapin:last-child { @@ -193,35 +211,26 @@ div.snapin:last-child { /* Header of the snapin */ div.snapin div.head { - width: 260px; + background-color: #6da1b8; text-align: center; color: #fff; - height: 26px; - line-height: 29px; + height: 20px; + line-height: 20px; } div.snapin div.head b { font-weight: normal; } - -div.snapin div.head.open { - background-image: url("images/snapin_header.png"); -} - -div.snapin div.head.closed { - background-image: url("images/snapin_closed.png"); -} - /* close button on header */ div.snapin div.closesnapin { float: right; - margin-right: 12px; - margin-top: 11px; + margin-right: 6px; + margin-top: 6px; line-height: 0px; height: 8px; - width:8px; - padding:0; + width: 8px; + padding: 0; } div.snapin div.closesnapin img { @@ -231,8 +240,8 @@ div.snapin div.closesnapin img { div.snapin div.minisnapin { float: left; - margin-left: 13px; - margin-top: 11px; + margin-left: 6px; + margin-top: 6px; line-height: 0px; height: 8px; } @@ -242,24 +251,9 @@ div.snapin div.minisnapin img { height: 8px; } - div.snapin div.content { - background-image: url("images/snapin_background.png"); - background-repeat: repeat-y; - background-position: left; - - /* It's important for the left/right padding to be substracted - * from the width defined below. The regular width would be 260px. */ - padding: 10px 15px 5px; - width: 230px; -} - -div.snapin div.foot { - background-image: url("images/snapin_footer.png"); - background-repeat: no-repeat; - width: 260px; - height: 5px; - line-height: 5px; + padding: 10px; + width: 228px; } /* diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 5537565..e204f1b 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -370,7 +370,7 @@ def render_snapin(name, state): html.write('<script>get_url("%s", updateContents, "snapin_%s")</script>' % (refresh_url, name)) except Exception, e: snapin_exception(e) - html.write('</div><div class="foot"%s></div>\n' % style) + html.write('</div>\n') html.write('</div>') return refresh_url