Module: check_mk
Branch: master
Commit: 37dadd920de17ea3558e9a4efcb547265a514eb7
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37dadd920de17e…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri May 11 13:02:40 2012 +0200
WATO: show complete path when moving folders
---
ChangeLog | 1 +
web/htdocs/wato.css | 13 +++++++------
web/htdocs/wato.py | 29 ++++++++++++++++++-----------
3 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 10d374f..e679e7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
* Hide check_mk variable names per default now (change via global settings)
* New layout of global settings
* Folder layout: show contact groups of folder
+ * Folder movement: always show complete path to target folder
* FIX: fix parent scan on single site installations
* FIX: fix folder visibility permission handling
* FIX: honor folder-permissions when creating, deleting
diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css
index 42a703c..b7bdd87 100644
--- a/web/htdocs/wato.css
+++ b/web/htdocs/wato.css
@@ -377,20 +377,20 @@ table.validationerror img {
.wato div.floatfolder .edit {
position: absolute;
- top:20px;
- right:54px;
+ top: 20px;
+ right: 47px;
}
.wato div.floatfolder .move {
position: absolute;
- top:20px;
- right:32px;
+ top: 20px;
+ right: 25px;
}
.wato div.floatfolder .delete {
position: absolute;
- top:20px;
- right:10px;
+ top: 20px;
+ right: 3px;
}
.wato div.floatfolder .infos {
@@ -448,6 +448,7 @@ table.validationerror img {
.wato div.move_dialog span {
display: block;
margin-bottom: 2px;
+ color: white;
}
.wato div.hoverarea {
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 7058b02..a301a36 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -917,6 +917,18 @@ def prepare_folder_info():
set_current_folder() # set g_folder from HTML variable
+def folder_title_path(path, withlinks = False):
+ folder = g_folders.get(path)
+ titles = []
+ while (folder):
+ title = folder["title"]
+ if withlinks:
+ title = "<a
href='wato.py?mode=folder&folder=%s'>%s</a>" %
(folder[".path"], title)
+ titles.append(title)
+ folder = folder.get(".parent")
+ return titles[::-1]
+
+
def check_host_permissions(hostname, exception=True, folder=None):
if folder == None:
folder = g_folder
@@ -1370,7 +1382,11 @@ def move_to_folder_combo(what, thing = None, top = False, multiple
= False):
# avoid naming conflict!
or thing[".name"] in afolder[".folders"])):
os_path = afolder[".path"]
- msg = afolder["title"]
+ title_path = folder_title_path(os_path)
+ if len(title_path) > 1:
+ del title_path[0] # remove name of main folder
+ msg = " / ".join(title_path)
+ # msg = afolder["title"]
if os_path and not config.wato_hide_filenames:
msg += " (%s)" % os_path
selections.append((os_path, msg))
@@ -10918,16 +10934,7 @@ class API:
# components, e.g. "muc/north" -> [ "Main Directory",
"Munich", "North" ]
def get_folder_title_path(self, path, withlinks=False):
load_all_folders() # TODO: speed up!
- folder = g_folders.get(path)
- titles = []
- while (folder):
- title = folder["title"]
- if withlinks:
- title = "<a
href='wato.py?mode=folder&folder=%s'>%s</a>" %
(folder[".path"], title)
- titles.append(title)
- folder = folder.get(".parent")
- return titles[::-1]
-
+ return folder_title_path(path, withlinks)
# Returns the number of not activated changes.
def num_pending_changes(self):