summaryrefslogtreecommitdiff
path: root/plugins/tasklist
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2015-01-27 14:15:04 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2015-01-27 14:15:04 (GMT)
commitf346aabe12d464755bcea74682e5d1c2d5e2fb37 (patch)
tree6d01d0496174721bc36333c4b761f2601d745a9b /plugins/tasklist
parent6bbad6f15ea2be085a59aa9a7e500b08b8a66677 (diff)
downloadroundcubemail-plugins-kolab-f346aabe12d464755bcea74682e5d1c2d5e2fb37.tar.gz
Wrap attendee/group name in span to render correctly in FF3+ (#4244)
Diffstat (limited to 'plugins/tasklist')
-rw-r--r--plugins/tasklist/skins/larry/tasklist.css10
-rw-r--r--plugins/tasklist/tasklist.js4
2 files changed, 11 insertions, 3 deletions
diff --git a/plugins/tasklist/skins/larry/tasklist.css b/plugins/tasklist/skins/larry/tasklist.css
index b47e496..bd5ec60 100644
--- a/plugins/tasklist/skins/larry/tasklist.css
+++ b/plugins/tasklist/skins/larry/tasklist.css
@@ -903,7 +903,7 @@ a.morelink:hover {
}
#taskedit .edit-attendees-table tbody td {
- padding: 4px 7px;
+ padding: 5px 7px 6px;
}
#taskedit .edit-attendees-table tbody tr:last-child td {
@@ -955,7 +955,15 @@ a.morelink:hover {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
+}
+
+#taskedit .edit-attendees-table td.name .attendee-name {
+ display: block;
position: relative;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ padding: 5px 7px 6px 4px;
+ margin: -5px -7px -6px;
}
#taskedit .edit-attendees-table td.name select {
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index acb7505..7021016 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -1720,7 +1720,7 @@ function rcube_tasklist_ui(settings)
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>' +
(data.cutype != 'RESOURCE' ? '<td class="invite">' + (readonly || !invbox ? '' : invbox) + '</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.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() {
var enabled = $('#edit-attendees-invite:checked').length || $('input.edit-attendee-reply:checked').length;
$('#taskeditform .attendees-commentbox')[enabled ? 'show' : 'hide']();