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

Wrap attendee/group name in span to render correctly in FF3+ (#4244)

Browse source
This commit is contained in:
Thomas Bruederli 2015-01-27 15:15:04 +01:00
parent 6bbad6f15e
commit f346aabe12
4 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/calendar/calendar_ui.js
View file

@ -1977,7 +1977,7 @@ function rcube_calendar_ui(settings)
var img_src = rcmail.assets_path('program/resources/blank.gif'); var img_src = rcmail.assets_path('program/resources/blank.gif');
var html = '<td class="role">' + select + '</td>' + var html = '<td class="role">' + select + '</td>' +
'<td class="name">' + dispname + '</td>' + '<td class="name"><span class="attendee-name">' + dispname + '</span></td>' +
'<td class="availability"><img src="' + img_src + '" class="availabilityicon ' + avail + '" data-email="' + data.email + '" alt="" /></td>' + '<td class="availability"><img src="' + img_src + '" class="availabilityicon ' + avail + '" data-email="' + data.email + '" alt="" /></td>' +
'<td class="confirmstate"><span class="' + String(data.status).toLowerCase() + '" title="' + Q(tooltip) + '">' + Q(data.status || '') + '</span></td>' + '<td class="confirmstate"><span class="' + String(data.status).toLowerCase() + '" title="' + Q(tooltip) + '">' + Q(data.status || '') + '</span></td>' +
(data.cutype != 'RESOURCE' ? '<td class="invite">' + (organizer || readonly || !invbox ? '' : invbox) + '</td>' : '') + (data.cutype != 'RESOURCE' ? '<td class="invite">' + (organizer || readonly || !invbox ? '' : invbox) + '</td>' : '') +
@ -1995,7 +1995,7 @@ function rcube_calendar_ui(settings)
tr.find('a.deletelink').click({ id:(data.email || data.name) }, function(e) { remove_attendee(this, e.data.id); return false; }); tr.find('a.deletelink').click({ id:(data.email || data.name) }, function(e) { remove_attendee(this, e.data.id); return false; });
tr.find('a.mailtolink').click(event_attendee_click); tr.find('a.mailtolink').click(event_attendee_click);
tr.find('a.expandlink').click(data, function(e) { me.expand_attendee_group(e, add_attendee, remove_attendee); }); tr.find('a.expandlink').click(data, function(e) { me.expand_attendee_group(e, add_attendee, remove_attendee); return false; });
tr.find('input.edit-attendee-reply').click(function() { tr.find('input.edit-attendee-reply').click(function() {
var enabled = $('#edit-attendees-invite:checked').length || $('input.edit-attendee-reply:checked').length; var enabled = $('#edit-attendees-invite:checked').length || $('input.edit-attendee-reply:checked').length;
$('#eventedit .attendees-commentbox')[enabled ? 'show' : 'hide'](); $('#eventedit .attendees-commentbox')[enabled ? 'show' : 'hide']();

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

@ -1129,13 +1129,21 @@ td.topalign {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
position: relative;
} }
#eventedit .edit-attendees-table td.name select { #eventedit .edit-attendees-table td.name select {
width: 100%; width: 100%;
} }
#eventedit .edit-attendees-table td.name .attendee-name {
display: block;
position: relative;
overflow: hidden;
text-overflow: ellipsis;
padding: 5px 7px 6px;
margin: -5px -7px -6px;
}
#eventedit .edit-attendees-table a.deletelink { #eventedit .edit-attendees-table a.deletelink {
display: inline-block; display: inline-block;
width: 17px; width: 17px;

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

@ -903,7 +903,7 @@ a.morelink:hover {
} }
#taskedit .edit-attendees-table tbody td { #taskedit .edit-attendees-table tbody td {
padding: 4px 7px; padding: 5px 7px 6px;
} }
#taskedit .edit-attendees-table tbody tr:last-child td { #taskedit .edit-attendees-table tbody tr:last-child td {
@ -955,7 +955,15 @@ a.morelink:hover {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
}
#taskedit .edit-attendees-table td.name .attendee-name {
display: block;
position: relative; position: relative;
overflow: hidden;
text-overflow: ellipsis;
padding: 5px 7px 6px 4px;
margin: -5px -7px -6px;
} }
#taskedit .edit-attendees-table td.name select { #taskedit .edit-attendees-table td.name select {

4
plugins/tasklist/tasklist.js
View file

@ -1720,7 +1720,7 @@ function rcube_tasklist_ui(settings)
rcmail.gettext('expandattendeegroup','libcalendaring') + '</a>'; rcmail.gettext('expandattendeegroup','libcalendaring') + '</a>';
} }
var html = '<td class="name">' + dispname + '</td>' + var html = '<td class="name"><span class="attendee-name">' + dispname + '</span></td>' +
'<td class="confirmstate"><span class="' + String(data.status).toLowerCase() + '" title="' + Q(tooltip) + '">' + Q(data.status || '') + '</span></td>' + '<td class="confirmstate"><span class="' + String(data.status).toLowerCase() + '" title="' + Q(tooltip) + '">' + Q(data.status || '') + '</span></td>' +
(data.cutype != 'RESOURCE' ? '<td class="invite">' + (readonly || !invbox ? '' : invbox) + '</td>' : '') + (data.cutype != 'RESOURCE' ? '<td class="invite">' + (readonly || !invbox ? '' : invbox) + '</td>' : '') +
'<td class="options">' + (readonly ? '' : dellink) + '</td>'; '<td class="options">' + (readonly ? '' : dellink) + '</td>';
@ -1736,7 +1736,7 @@ function rcube_tasklist_ui(settings)
tr.find('a.deletelink').click({ id:(data.email || data.name) }, function(e) { remove_attendee(this, e.data.id); return false; }); tr.find('a.deletelink').click({ id:(data.email || data.name) }, function(e) { remove_attendee(this, e.data.id); return false; });
tr.find('a.mailtolink').click(task_attendee_click); tr.find('a.mailtolink').click(task_attendee_click);
tr.find('a.expandlink').click(data, function(e) { me.expand_attendee_group(e, add_attendee, remove_attendee); }); tr.find('a.expandlink').click(data, function(e) { me.expand_attendee_group(e, add_attendee, remove_attendee); return false; });
tr.find('input.edit-attendee-reply').click(function() { tr.find('input.edit-attendee-reply').click(function() {
var enabled = $('#edit-attendees-invite:checked').length || $('input.edit-attendee-reply:checked').length; var enabled = $('#edit-attendees-invite:checked').length || $('input.edit-attendee-reply:checked').length;
$('#taskeditform .attendees-commentbox')[enabled ? 'show' : 'hide'](); $('#taskeditform .attendees-commentbox')[enabled ? 'show' : 'hide']();