Elastic: Style fixes for "Delegate Invitation" dialog

This commit is contained in:
Aleksander Machniak 2018-08-28 13:22:58 +02:00
parent 922e1dc202
commit b53108047f
3 changed files with 42 additions and 16 deletions

View file

@ -1178,29 +1178,33 @@ rcube_libcalendaring.add_from_itip_mail = function(mime_id, task, status, dom_id
rcube_libcalendaring.itip_delegate_dialog = function(callback, selector) rcube_libcalendaring.itip_delegate_dialog = function(callback, selector)
{ {
// show dialog for entering the delegatee address and comment // show dialog for entering the delegatee address and comment
var html = '<form class="itip-dialog-form" action="javascript:void()">' + var dialog, buttons = [];
'<div class="form-section">' + var form = $('<form class="itip-dialog-form propform" action="javascript:void()">' +
'<label for="itip-delegate-to">' + rcmail.gettext('itip.delegateto') + '</label><br/>' + '<div class="form-section form-group">' +
'<label for="itip-delegate-to">' + rcmail.gettext('itip.delegateto') + '</label>' +
'<input type="text" id="itip-delegate-to" class="text" size="40" value="" />' + '<input type="text" id="itip-delegate-to" class="text" size="40" value="" />' +
'</div>' + '</div>' +
'<div class="form-section">' + '<div class="form-section form-group form-check">' +
'<label for="itip-delegate-rsvp">' + '<label for="itip-delegate-rsvp">' + rcmail.gettext('itip.delegatersvpme') + '</label>' +
'<input type="checkbox" id="itip-delegate-rsvp" class="checkbox" size="40" value="" />' + '<input type="checkbox" id="itip-delegate-rsvp" value="1" />' +
rcmail.gettext('itip.delegatersvpme') +
'</label>' +
'</div>' + '</div>' +
'<div class="form-section">' + '<div class="form-section form-group">' +
'<textarea id="itip-delegate-comment" class="itip-comment" cols="40" rows="8" placeholder="' + '<textarea id="itip-delegate-comment" class="itip-comment" cols="40" rows="8" placeholder="' +
rcmail.gettext('itip.itipcomment') + '"></textarea>' + rcmail.gettext('itip.itipcomment') + '"></textarea>' +
'</div>' + '</div>' +
'<div class="form-section">' + '</form>');
(selector && selector.length ? selector.html() : '') +
'</div>' + if (selector && selector.length) {
'</form>'; form.append(
$('<div class="form-section form-group">')
.append($('<label for="itip-saveto">').text(rcmail.gettext('libcalendaring.savein')))
.append($('select', selector).clone(true))
);
}
var dialog, buttons = [];
buttons.push({ buttons.push({
text: rcmail.gettext('itipdelegated', 'itip'), text: rcmail.gettext('itipdelegated', 'itip'),
'class': 'save mainaction',
click: function() { click: function() {
var doc = window.parent.document, var doc = window.parent.document,
delegatee = String($('#itip-delegate-to', doc).val()).replace(/(^\s+)|(\s+$)/, ''); delegatee = String($('#itip-delegate-to', doc).val()).replace(/(^\s+)|(\s+$)/, '');
@ -1223,13 +1227,14 @@ rcube_libcalendaring.itip_delegate_dialog = function(callback, selector)
}); });
buttons.push({ buttons.push({
text: rcmail.gettext('cancel', 'itip'), text: rcmail.gettext('cancel'),
'class': 'cancel',
click: function() { click: function() {
dialog.dialog('close'); dialog.dialog('close');
} }
}); });
dialog = rcmail.show_popup_dialog(html, rcmail.gettext('delegateinvitation', 'itip'), buttons, { dialog = rcmail.show_popup_dialog(form, rcmail.gettext('delegateinvitation', 'itip'), buttons, {
width: 460, width: 460,
open: function(event, ui) { open: function(event, ui) {
$(this).parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().addClass('mainaction'); $(this).parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().addClass('mainaction');
@ -1396,6 +1401,10 @@ rcube_libcalendaring.update_itip_object_status = function(p)
} }
elem.show(); elem.show();
} }
if (window.UI && UI.pretty_select) {
$('#rsvp-'+p.id+' select').each(function() { UI.pretty_select(this); });
}
}; };
/** /**

View file

@ -183,6 +183,7 @@ $labels['delegatedto'] = 'Delegated to:';
$labels['delegatedfrom'] = 'Delegated from:'; $labels['delegatedfrom'] = 'Delegated from:';
$labels['savingdata'] = 'Saving data...'; $labels['savingdata'] = 'Saving data...';
$labels['savein'] = 'Save in';
// attendees labels // attendees labels
$labels['expandattendeegroup'] = 'Substitute with group members'; $labels['expandattendeegroup'] = 'Substitute with group members';

View file

@ -373,6 +373,22 @@ a.history {
} }
} }
.form-section.form-group.form-check {
display: flex;
padding: 0;
label {
order: 10;
}
.icon-checkbox + label {
order: unset;
min-width: 2em;
padding: 0;
line-height: 1;
}
}
button.btn.save.notify:before { button.btn.save.notify:before {
content: @fa-var-envelope; content: @fa-var-envelope;
} }