'.
- 'r'.$callsign.$commit->getCommitIdentifier().
- ' · '.
- phabricator_datetime($commit->getEpoch(), $user).
+ $headsup_panel->appendChild(
+ '');
- $detail_panel->appendChild(
- '
'.
- $property_table.
- '
'.
- ''.
- '');
-
- $content[] = $detail_panel;
+ $content[] = $headsup_panel;
}
$query = new PhabricatorAuditQuery();
@@ -273,10 +263,11 @@ final class DiffusionCommitController extends DiffusionController {
));
}
- private function renderPropertyTable(
+ private function getCommitProperties(
PhabricatorRepositoryCommit $commit,
PhabricatorRepositoryCommitData $data,
array $parents) {
+ $user = $this->getRequest()->getUser();
$phids = array();
if ($data->getCommitDetail('authorPHID')) {
@@ -302,6 +293,17 @@ final class DiffusionCommitController extends DiffusionController {
$props = array();
+ if ($commit->getAuditStatus()) {
+ $status = PhabricatorAuditCommitStatusConstants::getStatusName(
+ $commit->getAuditStatus());
+ $props['Status'] = phutil_render_tag(
+ 'strong',
+ array(),
+ phutil_escape_html($status));
+ }
+
+ $props['Committed'] = phabricator_datetime($commit->getEpoch(), $user);
+
$author_phid = $data->getCommitDetail('authorPHID');
if ($data->getCommitDetail('authorPHID')) {
$props['Author'] = $handles[$author_phid]->renderLink();
@@ -322,11 +324,6 @@ final class DiffusionCommitController extends DiffusionController {
$props['Differential Revision'] = $handles[$revision_phid]->renderLink();
}
- if ($commit->getAuditStatus()) {
- $props['Audit'] = PhabricatorAuditCommitStatusConstants::getStatusName(
- $commit->getAuditStatus());
- }
-
if ($parents) {
$parent_links = array();
foreach ($parents as $parent) {
@@ -347,19 +344,7 @@ final class DiffusionCommitController extends DiffusionController {
$props['Branches'] = $branches;
}
- $rows = array();
- foreach ($props as $key => $value) {
- $rows[] =
- '
'.
- '| '.$key.': | '.
- ''.$value.' | '.
- '
';
- }
-
- return
- '
'.
- implode("\n", $rows).
- '
';
+ return $props;
}
private function buildAuditTable($commit, $audits) {
@@ -378,6 +363,7 @@ final class DiffusionCommitController extends DiffusionController {
$panel = new AphrontPanelView();
$panel->setHeader('Audits');
+ $panel->setCaption('Audits you are responsible for are highlighted.');
$panel->appendChild($view);
return $panel;
@@ -609,5 +595,68 @@ final class DiffusionCommitController extends DiffusionController {
return $panel;
}
+ private function renderHeadsupActionList(
+ PhabricatorRepositoryCommit $commit) {
+
+ $user = $this->getRequest()->getUser();
+
+ $actions = array();
+
+ require_celerity_resource('phabricator-flag-css');
+ $flag = PhabricatorFlagQuery::loadUserFlag($user, $commit->getPHID());
+ if ($flag) {
+ $class = PhabricatorFlagColor::getCSSClass($flag->getColor());
+ $color = PhabricatorFlagColor::getColorName($flag->getColor());
+
+ $action = new AphrontHeadsupActionView();
+ $action->setClass('flag-clear '.$class);
+ $action->setURI('/flag/delete/'.$flag->getID().'/');
+ $action->setName('Remove '.$color.' Flag');
+ $action->setWorkflow(true);
+ $actions[] = $action;
+ } else {
+ $action = new AphrontHeadsupActionView();
+ $action->setClass('phabricator-flag-ghost');
+ $action->setURI('/flag/edit/'.$commit->getPHID().'/');
+ $action->setName('Flag Commit');
+ $action->setWorkflow(true);
+ $actions[] = $action;
+ }
+
+ require_celerity_resource('phabricator-object-selector-css');
+ require_celerity_resource('javelin-behavior-phabricator-object-selector');
+
+ /*
+ TODO: Implement this.
+
+ $action = new AphrontHeadsupActionView();
+ $action->setName('Edit Maniphest Tasks');
+ $action->setURI('/search/attach/'.$commit->getPHID().'/TASK/');
+ $action->setWorkflow(true);
+ $action->setClass('attach-maniphest');
+ $actions[] = $action;
+
+ */
+
+ if ($user->getIsAdmin()) {
+ $action = new AphrontHeadsupActionView();
+ $action->setName('MetaMTA Transcripts');
+ $action->setURI('/mail/?phid='.$commit->getPHID());
+ $action->setClass('transcripts-metamta');
+ $actions[] = $action;
+ }
+
+ $action = new AphrontHeadsupActionView();
+ $action->setName('Herald Transcripts');
+ $action->setURI('/herald/transcript/?phid='.$commit->getPHID());
+ $action->setClass('transcripts-herald');
+ $actions[] = $action;
+
+ $action_list = new AphrontHeadsupActionListView();
+ $action_list->setActions($actions);
+
+ return $action_list;
+ }
+
}
diff --git a/src/applications/diffusion/controller/commit/__init__.php b/src/applications/diffusion/controller/commit/__init__.php
index 01a6354783..b90af27377 100644
--- a/src/applications/diffusion/controller/commit/__init__.php
+++ b/src/applications/diffusion/controller/commit/__init__.php
@@ -29,6 +29,8 @@ phutil_require_module('phabricator', 'applications/diffusion/view/commentlist');
phutil_require_module('phabricator', 'applications/diffusion/view/commitchangetable');
phutil_require_module('phabricator', 'applications/diffusion/view/historytable');
phutil_require_module('phabricator', 'applications/draft/storage/draft');
+phutil_require_module('phabricator', 'applications/flag/constants/color');
+phutil_require_module('phabricator', 'applications/flag/query/flag');
phutil_require_module('phabricator', 'applications/markup/engine');
phutil_require_module('phabricator', 'applications/phid/handle/data');
phutil_require_module('phabricator', 'applications/repository/constants/repositorytype');
@@ -42,6 +44,9 @@ phutil_require_module('phabricator', 'view/form/control/select');
phutil_require_module('phabricator', 'view/form/control/submit');
phutil_require_module('phabricator', 'view/form/control/textarea');
phutil_require_module('phabricator', 'view/form/error');
+phutil_require_module('phabricator', 'view/layout/headsup/action');
+phutil_require_module('phabricator', 'view/layout/headsup/actionlist');
+phutil_require_module('phabricator', 'view/layout/headsup/panel');
phutil_require_module('phabricator', 'view/layout/panel');
phutil_require_module('phabricator', 'view/null');
phutil_require_module('phabricator', 'view/utils');
diff --git a/src/applications/maniphest/controller/descriptionpreview/ManiphestTaskDescriptionPreviewController.php b/src/applications/maniphest/controller/descriptionpreview/ManiphestTaskDescriptionPreviewController.php
index 70b640f9ef..a01e15a349 100644
--- a/src/applications/maniphest/controller/descriptionpreview/ManiphestTaskDescriptionPreviewController.php
+++ b/src/applications/maniphest/controller/descriptionpreview/ManiphestTaskDescriptionPreviewController.php
@@ -30,10 +30,8 @@ final class ManiphestTaskDescriptionPreviewController
$engine = PhabricatorMarkupEngine::newManiphestMarkupEngine();
$content =
- '
'.
- ''.
+ '';
return id(new AphrontAjaxResponse())
diff --git a/src/applications/maniphest/controller/taskdetail/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/taskdetail/ManiphestTaskDetailController.php
index 9fc1024801..582a80a1c0 100644
--- a/src/applications/maniphest/controller/taskdetail/ManiphestTaskDetailController.php
+++ b/src/applications/maniphest/controller/taskdetail/ManiphestTaskDetailController.php
@@ -185,28 +185,6 @@ final class ManiphestTaskDetailController extends ManiphestController {
$dict['Files'] = implode('', $views);
}
- $dict['Description'] =
- '
'.
- ''.
- '
';
-
- require_celerity_resource('maniphest-task-detail-css');
-
- $table = array();
- foreach ($dict as $key => $value) {
- $table[] =
- '
'.
- '| '.phutil_escape_html($key).': | '.
- ''.$value.' | '.
- '
';
- }
- $table =
- '
'.
- implode("\n", $table).
- '
';
-
$context_bar = null;
if ($parent_task) {
@@ -308,20 +286,16 @@ final class ManiphestTaskDetailController extends ManiphestController {
$action_list = new AphrontHeadsupActionListView();
$action_list->setActions($actions);
- $panel =
- '
'.
- $action_list->render().
- '
'.
- '
'.
- ''.
- phutil_escape_html('T'.$task->getID()).
- ''.
- ' '.
- phutil_escape_html($task->getTitle()).
- '
'.
- $table.
- ''.
- '
';
+ $headsup_panel = new AphrontHeadsupView();
+ $headsup_panel->setObjectName('T'.$task->getID());
+ $headsup_panel->setHeader($task->getTitle());
+ $headsup_panel->setActionList($action_list);
+ $headsup_panel->setProperties($dict);
+
+ $headsup_panel->appendChild(
+ '');
$transaction_types = ManiphestTransactionType::getTransactionTypeMap();
$resolution_types = ManiphestTaskStatus::getTaskStatusMap();
@@ -523,7 +497,7 @@ final class ManiphestTaskDetailController extends ManiphestController {
return $this->buildStandardPageResponse(
array(
$context_bar,
- $panel,
+ $headsup_panel,
$transaction_view,
$comment_panel,
$preview_panel,
diff --git a/src/applications/maniphest/controller/taskdetail/__init__.php b/src/applications/maniphest/controller/taskdetail/__init__.php
index 4bd258840b..4bd8605259 100644
--- a/src/applications/maniphest/controller/taskdetail/__init__.php
+++ b/src/applications/maniphest/controller/taskdetail/__init__.php
@@ -36,6 +36,7 @@ phutil_require_module('phabricator', 'view/layout/contextbar');
phutil_require_module('phabricator', 'view/layout/filepreview');
phutil_require_module('phabricator', 'view/layout/headsup/action');
phutil_require_module('phabricator', 'view/layout/headsup/actionlist');
+phutil_require_module('phabricator', 'view/layout/headsup/panel');
phutil_require_module('phabricator', 'view/layout/panel');
phutil_require_module('phutil', 'markup');
diff --git a/src/view/layout/headsup/panel/AphrontHeadsupView.php b/src/view/layout/headsup/panel/AphrontHeadsupView.php
new file mode 100644
index 0000000000..0b585fcf1a
--- /dev/null
+++ b/src/view/layout/headsup/panel/AphrontHeadsupView.php
@@ -0,0 +1,112 @@
+actionList = $action_list;
+ return $this;
+ }
+
+ public function setHeader($header) {
+ $this->header = $header;
+ return $this;
+ }
+
+ public function setProperties(array $dict) {
+ $this->properties = $dict;
+ return $this;
+ }
+
+ public function setObjectName($name) {
+ $this->objectName = $name;
+ return $this;
+ }
+
+ public function setHasKeyboardShortcuts($has_keyboard_shortcuts) {
+ $this->hasKeyboardShortcuts = $has_keyboard_shortcuts;
+ return $this;
+ }
+
+ public function getHasKeyboardShortcuts() {
+ return $this->hasKeyboardShortcuts;
+ }
+
+ public function render() {
+ $header =
+ '
'.
+ ''.
+ phutil_escape_html($this->objectName).
+ ''.
+ ' '.
+ phutil_escape_html($this->header).
+ '
';
+
+ require_celerity_resource('aphront-headsup-view-css');
+
+ $shortcuts = null;
+ if ($this->hasKeyboardShortcuts) {
+ $shortcuts =
+ '
'.
+ id(new AphrontKeyboardShortcutsAvailableView())->render().
+ '
';
+ }
+
+ $prop_table = null;
+ if ($this->properties) {
+ $prop_table = array();
+ foreach ($this->properties as $key => $value) {
+ $prop_table[] =
+ '
'.
+ '| '.phutil_escape_html($key.':').' | '.
+ ''.$value.' | '.
+ '
';
+ }
+ $prop_table =
+ '
'.
+ implode("\n", $prop_table).
+ '
';
+ }
+
+ $children = $this->renderChildren();
+ if (strlen($children)) {
+ $children =
+ '
'.
+ $children.
+ '
';
+ }
+
+ return
+ '
'.
+ self::renderSingleView($this->actionList).
+ $shortcuts.
+ '
'.
+ $header.
+ $prop_table.
+ $children.
+ '
'.
+ '
';
+ }
+
+}
diff --git a/src/view/layout/headsup/panel/__init__.php b/src/view/layout/headsup/panel/__init__.php
new file mode 100644
index 0000000000..258eb19d72
--- /dev/null
+++ b/src/view/layout/headsup/panel/__init__.php
@@ -0,0 +1,17 @@
+