From a86269b6534a960f89d3ca894d6ffe7f8de99bc4 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 15 Mar 2019 11:59:25 +0000 Subject: [PATCH] T5076: In event alarms form hide the number input in "on time" and "on date" mode --- plugins/libcalendaring/libcalendaring.js | 11 ++++++++--- .../skins/elastic/include/libcalendaring.less | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/plugins/libcalendaring/libcalendaring.js b/plugins/libcalendaring/libcalendaring.js index 95e30e45..b49fac10 100644 --- a/plugins/libcalendaring/libcalendaring.js +++ b/plugins/libcalendaring/libcalendaring.js @@ -435,10 +435,15 @@ function rcube_libcalendaring(settings) $(this).parent().find('span.edit-alarm-values')[(this.selectedIndex>0?'show':'hide')](); }); $(prefix+' select.edit-alarm-offset').change(function(){ - var val = $(this).val(), parent = $(this).parent(); + var val = $(this).val(), + parent = $(this).parent(), + class_map = {'0': 'ontime', '@': 'ondate'}; + parent.find('.edit-alarm-date, .edit-alarm-time')[val === '@' ? 'show' : 'hide'](); - parent.find('.edit-alarm-value').prop('disabled', val === '@' || val === '0'); + parent.find('.edit-alarm-value')[val === '@' || val === '0' ? 'hide' : 'show'](); parent.find('.edit-alarm-related')[val === '@' ? 'hide' : 'show'](); + parent.removeClass('offset-ontime offset-ondate offset-default') + .addClass('offset-' + (class_map[val] || 'default')); }); $(prefix+' .edit-alarm-date').removeClass('hasDatepicker').removeAttr('id').datepicker(this.datepicker_settings); @@ -455,7 +460,7 @@ function rcube_libcalendaring(settings) // Elastic if (window.UI && UI.pretty_select) { - $(prefix + ' select').each(function() { UI.pretty_select(this); }); + $(prefix + ' select').each(function() { UI.pretty_select(this); }); } if (index) diff --git a/plugins/libkolab/skins/elastic/include/libcalendaring.less b/plugins/libkolab/skins/elastic/include/libcalendaring.less index 8ef00735..3b0ef9c4 100644 --- a/plugins/libkolab/skins/elastic/include/libcalendaring.less +++ b/plugins/libkolab/skins/elastic/include/libcalendaring.less @@ -428,6 +428,25 @@ .edit-alarm-values { margin-left: .25rem; flex: 5; + + &.offset-default { + select.edit-alarm-related { + border-radius: 0 .25rem .25rem 0; + } + } + &.offset-ontime { + select.edit-alarm-offset { + border-radius: .25rem 0 0 .25rem; + } + select.edit-alarm-related { + border-radius: 0 .25rem .25rem 0; + } + } + &.offset-ondate { + select.edit-alarm-offset { + border-radius: .25rem 0 0 .25rem; + } + } } .edit-alarm-offset {