[checkmk-commits] Fixed overlay of "Actions" table title in activate changes dialog

Module: check_mk Branch: master Commit: 7ec04cecc12e126da0ba877c2190fd2c38da6adc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ec04cecc12e12… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Wed Nov 4 14:20:09 2015 +0100 Fixed overlay of "Actions" table title in activate changes dialog --- web/htdocs/pages.css | 8 ++++++-- web/htdocs/table.py | 7 ++++++- web/htdocs/wato.py | 18 +----------------- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 6a646c7..3105eb6 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -394,9 +394,13 @@ table.data tr th { vertical-align: baseline; } +table.data tr div.toggle_actions { + position: relative; + padding-left: 14px; +} + table.data tr a.toggle_actions { - display: inline-block; - float: left; + position: absolute; top: 0; left: 0; margin: 0; diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 932e296..b86bf30 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -279,11 +279,16 @@ def end(): state = '1' help = _('Display table actions') img = 'table_actions_off' + html.write("<div class=\"toggle_actions\">") html.icon_button(html.makeuri([('_%s_actions' % table_id, state)]), help, img, cssclass = 'toggle_actions') + html.write("<span>%s</span>" % header) + html.write("</div>") first_col = False + else: + html.write("%s" % header) - html.write("%s</th>\n" % header) + html.write("</th>\n") html.write(" </tr>\n") # If we have no group headers then paint the headers now diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e71b80f..f91afb9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5270,23 +5270,7 @@ def mode_changelog(phase): sites = [(name, config.site(name)) for name in config.sitenames() ] sort_sites(sites) - table.begin(_("Site Status"), searchable=False) - # html.write("<table class=data>") - # html.write("<tr>") - # html.write("<th>%s</th>" % _("Actions") + - # "<th>%s</th>" % _("ID") + - # "<th>%s</th>" % _("Alias")) - # html.write("<th>%s</th>" % _("Status") + - # "<th>%s</th>" % _("Version") + - # "<th>%s</th>" % _("Core") + - # "<th>%s</th>" % _("Hosts") + - # "<th>%s</th>" % _("Services")) - # if sitestatus_do_async_replication: - # html.write("<th>%s</th>" % _("Replication result")) - # else: - # html.write("<th colspan=2>%s</th>" % _("Pending changes") + - # "<th>%s</th>" % _("Last result")) - # html.write("</tr>") + table.begin("site-status", searchable=False) num_replsites = 0 # for detecting end of bulk replication for site_id, site in sites: