mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-26 00:32:42 +01:00
Improve wrapping and overflow behavior for curtain panels containing long usernames
Summary: Ref T13486. When a curtain element like "Author" in Maniphest has a very long username, the wrapping and overflow behavior is poor: the date is obscured. Adjust curtain elements which contain lists of references to other objects to improve wrapping behavior (put the date on a separate line) and overflow behavior (so we get a "..." when a name overflows). Test Plan: {F7179376} Maniphest Tasks: T13486 Differential Revision: https://secure.phabricator.com/D20966
This commit is contained in:
parent
84fd5cd5bb
commit
2a92fef879
6 changed files with 269 additions and 22 deletions
|
@ -146,6 +146,7 @@ return array(
|
||||||
'rsrc/css/phui/phui-comment-form.css' => '68a2d99a',
|
'rsrc/css/phui/phui-comment-form.css' => '68a2d99a',
|
||||||
'rsrc/css/phui/phui-comment-panel.css' => 'ec4e31c0',
|
'rsrc/css/phui/phui-comment-panel.css' => 'ec4e31c0',
|
||||||
'rsrc/css/phui/phui-crumbs-view.css' => '614f43cf',
|
'rsrc/css/phui/phui-crumbs-view.css' => '614f43cf',
|
||||||
|
'rsrc/css/phui/phui-curtain-object-ref-view.css' => 'e3331b60',
|
||||||
'rsrc/css/phui/phui-curtain-view.css' => '68c5efb6',
|
'rsrc/css/phui/phui-curtain-view.css' => '68c5efb6',
|
||||||
'rsrc/css/phui/phui-document-pro.css' => 'b9613a10',
|
'rsrc/css/phui/phui-document-pro.css' => 'b9613a10',
|
||||||
'rsrc/css/phui/phui-document-summary.css' => 'b068eed1',
|
'rsrc/css/phui/phui-document-summary.css' => 'b068eed1',
|
||||||
|
@ -833,6 +834,7 @@ return array(
|
||||||
'phui-comment-form-css' => '68a2d99a',
|
'phui-comment-form-css' => '68a2d99a',
|
||||||
'phui-comment-panel-css' => 'ec4e31c0',
|
'phui-comment-panel-css' => 'ec4e31c0',
|
||||||
'phui-crumbs-view-css' => '614f43cf',
|
'phui-crumbs-view-css' => '614f43cf',
|
||||||
|
'phui-curtain-object-ref-view-css' => 'e3331b60',
|
||||||
'phui-curtain-view-css' => '68c5efb6',
|
'phui-curtain-view-css' => '68c5efb6',
|
||||||
'phui-document-summary-view-css' => 'b068eed1',
|
'phui-document-summary-view-css' => 'b068eed1',
|
||||||
'phui-document-view-css' => '52b748a5',
|
'phui-document-view-css' => '52b748a5',
|
||||||
|
|
|
@ -1991,6 +1991,8 @@ phutil_register_library_map(array(
|
||||||
'PHUICrumbView' => 'view/phui/PHUICrumbView.php',
|
'PHUICrumbView' => 'view/phui/PHUICrumbView.php',
|
||||||
'PHUICrumbsView' => 'view/phui/PHUICrumbsView.php',
|
'PHUICrumbsView' => 'view/phui/PHUICrumbsView.php',
|
||||||
'PHUICurtainExtension' => 'view/extension/PHUICurtainExtension.php',
|
'PHUICurtainExtension' => 'view/extension/PHUICurtainExtension.php',
|
||||||
|
'PHUICurtainObjectRefListView' => 'view/phui/PHUICurtainObjectRefListView.php',
|
||||||
|
'PHUICurtainObjectRefView' => 'view/phui/PHUICurtainObjectRefView.php',
|
||||||
'PHUICurtainPanelView' => 'view/layout/PHUICurtainPanelView.php',
|
'PHUICurtainPanelView' => 'view/layout/PHUICurtainPanelView.php',
|
||||||
'PHUICurtainView' => 'view/layout/PHUICurtainView.php',
|
'PHUICurtainView' => 'view/layout/PHUICurtainView.php',
|
||||||
'PHUIDiffGraphView' => 'infrastructure/diff/view/PHUIDiffGraphView.php',
|
'PHUIDiffGraphView' => 'infrastructure/diff/view/PHUIDiffGraphView.php',
|
||||||
|
@ -8189,6 +8191,8 @@ phutil_register_library_map(array(
|
||||||
'PHUICrumbView' => 'AphrontView',
|
'PHUICrumbView' => 'AphrontView',
|
||||||
'PHUICrumbsView' => 'AphrontView',
|
'PHUICrumbsView' => 'AphrontView',
|
||||||
'PHUICurtainExtension' => 'Phobject',
|
'PHUICurtainExtension' => 'Phobject',
|
||||||
|
'PHUICurtainObjectRefListView' => 'AphrontTagView',
|
||||||
|
'PHUICurtainObjectRefView' => 'AphrontTagView',
|
||||||
'PHUICurtainPanelView' => 'AphrontTagView',
|
'PHUICurtainPanelView' => 'AphrontTagView',
|
||||||
'PHUICurtainView' => 'AphrontTagView',
|
'PHUICurtainView' => 'AphrontTagView',
|
||||||
'PHUIDiffGraphView' => 'Phobject',
|
'PHUIDiffGraphView' => 'Phobject',
|
||||||
|
|
|
@ -340,37 +340,29 @@ final class ManiphestTaskDetailController extends ManiphestController {
|
||||||
$author_phid = $task->getAuthorPHID();
|
$author_phid = $task->getAuthorPHID();
|
||||||
$handles = $viewer->loadHandles(array($owner_phid, $author_phid));
|
$handles = $viewer->loadHandles(array($owner_phid, $author_phid));
|
||||||
|
|
||||||
|
$assigned_refs = id(new PHUICurtainObjectRefListView())
|
||||||
|
->setViewer($viewer)
|
||||||
|
->setEmptyMessage(pht('None'));
|
||||||
|
|
||||||
if ($owner_phid) {
|
if ($owner_phid) {
|
||||||
$image_uri = $handles[$owner_phid]->getImageURI();
|
$assigned_ref = $assigned_refs->newObjectRefView()
|
||||||
$image_href = $handles[$owner_phid]->getURI();
|
->setHandle($handles[$owner_phid]);
|
||||||
$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'));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$curtain->newPanel()
|
$curtain->newPanel()
|
||||||
->setHeaderText(pht('Assigned To'))
|
->setHeaderText(pht('Assigned To'))
|
||||||
->appendChild($assigned_to);
|
->appendChild($assigned_refs);
|
||||||
|
|
||||||
$author_uri = $handles[$author_phid]->getImageURI();
|
$author_refs = id(new PHUICurtainObjectRefListView())
|
||||||
$author_href = $handles[$author_phid]->getURI();
|
->setViewer($viewer);
|
||||||
$author = $viewer->renderHandle($author_phid)->render();
|
|
||||||
$content = phutil_tag('strong', array(), $author);
|
$author_ref = $author_refs->newObjectRefView()
|
||||||
$date = phabricator_date($task->getDateCreated(), $viewer);
|
->setHandle($handles[$author_phid])
|
||||||
$content = pht('%s, %s', $content, $date);
|
->setEpoch($task->getDateCreated());
|
||||||
$authored_by = id(new PHUIHeadThingView())
|
|
||||||
->setImage($author_uri)
|
|
||||||
->setImageHref($author_href)
|
|
||||||
->setContent($content);
|
|
||||||
|
|
||||||
$curtain->newPanel()
|
$curtain->newPanel()
|
||||||
->setHeaderText(pht('Authored By'))
|
->setHeaderText(pht('Authored By'))
|
||||||
->appendChild($authored_by);
|
->appendChild($author_refs);
|
||||||
|
|
||||||
return $curtain;
|
return $curtain;
|
||||||
}
|
}
|
||||||
|
|
46
src/view/phui/PHUICurtainObjectRefListView.php
Normal file
46
src/view/phui/PHUICurtainObjectRefListView.php
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
final class PHUICurtainObjectRefListView
|
||||||
|
extends AphrontTagView {
|
||||||
|
|
||||||
|
private $refs = array();
|
||||||
|
private $emptyMessage;
|
||||||
|
|
||||||
|
protected function getTagAttributes() {
|
||||||
|
return array(
|
||||||
|
'class' => 'phui-curtain-object-ref-list-view',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setEmptyMessage($empty_message) {
|
||||||
|
$this->emptyMessage = $empty_message;
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getTagContent() {
|
||||||
|
$refs = $this->refs;
|
||||||
|
|
||||||
|
if (!$refs) {
|
||||||
|
if ($this->emptyMessage) {
|
||||||
|
return phutil_tag(
|
||||||
|
'div',
|
||||||
|
array(
|
||||||
|
'class' => 'phui-curtain-object-ref-list-view-empty',
|
||||||
|
),
|
||||||
|
$this->emptyMessage);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $refs;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function newObjectRefView() {
|
||||||
|
$ref_view = id(new PHUICurtainObjectRefView())
|
||||||
|
->setViewer($this->getViewer());
|
||||||
|
|
||||||
|
$this->refs[] = $ref_view;
|
||||||
|
|
||||||
|
return $ref_view;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
155
src/view/phui/PHUICurtainObjectRefView.php
Normal file
155
src/view/phui/PHUICurtainObjectRefView.php
Normal file
|
@ -0,0 +1,155 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
final class PHUICurtainObjectRefView
|
||||||
|
extends AphrontTagView {
|
||||||
|
|
||||||
|
private $handle;
|
||||||
|
private $epoch;
|
||||||
|
|
||||||
|
public function setHandle(PhabricatorObjectHandle $handle) {
|
||||||
|
$this->handle = $handle;
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setEpoch($epoch) {
|
||||||
|
$this->epoch = $epoch;
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getTagAttributes() {
|
||||||
|
return array(
|
||||||
|
'class' => 'phui-curtain-object-ref-view',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getTagContent() {
|
||||||
|
require_celerity_resource('phui-curtain-object-ref-view-css');
|
||||||
|
|
||||||
|
$viewer = $this->getViewer();
|
||||||
|
$handle = $this->handle;
|
||||||
|
|
||||||
|
$more_rows = array();
|
||||||
|
|
||||||
|
$epoch = $this->epoch;
|
||||||
|
if ($epoch !== null) {
|
||||||
|
$epoch_view = phabricator_datetime($epoch, $viewer);
|
||||||
|
|
||||||
|
$epoch_cells = array();
|
||||||
|
|
||||||
|
$epoch_cells[] = phutil_tag(
|
||||||
|
'td',
|
||||||
|
array(
|
||||||
|
'class' => 'phui-curtain-object-ref-view-epoch-cell',
|
||||||
|
),
|
||||||
|
$epoch_view);
|
||||||
|
|
||||||
|
$more_rows[] = phutil_tag('tr', array(), $epoch_cells);
|
||||||
|
}
|
||||||
|
|
||||||
|
$header_cells = array();
|
||||||
|
|
||||||
|
$image_view = $this->newImage();
|
||||||
|
|
||||||
|
if ($more_rows) {
|
||||||
|
$row_count = 1 + count($more_rows);
|
||||||
|
} else {
|
||||||
|
$row_count = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$header_cells[] = phutil_tag(
|
||||||
|
'td',
|
||||||
|
array(
|
||||||
|
'rowspan' => $row_count,
|
||||||
|
'class' => 'phui-curtain-object-ref-view-image-cell',
|
||||||
|
),
|
||||||
|
$image_view);
|
||||||
|
|
||||||
|
$title_view = $this->newTitle();
|
||||||
|
|
||||||
|
$header_cells[] = phutil_tag(
|
||||||
|
'td',
|
||||||
|
array(
|
||||||
|
'class' => 'phui-curtain-object-ref-view-title-cell',
|
||||||
|
),
|
||||||
|
$title_view);
|
||||||
|
|
||||||
|
$rows = array();
|
||||||
|
|
||||||
|
if (!$more_rows) {
|
||||||
|
$title_row_class = 'phui-curtain-object-ref-view-without-content';
|
||||||
|
} else {
|
||||||
|
$title_row_class = 'phui-curtain-object-ref-view-with-content';
|
||||||
|
}
|
||||||
|
|
||||||
|
$rows[] = phutil_tag(
|
||||||
|
'tr',
|
||||||
|
array(
|
||||||
|
'class' => $title_row_class,
|
||||||
|
),
|
||||||
|
$header_cells);
|
||||||
|
|
||||||
|
$body = phutil_tag(
|
||||||
|
'tbody',
|
||||||
|
array(),
|
||||||
|
array(
|
||||||
|
$rows,
|
||||||
|
$more_rows,
|
||||||
|
));
|
||||||
|
|
||||||
|
return phutil_tag('table', array(), $body);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function newTitle() {
|
||||||
|
$title_view = null;
|
||||||
|
$handle = $this->handle;
|
||||||
|
|
||||||
|
if ($handle) {
|
||||||
|
$title_view = $handle->renderLink();
|
||||||
|
}
|
||||||
|
|
||||||
|
return $title_view;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function newImage() {
|
||||||
|
$image_uri = $this->getImageURI();
|
||||||
|
$target_uri = $this->getTargetURI();
|
||||||
|
|
||||||
|
if ($image_uri !== null) {
|
||||||
|
$image_view = javelin_tag(
|
||||||
|
'a',
|
||||||
|
array(
|
||||||
|
'style' => sprintf('background-image: url(%s)', $image_uri),
|
||||||
|
'href' => $target_uri,
|
||||||
|
'aural' => false,
|
||||||
|
));
|
||||||
|
} else {
|
||||||
|
$image_view = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $image_view;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getTargetURI() {
|
||||||
|
$target_uri = null;
|
||||||
|
$handle = $this->handle;
|
||||||
|
|
||||||
|
if ($handle) {
|
||||||
|
$target_uri = $handle->getURI();
|
||||||
|
}
|
||||||
|
|
||||||
|
return $target_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getImageURI() {
|
||||||
|
$image_uri = null;
|
||||||
|
$handle = $this->handle;
|
||||||
|
|
||||||
|
if ($handle) {
|
||||||
|
$image_uri = $handle->getImageURI();
|
||||||
|
}
|
||||||
|
|
||||||
|
return $image_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
48
webroot/rsrc/css/phui/phui-curtain-object-ref-view.css
Normal file
48
webroot/rsrc/css/phui/phui-curtain-object-ref-view.css
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
/**
|
||||||
|
* @provides phui-curtain-object-ref-view-css
|
||||||
|
*/
|
||||||
|
|
||||||
|
.phui-curtain-object-ref-list-view-empty {
|
||||||
|
font-style: italic;
|
||||||
|
color: {$greytext};
|
||||||
|
}
|
||||||
|
|
||||||
|
.phui-curtain-object-ref-view-image-cell {
|
||||||
|
min-width: 32px;
|
||||||
|
min-height: 32px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.phui-curtain-object-ref-view-image-cell > a {
|
||||||
|
height: 24px;
|
||||||
|
width: 24px;
|
||||||
|
background-size: 100%;
|
||||||
|
border-radius: 3px;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.phui-curtain-object-ref-view-title-cell {
|
||||||
|
font-weight: bold;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
overflow: hidden;
|
||||||
|
|
||||||
|
/* This is forcing "text-overflow: ellipsis" to actually work. */
|
||||||
|
max-width: 225px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.phui-curtain-object-ref-view-without-content >
|
||||||
|
.phui-curtain-object-ref-view-title-cell {
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
|
|
||||||
|
.phui-curtain-object-ref-view-with-content >
|
||||||
|
.phui-curtain-object-ref-view-image-cell > a {
|
||||||
|
margin-top: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.phui-curtain-object-ref-view-title-cell > a {
|
||||||
|
color: {$darkgreytext};
|
||||||
|
}
|
||||||
|
|
||||||
|
.phui-curtain-object-ref-view-epoch-cell {
|
||||||
|
color: {$greytext};
|
||||||
|
}
|
Loading…
Reference in a new issue