From ecfeb4fbe6f3d88b70c2d9eee330927419a498ed Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 2 Nov 2015 10:42:00 +0100 Subject: [PATCH] monitoring/CSS: Don't use text-small mixin for the selection info refs #5543 --- .../scripts/list/components/selectioninfo.phtml | 15 ++++++++++++--- modules/monitoring/public/css/module.less | 11 +++++++++++ public/css/icinga/main.less | 5 ----- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml b/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml index b86aad7a76..ec0fb85d1e 100644 --- a/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml +++ b/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml @@ -1,6 +1,15 @@ translate('Press and hold the Ctrl key while clicking on rows to select multiple rows or press and hold the Shift key to select a range of rows.', 'multiselection'); +$helpMessage = $this->translate( + 'Press and hold the Ctrl key while clicking on rows to select multiple rows or press and hold the Shift key to' + .' select a range of rows', + 'Multi-selection help' +); ?> -
- 0 translate('row(s) selected', 'multiselection') ?> +
+ translate('%s row(s) selected', 'Multi-selection count'), + '0' + ) ?>
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less index 66964178f2..9f66db57b5 100644 --- a/modules/monitoring/public/css/module.less +++ b/modules/monitoring/public/css/module.less @@ -14,6 +14,17 @@ } } +// Multi-selection info +.selection-info { + float: right; + font-size: @font-size-small; + padding: @vertical-padding / 2 0; + + &:hover { + cursor: help; + } +} + .hosts-summary, .services-summary { .v-center(); diff --git a/public/css/icinga/main.less b/public/css/icinga/main.less index d48fa19677..f4319f77e0 100644 --- a/public/css/icinga/main.less +++ b/public/css/icinga/main.less @@ -200,9 +200,4 @@ table.listing-table { .pull-right(); padding: @vertical-padding / 2 0; } - - .selection-info { - .pull-right(); - padding: @vertical-padding / 2 0; - } }