Page MenuHomePhabricator
Files F15398538

D20344.id48559.diff
No OneTemporary
Actions

D20344.id48559.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
@@ -99,7 +99,7 @@
'rsrc/css/application/policy/policy-transaction-detail.css' => 'c02b8384',
'rsrc/css/application/policy/policy.css' => 'ceb56a08',
'rsrc/css/application/ponder/ponder-view.css' => '05a09d0a',
- 'rsrc/css/application/project/project-card-view.css' => '3b1f7b20',
+ 'rsrc/css/application/project/project-card-view.css' => '4e7371cd',
'rsrc/css/application/project/project-triggers.css' => 'cb866c2d',
'rsrc/css/application/project/project-view.css' => '567858b3',
'rsrc/css/application/releeph/releeph-core.css' => 'f81ff2db',
@@ -881,7 +881,7 @@
'policy-edit-css' => '8794e2ed',
'policy-transaction-detail-css' => 'c02b8384',
'ponder-view-css' => '05a09d0a',
- 'project-card-view-css' => '3b1f7b20',
+ 'project-card-view-css' => '4e7371cd',
'project-triggers-css' => 'cb866c2d',
'project-view-css' => '567858b3',
'releeph-core' => 'f81ff2db',
diff --git a/src/applications/people/view/PhabricatorUserCardView.php b/src/applications/people/view/PhabricatorUserCardView.php
--- a/src/applications/people/view/PhabricatorUserCardView.php
+++ b/src/applications/people/view/PhabricatorUserCardView.php
@@ -95,14 +95,17 @@
'fa-user-plus',
phabricator_date($user->getDateCreated(), $viewer));
- if (PhabricatorApplication::isClassInstalledForViewer(
- 'PhabricatorCalendarApplication',
- $viewer)) {
- $body[] = $this->addItem(
- 'fa-calendar-o',
- id(new PHUIUserAvailabilityView())
- ->setViewer($viewer)
- ->setAvailableUser($user));
+ $has_calendar = PhabricatorApplication::isClassInstalledForViewer(
+ 'PhabricatorCalendarApplication',
+ $viewer);
+ if ($has_calendar) {
+ if (!$user->getIsDisabled()) {
+ $body[] = $this->addItem(
+ 'fa-calendar-o',
+ id(new PHUIUserAvailabilityView())
+ ->setViewer($viewer)
+ ->setAvailableUser($user));
+ }
}
$classes[] = 'project-card-image';
@@ -150,8 +153,8 @@
'class' => 'project-card-inner',
),
array(
- $image,
$header,
+ $image,
));
return $card;
diff --git a/webroot/rsrc/css/application/project/project-card-view.css b/webroot/rsrc/css/application/project/project-card-view.css
--- a/webroot/rsrc/css/application/project/project-card-view.css
+++ b/webroot/rsrc/css/application/project/project-card-view.css
@@ -36,22 +36,36 @@
}
.project-card-view .project-card-image {
+ position: absolute;
height: 140px;
width: 140px;
- margin: 6px;
+ top: 6px;
+ left: 6px;
border-radius: 3px;
}
.project-card-view .project-card-image-href {
- display: inline-block;
+ display: block;
}
.project-card-view .project-card-item div {
display: inline;
}
+.project-card-inner {
+ position: relative;
+}
+
+.people-card-view .project-card-inner {
+ padding: 6px;
+ min-height: 140px;
+}
+
.project-card-view .project-card-item {
margin-bottom: 2px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.project-card-view .project-card-item-text {
@@ -63,9 +77,9 @@
}
.project-card-view .project-card-header {
- position: absolute;
- top: 12px;
- left: 158px;
+ margin-top: 6px;
+ margin-left: 152px;
+ overflow: hidden;
}
.project-card-header .project-card-name {

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 18, 12:33 AM (1 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7469189
Default Alt Text
D20344.id48559.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility