26 Apr
2012
26 Apr
'12
6:04 p.m.
Module: check_mk
Branch: master
Commit: 0144276185f3d656cddd75fe3fb96a3bd1a39f13
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0144276185f3d6…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Apr 26 18:04:23 2012 +0200
Fixed dimensions of bread crump
---
web/htdocs/wato.css | 54 ++++++++++++--------------------------------------
web/htdocs/wato.py | 10 ++++++--
2 files changed, 20 insertions(+), 44 deletions(-)
diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css
index 94d3a83..826c4bf 100644
--- a/web/htdocs/wato.css
+++ b/web/htdocs/wato.css
@@ -45,6 +45,7 @@ Boston, MA 02110-1301 USA.
/* Tables in WATO are not size to 100% per default */
.wato table.data {
+ box-shadow: 0 0 3px #334488;
width: auto;
}
.wato table.data th {
@@ -259,8 +260,10 @@ table.validationerror img {
/* Path to current folder at top of screen */
.wato div.folderpath {
- margin-bottom: 10px;
+ margin-bottom: 8px;
height: 30px;
+ position: relative;
+ left: 3px;
}
.wato div.folderpath ul {
@@ -303,10 +306,16 @@ table.validationerror img {
}
.wato div.folderpath li select {
- padding-top: 1px;
- padding-bottom: 1px;
+ padding: 2px 0px 2px 4px;
background-color: #6da1b8;
- color: #000;
+ margin: 0;
+ color: #fff;
+ font-weight: normal;
+ font-size: 8pt;
+ border-style: none;
+ position: relative;
+ right: -6px;
+ z-index: 200;
}
.wato div.folderpath li:hover select {
@@ -360,43 +369,6 @@ table.validationerror img {
background-image: url('images/breadcrumb_r_hi.png');
}
-/*.wato div.folderpath a, .wato div.folderpath b, .wato div.folderpath i {
- float: left;
-}
-
-.wato div.folderpath i {
- margin: 0px 3px;
- font-weight: bold;
- font-style: normal;
-}
-
-.wato div.folderpath a,
-.wato div.folderpath b {
- -moz-border-radius: 3px;
- background-color: #8ab;
- padding: 2px 9px;
- color: #fff;
- font-weight: normal;
-}
-.wato div.folderpath a {
- text-decoration: none;
-}
-.wato div.folderpath a:hover {
- color: #fff;
- background-color: #9bc;
-}*/
-
-.wato select.folderpath {
- background-color: #8ab;
- -moz-border-radius: 3px;
- padding: 2px 4px;
- margin: 0;
- color: #fff;
- font-weight: normal;
- font-size: 8pt;
- border-style: none;
-}
-
.wato div.floatfolder {
position: relative;
left:-14px;
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index b165568..06fa96f 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -317,7 +317,6 @@ def page_handler():
else:
html.context_button(buttontext, make_link([("mode",
target)]))
html.end_context_buttons()
- html.write("<br>")
# Show outcome of action
if html.has_user_errors():
@@ -10704,6 +10703,7 @@ def render_folder_path(the_folder = 0, link_to_last = False,
keepvarnames = ["mo
while folder:
folders.append(folder)
folder = folder.get(".parent")
+ subfolders = the_folder[".folders"]
parts = []
for folder in folders[::-1]:
@@ -10715,6 +10715,7 @@ def render_folder_path(the_folder = 0, link_to_last = False,
keepvarnames = ["mo
else:
parts.append(the_folder["title"])
+
# Render the folder path
html.write("<div class=folderpath><ul>\n")
num = 0
@@ -10724,11 +10725,14 @@ def render_folder_path(the_folder = 0, link_to_last = False,
keepvarnames = ["mo
else:
bc_el_start(z_index = 100 + num)
html.write('<div class=content>%s</div>\n' % part)
- bc_el_end()
+
+ bc_el_end(num == len(parts)-1
+ and not (
+ len(subfolders) > 0 and not link_to_last)
+ and "end" or "")
num += 1
# Render the current folder when having subfolders
- subfolders = the_folder[".folders"]
if len(subfolders) > 0 and not link_to_last:
bc_el_start(z_index = 100 + num)
html.write("<div class=content><form method=GET
name=folderpath>")