From 5f04bb6dd9582e2021f41c3f5ec2caea73bef2eb Mon Sep 17 00:00:00 2001
From: Chad Little <chad@chadsdomain.com>
Date: Fri, 26 Sep 2014 09:28:37 -0700
Subject: [PATCH] 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
---
 resources/celerity/map.php                          |  4 ++--
 .../PhabricatorPeopleProfileController.php          | 13 +++++++++++--
 .../rsrc/css/application/profile/profile-view.css   |  4 ++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 9e171e90a6..67464e67a0 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -93,7 +93,7 @@ return array(
     '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 @@ return array(
     '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
index 398ffe8f4c..4a4524d8aa 100644
--- a/src/applications/people/controller/PhabricatorPeopleProfileController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileController.php
@@ -133,11 +133,20 @@ final class PhabricatorPeopleProfileController
     $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
index 47214d9d68..a51fa5a195 100644
--- 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;
 }