Page MenuHomePhabricator
Files F14053268

D12801.diff
No OneTemporary
Actions

D12801.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -120,7 +120,7 @@
'rsrc/css/layout/phabricator-hovercard-view.css' => '44394670',
'rsrc/css/layout/phabricator-side-menu-view.css' => 'c1db9e9c',
'rsrc/css/layout/phabricator-source-code-view.css' => '2ceee894',
- 'rsrc/css/phui/calendar/phui-calendar-day.css' => '49037167',
+ 'rsrc/css/phui/calendar/phui-calendar-day.css' => '38891735',
'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1d0ca59',
'rsrc/css/phui/calendar/phui-calendar-month.css' => '873e00da',
'rsrc/css/phui/calendar/phui-calendar.css' => '8675968e',
@@ -777,7 +777,7 @@
'phui-box-css' => '7b3a2eed',
'phui-button-css' => 'de610129',
'phui-calendar-css' => '8675968e',
- 'phui-calendar-day-css' => '49037167',
+ 'phui-calendar-day-css' => '38891735',
'phui-calendar-list-css' => 'c1d0ca59',
'phui-calendar-month-css' => '873e00da',
'phui-crumbs-view-css' => '594d719e',
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
@@ -268,7 +268,8 @@
}
private function renderSidebarBox($events, $title) {
- $widget = new PHUICalendarWidgetView();
+ $widget = id(new PHUICalendarWidgetView())
+ ->addClass('calendar-day-view-sidebar');
$list = id(new PHUICalendarListView())
->setUser($this->user);
@@ -276,7 +277,8 @@
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);
}
}
@@ -388,7 +390,7 @@
$name = phutil_tag(
'a',
array(
- 'class' => 'all-day',
+ 'class' => 'day-view-all-day',
'href' => $event->getURI(),
),
$event->getName());
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
@@ -4,18 +4,12 @@
private $events = array();
private $blankState;
- private $isDayView = false;
public function addEvent(AphrontCalendarEventView $event) {
$this->events[] = $event;
return $this;
}
- public function setIsDayView($is_day_view) {
- $this->isDayView = $is_day_view;
- return $this;
- }
-
public function showBlankState($state) {
$this->blankState = $state;
return $this;
diff --git a/webroot/rsrc/css/phui/calendar/phui-calendar-day.css b/webroot/rsrc/css/phui/calendar/phui-calendar-day.css
--- a/webroot/rsrc/css/phui/calendar/phui-calendar-day.css
+++ b/webroot/rsrc/css/phui/calendar/phui-calendar-day.css
@@ -49,7 +49,7 @@
color: {$greytext};
}
-.all-day {
+.day-view-all-day {
border: 1px solid {$blueborder};
height: 12px;
margin: 0;
@@ -60,7 +60,7 @@
color: {$greytext};
}
-.phui-calendar-day-event + .phui-calendar-day-event .all-day {
+.phui-calendar-day-event + .phui-calendar-day-event .day-view-all-day {
border-top-style: none;
border-top-width: 0;
}

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 16, 1:51 PM (2 d, 7 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6714000
Default Alt Text
D12801.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility