Page MenuHomePhabricator

D12801.id30773.diff
No OneTemporary

D12801.id30773.diff

diff --git a/src/view/phui/calendar/PHUICalendarDayView.php b/src/view/phui/calendar/PHUICalendarDayView.php
--- a/src/view/phui/calendar/PHUICalendarDayView.php
+++ b/src/view/phui/calendar/PHUICalendarDayView.php
@@ -271,12 +271,14 @@
$widget = new PHUICalendarWidgetView();
$list = id(new PHUICalendarListView())
- ->setUser($this->user);
+ ->setUser($this->user)
+ ->setIsDayView(true);
if (count($events) == 0) {
$list->showBlankState(true);
} else {
- foreach ($events as $event) {
+ $sorted_events = msort($events, 'getEpochStart');
+ foreach ($sorted_events as $event) {
$list->addEvent($event);
}
}
diff --git a/src/view/phui/calendar/PHUICalendarListView.php b/src/view/phui/calendar/PHUICalendarListView.php
--- a/src/view/phui/calendar/PHUICalendarListView.php
+++ b/src/view/phui/calendar/PHUICalendarListView.php
@@ -73,7 +73,8 @@
$class = 'phui-calendar-list-item phui-calendar-'.$color;
if ($event->getIsAllDay()) {
- $class = $class.' all-day';
+ $all_day_class = $this->isDayView ? ' sidebar-all-day' : ' all-day';
+ $class = $class.$all_day_class;
}
$singletons[] = phutil_tag(

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 25, 4:23 AM (10 h, 27 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7046686
Default Alt Text
D12801.id30773.diff (1 KB)

Event Timeline