Page MenuHomePhabricator
Files F14007168

D12700.id.diff
No OneTemporary
Actions

D12700.id.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
@@ -119,7 +119,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' => 'a4df5b72',
+ 'rsrc/css/phui/calendar/phui-calendar-day.css' => '75b8cc4a',
'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1d0ca59',
'rsrc/css/phui/calendar/phui-calendar-month.css' => 'a92e47d2',
'rsrc/css/phui/calendar/phui-calendar.css' => '8675968e',
@@ -780,7 +780,7 @@
'phui-box-css' => '7b3a2eed',
'phui-button-css' => 'de610129',
'phui-calendar-css' => '8675968e',
- 'phui-calendar-day-css' => 'a4df5b72',
+ 'phui-calendar-day-css' => '75b8cc4a',
'phui-calendar-list-css' => 'c1d0ca59',
'phui-calendar-month-css' => 'a92e47d2',
'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
@@ -40,6 +40,7 @@
$hour_start = $hour->format('U');
$hour_end = id(clone $hour)->modify('+1 hour')->format('U');
foreach ($this->events as $event) {
+ // check if start date is in hour slot
if ($event->getEpochStart() >= $hour_start
&& $event->getEpochStart() < $hour_end) {
$events[] = $event;
@@ -49,10 +50,25 @@
$count_events = count($events);
$event_boxes = array();
$n = 0;
+ // draw all events that start in this hour
+ // all times as epochs
foreach ($events as $event) {
+ $event_start = $event->getEpochStart();
+ $event_end = $event->getEpochEnd();
+
$offset = (($n / $count_events) * 100).'%';
$width = ((1 / $count_events) * 100).'%';
- $event_boxes[] = $this->drawEvent($event, $offset, $width);
+ $top = ((($event_start - $hour_start) / ($hour_end - $hour_start))
+ * 100).'%';
+ $height = ((($event_end - $event_start) / ($hour_end - $hour_start))
+ * 100).'%';
+
+ $event_boxes[] = $this->drawEvent(
+ $event,
+ $offset,
+ $width,
+ $top,
+ $height);
$n++;
}
@@ -87,7 +103,9 @@
private function drawEvent(
AphrontCalendarDayEventView $event,
$offset,
- $width) {
+ $width,
+ $top,
+ $height) {
$name = phutil_tag(
'a',
array(
@@ -100,7 +118,11 @@
'div',
array(
'class' => 'phui-calendar-day-event',
- 'style' => 'left: '.$offset.'; width: '.$width.';',
+ 'style' => 'left: '.$offset
+ .'; width: '.$width
+ .'; top: '.$top
+ .'; height: '.$height
+ .';',
),
$name);
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
@@ -32,13 +32,14 @@
position: absolute;
top: 0;
bottom: 0;
+ min-height: 30px;
}
.phui-calendar-day-event-link {
padding: 8px;
border: 1px solid {$blueborder};
background-color: {$bluebackground};
- margin: 4px;
+ margin: 0 4px;
position: absolute;
left: 0;
right: 0;

File Metadata

Mime Type
text/plain
Expires
Wed, Oct 30, 12:53 AM (2 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6748854
Default Alt Text
D12700.id.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility