[checkmk-commits] Check_MK Git: check_mk: #1638 FIX Fixed styling small styling problems in wiki snapin

Module: check_mk Branch: master Commit: fe89ccd85f753f14fcd43802f228f2ba8262ab3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe89ccd85f753f… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Thu Dec 4 11:08:38 2014 +0100 #1638 FIX Fixed styling small styling problems in wiki snapin --- .werks/1638 | 9 +++++++++ ChangeLog | 1 + web/plugins/sidebar/search.py | 3 ++- web/plugins/sidebar/shipped.py | 14 ++++++++++---- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.werks/1638 b/.werks/1638 new file mode 100644 index 0000000..5afeb70 --- /dev/null +++ b/.werks/1638 @@ -0,0 +1,9 @@ +Title: Fixed styling small styling problems in wiki snapin +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417687698 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index caca78c..32a6929 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,6 +135,7 @@ * 1607 FIX: check_http: Fixed broken links in escaped plugin output * 1614 FIX: Fixed wrong URL in webapi.py documentation * 1619 FIX: Renamed "Hostgroups" and "Servicegroups" views to "Host Groups" and "Service Groups" + * 1638 FIX: Fixed styling small styling problems in wiki snapin WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index 7494ab6..6e60dab 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -53,7 +53,8 @@ sidebar_snapins["search"] = { height: 26px; margin-top: -25px; left: 196px; - float:right; + float: left; + position: relative; z-index:100; } diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 1fb38a4..210e2ab 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1165,6 +1165,8 @@ def render_wiki(): if start_ul == True: if title: html.begin_foldable_container("wikisnapin", title, True, title, indent=True) + else: + html.write('<ul>') start_ul = False ul_started = True @@ -1179,7 +1181,6 @@ def render_wiki(): link = erg[0] name = erg[0] - if link.startswith("http://") or link.startswith("https://"): simplelink(name, link, "_blank") else: @@ -1196,8 +1197,8 @@ def render_wiki(): if ul_started == True: html.write("</ul>") except IOError: - html.write("You have to create a <a href='/%s/wiki/doku.php?id=%s'>sidebar</a> first" % - (defaults.omd_site, _("sidebar") )) + html.write("<p>To get a navigation menu, you have to create a <a href='/%s/wiki/doku.php?id=%s' " + "target='main'>sidebar</a> in your wiki first.</p>" % (defaults.omd_site, _("sidebar"))) if defaults.omd_root: sidebar_snapins["wiki"] = { @@ -1211,6 +1212,10 @@ if defaults.omd_root: color: white; } + #snapin_container_wiki div.content p { + font-weight: normal; + } + #wiki_navigation { text-align: left; } @@ -1229,7 +1234,8 @@ if defaults.omd_root: height: 26px; margin-top: -25px; left: 196px; - float:right; + float: left; + position: relative; z-index:100; }