Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Elastic: Various improvements in Tasks

Browse source
This commit is contained in:
Aleksander Machniak 2018-03-25 17:01:38 +00:00
parent a1e090b1f1
commit 715621e316
13 changed files with 70 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/calendar/calendar_ui.js
View file

@ -971,7 +971,7 @@ function rcube_calendar_ui(settings)
if (data === false || !data.length || !event) { if (data === false || !data.length || !event) {
// display 'unavailable' message // display 'unavailable' message
$('<div class="notfound-message event-dialog-message warning">' + rcmail.gettext('objectchangelognotavailable','calendar') + '</div>') $('<div class="notfound-message dialog-message warning">' + rcmail.gettext('objectchangelognotavailable','calendar') + '</div>')
.insertBefore($dialog.find('.changelog-table').hide()); .insertBefore($dialog.find('.changelog-table').hide());
return; return;
} }

8
plugins/calendar/skins/elastic/templates/eventedit.html
View file

@ -150,9 +150,9 @@
<roundcube:object name="plugin.filedroparea" id="event-panel-attachments" /> <roundcube:object name="plugin.filedroparea" id="event-panel-attachments" />
</fieldset> </fieldset>
</form> </form>
<roundcube:object name="plugin.edit_recurrence_sync" id="edit-recurrence-syncstart" class="event-dialog-message" style="display:none" /> <roundcube:object name="plugin.edit_recurrence_sync" id="edit-recurrence-syncstart" class="dialog-message" style="display:none" />
<roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="event-dialog-message" style="display:none" /> <roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="dialog-message" style="display:none" />
<roundcube:object name="plugin.edit_recurring_warning" class="event-dialog-message edit-recurring-warning" style="display:none" /> <roundcube:object name="plugin.edit_recurring_warning" class="dialog-message edit-recurring-warning" style="display:none" />
<roundcube:object name="plugin.attachments_form" id="event-attachment-form" mode="smart" /> <roundcube:object name="plugin.attachments_form" id="event-attachment-form" mode="smart" />
<div id="edit-localchanges-warning" class="event-dialog-message" style="display:none"><roundcube:label name="calendar.localchangeswarning" /></div> <div id="edit-localchanges-warning" class="dialog-message" style="display:none"><roundcube:label name="calendar.localchangeswarning" /></div>
</div> </div>

8
plugins/calendar/skins/larry/calendar.css
View file

@ -979,7 +979,7 @@ td.topalign {
padding: 0 0.5em 0.5em 0.5em; padding: 0 0.5em 0.5em 0.5em;
} }
.event-dialog-message, .dialog-message,
.event-update-confirm .message { .event-update-confirm .message {
margin-top: 0.5em; margin-top: 0.5em;
padding: 0.8em; padding: 0.8em;
@ -987,7 +987,7 @@ td.topalign {
background-color: #fef893; background-color: #fef893;
} }
.event-dialog-message .message, .dialog-message .message,
.event-update-confirm .message { .event-update-confirm .message {
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }
@ -1000,13 +1000,13 @@ td.topalign {
padding-left: 30px; padding-left: 30px;
} }
.event-dialog-message span.ui-icon, .dialog-message span.ui-icon,
.event-update-confirm span.ui-icon { .event-update-confirm span.ui-icon {
float: left; float: left;
margin: 0 7px 20px 0; margin: 0 7px 20px 0;
} }
.event-dialog-message label, .dialog-message label,
.event-update-confirm label { .event-update-confirm label {
min-width: 3em; min-width: 3em;
padding-right: 1em; padding-right: 1em;

2
plugins/calendar/skins/larry/templates/calendar.html
View file

@ -158,7 +158,7 @@
<div class="event-text"></div> <div class="event-text"></div>
</div> </div>
<roundcube:object name="plugin.event_rsvp_buttons" id="event-rsvp" class="event-dialog-message" style="display:none" /> <roundcube:object name="plugin.event_rsvp_buttons" id="event-rsvp" class="dialog-message" style="display:none" />
</div> </div>
<div id="eventoptionsmenu" class="popupmenu" aria-hidden="true"> <div id="eventoptionsmenu" class="popupmenu" aria-hidden="true">

8
plugins/calendar/skins/larry/templates/eventedit.html
View file

@ -128,9 +128,9 @@
</div> </div>
</form> </form>
<roundcube:object name="plugin.edit_recurrence_sync" id="edit-recurrence-syncstart" class="event-dialog-message" style="display:none" /> <roundcube:object name="plugin.edit_recurrence_sync" id="edit-recurrence-syncstart" class="dialog-message" style="display:none" />
<roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="event-dialog-message" style="display:none" /> <roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="dialog-message" style="display:none" />
<roundcube:object name="plugin.edit_recurring_warning" class="event-dialog-message edit-recurring-warning" style="display:none" /> <roundcube:object name="plugin.edit_recurring_warning" class="dialog-message edit-recurring-warning" style="display:none" />
<roundcube:object name="plugin.attachments_form" id="edit-attachment-form" mode="smart" /> <roundcube:object name="plugin.attachments_form" id="edit-attachment-form" mode="smart" />
<div id="edit-localchanges-warning" class="event-dialog-message" style="display:none"><roundcube:label name="calendar.localchangeswarning" /></div> <div id="edit-localchanges-warning" class="dialog-message" style="display:none"><roundcube:label name="calendar.localchangeswarning" /></div>
</div> </div>

31
plugins/libkolab/skins/elastic/include/libcalendaring.less
View file

@ -75,6 +75,7 @@
.rsvp-buttons { .rsvp-buttons {
width: 100%; width: 100%;
padding-top: .25rem;
} }
.itip-reply-controls { .itip-reply-controls {
@ -83,6 +84,11 @@
& > label { & > label {
display: inline; display: inline;
label {
line-height: 1;
margin-right: .25rem;
}
} }
a { a {
@ -304,8 +310,8 @@
height: 2em; height: 2em;
&:before { &:before {
line-height: 2; line-height: 1.8;
height: 2em; margin: 0;
} }
} }
} }
@ -554,7 +560,6 @@
} }
} }
#alarm-display { #alarm-display {
h3 { h3 {
font-size: 1.2rem; font-size: 1.2rem;
@ -607,3 +612,23 @@
#alarm-snooze-dropdown a:before { #alarm-snooze-dropdown a:before {
.font-icon-regular(@fa-var-clock); .font-icon-regular(@fa-var-clock);
} }
.dialog-message {
margin: 0;
opacity: .95;
width: 100%;
padding: .75em;
margin-top: .25em;
color: @color-message;
background-color: @color-message-warning-background;
& > label {
margin: 0;
display: block;
label:before {
line-height: 1.25;
margin-right: .25rem;
}
}
}

