Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15392688
D12801.id30770.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
8 KB
Referenced Files
None
Subscribers
None
D12801.id30770.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
@@ -8,7 +8,7 @@
return array(
'names' => array(
'core.pkg.css' => 'ed3d6355',
- 'core.pkg.js' => '31eaf90a',
+ 'core.pkg.js' => '73942604',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => 'bb338e4b',
'differential.pkg.js' => '895b8d62',
@@ -122,7 +122,7 @@
'rsrc/css/layout/phabricator-source-code-view.css' => '2ceee894',
'rsrc/css/phui/calendar/phui-calendar-day.css' => '49037167',
'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1d0ca59',
- 'rsrc/css/phui/calendar/phui-calendar-month.css' => 'a92e47d2',
+ 'rsrc/css/phui/calendar/phui-calendar-month.css' => '873e00da',
'rsrc/css/phui/calendar/phui-calendar.css' => '8675968e',
'rsrc/css/phui/phui-action-header-view.css' => '89c497e7',
'rsrc/css/phui/phui-action-list.css' => '4f4d09f2',
@@ -211,7 +211,7 @@
'rsrc/externals/javelin/lib/Resource.js' => '44959b73',
'rsrc/externals/javelin/lib/Routable.js' => 'b3e7d692',
'rsrc/externals/javelin/lib/Router.js' => '29274e2b',
- 'rsrc/externals/javelin/lib/Scrollbar.js' => '4f812f8a',
+ 'rsrc/externals/javelin/lib/Scrollbar.js' => '087e919c',
'rsrc/externals/javelin/lib/Sound.js' => '949c0fe5',
'rsrc/externals/javelin/lib/URI.js' => '6eff08aa',
'rsrc/externals/javelin/lib/Vector.js' => '2caa8fb8',
@@ -681,7 +681,7 @@
'javelin-resource' => '44959b73',
'javelin-routable' => 'b3e7d692',
'javelin-router' => '29274e2b',
- 'javelin-scrollbar' => '4f812f8a',
+ 'javelin-scrollbar' => '087e919c',
'javelin-sound' => '949c0fe5',
'javelin-stratcom' => '6c53634d',
'javelin-tokenizer' => 'ab5f468d',
@@ -779,7 +779,7 @@
'phui-calendar-css' => '8675968e',
'phui-calendar-day-css' => '49037167',
'phui-calendar-list-css' => 'c1d0ca59',
- 'phui-calendar-month-css' => 'a92e47d2',
+ 'phui-calendar-month-css' => '873e00da',
'phui-crumbs-view-css' => '594d719e',
'phui-document-view-css' => '94d5dcd8',
'phui-feed-story-css' => 'c9f3a0b5',
@@ -868,6 +868,12 @@
'javelin-uri',
'phabricator-file-upload',
),
+ '087e919c' => array(
+ 'javelin-install',
+ 'javelin-dom',
+ 'javelin-stratcom',
+ 'javelin-vector',
+ ),
'0a3f3021' => array(
'javelin-behavior',
'javelin-stratcom',
@@ -1134,12 +1140,6 @@
'javelin-stratcom',
'javelin-request',
),
- '4f812f8a' => array(
- 'javelin-install',
- 'javelin-dom',
- 'javelin-stratcom',
- 'javelin-vector',
- ),
'4fdb476d' => array(
'javelin-behavior',
'javelin-stratcom',
diff --git a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
--- a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
+++ b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
@@ -58,7 +58,7 @@
$max_range = $this->getDateTo($saved)->getEpoch();
if ($this->isMonthView($saved) ||
- $this->isDayQuery($saved)) {
+ $this->isDayView($saved)) {
list($start_year, $start_month, $start_day) =
$this->getDisplayYearAndMonthAndDay($saved);
@@ -69,7 +69,7 @@
if ($this->isMonthView($saved)) {
$next->modify('+1 month');
- } else if ($this->isDayQuery($saved)) {
+ } else if ($this->isDayView($saved)) {
$next->modify('+6 day');
}
@@ -271,7 +271,7 @@
if ($this->isMonthView($query)) {
return $this->buildCalendarView($events, $query, $handles);
- } else if ($this->isDayQuery($query)) {
+ } else if ($this->isDayView($query)) {
return $this->buildCalendarDayView($events, $query, $handles);
}
@@ -474,7 +474,7 @@
}
private function isMonthView(PhabricatorSavedQuery $query) {
- if ($this->isDayQuery($query)) {
+ if ($this->isDayView($query)) {
return false;
}
if ($query->getParameter('display') == 'month') {
@@ -482,7 +482,7 @@
}
}
- private function isDayQuery(PhabricatorSavedQuery $query) {
+ private function isDayView(PhabricatorSavedQuery $query) {
if ($query->getParameter('display') == 'day') {
return true;
}
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
@@ -4,19 +4,16 @@
private $events = array();
private $blankState;
- private $showMoreURI;
+ private $isDayView = false;
public function addEvent(AphrontCalendarEventView $event) {
$this->events[] = $event;
return $this;
}
- public function setShowMoreURI($uri) {
- $this->showMoreURI = $uri;
- }
-
- public function getEventCount() {
- return count($this->events);
+ public function setIsDayView($is_day_view) {
+ $this->isDayView = $is_day_view;
+ return $this;
}
public function showBlankState($state) {
@@ -76,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(
@@ -91,23 +89,6 @@
));
}
- if (strlen($this->showMoreURI) > 0) {
- $show_more_link = phutil_tag(
- 'a',
- array(
- 'href' => $this->showMoreURI,
- ),
- pht('Show More'));
-
- $singletons[] = phutil_tag(
- 'li',
- array(
- 'class' => $class,
- ),
- $show_more_link);
- }
-
-
if (empty($singletons)) {
$singletons[] = phutil_tag(
'li',
diff --git a/src/view/phui/calendar/PHUICalendarMonthView.php b/src/view/phui/calendar/PHUICalendarMonthView.php
--- a/src/view/phui/calendar/PHUICalendarMonthView.php
+++ b/src/view/phui/calendar/PHUICalendarMonthView.php
@@ -72,13 +72,14 @@
$empty = $first->format('w');
$markup = array();
-
- for ($ii = 0; $ii < $empty; $ii++) {
- $markup[] = array(
+ $empty_cell = array(
'list' => null,
'date' => null,
'class' => 'phui-calendar-empty',
);
+
+ for ($ii = 0; $ii < $empty; $ii++) {
+ $markup[] = $empty_cell;
}
$show_events = array();
@@ -153,11 +154,7 @@
foreach ($rows as $row) {
$cells = array();
while (count($row) < 7) {
- $row[] = array(
- 'list' => null,
- 'date' => null,
- 'class' => 'phui-calendar-empty',
- );
+ $row[] = $empty_cell;
}
foreach ($row as $cell) {
$cell_list = $cell['list'];
diff --git a/webroot/rsrc/css/phui/calendar/phui-calendar-month.css b/webroot/rsrc/css/phui/calendar/phui-calendar-month.css
--- a/webroot/rsrc/css/phui/calendar/phui-calendar-month.css
+++ b/webroot/rsrc/css/phui/calendar/phui-calendar-month.css
@@ -30,17 +30,6 @@
min-height: 125px;
}
-.phui-calendar-holiday {
- color: {$greytext};
- padding: .5em;
- max-height: 1em;
- overflow: hidden;
-}
-
-table.phui-calendar-view td.phui-calendar-month-weekstart {
- border-left: none;
-}
-
table.phui-calendar-view a.phui-calendar-date-number {
color: {$lightgreytext};
border-color: {$thinblueborder};
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Mar 16, 4:57 PM (2 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7707375
Default Alt Text
D12801.id30770.diff (8 KB)
Attached To
Mode
D12801: Cleaning up day view sidebar css
Attached
Detach File
Event Timeline
Log In to Comment