Page MenuHomePhabricator
Files F15387078

D15418.id37171.diff
No OneTemporary
Actions

D15418.id37171.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
@@ -127,7 +127,7 @@
'rsrc/css/phui/phui-button.css' => 'a64a8de6',
'rsrc/css/phui/phui-chart.css' => '6bf6f78e',
'rsrc/css/phui/phui-crumbs-view.css' => '79d536e5',
- 'rsrc/css/phui/phui-curtain-view.css' => '8bb7ee8f',
+ 'rsrc/css/phui/phui-curtain-view.css' => 'd590da33',
'rsrc/css/phui/phui-document-pro.css' => '92d5b648',
'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf',
'rsrc/css/phui/phui-document.css' => '9c71d2bf',
@@ -135,7 +135,7 @@
'rsrc/css/phui/phui-fontkit.css' => '9cda225e',
'rsrc/css/phui/phui-form-view.css' => '4a1a0f5e',
'rsrc/css/phui/phui-form.css' => 'aac1d51d',
- 'rsrc/css/phui/phui-head-thing.css' => '11731da0',
+ 'rsrc/css/phui/phui-head-thing.css' => '31638812',
'rsrc/css/phui/phui-header-view.css' => '26cffd3d',
'rsrc/css/phui/phui-hovercard.css' => 'de1a2119',
'rsrc/css/phui/phui-icon-set-selector.css' => '1ab67aad',
@@ -156,7 +156,7 @@
'rsrc/css/phui/phui-status.css' => '37309046',
'rsrc/css/phui/phui-tag-view.css' => '6bbd83e2',
'rsrc/css/phui/phui-timeline-view.css' => '2efceff8',
- 'rsrc/css/phui/phui-two-column-view.css' => 'ecd7ec62',
+ 'rsrc/css/phui/phui-two-column-view.css' => '38871c98',
'rsrc/css/phui/workboards/phui-workboard-color.css' => 'ac6fe6a7',
'rsrc/css/phui/workboards/phui-workboard.css' => 'e6d89647',
'rsrc/css/phui/workboards/phui-workcard.css' => '3646fb96',
@@ -812,7 +812,7 @@
'phui-calendar-month-css' => '476be7e0',
'phui-chart-css' => '6bf6f78e',
'phui-crumbs-view-css' => '79d536e5',
- 'phui-curtain-view-css' => '8bb7ee8f',
+ 'phui-curtain-view-css' => 'd590da33',
'phui-document-summary-view-css' => '9ca48bdf',
'phui-document-view-css' => '9c71d2bf',
'phui-document-view-pro-css' => '92d5b648',
@@ -821,7 +821,7 @@
'phui-fontkit-css' => '9cda225e',
'phui-form-css' => 'aac1d51d',
'phui-form-view-css' => '4a1a0f5e',
- 'phui-head-thing-view-css' => '11731da0',
+ 'phui-head-thing-view-css' => '31638812',
'phui-header-view-css' => '26cffd3d',
'phui-hovercard' => '1bd28176',
'phui-hovercard-view-css' => 'de1a2119',
@@ -845,7 +845,7 @@
'phui-tag-view-css' => '6bbd83e2',
'phui-theme-css' => '027ba77e',
'phui-timeline-view-css' => '2efceff8',
- 'phui-two-column-view-css' => 'ecd7ec62',
+ 'phui-two-column-view-css' => '38871c98',
'phui-workboard-color-css' => 'ac6fe6a7',
'phui-workboard-view-css' => 'e6d89647',
'phui-workcard-view-css' => '3646fb96',
diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
@@ -91,8 +91,8 @@
$timeline,
$comment_view,
))
- ->addPropertySection(pht('DETAILS'), $details)
- ->addPropertySection(pht('DESCRIPTION'), $description);
+ ->addPropertySection(pht('DESCRIPTION'), $description)
+ ->addPropertySection(pht('DETAILS'), $details);
return $this->newPage()
->setTitle($title)
@@ -214,10 +214,18 @@
$owner_phid = $task->getOwnerPHID();
+ $author_phid = $task->getAuthorPHID();
+ $handles = $viewer->loadHandles(array($owner_phid, $author_phid));
+
if ($owner_phid) {
- $assigned_to = $viewer
- ->renderHandle($owner_phid)
- ->setShowHovercard(true);
+ $image_uri = $handles[$owner_phid]->getImageURI();
+ $image_href = $handles[$owner_phid]->getURI();
+ $owner = $viewer->renderHandle($owner_phid)->render();
+ $content = phutil_tag('strong', array(), $owner);
+ $assigned_to = id(new PHUIHeadThingView())
+ ->setImage($image_uri)
+ ->setImageHref($image_href)
+ ->setContent($content);
} else {
$assigned_to = phutil_tag('em', array(), pht('None'));
}
@@ -226,14 +234,18 @@
->setHeaderText(pht('Assigned To'))
->appendChild($assigned_to);
- $author_phid = $task->getAuthorPHID();
- $author = $viewer
- ->renderHandle($author_phid)
- ->setShowHovercard(true);
+ $author_uri = $handles[$author_phid]->getImageURI();
+ $author_href = $handles[$author_phid]->getURI();
+ $author = $viewer->renderHandle($author_phid)->render();
+ $content = phutil_tag('strong', array(), $author);
+ $authored_by = id(new PHUIHeadThingView())
+ ->setImage($author_uri)
+ ->setImageHref($author_href)
+ ->setContent($content);
$curtain->newPanel()
- ->setHeaderText(pht('Author'))
- ->appendChild($author);
+ ->setHeaderText(pht('Authored By'))
+ ->appendChild($authored_by);
return $curtain;
}
diff --git a/webroot/rsrc/css/phui/phui-curtain-view.css b/webroot/rsrc/css/phui/phui-curtain-view.css
--- a/webroot/rsrc/css/phui/phui-curtain-view.css
+++ b/webroot/rsrc/css/phui/phui-curtain-view.css
@@ -3,16 +3,21 @@
*/
.phui-curtain-panel {
- margin: 4px;
- padding: 4px 0;
+ padding: 16px 0;
+ margin: 0 4px;
+}
+
+.device .phui-curtain-panel {
+ padding: 8px 0;
+ margin: 0;
}
.device-desktop .phui-curtain-panel {
- border-top: 1px solid {$lightblueborder};
+ border-top: 1px solid rgba({$alphablue}, .1);
}
.phui-curtain-panel-header {
- padding: 4px 0 0;
+ padding: 0 0 4px;
color: {$bluetext};
font-weight: bold;
}
@@ -20,3 +25,7 @@
.phui-curtain-panel-body {
padding: 4px 0 0;
}
+
+.device .phui-curtain-panel-body {
+ padding: 0;
+}
diff --git a/webroot/rsrc/css/phui/phui-head-thing.css b/webroot/rsrc/css/phui/phui-head-thing.css
--- a/webroot/rsrc/css/phui/phui-head-thing.css
+++ b/webroot/rsrc/css/phui/phui-head-thing.css
@@ -10,7 +10,7 @@
padding-left: 32px;
}
-.device-phone .phui-head-thing-view {
+.device-phone .phui-two-column-subheader .phui-head-thing-view {
min-height: 24px;
height: auto;
line-height: inherit;
diff --git a/webroot/rsrc/css/phui/phui-two-column-view.css b/webroot/rsrc/css/phui/phui-two-column-view.css
--- a/webroot/rsrc/css/phui/phui-two-column-view.css
+++ b/webroot/rsrc/css/phui/phui-two-column-view.css
@@ -139,36 +139,6 @@
border: 1px solid rgba({$alphablue}, .2);
}
-.phui-two-column-properties .phui-property-list-stacked
- .phui-property-list-properties .phui-property-list-key {
- margin: 4px 0 8px 0;
- padding: 20px 4px 0;
- border-top: 1px solid rgba({$alphablue}, .2);
-}
-
-.phui-two-column-properties .phui-property-list-stacked
- .phui-property-list-properties .phui-property-list-value {
- margin: 0 0 20px 0;
- padding: 0 4px;
-}
-
-.device .phui-two-column-properties .phui-property-list-stacked
- .phui-property-list-properties .phui-property-list-value {
- margin-bottom: 12px;
-}
-
-.device-desktop .phui-two-column-properties .phui-property-list-container,
-.device .phui-two-column-properties .phui-property-list-container {
- padding: 0;
-}
-
-.device .phui-two-column-properties .phui-property-list-stacked
- .phui-property-list-properties .phui-property-list-key {
- margin: 12px 0 4px 0;
- padding: 0;
- border: none;
-}
-
.device .phui-two-column-content .phui-two-column-properties.phui-object-box {
padding: 0 12px;
}

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 16, 1:47 AM (3 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7705038
Default Alt Text
D15418.id37171.diff (7 KB)

Event Timeline

Phabricator · Built by Phacility