diff --git a/assets/static/base.css b/assets/static/base.css index ab68d4130..39dba079b 100644 --- a/assets/static/base.css +++ b/assets/static/base.css @@ -396,6 +396,18 @@ span.alert-group-link > a { .bootstrap-select > button { padding: 0; } +.bootstrap-select > .dropdown-toggle { + padding-right: 6px; +} +table.silence-label-selects { + width: auto; +} +table.table.silence-label-selects > tbody > tr > td { + padding-left: 0; + padding-right: 4px; + padding-top: 0; + padding-bottom: 0; +} .silence-label-select > .bs-caret { margin-left: -6px; } @@ -404,6 +416,9 @@ span.alert-group-link > a { .silence-label-select:focus, .silence-label-picker:focus { color: inherit; } +.select-label-badge { + cursor: pointer; +} .bootstrap-select > .dropdown-menu > .dropdown-menu > li > a > .label { margin-right: 20px; } diff --git a/assets/static/ui.js b/assets/static/ui.js index 07376a223..65ee0a42f 100644 --- a/assets/static/ui.js +++ b/assets/static/ui.js @@ -206,6 +206,17 @@ var UI = (function(params) { minDate: moment().subtract(1, 'minutes'), sideBySide: true }); + setupGroupTooltips(modal); + $('.select-label-badge').on('click', function(e) { + var select = $(this).parent().parent().find('select'); + if (select.selectpicker('val')) { + // if there's anything selected deselect all + select.selectpicker('deselectAll') + } else { + // else select all + select.selectpicker('selectAll') + } + }); } }); diff --git a/assets/templates/silence.html b/assets/templates/silence.html index 9666faf31..e9191cc4b 100644 --- a/assets/templates/silence.html +++ b/assets/templates/silence.html @@ -2,26 +2,33 @@