Page MenuHomePhabricator
Files F13179322

D10574.diff
No OneTemporary
Actions

D10574.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
@@ -93,7 +93,7 @@
'rsrc/css/application/ponder/feed.css' => 'e62615b6',
'rsrc/css/application/ponder/post.css' => 'ebab8a70',
'rsrc/css/application/ponder/vote.css' => '8ed6ed8b',
- 'rsrc/css/application/profile/profile-view.css' => 'b459416e',
+ 'rsrc/css/application/profile/profile-view.css' => '28f433ef',
'rsrc/css/application/projects/project-icon.css' => 'c2ecb7f1',
'rsrc/css/application/releeph/releeph-core.css' => '9b3c5733',
'rsrc/css/application/releeph/releeph-preview-branch.css' => 'b7a6f4a5',
@@ -732,7 +732,7 @@
'phabricator-object-selector-css' => '029a133d',
'phabricator-phtize' => 'd254d646',
'phabricator-prefab' => 'bbae734c',
- 'phabricator-profile-css' => 'b459416e',
+ 'phabricator-profile-css' => '28f433ef',
'phabricator-remarkup-css' => '45313445',
'phabricator-search-results-css' => 'f240504c',
'phabricator-shaped-request' => '7cbe244b',
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileController.php b/src/applications/people/controller/PhabricatorPeopleProfileController.php
--- a/src/applications/people/controller/PhabricatorPeopleProfileController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileController.php
@@ -133,11 +133,20 @@
$crumbs->addTextCrumb($user->getUsername());
$crumbs->setActionList($actions);
$feed = $this->renderUserFeed($user);
- $calendar = $this->renderUserCalendar($user);
+ $cal_class = 'PhabricatorCalendarApplication';
+ $classes = array();
+ $classes[] = 'profile-activity-view';
+ if (PhabricatorApplication::isClassInstalledForViewer($cal_class, $user)) {
+ $calendar = $this->renderUserCalendar($user);
+ $classes[] = 'profile-has-calendar';
+ $classes[] = 'grouped';
+ } else {
+ $calendar = null;
+ }
$activity = phutil_tag(
'div',
array(
- 'class' => 'profile-activity-view grouped'
+ 'class' => implode($classes, ' '),
),
array(
$calendar,
diff --git a/webroot/rsrc/css/application/profile/profile-view.css b/webroot/rsrc/css/application/profile/profile-view.css
--- a/webroot/rsrc/css/application/profile/profile-view.css
+++ b/webroot/rsrc/css/application/profile/profile-view.css
@@ -30,6 +30,10 @@
}
.profile-activity-view .profile-feed {
+ margin-left: 16px;
+}
+
+.profile-activity-view.profile-has-calendar .profile-feed {
margin-left: 332px;
}

File Metadata

Mime Type
text/plain
Expires
Thu, May 9, 9:06 PM (3 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6277554
Default Alt Text
D10574.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility