diff --git a/src/applications/config/controller/PhabricatorConfigIssueViewController.php b/src/applications/config/controller/PhabricatorConfigIssueViewController.php index ddac26922c..546261ed07 100644 --- a/src/applications/config/controller/PhabricatorConfigIssueViewController.php +++ b/src/applications/config/controller/PhabricatorConfigIssueViewController.php @@ -64,7 +64,7 @@ final class PhabricatorConfigIssueViewController $view = new PhabricatorSetupIssueView(); $view->setIssue($issue); - $container = phutil_render_tag( + $container = phutil_tag( 'div', array( 'class' => 'setup-issue-background', diff --git a/src/applications/maniphest/view/ManiphestTaskProjectsView.php b/src/applications/maniphest/view/ManiphestTaskProjectsView.php index 358d3145bc..00f4ad86f2 100644 --- a/src/applications/maniphest/view/ManiphestTaskProjectsView.php +++ b/src/applications/maniphest/view/ManiphestTaskProjectsView.php @@ -52,7 +52,7 @@ final class ManiphestTaskProjectsView extends ManiphestView { "\xE2\x80\xA6"); } - return implode("\n", $tags); + return $this->renderHTMLView($tags); } } diff --git a/src/applications/maniphest/view/ManiphestTaskSummaryView.php b/src/applications/maniphest/view/ManiphestTaskSummaryView.php index 20c03b9fe0..6e7b13c7ea 100644 --- a/src/applications/maniphest/view/ManiphestTaskSummaryView.php +++ b/src/applications/maniphest/view/ManiphestTaskSummaryView.php @@ -60,17 +60,19 @@ final class ManiphestTaskSummaryView extends ManiphestView { $batch = null; if ($this->showBatchControls) { - $batch = - ''. - javelin_tag( - 'input', - array( - 'type' => 'checkbox', - 'name' => 'batch[]', - 'value' => $task->getID(), - 'sigil' => 'maniphest-batch', - )). - ''; + $batch = phutil_tag( + 'td', + array( + 'class' => 'maniphest-task-batch', + ), + javelin_tag( + 'input', + array( + 'type' => 'checkbox', + 'name' => 'batch[]', + 'value' => $task->getID(), + 'sigil' => 'maniphest-batch', + ))); } $projects_view = new ManiphestTaskProjectsView(); @@ -94,7 +96,70 @@ final class ManiphestTaskSummaryView extends ManiphestView { ), ''); - return javelin_render_tag( + $task_id = phutil_tag( + 'td', + array( + 'class' => 'maniphest-task-number', + ), + 'T'.$task->getID()); + + $task_status = phutil_tag( + 'td', + array( + 'class' => 'maniphest-task-status', + ), + idx($status_map, $task->getStatus(), 'Unknown')); + + $task_owner = phutil_tag( + 'td', + array( + 'class' => 'maniphest-task-owner', + ), + $task->getOwnerPHID() + ? $handles[$task->getOwnerPHID()]->renderLink() + : phutil_tag('em', array(), pht('None'))); + + $task_name = phutil_tag( + 'td', + array( + 'class' => 'maniphest-task-name', + ), + phutil_tag( + 'a', + array( + 'href' => '/T'.$task->getID(), + ), + $task->getTitle())); + + $task_projects = phutil_tag( + 'td', + array( + 'class' => 'maniphest-task-projects', + ), + $projects_view->render()); + + $task_updated = phutil_tag( + 'td', + array( + 'class' => 'maniphest-task-updated', + ), + phabricator_date($task->getDateModified(), $this->user)); + + $row = phutil_tag( + 'tr', + array(), + array( + $handle, + $batch, + $task_id, + $task_status, + $task_owner, + $task_name, + $task_projects, + $task_updated, + )); + + return javelin_tag( 'table', array( 'class' => 'maniphest-task-summary', @@ -103,35 +168,7 @@ final class ManiphestTaskSummaryView extends ManiphestView { 'taskID' => $task->getID(), ), ), - ''. - $handle. - $batch. - ''. - 'T'.$task->getID(). - ''. - ''. - idx($status_map, $task->getStatus(), 'Unknown'). - ''. - ''. - ($task->getOwnerPHID() - ? $handles[$task->getOwnerPHID()]->renderLink() - : 'None'). - ''. - ''. - phutil_tag( - 'a', - array( - 'href' => '/T'.$task->getID(), - ), - $task->getTitle()). - ''. - ''. - $projects_view->render(). - ''. - ''. - phabricator_date($task->getDateModified(), $this->user). - ''. - ''); + $row); } }