5
plugins/libkolab/skins/elastic/include/tasklist.less
View file

@ -223,11 +223,12 @@
right: .25rem; right: .25rem;
bottom: 0; bottom: 0;
top: auto; top: auto;
line-height: 2em;
padding: 0 .2em 0 0; padding: 0 .2em 0 0;
cursor: pointer; cursor: pointer;
z-index: 1; z-index: 1;
line-height: 1.8; line-height: 1;
height: 1.5em;
font-size: 1.15em;
} }
.actions { .actions {

2
plugins/tasklist/skins/elastic/templates/taskedit.html
View file

@ -121,6 +121,6 @@
<roundcube:object name="plugin.filedroparea" id="taskedit-attachments-droparea" /> <roundcube:object name="plugin.filedroparea" id="taskedit-attachments-droparea" />
</fieldset> </fieldset>
</form> </form>
<roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="task-dialog-message" style="display:none" /> <roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="dialog-message" style="display:none" />
<roundcube:object name="plugin.attachments_form" id="taskedit-attachment-form" mode="smart" /> <roundcube:object name="plugin.attachments_form" id="taskedit-attachment-form" mode="smart" />
</div> </div>

4
plugins/tasklist/skins/larry/tasklist.css
View file

@ -1189,14 +1189,14 @@ label.block {
width: 20em; width: 20em;
} }
.task-dialog-message { .dialog-message {
margin-top: 0.5em; margin-top: 0.5em;
padding: 0.8em; padding: 0.8em;
border: 1px solid #ffdf0e; border: 1px solid #ffdf0e;
background-color: #fef893; background-color: #fef893;
} }
.task-dialog-message .message, .dialog-message .message,
.task-update-confirm .message { .task-update-confirm .message {
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }

2
plugins/tasklist/skins/larry/templates/mainview.html
View file

@ -235,7 +235,7 @@
<span class="task-text"></span> <span class="task-text"></span>
</div> </div>
<roundcube:object name="plugin.task_rsvp_buttons" id="task-rsvp" class="task-dialog-message" style="display:none" /> <roundcube:object name="plugin.task_rsvp_buttons" id="task-rsvp" class="dialog-message" style="display:none" />
</div> </div>
<roundcube:if condition="env:tasklist_driver == 'kolab' && config:kolab_bonnie_api" /> <roundcube:if condition="env:tasklist_driver == 'kolab' && config:kolab_bonnie_api" />

2
plugins/tasklist/skins/larry/templates/taskedit.html
View file

@ -107,6 +107,6 @@
<roundcube:object name="plugin.filedroparea" id="taskedit-panel-attachments" /> <roundcube:object name="plugin.filedroparea" id="taskedit-panel-attachments" />
</div> </div>
</form> </form>
<roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="task-dialog-message" style="display:none" /> <roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="dialog-message" style="display:none" />
<roundcube:object name="plugin.attachments_form" id="taskedit-attachment-form" mode="smart" /> <roundcube:object name="plugin.attachments_form" id="taskedit-attachment-form" mode="smart" />
</div> </div>

25
plugins/tasklist/tasklist.js
View file

@ -1094,7 +1094,10 @@ function rcube_tasklist_ui(settings)
cache = {}, cache = {},
activetags = {}, activetags = {},
msgbox = $('#listmessagebox').hide(), msgbox = $('#listmessagebox').hide(),
list = $(rcmail.gui_objects.resultlist).html(''); list = $(rcmail.gui_objects.resultlist);
selected = $('.taskhead.selected', list).parent().attr('rel');
list.html('');
for (var i=0; i < listindex.length; i++) { for (var i=0; i < listindex.length; i++) {
id = listindex[i]; id = listindex[i];
@ -1128,6 +1131,10 @@ function rcube_tasklist_ui(settings)
msgbox.html(rcmail.gettext('notasksfound','tasklist')).show(); msgbox.html(rcmail.gettext('notasksfound','tasklist')).show();
rcmail.display_message(rcmail.gettext('notasksfound','tasklist'), 'voice'); rcmail.display_message(rcmail.gettext('notasksfound','tasklist'), 'voice');
} }
else if (selected) {
// mark back the selected task
$('li[rel="' + selected + '"] > .taskhead').addClass('selected');
}
} }
/** /**
@ -1402,6 +1409,12 @@ function rcube_tasklist_ui(settings)
rcmail.set_busy(false, null, saving_lock); rcmail.set_busy(false, null, saving_lock);
$('button.ui-button:ui-button').button('option', 'disabled', false); $('button.ui-button:ui-button').button('option', 'disabled', false);
saving_lock = null; saving_lock = null;
// Elastic
if (!$('.selected', rcmail.gui_objects.resultlist).length) {
$('#taskedit').parents('.watermark').removeClass('formcontainer');
rcmail.triggerEvent('show-list');
}
} }
} }
@ -2254,7 +2267,7 @@ function rcube_tasklist_ui(settings)
if (data === false || !data.length || !rec) { if (data === false || !data.length || !rec) {
// display 'unavailable' message // display 'unavailable' message
$('<div class="notfound-message task-dialog-message warning">' + rcmail.gettext('objectchangelognotavailable','tasklist') + '</div>') $('<div class="notfound-message dialog-message warning">' + rcmail.gettext('objectchangelognotavailable','tasklist') + '</div>')
.insertBefore($dialog.find('.changelog-table').hide()); .insertBefore($dialog.find('.changelog-table').hide());
return; return;
} }
@ -2853,14 +2866,14 @@ function rcube_tasklist_ui(settings)
} }
if (me.is_attendee(rec)) { if (me.is_attendee(rec)) {
html += '<div class="task-dialog-message">' + html += '<div class="dialog-message">' +
'<label><input class="confirm-attendees-decline" type="checkbox" checked="checked" value="1" name="_decline" />&nbsp;' + '<label><input class="confirm-attendees-decline pretty-checkbox" type="checkbox" checked="checked" value="1" name="_decline" />&nbsp;' +
rcmail.gettext('itipdeclinetask', 'tasklist') + rcmail.gettext('itipdeclinetask', 'tasklist') +
'</label></div>'; '</label></div>';
} }
else if (me.has_attendees(rec) && me.is_organizer(rec)) { else if (me.has_attendees(rec) && me.is_organizer(rec)) {
html += '<div class="task-dialog-message">' + html += '<div class="dialog-message">' +
'<label><input class="confirm-attendees-notify" type="checkbox" checked="checked" value="1" name="_notify" />&nbsp;' + '<label><input class="confirm-attendees-notify pretty-checkbox" type="checkbox" checked="checked" value="1" name="_notify" />&nbsp;' +
rcmail.gettext('sendcancellation', 'tasklist') + rcmail.gettext('sendcancellation', 'tasklist') +
'</label></div>'; '</label></div>';
} }

2
plugins/tasklist/tasklist_ui.php
View file

@ -470,7 +470,7 @@ class tasklist_ui
*/ */
function edit_attendees_notify($attrib = array()) function edit_attendees_notify($attrib = array())
{ {
$checkbox = new html_checkbox(array('name' => '_notify', 'id' => 'edit-attendees-donotify', 'value' => 1)); $checkbox = new html_checkbox(array('name' => '_notify', 'id' => 'edit-attendees-donotify', 'value' => 1, 'class' => 'pretty-checkbox'));
return html::div($attrib, html::label(null, $checkbox->show(1) . ' ' . $this->plugin->gettext('sendnotifications'))); return html::div($attrib, html::label(null, $checkbox->show(1) . ' ' . $this->plugin->gettext('sendnotifications')));
} }