plugins/calendar plugins/tasklist
Thomas Brüderli
bruederli at kolabsys.com
Tue Jan 27 15:15:52 CET 2015
plugins/calendar/calendar_ui.js | 4 ++--
plugins/calendar/skins/larry/calendar.css | 10 +++++++++-
plugins/tasklist/skins/larry/tasklist.css | 10 +++++++++-
plugins/tasklist/tasklist.js | 4 ++--
4 files changed, 22 insertions(+), 6 deletions(-)
New commits:
commit f346aabe12d464755bcea74682e5d1c2d5e2fb37
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Tue Jan 27 15:15:04 2015 +0100
Wrap attendee/group name in span to render correctly in FF3+ (#4244)
diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 2d2c467..925324e 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -1977,7 +1977,7 @@ function rcube_calendar_ui(settings)
var img_src = rcmail.assets_path('program/resources/blank.gif');
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="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>' : '') +
@@ -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.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() {
var enabled = $('#edit-attendees-invite:checked').length || $('input.edit-attendee-reply:checked').length;
$('#eventedit .attendees-commentbox')[enabled ? 'show' : 'hide']();
diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index 6375c0e..a239f2b 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -1129,13 +1129,21 @@ td.topalign {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
- position: relative;
}
#eventedit .edit-attendees-table td.name select {
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 {
display: inline-block;
width: 17px;
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']();
More information about the commits
mailing list