[checkmk-commits] Check_MK Git: check_mk: Added hover-help for display option buttons

Module: check_mk Branch: master Commit: ec0752fbdfaf1a58299ad90e0bc543f0d67078f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec0752fbdfaf1a… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Wed May 23 12:57:54 2012 +0200 Added hover-help for display option buttons --- web/htdocs/views.css | 4 ++++ web/htdocs/views.py | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 1a3ed40..35b13f3 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -126,6 +126,10 @@ div.togglebutton.down { top: -1px; left: -3px; } +div.togglebutton.checkbox.down { + top: 0px; + left: -2px; +} div.togglebutton.filters { background-image: url("images/button_filters_lo.png"); } div.togglebutton.filters:hover { background-image: url("images/button_filters_hi.png"); } diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 1857bf8..95c0c0c 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1526,26 +1526,26 @@ def view_linktitle(view): else: return t -def view_optiondial(view, option, choices): +def view_optiondial(view, option, choices, help): vo = view_options(view["name"]) value = vo.get(option, view.get(option, choices[0][0])) title = dict(choices).get(value, value) html.begin_context_buttons() # just to be sure - html.write('<div id="optiondial_%s" class="optiondial %s val_%s"' + html.write('<div title="%s" id="optiondial_%s" class="optiondial %s val_%s"' 'onclick="view_dial_option(this, \'%s\', \'%s\', %r);"><div>%s</div></div>' % ( - option, option, value, view["name"], option, choices, title)) + help, option, option, value, view["name"], option, choices, title)) def view_optiondial_off(option): html.write('<div class="optiondial off %s"></div>' % option) -def view_option_toggler(view, option, icon): +def view_option_toggler(view, option, icon, help): vo = view_options(view["name"]) value = vo.get(option, view.get(option, False)) html.begin_context_buttons() # just to be sure - html.write('<div class="togglebutton %s %s"' + html.write('<div title="%s" class="togglebutton %s %s"' 'onclick="view_switch_option(this, \'%s\', \'%s\');"></div>' % ( - icon, value and "down" or "up", view["name"], option)) + help, icon, value and "down" or "up", view["name"], option)) @@ -1607,7 +1607,7 @@ def show_context_links(thisview, active_filters, show_filters, display_options, if 'C' in display_options: if command_form: togglebutton("commands", False, "commands", _("Execute commands on hosts, services and other objects")) - view_option_toggler(thisview, "show_checkboxes", "checkbox") + view_option_toggler(thisview, "show_checkboxes", "checkbox", _("Enable/Disable checkboxes for selecting rows for commands")) else: togglebutton_off("commands") togglebutton_off("checkboxes") @@ -1615,13 +1615,13 @@ def show_context_links(thisview, active_filters, show_filters, display_options, if 'O' in display_options: if config.may("view_option_columns"): choices = [ [x, "%s" % x] for x in config.view_option_columns ] - view_optiondial(thisview, "num_columns", choices) + view_optiondial(thisview, "num_columns", choices, _("Change the number of display columns")) else: view_optiondial_off("num_columns") if 'R' in display_options and config.may("view_option_refresh"): choices = [ [x, {0:_("off")}.get(x,str(x) + "s") + (x and "" or "")] for x in config.view_option_refreshes ] - view_optiondial(thisview, "refresh", choices) + view_optiondial(thisview, "refresh", choices, _("Change the refresh rate")) else: view_optiondial_off("refresh")