@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Check calendar is installed on profile

Summary: Fixes T6199, checks if Calendar is installed and displays if so.

Test Plan: Turned Calendar on and off, tested both layouts.

Reviewers: btrahan, epriestley

Reviewed By: epriestley

Subscribers: epriestley, Korvin

Maniphest Tasks: T6199

Differential Revision: https://secure.phabricator.com/D10574

+17 -4
+2 -2
resources/celerity/map.php
··· 93 93 'rsrc/css/application/ponder/feed.css' => 'e62615b6', 94 94 'rsrc/css/application/ponder/post.css' => 'ebab8a70', 95 95 'rsrc/css/application/ponder/vote.css' => '8ed6ed8b', 96 - 'rsrc/css/application/profile/profile-view.css' => 'b459416e', 96 + 'rsrc/css/application/profile/profile-view.css' => '28f433ef', 97 97 'rsrc/css/application/projects/project-icon.css' => 'c2ecb7f1', 98 98 'rsrc/css/application/releeph/releeph-core.css' => '9b3c5733', 99 99 'rsrc/css/application/releeph/releeph-preview-branch.css' => 'b7a6f4a5', ··· 732 732 'phabricator-object-selector-css' => '029a133d', 733 733 'phabricator-phtize' => 'd254d646', 734 734 'phabricator-prefab' => 'bbae734c', 735 - 'phabricator-profile-css' => 'b459416e', 735 + 'phabricator-profile-css' => '28f433ef', 736 736 'phabricator-remarkup-css' => '45313445', 737 737 'phabricator-search-results-css' => 'f240504c', 738 738 'phabricator-shaped-request' => '7cbe244b',
+11 -2
src/applications/people/controller/PhabricatorPeopleProfileController.php
··· 133 133 $crumbs->addTextCrumb($user->getUsername()); 134 134 $crumbs->setActionList($actions); 135 135 $feed = $this->renderUserFeed($user); 136 - $calendar = $this->renderUserCalendar($user); 136 + $cal_class = 'PhabricatorCalendarApplication'; 137 + $classes = array(); 138 + $classes[] = 'profile-activity-view'; 139 + if (PhabricatorApplication::isClassInstalledForViewer($cal_class, $user)) { 140 + $calendar = $this->renderUserCalendar($user); 141 + $classes[] = 'profile-has-calendar'; 142 + $classes[] = 'grouped'; 143 + } else { 144 + $calendar = null; 145 + } 137 146 $activity = phutil_tag( 138 147 'div', 139 148 array( 140 - 'class' => 'profile-activity-view grouped' 149 + 'class' => implode($classes, ' '), 141 150 ), 142 151 array( 143 152 $calendar,
+4
webroot/rsrc/css/application/profile/profile-view.css
··· 30 30 } 31 31 32 32 .profile-activity-view .profile-feed { 33 + margin-left: 16px; 34 + } 35 + 36 + .profile-activity-view.profile-has-calendar .profile-feed { 33 37 margin-left: 332px; 34 38 } 35 39