plugins/calendar

Thomas Brüderli bruederli at kolabsys.com
Wed Jul 9 15:45:52 CEST 2014


 plugins/calendar/lib/js/fullcalendar.js   |    2 +-
 plugins/calendar/skins/larry/calendar.css |   22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

New commits:
commit 37af242d6322074fcae09c1308616779660cc342
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Jul 9 15:45:45 2014 +0200

    Render pending/declined invitations slightly different in agenda view

diff --git a/plugins/calendar/lib/js/fullcalendar.js b/plugins/calendar/lib/js/fullcalendar.js
index 24d0c6d..8cf0dbd 100644
--- a/plugins/calendar/lib/js/fullcalendar.js
+++ b/plugins/calendar/lib/js/fullcalendar.js
@@ -5128,7 +5128,7 @@ function TableEventRenderer() {
 				if (event.source && event.source.className) {
 					skinClasses = skinClasses.concat(event.source.className);
 				}
-				rowClasses = ['fc-event', 'fc-event-row', 'fc-'+dayIDs[event.start.getDay()]];
+				rowClasses = ['fc-event', 'fc-event-row', 'fc-'+dayIDs[event.start.getDay()]].concat(event.className);
 				if (seg.daydiff == 0) {
 					rowClasses.push('fc-today');
 				}
diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index b94dc46..cfba7c1 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -1576,10 +1576,6 @@ a.dropdown-link:after {
 	top: -5000px;
 }
 
-.fc-invitation-declined {
-
-}
-
 .fc-event-vert.fc-invitation-needs-action,
 .fc-event-hori.fc-invitation-needs-action {
 	border: 1px dashed #5757c7 !important;
@@ -1613,6 +1609,24 @@ a.dropdown-link:after {
 	background: url(data:image/gif;base64,R0lGODlhCAAIAPABAMwAAP///yH/C1hNUCBEYXRhWE1QAT8AIfkEBQAAAQAsAAAAAAgACAAAAg4Egmipx+ZaDPCtVPFNBQA7) 0 0 repeat #fff;
 }
 
+.fc-view-table tr.fc-invitation-tentative td,
+.fc-view-table tr.fc-invitation-declined td,
+.fc-view-table tr.fc-invitation-needs-action td {
+	color: #888;
+}
+
+.fc-view-table tr.fc-invitation-tentative td.fc-event-title,
+.fc-view-table tr.fc-invitation-declined td.fc-event-title,
+.fc-view-table tr.fc-invitation-needs-action td.fc-event-title {
+	font-weight: normal;
+}
+
+#quickview-calendar .fc-view-table tr.fc-invitation-tentative td,
+#quickview-calendar .fc-view-table tr.fc-invitation-declined td,
+#quickview-calendar .fc-view-table tr.fc-invitation-needs-action td {
+	color: #333;
+}
+
 .calendarmain .fc-event:focus {
 	outline: 1px solid rgba(71,135,177, 0.4);
 	-webkit-box-shadow: 0 0 2px 3px rgba(71,135,177, 0.6);




More information about the commits mailing list