Merge pull request #457 from felixhahnweilheim/enh-canceled

Canceled Events: add CSS class
humhub · Feb 19, 2024 · ace8497 · ace8497
2 parents 577925e + 2879be6
commit ace8497
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/models/fullcalendar/FullCalendar.php b/models/fullcalendar/FullCalendar.php
@@ -81,6 +81,11 @@ public static function getFullCalendarArray(CalendarEventIF $entry)
            // $result['rrule'] = $entry->getRrule();
            // $result['exdate'] = $entry->getExdate();
         }
+
+        // Add CSS class for canceled events
+        if($entry instanceof CalendarEventStatusIF && $entry->getEventStatus() === CalendarEventStatusIF::STATUS_CANCELLED) {
+            $result['className'] = 'canceled';
+        }
 
         return $result;
     }
@@ -121,13 +126,7 @@ private static function getEndDate(CalendarEventIF $entry)
 
     private static function getTitle(CalendarEventIF $entry)
     {
-        $title = $entry->getTitle();
-
-        if($entry instanceof CalendarEventStatusIF && $entry->getEventStatus() === CalendarEventStatusIF::STATUS_CANCELLED) {
-            $title .= ' ('.Yii::t('CalendarModule.base', 'canceled').')';
-        }
-
-        return $title;
+        return $entry->getTitle();
     }
 
     /**

diff --git a/resources/css/calendar.css b/resources/css/calendar.css
@@ -322,6 +322,13 @@ a.fc-event,
     line-height: 50%; /* */
 }
 
+/* Canceled Events */
+.fc-view .canceled .fc-content,
+.fc-view .canceled .fc-content div,
+.fc-view .canceled.fc-list-item {
+  text-decoration: line-through;
+}
+
 
 /* Horizontal Events
 ------------------------------------------------------------------------*/