Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64139 discussions

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 76c0c7a60accf1c15ee8d76ec6229b8b081256b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76c0c7a60accf1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 4 11:04:57 2011 +0100 Updated bug entries --- .bugs/72 | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.bugs/72 b/.bugs/72 index ee933e1..32428bf 100644 --- a/.bugs/72 +++ b/.bugs/72 @@ -1,11 +1,16 @@ Title: Quicksearch case-insensitive Component: multisite +State: done +Class: feature +Date: 2010-12-22 11:07:51 Benefit: 1 -State: open Cost: 1 -Date: 2010-12-22 11:07:51 -Class: feature +Fun: 0 Evtl. sollte das Case-Insensitive werden. Es spricht doch eigentlich nix dagegen. Gefordert wird das von Leuten, die ihre Hosts mit Großbuchstaben schreiben. Ich denke bei den Services ist es jetzt schon ci. + +2011-01-04 11:04:51: changed state open -> done +Original Verhalten wieder hergestellt. Das Snapin war schonmal case insensitive. +Ist wohl unter die Räder gekommen.

13 years, 8 months

Check_MK Git: check_mk: Sidebar: The sidebar quicksearch snapin is case insensitive again

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 40a1704c849b1738c4b1ce13c0bcb79ce291651c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40a1704c849b17… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 4 11:05:09 2011 +0100 Sidebar: The sidebar quicksearch snapin is case insensitive again --- ChangeLog | 1 + web/htdocs/js/search.js | 11 +++++++++-- web/plugins/sidebar/search.py | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ffaf27..9a66338 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * Sidebar: Fixed scrolling problem in IE8 with compat mode (or maybe older IE versions) which broke the snapin titles and also the tactical overview table * Sidebar: Fixed bulletlist positioning + * Sidebar: The sidebar quicksearch snapin is case insensitive again * Fixed header displaying on views when the edit button is not shown to the user * View pages are not refreshed when at least one form (Filter, Commands, Display Options) is open diff --git a/web/htdocs/js/search.js b/web/htdocs/js/search.js index 7c6ba69..4340be0 100644 --- a/web/htdocs/js/search.js +++ b/web/htdocs/js/search.js @@ -100,7 +100,7 @@ function mkSearchFindUrl(aSearchObjects, objType, oField) { for (var i in aSearchObjects) { var objSite = aSearchObjects[i][0]; var objName = aSearchObjects[i][1]; - if (objName.indexOf(namepart) > -1) { + if (mkSearchMatch(objName, namepart)) { found ++; if (url != null) { // found second match -> not unique url = null; @@ -347,6 +347,12 @@ function mkSearchGetUrl(objType, objName, objSite, numMatches) { return 'view.py?view_name=servicedesc&service=' + objName + '&site=' + objSite; } +// This performs a case insensitive search of a substring in a string +// Returns true if found and false if not +function mkSearchMatch(base, search) { + return base.toLowerCase().indexOf(search.toLowerCase()) > -1; +} + function mkSearchAddSearchResults(aSearchObjects, objType, val) { val = mkSearchCleanupString(val, objType); // Build matching regex @@ -364,7 +370,8 @@ function mkSearchAddSearchResults(aSearchObjects, objType, val) { objName = aSearchObjects[i][1]; // if(objName.match(oMatch)) { - if(objName.indexOf(val) > -1) { + // case insensitive search! + if(mkSearchMatch(objName, val)) { var url = mkSearchGetUrl(objType, objName, objSite, 1); var oResult = { 'id': 'result_' + objName, diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index d721d39..18e84b0 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -48,7 +48,7 @@ def render_searchform(): html.write('<div id="mk_side_search" onclick="mkSearchClose();">') html.write('<input id="mk_side_search_field" type="text" name="search" autocomplete="off" />') html.write('</div>') - html.write("<script type='text/javascript' src='search.js'></script>\n") + html.write("<script type='text/javascript' src='js/search.js'></script>\n") html.write("<script type='text/javascript'>\n") # Store (user) hosts in JS array

13 years, 8 months

Check_MK Git: check_mk: gb: new command commit

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c1538a349a563ccebd61c18563c4beec49c099b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1538a349a563c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 28 10:46:46 2010 +0100 gb: new command commit --- gb | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/gb b/gb index 0d4de22..f48ef6e 100755 --- a/gb +++ b/gb @@ -79,7 +79,7 @@ def check_modified(): global g_modified g_modified = set([]) for line in os.popen("git status --porcelain"): - if line.startswith("M") and ".bugs/" in line: + if line[0] in "AM" and ".bugs/" in line: try: id = line.rsplit("/", 1)[-1].strip() g_modified.add(int(id)) @@ -155,6 +155,7 @@ where COMMAND is one of: delete #.. - delete bug(s) grep WHAT... - grep in titles and descriptions edit [#] - open bug # in editor (or newest bug) + commit - commit all changed and new bugs """) sys.exit(1) @@ -416,6 +417,18 @@ def main_edit(args): git_add(g_bugs[int(ids)]) +def main_commit(args): + if len(g_modified) == 0: + bail_out("No new or modified bug.") + else: + sys.stdout.write("Commiting:\n") + for id in g_modified: + list_bug(g_bugs[id]) + if 0 == os.system("git commit -m 'Updated bug entries' ."): + sys.stdout.write("--> Successfully committed %d bugs." % len(g_modified)) + else: + bail_out("Cannot commit.") + # _ # _ __ ___ __ _(_)_ __ # | '_ ` _ \ / _` | | '_ \ @@ -439,6 +452,7 @@ commands = { "delete" : main_delete, "grep" : main_grep, "edit" : main_edit, + "commit" : main_commit, } hits = []

13 years, 8 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ddf0867cbdd1656e7cc00c50414a9de48c81b826 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddf0867cbdd165… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 28 10:46:11 2010 +0100 Updated bug entries --- .bugs/35 | 18 +++++++++++++++++- .bugs/87 | 9 +++++++++ 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/.bugs/35 b/.bugs/35 index 2526ef6..f6f4478 100644 --- a/.bugs/35 +++ b/.bugs/35 @@ -1,4 +1,4 @@ -Title: View-Editor: Spaltenzahl irgendwie dynamisch machen +Title: View-Editor: Spalten-Editieren komfortabler machen Component: multisite Benefit: 3 State: open @@ -9,3 +9,19 @@ Class: feature Das aktuelle Prinzip ist eh doof, weil man keine Spalten in der Mitte einfügen kann. Das müsste man irgendwie über Javascript hinbekommen. Auch dass man nicht auf 10 begrenzt ist. + +Was fehlt ist: +- einfügen von Spalten +- Umsortieren von Spalten (noch oben/unten verschieben) + +Problem dabei: Die HTML-Variablen sind durchnummeriert. Die +Nummern bleiben erhalten, selbst wenn man die Elemente im +DOM-Baum verschiebt. + +Wenn man die Nummern im DOM-Baum nicht anpassen kann, dann +bietet sich vielleicht als Lösung, dass alle Elemente die +*gleichen* HTML-Variablen verwenden. Diese kommen ja bei +Apache trotzdem an. Und dass man dann nicht html.var() +verwendet, sondern eine Hilfsfunktion, die mehrfach genannte +Variablen konserviert und z.B. als Array zur Verfügung stellt. + diff --git a/.bugs/87 b/.bugs/87 new file mode 100644 index 0000000..0f0561e --- /dev/null +++ b/.bugs/87 @@ -0,0 +1,9 @@ +Title: TEST +Component: core +Benefit: 1 +State: open +Cost: 1 +Date: 2010-12-28 10:41:33 +Class: todo + +TEST

13 years, 8 months

Check_MK Git: check_mk: Multisite: new feature: tooltip columns

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 90bf23704b6b24ffa0db65a13306779a3f953484 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90bf23704b6b24… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 27 17:09:46 2010 +0100 Multisite: new feature: tooltip columns Still not being used by builtin views --- .bugs/57 | 5 +-- ChangeLog | 2 + web/.f12 | 2 +- web/htdocs/check_mk.css | 38 +++++++++++++++++++-- web/htdocs/htmllib.py | 11 ++++++ web/htdocs/js/check_mk.js | 21 +++++++++++ web/htdocs/js/sidebar.js | 9 ----- web/htdocs/views.py | 82 +++++++++++++++++++++++++++++++++++--------- 8 files changed, 137 insertions(+), 33 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=90bf23704b…

13 years, 8 months

Check_MK Git: check_mk: Updated some bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d2d843d723b2ee58f69431cb568864b7271f5c2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2d843d723b2ee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 27 13:02:15 2010 +0100 Updated some bug entries --- .bugs/54 | 2 +- .bugs/57 | 11 ++++++++--- .bugs/86 | 15 +++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.bugs/54 b/.bugs/54 index a953314..072878e 100644 --- a/.bugs/54 +++ b/.bugs/54 @@ -1,4 +1,4 @@ -Title: \Precompile und cmk -N parallelisieren +Title: Precompile und cmk -N parallelisieren Component: core Benefit: 1 State: open diff --git a/.bugs/57 b/.bugs/57 index 59b8c94..fb02025 100644 --- a/.bugs/57 +++ b/.bugs/57 @@ -10,9 +10,14 @@ Hover: Wenn man über einen Painter geht, könnte man eine Hover aufmachen, der einen weiteren Painter anzeigt. Das macht man über eine Auswahlbox analog zu der "Link to". -Kritisch ist hier wahrscheinlich hauptsächlich die Frage, wie man -das im View-Editor noch sinnvoll unterbringt. Die ganze Spalten-geschicht -muss man dann wohl endgültig neu aufbauen. +Kritisch ist hier wahrscheinlich hauptsächlich die Frage, wie man das im +View-Editor noch sinnvoll unterbringt. Die ganze Spalten-geschicht muss man +dann wohl endgültig neu aufbauen. Man kann an dieser Stelle noch überlegen, +dass man neben dem Hover-Painter auch Hover-Views einbaut (siehe #0086). In so einem Hover-Ding könnte man aber viele Interessante Dinge unterbringen, z.B. host notes, PNP popups und vieles mehr. + +Stand jetzt: Halb programmiert. Man kann Tooltips konfigurieren. +Der Editor schaut noch doof aus. Die Builtin-Views müssen noch +mit Tooltips ausgestattet werden, wo sinnvoll. diff --git a/.bugs/86 b/.bugs/86 new file mode 100644 index 0000000..4958adc --- /dev/null +++ b/.bugs/86 @@ -0,0 +1,15 @@ +Title: Hover-Preview von View +Component: multisite +Benefit: 3 +State: open +Cost: 3 +Date: 2010-12-26 14:45:15 +Class: feature + +Idee: Man könnte zu einem Painter ein Hover-Preview definieren: einfach +eine andere View (analog zu Kontextlink). Anstelle eines Links wird aber +ein Hover eingebaut, so dass man den Inhalt der View (nur die Tabelle) +per Popup bekommt. Dazu mache ich eine spezielle URL, über die man eine +View als Popup bekommt. Andererseits geht das ja auch schon jetzt mit +den display_options. Zusätzlich bräuchte man noch eine Option, damit +die Schriftart kleiner wird oder sowas.

13 years, 8 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 991aadf6a6072d3e10b0094e2ee55433e15305b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=991aadf6a6072d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 27 13:02:33 2010 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 8 months

Check_MK Git: check_mk: Set version to 1.1.9i4

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cf97b49dc39c342e111c6e33309bc5bd309c98c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf97b49dc39c34… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Dec 26 14:04:30 2010 +0100 Set version to 1.1.9i4 --- Makefile | 4 +++- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 95232 -> 95232 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes livestatus/configure.ac | 2 +- scripts/install_nagios.sh | 2 +- scripts/setup.sh | 2 +- 11 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 9ad879c..99b28d5 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.9i3 +VERSION = 1.1.9i4 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot @@ -100,6 +100,7 @@ mk-livestatus: version: + [ "$$(head -c 14 /etc/issue)" = "Ubuntu 10.04.1" ] || { echo 'You are not on the reference system!' ; exit 1; } @newversion=$$(dialog --stdout --inputbox "New Version:" 0 0 "$(VERSION)") ; \ if [ -n "$$newversion" ] ; then \ sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$$newversion/" Makefile ; \ @@ -114,6 +115,7 @@ version: echo 'check-mk_$$newversion-1_all.deb net optional' > debian/files ; \ sed -i 's/^CHECK_MK_VERSION=.*/CHECK_MK_VERSION='$$newversion/ scripts/install_nagios.sh ; \ fi ; \ + cd agents/windows ; rm *.exe ; make headers: ./headrify diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 5bd4c2a..6b564c5 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,7 +38,7 @@ LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.9i3 +echo Version: 1.1.9i4 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 28b3d82..0e89b1d 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.9i3 +echo Version: 1.1.9i4 echo AgentOS: freebsd # Partitionen (-P verhindert Zeilenumbruch bei langen Mountpunkten) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 0bac8f5..2a07606 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.9i3 +echo Version: 1.1.9i4 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index ccfb6bc..c9d46ca 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -38,7 +38,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.9i3 +echo Version: 1.1.9i4 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index ad723b7..2189c8a 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -61,7 +61,7 @@ #include <ctype.h> // isspace() -#define CHECK_MK_VERSION "1.1.9i3" +#define CHECK_MK_VERSION "1.1.9i4" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 4691058..818b05f 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index dc96b21..8fa12a6 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 59c466a..725bf98 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.1.9i3], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.9i4], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/install_nagios.sh b/scripts/install_nagios.sh index a55dcd3..a0d668d 100644 --- a/scripts/install_nagios.sh +++ b/scripts/install_nagios.sh @@ -57,7 +57,7 @@ set -e NAGIOS_VERSION=3.2.3 PLUGINS_VERSION=1.4.15 RRDTOOL_VERSION=1.4.4 -CHECK_MK_VERSION=1.1.9i3 +CHECK_MK_VERSION=1.1.9i4 PNP_VERSION=0.6.6 NAGVIS_VERSION=1.5.6 diff --git a/scripts/setup.sh b/scripts/setup.sh index cd54855..a356062 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.9i3 +VERSION=1.1.9i4 NAME=check_mk LANG= LC_ALL=

13 years, 8 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dc4be529af9b14414e01eb978c14cab79be18ad2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc4be529af9b14… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 27 16:27:54 2010 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 8 months

Check_MK Git: check_mk: Fixed header displaying on views when the edit button is not shown to the user

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5988dc68b2c4439ac451c483e6643ca4800ad36f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5988dc68b2c443… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 27 16:18:27 2010 +0100 Fixed header displaying on views when the edit button is not shown to the user --- .bugs/9 | 1 + ChangeLog | 1 + web/htdocs/check_mk.css | 11 ++++++++--- web/htdocs/views.py | 34 ++++++++++++++-------------------- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.bugs/9 b/.bugs/9 index f9adf92..b789cb5 100644 --- a/.bugs/9 +++ b/.bugs/9 @@ -32,3 +32,4 @@ Multisite: Endgültig kompatibel mit IE machen. Bekannte Probleme: Ich könnte die Tabs anstelle von Grafiken mit Rahmen von TDs machen und einfach -moz-border-radius verwenden. Schaut bei IE a bisserl anders aus, aber was solls. + => Fixed diff --git a/ChangeLog b/ChangeLog index 0b895bb..7d752f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ * Sidebar: Fixed scrolling problem in IE8 with compat mode (or maybe older IE versions) which broke the snapin titles and also the tactical overview table * Sidebar: Fixed bulletlist positioning + * Fixed header displaying on views when the edit button is not shown to the user Checks & Agents: * Fixed problem with OnlyFrom: in Linux agent (df didn't work properly) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 3c73e91..d37536c 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -514,12 +514,16 @@ div.naviend { } table.navi { - margin: 0px 0px 10px 5px; + margin: 0px 0px 0px 5px; width: 100%; border-collapse: collapse; border-spacing: 0px; -position: relative; -left: -5px; + position: relative; + left: -5px; +} + +table.naviform { + margin-bottom: 10px; } table.navi td { @@ -527,6 +531,7 @@ table.navi td { margin: 0px; /* border: 1px solid green; */ } + table.navi td.gap, table.navi td.minigap { border-bottom: 1px solid white; } diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 14fe67c..38ec1f1 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -92,10 +92,10 @@ def toggle_button(id, isopen, text, addclasses=[]): 'onmouseout="this.style.cursor=\'auto\'; unhover_tab(this);">%s</td>\n' % (cssclass, id, text)) -def show_filter_form(is_open, filters, colspan): +def show_filter_form(is_open, filters): # Table muss einen anderen Namen, als das Formular html.write("<tr class=form id=table_filter %s>\n" % (not is_open and 'style="display: none"' or '') ) - html.write("<td colspan=%d>" % colspan) + html.write("<td>") html.begin_form("filter") html.write("<div class=whiteborder>\n") @@ -127,9 +127,9 @@ def show_filter_form(is_open, filters, colspan): html.write("</div>") html.write("</td></tr>\n") -def show_painter_options(painter_options, colspan): +def show_painter_options(painter_options): html.write('<tr class=form id=painter_options style="display: none">') - html.write("<td colspan=%d>" % colspan) + html.write("<td>") html.begin_form("painteroptions") html.write("<div class=whiteborder>\n") @@ -976,26 +976,22 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru need_navi = show_buttons and ('F' in display_options or 'C' in display_options or 'O' in display_options or 'E' in display_options) if need_navi: html.write("<table class=navi><tr>\n") - colspan = 0 # Filter-button if 'F' in display_options and len(show_filters) > 0 and not html.do_actions(): filter_isopen = html.var("search", "") == "" and view["mustsearch"] toggle_button("table_filter", filter_isopen, "Filter", ["filter"]) html.write("<td class=minigap></td>\n") - colspan += 2 # Command-button if 'C' in display_options and len(rows) > 0 and config.may("act") and not html.do_actions(): toggle_button("table_actions", False, "Commands") html.write("<td class=minigap></td>\n") - colspan += 2 # Painter-Options if len(painter_options) > 0 and config.may("painter_options"): toggle_button("painter_options", False, "Display") html.write("<td class=minigap></td>\n") - colspan += 2 # Buttons for view options if 'O' in display_options: @@ -1008,7 +1004,6 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru addclass = "" html.write('<td class="left w30%s"><a href="%s">%s</a></td>\n' % (addclass, uri, col)) html.write("<td class=minigap></td>\n") - colspan += 2 if 'R' in display_options and config.user_may(config.user, "view_option_refresh"): for ref in config.view_option_refreshes: @@ -1023,10 +1018,8 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru reftext = "∞" html.write('<td class="left w40%s"><a href="%s">%s</a></td>\n' % (addclass, uri, reftext)) html.write("<td class=minigap></td>\n") - colspan += 2 - html.write("<td class=gap></td>\n") - colspan += 1 + html.write("<td class=gap> </td>\n") # Customize/Edit view button if 'E' in display_options and config.may("edit_views"): @@ -1037,18 +1030,19 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru else: html.write('<a href="edit_view.py?clonefrom=%s&load_view=%s&back=%s">Edit</a>\n' % (view["owner"], view["name"], backurl)) html.write('</td>') - colspan += 1 + html.write("</tr>") + html.write("</table><table class=navi><tr>\n") # Filter form if 'F' in display_options and len(show_filters) > 0 and not html.do_actions(): - show_filter_form(filter_isopen, show_filters, colspan) + show_filter_form(filter_isopen, show_filters) # Actions if 'C' in display_options and len(rows) > 0: if html.do_actions() and html.transaction_valid(): # submit button pressed, no reload try: - html.write("<tr class=form><td class=whiteborder colspan=%d>" % colspan) + html.write("<tr class=form><td class=whiteborder>") # Create URI with all actions variables removed backurl = html.makeuri([]) has_done_actions = do_actions(datasource["infos"][0], rows, backurl) @@ -1057,13 +1051,13 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru html.show_error(e.message) html.write("</td></tr>") html.add_user_error(e.varname, e.message) - show_action_form(True, datasource, colspan) + show_action_form(True, datasource) else: - show_action_form(False, datasource, colspan) + show_action_form(False, datasource) if 'O' in display_options and len(painter_options) > 0 and config.may("painter_options"): - show_painter_options(painter_options, colspan) + show_painter_options(painter_options) # Ende des Bereichs mit den Tabs html.write("</table>\n") # class=navi @@ -1412,7 +1406,7 @@ def allowed_for_datasource(collection, datasourcename): # # ----------------------------------------------------------------------------- -def show_action_form(is_open, datasource, colspan): +def show_action_form(is_open, datasource): if not config.may("act"): return @@ -1424,7 +1418,7 @@ def show_action_form(is_open, datasource, colspan): # Table muss einen anderen Namen, als das Formular - html.write("<tr class=form id=table_actions %s><td colspan=%d>" % ((not is_open and 'style="display: none"' or ''), colspan) ) + html.write("<tr class=form id=table_actions %s><td>" % (not is_open and 'style="display: none"' or '') ) html.begin_form("actions") html.hidden_field("_do_actions", "yes") html.hidden_field("actions", "yes")

13 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits