lists.checkmk.com
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
List overview
Download
Checkmk git commits
March 2012
----- 2024 -----
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
checkmk-commits@lists.checkmk.com
3 participants
160 discussions
Start a n
N
ew thread
Check_MK Git: check_mk: Relayouting dashboard - part 1
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: 5f3cfaf66cacf15844ed38a7bb1d5435d6229050 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f3cfaf66cacf1…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 6 14:59:27 2012 +0100 Relayouting dashboard - part 1 --- web/htdocs/dashboard.css | 71 ++++++++++++------------- web/htdocs/dashboard.py | 12 ++-- web/htdocs/images/contentframe_background.jpg | Bin 252025 -> 2091 bytes web/htdocs/images/dashadow-e.png | Bin 197 -> 127 bytes web/htdocs/images/dashadow-n.png | Bin 202 -> 133 bytes web/htdocs/images/dashadow-ne.png | Bin 371 -> 313 bytes web/htdocs/images/dashadow-nw.png | Bin 333 -> 289 bytes web/htdocs/images/dashadow-s.png | Bin 199 -> 131 bytes web/htdocs/images/dashadow-se.png | Bin 363 -> 305 bytes web/htdocs/images/dashadow-sw.png | Bin 363 -> 273 bytes web/htdocs/images/dashadow-w.png | Bin 200 -> 126 bytes web/htdocs/images/dashlet_linkarrow.png | Bin 0 -> 298 bytes web/htdocs/images/sidebar_background.jpg | Bin 49576 -> 2091 bytes web/htdocs/images/snapin_background.png | Bin 223 -> 189 bytes web/htdocs/images/snapin_closed.png | Bin 878 -> 848 bytes web/htdocs/images/snapin_footer.png | Bin 511 -> 458 bytes web/htdocs/images/snapin_header.png | Bin 629 -> 506 bytes web/htdocs/js/dashboard.js | 46 +++++++++------- web/htdocs/pages.css | 2 +- 19 files changed, 68 insertions(+), 63 deletions(-) Diff:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5f3cfaf66c…
12 years, 7 months
1
0
0
0
Check_MK Git: check_mk: Layout changes
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: 677d355d641b5982e67540546e9e1a616c8cbe97 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=677d355d641b59…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 9 16:30:34 2012 +0100 Layout changes --- web/htdocs/check_mk.css | 6 +++--- web/htdocs/dashboard.css | 2 +- web/htdocs/pages.css | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index cebf021..0877ed3 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -194,10 +194,10 @@ div.livestatus.message { '-------------------------------------------------------------------------*/ img.treeangle { - width: 9px; - height: 9px; + width: 13px; + height: 12px; margin-right: 3px; - margin-top: 2px; + margin-top: 0px; } b.treeangle.title { font-weight: bold; diff --git a/web/htdocs/dashboard.css b/web/htdocs/dashboard.css index ae4168e..9aceab3 100644 --- a/web/htdocs/dashboard.css +++ b/web/htdocs/dashboard.css @@ -53,7 +53,7 @@ div.dashlet div.dashlet_inner { div.dashlet div.dashlet_inner.background { /* background-image: url("images/form_background.png"); */ /* background-repeat: repeat; */ - background-color: #ccc; + background-color: #cbd6da; } div.dashlet iframe { diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index c2efac1..1bb2a3f 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -80,7 +80,7 @@ body.main hr.header { body.main table.header td.left { font-size: 15pt; - font-weight: bold; + /*font-weight: bold;*/ vertical-align: bottom; padding-left: 0px; height: 31px; @@ -473,7 +473,7 @@ input.date, input.time { font-family: monospace; } -.inputerror input, .inputerror textarea, .inputerror span.checkbox { +.inputerror input, .inputerror textarea, span.checkbox { background-color: #f84; }
12 years, 7 months
1
0
0
0
Check_MK Git: check_mk: Merge branch 'tobi' of ssh://mathias-kettner.de/ check_mk into tobi
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: 6de8f981f6565795839a1aebb2ba62d05b02eeae URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6de8f981f65657…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 20 17:00:48 2012 +0100 Merge branch 'tobi' of ssh://mathias-kettner.de/check_mk into tobi ---
12 years, 7 months
1
0
0
0
Check_MK Git: check_mk: Merge branch 'master' into tobi
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: e4fee043b4f925c14dd9df34fa9e29df070ff077 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4fee043b4f925…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 9 16:19:55 2012 +0100 Merge branch 'master' into tobi Conflicts: web/htdocs/htmllib.py web/htdocs/wato.py ---
12 years, 7 months
1
0
0
0
Check_MK Git: check_mk: Intermediate Layout Change
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: ec015e6afde90b7887c17e1e1569a5469926542d URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec015e6afde90b…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 9 16:15:09 2012 +0100 Intermediate Layout Change --- web/htdocs/sidebar.css | 3 ++- web/plugins/sidebar/shipped.py | 31 ++++++++++++++++++++++++------- web/plugins/sidebar/wato.py | 6 ++++-- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 362a23a..9a348f6 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -374,8 +374,9 @@ div.statebullet { margin-right: 6px; width: 10px; height: 10px; - border: 1px solid #eee; + border: 1px solid #123a4a; float: left; + box-shadow: 0px 0px 1px #123a4a; } diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 1679bdd..107199c 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -367,8 +367,8 @@ sidebar_snapins["hostmatrix"] = { table.hostmatrix { border-spacing: 0; } table.hostmatrix tr { padding: 0; border-spacing: 0; } table.hostmatrix a { display: block; width: 100%%; height: 100%%; line-height: 100%%; } -table.hostmatrix td { border: 1px solid white; padding: 0; border-spacing: 0; } -""" +table.hostmatrix td { border: 1px solid #123a4a; padding: 0; border-spacing: 0; } + """ } @@ -558,8 +558,22 @@ table.tacticaloverview { width: %dpx; margin-top: 0; } -table.tacticaloverview th { font-size: 7pt; text-align: left; font-weight: normal; padding: 0; padding-top: 2px; } -table.tacticaloverview td { text-align: right; border: 1px solid #444; padding: 0px; } +table.tacticaloverview th { + font-size: 7pt; + text-align: left; + color: #123a4a; + font-weight: normal; + padding: 0; + padding-top: 2px; +} +table.tacticaloverview td { + width: 33.3%%; + text-align: right; + border: 1px solid #123a4a; + background-color: #6da1b8; + padding: 0px; + height: 14px; +} table.tacticaloverview a { display: block; margin-right: 2px; } """ % snapin_width } @@ -617,14 +631,17 @@ sidebar_snapins["performance"] = { table.performance { width: %dpx; -moz-border-radius: 5px; - font-size: 8pt; background-color: #589; + /* background-color: #6da1b8;*/ border-style: solid; border-color: #444 #bbb #eee #666; /* The border needs to be substracted from the width */ border-width: 1px; } -table.performance td { padding: 0px; } +table.performance td { + padding: 0px 2px; + font-size: 8pt; +} table.performance td.right { text-align: right; padding: 0px; @@ -902,7 +919,7 @@ def render_nagios(): nagioscgilink(text, ref) sidebar_snapins["nagios_legacy"] = { - "title" : _("Nagios"), + "title" : _("Old Nagios GUI"), "description" : _("The classical sidebar of Nagios 3.2.0 with links to your local Nagios instance (no multi site support)"), "author" : "Mathias Kettner", "render" : render_nagios, diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 0d4decb..62406b2 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -224,11 +224,13 @@ sidebar_snapins['wato_foldertree'] = { width: 190px; height: 19px; margin-bottom: 2px; - background-color: #8EAEB8; + background-color: #6da1b8; color: #fff; + border-color: #123a4a; + font-size: 8pt; } #snapin_wato_foldertree select option { - background-color: #8EAEB8; + background-color: #6da1b8; } #snapin_wato_foldertree span { text-align: middle;
12 years, 7 months
1
0
0
0
Check_MK Git: check_mk: Updated layout of login screen
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: 3c02665679ef3adecdae6f4275cd917a25e4c8ae URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c02665679ef3a…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 20 14:46:25 2012 +0100 Updated layout of login screen --- web/htdocs/images/image_button.png | Bin 0 -> 5010 bytes web/htdocs/images/login_dark_bg.png | Bin 4670 -> 3494 bytes web/htdocs/images/login_spotlight.png | Bin 334182 -> 575079 bytes web/htdocs/images/login_window.png | Bin 10934 -> 29560 bytes web/htdocs/login.css | 42 ++++++++++++++++++-------------- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/web/htdocs/images/image_button.png b/web/htdocs/images/image_button.png new file mode 100644 index 0000000..5727f80 Binary files /dev/null and b/web/htdocs/images/image_button.png differ diff --git a/web/htdocs/images/login_dark_bg.png b/web/htdocs/images/login_dark_bg.png index d02f332..1977293 100644 Binary files a/web/htdocs/images/login_dark_bg.png and b/web/htdocs/images/login_dark_bg.png differ diff --git a/web/htdocs/images/login_spotlight.png b/web/htdocs/images/login_spotlight.png index ab3abf6..3858218 100644 Binary files a/web/htdocs/images/login_spotlight.png and b/web/htdocs/images/login_spotlight.png differ diff --git a/web/htdocs/images/login_window.png b/web/htdocs/images/login_window.png index 931dab3..87449ba 100644 Binary files a/web/htdocs/images/login_window.png and b/web/htdocs/images/login_window.png differ diff --git a/web/htdocs/login.css b/web/htdocs/login.css index 73ffd6b..f8f9c20 100644 --- a/web/htdocs/login.css +++ b/web/htdocs/login.css @@ -46,12 +46,13 @@ body.main { div#login { background-image: url("images/login_spotlight.png"); - width: 605px; - height: 410px; + background-repeat: no-repeat; + width: 770px; + height: 605px; position: absolute; top: 50%; left: 50%; - margin: -205px 0px 0px -302px; + margin: -276px 0px 0px -386px; /* border: 1px solid yellow; */ } @@ -60,7 +61,7 @@ img#login_window { height: 230px; position: relative; left: 10px; - top: 10px; + top: 160px; float: none; } @@ -70,35 +71,38 @@ label { #version { position: absolute; - top: 25px; - left: 420px; + text-align: right; + width: 150px; + top: 173px; + left: 415px; color: white; + font-size: 8pt; } #label_user, #label_pass { - left: 174px; + left: 264px; } #input_user, #input_pass { - left: 250px; + left: 330px; } #label_user { position: absolute; - top: 132px; + top: 275px; } #input_user { position: absolute; - top: 128px; + top: 270px; } #label_pass { position: absolute; - top: 168px; + top: 315px; } #input_pass { position: absolute; - top: 164px; + top: 310px; } #input_user, #input_pass { @@ -108,8 +112,8 @@ label { #button_login { position: absolute; - top: 190px; - left: 415px; + top: 345px; + left: 505px; } #button_login img { @@ -119,12 +123,14 @@ label { #button_text { position: absolute; - top: 198px; - left: 415px; + top: 355px; + left: 505px; text-align: center; width: 61px; color: white; z-index: 100; + font-size: 10px; + text-transform: uppercase; } #login_error { @@ -139,8 +145,8 @@ label { #foot { position: absolute; text-align: center; - top: 250px; - left: 135px; + top: 400px; + left: 220px; width: 350px; color: white; font-size: 8pt;
12 years, 7 months
1
0
0
0
Check_MK Git: check_mk: Added image designed submit button (
by git@mathias-kettner.de
only for login dialog at the moment) User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: cf29c776d71e151a58bc888c96315fece2096409 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf29c776d71e15…
Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 20 16:52:25 2012 +0100 Added image designed submit button (only for login dialog at the moment) --- web/htdocs/check_mk.css | 45 +++++++++++++++++++++++++++++++--- web/htdocs/htmllib.py | 5 ++++ web/htdocs/images/image_button_l.png | Bin 0 -> 2233 bytes web/htdocs/images/image_button_r.png | Bin 0 -> 2801 bytes web/htdocs/login.css | 14 +++++++---- web/htdocs/login.py | 18 +++++++------- 6 files changed, 64 insertions(+), 18 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index a4a04a7..bd90b1b 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -73,10 +73,6 @@ input, select, textarea { background-color: #fff; } -input:hover, select:hover, textarea:hover { - background-color: #EDECEB; -} - /* Select element with icons */ select.icon option { background-repeat: no-repeat; @@ -108,6 +104,47 @@ a.button { margin: 2px; } +/* Image submit button styling */ +label.image_button { + display: block; + margin: 0 auto; + background: transparent url('images/image_button_l.png') no-repeat; + background-position: 0 -30px; + padding: 0 0 0 14px; + height: 30px; +} +label.image_button:hover { + background-position: 0 -60px; +} +label.image_button:active { + background-position: 0 -90px; +} +label.image_button input { + height: 30px; + color: #fff; + border: none; + padding-right: 16px; + background: transparent url('images/image_button_r.png') no-repeat; + background-position: right -30px; +} +label.image_button input:hover { + background-position: right -60px; +} +label.image_button input:active { + background-position: right -90px; +} +label.image_button input[type="submit"]::-moz-focus-inner { + border: 0px; +} +/*for IE8 */ +input[type="submit"]:focus { + outline: none; +} + +input:hover, select:hover, textarea:hover { + background-color: #EDECEB; +} + /* Images have a native size of 48x48 and are scaled down by the browser. That way if you select a zoom level in the browser, the quality of the images are better */ diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index f37ca06..676b641 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -303,6 +303,11 @@ class html: def makeuri_contextless(self, vars): return self.req.myfile + ".py?" + urlencode_vars(vars) + def image_button(self, varname, title, cssclass = ''): + self.write('<label for="%s" class=image_button>' % varname) + self.button(varname, title, cssclass) + self.write('</label>') + def button(self, varname, title, cssclass=""): self.write("<input type=submit name=\"%s\" id=\"%s\" value=\"%s\" class=\"%s\">\n" % \ ( varname, varname, title, cssclass)) diff --git a/web/htdocs/images/image_button_l.png b/web/htdocs/images/image_button_l.png new file mode 100644 index 0000000..340936e Binary files /dev/null and b/web/htdocs/images/image_button_l.png differ diff --git a/web/htdocs/images/image_button_r.png b/web/htdocs/images/image_button_r.png new file mode 100644 index 0000000..cd374b0 Binary files /dev/null and b/web/htdocs/images/image_button_r.png differ diff --git a/web/htdocs/login.css b/web/htdocs/login.css index f8f9c20..287e44a 100644 --- a/web/htdocs/login.css +++ b/web/htdocs/login.css @@ -123,8 +123,8 @@ label { #button_text { position: absolute; - top: 355px; - left: 505px; + top: 350px; + left: 500px; text-align: center; width: 61px; color: white; @@ -135,12 +135,16 @@ label { #login_error { position: absolute; - top: -60px; - left: 135px; - width: 360px; + top: 350px; + left: 264px; + width: 205px; z-index: 100; } +#login_error div.error { + margin:0; + padding:6px 0; +} #foot { position: absolute; diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 1e2afab..c2acaa6 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -220,11 +220,6 @@ def normal_login_page(): origtarget = html.req.uri html.write("<div id=login>") - if html.has_user_errors(): - html.write('<div id=login_error>') - html.show_user_errors() - html.write('</div>') - html.write("<img id=login_window src=\"images/login_window.png\">") html.write("<div id=version>%s</div>" % defaults.check_mk_version) @@ -235,11 +230,16 @@ def normal_login_page(): html.text_input("_username", size = 50, id="input_user") html.write("<label id=label_pass class=legend for=_password>%s:</label><br />" % _('Password')) html.password_input("_password", size = 50, id="input_pass") - html.write("<div id=button_text>%s</div>" % _("Login")) - html.icon_button("javascript:document.getElementById('form_login').submit();", _("Login"), "login", id="button_login") - html.write('<input type=submit style="display: none;">') - # Footer with copyright and stuff + if html.has_user_errors(): + html.write('<div id=login_error>') + html.show_user_errors() + html.write('</div>') + + html.write("<div id=button_text>") + html.image_button("_login", _('Login')) + html.write("</div>") + html.write("<div id=foot>Version: %s - © " "<a href=\"
http://mathias-kettner.de\
">Mathias Kettner</a><br><br>" % defaults.check_mk_version) html.write(_("You can use, modify and distribute Check_MK under the terms of the <a href='%s'>"
12 years, 7 months
1
0
0
0
Check_MK Git: check_mk: Various layout experiments
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: 9b024ba366909b56cc69eaad84e2ebb88f006cb6 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b024ba366909b…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 26 15:28:51 2012 +0100 Various layout experiments --- web/htdocs/check_mk.css | 3 ++ web/htdocs/htmllib.py | 12 ++++++++-- web/htdocs/pages.css | 8 +------ web/htdocs/wato.css | 51 +++++++++++++++++++++++++++++++++++++++++----- web/htdocs/wato.py | 6 ++-- 5 files changed, 61 insertions(+), 19 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 1d69e80..ad8de59 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -121,6 +121,8 @@ label.image_button { background-position: 0 -30px; padding: 0 0 0 14px; height: 30px; + float: left; + margin-right: 5px; } label.image_button:hover { background-position: 0 -60px; @@ -135,6 +137,7 @@ label.image_button input { padding-right: 16px; background: transparent url('images/image_button_r.png') no-repeat; background-position: right -30px; + float: left; } label.image_button input:hover { background-position: right -60px; diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index f422c32..de6c01c 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -312,13 +312,19 @@ class html: def image_button(self, varname, title, cssclass = ''): self.write('<label for="%s" class=image_button>' % varname) - self.button(varname, title, cssclass) + self.raw_button(varname, title, cssclass) self.write('</label>') - def button(self, varname, title, cssclass=""): - self.write("<input type=submit name=\"%s\" id=\"%s\" value=\"%s\" class=\"%s\">\n" % \ + def button(self, *args): + self.image_button(*args) + + def raw_button(self, varname, title, cssclass=""): + self.write("<input onfocus=\"if (this.blur) this.blur();\" " + "type=submit name=\"%s\" id=\"%s\" value=\"%s\" " + "class=\"%s\">\n" % \ ( varname, varname, title, cssclass)) + def buttonlink(self, href, text, add_transid=False, obj_id='', style='', title='', disabled=''): if add_transid: href += "&_transid=%s" % self.fresh_transid() diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 7674186..0a80530 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -358,7 +358,6 @@ table.form.nomargin { margin: 0; } table.form.nomargin td.legend, -.wato table.form.nomargin td.checkbox, table.form.nomargin td.content, table.form.nomargin td.buttons { border-top-style: none; @@ -369,11 +368,6 @@ table.form.nomargin td.title { background-image: url("images/form_background.png"); background-repeat: repeat; } -.wato table.form tr.top td, -.wato table.form tr.top td.checkbox { - border-top-style: solid; -} - table.form > tbody > tr > td { padding: 4px 10px; } @@ -440,7 +434,7 @@ table.form td.content { } td.legend, td.content { - border: 1px solid #884; + /* border: 1px solid #884; */ padding: 2px 0.5ex; } diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 71862de..11c40b7 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -49,6 +49,8 @@ Boston, MA 02110-1301 USA. } .wato table.data th { -moz-border-radius: 0px; + background-color: #508aa1; + background-color: #73a1b4; } .wato input[type=submit], .wato input[type=button], .wato select { box-shadow: 0px 0px 1px #888888; @@ -63,6 +65,10 @@ Boston, MA 02110-1301 USA. border-left-style: none; -moz-border-radius: 4px 0px 0px 0px; } +.wato table.data td { + border-style: dashed; +} + .wato table.data td.select { text-align: center; width: 1px; @@ -72,15 +78,24 @@ Boston, MA 02110-1301 USA. border-right-style: none; -moz-border-radius: 0px 4px 0px 0px; } + +/* WATO configuration forms */ .wato table.form { - width: 850px; + width: 100%; + /* width: 850px; */ margin-left: 0px; } +.wato table.form td { + border-style: dashed; +} + .wato table.form td.legend { - border-right-style: none; + width: 300px; padding-bottom: 8px; - width: 350px; + padding-left: 20px; + border-left-style: none; + border-right-style: none; } .wato table.form td.legend h3 { @@ -89,9 +104,14 @@ Boston, MA 02110-1301 USA. font-size: 9pt; font-weight: normal; } +.wato table.form td.title { + border-style: none none dashed none; +} + .wato table.form td.title i { font-weight: normal; padding-bottom: 8px; + border-top-style: solid; } @@ -103,19 +123,38 @@ Boston, MA 02110-1301 USA. .wato table.form td.content { border-left-style: solid; - width: 494px; + /* width: 494px; */ padding-top: 7px; padding-bottom: 7px; + padding-right: 20px; + border-left-style: dashed; + border-right-style: none; +} + +.wato table.form td.buttons { + border-style: solid none none none; } +.wato table.form tr.top td, +.wato table.form tr.top td, +.wato table.form tr.top td.checkbox { + border-top-style: none; +} + +.wato table.form.nomargin td.checkbox { + border-top-style: none; +} + + .wato table.form td.checkbox { width: 40px; height: 40px; padding-top: 7px; vertical-align: top; text-align: right; - border: 1px solid #fff; - border-left-style: none; + border-width: 1px; + border-color: #fff; + border-style: dashed none dashed none; } .wato div.sitestatus { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index db4f0f2..d20b63f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1853,10 +1853,10 @@ def mode_edithost(phase, new, cluster): configure_attributes({hostname: host}, "host", parent = g_folder) html.write('<tr><td class="buttons" colspan=3>') - html.button("save", _("Save & Finish"), "submit") + html.image_button("save", _("Save & Finish"), "submit") if not new: - html.button("delete", _("Delete host!"), "submit") - html.button("services", _("Save & go to Services"), "submit") + html.image_button("delete", _("Delete host!"), "submit") + html.image_button("services", _("Save & go to Services"), "submit") html.write("</td></tr>\n") html.write("</table>\n") html.hidden_fields()
12 years, 7 months
1
0
0
0
Check_MK Git: check_mk: Merge branch 'tobi' of ssh://mathias-kettner.de/ check_mk into tobi
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: fe9603ca0652b4bb87d4e3cd55f9905e1feb854b URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe9603ca0652b4…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 17:46:14 2012 +0100 Merge branch 'tobi' of ssh://mathias-kettner.de/check_mk into tobi ---
12 years, 7 months
1
0
0
0
Check_MK Git: check_mk: Merge branch 'master' into tobi
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: b37625ae5f149b9f0c223169019389f0a4569b2b URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b37625ae5f149b…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 26 14:43:03 2012 +0100 Merge branch 'master' into tobi Conflicts: web/htdocs/check_mk.css web/htdocs/htmllib.py ---
12 years, 7 months
1
0
0
0
← Newer
1
...
4
5
6
7
8
9
10
...
16
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
Results per page:
10
25
50
100
200