No OneTemporary
Actions

Size

404 KB

Referenced Files

None

Subscribers

None

View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
	index d6a37651e6..43386fe0d6 100644
	--- a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
	+++ b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
	@@ -1,384 +1,383 @@
	<?php

	final class PhabricatorCalendarEventViewController
	extends PhabricatorCalendarController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');
	$sequence = $request->getURIData('sequence');

	$timeline = null;

	$event = id(new PhabricatorCalendarEventQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$event) {
	return new Aphront404Response();
	}

	if ($sequence) {
	$result = $this->getEventAtIndexForGhostPHID(
	$viewer,
	$event->getPHID(),
	$sequence);

	if ($result) {
	$parent_event = $event;
	$event = $result;
	$event->attachParentEvent($parent_event);
	return id(new AphrontRedirectResponse())
	->setURI('/E'.$result->getID());
	} else if ($sequence && $event->getIsRecurring()) {
	$parent_event = $event;
	$event = $event->generateNthGhost($sequence, $viewer);
	$event->attachParentEvent($parent_event);
	} else if ($sequence) {
	return new Aphront404Response();
	}

	$title = $event->getMonogram().' ('.$sequence.')';
	$page_title = $title.' '.$event->getName();
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($title, '/'.$event->getMonogram().'/'.$sequence);


	} else {
	$title = 'E'.$event->getID();
	$page_title = $title.' '.$event->getName();
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($title, '/E'.$event->getID());
	}

	if (!$event->getIsGhostEvent()) {
	$timeline = $this->buildTransactionTimeline(
	$event,
	new PhabricatorCalendarEventTransactionQuery());
	}

	$header = $this->buildHeaderView($event);
	$actions = $this->buildActionView($event);
	$properties = $this->buildPropertyView($event);

	$properties->setActionList($actions);
	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
	$add_comment_header = $is_serious
	? pht('Add Comment')
	: pht('Add To Plate');
	$draft = PhabricatorDraft::newFromUserAndKey($viewer, $event->getPHID());
	if ($sequence) {
	$comment_uri = $this->getApplicationURI(
	'/event/comment/'.$event->getID().'/'.$sequence.'/');
	} else {
	$comment_uri = $this->getApplicationURI(
	'/event/comment/'.$event->getID().'/');
	}
	$add_comment_form = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($event->getPHID())
	->setDraft($draft)
	->setHeaderText($add_comment_header)
	->setAction($comment_uri)
	->setSubmitButtonName(pht('Add Comment'));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$timeline,
	$add_comment_form,
	),
	array(
	'title' => $page_title,
	'pageObjects' => array($event->getPHID()),
	));
	}

	private function buildHeaderView(PhabricatorCalendarEvent $event) {
	$viewer = $this->getRequest()->getUser();
	$id = $event->getID();

	$is_cancelled = $event->getIsCancelled();
	$icon = $is_cancelled ? ('fa-times') : ('fa-calendar');
	$color = $is_cancelled ? ('grey') : ('green');
	$status = $is_cancelled ? pht('Cancelled') : pht('Active');

	$invite_status = $event->getUserInviteStatus($viewer->getPHID());
	$status_invited = PhabricatorCalendarEventInvitee::STATUS_INVITED;
	$is_invite_pending = ($invite_status == $status_invited);

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($event->getName())
	->setStatus($icon, $color, $status)
	->setPolicyObject($event);

	if ($is_invite_pending) {
	$decline_button = id(new PHUIButtonView())
	->setTag('a')
	->setIcon(id(new PHUIIconView())
	->setIconFont('fa-times grey'))
	->setHref($this->getApplicationURI("/event/decline/{$id}/"))
	->setWorkflow(true)
	->setText(pht('Decline'));

	$accept_button = id(new PHUIButtonView())
	->setTag('a')
	->setIcon(id(new PHUIIconView())
	->setIconFont('fa-check green'))
	->setHref($this->getApplicationURI("/event/accept/{$id}/"))
	->setWorkflow(true)
	->setText(pht('Accept'));

	$header->addActionLink($decline_button)
	->addActionLink($accept_button);
	}
	return $header;
	}

	private function buildActionView(PhabricatorCalendarEvent $event) {
	$viewer = $this->getRequest()->getUser();
	$id = $event->getID();
	$is_cancelled = $event->getIsCancelled();
	$is_attending = $event->getIsUserAttending($viewer->getPHID());

	$actions = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getApplicationURI('event/'.$id.'/'))
	->setUser($viewer)
	->setObject($event);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$event,
	PhabricatorPolicyCapability::CAN_EDIT);

	$edit_label = false;
	$edit_uri = false;

	if ($event->getIsGhostEvent()) {
	$index = $event->getSequenceIndex();
	$edit_label = pht('Edit This Instance');
	$edit_uri = "event/edit/{$id}/{$index}/";
	} else if ($event->getIsRecurrenceException()) {
	$edit_label = pht('Edit This Instance');
	$edit_uri = "event/edit/{$id}/";
	} else {
	$edit_label = pht('Edit');
	$edit_uri = "event/edit/{$id}/";
	}

	if ($edit_label && $edit_uri) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName($edit_label)
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI($edit_uri))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));
	}

	if ($is_attending) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Decline Event'))
	->setIcon('fa-user-times')
	->setHref($this->getApplicationURI("event/join/{$id}/"))
	->setWorkflow(true));
	} else {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Join Event'))
	->setIcon('fa-user-plus')
	->setHref($this->getApplicationURI("event/join/{$id}/"))
	->setWorkflow(true));
	}

	$cancel_uri = $this->getApplicationURI("event/cancel/{$id}/");

	if ($event->getIsGhostEvent()) {
	$index = $event->getSequenceIndex();
	$can_reinstate = $event->getIsParentCancelled();

	$cancel_label = pht('Cancel This Instance');
	$reinstate_label = pht('Reinstate This Instance');
	$cancel_disabled = (!$can_edit \|\| $can_reinstate);
	$cancel_uri = $this->getApplicationURI("event/cancel/{$id}/{$index}/");
	} else if ($event->getIsRecurrenceException()) {
	$can_reinstate = $event->getIsParentCancelled();
	$cancel_label = pht('Cancel This Instance');
	$reinstate_label = pht('Reinstate This Instance');
	$cancel_disabled = (!$can_edit \|\| $can_reinstate);
	} else if ($event->getIsRecurrenceParent()) {
	$cancel_label = pht('Cancel Recurrence');
	$reinstate_label = pht('Reinstate Recurrence');
	$cancel_disabled = !$can_edit;
	} else {
	$cancel_label = pht('Cancel Event');
	$reinstate_label = pht('Reinstate Event');
	$cancel_disabled = !$can_edit;
	}

	if ($is_cancelled) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName($reinstate_label)
	->setIcon('fa-plus')
	->setHref($cancel_uri)
	->setDisabled($cancel_disabled)
	->setWorkflow(true));
	} else {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName($cancel_label)
	->setIcon('fa-times')
	->setHref($cancel_uri)
	->setDisabled($cancel_disabled)
	->setWorkflow(true));
	}

	return $actions;
	}

	private function buildPropertyView(PhabricatorCalendarEvent $event) {
	$viewer = $this->getRequest()->getUser();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($event);

	if ($event->getIsAllDay()) {
	$date_start = phabricator_date($event->getDateFrom(), $viewer);
	$date_end = phabricator_date($event->getDateTo(), $viewer);

	if ($date_start == $date_end) {
	$properties->addProperty(
	pht('Time'),
	phabricator_date($event->getDateFrom(), $viewer));
	} else {
	$properties->addProperty(
	pht('Starts'),
	phabricator_date($event->getDateFrom(), $viewer));
	$properties->addProperty(
	pht('Ends'),
	phabricator_date($event->getDateTo(), $viewer));
	}
	} else {
	$properties->addProperty(
	pht('Starts'),
	phabricator_datetime($event->getDateFrom(), $viewer));

	$properties->addProperty(
	pht('Ends'),
	phabricator_datetime($event->getDateTo(), $viewer));
	}

	if ($event->getIsRecurring()) {
	$properties->addProperty(
	pht('Recurs'),
	ucwords(idx($event->getRecurrenceFrequency(), 'rule')));

	if ($event->getRecurrenceEndDate()) {
	$properties->addProperty(
	pht('Recurrence Ends'),
	phabricator_datetime($event->getRecurrenceEndDate(), $viewer));
	}

	if ($event->getInstanceOfEventPHID()) {
	$properties->addProperty(
	pht('Recurrence of Event'),
	pht('%s of %s',
	$event->getSequenceIndex(),
	$viewer->renderHandle($event->getInstanceOfEventPHID())->render()));
	}
	}

	$properties->addProperty(
	pht('Host'),
	$viewer->renderHandle($event->getUserPHID()));

	$invitees = $event->getInvitees();
	foreach ($invitees as $key => $invitee) {
	if ($invitee->isUninvited()) {
	unset($invitees[$key]);
	}
	}

	if ($invitees) {
	$invitee_list = new PHUIStatusListView();

	$icon_invited = PHUIStatusItemView::ICON_OPEN;
	$icon_attending = PHUIStatusItemView::ICON_ACCEPT;
	$icon_declined = PHUIStatusItemView::ICON_REJECT;

	$status_invited = PhabricatorCalendarEventInvitee::STATUS_INVITED;
	$status_attending = PhabricatorCalendarEventInvitee::STATUS_ATTENDING;
	$status_declined = PhabricatorCalendarEventInvitee::STATUS_DECLINED;

	$icon_map = array(
	$status_invited => $icon_invited,
	$status_attending => $icon_attending,
	$status_declined => $icon_declined,
	);

	$icon_color_map = array(
	$status_invited => null,
	$status_attending => 'green',
	$status_declined => 'red',
	);

	foreach ($invitees as $invitee) {
	$item = new PHUIStatusItemView();
	$invitee_phid = $invitee->getInviteePHID();
	$status = $invitee->getStatus();
	$target = $viewer->renderHandle($invitee_phid);
	$icon = $icon_map[$status];
	$icon_color = $icon_color_map[$status];

	$item->setIcon($icon, $icon_color)
	->setTarget($target);
	$invitee_list->addItem($item);
	}
	} else {
	$invitee_list = phutil_tag(
	'em',
	array(),
	pht('None'));
	}

	$properties->addProperty(
	pht('Invitees'),
	$invitee_list);

	$properties->invokeWillRenderEvent();

	$properties->addProperty(
	pht('Icon'),
	id(new PhabricatorCalendarIconSet())
	->getIconLabel($event->getIcon()));

	if (strlen($event->getDescription())) {
	$description = PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())->setContent($event->getDescription()),
	'default',
	$viewer);

	$properties->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);

	$properties->addTextContent($description);
	}

	return $properties;
	}

	}
	diff --git a/src/applications/dashboard/controller/PhabricatorDashboardManageController.php b/src/applications/dashboard/controller/PhabricatorDashboardManageController.php
	index a264859645..6600ad0d34 100644
	--- a/src/applications/dashboard/controller/PhabricatorDashboardManageController.php
	+++ b/src/applications/dashboard/controller/PhabricatorDashboardManageController.php
	@@ -1,202 +1,201 @@
	<?php

	final class PhabricatorDashboardManageController
	extends PhabricatorDashboardController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$dashboard_uri = $this->getApplicationURI('view/'.$id.'/');

	// TODO: This UI should drop a lot of capabilities if the user can't
	// edit the dashboard, but we should still let them in for "Install" and
	// "View History".

	$dashboard = id(new PhabricatorDashboardQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needPanels(true)
	->executeOne();
	if (!$dashboard) {
	return new Aphront404Response();
	}

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$dashboard,
	PhabricatorPolicyCapability::CAN_EDIT);

	$title = $dashboard->getName();

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(
	pht('Dashboard %d', $dashboard->getID()),
	$dashboard_uri);
	$crumbs->addTextCrumb(pht('Manage'));

	$header = $this->buildHeaderView($dashboard);
	$actions = $this->buildActionView($dashboard);
	$properties = $this->buildPropertyView($dashboard);

	$properties->setActionList($actions);
	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	if (!$can_edit) {
	$no_edit = pht(
	'You do not have permission to edit this dashboard. If you want to '.
	'make changes, make a copy first.');

	$box->setInfoView(
	id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
	->setErrors(array($no_edit)));
	}

	$rendered_dashboard = id(new PhabricatorDashboardRenderingEngine())
	->setViewer($viewer)
	->setDashboard($dashboard)
	->setArrangeMode($can_edit)
	->renderDashboard();

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$rendered_dashboard,
	),
	array(
	'title' => $title,
	));
	}

	private function buildHeaderView(PhabricatorDashboard $dashboard) {
	$viewer = $this->getRequest()->getUser();

	if ($dashboard->isArchived()) {
	$status_icon = 'fa-ban';
	$status_color = 'dark';
	} else {
	$status_icon = 'fa-check';
	$status_color = 'bluegrey';
	}

	$status_name = idx(
	PhabricatorDashboard::getStatusNameMap(),
	$dashboard->getStatus());

	return id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($dashboard->getName())
	->setPolicyObject($dashboard)
	->setStatus($status_icon, $status_color, $status_name);
	}

	private function buildActionView(PhabricatorDashboard $dashboard) {
	$viewer = $this->getRequest()->getUser();
	$id = $dashboard->getID();

	$actions = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getApplicationURI('view/'.$dashboard->getID().'/'))
	->setObject($dashboard)
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$dashboard,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View Dashboard'))
	->setIcon('fa-columns')
	->setHref($this->getApplicationURI("view/{$id}/")));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Dashboard'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("edit/{$id}/"))
	->setDisabled(!$can_edit));

	if ($dashboard->isArchived()) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Activate Dashboard'))
	->setIcon('fa-check')
	->setHref($this->getApplicationURI("archive/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow($can_edit));
	} else {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Archive Dashboard'))
	->setIcon('fa-ban')
	->setHref($this->getApplicationURI("archive/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow($can_edit));
	}

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Copy Dashboard'))
	->setIcon('fa-files-o')
	->setHref($this->getApplicationURI("copy/{$id}/"))
	->setWorkflow(true));

	$installed_dashboard = id(new PhabricatorDashboardInstall())
	->loadOneWhere(
	'objectPHID = %s AND applicationClass = %s',
	$viewer->getPHID(),
	'PhabricatorHomeApplication');
	if ($installed_dashboard &&
	$installed_dashboard->getDashboardPHID() == $dashboard->getPHID()) {
	$title_install = pht('Uninstall Dashboard');
	$href_install = "uninstall/{$id}/";
	} else {
	$title_install = pht('Install Dashboard');
	$href_install = "install/{$id}/";
	}
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName($title_install)
	->setIcon('fa-wrench')
	->setHref($this->getApplicationURI($href_install))
	->setWorkflow(true));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View History'))
	->setIcon('fa-history')
	->setHref($this->getApplicationURI("history/{$id}/")));

	return $actions;
	}

	private function buildPropertyView(PhabricatorDashboard $dashboard) {
	$viewer = $this->getRequest()->getUser();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($dashboard);

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$dashboard);

	$properties->addProperty(
	pht('Editable By'),
	$descriptions[PhabricatorPolicyCapability::CAN_EDIT]);

	$properties->addProperty(
	pht('Panels'),
	$viewer->renderHandleList($dashboard->getPanelPHIDs()));

	$properties->invokeWillRenderEvent();

	return $properties;
	}

	}
	diff --git a/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php b/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php
	index f22b60ca75..bc13374596 100644
	--- a/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php
	+++ b/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php
	@@ -1,174 +1,173 @@
	<?php

	final class PhabricatorDashboardPanelViewController
	extends PhabricatorDashboardController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$panel = id(new PhabricatorDashboardPanelQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$panel) {
	return new Aphront404Response();
	}

	$title = $panel->getMonogram().' '.$panel->getName();
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(
	pht('Panels'),
	$this->getApplicationURI('panel/'));
	$crumbs->addTextCrumb($panel->getMonogram());

	$header = $this->buildHeaderView($panel);
	$actions = $this->buildActionView($panel);
	$properties = $this->buildPropertyView($panel);
	$timeline = $this->buildTransactionTimeline(
	$panel,
	new PhabricatorDashboardPanelTransactionQuery());
	$timeline->setShouldTerminate(true);

	$properties->setActionList($actions);
	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$rendered_panel = id(new PhabricatorDashboardPanelRenderingEngine())
	->setViewer($viewer)
	->setPanel($panel)
	->setParentPanelPHIDs(array())
	->renderPanel();

	$view = id(new PHUIBoxView())
	->addMargin(PHUI::MARGIN_LARGE_LEFT)
	->addMargin(PHUI::MARGIN_LARGE_RIGHT)
	->addMargin(PHUI::MARGIN_LARGE_TOP)
	->appendChild($rendered_panel);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$view,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	private function buildHeaderView(PhabricatorDashboardPanel $panel) {
	$viewer = $this->getRequest()->getUser();

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($panel->getName())
	->setPolicyObject($panel);

	if (!$panel->getIsArchived()) {
	$header->setStatus('fa-check', 'bluegrey', pht('Active'));
	} else {
	$header->setStatus('fa-ban', 'red', pht('Archived'));
	}
	return $header;
	}

	private function buildActionView(PhabricatorDashboardPanel $panel) {
	$viewer = $this->getRequest()->getUser();
	$id = $panel->getID();

	$actions = id(new PhabricatorActionListView())
	- ->setObjectURI('/'.$panel->getMonogram())
	->setObject($panel)
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$panel,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Panel'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("panel/edit/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	if (!$panel->getIsArchived()) {
	$archive_text = pht('Archive Panel');
	$archive_icon = 'fa-ban';
	} else {
	$archive_text = pht('Activate Panel');
	$archive_icon = 'fa-check';
	}

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName($archive_text)
	->setIcon($archive_icon)
	->setHref($this->getApplicationURI("panel/archive/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(true));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View Standalone'))
	->setIcon('fa-eye')
	->setHref($this->getApplicationURI("panel/render/{$id}/")));

	return $actions;
	}

	private function buildPropertyView(PhabricatorDashboardPanel $panel) {
	$viewer = $this->getRequest()->getUser();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($panel);

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$panel);

	$panel_type = $panel->getImplementation();
	if ($panel_type) {
	$type_name = $panel_type->getPanelTypeName();
	} else {
	$type_name = phutil_tag(
	'em',
	array(),
	nonempty($panel->getPanelType(), pht('null')));
	}

	$properties->addProperty(
	pht('Panel Type'),
	$type_name);

	$properties->addProperty(
	pht('Editable By'),
	$descriptions[PhabricatorPolicyCapability::CAN_EDIT]);

	$dashboard_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$panel->getPHID(),
	PhabricatorDashboardPanelHasDashboardEdgeType::EDGECONST);

	$does_not_appear = pht(
	'This panel does not appear on any dashboards.');

	$properties->addProperty(
	pht('Appears On'),
	$dashboard_phids
	? $viewer->renderHandleList($dashboard_phids)
	: phutil_tag('em', array(), $does_not_appear));

	return $properties;
	}

	}
	diff --git a/src/applications/differential/view/DifferentialRevisionDetailView.php b/src/applications/differential/view/DifferentialRevisionDetailView.php
	index 493691d21a..a8436811c2 100644
	--- a/src/applications/differential/view/DifferentialRevisionDetailView.php
	+++ b/src/applications/differential/view/DifferentialRevisionDetailView.php
	@@ -1,122 +1,121 @@
	<?php

	final class DifferentialRevisionDetailView extends AphrontView {

	private $revision;
	private $actions;
	private $customFields;
	private $diff;
	private $uri;
	private $actionList;

	public function setURI($uri) {
	$this->uri = $uri;
	return $this;
	}
	public function getURI() {
	return $this->uri;
	}

	public function setDiff(DifferentialDiff $diff) {
	$this->diff = $diff;
	return $this;
	}
	private function getDiff() {
	return $this->diff;
	}

	public function setRevision(DifferentialRevision $revision) {
	$this->revision = $revision;
	return $this;
	}

	public function setActions(array $actions) {
	$this->actions = $actions;
	return $this;
	}
	private function getActions() {
	return $this->actions;
	}

	public function setActionList(PhabricatorActionListView $list) {
	$this->actionList = $list;
	return $this;
	}

	public function getActionList() {
	return $this->actionList;
	}

	public function setCustomFields(PhabricatorCustomFieldList $list) {
	$this->customFields = $list;
	return $this;
	}

	public function render() {

	$this->requireResource('differential-core-view-css');

	$revision = $this->revision;
	$user = $this->getUser();

	$header = $this->renderHeader($revision);

	$actions = id(new PhabricatorActionListView())
	->setUser($user)
	- ->setObject($revision)
	- ->setObjectURI($this->getURI());
	+ ->setObject($revision);
	foreach ($this->getActions() as $action) {
	$actions->addAction($action);
	}

	$properties = id(new PHUIPropertyListView())
	->setUser($user)
	->setObject($revision);

	$properties->setHasKeyboardShortcuts(true);
	$properties->setActionList($actions);
	$this->setActionList($actions);

	$field_list = $this->customFields;
	if ($field_list) {
	$field_list->appendFieldsToPropertyList(
	$revision,
	$user,
	$properties);
	}

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	return $object_box;
	}

	private function renderHeader(DifferentialRevision $revision) {
	$view = id(new PHUIHeaderView())
	->setHeader($revision->getTitle($revision))
	->setUser($this->getUser())
	->setPolicyObject($revision);

	$status = $revision->getStatus();
	$status_name =
	DifferentialRevisionStatus::renderFullDescription($status);

	$view->addProperty(PHUIHeaderView::PROPERTY_STATUS, $status_name);

	return $view;
	}

	public static function renderTagForRevision(
	DifferentialRevision $revision) {

	$status = $revision->getStatus();
	$status_name =
	ArcanistDifferentialRevisionStatus::getNameForRevisionStatus($status);

	return id(new PHUITagView())
	->setType(PHUITagView::TYPE_STATE)
	->setName($status_name);
	}

	}
	diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
	index a698eba5c0..6f1dbf26ac 100644
	--- a/src/applications/diffusion/controller/DiffusionCommitController.php
	+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
	@@ -1,1242 +1,1241 @@
	<?php

	final class DiffusionCommitController extends DiffusionController {

	const CHANGES_LIMIT = 100;

	private $auditAuthorityPHIDs;
	private $highlightedAudits;

	private $commitParents;
	private $commitRefs;
	private $commitMerges;
	private $commitErrors;
	private $commitExists;

	public function shouldAllowPublic() {
	return true;
	}

	protected function shouldLoadDiffusionRequest() {
	return false;
	}

	protected function processDiffusionRequest(AphrontRequest $request) {
	$user = $request->getUser();

	// This controller doesn't use blob/path stuff, just pass the dictionary
	// in directly instead of using the AphrontRequest parsing mechanism.
	$data = $request->getURIMap();
	$data['user'] = $user;
	$drequest = DiffusionRequest::newFromDictionary($data);
	$this->diffusionRequest = $drequest;

	if ($request->getStr('diff')) {
	return $this->buildRawDiffResponse($drequest);
	}

	$repository = $drequest->getRepository();
	$callsign = $repository->getCallsign();

	$content = array();
	$commit = id(new DiffusionCommitQuery())
	->setViewer($request->getUser())
	->withRepository($repository)
	->withIdentifiers(array($drequest->getCommit()))
	->needCommitData(true)
	->needAuditRequests(true)
	->executeOne();

	$crumbs = $this->buildCrumbs(array(
	'commit' => true,
	));

	if (!$commit) {
	if (!$this->getCommitExists()) {
	return new Aphront404Response();
	}

	$error = id(new PHUIInfoView())
	->setTitle(pht('Commit Still Parsing'))
	->appendChild(
	pht(
	'Failed to load the commit because the commit has not been '.
	'parsed yet.'));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$error,
	),
	array(
	'title' => pht('Commit Still Parsing'),
	));
	}

	$audit_requests = $commit->getAudits();
	$this->auditAuthorityPHIDs =
	PhabricatorAuditCommentEditor::loadAuditPHIDsForUser($user);

	$commit_data = $commit->getCommitData();
	$is_foreign = $commit_data->getCommitDetail('foreign-svn-stub');
	if ($is_foreign) {
	$subpath = $commit_data->getCommitDetail('svn-subpath');

	$error_panel = new PHUIInfoView();
	$error_panel->setTitle(pht('Commit Not Tracked'));
	$error_panel->setSeverity(PHUIInfoView::SEVERITY_WARNING);
	$error_panel->appendChild(
	pht(
	"This Diffusion repository is configured to track only one ".
	"subdirectory of the entire Subversion repository, and this commit ".
	"didn't affect the tracked subdirectory ('%s'), so no ".
	"information is available.",
	$subpath));
	$content[] = $error_panel;
	} else {
	$engine = PhabricatorMarkupEngine::newDifferentialMarkupEngine();
	$engine->setConfig('viewer', $user);

	require_celerity_resource('phabricator-remarkup-css');

	$headsup_view = id(new PHUIHeaderView())
	->setHeader(nonempty($commit->getSummary(), pht('Commit Detail')));

	$headsup_actions = $this->renderHeadsupActionList($commit, $repository);

	$commit_properties = $this->loadCommitProperties(
	$commit,
	$commit_data,
	$audit_requests);
	$property_list = id(new PHUIPropertyListView())
	->setHasKeyboardShortcuts(true)
	->setUser($user)
	->setObject($commit);
	foreach ($commit_properties as $key => $value) {
	$property_list->addProperty($key, $value);
	}

	$message = $commit_data->getCommitMessage();

	$revision = $commit->getCommitIdentifier();
	$message = $this->linkBugtraq($message);

	$message = $engine->markupText($message);

	$property_list->invokeWillRenderEvent();
	$property_list->setActionList($headsup_actions);

	$detail_list = new PHUIPropertyListView();
	$detail_list->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);
	$detail_list->addTextContent(
	phutil_tag(
	'div',
	array(
	'class' => 'diffusion-commit-message phabricator-remarkup',
	),
	$message));

	$headsup_view->setTall(true);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($headsup_view)
	->setFormErrors($this->getCommitErrors())
	->addPropertyList($property_list)
	->addPropertyList($detail_list);

	$content[] = $object_box;
	}

	$content[] = $this->buildComments($commit);

	$hard_limit = 1000;

	if ($commit->isImported()) {
	$change_query = DiffusionPathChangeQuery::newFromDiffusionRequest(
	$drequest);
	$change_query->setLimit($hard_limit + 1);
	$changes = $change_query->loadChanges();
	} else {
	$changes = array();
	}

	$was_limited = (count($changes) > $hard_limit);
	if ($was_limited) {
	$changes = array_slice($changes, 0, $hard_limit);
	}

	$content[] = $this->buildMergesTable($commit);

	$highlighted_audits = $commit->getAuthorityAudits(
	$user,
	$this->auditAuthorityPHIDs);

	$count = count($changes);

	$bad_commit = null;
	if ($count == 0) {
	$bad_commit = queryfx_one(
	id(new PhabricatorRepository())->establishConnection('r'),
	'SELECT * FROM %T WHERE fullCommitName = %s',
	PhabricatorRepository::TABLE_BADCOMMIT,
	'r'.$callsign.$commit->getCommitIdentifier());
	}

	$show_changesets = false;
	if ($bad_commit) {
	$content[] = $this->renderStatusMessage(
	pht('Bad Commit'),
	$bad_commit['description']);
	} else if ($is_foreign) {
	// Don't render anything else.
	} else if (!$commit->isImported()) {
	$content[] = $this->renderStatusMessage(
	pht('Still Importing...'),
	pht(
	'This commit is still importing. Changes will be visible once '.
	'the import finishes.'));
	} else if (!count($changes)) {
	$content[] = $this->renderStatusMessage(
	pht('Empty Commit'),
	pht(
	'This commit is empty and does not affect any paths.'));
	} else if ($was_limited) {
	$content[] = $this->renderStatusMessage(
	pht('Enormous Commit'),
	pht(
	'This commit is enormous, and affects more than %d files. '.
	'Changes are not shown.',
	$hard_limit));
	} else if (!$this->getCommitExists()) {
	$content[] = $this->renderStatusMessage(
	pht('Commit No Longer Exists'),
	pht('This commit no longer exists in the repository.'));
	} else {
	$show_changesets = true;

	// The user has clicked "Show All Changes", and we should show all the
	// changes inline even if there are more than the soft limit.
	$show_all_details = $request->getBool('show_all');

	$change_panel = new PHUIObjectBoxView();
	$header = new PHUIHeaderView();
	$header->setHeader(pht('Changes (%s)', new PhutilNumber($count)));
	$change_panel->setID('toc');

	if ($count > self::CHANGES_LIMIT && !$show_all_details) {
	$icon = id(new PHUIIconView())
	->setIconFont('fa-files-o');

	$button = id(new PHUIButtonView())
	->setText(pht('Show All Changes'))
	->setHref('?show_all=true')
	->setTag('a')
	->setIcon($icon);

	$warning_view = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_WARNING)
	->setTitle(pht('Very Large Commit'))
	->appendChild(
	pht('This commit is very large. Load each file individually.'));

	$change_panel->setInfoView($warning_view);
	$header->addActionLink($button);
	}

	$changesets = DiffusionPathChange::convertToDifferentialChangesets(
	$user,
	$changes);

	// TODO: This table and panel shouldn't really be separate, but we need
	// to clean up the "Load All Files" interaction first.
	$change_table = $this->buildTableOfContents(
	$changesets);

	$change_panel->setTable($change_table);
	$change_panel->setHeader($header);

	$content[] = $change_panel;

	$vcs = $repository->getVersionControlSystem();
	switch ($vcs) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$vcs_supports_directory_changes = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$vcs_supports_directory_changes = false;
	break;
	default:
	throw new Exception(pht('Unknown VCS.'));
	}

	$references = array();
	foreach ($changesets as $key => $changeset) {
	$file_type = $changeset->getFileType();
	if ($file_type == DifferentialChangeType::FILE_DIRECTORY) {
	if (!$vcs_supports_directory_changes) {
	unset($changesets[$key]);
	continue;
	}
	}

	$references[$key] = $drequest->generateURI(
	array(
	'action' => 'rendering-ref',
	'path' => $changeset->getFilename(),
	));
	}

	// TODO: Some parts of the views still rely on properties of the
	// DifferentialChangeset. Make the objects ephemeral to make sure we don't
	// accidentally save them, and then set their ID to the appropriate ID for
	// this application (the path IDs).
	$path_ids = array_flip(mpull($changes, 'getPath'));
	foreach ($changesets as $changeset) {
	$changeset->makeEphemeral();
	$changeset->setID($path_ids[$changeset->getFilename()]);
	}

	if ($count <= self::CHANGES_LIMIT \|\| $show_all_details) {
	$visible_changesets = $changesets;
	} else {
	$visible_changesets = array();
	$inlines = PhabricatorAuditInlineComment::loadDraftAndPublishedComments(
	$user,
	$commit->getPHID());
	$path_ids = mpull($inlines, null, 'getPathID');
	foreach ($changesets as $key => $changeset) {
	if (array_key_exists($changeset->getID(), $path_ids)) {
	$visible_changesets[$key] = $changeset;
	}
	}
	}

	$change_list_title = DiffusionView::nameCommit(
	$repository,
	$commit->getCommitIdentifier());
	$change_list = new DifferentialChangesetListView();
	$change_list->setTitle($change_list_title);
	$change_list->setChangesets($changesets);
	$change_list->setVisibleChangesets($visible_changesets);
	$change_list->setRenderingReferences($references);
	$change_list->setRenderURI('/diffusion/'.$callsign.'/diff/');
	$change_list->setRepository($repository);
	$change_list->setUser($user);

	// TODO: Try to setBranch() to something reasonable here?

	$change_list->setStandaloneURI(
	'/diffusion/'.$callsign.'/diff/');
	$change_list->setRawFileURIs(
	// TODO: Implement this, somewhat tricky if there's an octopus merge
	// or whatever?
	null,
	'/diffusion/'.$callsign.'/diff/?view=r');

	$change_list->setInlineCommentControllerURI(
	'/diffusion/inline/edit/'.phutil_escape_uri($commit->getPHID()).'/');

	$content[] = $change_list->render();
	}

	$content[] = $this->renderAddCommentPanel($commit, $audit_requests);

	$commit_id = 'r'.$callsign.$commit->getCommitIdentifier();
	$short_name = DiffusionView::nameCommit(
	$repository,
	$commit->getCommitIdentifier());

	$prefs = $user->loadPreferences();
	$pref_filetree = PhabricatorUserPreferences::PREFERENCE_DIFF_FILETREE;
	$pref_collapse = PhabricatorUserPreferences::PREFERENCE_NAV_COLLAPSED;
	$show_filetree = $prefs->getPreference($pref_filetree);
	$collapsed = $prefs->getPreference($pref_collapse);

	if ($show_changesets && $show_filetree) {
	$nav = id(new DifferentialChangesetFileTreeSideNavBuilder())
	->setTitle($short_name)
	->setBaseURI(new PhutilURI('/'.$commit_id))
	->build($changesets)
	->setCrumbs($crumbs)
	->setCollapsed((bool)$collapsed)
	->appendChild($content);
	$content = $nav;
	} else {
	$content = array($crumbs, $content);
	}

	return $this->buildApplicationPage(
	$content,
	array(
	'title' => $commit_id,
	'pageObjects' => array($commit->getPHID()),
	));
	}

	private function loadCommitProperties(
	PhabricatorRepositoryCommit $commit,
	PhabricatorRepositoryCommitData $data,
	array $audit_requests) {

	$viewer = $this->getRequest()->getUser();
	$commit_phid = $commit->getPHID();
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();

	$edge_query = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs(array($commit_phid))
	->withEdgeTypes(array(
	DiffusionCommitHasTaskEdgeType::EDGECONST,
	DiffusionCommitHasRevisionEdgeType::EDGECONST,
	DiffusionCommitRevertsCommitEdgeType::EDGECONST,
	DiffusionCommitRevertedByCommitEdgeType::EDGECONST,
	));

	$edges = $edge_query->execute();

	$task_phids = array_keys(
	$edges[$commit_phid][DiffusionCommitHasTaskEdgeType::EDGECONST]);
	$revision_phid = key(
	$edges[$commit_phid][DiffusionCommitHasRevisionEdgeType::EDGECONST]);

	$reverts_phids = array_keys(
	$edges[$commit_phid][DiffusionCommitRevertsCommitEdgeType::EDGECONST]);
	$reverted_by_phids = array_keys(
	$edges[$commit_phid][DiffusionCommitRevertedByCommitEdgeType::EDGECONST]);

	$phids = $edge_query->getDestinationPHIDs(array($commit_phid));

	if ($data->getCommitDetail('authorPHID')) {
	$phids[] = $data->getCommitDetail('authorPHID');
	}
	if ($data->getCommitDetail('reviewerPHID')) {
	$phids[] = $data->getCommitDetail('reviewerPHID');
	}
	if ($data->getCommitDetail('committerPHID')) {
	$phids[] = $data->getCommitDetail('committerPHID');
	}

	// NOTE: We should never normally have more than a single push log, but
	// it can occur naturally if a commit is pushed, then the branch it was
	// on is deleted, then the commit is pushed again (or through other similar
	// chains of events). This should be rare, but does not indicate a bug
	// or data issue.

	// NOTE: We never query push logs in SVN because the commiter is always
	// the pusher and the commit time is always the push time; the push log
	// is redundant and we save a query by skipping it.

	$push_logs = array();
	if ($repository->isHosted() && !$repository->isSVN()) {
	$push_logs = id(new PhabricatorRepositoryPushLogQuery())
	->setViewer($viewer)
	->withRepositoryPHIDs(array($repository->getPHID()))
	->withNewRefs(array($commit->getCommitIdentifier()))
	->withRefTypes(array(PhabricatorRepositoryPushLog::REFTYPE_COMMIT))
	->execute();
	foreach ($push_logs as $log) {
	$phids[] = $log->getPusherPHID();
	}
	}

	$handles = array();
	if ($phids) {
	$handles = $this->loadViewerHandles($phids);
	}

	$props = array();

	if ($commit->getAuditStatus()) {
	$status = PhabricatorAuditCommitStatusConstants::getStatusName(
	$commit->getAuditStatus());
	$tag = id(new PHUITagView())
	->setType(PHUITagView::TYPE_STATE)
	->setName($status);

	switch ($commit->getAuditStatus()) {
	case PhabricatorAuditCommitStatusConstants::NEEDS_AUDIT:
	$tag->setBackgroundColor(PHUITagView::COLOR_ORANGE);
	break;
	case PhabricatorAuditCommitStatusConstants::CONCERN_RAISED:
	$tag->setBackgroundColor(PHUITagView::COLOR_RED);
	break;
	case PhabricatorAuditCommitStatusConstants::PARTIALLY_AUDITED:
	$tag->setBackgroundColor(PHUITagView::COLOR_BLUE);
	break;
	case PhabricatorAuditCommitStatusConstants::FULLY_AUDITED:
	$tag->setBackgroundColor(PHUITagView::COLOR_GREEN);
	break;
	}

	$props['Status'] = $tag;
	}

	if ($audit_requests) {
	$user_requests = array();
	$other_requests = array();
	foreach ($audit_requests as $audit_request) {
	if ($audit_request->isUser()) {
	$user_requests[] = $audit_request;
	} else {
	$other_requests[] = $audit_request;
	}
	}

	if ($user_requests) {
	$props['Auditors'] = $this->renderAuditStatusView(
	$user_requests);
	}

	if ($other_requests) {
	$props['Project/Package Auditors'] = $this->renderAuditStatusView(
	$other_requests);
	}
	}

	$author_phid = $data->getCommitDetail('authorPHID');
	$author_name = $data->getAuthorName();

	if (!$repository->isSVN()) {
	$authored_info = id(new PHUIStatusItemView());
	// TODO: In Git, a distinct authorship date is available. When present,
	// we should show it here.

	if ($author_phid) {
	$authored_info->setTarget($handles[$author_phid]->renderLink());
	} else if (strlen($author_name)) {
	$authored_info->setTarget($author_name);
	}

	$props['Authored'] = id(new PHUIStatusListView())
	->addItem($authored_info);
	}

	$committed_info = id(new PHUIStatusItemView())
	->setNote(phabricator_datetime($commit->getEpoch(), $viewer));

	$committer_phid = $data->getCommitDetail('committerPHID');
	$committer_name = $data->getCommitDetail('committer');
	if ($committer_phid) {
	$committed_info->setTarget($handles[$committer_phid]->renderLink());
	} else if (strlen($committer_name)) {
	$committed_info->setTarget($committer_name);
	} else if ($author_phid) {
	$committed_info->setTarget($handles[$author_phid]->renderLink());
	} else if (strlen($author_name)) {
	$committed_info->setTarget($author_name);
	}

	$props['Committed'] = id(new PHUIStatusListView())
	->addItem($committed_info);

	if ($push_logs) {
	$pushed_list = new PHUIStatusListView();

	foreach ($push_logs as $push_log) {
	$pushed_item = id(new PHUIStatusItemView())
	->setTarget($handles[$push_log->getPusherPHID()]->renderLink())
	->setNote(phabricator_datetime($push_log->getEpoch(), $viewer));
	$pushed_list->addItem($pushed_item);
	}

	$props['Pushed'] = $pushed_list;
	}

	$reviewer_phid = $data->getCommitDetail('reviewerPHID');
	if ($reviewer_phid) {
	$props['Reviewer'] = $handles[$reviewer_phid]->renderLink();
	}

	if ($revision_phid) {
	$props['Differential Revision'] = $handles[$revision_phid]->renderLink();
	}

	$parents = $this->getCommitParents();
	if ($parents) {
	$props['Parents'] = $viewer->renderHandleList(mpull($parents, 'getPHID'));
	}

	if ($this->getCommitExists()) {
	$props['Branches'] = phutil_tag(
	'span',
	array(
	'id' => 'commit-branches',
	),
	pht('Unknown'));
	$props['Tags'] = phutil_tag(
	'span',
	array(
	'id' => 'commit-tags',
	),
	pht('Unknown'));

	$callsign = $repository->getCallsign();
	$root = '/diffusion/'.$callsign.'/commit/'.$commit->getCommitIdentifier();
	Javelin::initBehavior(
	'diffusion-commit-branches',
	array(
	$root.'/branches/' => 'commit-branches',
	$root.'/tags/' => 'commit-tags',
	));
	}

	$refs = $this->getCommitRefs();
	if ($refs) {
	$ref_links = array();
	foreach ($refs as $ref_data) {
	$ref_links[] = phutil_tag(
	'a',
	array(
	'href' => $ref_data['href'],
	),
	$ref_data['ref']);
	}
	$props['References'] = phutil_implode_html(', ', $ref_links);
	}

	if ($reverts_phids) {
	$props[pht('Reverts')] = $viewer->renderHandleList($reverts_phids);
	}

	if ($reverted_by_phids) {
	$props[pht('Reverted By')] = $viewer->renderHandleList(
	$reverted_by_phids);
	}

	if ($task_phids) {
	$task_list = array();
	foreach ($task_phids as $phid) {
	$task_list[] = $handles[$phid]->renderLink();
	}
	$task_list = phutil_implode_html(phutil_tag('br'), $task_list);
	$props['Tasks'] = $task_list;
	}

	return $props;
	}

	private function buildComments(PhabricatorRepositoryCommit $commit) {
	$timeline = $this->buildTransactionTimeline(
	$commit,
	new PhabricatorAuditTransactionQuery());
	$commit->willRenderTimeline($timeline, $this->getRequest());
	return $timeline;
	}

	private function renderAddCommentPanel(
	PhabricatorRepositoryCommit $commit,
	array $audit_requests) {
	assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest');

	$request = $this->getRequest();
	$user = $request->getUser();

	if (!$user->isLoggedIn()) {
	return id(new PhabricatorApplicationTransactionCommentView())
	->setUser($user)
	->setRequestURI($request->getRequestURI());
	}

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');

	$pane_id = celerity_generate_unique_node_id();
	Javelin::initBehavior(
	'differential-keyboard-navigation',
	array(
	'haunt' => $pane_id,
	));

	$draft = id(new PhabricatorDraft())->loadOneWhere(
	'authorPHID = %s AND draftKey = %s',
	$user->getPHID(),
	'diffusion-audit-'.$commit->getID());
	if ($draft) {
	$draft = $draft->getDraft();
	} else {
	$draft = null;
	}

	$actions = $this->getAuditActions($commit, $audit_requests);

	$mailable_source = new PhabricatorMetaMTAMailableDatasource();
	$auditor_source = new DiffusionAuditorDatasource();

	$form = id(new AphrontFormView())
	->setUser($user)
	->setAction('/audit/addcomment/')
	->addHiddenInput('commit', $commit->getPHID())
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Action'))
	->setName('action')
	->setID('audit-action')
	->setOptions($actions))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Add Auditors'))
	->setName('auditors')
	->setControlID('add-auditors')
	->setControlStyle('display: none')
	->setID('add-auditors-tokenizer')
	->setDisableBehavior(true)
	->setDatasource($auditor_source))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Add CCs'))
	->setName('ccs')
	->setControlID('add-ccs')
	->setControlStyle('display: none')
	->setID('add-ccs-tokenizer')
	->setDisableBehavior(true)
	->setDatasource($mailable_source))
	->appendChild(
	id(new PhabricatorRemarkupControl())
	->setLabel(pht('Comments'))
	->setName('content')
	->setValue($draft)
	->setID('audit-content')
	->setUser($user))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Submit')));

	$header = new PHUIHeaderView();
	$header->setHeader(
	$is_serious ? pht('Audit Commit') : pht('Creative Accounting'));

	Javelin::initBehavior(
	'differential-add-reviewers-and-ccs',
	array(
	'dynamic' => array(
	'add-auditors-tokenizer' => array(
	'actions' => array('add_auditors' => 1),
	'src' => $auditor_source->getDatasourceURI(),
	'row' => 'add-auditors',
	'placeholder' => $auditor_source->getPlaceholderText(),
	),
	'add-ccs-tokenizer' => array(
	'actions' => array('add_ccs' => 1),
	'src' => $mailable_source->getDatasourceURI(),
	'row' => 'add-ccs',
	'placeholder' => $mailable_source->getPlaceholderText(),
	),
	),
	'select' => 'audit-action',
	));

	Javelin::initBehavior('differential-feedback-preview', array(
	'uri' => '/audit/preview/'.$commit->getID().'/',
	'preview' => 'audit-preview',
	'content' => 'audit-content',
	'action' => 'audit-action',
	'previewTokenizers' => array(
	'auditors' => 'add-auditors-tokenizer',
	'ccs' => 'add-ccs-tokenizer',
	),
	'inline' => 'inline-comment-preview',
	'inlineuri' => '/diffusion/inline/preview/'.$commit->getPHID().'/',
	));

	$loading = phutil_tag_div(
	'aphront-panel-preview-loading-text',
	pht('Loading preview...'));

	$preview_panel = phutil_tag_div(
	'aphront-panel-preview aphront-panel-flush',
	array(
	phutil_tag('div', array('id' => 'audit-preview'), $loading),
	phutil_tag('div', array('id' => 'inline-comment-preview')),
	));

	// TODO: This is pretty awkward, unify the CSS between Diffusion and
	// Differential better.
	require_celerity_resource('differential-core-view-css');

	$anchor = id(new PhabricatorAnchorView())
	->setAnchorName('comment')
	->setNavigationMarker(true)
	->render();

	$comment_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->appendChild($form);

	return phutil_tag(
	'div',
	array(
	'id' => $pane_id,
	),
	phutil_tag_div(
	'differential-add-comment-panel',
	array($anchor, $comment_box, $preview_panel)));
	}

	/**
	* Return a map of available audit actions for rendering into a <select />.
	* This shows the user valid actions, and does not show nonsense/invalid
	* actions (like closing an already-closed commit, or resigning from a commit
	* you have no association with).
	*/
	private function getAuditActions(
	PhabricatorRepositoryCommit $commit,
	array $audit_requests) {
	assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest');
	$user = $this->getRequest()->getUser();

	$user_is_author = ($commit->getAuthorPHID() == $user->getPHID());

	$user_request = null;
	foreach ($audit_requests as $audit_request) {
	if ($audit_request->getAuditorPHID() == $user->getPHID()) {
	$user_request = $audit_request;
	break;
	}
	}

	$actions = array();
	$actions[PhabricatorAuditActionConstants::COMMENT] = true;
	$actions[PhabricatorAuditActionConstants::ADD_CCS] = true;
	$actions[PhabricatorAuditActionConstants::ADD_AUDITORS] = true;

	// We allow you to accept your own commits. A use case here is that you
	// notice an issue with your own commit and "Raise Concern" as an indicator
	// to other auditors that you're on top of the issue, then later resolve it
	// and "Accept". You can not accept on behalf of projects or packages,
	// however.
	$actions[PhabricatorAuditActionConstants::ACCEPT] = true;
	$actions[PhabricatorAuditActionConstants::CONCERN] = true;


	// To resign, a user must have authority on some request and not be the
	// commit's author.
	if (!$user_is_author) {
	$may_resign = false;

	$authority_map = array_fill_keys($this->auditAuthorityPHIDs, true);
	foreach ($audit_requests as $request) {
	if (empty($authority_map[$request->getAuditorPHID()])) {
	continue;
	}
	$may_resign = true;
	break;
	}

	// If the user has already resigned, don't show "Resign...".
	$status_resigned = PhabricatorAuditStatusConstants::RESIGNED;
	if ($user_request) {
	if ($user_request->getAuditStatus() == $status_resigned) {
	$may_resign = false;
	}
	}

	if ($may_resign) {
	$actions[PhabricatorAuditActionConstants::RESIGN] = true;
	}
	}

	$status_concern = PhabricatorAuditCommitStatusConstants::CONCERN_RAISED;
	$concern_raised = ($commit->getAuditStatus() == $status_concern);
	$can_close_option = PhabricatorEnv::getEnvConfig(
	'audit.can-author-close-audit');
	if ($can_close_option && $user_is_author && $concern_raised) {
	$actions[PhabricatorAuditActionConstants::CLOSE] = true;
	}

	foreach ($actions as $constant => $ignored) {
	$actions[$constant] =
	PhabricatorAuditActionConstants::getActionName($constant);
	}

	return $actions;
	}

	private function buildMergesTable(PhabricatorRepositoryCommit $commit) {
	$viewer = $this->getViewer();
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();

	$merges = $this->getCommitMerges();
	if (!$merges) {
	return null;
	}

	$limit = $this->getMergeDisplayLimit();

	$caption = null;
	if (count($merges) > $limit) {
	$merges = array_slice($merges, 0, $limit);
	$caption = new PHUIInfoView();
	$caption->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	$caption->appendChild(
	pht(
	'This commit merges a very large number of changes. '.
	'Only the first %s are shown.',
	new PhutilNumber($limit)));
	}

	$history_table = id(new DiffusionHistoryTableView())
	->setUser($viewer)
	->setDiffusionRequest($drequest)
	->setHistory($merges);

	$history_table->loadRevisions();

	$panel = new PHUIObjectBoxView();
	$panel->setHeaderText(pht('Merged Changes'));
	$panel->setTable($history_table);
	if ($caption) {
	$panel->setInfoView($caption);
	}

	return $panel;
	}

	private function renderHeadsupActionList(
	PhabricatorRepositoryCommit $commit,
	PhabricatorRepository $repository) {

	$request = $this->getRequest();
	$user = $request->getUser();

	$actions = id(new PhabricatorActionListView())
	->setUser($user)
	- ->setObject($commit)
	- ->setObjectURI($request->getRequestURI());
	+ ->setObject($commit);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$user,
	$commit,
	PhabricatorPolicyCapability::CAN_EDIT);

	$uri = '/diffusion/'.$repository->getCallsign().'/commit/'.
	$commit->getCommitIdentifier().'/edit/';

	$action = id(new PhabricatorActionView())
	->setName(pht('Edit Commit'))
	->setHref($uri)
	->setIcon('fa-pencil')
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit);
	$actions->addAction($action);

	require_celerity_resource('phabricator-object-selector-css');
	require_celerity_resource('javelin-behavior-phabricator-object-selector');

	$maniphest = 'PhabricatorManiphestApplication';
	if (PhabricatorApplication::isClassInstalled($maniphest)) {
	$action = id(new PhabricatorActionView())
	->setName(pht('Edit Maniphest Tasks'))
	->setIcon('fa-anchor')
	->setHref('/search/attach/'.$commit->getPHID().'/TASK/edge/')
	->setWorkflow(true)
	->setDisabled(!$can_edit);
	$actions->addAction($action);
	}

	$action = id(new PhabricatorActionView())
	->setName(pht('Download Raw Diff'))
	->setHref($request->getRequestURI()->alter('diff', true))
	->setIcon('fa-download');
	$actions->addAction($action);

	return $actions;
	}

	private function buildRawDiffResponse(DiffusionRequest $drequest) {
	$raw_diff = $this->callConduitWithDiffusionRequest(
	'diffusion.rawdiffquery',
	array(
	'commit' => $drequest->getCommit(),
	'path' => $drequest->getPath(),
	));

	$file = PhabricatorFile::buildFromFileDataOrHash(
	$raw_diff,
	array(
	'name' => $drequest->getCommit().'.diff',
	'ttl' => (60 * 60 * 24),
	'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
	));

	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	$file->attachToObject($drequest->getRepository()->getPHID());
	unset($unguarded);

	return $file->getRedirectResponse();
	}

	private function renderAuditStatusView(array $audit_requests) {
	assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest');
	$viewer = $this->getViewer();

	$authority_map = array_fill_keys($this->auditAuthorityPHIDs, true);

	$view = new PHUIStatusListView();
	foreach ($audit_requests as $request) {
	$code = $request->getAuditStatus();
	$item = new PHUIStatusItemView();
	$item->setIcon(
	PhabricatorAuditStatusConstants::getStatusIcon($code),
	PhabricatorAuditStatusConstants::getStatusColor($code),
	PhabricatorAuditStatusConstants::getStatusName($code));

	$note = array();
	foreach ($request->getAuditReasons() as $reason) {
	$note[] = phutil_tag('div', array(), $reason);
	}
	$item->setNote($note);

	$auditor_phid = $request->getAuditorPHID();
	$target = $viewer->renderHandle($auditor_phid);
	$item->setTarget($target);

	if (isset($authority_map[$auditor_phid])) {
	$item->setHighlighted(true);
	}

	$view->addItem($item);
	}

	return $view;
	}

	private function linkBugtraq($corpus) {
	$url = PhabricatorEnv::getEnvConfig('bugtraq.url');
	if (!strlen($url)) {
	return $corpus;
	}

	$regexes = PhabricatorEnv::getEnvConfig('bugtraq.logregex');
	if (!$regexes) {
	return $corpus;
	}

	$parser = id(new PhutilBugtraqParser())
	->setBugtraqPattern("[[ {$url} \| %BUGID% ]]")
	->setBugtraqCaptureExpression(array_shift($regexes));

	$select = array_shift($regexes);
	if ($select) {
	$parser->setBugtraqSelectExpression($select);
	}

	return $parser->processCorpus($corpus);
	}

	private function buildTableOfContents(array $changesets) {
	$drequest = $this->getDiffusionRequest();
	$viewer = $this->getViewer();

	$toc_view = id(new PHUIDiffTableOfContentsListView())
	->setUser($viewer);

	// TODO: This is hacky, we just want access to the linkX() methods on
	// DiffusionView.
	$diffusion_view = id(new DiffusionEmptyResultView())
	->setDiffusionRequest($drequest);

	$have_owners = PhabricatorApplication::isClassInstalledForViewer(
	'PhabricatorOwnersApplication',
	$viewer);

	if (!$changesets) {
	$have_owners = false;
	}

	if ($have_owners) {
	if ($viewer->getPHID()) {
	$packages = id(new PhabricatorOwnersPackageQuery())
	->setViewer($viewer)
	->withStatuses(array(PhabricatorOwnersPackage::STATUS_ACTIVE))
	->withAuthorityPHIDs(array($viewer->getPHID()))
	->execute();
	$toc_view->setAuthorityPackages($packages);
	}

	$repository = $drequest->getRepository();
	$repository_phid = $repository->getPHID();

	$control_query = id(new PhabricatorOwnersPackageQuery())
	->setViewer($viewer)
	->withStatuses(array(PhabricatorOwnersPackage::STATUS_ACTIVE))
	->withControl($repository_phid, mpull($changesets, 'getFilename'));
	$control_query->execute();
	}

	foreach ($changesets as $changeset_id => $changeset) {
	$path = $changeset->getFilename();
	$anchor = substr(md5($path), 0, 8);

	$history_link = $diffusion_view->linkHistory($path);
	$browse_link = $diffusion_view->linkBrowse(
	$path,
	array(
	'type' => $changeset->getFileType(),
	));

	$item = id(new PHUIDiffTableOfContentsItemView())
	->setChangeset($changeset)
	->setAnchor($anchor)
	->setContext(
	array(
	$history_link,
	' ',
	$browse_link,
	));

	if ($have_owners) {
	$packages = $control_query->getControllingPackagesForPath(
	$repository_phid,
	$changeset->getFilename());
	$item->setPackages($packages);
	}

	$toc_view->addItem($item);
	}

	return $toc_view;
	}

	private function loadCommitState() {
	$viewer = $this->getViewer();
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();
	$commit = $drequest->getCommit();

	// TODO: We could use futures here and resolve these calls in parallel.

	$exceptions = array();

	try {
	$parent_refs = $this->callConduitWithDiffusionRequest(
	'diffusion.commitparentsquery',
	array(
	'commit' => $commit,
	));

	if ($parent_refs) {
	$parents = id(new DiffusionCommitQuery())
	->setViewer($viewer)
	->withRepository($repository)
	->withIdentifiers($parent_refs)
	->execute();
	} else {
	$parents = array();
	}

	$this->commitParents = $parents;
	} catch (Exception $ex) {
	$this->commitParents = false;
	$exceptions[] = $ex;
	}

	$merge_limit = $this->getMergeDisplayLimit();

	try {
	if ($repository->isSVN()) {
	$this->commitMerges = array();
	} else {
	$merges = $this->callConduitWithDiffusionRequest(
	'diffusion.mergedcommitsquery',
	array(
	'commit' => $commit,
	'limit' => $merge_limit + 1,
	));
	$this->commitMerges = DiffusionPathChange::newFromConduit($merges);
	}
	} catch (Exception $ex) {
	$this->commitMerges = false;
	$exceptions[] = $ex;
	}


	try {
	if ($repository->isGit()) {
	$refs = $this->callConduitWithDiffusionRequest(
	'diffusion.refsquery',
	array(
	'commit' => $commit,
	));
	} else {
	$refs = array();
	}

	$this->commitRefs = $refs;
	} catch (Exception $ex) {
	$this->commitRefs = false;
	$exceptions[] = $ex;
	}

	if ($exceptions) {
	$exists = $this->callConduitWithDiffusionRequest(
	'diffusion.existsquery',
	array(
	'commit' => $commit,
	));

	if ($exists) {
	$this->commitExists = true;
	foreach ($exceptions as $exception) {
	$this->commitErrors[] = $exception->getMessage();
	}
	} else {
	$this->commitExists = false;
	$this->commitErrors[] = pht(
	'This commit no longer exists in the repository. It may have '.
	'been part of a branch which was deleted.');
	}
	} else {
	$this->commitExists = true;
	$this->commitErrors = array();
	}
	}

	private function getMergeDisplayLimit() {
	return 50;
	}

	private function getCommitExists() {
	if ($this->commitExists === null) {
	$this->loadCommitState();
	}

	return $this->commitExists;
	}

	private function getCommitParents() {
	if ($this->commitParents === null) {
	$this->loadCommitState();
	}

	return $this->commitParents;
	}

	private function getCommitRefs() {
	if ($this->commitRefs === null) {
	$this->loadCommitState();
	}

	return $this->commitRefs;
	}

	private function getCommitMerges() {
	if ($this->commitMerges === null) {
	$this->loadCommitState();
	}

	return $this->commitMerges;
	}

	private function getCommitErrors() {
	if ($this->commitErrors === null) {
	$this->loadCommitState();
	}

	return $this->commitErrors;
	}


	}
	diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
	index cfa4f8f0d6..cd7859cc0a 100644
	--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
	+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
	@@ -1,744 +1,742 @@
	<?php

	final class DiffusionRepositoryController extends DiffusionController {

	public function shouldAllowPublic() {
	return true;
	}

	protected function processDiffusionRequest(AphrontRequest $request) {
	$viewer = $request->getUser();

	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();

	$content = array();

	$crumbs = $this->buildCrumbs();
	$content[] = $crumbs;

	$content[] = $this->buildPropertiesTable($drequest->getRepository());

	// Before we do any work, make sure we're looking at a some content: we're
	// on a valid branch, and the repository is not empty.
	$page_has_content = false;
	$empty_title = null;
	$empty_message = null;

	// If this VCS supports branches, check that the selected branch actually
	// exists.
	if ($drequest->supportsBranches()) {
	// NOTE: Mercurial may have multiple branch heads with the same name.
	$ref_cursors = id(new PhabricatorRepositoryRefCursorQuery())
	->setViewer($viewer)
	->withRepositoryPHIDs(array($repository->getPHID()))
	->withRefTypes(array(PhabricatorRepositoryRefCursor::TYPE_BRANCH))
	->withRefNames(array($drequest->getBranch()))
	->execute();
	if ($ref_cursors) {
	// This is a valid branch, so we necessarily have some content.
	$page_has_content = true;
	} else {
	$empty_title = pht('No Such Branch');
	$empty_message = pht(
	'There is no branch named "%s" in this repository.',
	$drequest->getBranch());
	}
	}

	// If we didn't find any branches, check if there are any commits at all.
	// This can tailor the message for empty repositories.
	if (!$page_has_content) {
	$any_commit = id(new DiffusionCommitQuery())
	->setViewer($viewer)
	->withRepository($repository)
	->setLimit(1)
	->execute();
	if ($any_commit) {
	if (!$drequest->supportsBranches()) {
	$page_has_content = true;
	}
	} else {
	$empty_title = pht('Empty Repository');
	$empty_message = pht('This repository does not have any commits yet.');
	}
	}

	if ($page_has_content) {
	$content[] = $this->buildNormalContent($drequest);
	} else {
	$content[] = id(new PHUIInfoView())
	->setTitle($empty_title)
	->setSeverity(PHUIInfoView::SEVERITY_WARNING)
	->setErrors(array($empty_message));
	}

	return $this->buildApplicationPage(
	$content,
	array(
	'title' => $drequest->getRepository()->getName(),
	));
	}


	private function buildNormalContent(DiffusionRequest $drequest) {
	$repository = $drequest->getRepository();

	$phids = array();
	$content = array();

	try {
	$history_results = $this->callConduitWithDiffusionRequest(
	'diffusion.historyquery',
	array(
	'commit' => $drequest->getCommit(),
	'path' => $drequest->getPath(),
	'offset' => 0,
	'limit' => 15,
	));
	$history = DiffusionPathChange::newFromConduit(
	$history_results['pathChanges']);

	foreach ($history as $item) {
	$data = $item->getCommitData();
	if ($data) {
	if ($data->getCommitDetail('authorPHID')) {
	$phids[$data->getCommitDetail('authorPHID')] = true;
	}
	if ($data->getCommitDetail('committerPHID')) {
	$phids[$data->getCommitDetail('committerPHID')] = true;
	}
	}
	}
	$history_exception = null;
	} catch (Exception $ex) {
	$history_results = null;
	$history = null;
	$history_exception = $ex;
	}

	try {
	$browse_results = DiffusionBrowseResultSet::newFromConduit(
	$this->callConduitWithDiffusionRequest(
	'diffusion.browsequery',
	array(
	'path' => $drequest->getPath(),
	'commit' => $drequest->getCommit(),
	)));
	$browse_paths = $browse_results->getPaths();

	foreach ($browse_paths as $item) {
	$data = $item->getLastCommitData();
	if ($data) {
	if ($data->getCommitDetail('authorPHID')) {
	$phids[$data->getCommitDetail('authorPHID')] = true;
	}
	if ($data->getCommitDetail('committerPHID')) {
	$phids[$data->getCommitDetail('committerPHID')] = true;
	}
	}
	}

	$browse_exception = null;
	} catch (Exception $ex) {
	$browse_results = null;
	$browse_paths = null;
	$browse_exception = $ex;
	}

	$phids = array_keys($phids);
	$handles = $this->loadViewerHandles($phids);

	$readme = null;
	if ($browse_results) {
	$readme_path = $browse_results->getReadmePath();
	if ($readme_path) {
	$readme_content = $this->callConduitWithDiffusionRequest(
	'diffusion.filecontentquery',
	array(
	'path' => $readme_path,
	'commit' => $drequest->getStableCommit(),
	));
	if ($readme_content) {
	$readme = id(new DiffusionReadmeView())
	->setUser($this->getViewer())
	->setPath($readme_path)
	->setContent($readme_content['corpus']);
	}
	}
	}

	$content[] = $this->buildBrowseTable(
	$browse_results,
	$browse_paths,
	$browse_exception,
	$handles);

	$content[] = $this->buildHistoryTable(
	$history_results,
	$history,
	$history_exception);

	try {
	$content[] = $this->buildTagListTable($drequest);
	} catch (Exception $ex) {
	if (!$repository->isImporting()) {
	$content[] = $this->renderStatusMessage(
	pht('Unable to Load Tags'),
	$ex->getMessage());
	}
	}

	try {
	$content[] = $this->buildBranchListTable($drequest);
	} catch (Exception $ex) {
	if (!$repository->isImporting()) {
	$content[] = $this->renderStatusMessage(
	pht('Unable to Load Branches'),
	$ex->getMessage());
	}
	}

	if ($readme) {
	$content[] = $readme;
	}

	return $content;
	}

	private function buildPropertiesTable(PhabricatorRepository $repository) {
	$user = $this->getRequest()->getUser();

	$header = id(new PHUIHeaderView())
	->setHeader($repository->getName())
	->setUser($user)
	->setPolicyObject($repository);

	if (!$repository->isTracked()) {
	$header->setStatus('fa-ban', 'dark', pht('Inactive'));
	} else if ($repository->isImporting()) {
	$header->setStatus('fa-clock-o', 'indigo', pht('Importing...'));
	} else {
	$header->setStatus('fa-check', 'bluegrey', pht('Active'));
	}


	$actions = $this->buildActionList($repository);

	$view = id(new PHUIPropertyListView())
	->setObject($repository)
	->setUser($user);

	if ($repository->isHosted()) {
	$ssh_uri = $repository->getSSHCloneURIObject();
	if ($ssh_uri) {
	$clone_uri = $this->renderCloneCommand(
	$repository,
	$ssh_uri,
	$repository->getServeOverSSH(),
	'/settings/panel/ssh/');

	$view->addProperty(
	$repository->isSVN()
	? pht('Checkout (SSH)')
	: pht('Clone (SSH)'),
	$clone_uri);
	}

	$http_uri = $repository->getHTTPCloneURIObject();
	if ($http_uri) {
	$clone_uri = $this->renderCloneCommand(
	$repository,
	$http_uri,
	$repository->getServeOverHTTP(),
	PhabricatorEnv::getEnvConfig('diffusion.allow-http-auth')
	? '/settings/panel/vcspassword/'
	: null);

	$view->addProperty(
	$repository->isSVN()
	? pht('Checkout (HTTP)')
	: pht('Clone (HTTP)'),
	$clone_uri);
	}
	} else {
	switch ($repository->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$view->addProperty(
	pht('Clone'),
	$this->renderCloneCommand(
	$repository,
	$repository->getPublicCloneURI()));
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$view->addProperty(
	pht('Checkout'),
	$this->renderCloneCommand(
	$repository,
	$repository->getPublicCloneURI()));
	break;
	}
	}

	$view->invokeWillRenderEvent();

	$description = $repository->getDetail('description');
	if (strlen($description)) {
	$description = PhabricatorMarkupEngine::renderOneObject(
	$repository,
	'description',
	$user);
	$view->addSectionHeader(
	pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
	$view->addTextContent($description);
	}

	$view->setActionList($actions);

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($view);

	$info = null;
	$drequest = $this->getDiffusionRequest();

	// Try to load alternatives. This may fail for repositories which have not
	// cloned yet. If it does, just ignore it and continue.
	try {
	$alternatives = $drequest->getRefAlternatives();
	} catch (ConduitClientException $ex) {
	$alternatives = array();
	}

	if ($alternatives) {
	$message = array(
	pht(
	'The ref "%s" is ambiguous in this repository.',
	$drequest->getBranch()),
	' ',
	phutil_tag(
	'a',
	array(
	'href' => $drequest->generateURI(
	array(
	'action' => 'refs',
	)),
	),
	pht('View Alternatives')),
	);

	$messages = array($message);

	$info = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_WARNING)
	->setErrors(array($message));

	$box->setInfoView($info);
	}


	return $box;
	}

	private function buildBranchListTable(DiffusionRequest $drequest) {
	$viewer = $this->getRequest()->getUser();

	if ($drequest->getBranch() === null) {
	return null;
	}

	$limit = 15;

	$branches = $this->callConduitWithDiffusionRequest(
	'diffusion.branchquery',
	array(
	'closed' => false,
	'limit' => $limit + 1,
	));
	if (!$branches) {
	return null;
	}

	$more_branches = (count($branches) > $limit);
	$branches = array_slice($branches, 0, $limit);

	$branches = DiffusionRepositoryRef::loadAllFromDictionaries($branches);

	$commits = id(new DiffusionCommitQuery())
	->setViewer($viewer)
	->withIdentifiers(mpull($branches, 'getCommitIdentifier'))
	->withRepository($drequest->getRepository())
	->execute();

	$table = id(new DiffusionBranchTableView())
	->setUser($viewer)
	->setDiffusionRequest($drequest)
	->setBranches($branches)
	->setCommits($commits);

	$panel = new PHUIObjectBoxView();
	$header = new PHUIHeaderView();
	$header->setHeader(pht('Branches'));

	if ($more_branches) {
	$header->setSubHeader(pht('Showing %d branches.', $limit));
	}

	$icon = id(new PHUIIconView())
	->setIconFont('fa-code-fork');

	$button = new PHUIButtonView();
	$button->setText(pht('Show All Branches'));
	$button->setTag('a');
	$button->setIcon($icon);
	$button->setHref($drequest->generateURI(
	array(
	'action' => 'branches',
	)));

	$header->addActionLink($button);
	$panel->setHeader($header);
	$panel->setTable($table);

	return $panel;
	}

	private function buildTagListTable(DiffusionRequest $drequest) {
	$viewer = $this->getRequest()->getUser();
	$repository = $drequest->getRepository();

	switch ($repository->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	// no tags in SVN
	return null;
	}
	$tag_limit = 15;
	$tags = array();
	$tags = DiffusionRepositoryTag::newFromConduit(
	$this->callConduitWithDiffusionRequest(
	'diffusion.tagsquery',
	array(
	// On the home page, we want to find tags on any branch.
	'commit' => null,
	'limit' => $tag_limit + 1,
	)));

	if (!$tags) {
	return null;
	}

	$more_tags = (count($tags) > $tag_limit);
	$tags = array_slice($tags, 0, $tag_limit);

	$commits = id(new DiffusionCommitQuery())
	->setViewer($viewer)
	->withIdentifiers(mpull($tags, 'getCommitIdentifier'))
	->withRepository($repository)
	->needCommitData(true)
	->execute();

	$view = id(new DiffusionTagListView())
	->setUser($viewer)
	->setDiffusionRequest($drequest)
	->setTags($tags)
	->setCommits($commits);

	$phids = $view->getRequiredHandlePHIDs();
	$handles = $this->loadViewerHandles($phids);
	$view->setHandles($handles);

	$panel = new PHUIObjectBoxView();
	$header = new PHUIHeaderView();
	$header->setHeader(pht('Tags'));

	if ($more_tags) {
	$header->setSubHeader(
	pht('Showing the %d most recent tags.', $tag_limit));
	}

	$icon = id(new PHUIIconView())
	->setIconFont('fa-tag');

	$button = new PHUIButtonView();
	$button->setText(pht('Show All Tags'));
	$button->setTag('a');
	$button->setIcon($icon);
	$button->setHref($drequest->generateURI(
	array(
	'action' => 'tags',
	)));

	$header->addActionLink($button);

	$panel->setHeader($header);
	$panel->setTable($view);

	return $panel;
	}

	private function buildActionList(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	- $view_uri = $this->getApplicationURI($repository->getCallsign().'/');
	$edit_uri = $this->getApplicationURI($repository->getCallsign().'/edit/');

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($repository)
	- ->setObjectURI($view_uri);
	+ ->setObject($repository);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$repository,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Repository'))
	->setIcon('fa-pencil')
	->setHref($edit_uri)
	->setWorkflow(!$can_edit)
	->setDisabled(!$can_edit));

	if ($repository->isHosted()) {
	$callsign = $repository->getCallsign();
	$push_uri = $this->getApplicationURI(
	'pushlog/?repositories=r'.$callsign);

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View Push Logs'))
	->setIcon('fa-list-alt')
	->setHref($push_uri));
	}

	return $view;
	}

	private function buildHistoryTable(
	$history_results,
	$history,
	$history_exception) {

	$request = $this->getRequest();
	$viewer = $request->getUser();
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();

	if ($history_exception) {
	if ($repository->isImporting()) {
	return $this->renderStatusMessage(
	pht('Still Importing...'),
	pht(
	'This repository is still importing. History is not yet '.
	'available.'));
	} else {
	return $this->renderStatusMessage(
	pht('Unable to Retrieve History'),
	$history_exception->getMessage());
	}
	}

	$history_table = id(new DiffusionHistoryTableView())
	->setUser($viewer)
	->setDiffusionRequest($drequest)
	->setHistory($history);

	// TODO: Super sketchy.
	$history_table->loadRevisions();

	if ($history_results) {
	$history_table->setParents($history_results['parents']);
	}

	$history_table->setIsHead(true);
	$callsign = $drequest->getRepository()->getCallsign();

	$icon = id(new PHUIIconView())
	->setIconFont('fa-list-alt');

	$button = id(new PHUIButtonView())
	->setText(pht('View Full History'))
	->setHref($drequest->generateURI(
	array(
	'action' => 'history',
	)))
	->setTag('a')
	->setIcon($icon);

	$panel = new PHUIObjectBoxView();
	$header = id(new PHUIHeaderView())
	->setHeader(pht('Recent Commits'))
	->addActionLink($button);
	$panel->setHeader($header);
	$panel->setTable($history_table);

	return $panel;
	}

	private function buildBrowseTable(
	$browse_results,
	$browse_paths,
	$browse_exception,
	array $handles) {

	require_celerity_resource('diffusion-icons-css');

	$request = $this->getRequest();
	$viewer = $request->getUser();
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();

	if ($browse_exception) {
	if ($repository->isImporting()) {
	// The history table renders a useful message.
	return null;
	} else {
	return $this->renderStatusMessage(
	pht('Unable to Retrieve Paths'),
	$browse_exception->getMessage());
	}
	}

	$browse_table = id(new DiffusionBrowseTableView())
	->setUser($viewer)
	->setDiffusionRequest($drequest)
	->setHandles($handles);
	if ($browse_paths) {
	$browse_table->setPaths($browse_paths);
	} else {
	$browse_table->setPaths(array());
	}

	$browse_uri = $drequest->generateURI(array('action' => 'browse'));

	$browse_panel = new PHUIObjectBoxView();
	$header = id(new PHUIHeaderView())
	->setHeader(pht('Repository'));

	$icon = id(new PHUIIconView())
	->setIconFont('fa-folder-open');

	$button = new PHUIButtonView();
	$button->setText(pht('Browse Repository'));
	$button->setTag('a');
	$button->setIcon($icon);
	$button->setHref($browse_uri);

	$header->addActionLink($button);
	$browse_panel->setHeader($header);

	$locate_panel = null;
	if ($repository->canUsePathTree()) {
	Javelin::initBehavior(
	'diffusion-locate-file',
	array(
	'controlID' => 'locate-control',
	'inputID' => 'locate-input',
	'browseBaseURI' => (string)$drequest->generateURI(
	array(
	'action' => 'browse',
	)),
	'uri' => (string)$drequest->generateURI(
	array(
	'action' => 'pathtree',
	)),
	));

	$form = id(new AphrontFormView())
	->setUser($viewer)
	->appendChild(
	id(new AphrontFormTypeaheadControl())
	->setHardpointID('locate-control')
	->setID('locate-input')
	->setLabel(pht('Locate File')));
	$form_box = id(new PHUIBoxView())
	->appendChild($form->buildLayoutView());
	$locate_panel = id(new PHUIObjectBoxView())
	->setHeaderText('Locate File')
	->appendChild($form_box);
	}

	$browse_panel->setTable($browse_table);

	return array($locate_panel, $browse_panel);
	}

	private function renderCloneCommand(
	PhabricatorRepository $repository,
	$uri,
	$serve_mode = null,
	$manage_uri = null) {

	require_celerity_resource('diffusion-icons-css');

	Javelin::initBehavior('select-on-click');

	switch ($repository->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$command = csprintf(
	'git clone %R',
	$uri);
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$command = csprintf(
	'hg clone %R',
	$uri);
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	if ($repository->isHosted()) {
	$command = csprintf(
	'svn checkout %R %R',
	$uri,
	$repository->getCloneName());
	} else {
	$command = csprintf(
	'svn checkout %R',
	$uri);
	}
	break;
	}

	$input = javelin_tag(
	'input',
	array(
	'type' => 'text',
	'value' => (string)$command,
	'class' => 'diffusion-clone-uri',
	'sigil' => 'select-on-click',
	'readonly' => 'true',
	));

	$extras = array();
	if ($serve_mode) {
	if ($serve_mode === PhabricatorRepository::SERVE_READONLY) {
	$extras[] = pht('(Read Only)');
	}
	}

	if ($manage_uri) {
	if ($this->getRequest()->getUser()->isLoggedIn()) {
	$extras[] = phutil_tag(
	'a',
	array(
	'href' => $manage_uri,
	),
	pht('Manage Credentials'));
	}
	}

	if ($extras) {
	$extras = phutil_implode_html(' ', $extras);
	$extras = phutil_tag(
	'div',
	array(
	'class' => 'diffusion-clone-extras',
	),
	$extras);
	}

	return array($input, $extras);
	}

	}
	diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
	index f18ffe4163..780e83d089 100644
	--- a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
	+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
	@@ -1,1375 +1,1362 @@
	<?php

	final class DiffusionRepositoryEditMainController
	extends DiffusionRepositoryEditController {

	protected function processDiffusionRequest(AphrontRequest $request) {
	$viewer = $request->getUser();
	$drequest = $this->diffusionRequest;
	$repository = $drequest->getRepository();

	PhabricatorPolicyFilter::requireCapability(
	$viewer,
	$repository,
	PhabricatorPolicyCapability::CAN_EDIT);

	$is_svn = false;
	$is_git = false;
	$is_hg = false;
	switch ($repository->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$is_git = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$is_svn = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$is_hg = true;
	break;
	}

	$has_branches = ($is_git \|\| $is_hg);
	$has_local = $repository->usesLocalWorkingCopy();
	$supports_staging = $repository->supportsStaging();
	$supports_automation = $repository->supportsAutomation();

	$crumbs = $this->buildApplicationCrumbs($is_main = true);

	$title = pht('Edit %s', $repository->getName());

	$header = id(new PHUIHeaderView())
	->setHeader($title);
	if ($repository->isTracked()) {
	$header->setStatus('fa-check', 'bluegrey', pht('Active'));
	} else {
	$header->setStatus('fa-ban', 'dark', pht('Inactive'));
	}

	$basic_actions = $this->buildBasicActions($repository);
	$basic_properties =
	$this->buildBasicProperties($repository, $basic_actions);

	$policy_actions = $this->buildPolicyActions($repository);
	$policy_properties =
	$this->buildPolicyProperties($repository, $policy_actions);

	$remote_properties = null;
	if (!$repository->isHosted()) {
	$remote_properties = $this->buildRemoteProperties(
	$repository,
	$this->buildRemoteActions($repository));
	}

	$encoding_actions = $this->buildEncodingActions($repository);
	$encoding_properties =
	$this->buildEncodingProperties($repository, $encoding_actions);

	$symbols_actions = $this->buildSymbolsActions($repository);
	$symbols_properties =
	$this->buildSymbolsProperties($repository, $symbols_actions);

	$hosting_properties = $this->buildHostingProperties(
	$repository,
	$this->buildHostingActions($repository));


	$branches_properties = null;
	if ($has_branches) {
	$branches_properties = $this->buildBranchesProperties(
	$repository,
	$this->buildBranchesActions($repository));
	}

	$subversion_properties = null;
	if ($is_svn) {
	$subversion_properties = $this->buildSubversionProperties(
	$repository,
	$this->buildSubversionActions($repository));
	}

	$storage_properties = null;
	if ($has_local) {
	$storage_properties = $this->buildStorageProperties(
	$repository,
	$this->buildStorageActions($repository));
	}

	$staging_properties = null;
	if ($supports_staging) {
	$staging_properties = $this->buildStagingProperties(
	$repository,
	$this->buildStagingActions($repository));
	}

	$automation_properties = null;
	if ($supports_automation) {
	$automation_properties = $this->buildAutomationProperties(
	$repository,
	$this->buildAutomationActions($repository));
	}

	$actions_properties = $this->buildActionsProperties(
	$repository,
	$this->buildActionsActions($repository));

	$timeline = $this->buildTransactionTimeline(
	$repository,
	new PhabricatorRepositoryTransactionQuery());
	$timeline->setShouldTerminate(true);

	$boxes = array();

	$boxes[] = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($basic_properties);

	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Policies'))
	->addPropertyList($policy_properties);

	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Hosting'))
	->addPropertyList($hosting_properties);

	if ($repository->canMirror()) {
	$mirror_actions = $this->buildMirrorActions($repository);
	$mirror_properties = $this->buildMirrorProperties(
	$repository,
	$mirror_actions);

	$mirrors = id(new PhabricatorRepositoryMirrorQuery())
	->setViewer($viewer)
	->withRepositoryPHIDs(array($repository->getPHID()))
	->execute();

	$mirror_list = $this->buildMirrorList($repository, $mirrors);

	$boxes[] = id(new PhabricatorAnchorView())->setAnchorName('mirrors');

	$mirror_info = array();
	if (PhabricatorEnv::getEnvConfig('phabricator.silent')) {
	$mirror_info[] = pht(
	'Phabricator is running in silent mode, so changes will not '.
	'be pushed to mirrors.');
	}

	$boxes[] = id(new PHUIObjectBoxView())
	->setFormErrors($mirror_info)
	->setHeaderText(pht('Mirrors'))
	->addPropertyList($mirror_properties);

	$boxes[] = $mirror_list;
	}

	if ($remote_properties) {
	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Remote'))
	->addPropertyList($remote_properties);
	}

	if ($storage_properties) {
	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Storage'))
	->addPropertyList($storage_properties);
	}

	if ($staging_properties) {
	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Staging'))
	->addPropertyList($staging_properties);
	}

	if ($automation_properties) {
	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Automation'))
	->addPropertyList($automation_properties);
	}

	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Text Encoding'))
	->addPropertyList($encoding_properties);

	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Symbols'))
	->addPropertyList($symbols_properties);

	if ($branches_properties) {
	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Branches'))
	->addPropertyList($branches_properties);
	}

	if ($subversion_properties) {
	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Subversion'))
	->addPropertyList($subversion_properties);
	}

	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Actions'))
	->addPropertyList($actions_properties);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$boxes,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	private function buildBasicActions(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Basic Information'))
	->setHref($this->getRepositoryControllerURI($repository, 'edit/basic/'));
	$view->addAction($edit);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-refresh')
	->setName(pht('Update Now'))
	->setWorkflow(true)
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/update/'));
	$view->addAction($edit);

	$activate = id(new PhabricatorActionView())
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/activate/'))
	->setWorkflow(true);

	if ($repository->isTracked()) {
	$activate
	->setIcon('fa-pause')
	->setName(pht('Deactivate Repository'));
	} else {
	$activate
	->setIcon('fa-play')
	->setName(pht('Activate Repository'));
	}

	$view->addAction($activate);

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Delete Repository'))
	->setIcon('fa-times')
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/delete/'))
	->setDisabled(true)
	->setWorkflow(true));

	return $view;
	}

	private function buildBasicProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($repository)
	->setActionList($actions);

	$type = PhabricatorRepositoryType::getNameForRepositoryType(
	$repository->getVersionControlSystem());

	$view->addProperty(pht('Type'), $type);
	$view->addProperty(pht('Callsign'), $repository->getCallsign());

	$clone_name = $repository->getDetail('clone-name');

	if ($repository->isHosted()) {
	$view->addProperty(
	pht('Clone/Checkout As'),
	$clone_name
	? $clone_name.'/'
	: phutil_tag('em', array(), $repository->getCloneName().'/'));
	}

	$view->invokeWillRenderEvent();

	$view->addProperty(
	pht('Status'),
	$this->buildRepositoryStatus($repository));

	$view->addProperty(
	pht('Update Frequency'),
	$this->buildRepositoryUpdateInterval($repository));

	$description = $repository->getDetail('description');
	$view->addSectionHeader(
	pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
	if (!strlen($description)) {
	$description = phutil_tag('em', array(), pht('No description provided.'));
	} else {
	$description = PhabricatorMarkupEngine::renderOneObject(
	$repository,
	'description',
	$viewer);
	}
	$view->addTextContent($description);

	return $view;
	}

	private function buildEncodingActions(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Text Encoding'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/encoding/'));
	$view->addAction($edit);

	return $view;
	}

	private function buildEncodingProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$encoding = $repository->getDetail('encoding');
	if (!$encoding) {
	$encoding = phutil_tag('em', array(), pht('Use Default (UTF-8)'));
	}

	$view->addProperty(pht('Encoding'), $encoding);

	return $view;
	}

	private function buildPolicyActions(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Policies'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/policy/'));
	$view->addAction($edit);

	return $view;
	}

	private function buildPolicyProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$repository);

	$view_parts = array();
	if (PhabricatorSpacesNamespaceQuery::getViewerSpacesExist($viewer)) {
	$space_phid = PhabricatorSpacesNamespaceQuery::getObjectSpacePHID(
	$repository);
	$view_parts[] = $viewer->renderHandle($space_phid);
	}
	$view_parts[] = $descriptions[PhabricatorPolicyCapability::CAN_VIEW];

	$view->addProperty(
	pht('Visible To'),
	phutil_implode_html(" \xC2\xB7 ", $view_parts));

	$view->addProperty(
	pht('Editable By'),
	$descriptions[PhabricatorPolicyCapability::CAN_EDIT]);

	$pushable = $repository->isHosted()
	? $descriptions[DiffusionPushCapability::CAPABILITY]
	: phutil_tag('em', array(), pht('Not a Hosted Repository'));
	$view->addProperty(pht('Pushable By'), $pushable);

	return $view;
	}

	private function buildBranchesActions(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Branches'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/branches/'));
	$view->addAction($edit);

	return $view;
	}

	private function buildBranchesProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$default_branch = nonempty(
	$repository->getHumanReadableDetail('default-branch'),
	phutil_tag('em', array(), $repository->getDefaultBranch()));
	$view->addProperty(pht('Default Branch'), $default_branch);

	$track_only = nonempty(
	$repository->getHumanReadableDetail('branch-filter', array()),
	phutil_tag('em', array(), pht('Track All Branches')));
	$view->addProperty(pht('Track Only'), $track_only);

	$autoclose_only = nonempty(
	$repository->getHumanReadableDetail('close-commits-filter', array()),
	phutil_tag('em', array(), pht('Autoclose On All Branches')));

	if ($repository->getDetail('disable-autoclose')) {
	$autoclose_only = phutil_tag('em', array(), pht('Disabled'));
	}

	$view->addProperty(pht('Autoclose Only'), $autoclose_only);

	return $view;
	}

	private function buildSubversionActions(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Subversion Info'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/subversion/'));
	$view->addAction($edit);

	return $view;
	}

	private function buildSubversionProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$svn_uuid = nonempty(
	$repository->getUUID(),
	phutil_tag('em', array(), pht('Not Configured')));
	$view->addProperty(pht('Subversion UUID'), $svn_uuid);

	$svn_subpath = nonempty(
	$repository->getHumanReadableDetail('svn-subpath'),
	phutil_tag('em', array(), pht('Import Entire Repository')));
	$view->addProperty(pht('Import Only'), $svn_subpath);

	return $view;
	}

	private function buildActionsActions(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Actions'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/actions/'));
	$view->addAction($edit);

	return $view;
	}

	private function buildActionsProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$notify = $repository->getDetail('herald-disabled')
	? pht('Off')
	: pht('On');
	$notify = phutil_tag('em', array(), $notify);
	$view->addProperty(pht('Publish/Notify'), $notify);

	$autoclose = $repository->getDetail('disable-autoclose')
	? pht('Off')
	: pht('On');
	$autoclose = phutil_tag('em', array(), $autoclose);
	$view->addProperty(pht('Autoclose'), $autoclose);

	return $view;
	}

	private function buildRemoteActions(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Remote'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/remote/'));
	$view->addAction($edit);

	return $view;
	}

	private function buildRemoteProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$view->addProperty(
	pht('Remote URI'),
	$repository->getHumanReadableDetail('remote-uri'));

	$credential_phid = $repository->getCredentialPHID();
	if ($credential_phid) {
	$view->addProperty(
	pht('Credential'),
	$viewer->renderHandle($credential_phid));
	}

	return $view;
	}

	private function buildStorageActions(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Storage'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/storage/'));
	$view->addAction($edit);

	return $view;
	}

	private function buildStorageProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$service_phid = $repository->getAlmanacServicePHID();
	if ($service_phid) {
	$v_service = $viewer->renderHandle($service_phid);
	} else {
	$v_service = phutil_tag(
	'em',
	array(),
	pht('Local'));
	}

	$view->addProperty(
	pht('Storage Service'),
	$v_service);

	$view->addProperty(
	pht('Storage Path'),
	$repository->getHumanReadableDetail('local-path'));

	return $view;
	}

	private function buildStagingActions(PhabricatorRepository $repository) {
	$viewer = $this->getViewer();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Staging'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/staging/'));
	$view->addAction($edit);

	return $view;
	}

	private function buildStagingProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {
	$viewer = $this->getViewer();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$staging_uri = $repository->getStagingURI();
	if (!$staging_uri) {
	$staging_uri = phutil_tag('em', array(), pht('No Staging Area'));
	}

	$view->addProperty(
	pht('Staging Area'),
	$staging_uri);

	return $view;
	}

	private function buildAutomationActions(PhabricatorRepository $repository) {
	$viewer = $this->getViewer();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Automation'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/automation/'));
	$view->addAction($edit);

	$can_test = $repository->canPerformAutomation();

	$test = id(new PhabricatorActionView())
	->setIcon('fa-gamepad')
	->setName(pht('Test Configuration'))
	->setWorkflow(true)
	->setDisabled(!$can_test)
	->setHref(
	$this->getRepositoryControllerURI(
	$repository,
	'edit/testautomation/'));
	$view->addAction($test);

	return $view;
	}

	private function buildAutomationProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {
	$viewer = $this->getViewer();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$blueprint_phids = $repository->getAutomationBlueprintPHIDs();
	if (!$blueprint_phids) {
	$blueprint_view = phutil_tag('em', array(), pht('Not Configured'));
	} else {
	$blueprint_view = id(new DrydockObjectAuthorizationView())
	->setUser($viewer)
	->setObjectPHID($repository->getPHID())
	->setBlueprintPHIDs($blueprint_phids);
	}

	$view->addProperty(pht('Automation'), $blueprint_view);

	return $view;
	}

	private function buildHostingActions(PhabricatorRepository $repository) {
	$user = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($user);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Hosting'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/hosting/'));
	$view->addAction($edit);

	if ($repository->canAllowDangerousChanges()) {
	if ($repository->shouldAllowDangerousChanges()) {
	$changes = id(new PhabricatorActionView())
	->setIcon('fa-shield')
	->setName(pht('Prevent Dangerous Changes'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/dangerous/'))
	->setWorkflow(true);
	} else {
	$changes = id(new PhabricatorActionView())
	->setIcon('fa-bullseye')
	->setName(pht('Allow Dangerous Changes'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/dangerous/'))
	->setWorkflow(true);
	}
	$view->addAction($changes);
	}

	return $view;
	}

	private function buildHostingProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$user = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($user)
	->setActionList($actions);

	$hosting = $repository->isHosted()
	? pht('Hosted on Phabricator')
	: pht('Hosted Elsewhere');
	$view->addProperty(pht('Hosting'), phutil_tag('em', array(), $hosting));

	$view->addProperty(
	pht('Serve over HTTP'),
	phutil_tag(
	'em',
	array(),
	PhabricatorRepository::getProtocolAvailabilityName(
	$repository->getServeOverHTTP())));

	$view->addProperty(
	pht('Serve over SSH'),
	phutil_tag(
	'em',
	array(),
	PhabricatorRepository::getProtocolAvailabilityName(
	$repository->getServeOverSSH())));

	if ($repository->canAllowDangerousChanges()) {
	if ($repository->shouldAllowDangerousChanges()) {
	$description = pht('Allowed');
	} else {
	$description = pht('Not Allowed');
	}

	$view->addProperty(
	pht('Dangerous Changes'),
	$description);
	}

	return $view;
	}

	private function buildRepositoryStatus(
	PhabricatorRepository $repository) {

	$viewer = $this->getRequest()->getUser();
	$is_cluster = $repository->getAlmanacServicePHID();

	$view = new PHUIStatusListView();

	$messages = id(new PhabricatorRepositoryStatusMessage())
	->loadAllWhere('repositoryID = %d', $repository->getID());
	$messages = mpull($messages, null, 'getStatusType');

	if ($repository->isTracked()) {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
	->setTarget(pht('Repository Active')));
	} else {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'bluegrey')
	->setTarget(pht('Repository Inactive'))
	->setNote(
	pht('Activate this repository to begin or resume import.')));
	return $view;
	}

	$binaries = array();
	$svnlook_check = false;
	switch ($repository->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$binaries[] = 'git';
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$binaries[] = 'svn';
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$binaries[] = 'hg';
	break;
	}

	if ($repository->isHosted()) {
	if ($repository->getServeOverHTTP() != PhabricatorRepository::SERVE_OFF) {
	switch ($repository->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$binaries[] = 'git-http-backend';
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$binaries[] = 'svnserve';
	$binaries[] = 'svnadmin';
	$binaries[] = 'svnlook';
	$svnlook_check = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$binaries[] = 'hg';
	break;
	}
	}
	if ($repository->getServeOverSSH() != PhabricatorRepository::SERVE_OFF) {
	switch ($repository->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$binaries[] = 'git-receive-pack';
	$binaries[] = 'git-upload-pack';
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$binaries[] = 'svnserve';
	$binaries[] = 'svnadmin';
	$binaries[] = 'svnlook';
	$svnlook_check = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$binaries[] = 'hg';
	break;
	}
	}
	}

	$binaries = array_unique($binaries);
	if (!$is_cluster) {
	// We're only checking for binaries if we aren't running with a cluster
	// configuration. In theory, we could check for binaries on the
	// repository host machine, but we'd need to make this more complicated
	// to do that.

	foreach ($binaries as $binary) {
	$where = Filesystem::resolveBinary($binary);
	if (!$where) {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
	->setTarget(
	pht('Missing Binary %s', phutil_tag('tt', array(), $binary)))
	->setNote(pht(
	"Unable to find this binary in the webserver's PATH. You may ".
	"need to configure %s.",
	$this->getEnvConfigLink())));
	} else {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
	->setTarget(
	pht('Found Binary %s', phutil_tag('tt', array(), $binary)))
	->setNote(phutil_tag('tt', array(), $where)));
	}
	}

	// This gets checked generically above. However, for svn commit hooks, we
	// need this to be in environment.append-paths because subversion strips
	// PATH.
	if ($svnlook_check) {
	$where = Filesystem::resolveBinary('svnlook');
	if ($where) {
	$path = substr($where, 0, strlen($where) - strlen('svnlook'));
	$dirs = PhabricatorEnv::getEnvConfig('environment.append-paths');
	$in_path = false;
	foreach ($dirs as $dir) {
	if (Filesystem::isDescendant($path, $dir)) {
	$in_path = true;
	break;
	}
	}
	if (!$in_path) {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
	->setTarget(
	pht('Missing Binary %s', phutil_tag('tt', array(), $binary)))
	->setNote(pht(
	'Unable to find this binary in `%s`. '.
	'You need to configure %s and include %s.',
	'environment.append-paths',
	$this->getEnvConfigLink(),
	$path)));
	}
	}
	}
	}

	$doc_href = PhabricatorEnv::getDocLink('Managing Daemons with phd');

	$daemon_instructions = pht(
	'Use %s to start daemons. See %s.',
	phutil_tag('tt', array(), 'bin/phd start'),
	phutil_tag(
	'a',
	array(
	'href' => $doc_href,
	),
	pht('Managing Daemons with phd')));


	$pull_daemon = id(new PhabricatorDaemonLogQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withStatus(PhabricatorDaemonLogQuery::STATUS_ALIVE)
	->withDaemonClasses(array('PhabricatorRepositoryPullLocalDaemon'))
	->setLimit(1)
	->execute();

	if ($pull_daemon) {

	// TODO: In a cluster environment, we need a daemon on this repository's
	// host, specifically, and we aren't checking for that right now. This
	// is a reasonable proxy for things being more-or-less correctly set up,
	// though.

	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
	->setTarget(pht('Pull Daemon Running')));
	} else {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
	->setTarget(pht('Pull Daemon Not Running'))
	->setNote($daemon_instructions));
	}


	$task_daemon = id(new PhabricatorDaemonLogQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withStatus(PhabricatorDaemonLogQuery::STATUS_ALIVE)
	->withDaemonClasses(array('PhabricatorTaskmasterDaemon'))
	->setLimit(1)
	->execute();
	if ($task_daemon) {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
	->setTarget(pht('Task Daemon Running')));
	} else {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
	->setTarget(pht('Task Daemon Not Running'))
	->setNote($daemon_instructions));
	}


	if ($is_cluster) {
	// Just omit this status check for now in cluster environments. We
	// could make a service call and pull it from the repository host
	// eventually.
	} else if ($repository->usesLocalWorkingCopy()) {
	$local_parent = dirname($repository->getLocalPath());
	if (Filesystem::pathExists($local_parent)) {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
	->setTarget(pht('Storage Directory OK'))
	->setNote(phutil_tag('tt', array(), $local_parent)));
	} else {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
	->setTarget(pht('No Storage Directory'))
	->setNote(
	pht(
	'Storage directory %s does not exist, or is not readable by '.
	'the webserver. Create this directory or make it readable.',
	phutil_tag('tt', array(), $local_parent))));
	return $view;
	}

	$local_path = $repository->getLocalPath();
	$message = idx($messages, PhabricatorRepositoryStatusMessage::TYPE_INIT);
	if ($message) {
	switch ($message->getStatusCode()) {
	case PhabricatorRepositoryStatusMessage::CODE_ERROR:
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
	->setTarget(pht('Initialization Error'))
	->setNote($message->getParameter('message')));
	return $view;
	case PhabricatorRepositoryStatusMessage::CODE_OKAY:
	if (Filesystem::pathExists($local_path)) {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
	->setTarget(pht('Working Copy OK'))
	->setNote(phutil_tag('tt', array(), $local_path)));
	} else {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
	->setTarget(pht('Working Copy Error'))
	->setNote(
	pht(
	'Working copy %s has been deleted, or is not '.
	'readable by the webserver. Make this directory '.
	'readable. If it has been deleted, the daemons should '.
	'restore it automatically.',
	phutil_tag('tt', array(), $local_path))));
	return $view;
	}
	break;
	case PhabricatorRepositoryStatusMessage::CODE_WORKING:
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_CLOCK, 'green')
	->setTarget(pht('Initializing Working Copy'))
	->setNote(pht('Daemons are initializing the working copy.')));
	return $view;
	default:
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
	->setTarget(pht('Unknown Init Status'))
	->setNote($message->getStatusCode()));
	return $view;
	}
	} else {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_CLOCK, 'orange')
	->setTarget(pht('No Working Copy Yet'))
	->setNote(
	pht('Waiting for daemons to build a working copy.')));
	return $view;
	}
	}

	$message = idx($messages, PhabricatorRepositoryStatusMessage::TYPE_FETCH);
	if ($message) {
	switch ($message->getStatusCode()) {
	case PhabricatorRepositoryStatusMessage::CODE_ERROR:
	$message = $message->getParameter('message');

	$suggestion = null;
	if (preg_match('/Permission denied $publickey$./', $message)) {
	$suggestion = pht(
	'Public Key Error: This error usually indicates that the '.
	'keypair you have configured does not have permission to '.
	'access the repository.');
	}

	$message = phutil_escape_html_newlines($message);

	if ($suggestion !== null) {
	$message = array(
	phutil_tag('strong', array(), $suggestion),
	phutil_tag('br'),
	phutil_tag('br'),
	phutil_tag('em', array(), pht('Raw Error')),
	phutil_tag('br'),
	$message,
	);
	}

	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
	->setTarget(pht('Update Error'))
	->setNote($message));
	return $view;
	case PhabricatorRepositoryStatusMessage::CODE_OKAY:
	$ago = (PhabricatorTime::getNow() - $message->getEpoch());
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
	->setTarget(pht('Updates OK'))
	->setNote(
	pht(
	'Last updated %s (%s ago).',
	phabricator_datetime($message->getEpoch(), $viewer),
	phutil_format_relative_time_detailed($ago))));
	break;
	}
	} else {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_CLOCK, 'orange')
	->setTarget(pht('Waiting For Update'))
	->setNote(
	pht('Waiting for daemons to read updates.')));
	}

	if ($repository->isImporting()) {
	$progress = queryfx_all(
	$repository->establishConnection('r'),
	'SELECT importStatus, count(*) N FROM %T WHERE repositoryID = %d
	GROUP BY importStatus',
	id(new PhabricatorRepositoryCommit())->getTableName(),
	$repository->getID());

	$done = 0;
	$total = 0;
	foreach ($progress as $row) {
	$total += $row['N'] * 4;
	$status = $row['importStatus'];
	if ($status & PhabricatorRepositoryCommit::IMPORTED_MESSAGE) {
	$done += $row['N'];
	}
	if ($status & PhabricatorRepositoryCommit::IMPORTED_CHANGE) {
	$done += $row['N'];
	}
	if ($status & PhabricatorRepositoryCommit::IMPORTED_OWNERS) {
	$done += $row['N'];
	}
	if ($status & PhabricatorRepositoryCommit::IMPORTED_HERALD) {
	$done += $row['N'];
	}
	}

	if ($total) {
	$percentage = 100 * ($done / $total);
	} else {
	$percentage = 0;
	}

	// Cap this at "99.99%", because it's confusing to users when the actual
	// fraction is "99.996%" and it rounds up to "100.00%".
	if ($percentage > 99.99) {
	$percentage = 99.99;
	}

	$percentage = sprintf('%.2f%%', $percentage);

	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_CLOCK, 'green')
	->setTarget(pht('Importing'))
	->setNote(
	pht('%s Complete', $percentage)));
	} else {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
	->setTarget(pht('Fully Imported')));
	}

	if (idx($messages, PhabricatorRepositoryStatusMessage::TYPE_NEEDS_UPDATE)) {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_UP, 'indigo')
	->setTarget(pht('Prioritized'))
	->setNote(pht('This repository will be updated soon!')));
	}

	return $view;
	}

	private function buildRepositoryUpdateInterval(
	PhabricatorRepository $repository) {

	$smart_wait = $repository->loadUpdateInterval();

	$doc_href = PhabricatorEnv::getDoclink(
	'Diffusion User Guide: Repository Updates');

	return array(
	phutil_format_relative_time_detailed($smart_wait),
	" \xC2\xB7 ",
	phutil_tag(
	'a',
	array(
	'href' => $doc_href,
	'target' => '_blank',
	),
	pht('Learn More')),
	);
	}


	private function buildMirrorActions(
	PhabricatorRepository $repository) {

	$viewer = $this->getRequest()->getUser();

	$mirror_actions = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$new_mirror_uri = $this->getRepositoryControllerURI(
	$repository,
	'mirror/edit/');

	$mirror_actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Add Mirror'))
	->setIcon('fa-plus')
	->setHref($new_mirror_uri)
	->setWorkflow(true));

	return $mirror_actions;
	}

	private function buildMirrorProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$mirror_properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$mirror_properties->addProperty(
	'',
	phutil_tag(
	'em',
	array(),
	pht('Automatically push changes into other remotes.')));

	return $mirror_properties;
	}

	private function buildMirrorList(
	PhabricatorRepository $repository,
	array $mirrors) {
	assert_instances_of($mirrors, 'PhabricatorRepositoryMirror');

	$mirror_list = id(new PHUIObjectItemListView())
	->setNoDataString(pht('This repository has no configured mirrors.'));

	foreach ($mirrors as $mirror) {
	$item = id(new PHUIObjectItemView())
	->setHeader($mirror->getRemoteURI());

	$edit_uri = $this->getRepositoryControllerURI(
	$repository,
	'mirror/edit/'.$mirror->getID().'/');

	$delete_uri = $this->getRepositoryControllerURI(
	$repository,
	'mirror/delete/'.$mirror->getID().'/');

	$item->addAction(
	id(new PHUIListItemView())
	->setIcon('fa-pencil')
	->setHref($edit_uri)
	->setWorkflow(true));

	$item->addAction(
	id(new PHUIListItemView())
	->setIcon('fa-times')
	->setHref($delete_uri)
	->setWorkflow(true));

	$mirror_list->addItem($item);
	}

	return $mirror_list;
	}

	private function buildSymbolsActions(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Symbols'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/symbol/'));
	$view->addAction($edit);

	return $view;
	}

	private function buildSymbolsProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$languages = $repository->getSymbolLanguages();

	if ($languages) {
	$languages = implode(', ', $languages);
	} else {
	$languages = phutil_tag('em', array(), pht('Any'));
	}
	$view->addProperty(pht('Languages'), $languages);

	$sources = $repository->getSymbolSources();
	if ($sources) {
	$handles = $viewer->loadHandles($sources);
	$sources = $handles->renderList();
	} else {
	$sources = phutil_tag('em', array(), pht('This Repository Only'));
	}
	$view->addProperty(pht('Use Symbols From'), $sources);
	return $view;
	}

	private function getEnvConfigLink() {
	$config_href = '/config/edit/environment.append-paths/';
	return phutil_tag(
	'a',
	array(
	'href' => $config_href,
	),
	'environment.append-paths');
	}

	}
	diff --git a/src/applications/diviner/controller/DivinerBookController.php b/src/applications/diviner/controller/DivinerBookController.php
	index 38e6cc3767..ebaf559775 100644
	--- a/src/applications/diviner/controller/DivinerBookController.php
	+++ b/src/applications/diviner/controller/DivinerBookController.php
	@@ -1,141 +1,140 @@
	<?php

	final class DivinerBookController extends DivinerController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();

	$book_name = $request->getURIData('book');

	$book = id(new DivinerBookQuery())
	->setViewer($viewer)
	->withNames(array($book_name))
	->needRepositories(true)
	->executeOne();

	if (!$book) {
	return new Aphront404Response();
	}

	$actions = $this->buildActionView($viewer, $book);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->setBorder(true);
	$crumbs->addTextCrumb(
	$book->getShortTitle(),
	'/book/'.$book->getName().'/');

	$action_button = id(new PHUIButtonView())
	->setTag('a')
	->setText(pht('Actions'))
	->setHref('#')
	->setIconFont('fa-bars')
	->addClass('phui-mobile-menu')
	->setDropdownMenu($actions);

	$header = id(new PHUIHeaderView())
	->setHeader($book->getTitle())
	->setUser($viewer)
	->setPolicyObject($book)
	->setEpoch($book->getDateModified())
	->addActionLink($action_button);

	// TODO: This could probably look better.
	if ($book->getRepositoryPHID()) {
	$header->addTag(
	id(new PHUITagView())
	->setType(PHUITagView::TYPE_STATE)
	->setBackgroundColor(PHUITagView::COLOR_BLUE)
	->setName($book->getRepository()->getMonogram()));
	}

	$document = new PHUIDocumentViewPro();
	$document->setHeader($header);
	$document->addClass('diviner-view');

	$atoms = id(new DivinerAtomQuery())
	->setViewer($viewer)
	->withBookPHIDs(array($book->getPHID()))
	->withGhosts(false)
	->withIsDocumentable(true)
	->execute();

	$atoms = msort($atoms, 'getSortKey');

	$group_spec = $book->getConfig('groups');
	if (!is_array($group_spec)) {
	$group_spec = array();
	}

	$groups = mgroup($atoms, 'getGroupName');
	$groups = array_select_keys($groups, array_keys($group_spec)) + $groups;
	if (isset($groups[''])) {
	$no_group = $groups[''];
	unset($groups['']);
	$groups[''] = $no_group;
	}

	$out = array();
	foreach ($groups as $group => $atoms) {
	$group_name = $book->getGroupName($group);
	if (!strlen($group_name)) {
	$group_name = pht('Free Radicals');
	}
	$section = id(new DivinerSectionView())
	->setHeader($group_name);
	$section->addContent($this->renderAtomList($atoms));
	$out[] = $section;
	}

	$preface = $book->getPreface();
	$preface_view = null;
	if (strlen($preface)) {
	$preface_view =
	PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())->setContent($preface),
	'default',
	$viewer);
	}

	$document->appendChild($preface_view);
	$document->appendChild($out);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$document,
	),
	array(
	'title' => $book->getTitle(),
	));
	}

	private function buildActionView(
	PhabricatorUser $user,
	DivinerLiveBook $book) {

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$user,
	$book,
	PhabricatorPolicyCapability::CAN_EDIT);

	$action_view = id(new PhabricatorActionListView())
	->setUser($user)
	- ->setObject($book)
	- ->setObjectURI($this->getRequest()->getRequestURI());
	+ ->setObject($book);

	$action_view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Book'))
	->setIcon('fa-pencil')
	->setHref('/book/'.$book->getName().'/edit/')
	->setDisabled(!$can_edit));

	return $action_view;
	}

	}
	diff --git a/src/applications/drydock/controller/DrydockAuthorizationViewController.php b/src/applications/drydock/controller/DrydockAuthorizationViewController.php
	index 3609b95f9f..bc34154e4f 100644
	--- a/src/applications/drydock/controller/DrydockAuthorizationViewController.php
	+++ b/src/applications/drydock/controller/DrydockAuthorizationViewController.php
	@@ -1,131 +1,130 @@
	<?php

	final class DrydockAuthorizationViewController
	extends DrydockController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$authorization = id(new DrydockAuthorizationQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$authorization) {
	return new Aphront404Response();
	}

	$id = $authorization->getID();
	$title = pht('Authorization %d', $id);

	$blueprint = $authorization->getBlueprint();
	$blueprint_id = $blueprint->getID();

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($viewer)
	->setPolicyObject($authorization);


	$state = $authorization->getBlueprintAuthorizationState();
	$icon = DrydockAuthorization::getBlueprintStateIcon($state);
	$name = DrydockAuthorization::getBlueprintStateName($state);

	$header->setStatus($icon, null, $name);

	$actions = $this->buildActionListView($authorization);
	$properties = $this->buildPropertyListView($authorization);
	$properties->setActionList($actions);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(
	pht('Blueprints'),
	$this->getApplicationURI('blueprint/'));
	$crumbs->addTextCrumb(
	$blueprint->getBlueprintName(),
	$this->getApplicationURI("blueprint/{$blueprint_id}/"));
	$crumbs->addTextCrumb($title);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	),
	array(
	'title' => $title,
	));

	}

	private function buildActionListView(DrydockAuthorization $authorization) {
	$viewer = $this->getViewer();
	$id = $authorization->getID();

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($authorization);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$authorization,
	PhabricatorPolicyCapability::CAN_EDIT);

	$authorize_uri = $this->getApplicationURI("authorization/{$id}/authorize/");
	$decline_uri = $this->getApplicationURI("authorization/{$id}/decline/");

	$state_authorized = DrydockAuthorization::BLUEPRINTAUTH_AUTHORIZED;
	$state_declined = DrydockAuthorization::BLUEPRINTAUTH_DECLINED;

	$state = $authorization->getBlueprintAuthorizationState();
	$can_authorize = $can_edit && ($state != $state_authorized);
	$can_decline = $can_edit && ($state != $state_declined);

	$view->addAction(
	id(new PhabricatorActionView())
	->setHref($authorize_uri)
	->setName(pht('Approve Authorization'))
	->setIcon('fa-check')
	->setWorkflow(true)
	->setDisabled(!$can_authorize));

	$view->addAction(
	id(new PhabricatorActionView())
	->setHref($decline_uri)
	->setName(pht('Decline Authorization'))
	->setIcon('fa-times')
	->setWorkflow(true)
	->setDisabled(!$can_decline));

	return $view;
	}

	private function buildPropertyListView(DrydockAuthorization $authorization) {
	$viewer = $this->getViewer();

	$object_phid = $authorization->getObjectPHID();
	$handles = $viewer->loadHandles(array($object_phid));
	$handle = $handles[$object_phid];

	$view = new PHUIPropertyListView();

	$view->addProperty(
	pht('Authorized Object'),
	$handle->renderLink($handle->getFullName()));

	$view->addProperty(pht('Object Type'), $handle->getTypeName());

	$object_state = $authorization->getObjectAuthorizationState();

	$view->addProperty(
	pht('Authorization State'),
	DrydockAuthorization::getObjectStateName($object_state));

	return $view;
	}

	}
	diff --git a/src/applications/drydock/controller/DrydockBlueprintViewController.php b/src/applications/drydock/controller/DrydockBlueprintViewController.php
	index f90dcb9d82..2566c69840 100644
	--- a/src/applications/drydock/controller/DrydockBlueprintViewController.php
	+++ b/src/applications/drydock/controller/DrydockBlueprintViewController.php
	@@ -1,247 +1,246 @@
	<?php

	final class DrydockBlueprintViewController extends DrydockBlueprintController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$blueprint = id(new DrydockBlueprintQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$blueprint) {
	return new Aphront404Response();
	}

	$title = $blueprint->getBlueprintName();

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($viewer)
	->setPolicyObject($blueprint);

	if ($blueprint->getIsDisabled()) {
	$header->setStatus('fa-ban', 'red', pht('Disabled'));
	} else {
	$header->setStatus('fa-check', 'bluegrey', pht('Active'));
	}

	$actions = $this->buildActionListView($blueprint);
	$properties = $this->buildPropertyListView($blueprint, $actions);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Blueprint %d', $blueprint->getID()));

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$field_list = PhabricatorCustomField::getObjectFields(
	$blueprint,
	PhabricatorCustomField::ROLE_VIEW);
	$field_list
	->setViewer($viewer)
	->readFieldsFromStorage($blueprint);

	$field_list->appendFieldsToPropertyList(
	$blueprint,
	$viewer,
	$properties);

	$resource_box = $this->buildResourceBox($blueprint);

	$authorizations_box = $this->buildAuthorizationsBox($blueprint);

	$timeline = $this->buildTransactionTimeline(
	$blueprint,
	new DrydockBlueprintTransactionQuery());
	$timeline->setShouldTerminate(true);

	$log_query = id(new DrydockLogQuery())
	->withBlueprintPHIDs(array($blueprint->getPHID()));

	$log_box = $this->buildLogBox(
	$log_query,
	$this->getApplicationURI("blueprint/{$id}/logs/query/all/"));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$resource_box,
	$authorizations_box,
	$log_box,
	$timeline,
	),
	array(
	'title' => $title,
	));

	}

	private function buildActionListView(DrydockBlueprint $blueprint) {
	$viewer = $this->getViewer();
	$id = $blueprint->getID();

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($blueprint);

	$edit_uri = $this->getApplicationURI("blueprint/edit/{$id}/");

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$blueprint,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view->addAction(
	id(new PhabricatorActionView())
	->setHref($edit_uri)
	->setName(pht('Edit Blueprint'))
	->setIcon('fa-pencil')
	->setWorkflow(!$can_edit)
	->setDisabled(!$can_edit));

	if (!$blueprint->getIsDisabled()) {
	$disable_name = pht('Disable Blueprint');
	$disable_icon = 'fa-ban';
	$disable_uri = $this->getApplicationURI("blueprint/{$id}/disable/");
	} else {
	$disable_name = pht('Enable Blueprint');
	$disable_icon = 'fa-check';
	$disable_uri = $this->getApplicationURI("blueprint/{$id}/enable/");
	}

	$view->addAction(
	id(new PhabricatorActionView())
	->setHref($disable_uri)
	->setName($disable_name)
	->setIcon($disable_icon)
	->setWorkflow(true)
	->setDisabled(!$can_edit));

	return $view;
	}

	private function buildPropertyListView(
	DrydockBlueprint $blueprint,
	PhabricatorActionListView $actions) {

	$view = new PHUIPropertyListView();
	$view->setActionList($actions);

	$view->addProperty(
	pht('Type'),
	$blueprint->getImplementation()->getBlueprintName());

	return $view;
	}

	private function buildResourceBox(DrydockBlueprint $blueprint) {
	$viewer = $this->getViewer();

	$resources = id(new DrydockResourceQuery())
	->setViewer($viewer)
	->withBlueprintPHIDs(array($blueprint->getPHID()))
	->withStatuses(
	array(
	DrydockResourceStatus::STATUS_PENDING,
	DrydockResourceStatus::STATUS_ACTIVE,
	))
	->setLimit(100)
	->execute();

	$resource_list = id(new DrydockResourceListView())
	->setUser($viewer)
	->setResources($resources)
	->render()
	->setNoDataString(pht('This blueprint has no active resources.'));

	$id = $blueprint->getID();
	$resources_uri = "blueprint/{$id}/resources/query/all/";
	$resources_uri = $this->getApplicationURI($resources_uri);

	$resource_header = id(new PHUIHeaderView())
	->setHeader(pht('Active Resources'))
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	->setHref($resources_uri)
	->setIconFont('fa-search')
	->setText(pht('View All')));

	return id(new PHUIObjectBoxView())
	->setHeader($resource_header)
	->setObjectList($resource_list);
	}

	private function buildAuthorizationsBox(DrydockBlueprint $blueprint) {
	$viewer = $this->getViewer();

	$limit = 25;

	// If there are pending authorizations against this blueprint, make sure
	// we show them first.

	$pending_authorizations = id(new DrydockAuthorizationQuery())
	->setViewer($viewer)
	->withBlueprintPHIDs(array($blueprint->getPHID()))
	->withObjectStates(
	array(
	DrydockAuthorization::OBJECTAUTH_ACTIVE,
	))
	->withBlueprintStates(
	array(
	DrydockAuthorization::BLUEPRINTAUTH_REQUESTED,
	))
	->setLimit($limit)
	->execute();

	$all_authorizations = id(new DrydockAuthorizationQuery())
	->setViewer($viewer)
	->withBlueprintPHIDs(array($blueprint->getPHID()))
	->withObjectStates(
	array(
	DrydockAuthorization::OBJECTAUTH_ACTIVE,
	))
	->withBlueprintStates(
	array(
	DrydockAuthorization::BLUEPRINTAUTH_REQUESTED,
	DrydockAuthorization::BLUEPRINTAUTH_AUTHORIZED,
	))
	->setLimit($limit)
	->execute();

	$authorizations =
	mpull($pending_authorizations, null, 'getPHID') +
	mpull($all_authorizations, null, 'getPHID');

	$authorization_list = id(new DrydockAuthorizationListView())
	->setUser($viewer)
	->setAuthorizations($authorizations)
	->setNoDataString(
	pht('No objects have active authorizations to use this blueprint.'));

	$id = $blueprint->getID();
	$authorizations_uri = "blueprint/{$id}/authorizations/query/all/";
	$authorizations_uri = $this->getApplicationURI($authorizations_uri);

	$authorizations_header = id(new PHUIHeaderView())
	->setHeader(pht('Active Authorizations'))
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	->setHref($authorizations_uri)
	->setIconFont('fa-search')
	->setText(pht('View All')));

	return id(new PHUIObjectBoxView())
	->setHeader($authorizations_header)
	->setObjectList($authorization_list);

	}


	}
	diff --git a/src/applications/drydock/controller/DrydockLeaseViewController.php b/src/applications/drydock/controller/DrydockLeaseViewController.php
	index 0b5eae3e12..088b197a5f 100644
	--- a/src/applications/drydock/controller/DrydockLeaseViewController.php
	+++ b/src/applications/drydock/controller/DrydockLeaseViewController.php
	@@ -1,155 +1,154 @@
	<?php

	final class DrydockLeaseViewController extends DrydockLeaseController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$lease = id(new DrydockLeaseQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needUnconsumedCommands(true)
	->executeOne();
	if (!$lease) {
	return new Aphront404Response();
	}

	$id = $lease->getID();
	$lease_uri = $this->getApplicationURI("lease/{$id}/");

	$title = pht('Lease %d', $lease->getID());

	$header = id(new PHUIHeaderView())
	->setHeader($title);

	if ($lease->isReleasing()) {
	$header->setStatus('fa-exclamation-triangle', 'red', pht('Releasing'));
	}

	$actions = $this->buildActionListView($lease);
	$properties = $this->buildPropertyListView($lease, $actions);

	$log_query = id(new DrydockLogQuery())
	->withLeasePHIDs(array($lease->getPHID()));

	$log_box = $this->buildLogBox(
	$log_query,
	$this->getApplicationURI("lease/{$id}/logs/query/all/"));

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($title, $lease_uri);

	$locks = $this->buildLocksTab($lease->getPHID());
	$commands = $this->buildCommandsTab($lease->getPHID());

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties, pht('Properties'))
	->addPropertyList($locks, pht('Slot Locks'))
	->addPropertyList($commands, pht('Commands'));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$log_box,
	),
	array(
	'title' => $title,
	));

	}

	private function buildActionListView(DrydockLease $lease) {
	$viewer = $this->getViewer();

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($lease);

	$id = $lease->getID();

	$can_release = $lease->canRelease();
	if ($lease->isReleasing()) {
	$can_release = false;
	}

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$lease,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Release Lease'))
	->setIcon('fa-times')
	->setHref($this->getApplicationURI("/lease/{$id}/release/"))
	->setWorkflow(true)
	->setDisabled(!$can_release \|\| !$can_edit));

	return $view;
	}

	private function buildPropertyListView(
	DrydockLease $lease,
	PhabricatorActionListView $actions) {
	$viewer = $this->getViewer();

	$view = new PHUIPropertyListView();
	$view->setActionList($actions);

	$view->addProperty(
	pht('Status'),
	DrydockLeaseStatus::getNameForStatus($lease->getStatus()));

	$view->addProperty(
	pht('Resource Type'),
	$lease->getResourceType());

	$owner_phid = $lease->getOwnerPHID();
	if ($owner_phid) {
	$owner_display = $viewer->renderHandle($owner_phid);
	} else {
	$owner_display = phutil_tag('em', array(), pht('No Owner'));
	}
	$view->addProperty(pht('Owner'), $owner_display);

	$authorizing_phid = $lease->getAuthorizingPHID();
	if ($authorizing_phid) {
	$authorizing_display = $viewer->renderHandle($authorizing_phid);
	} else {
	$authorizing_display = phutil_tag('em', array(), pht('None'));
	}
	$view->addProperty(pht('Authorized By'), $authorizing_display);

	$resource_phid = $lease->getResourcePHID();
	if ($resource_phid) {
	$resource_display = $viewer->renderHandle($resource_phid);
	} else {
	$resource_display = phutil_tag('em', array(), pht('No Resource'));
	}
	$view->addProperty(pht('Resource'), $resource_display);

	$until = $lease->getUntil();
	if ($until) {
	$until_display = phabricator_datetime($until, $viewer);
	} else {
	$until_display = phutil_tag('em', array(), pht('Never'));
	}
	$view->addProperty(pht('Expires'), $until_display);

	$attributes = $lease->getAttributes();
	if ($attributes) {
	$view->addSectionHeader(
	pht('Attributes'), 'fa-list-ul');
	foreach ($attributes as $key => $value) {
	$view->addProperty($key, $value);
	}
	}

	return $view;
	}

	}
	diff --git a/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php b/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php
	index e43ffbd367..1430c326c4 100644
	--- a/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php
	+++ b/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php
	@@ -1,103 +1,102 @@
	<?php

	final class DrydockRepositoryOperationViewController
	extends DrydockController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$operation = id(new DrydockRepositoryOperationQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$operation) {
	return new Aphront404Response();
	}

	$id = $operation->getID();
	$title = pht('Repository Operation %d', $id);

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($viewer)
	->setPolicyObject($operation);

	$state = $operation->getOperationState();
	$icon = DrydockRepositoryOperation::getOperationStateIcon($state);
	$name = DrydockRepositoryOperation::getOperationStateName($state);
	$header->setStatus($icon, null, $name);

	$actions = $this->buildActionListView($operation);
	$properties = $this->buildPropertyListView($operation);
	$properties->setActionList($actions);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(
	pht('Operations'),
	$this->getApplicationURI('operation/'));
	$crumbs->addTextCrumb($title);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$status_view = id(new DrydockRepositoryOperationStatusView())
	->setUser($viewer)
	->setOperation($operation);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$status_view,
	),
	array(
	'title' => $title,
	));

	}

	private function buildActionListView(DrydockRepositoryOperation $operation) {
	$viewer = $this->getViewer();
	$id = $operation->getID();

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($operation);

	return $view;
	}

	private function buildPropertyListView(
	DrydockRepositoryOperation $operation) {

	$viewer = $this->getViewer();

	$view = new PHUIPropertyListView();
	$view->addProperty(
	pht('Repository'),
	$viewer->renderHandle($operation->getRepositoryPHID()));

	$view->addProperty(
	pht('Object'),
	$viewer->renderHandle($operation->getObjectPHID()));

	$lease_phid = $operation->getWorkingCopyLeasePHID();
	if ($lease_phid) {
	$lease_display = $viewer->renderHandle($lease_phid);
	} else {
	$lease_display = phutil_tag('em', array(), pht('None'));
	}

	$view->addProperty(pht('Working Copy'), $lease_display);

	return $view;
	}

	}
	diff --git a/src/applications/drydock/controller/DrydockResourceViewController.php b/src/applications/drydock/controller/DrydockResourceViewController.php
	index 71e4a09db1..d392796f57 100644
	--- a/src/applications/drydock/controller/DrydockResourceViewController.php
	+++ b/src/applications/drydock/controller/DrydockResourceViewController.php
	@@ -1,186 +1,185 @@
	<?php

	final class DrydockResourceViewController extends DrydockResourceController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$resource = id(new DrydockResourceQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needUnconsumedCommands(true)
	->executeOne();
	if (!$resource) {
	return new Aphront404Response();
	}

	$title = pht(
	'Resource %s %s',
	$resource->getID(),
	$resource->getResourceName());

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setPolicyObject($resource)
	->setHeader($title);

	if ($resource->isReleasing()) {
	$header->setStatus('fa-exclamation-triangle', 'red', pht('Releasing'));
	}

	$actions = $this->buildActionListView($resource);
	$properties = $this->buildPropertyListView($resource, $actions);

	$id = $resource->getID();
	$resource_uri = $this->getApplicationURI("resource/{$id}/");

	$log_query = id(new DrydockLogQuery())
	->withResourcePHIDs(array($resource->getPHID()));

	$log_box = $this->buildLogBox(
	$log_query,
	$this->getApplicationURI("resource/{$id}/logs/query/all/"));

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Resource %d', $resource->getID()));

	$locks = $this->buildLocksTab($resource->getPHID());
	$commands = $this->buildCommandsTab($resource->getPHID());

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties, pht('Properties'))
	->addPropertyList($locks, pht('Slot Locks'))
	->addPropertyList($commands, pht('Commands'));

	$lease_box = $this->buildLeaseBox($resource);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$lease_box,
	$log_box,
	),
	array(
	'title' => $title,
	));

	}

	private function buildActionListView(DrydockResource $resource) {
	$viewer = $this->getViewer();

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($resource);

	$can_release = $resource->canRelease();
	if ($resource->isReleasing()) {
	$can_release = false;
	}

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$resource,
	PhabricatorPolicyCapability::CAN_EDIT);

	$uri = '/resource/'.$resource->getID().'/release/';
	$uri = $this->getApplicationURI($uri);

	$view->addAction(
	id(new PhabricatorActionView())
	->setHref($uri)
	->setName(pht('Release Resource'))
	->setIcon('fa-times')
	->setWorkflow(true)
	->setDisabled(!$can_release \|\| !$can_edit));

	return $view;
	}

	private function buildPropertyListView(
	DrydockResource $resource,
	PhabricatorActionListView $actions) {
	$viewer = $this->getViewer();

	$view = id(new PHUIPropertyListView())
	->setActionList($actions);

	$status = $resource->getStatus();
	$status = DrydockResourceStatus::getNameForStatus($status);

	$view->addProperty(
	pht('Status'),
	$status);

	$until = $resource->getUntil();
	if ($until) {
	$until_display = phabricator_datetime($until, $viewer);
	} else {
	$until_display = phutil_tag('em', array(), pht('Never'));
	}
	$view->addProperty(pht('Expires'), $until_display);

	$view->addProperty(
	pht('Resource Type'),
	$resource->getType());

	$view->addProperty(
	pht('Blueprint'),
	$viewer->renderHandle($resource->getBlueprintPHID()));

	$attributes = $resource->getAttributes();
	if ($attributes) {
	$view->addSectionHeader(
	pht('Attributes'), 'fa-list-ul');
	foreach ($attributes as $key => $value) {
	$view->addProperty($key, $value);
	}
	}

	return $view;
	}

	private function buildLeaseBox(DrydockResource $resource) {
	$viewer = $this->getViewer();

	$leases = id(new DrydockLeaseQuery())
	->setViewer($viewer)
	->withResourcePHIDs(array($resource->getPHID()))
	->withStatuses(
	array(
	DrydockLeaseStatus::STATUS_PENDING,
	DrydockLeaseStatus::STATUS_ACQUIRED,
	DrydockLeaseStatus::STATUS_ACTIVE,
	))
	->setLimit(100)
	->execute();

	$id = $resource->getID();
	$leases_uri = "resource/{$id}/leases/query/all/";
	$leases_uri = $this->getApplicationURI($leases_uri);

	$lease_header = id(new PHUIHeaderView())
	->setHeader(pht('Active Leases'))
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	->setHref($leases_uri)
	->setIconFont('fa-search')
	->setText(pht('View All')));

	$lease_list = id(new DrydockLeaseListView())
	->setUser($viewer)
	->setLeases($leases)
	->render()
	->setNoDataString(pht('This resource has no active leases.'));

	return id(new PHUIObjectBoxView())
	->setHeader($lease_header)
	->setObjectList($lease_list);
	}

	}
	diff --git a/src/applications/files/controller/PhabricatorFileInfoController.php b/src/applications/files/controller/PhabricatorFileInfoController.php
	index d9b5de14ee..2731b7f4bb 100644
	--- a/src/applications/files/controller/PhabricatorFileInfoController.php
	+++ b/src/applications/files/controller/PhabricatorFileInfoController.php
	@@ -1,374 +1,373 @@
	<?php

	final class PhabricatorFileInfoController extends PhabricatorFileController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');
	$phid = $request->getURIData('phid');

	if ($phid) {
	$file = id(new PhabricatorFileQuery())
	->setViewer($viewer)
	->withPHIDs(array($phid))
	->executeOne();

	if (!$file) {
	return new Aphront404Response();
	}
	return id(new AphrontRedirectResponse())->setURI($file->getInfoURI());
	}
	$file = id(new PhabricatorFileQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$file) {
	return new Aphront404Response();
	}

	$phid = $file->getPHID();

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setPolicyObject($file)
	->setHeader($file->getName());

	$ttl = $file->getTTL();
	if ($ttl !== null) {
	$ttl_tag = id(new PHUITagView())
	->setType(PHUITagView::TYPE_STATE)
	->setBackgroundColor(PHUITagView::COLOR_YELLOW)
	->setName(pht('Temporary'));
	$header->addTag($ttl_tag);
	}

	$partial = $file->getIsPartial();
	if ($partial) {
	$partial_tag = id(new PHUITagView())
	->setType(PHUITagView::TYPE_STATE)
	->setBackgroundColor(PHUITagView::COLOR_ORANGE)
	->setName(pht('Partial Upload'));
	$header->addTag($partial_tag);
	}

	$actions = $this->buildActionView($file);
	$timeline = $this->buildTransactionView($file);
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(
	'F'.$file->getID(),
	$this->getApplicationURI("/info/{$phid}/"));

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header);

	$this->buildPropertyViews($object_box, $file, $actions);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$timeline,
	),
	array(
	'title' => $file->getName(),
	'pageObjects' => array($file->getPHID()),
	));
	}

	private function buildTransactionView(PhabricatorFile $file) {
	$viewer = $this->getViewer();

	$timeline = $this->buildTransactionTimeline(
	$file,
	new PhabricatorFileTransactionQuery());

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');

	$add_comment_header = $is_serious
	? pht('Add Comment')
	: pht('Question File Integrity');

	$draft = PhabricatorDraft::newFromUserAndKey($viewer, $file->getPHID());

	$add_comment_form = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($file->getPHID())
	->setDraft($draft)
	->setHeaderText($add_comment_header)
	->setAction($this->getApplicationURI('/comment/'.$file->getID().'/'))
	->setSubmitButtonName(pht('Add Comment'));

	return array(
	$timeline,
	$add_comment_form,
	);
	}

	private function buildActionView(PhabricatorFile $file) {
	$viewer = $this->getViewer();

	$id = $file->getID();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$file,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($file);

	$can_download = !$file->getIsPartial();

	if ($file->isViewableInBrowser()) {
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View File'))
	->setIcon('fa-file-o')
	->setHref($file->getViewURI())
	->setDisabled(!$can_download)
	->setWorkflow(!$can_download));
	} else {
	$view->addAction(
	id(new PhabricatorActionView())
	->setUser($viewer)
	->setRenderAsForm($can_download)
	->setDownload($can_download)
	->setName(pht('Download File'))
	->setIcon('fa-download')
	->setHref($file->getViewURI())
	->setDisabled(!$can_download)
	->setWorkflow(!$can_download));
	}

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit File'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("/edit/{$id}/"))
	->setWorkflow(!$can_edit)
	->setDisabled(!$can_edit));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Delete File'))
	->setIcon('fa-times')
	->setHref($this->getApplicationURI("/delete/{$id}/"))
	->setWorkflow(true)
	->setDisabled(!$can_edit));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View Transforms'))
	->setIcon('fa-crop')
	->setHref($this->getApplicationURI("/transforms/{$id}/")));

	return $view;
	}

	private function buildPropertyViews(
	PHUIObjectBoxView $box,
	PhabricatorFile $file,
	PhabricatorActionListView $actions) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$properties = id(new PHUIPropertyListView());
	$properties->setActionList($actions);
	$box->addPropertyList($properties, pht('Details'));

	if ($file->getAuthorPHID()) {
	$properties->addProperty(
	pht('Author'),
	$viewer->renderHandle($file->getAuthorPHID()));
	}

	$properties->addProperty(
	pht('Created'),
	phabricator_datetime($file->getDateCreated(), $viewer));


	$finfo = id(new PHUIPropertyListView());
	$box->addPropertyList($finfo, pht('File Info'));

	$finfo->addProperty(
	pht('Size'),
	phutil_format_bytes($file->getByteSize()));

	$finfo->addProperty(
	pht('Mime Type'),
	$file->getMimeType());

	$width = $file->getImageWidth();
	if ($width) {
	$finfo->addProperty(
	pht('Width'),
	pht('%s px', new PhutilNumber($width)));
	}

	$height = $file->getImageHeight();
	if ($height) {
	$finfo->addProperty(
	pht('Height'),
	pht('%s px', new PhutilNumber($height)));
	}

	$is_image = $file->isViewableImage();
	if ($is_image) {
	$image_string = pht('Yes');
	$cache_string = $file->getCanCDN() ? pht('Yes') : pht('No');
	} else {
	$image_string = pht('No');
	$cache_string = pht('Not Applicable');
	}

	$finfo->addProperty(pht('Viewable Image'), $image_string);
	$finfo->addProperty(pht('Cacheable'), $cache_string);

	$builtin = $file->getBuiltinName();
	if ($builtin === null) {
	$builtin_string = pht('No');
	} else {
	$builtin_string = $builtin;
	}

	$finfo->addProperty(pht('Builtin'), $builtin_string);

	$is_profile = $file->getIsProfileImage()
	? pht('Yes')
	: pht('No');

	$finfo->addProperty(pht('Profile'), $is_profile);

	$storage_properties = new PHUIPropertyListView();
	$box->addPropertyList($storage_properties, pht('Storage'));

	$storage_properties->addProperty(
	pht('Engine'),
	$file->getStorageEngine());

	$storage_properties->addProperty(
	pht('Format'),
	$file->getStorageFormat());

	$storage_properties->addProperty(
	pht('Handle'),
	$file->getStorageHandle());


	$phids = $file->getObjectPHIDs();
	if ($phids) {
	$attached = new PHUIPropertyListView();
	$box->addPropertyList($attached, pht('Attached'));

	$attached->addProperty(
	pht('Attached To'),
	$viewer->renderHandleList($phids));
	}

	if ($file->isViewableImage()) {
	$image = phutil_tag(
	'img',
	array(
	'src' => $file->getViewURI(),
	'class' => 'phui-property-list-image',
	));

	$linked_image = phutil_tag(
	'a',
	array(
	'href' => $file->getViewURI(),
	),
	$image);

	$media = id(new PHUIPropertyListView())
	->addImageContent($linked_image);

	$box->addPropertyList($media);
	} else if ($file->isAudio()) {
	$audio = phutil_tag(
	'audio',
	array(
	'controls' => 'controls',
	'class' => 'phui-property-list-audio',
	),
	phutil_tag(
	'source',
	array(
	'src' => $file->getViewURI(),
	'type' => $file->getMimeType(),
	)));
	$media = id(new PHUIPropertyListView())
	->addImageContent($audio);

	$box->addPropertyList($media);
	}

	$engine = null;
	try {
	$engine = $file->instantiateStorageEngine();
	} catch (Exception $ex) {
	// Don't bother raising this anywhere for now.
	}

	if ($engine) {
	if ($engine->isChunkEngine()) {
	$chunkinfo = new PHUIPropertyListView();
	$box->addPropertyList($chunkinfo, pht('Chunks'));

	$chunks = id(new PhabricatorFileChunkQuery())
	->setViewer($viewer)
	->withChunkHandles(array($file->getStorageHandle()))
	->execute();
	$chunks = msort($chunks, 'getByteStart');

	$rows = array();
	$completed = array();
	foreach ($chunks as $chunk) {
	$is_complete = $chunk->getDataFilePHID();

	$rows[] = array(
	$chunk->getByteStart(),
	$chunk->getByteEnd(),
	($is_complete ? pht('Yes') : pht('No')),
	);

	if ($is_complete) {
	$completed[] = $chunk;
	}
	}

	$table = id(new AphrontTableView($rows))
	->setHeaders(
	array(
	pht('Offset'),
	pht('End'),
	pht('Complete'),
	))
	->setColumnClasses(
	array(
	'',
	'',
	'wide',
	));

	$chunkinfo->addProperty(
	pht('Total Chunks'),
	count($chunks));

	$chunkinfo->addProperty(
	pht('Completed Chunks'),
	count($completed));

	$chunkinfo->addRawContent($table);
	}
	}

	}

	}
	diff --git a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
	index 363a05776e..d197174175 100644
	--- a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
	+++ b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
	@@ -1,626 +1,625 @@
	<?php

	final class HarbormasterBuildViewController
	extends HarbormasterController {

	public function handleRequest(AphrontRequest $request) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$id = $request->getURIData('id');
	$generation = $request->getInt('g');

	$build = id(new HarbormasterBuildQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$build) {
	return new Aphront404Response();
	}

	require_celerity_resource('harbormaster-css');

	$title = pht('Build %d', $id);

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($viewer)
	->setPolicyObject($build);

	if ($build->isRestarting()) {
	$header->setStatus('fa-exclamation-triangle', 'red', pht('Restarting'));
	} else if ($build->isPausing()) {
	$header->setStatus('fa-exclamation-triangle', 'red', pht('Pausing'));
	} else if ($build->isResuming()) {
	$header->setStatus('fa-exclamation-triangle', 'red', pht('Resuming'));
	} else if ($build->isAborting()) {
	$header->setStatus('fa-exclamation-triangle', 'red', pht('Aborting'));
	}

	$box = id(new PHUIObjectBoxView())
	->setHeader($header);

	$actions = $this->buildActionList($build);
	$this->buildPropertyLists($box, $build, $actions);

	$crumbs = $this->buildApplicationCrumbs();
	$this->addBuildableCrumb($crumbs, $build->getBuildable());
	$crumbs->addTextCrumb($title);

	if ($generation === null \|\| $generation > $build->getBuildGeneration() \|\|
	$generation < 0) {
	$generation = $build->getBuildGeneration();
	}

	$build_targets = id(new HarbormasterBuildTargetQuery())
	->setViewer($viewer)
	->needBuildSteps(true)
	->withBuildPHIDs(array($build->getPHID()))
	->withBuildGenerations(array($generation))
	->execute();

	if ($build_targets) {
	$messages = id(new HarbormasterBuildMessageQuery())
	->setViewer($viewer)
	->withBuildTargetPHIDs(mpull($build_targets, 'getPHID'))
	->execute();
	$messages = mgroup($messages, 'getBuildTargetPHID');
	} else {
	$messages = array();
	}

	if ($build_targets) {
	$artifacts = id(new HarbormasterBuildArtifactQuery())
	->setViewer($viewer)
	->withBuildTargetPHIDs(mpull($build_targets, 'getPHID'))
	->execute();
	$artifacts = msort($artifacts, 'getArtifactKey');
	$artifacts = mgroup($artifacts, 'getBuildTargetPHID');
	} else {
	$artifacts = array();
	}


	$targets = array();
	foreach ($build_targets as $build_target) {
	$header = id(new PHUIHeaderView())
	->setHeader($build_target->getName())
	->setUser($viewer);

	$target_box = id(new PHUIObjectBoxView())
	->setHeader($header);

	$properties = new PHUIPropertyListView();

	$target_artifacts = idx($artifacts, $build_target->getPHID(), array());

	$links = array();
	$type_uri = HarbormasterURIArtifact::ARTIFACTCONST;
	foreach ($target_artifacts as $artifact) {
	if ($artifact->getArtifactType() == $type_uri) {
	$impl = $artifact->getArtifactImplementation();
	if ($impl->isExternalLink()) {
	$links[] = $impl->renderLink();
	}
	}
	}

	if ($links) {
	$links = phutil_implode_html(phutil_tag('br'), $links);
	$properties->addProperty(
	pht('External Link'),
	$links);
	}

	$status_view = new PHUIStatusListView();

	$item = new PHUIStatusItemView();

	$status = $build_target->getTargetStatus();
	$status_name =
	HarbormasterBuildTarget::getBuildTargetStatusName($status);
	$icon = HarbormasterBuildTarget::getBuildTargetStatusIcon($status);
	$color = HarbormasterBuildTarget::getBuildTargetStatusColor($status);

	$item->setTarget($status_name);
	$item->setIcon($icon, $color);
	$status_view->addItem($item);

	$when = array();
	$started = $build_target->getDateStarted();
	$now = PhabricatorTime::getNow();
	if ($started) {
	$ended = $build_target->getDateCompleted();
	if ($ended) {
	$when[] = pht(
	'Completed at %s',
	phabricator_datetime($started, $viewer));

	$duration = ($ended - $started);
	if ($duration) {
	$when[] = pht(
	'Built for %s',
	phutil_format_relative_time_detailed($duration));
	} else {
	$when[] = pht('Built instantly');
	}
	} else {
	$when[] = pht(
	'Started at %s',
	phabricator_datetime($started, $viewer));
	$duration = ($now - $started);
	if ($duration) {
	$when[] = pht(
	'Running for %s',
	phutil_format_relative_time_detailed($duration));
	}
	}
	} else {
	$created = $build_target->getDateCreated();
	$when[] = pht(
	'Queued at %s',
	phabricator_datetime($started, $viewer));
	$duration = ($now - $created);
	if ($duration) {
	$when[] = pht(
	'Waiting for %s',
	phutil_format_relative_time_detailed($duration));
	}
	}

	$properties->addProperty(
	pht('When'),
	phutil_implode_html(" \xC2\xB7 ", $when));

	$properties->addProperty(pht('Status'), $status_view);

	$target_box->addPropertyList($properties, pht('Overview'));

	$step = $build_target->getBuildStep();

	if ($step) {
	$description = $step->getDescription();
	if ($description) {
	$rendered = PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())
	->setContent($description)
	->setPreserveLinebreaks(true),
	'default',
	$viewer);

	$properties->addSectionHeader(
	pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
	$properties->addTextContent($rendered);
	}
	} else {
	$target_box->setFormErrors(
	array(
	pht(
	'This build step has since been deleted on the build plan. '.
	'Some information may be omitted.'),
	));
	}

	$details = $build_target->getDetails();
	$properties = new PHUIPropertyListView();
	foreach ($details as $key => $value) {
	$properties->addProperty($key, $value);
	}
	$target_box->addPropertyList($properties, pht('Configuration'));

	$variables = $build_target->getVariables();
	$properties = new PHUIPropertyListView();
	$properties->addRawContent($this->buildProperties($variables));
	$target_box->addPropertyList($properties, pht('Variables'));

	$artifacts_tab = $this->buildArtifacts($build_target, $target_artifacts);
	$properties = new PHUIPropertyListView();
	$properties->addRawContent($artifacts_tab);
	$target_box->addPropertyList($properties, pht('Artifacts'));

	$build_messages = idx($messages, $build_target->getPHID(), array());
	$properties = new PHUIPropertyListView();
	$properties->addRawContent($this->buildMessages($build_messages));
	$target_box->addPropertyList($properties, pht('Messages'));

	$properties = new PHUIPropertyListView();
	$properties->addProperty(
	pht('Build Target ID'),
	$build_target->getID());
	$properties->addProperty(
	pht('Build Target PHID'),
	$build_target->getPHID());
	$target_box->addPropertyList($properties, pht('Metadata'));

	$targets[] = $target_box;

	$targets[] = $this->buildLog($build, $build_target);
	}

	$timeline = $this->buildTransactionTimeline(
	$build,
	new HarbormasterBuildTransactionQuery());
	$timeline->setShouldTerminate(true);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$targets,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	private function buildArtifacts(
	HarbormasterBuildTarget $build_target,
	array $artifacts) {
	$viewer = $this->getViewer();

	$rows = array();
	foreach ($artifacts as $artifact) {
	$impl = $artifact->getArtifactImplementation();

	if ($impl) {
	$summary = $impl->renderArtifactSummary($viewer);
	$type_name = $impl->getArtifactTypeName();
	} else {
	$summary = pht('<Unknown Artifact Type>');
	$type_name = $artifact->getType();
	}

	$rows[] = array(
	$artifact->getArtifactKey(),
	$type_name,
	$summary,
	);
	}

	$table = id(new AphrontTableView($rows))
	->setNoDataString(pht('This target has no associated artifacts.'))
	->setHeaders(
	array(
	pht('Key'),
	pht('Type'),
	pht('Summary'),
	))
	->setColumnClasses(
	array(
	'pri',
	'',
	'wide',
	));

	return $table;
	}

	private function buildLog(
	HarbormasterBuild $build,
	HarbormasterBuildTarget $build_target) {

	$request = $this->getRequest();
	$viewer = $request->getUser();
	$limit = $request->getInt('l', 25);

	$logs = id(new HarbormasterBuildLogQuery())
	->setViewer($viewer)
	->withBuildTargetPHIDs(array($build_target->getPHID()))
	->execute();

	$empty_logs = array();

	$log_boxes = array();
	foreach ($logs as $log) {
	$start = 1;
	$lines = preg_split("/\r\n\|\r\|\n/", $log->getLogText());
	if ($limit !== 0) {
	$start = count($lines) - $limit;
	if ($start >= 1) {
	$lines = array_slice($lines, -$limit, $limit);
	} else {
	$start = 1;
	}
	}

	$id = null;
	$is_empty = false;
	if (count($lines) === 1 && trim($lines[0]) === '') {
	// Prevent Harbormaster from showing empty build logs.
	$id = celerity_generate_unique_node_id();
	$empty_logs[] = $id;
	$is_empty = true;
	}

	$log_view = new ShellLogView();
	$log_view->setLines($lines);
	$log_view->setStart($start);

	$header = id(new PHUIHeaderView())
	->setHeader(pht(
	'Build Log %d (%s - %s)',
	$log->getID(),
	$log->getLogSource(),
	$log->getLogType()))
	->setSubheader($this->createLogHeader($build, $log))
	->setUser($viewer);

	$log_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->setForm($log_view);

	if ($is_empty) {
	$log_box = phutil_tag(
	'div',
	array(
	'style' => 'display: none',
	'id' => $id,
	),
	$log_box);
	}

	$log_boxes[] = $log_box;
	}

	if ($empty_logs) {
	$hide_id = celerity_generate_unique_node_id();

	Javelin::initBehavior('phabricator-reveal-content');

	$expand = phutil_tag(
	'div',
	array(
	'id' => $hide_id,
	'class' => 'harbormaster-empty-logs-are-hidden mlr mlt mll',
	),
	array(
	pht(
	'%s empty logs are hidden.',
	phutil_count($empty_logs)),
	' ',
	javelin_tag(
	'a',
	array(
	'href' => '#',
	'sigil' => 'reveal-content',
	'meta' => array(
	'showIDs' => $empty_logs,
	'hideIDs' => array($hide_id),
	),
	),
	pht('Show all logs.')),
	));

	array_unshift($log_boxes, $expand);
	}

	return $log_boxes;
	}

	private function createLogHeader($build, $log) {
	$request = $this->getRequest();
	$limit = $request->getInt('l', 25);

	$lines_25 = $this->getApplicationURI('/build/'.$build->getID().'/?l=25');
	$lines_50 = $this->getApplicationURI('/build/'.$build->getID().'/?l=50');
	$lines_100 =
	$this->getApplicationURI('/build/'.$build->getID().'/?l=100');
	$lines_0 = $this->getApplicationURI('/build/'.$build->getID().'/?l=0');

	$link_25 = phutil_tag('a', array('href' => $lines_25), pht('25'));
	$link_50 = phutil_tag('a', array('href' => $lines_50), pht('50'));
	$link_100 = phutil_tag('a', array('href' => $lines_100), pht('100'));
	$link_0 = phutil_tag('a', array('href' => $lines_0), pht('Unlimited'));

	if ($limit === 25) {
	$link_25 = phutil_tag('strong', array(), $link_25);
	} else if ($limit === 50) {
	$link_50 = phutil_tag('strong', array(), $link_50);
	} else if ($limit === 100) {
	$link_100 = phutil_tag('strong', array(), $link_100);
	} else if ($limit === 0) {
	$link_0 = phutil_tag('strong', array(), $link_0);
	}

	return phutil_tag(
	'span',
	array(),
	array(
	$link_25,
	' - ',
	$link_50,
	' - ',
	$link_100,
	' - ',
	$link_0,
	' Lines',
	));
	}

	private function buildActionList(HarbormasterBuild $build) {
	$request = $this->getRequest();
	$viewer = $request->getUser();
	$id = $build->getID();

	$list = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($build)
	- ->setObjectURI("/build/{$id}");
	+ ->setObject($build);

	$can_restart = $build->canRestartBuild();
	$can_pause = $build->canPauseBuild();
	$can_resume = $build->canResumeBuild();
	$can_abort = $build->canAbortBuild();

	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Restart Build'))
	->setIcon('fa-repeat')
	->setHref($this->getApplicationURI('/build/restart/'.$id.'/'))
	->setDisabled(!$can_restart)
	->setWorkflow(true));

	if ($build->canResumeBuild()) {
	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Resume Build'))
	->setIcon('fa-play')
	->setHref($this->getApplicationURI('/build/resume/'.$id.'/'))
	->setDisabled(!$can_resume)
	->setWorkflow(true));
	} else {
	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Pause Build'))
	->setIcon('fa-pause')
	->setHref($this->getApplicationURI('/build/pause/'.$id.'/'))
	->setDisabled(!$can_pause)
	->setWorkflow(true));
	}

	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Abort Build'))
	->setIcon('fa-exclamation-triangle')
	->setHref($this->getApplicationURI('/build/abort/'.$id.'/'))
	->setDisabled(!$can_abort)
	->setWorkflow(true));

	return $list;
	}

	private function buildPropertyLists(
	PHUIObjectBoxView $box,
	HarbormasterBuild $build,
	PhabricatorActionListView $actions) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($build)
	->setActionList($actions);
	$box->addPropertyList($properties);

	$handles = id(new PhabricatorHandleQuery())
	->setViewer($viewer)
	->withPHIDs(array(
	$build->getBuildablePHID(),
	$build->getBuildPlanPHID(),
	))
	->execute();

	$properties->addProperty(
	pht('Buildable'),
	$handles[$build->getBuildablePHID()]->renderLink());

	$properties->addProperty(
	pht('Build Plan'),
	$handles[$build->getBuildPlanPHID()]->renderLink());

	$properties->addProperty(
	pht('Restarts'),
	$build->getBuildGeneration());

	$properties->addProperty(
	pht('Status'),
	$this->getStatus($build));
	}

	private function getStatus(HarbormasterBuild $build) {
	$status_view = new PHUIStatusListView();

	$item = new PHUIStatusItemView();

	if ($build->isPausing()) {
	$status_name = pht('Pausing');
	$icon = PHUIStatusItemView::ICON_RIGHT;
	$color = 'dark';
	} else {
	$status = $build->getBuildStatus();
	$status_name =
	HarbormasterBuild::getBuildStatusName($status);
	$icon = HarbormasterBuild::getBuildStatusIcon($status);
	$color = HarbormasterBuild::getBuildStatusColor($status);
	}

	$item->setTarget($status_name);
	$item->setIcon($icon, $color);
	$status_view->addItem($item);

	return $status_view;
	}

	private function buildMessages(array $messages) {
	$viewer = $this->getRequest()->getUser();

	if ($messages) {
	$handles = id(new PhabricatorHandleQuery())
	->setViewer($viewer)
	->withPHIDs(mpull($messages, 'getAuthorPHID'))
	->execute();
	} else {
	$handles = array();
	}

	$rows = array();
	foreach ($messages as $message) {
	$rows[] = array(
	$message->getID(),
	$handles[$message->getAuthorPHID()]->renderLink(),
	$message->getType(),
	$message->getIsConsumed() ? pht('Consumed') : null,
	phabricator_datetime($message->getDateCreated(), $viewer),
	);
	}

	$table = new AphrontTableView($rows);
	$table->setNoDataString(pht('No messages for this build target.'));
	$table->setHeaders(
	array(
	pht('ID'),
	pht('From'),
	pht('Type'),
	pht('Consumed'),
	pht('Received'),
	));
	$table->setColumnClasses(
	array(
	'',
	'',
	'wide',
	'',
	'date',
	));

	return $table;
	}

	private function buildProperties(array $properties) {
	ksort($properties);

	$rows = array();
	foreach ($properties as $key => $value) {
	$rows[] = array(
	$key,
	$value,
	);
	}

	$table = id(new AphrontTableView($rows))
	->setHeaders(
	array(
	pht('Key'),
	pht('Value'),
	))
	->setColumnClasses(
	array(
	'pri right',
	'wide',
	));

	return $table;
	}

	}
	diff --git a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
	index e57c322be4..300cb79f23 100644
	--- a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
	+++ b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
	@@ -1,354 +1,353 @@
	<?php

	final class HarbormasterBuildableViewController
	extends HarbormasterController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();

	$buildable = id(new HarbormasterBuildableQuery())
	->setViewer($viewer)
	->withIDs(array($request->getURIData('id')))
	->needBuildableHandles(true)
	->needContainerHandles(true)
	->executeOne();
	if (!$buildable) {
	return new Aphront404Response();
	}

	$id = $buildable->getID();

	// Pull builds and build targets.
	$builds = id(new HarbormasterBuildQuery())
	->setViewer($viewer)
	->withBuildablePHIDs(array($buildable->getPHID()))
	->needBuildTargets(true)
	->execute();

	list($lint, $unit) = $this->renderLintAndUnit($buildable, $builds);

	$buildable->attachBuilds($builds);
	$object = $buildable->getBuildableObject();

	$build_list = $this->buildBuildList($buildable);

	$title = pht('Buildable %d', $id);

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($viewer)
	->setPolicyObject($buildable);

	$box = id(new PHUIObjectBoxView())
	->setHeader($header);

	$timeline = $this->buildTransactionTimeline(
	$buildable,
	new HarbormasterBuildableTransactionQuery());
	$timeline->setShouldTerminate(true);

	$actions = $this->buildActionList($buildable);
	$this->buildPropertyLists($box, $buildable, $actions);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($buildable->getMonogram());

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$lint,
	$unit,
	$build_list,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	private function buildActionList(HarbormasterBuildable $buildable) {
	$request = $this->getRequest();
	$viewer = $request->getUser();
	$id = $buildable->getID();

	$list = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($buildable)
	- ->setObjectURI($buildable->getMonogram());
	+ ->setObject($buildable);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$buildable,
	PhabricatorPolicyCapability::CAN_EDIT);

	$can_restart = false;
	$can_resume = false;
	$can_pause = false;
	$can_abort = false;

	foreach ($buildable->getBuilds() as $build) {
	if ($build->canRestartBuild()) {
	$can_restart = true;
	}
	if ($build->canResumeBuild()) {
	$can_resume = true;
	}
	if ($build->canPauseBuild()) {
	$can_pause = true;
	}
	if ($build->canAbortBuild()) {
	$can_abort = true;
	}
	}

	$restart_uri = "buildable/{$id}/restart/";
	$pause_uri = "buildable/{$id}/pause/";
	$resume_uri = "buildable/{$id}/resume/";
	$abort_uri = "buildable/{$id}/abort/";

	$list->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-repeat')
	->setName(pht('Restart All Builds'))
	->setHref($this->getApplicationURI($restart_uri))
	->setWorkflow(true)
	->setDisabled(!$can_restart \|\| !$can_edit));

	$list->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pause')
	->setName(pht('Pause All Builds'))
	->setHref($this->getApplicationURI($pause_uri))
	->setWorkflow(true)
	->setDisabled(!$can_pause \|\| !$can_edit));

	$list->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-play')
	->setName(pht('Resume All Builds'))
	->setHref($this->getApplicationURI($resume_uri))
	->setWorkflow(true)
	->setDisabled(!$can_resume \|\| !$can_edit));

	$list->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-exclamation-triangle')
	->setName(pht('Abort All Builds'))
	->setHref($this->getApplicationURI($abort_uri))
	->setWorkflow(true)
	->setDisabled(!$can_abort \|\| !$can_edit));

	return $list;
	}

	private function buildPropertyLists(
	PHUIObjectBoxView $box,
	HarbormasterBuildable $buildable,
	PhabricatorActionListView $actions) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($buildable)
	->setActionList($actions);
	$box->addPropertyList($properties);

	if ($buildable->getContainerHandle() !== null) {
	$properties->addProperty(
	pht('Container'),
	$buildable->getContainerHandle()->renderLink());
	}

	$properties->addProperty(
	pht('Buildable'),
	$buildable->getBuildableHandle()->renderLink());

	$properties->addProperty(
	pht('Origin'),
	$buildable->getIsManualBuildable()
	? pht('Manual Buildable')
	: pht('Automatic Buildable'));

	}

	private function buildBuildList(HarbormasterBuildable $buildable) {
	$viewer = $this->getRequest()->getUser();

	$build_list = id(new PHUIObjectItemListView())
	->setUser($viewer);
	foreach ($buildable->getBuilds() as $build) {
	$view_uri = $this->getApplicationURI('/build/'.$build->getID().'/');
	$item = id(new PHUIObjectItemView())
	->setObjectName(pht('Build %d', $build->getID()))
	->setHeader($build->getName())
	->setHref($view_uri);

	$status = $build->getBuildStatus();
	$item->setStatusIcon(
	'fa-dot-circle-o '.HarbormasterBuild::getBuildStatusColor($status),
	HarbormasterBuild::getBuildStatusName($status));

	$item->addAttribute(HarbormasterBuild::getBuildStatusName($status));

	if ($build->isRestarting()) {
	$item->addIcon('fa-repeat', pht('Restarting'));
	} else if ($build->isPausing()) {
	$item->addIcon('fa-pause', pht('Pausing'));
	} else if ($build->isResuming()) {
	$item->addIcon('fa-play', pht('Resuming'));
	}

	$build_id = $build->getID();

	$restart_uri = "build/restart/{$build_id}/buildable/";
	$resume_uri = "build/resume/{$build_id}/buildable/";
	$pause_uri = "build/pause/{$build_id}/buildable/";
	$abort_uri = "build/abort/{$build_id}/buildable/";

	$item->addAction(
	id(new PHUIListItemView())
	->setIcon('fa-repeat')
	->setName(pht('Restart'))
	->setHref($this->getApplicationURI($restart_uri))
	->setWorkflow(true)
	->setDisabled(!$build->canRestartBuild()));

	if ($build->canResumeBuild()) {
	$item->addAction(
	id(new PHUIListItemView())
	->setIcon('fa-play')
	->setName(pht('Resume'))
	->setHref($this->getApplicationURI($resume_uri))
	->setWorkflow(true));
	} else {
	$item->addAction(
	id(new PHUIListItemView())
	->setIcon('fa-pause')
	->setName(pht('Pause'))
	->setHref($this->getApplicationURI($pause_uri))
	->setWorkflow(true)
	->setDisabled(!$build->canPauseBuild()));
	}

	$targets = $build->getBuildTargets();

	if ($targets) {
	$target_list = id(new PHUIStatusListView());
	foreach ($targets as $target) {
	$status = $target->getTargetStatus();
	$icon = HarbormasterBuildTarget::getBuildTargetStatusIcon($status);
	$color = HarbormasterBuildTarget::getBuildTargetStatusColor($status);
	$status_name =
	HarbormasterBuildTarget::getBuildTargetStatusName($status);

	$name = $target->getName();

	$target_list->addItem(
	id(new PHUIStatusItemView())
	->setIcon($icon, $color, $status_name)
	->setTarget(pht('Target %d', $target->getID()))
	->setNote($name));
	}

	$target_box = id(new PHUIBoxView())
	->addPadding(PHUI::PADDING_SMALL)
	->appendChild($target_list);

	$item->appendChild($target_box);
	}

	$build_list->addItem($item);
	}

	$build_list->setFlush(true);

	$box = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Builds'))
	->appendChild($build_list);

	return $box;
	}

	private function renderLintAndUnit(
	HarbormasterBuildable $buildable,
	array $builds) {

	$viewer = $this->getViewer();

	$targets = array();
	foreach ($builds as $build) {
	foreach ($build->getBuildTargets() as $target) {
	$targets[] = $target;
	}
	}

	if (!$targets) {
	return;
	}

	$target_phids = mpull($targets, 'getPHID');

	$lint_data = id(new HarbormasterBuildLintMessage())->loadAllWhere(
	'buildTargetPHID IN (%Ls)',
	$target_phids);

	$unit_data = id(new HarbormasterBuildUnitMessage())->loadAllWhere(
	'buildTargetPHID IN (%Ls)',
	$target_phids);

	if ($lint_data) {
	$lint_table = id(new HarbormasterLintPropertyView())
	->setUser($viewer)
	->setLimit(10)
	->setLintMessages($lint_data);

	$lint_href = $this->getApplicationURI('lint/'.$buildable->getID().'/');

	$lint_header = id(new PHUIHeaderView())
	->setHeader(pht('Lint Messages'))
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	->setHref($lint_href)
	->setIconFont('fa-list-ul')
	->setText('View All'));

	$lint = id(new PHUIObjectBoxView())
	->setHeader($lint_header)
	->setTable($lint_table);
	} else {
	$lint = null;
	}

	if ($unit_data) {
	$unit_table = id(new HarbormasterUnitPropertyView())
	->setUser($viewer)
	->setLimit(25)
	->setUnitMessages($unit_data);

	$unit_href = $this->getApplicationURI('unit/'.$buildable->getID().'/');

	$unit_header = id(new PHUIHeaderView())
	->setHeader(pht('Unit Tests'))
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	->setHref($unit_href)
	->setIconFont('fa-list-ul')
	->setText('View All'));

	$unit = id(new PHUIObjectBoxView())
	->setHeader($unit_header)
	->setTable($unit_table);
	} else {
	$unit = null;
	}

	return array($lint, $unit);
	}



	}
	diff --git a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
	index ef8f98bdb2..e306eaef7c 100644
	--- a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
	+++ b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
	@@ -1,460 +1,459 @@
	<?php

	final class HarbormasterPlanViewController extends HarbormasterPlanController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();
	$id = $request->getURIData('id');

	$plan = id(new HarbormasterBuildPlanQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$plan) {
	return new Aphront404Response();
	}

	$timeline = $this->buildTransactionTimeline(
	$plan,
	new HarbormasterBuildPlanTransactionQuery());
	$timeline->setShouldTerminate(true);

	$title = $plan->getName();

	$header = id(new PHUIHeaderView())
	->setHeader($plan->getName())
	->setUser($viewer)
	->setPolicyObject($plan);

	$box = id(new PHUIObjectBoxView())
	->setHeader($header);

	$actions = $this->buildActionList($plan);
	$this->buildPropertyLists($box, $plan, $actions);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Plan %d', $id));

	list($step_list, $has_any_conflicts, $would_deadlock) =
	$this->buildStepList($plan);

	if ($would_deadlock) {
	$box->setFormErrors(
	array(
	pht(
	'This build plan will deadlock when executed, due to '.
	'circular dependencies present in the build plan. '.
	'Examine the step list and resolve the deadlock.'),
	));
	} else if ($has_any_conflicts) {
	// A deadlocking build will also cause all the artifacts to be
	// invalid, so we just skip showing this message if that's the
	// case.
	$box->setFormErrors(
	array(
	pht(
	'This build plan has conflicts in one or more build steps. '.
	'Examine the step list and resolve the listed errors.'),
	));
	}

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$step_list,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	private function buildStepList(HarbormasterBuildPlan $plan) {
	$viewer = $this->getViewer();

	$run_order = HarbormasterBuildGraph::determineDependencyExecution($plan);

	$steps = id(new HarbormasterBuildStepQuery())
	->setViewer($viewer)
	->withBuildPlanPHIDs(array($plan->getPHID()))
	->execute();
	$steps = mpull($steps, null, 'getPHID');

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$plan,
	PhabricatorPolicyCapability::CAN_EDIT);

	$step_list = id(new PHUIObjectItemListView())
	->setUser($viewer)
	->setNoDataString(
	pht('This build plan does not have any build steps yet.'));

	$i = 1;
	$last_depth = 0;
	$has_any_conflicts = false;
	$is_deadlocking = false;
	foreach ($run_order as $run_ref) {
	$step = $steps[$run_ref['node']->getPHID()];
	$depth = $run_ref['depth'] + 1;
	if ($last_depth !== $depth) {
	$last_depth = $depth;
	$i = 1;
	} else {
	$i++;
	}

	$implementation = null;
	try {
	$implementation = $step->getStepImplementation();
	} catch (Exception $ex) {
	// We can't initialize the implementation. This might be because
	// it's been renamed or no longer exists.
	$item = id(new PHUIObjectItemView())
	->setObjectName(pht('Step %d.%d', $depth, $i))
	->setHeader(pht('Unknown Implementation'))
	->setStatusIcon('fa-warning red')
	->addAttribute(pht(
	'This step has an invalid implementation (%s).',
	$step->getClassName()));
	$step_list->addItem($item);
	continue;
	}
	$item = id(new PHUIObjectItemView())
	->setObjectName(pht('Step %d.%d', $depth, $i))
	->setHeader($step->getName());

	$item->addAttribute($implementation->getDescription());

	$step_id = $step->getID();

	$view_uri = $this->getApplicationURI("step/view/{$step_id}/");
	$item->setHref($view_uri);

	$depends = $step->getStepImplementation()->getDependencies($step);
	$inputs = $step->getStepImplementation()->getArtifactInputs();
	$outputs = $step->getStepImplementation()->getArtifactOutputs();

	$has_conflicts = false;
	if ($depends \|\| $inputs \|\| $outputs) {
	$available_artifacts =
	HarbormasterBuildStepImplementation::getAvailableArtifacts(
	$plan,
	$step,
	null);
	$available_artifacts = ipull($available_artifacts, 'type');

	list($depends_ui, $has_conflicts) = $this->buildDependsOnList(
	$depends,
	pht('Depends On'),
	$steps);

	list($inputs_ui, $has_conflicts) = $this->buildArtifactList(
	$inputs,
	'in',
	pht('Input Artifacts'),
	$available_artifacts);

	list($outputs_ui) = $this->buildArtifactList(
	$outputs,
	'out',
	pht('Output Artifacts'),
	array());

	$item->appendChild(
	phutil_tag(
	'div',
	array(
	'class' => 'harbormaster-artifact-io',
	),
	array(
	$depends_ui,
	$inputs_ui,
	$outputs_ui,
	)));
	}

	if ($has_conflicts) {
	$has_any_conflicts = true;
	$item->setStatusIcon('fa-warning red');
	}

	if ($run_ref['cycle']) {
	$is_deadlocking = true;
	}

	if ($is_deadlocking) {
	$item->setStatusIcon('fa-warning red');
	}

	$step_list->addItem($item);
	}

	$step_list->setFlush(true);

	$plan_id = $plan->getID();

	$header = id(new PHUIHeaderView())
	->setHeader(pht('Build Steps'))
	->addActionLink(
	id(new PHUIButtonView())
	->setText(pht('Add Build Step'))
	->setHref($this->getApplicationURI("step/add/{$plan_id}/"))
	->setTag('a')
	->setIcon(
	id(new PHUIIconView())
	->setIconFont('fa-plus'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$step_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->appendChild($step_list);

	return array($step_box, $has_any_conflicts, $is_deadlocking);
	}

	private function buildActionList(HarbormasterBuildPlan $plan) {
	$viewer = $this->getViewer();
	$id = $plan->getID();

	$list = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($plan)
	- ->setObjectURI($this->getApplicationURI("plan/{$id}/"));
	+ ->setObject($plan);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$plan,
	PhabricatorPolicyCapability::CAN_EDIT);

	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Plan'))
	->setHref($this->getApplicationURI("plan/edit/{$id}/"))
	->setWorkflow(!$can_edit)
	->setDisabled(!$can_edit)
	->setIcon('fa-pencil'));

	if ($plan->isDisabled()) {
	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Enable Plan'))
	->setHref($this->getApplicationURI("plan/disable/{$id}/"))
	->setWorkflow(true)
	->setDisabled(!$can_edit)
	->setIcon('fa-check'));
	} else {
	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Disable Plan'))
	->setHref($this->getApplicationURI("plan/disable/{$id}/"))
	->setWorkflow(true)
	->setDisabled(!$can_edit)
	->setIcon('fa-ban'));
	}

	$can_run = ($can_edit && $plan->canRunManually());

	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Run Plan Manually'))
	->setHref($this->getApplicationURI("plan/run/{$id}/"))
	->setWorkflow(true)
	->setDisabled(!$can_run)
	->setIcon('fa-play-circle'));

	return $list;
	}

	private function buildPropertyLists(
	PHUIObjectBoxView $box,
	HarbormasterBuildPlan $plan,
	PhabricatorActionListView $actions) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($plan)
	->setActionList($actions);
	$box->addPropertyList($properties);

	$properties->addProperty(
	pht('Created'),
	phabricator_datetime($plan->getDateCreated(), $viewer));

	}

	private function buildArtifactList(
	array $artifacts,
	$kind,
	$name,
	array $available_artifacts) {
	$has_conflicts = false;

	if (!$artifacts) {
	return array(null, $has_conflicts);
	}

	$this->requireResource('harbormaster-css');

	$header = phutil_tag(
	'div',
	array(
	'class' => 'harbormaster-artifact-summary-header',
	),
	$name);

	$is_input = ($kind == 'in');

	$list = new PHUIStatusListView();
	foreach ($artifacts as $artifact) {
	$error = null;

	$key = idx($artifact, 'key');
	if (!strlen($key)) {
	$bound = phutil_tag('em', array(), pht('(null)'));
	if ($is_input) {
	// This is an unbound input. For now, all inputs are always required.
	$icon = PHUIStatusItemView::ICON_WARNING;
	$color = 'red';
	$icon_label = pht('Required Input');
	$has_conflicts = true;
	$error = pht('This input is required, but not configured.');
	} else {
	// This is an unnamed output. Outputs do not necessarily need to be
	// named.
	$icon = PHUIStatusItemView::ICON_OPEN;
	$color = 'bluegrey';
	$icon_label = pht('Unused Output');
	}
	} else {
	$bound = phutil_tag('strong', array(), $key);
	if ($is_input) {
	if (isset($available_artifacts[$key])) {
	if ($available_artifacts[$key] == idx($artifact, 'type')) {
	$icon = PHUIStatusItemView::ICON_ACCEPT;
	$color = 'green';
	$icon_label = pht('Valid Input');
	} else {
	$icon = PHUIStatusItemView::ICON_WARNING;
	$color = 'red';
	$icon_label = pht('Bad Input Type');
	$has_conflicts = true;
	$error = pht(
	'This input is bound to the wrong artifact type. It is bound '.
	'to a "%s" artifact, but should be bound to a "%s" artifact.',
	$available_artifacts[$key],
	idx($artifact, 'type'));
	}
	} else {
	$icon = PHUIStatusItemView::ICON_QUESTION;
	$color = 'red';
	$icon_label = pht('Unknown Input');
	$has_conflicts = true;
	$error = pht(
	'This input is bound to an artifact ("%s") which does not exist '.
	'at this stage in the build process.',
	$key);
	}
	} else {
	$icon = PHUIStatusItemView::ICON_DOWN;
	$color = 'green';
	$icon_label = pht('Valid Output');
	}
	}

	if ($error) {
	$note = array(
	phutil_tag('strong', array(), pht('ERROR:')),
	' ',
	$error,
	);
	} else {
	$note = $bound;
	}

	$list->addItem(
	id(new PHUIStatusItemView())
	->setIcon($icon, $color, $icon_label)
	->setTarget($artifact['name'])
	->setNote($note));
	}

	$ui = array(
	$header,
	$list,
	);

	return array($ui, $has_conflicts);
	}

	private function buildDependsOnList(
	array $step_phids,
	$name,
	array $steps) {
	$has_conflicts = false;

	if (count($step_phids) === 0) {
	return null;
	}

	$this->requireResource('harbormaster-css');

	$steps = mpull($steps, null, 'getPHID');

	$header = phutil_tag(
	'div',
	array(
	'class' => 'harbormaster-artifact-summary-header',
	),
	$name);

	$list = new PHUIStatusListView();
	foreach ($step_phids as $step_phid) {
	$error = null;

	if (idx($steps, $step_phid) === null) {
	$icon = PHUIStatusItemView::ICON_WARNING;
	$color = 'red';
	$icon_label = pht('Missing Dependency');
	$has_conflicts = true;
	$error = pht(
	"This dependency specifies a build step which doesn't exist.");
	} else {
	$bound = phutil_tag(
	'strong',
	array(),
	idx($steps, $step_phid)->getName());
	$icon = PHUIStatusItemView::ICON_ACCEPT;
	$color = 'green';
	$icon_label = pht('Valid Input');
	}

	if ($error) {
	$note = array(
	phutil_tag('strong', array(), pht('ERROR:')),
	' ',
	$error,
	);
	} else {
	$note = $bound;
	}

	$list->addItem(
	id(new PHUIStatusItemView())
	->setIcon($icon, $color, $icon_label)
	->setTarget(pht('Build Step'))
	->setNote($note));
	}

	$ui = array(
	$header,
	$list,
	);

	return array($ui, $has_conflicts);
	}
	}
	diff --git a/src/applications/herald/controller/HeraldRuleViewController.php b/src/applications/herald/controller/HeraldRuleViewController.php
	index c8e0442dc5..3b209dd960 100644
	--- a/src/applications/herald/controller/HeraldRuleViewController.php
	+++ b/src/applications/herald/controller/HeraldRuleViewController.php
	@@ -1,157 +1,156 @@
	<?php

	final class HeraldRuleViewController extends HeraldController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$rule = id(new HeraldRuleQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needConditionsAndActions(true)
	->executeOne();
	if (!$rule) {
	return new Aphront404Response();
	}

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($rule->getName())
	->setPolicyObject($rule);

	if ($rule->getIsDisabled()) {
	$header->setStatus(
	'fa-ban',
	'red',
	pht('Archived'));
	} else {
	$header->setStatus(
	'fa-check',
	'bluegrey',
	pht('Active'));
	}

	$actions = $this->buildActionView($rule);
	$properties = $this->buildPropertyView($rule, $actions);

	$id = $rule->getID();

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb("H{$id}");

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$timeline = $this->buildTransactionTimeline(
	$rule,
	new HeraldTransactionQuery());
	$timeline->setShouldTerminate(true);

	$title = $rule->getName();

	return $this->newPage()
	->setTitle($title)
	->setCrumbs($crumbs)
	->appendChild(
	array(
	$object_box,
	$timeline,
	));
	}

	private function buildActionView(HeraldRule $rule) {
	$viewer = $this->getRequest()->getUser();
	$id = $rule->getID();

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($rule)
	- ->setObjectURI('/'.$rule->getMonogram());
	+ ->setObject($rule);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$rule,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Rule'))
	->setHref($this->getApplicationURI("edit/{$id}/"))
	->setIcon('fa-pencil')
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	if ($rule->getIsDisabled()) {
	$disable_uri = "disable/{$id}/enable/";
	$disable_icon = 'fa-check';
	$disable_name = pht('Activate Rule');
	} else {
	$disable_uri = "disable/{$id}/disable/";
	$disable_icon = 'fa-ban';
	$disable_name = pht('Archive Rule');
	}

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Disable Rule'))
	->setHref($this->getApplicationURI($disable_uri))
	->setIcon($disable_icon)
	->setName($disable_name)
	->setDisabled(!$can_edit)
	->setWorkflow(true));

	return $view;
	}

	private function buildPropertyView(
	HeraldRule $rule,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($rule)
	->setActionList($actions);

	$view->addProperty(
	pht('Rule Type'),
	idx(HeraldRuleTypeConfig::getRuleTypeMap(), $rule->getRuleType()));

	if ($rule->isPersonalRule()) {
	$view->addProperty(
	pht('Author'),
	$viewer->renderHandle($rule->getAuthorPHID()));
	}

	$adapter = HeraldAdapter::getAdapterForContentType($rule->getContentType());
	if ($adapter) {
	$view->addProperty(
	pht('Applies To'),
	idx(
	HeraldAdapter::getEnabledAdapterMap($viewer),
	$rule->getContentType()));

	if ($rule->isObjectRule()) {
	$view->addProperty(
	pht('Trigger Object'),
	$viewer->renderHandle($rule->getTriggerObjectPHID()));
	}

	$view->invokeWillRenderEvent();

	$view->addSectionHeader(
	pht('Rule Description'),
	PHUIPropertyListView::ICON_SUMMARY);

	$handles = $viewer->loadHandles(HeraldAdapter::getHandlePHIDs($rule));
	$rule_text = $adapter->renderRuleAsText($rule, $handles, $viewer);
	$view->addTextContent($rule_text);
	}

	return $view;
	}

	}
	diff --git a/src/applications/legalpad/controller/LegalpadDocumentManageController.php b/src/applications/legalpad/controller/LegalpadDocumentManageController.php
	index 1ca838258b..baeefeaf4b 100644
	--- a/src/applications/legalpad/controller/LegalpadDocumentManageController.php
	+++ b/src/applications/legalpad/controller/LegalpadDocumentManageController.php
	@@ -1,202 +1,201 @@
	<?php

	final class LegalpadDocumentManageController extends LegalpadController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	// NOTE: We require CAN_EDIT to view this page.

	$document = id(new LegalpadDocumentQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needDocumentBodies(true)
	->needContributors(true)
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$document) {
	return new Aphront404Response();
	}

	$subscribers = PhabricatorSubscribersQuery::loadSubscribersForPHID(
	$document->getPHID());

	$document_body = $document->getDocumentBody();

	$engine = id(new PhabricatorMarkupEngine())
	->setViewer($viewer);
	$engine->addObject(
	$document_body,
	LegalpadDocumentBody::MARKUP_FIELD_TEXT);
	$timeline = $this->buildTransactionTimeline(
	$document,
	new LegalpadTransactionQuery(),
	$engine);

	$title = $document_body->getTitle();

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($viewer)
	->setPolicyObject($document);

	$actions = $this->buildActionView($document);
	$properties = $this->buildPropertyView($document, $engine, $actions);

	$comment_form_id = celerity_generate_unique_node_id();

	$add_comment = $this->buildAddCommentView($document, $comment_form_id);

	$crumbs = $this->buildApplicationCrumbs($this->buildSideNav());
	$crumbs->addTextCrumb(
	$document->getMonogram(),
	'/'.$document->getMonogram());
	$crumbs->addTextCrumb(pht('Manage'));

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties)
	->addPropertyList($this->buildDocument($engine, $document_body));

	$content = array(
	$crumbs,
	$object_box,
	$timeline,
	$add_comment,
	);

	return $this->buildApplicationPage(
	$content,
	array(
	'title' => $title,
	'pageObjects' => array($document->getPHID()),
	));
	}

	private function buildDocument(
	PhabricatorMarkupEngine
	$engine, LegalpadDocumentBody $body) {

	$view = new PHUIPropertyListView();
	$view->addClass('legalpad');
	$view->addSectionHeader(
	pht('Document'), 'fa-file-text-o');
	$view->addTextContent(
	$engine->getOutput($body, LegalpadDocumentBody::MARKUP_FIELD_TEXT));

	return $view;

	}

	private function buildActionView(LegalpadDocument $document) {
	$viewer = $this->getViewer();

	$actions = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($document);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$document,
	PhabricatorPolicyCapability::CAN_EDIT);

	$doc_id = $document->getID();

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil-square')
	->setName(pht('View/Sign Document'))
	->setHref('/'.$document->getMonogram()));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Document'))
	->setHref($this->getApplicationURI('/edit/'.$doc_id.'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-terminal')
	->setName(pht('View Signatures'))
	->setHref($this->getApplicationURI('/signatures/'.$doc_id.'/')));

	return $actions;
	}

	private function buildPropertyView(
	LegalpadDocument $document,
	PhabricatorMarkupEngine $engine,
	PhabricatorActionListView $actions) {

	$viewer = $this->getViewer();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($document)
	->setActionList($actions);

	$properties->addProperty(
	pht('Signature Type'),
	$document->getSignatureTypeName());

	$properties->addProperty(
	pht('Last Updated'),
	phabricator_datetime($document->getDateModified(), $viewer));

	$properties->addProperty(
	pht('Updated By'),
	$viewer->renderHandle($document->getDocumentBody()->getCreatorPHID()));

	$properties->addProperty(
	pht('Versions'),
	$document->getVersions());

	if ($document->getContributors()) {
	$properties->addProperty(
	pht('Contributors'),
	$viewer
	->renderHandleList($document->getContributors())
	->setAsInline(true));
	}

	$properties->invokeWillRenderEvent();

	return $properties;
	}

	private function buildAddCommentView(
	LegalpadDocument $document,
	$comment_form_id) {
	$viewer = $this->getViewer();

	$draft = PhabricatorDraft::newFromUserAndKey($viewer, $document->getPHID());

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');

	$title = $is_serious
	? pht('Add Comment')
	: pht('Debate Legislation');

	$form = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($document->getPHID())
	->setFormID($comment_form_id)
	->setHeaderText($title)
	->setDraft($draft)
	->setSubmitButtonName(pht('Add Comment'))
	->setAction($this->getApplicationURI('/comment/'.$document->getID().'/'))
	->setRequestURI($this->getRequest()->getRequestURI());

	return $form;

	}

	}
	diff --git a/src/applications/macro/controller/PhabricatorMacroViewController.php b/src/applications/macro/controller/PhabricatorMacroViewController.php
	index 02a6f0d342..fb6db3cf07 100644
	--- a/src/applications/macro/controller/PhabricatorMacroViewController.php
	+++ b/src/applications/macro/controller/PhabricatorMacroViewController.php
	@@ -1,176 +1,175 @@
	<?php

	final class PhabricatorMacroViewController
	extends PhabricatorMacroController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$macro = id(new PhabricatorMacroQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needFiles(true)
	->executeOne();
	if (!$macro) {
	return new Aphront404Response();
	}

	$file = $macro->getFile();

	$title_short = pht('Macro "%s"', $macro->getName());
	$title_long = pht('Image Macro "%s"', $macro->getName());

	$actions = $this->buildActionView($macro);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(
	$title_short,
	$this->getApplicationURI('/view/'.$macro->getID().'/'));

	$properties = $this->buildPropertyView($macro, $actions);
	if ($file) {
	$file_view = new PHUIPropertyListView();
	$file_view->addImageContent(
	phutil_tag(
	'img',
	array(
	'src' => $file->getViewURI(),
	'class' => 'phabricator-image-macro-hero',
	)));
	}

	$timeline = $this->buildTransactionTimeline(
	$macro,
	new PhabricatorMacroTransactionQuery());

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setPolicyObject($macro)
	->setHeader($title_long);

	if (!$macro->getIsDisabled()) {
	$header->setStatus('fa-check', 'bluegrey', pht('Active'));
	} else {
	$header->setStatus('fa-ban', 'red', pht('Archived'));
	}

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');

	$comment_header = $is_serious
	? pht('Add Comment')
	: pht('Grovel in Awe');

	$draft = PhabricatorDraft::newFromUserAndKey($viewer, $macro->getPHID());

	$add_comment_form = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($macro->getPHID())
	->setDraft($draft)
	->setHeaderText($comment_header)
	->setAction($this->getApplicationURI('/comment/'.$macro->getID().'/'))
	->setSubmitButtonName(pht('Add Comment'));

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	if ($file_view) {
	$object_box->addPropertyList($file_view);
	}

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$timeline,
	$add_comment_form,
	),
	array(
	'title' => $title_short,
	'pageObjects' => array($macro->getPHID()),
	));
	}

	private function buildActionView(PhabricatorFileImageMacro $macro) {
	$can_manage = $this->hasApplicationCapability(
	PhabricatorMacroManageCapability::CAPABILITY);

	$request = $this->getRequest();
	$view = id(new PhabricatorActionListView())
	->setUser($request->getUser())
	->setObject($macro)
	- ->setObjectURI($request->getRequestURI())
	->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Macro'))
	->setHref($this->getApplicationURI('/edit/'.$macro->getID().'/'))
	->setDisabled(!$can_manage)
	->setWorkflow(!$can_manage)
	->setIcon('fa-pencil'));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Audio'))
	->setHref($this->getApplicationURI('/audio/'.$macro->getID().'/'))
	->setDisabled(!$can_manage)
	->setWorkflow(!$can_manage)
	->setIcon('fa-music'));

	if ($macro->getIsDisabled()) {
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Activate Macro'))
	->setHref($this->getApplicationURI('/disable/'.$macro->getID().'/'))
	->setWorkflow(true)
	->setDisabled(!$can_manage)
	->setIcon('fa-check'));
	} else {
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Archive Macro'))
	->setHref($this->getApplicationURI('/disable/'.$macro->getID().'/'))
	->setWorkflow(true)
	->setDisabled(!$can_manage)
	->setIcon('fa-ban'));
	}

	return $view;
	}

	private function buildPropertyView(
	PhabricatorFileImageMacro $macro,
	PhabricatorActionListView $actions) {
	$viewer = $this->getViewer();

	$view = id(new PHUIPropertyListView())
	->setUser($this->getRequest()->getUser())
	->setObject($macro)
	->setActionList($actions);

	switch ($macro->getAudioBehavior()) {
	case PhabricatorFileImageMacro::AUDIO_BEHAVIOR_ONCE:
	$view->addProperty(pht('Audio Behavior'), pht('Play Once'));
	break;
	case PhabricatorFileImageMacro::AUDIO_BEHAVIOR_LOOP:
	$view->addProperty(pht('Audio Behavior'), pht('Loop'));
	break;
	}

	$audio_phid = $macro->getAudioPHID();
	if ($audio_phid) {
	$view->addProperty(
	pht('Audio'),
	$viewer->renderHandle($audio_phid));
	}

	$view->invokeWillRenderEvent();

	return $view;
	}

	}
	diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	index a7e64f04d1..e5e5083664 100644
	--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	@@ -1,323 +1,322 @@
	<?php

	final class ManiphestTaskDetailController extends ManiphestController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();
	$id = $request->getURIData('id');

	$task = id(new ManiphestTaskQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needSubscriberPHIDs(true)
	->executeOne();
	if (!$task) {
	return new Aphront404Response();
	}

	$field_list = PhabricatorCustomField::getObjectFields(
	$task,
	PhabricatorCustomField::ROLE_VIEW);
	$field_list
	->setViewer($viewer)
	->readFieldsFromStorage($task);

	$e_commit = ManiphestTaskHasCommitEdgeType::EDGECONST;
	$e_dep_on = ManiphestTaskDependsOnTaskEdgeType::EDGECONST;
	$e_dep_by = ManiphestTaskDependedOnByTaskEdgeType::EDGECONST;
	$e_rev = ManiphestTaskHasRevisionEdgeType::EDGECONST;
	$e_mock = ManiphestTaskHasMockEdgeType::EDGECONST;

	$phid = $task->getPHID();

	$query = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs(array($phid))
	->withEdgeTypes(
	array(
	$e_commit,
	$e_dep_on,
	$e_dep_by,
	$e_rev,
	$e_mock,
	));
	$edges = idx($query->execute(), $phid);
	$phids = array_fill_keys($query->getDestinationPHIDs(), true);

	if ($task->getOwnerPHID()) {
	$phids[$task->getOwnerPHID()] = true;
	}
	$phids[$task->getAuthorPHID()] = true;

	$phids = array_keys($phids);
	$handles = $viewer->loadHandles($phids);

	$engine = id(new PhabricatorMarkupEngine())
	->setViewer($viewer)
	->setContextObject($task)
	->addObject($task, ManiphestTask::MARKUP_FIELD_DESCRIPTION);

	$timeline = $this->buildTransactionTimeline(
	$task,
	new ManiphestTransactionQuery(),
	$engine);

	$actions = $this->buildActionView($task);

	$monogram = $task->getMonogram();
	$crumbs = $this->buildApplicationCrumbs()
	->addTextCrumb($monogram, '/'.$monogram);

	$header = $this->buildHeaderView($task);
	$properties = $this->buildPropertyView(
	$task, $field_list, $edges, $actions, $handles);
	$description = $this->buildDescriptionView($task, $engine);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	if ($description) {
	$object_box->addPropertyList($description);
	}

	$title = pht('%s %s', $monogram, $task->getTitle());

	$comment_view = id(new ManiphestEditEngine())
	->setViewer($viewer)
	->buildEditEngineCommentView($task);

	$timeline->setQuoteRef($monogram);
	$comment_view->setTransactionTimeline($timeline);

	return $this->newPage()
	->setTitle($title)
	->setCrumbs($crumbs)
	->setPageObjectPHIDs(
	array(
	$task->getPHID(),
	))
	->appendChild(
	array(
	$object_box,
	$timeline,
	$comment_view,
	));
	}

	private function buildHeaderView(ManiphestTask $task) {
	$view = id(new PHUIHeaderView())
	->setHeader($task->getTitle())
	->setUser($this->getRequest()->getUser())
	->setPolicyObject($task);

	$status = $task->getStatus();
	$status_name = ManiphestTaskStatus::renderFullDescription($status);

	$view->addProperty(PHUIHeaderView::PROPERTY_STATUS, $status_name);

	return $view;
	}


	private function buildActionView(ManiphestTask $task) {
	$viewer = $this->getRequest()->getUser();

	$id = $task->getID();
	$phid = $task->getPHID();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$task,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($task)
	- ->setObjectURI($this->getRequest()->getRequestURI());
	+ ->setObject($task);

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Task'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("/task/edit/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Merge Duplicates In'))
	->setHref("/search/attach/{$phid}/TASK/merge/")
	->setWorkflow(true)
	->setIcon('fa-compress')
	->setDisabled(!$can_edit)
	->setWorkflow(true));

	$edit_config = id(new ManiphestEditEngine())
	->setViewer($viewer)
	->loadDefaultEditConfiguration();

	$can_create = (bool)$edit_config;
	if ($can_create) {
	$form_key = $edit_config->getIdentifier();
	$edit_uri = id(new PhutilURI("/task/edit/form/{$form_key}/"))
	->setQueryParam('parent', $id)
	->setQueryParam('template', $id)
	->setQueryParam('status', ManiphestTaskStatus::getDefaultStatus());
	$edit_uri = $this->getApplicationURI($edit_uri);
	} else {
	// TODO: This will usually give us a somewhat-reasonable error page, but
	// could be a bit cleaner.
	$edit_uri = "/task/edit/{$id}/";
	$edit_uri = $this->getApplicationURI($edit_uri);
	}

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Create Subtask'))
	->setHref($edit_uri)
	->setIcon('fa-level-down')
	->setDisabled(!$can_create)
	->setWorkflow(!$can_create));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Blocking Tasks'))
	->setHref("/search/attach/{$phid}/TASK/blocks/")
	->setWorkflow(true)
	->setIcon('fa-link')
	->setDisabled(!$can_edit)
	->setWorkflow(true));

	return $view;
	}

	private function buildPropertyView(
	ManiphestTask $task,
	PhabricatorCustomFieldList $field_list,
	array $edges,
	PhabricatorActionListView $actions,
	$handles) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($task)
	->setActionList($actions);

	$view->addProperty(
	pht('Assigned To'),
	$task->getOwnerPHID()
	? $handles->renderHandle($task->getOwnerPHID())
	: phutil_tag('em', array(), pht('None')));

	$view->addProperty(
	pht('Priority'),
	ManiphestTaskPriority::getTaskPriorityName($task->getPriority()));

	$view->addProperty(
	pht('Author'),
	$handles->renderHandle($task->getAuthorPHID()));

	$source = $task->getOriginalEmailSource();
	if ($source) {
	$subject = '[T'.$task->getID().'] '.$task->getTitle();
	$view->addProperty(
	pht('From Email'),
	phutil_tag(
	'a',
	array(
	'href' => 'mailto:'.$source.'?subject='.$subject,
	),
	$source));
	}

	$edge_types = array(
	ManiphestTaskDependedOnByTaskEdgeType::EDGECONST
	=> pht('Blocks'),
	ManiphestTaskDependsOnTaskEdgeType::EDGECONST
	=> pht('Blocked By'),
	ManiphestTaskHasRevisionEdgeType::EDGECONST
	=> pht('Differential Revisions'),
	ManiphestTaskHasMockEdgeType::EDGECONST
	=> pht('Pholio Mocks'),
	);

	$revisions_commits = array();

	$commit_phids = array_keys(
	$edges[ManiphestTaskHasCommitEdgeType::EDGECONST]);
	if ($commit_phids) {
	$commit_drev = DiffusionCommitHasRevisionEdgeType::EDGECONST;
	$drev_edges = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs($commit_phids)
	->withEdgeTypes(array($commit_drev))
	->execute();

	foreach ($commit_phids as $phid) {
	$revisions_commits[$phid] = $handles->renderHandle($phid);
	$revision_phid = key($drev_edges[$phid][$commit_drev]);
	$revision_handle = $handles->getHandleIfExists($revision_phid);
	if ($revision_handle) {
	$task_drev = ManiphestTaskHasRevisionEdgeType::EDGECONST;
	unset($edges[$task_drev][$revision_phid]);
	$revisions_commits[$phid] = hsprintf(
	'%s / %s',
	$revision_handle->renderLink($revision_handle->getName()),
	$revisions_commits[$phid]);
	}
	}
	}

	foreach ($edge_types as $edge_type => $edge_name) {
	if ($edges[$edge_type]) {
	$edge_handles = $viewer->loadHandles(array_keys($edges[$edge_type]));
	$view->addProperty(
	$edge_name,
	$edge_handles->renderList());
	}
	}

	if ($revisions_commits) {
	$view->addProperty(
	pht('Commits'),
	phutil_implode_html(phutil_tag('br'), $revisions_commits));
	}

	$view->invokeWillRenderEvent();

	$field_list->appendFieldsToPropertyList(
	$task,
	$viewer,
	$view);

	return $view;
	}

	private function buildDescriptionView(
	ManiphestTask $task,
	PhabricatorMarkupEngine $engine) {

	$section = null;
	if (strlen($task->getDescription())) {
	$section = new PHUIPropertyListView();
	$section->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);
	$section->addTextContent(
	phutil_tag(
	'div',
	array(
	'class' => 'phabricator-remarkup',
	),
	$engine->getOutput($task, ManiphestTask::MARKUP_FIELD_DESCRIPTION)));
	}

	return $section;
	}

	}
	diff --git a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
	index 702d0b2130..0ef4b83abd 100644
	--- a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
	+++ b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
	@@ -1,197 +1,196 @@
	<?php

	final class PhabricatorApplicationDetailViewController
	extends PhabricatorApplicationsController {


	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();
	$application = $request->getURIData('application');

	$selected = id(new PhabricatorApplicationQuery())
	->setViewer($viewer)
	->withClasses(array($application))
	->executeOne();
	if (!$selected) {
	return new Aphront404Response();
	}

	$title = $selected->getName();

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($selected->getName());

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($viewer)
	->setPolicyObject($selected);

	if ($selected->isInstalled()) {
	$header->setStatus('fa-check', 'bluegrey', pht('Installed'));
	} else {
	$header->setStatus('fa-ban', 'dark', pht('Uninstalled'));
	}

	$actions = $this->buildActionView($viewer, $selected);
	$properties = $this->buildPropertyView($selected, $actions);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$configs =
	PhabricatorApplicationConfigurationPanel::loadAllPanelsForApplication(
	$selected);

	$panels = array();
	foreach ($configs as $config) {
	$config->setViewer($viewer);
	$config->setApplication($selected);

	$panels[] = $config->buildConfigurationPagePanel();
	}

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$panels,
	),
	array(
	'title' => $title,
	));
	}

	private function buildPropertyView(
	PhabricatorApplication $application,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$properties = id(new PHUIPropertyListView());
	$properties->setActionList($actions);

	$properties->addProperty(
	pht('Description'),
	$application->getShortDescription());

	if ($application->getFlavorText()) {
	$properties->addProperty(
	null,
	phutil_tag('em', array(), $application->getFlavorText()));
	}

	if ($application->isPrototype()) {
	$proto_href = PhabricatorEnv::getDoclink(
	'User Guide: Prototype Applications');
	$learn_more = phutil_tag(
	'a',
	array(
	'href' => $proto_href,
	'target' => '_blank',
	),
	pht('Learn More'));

	$properties->addProperty(
	pht('Prototype'),
	pht(
	'This application is a prototype. %s',
	$learn_more));
	}

	$overview = $application->getOverview();
	if ($overview) {
	$properties->addSectionHeader(
	pht('Overview'), PHUIPropertyListView::ICON_SUMMARY);
	$properties->addTextContent(
	PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())->setContent($overview),
	'default',
	$viewer));
	}

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$application);

	$properties->addSectionHeader(
	pht('Policies'), 'fa-lock');

	foreach ($application->getCapabilities() as $capability) {
	$properties->addProperty(
	$application->getCapabilityLabel($capability),
	idx($descriptions, $capability));
	}

	return $properties;
	}

	private function buildActionView(
	PhabricatorUser $user,
	PhabricatorApplication $selected) {

	$view = id(new PhabricatorActionListView())
	- ->setUser($user)
	- ->setObjectURI($this->getRequest()->getRequestURI());
	+ ->setUser($user);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$user,
	$selected,
	PhabricatorPolicyCapability::CAN_EDIT);

	$edit_uri = $this->getApplicationURI('edit/'.get_class($selected).'/');

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Policies'))
	->setIcon('fa-pencil')
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit)
	->setHref($edit_uri));

	if ($selected->canUninstall()) {
	if ($selected->isInstalled()) {
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Uninstall'))
	->setIcon('fa-times')
	->setDisabled(!$can_edit)
	->setWorkflow(true)
	->setHref(
	$this->getApplicationURI(get_class($selected).'/uninstall/')));
	} else {
	$action = id(new PhabricatorActionView())
	->setName(pht('Install'))
	->setIcon('fa-plus')
	->setDisabled(!$can_edit)
	->setWorkflow(true)
	->setHref(
	$this->getApplicationURI(get_class($selected).'/install/'));

	$prototypes_enabled = PhabricatorEnv::getEnvConfig(
	'phabricator.show-prototypes');
	if ($selected->isPrototype() && !$prototypes_enabled) {
	$action->setDisabled(true);
	}

	$view->addAction($action);
	}
	} else {
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Uninstall'))
	->setIcon('fa-times')
	->setWorkflow(true)
	->setDisabled(true)
	->setHref(
	$this->getApplicationURI(get_class($selected).'/uninstall/')));
	}

	return $view;
	}

	}
	diff --git a/src/applications/nuance/controller/NuanceQueueViewController.php b/src/applications/nuance/controller/NuanceQueueViewController.php
	index d619cfb946..71e5e04ce7 100644
	--- a/src/applications/nuance/controller/NuanceQueueViewController.php
	+++ b/src/applications/nuance/controller/NuanceQueueViewController.php
	@@ -1,93 +1,92 @@
	<?php

	final class NuanceQueueViewController extends NuanceController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();

	$queue = id(new NuanceQueueQuery())
	->setViewer($viewer)
	->withIDs(array($request->getURIData('id')))
	->executeOne();
	if (!$queue) {
	return new Aphront404Response();
	}

	$title = $queue->getName();

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Queues'), $this->getApplicationURI('queue/'));
	$crumbs->addTextCrumb($queue->getName());

	$header = $this->buildHeaderView($queue);
	$actions = $this->buildActionView($queue);
	$properties = $this->buildPropertyView($queue, $actions);

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$timeline = $this->buildTransactionTimeline(
	$queue,
	new NuanceQueueTransactionQuery());
	$timeline->setShouldTerminate(true);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	private function buildHeaderView(NuanceQueue $queue) {
	$viewer = $this->getViewer();

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($queue->getName())
	->setPolicyObject($queue);

	return $header;
	}

	private function buildActionView(NuanceQueue $queue) {
	$viewer = $this->getViewer();
	$id = $queue->getID();

	$actions = id(new PhabricatorActionListView())
	- ->setObjectURI($queue->getURI())
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$queue,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Queue'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("queue/edit/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	return $actions;
	}

	private function buildPropertyView(
	NuanceQueue $queue,
	PhabricatorActionListView $actions) {
	$viewer = $this->getViewer();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($queue)
	->setActionList($actions);

	return $properties;
	}
	}
	diff --git a/src/applications/nuance/controller/NuanceSourceViewController.php b/src/applications/nuance/controller/NuanceSourceViewController.php
	index 7b8d9e8251..78d6949455 100644
	--- a/src/applications/nuance/controller/NuanceSourceViewController.php
	+++ b/src/applications/nuance/controller/NuanceSourceViewController.php
	@@ -1,134 +1,133 @@
	<?php

	final class NuanceSourceViewController extends NuanceController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();

	$source = id(new NuanceSourceQuery())
	->setViewer($viewer)
	->withIDs(array($request->getURIData('id')))
	->executeOne();
	if (!$source) {
	return new Aphront404Response();
	}

	$source_id = $source->getID();

	$timeline = $this->buildTransactionTimeline(
	$source,
	new NuanceSourceTransactionQuery());
	$timeline->setShouldTerminate(true);

	$header = $this->buildHeaderView($source);
	$actions = $this->buildActionView($source);
	$properties = $this->buildPropertyView($source, $actions);

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$title = $source->getName();
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Sources'), $this->getApplicationURI('source/'));

	$crumbs->addTextCrumb($title);


	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$source,
	PhabricatorPolicyCapability::CAN_EDIT);

	$routing_list = id(new PHUIPropertyListView())
	->addProperty(
	pht('Default Queue'),
	$viewer->renderHandle($source->getDefaultQueuePHID()));

	$routing_header = id(new PHUIHeaderView())
	->setHeader(pht('Routing Rules'));

	$routing = id(new PHUIObjectBoxView())
	->setHeader($routing_header)
	->addPropertyList($routing_list);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$routing,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	private function buildHeaderView(NuanceSource $source) {
	$viewer = $this->getViewer();

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($source->getName())
	->setPolicyObject($source);

	return $header;
	}

	private function buildActionView(NuanceSource $source) {
	$viewer = $this->getViewer();
	$id = $source->getID();

	$actions = id(new PhabricatorActionListView())
	- ->setObjectURI($source->getURI())
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$source,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Source'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("source/edit/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$request = $this->getRequest();
	$definition = $source->requireDefinition();
	$source_actions = $definition->getSourceViewActions($request);
	foreach ($source_actions as $source_action) {
	$actions->addAction($source_action);
	}

	return $actions;
	}

	private function buildPropertyView(
	NuanceSource $source,
	PhabricatorActionListView $actions) {
	$viewer = $this->getRequest()->getUser();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($source)
	->setActionList($actions);

	$definition = $source->requireDefinition();
	$properties->addProperty(
	pht('Source Type'),
	$definition->getName());

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$source);

	$properties->addProperty(
	pht('Editable By'),
	$descriptions[PhabricatorPolicyCapability::CAN_EDIT]);

	return $properties;
	}
	}
	diff --git a/src/applications/passphrase/controller/PassphraseCredentialViewController.php b/src/applications/passphrase/controller/PassphraseCredentialViewController.php
	index 46ae06cdc7..c156be81ce 100644
	--- a/src/applications/passphrase/controller/PassphraseCredentialViewController.php
	+++ b/src/applications/passphrase/controller/PassphraseCredentialViewController.php
	@@ -1,210 +1,209 @@
	<?php

	final class PassphraseCredentialViewController extends PassphraseController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$credential = id(new PassphraseCredentialQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$credential) {
	return new Aphront404Response();
	}

	$type = PassphraseCredentialType::getTypeByConstant(
	$credential->getCredentialType());
	if (!$type) {
	throw new Exception(pht('Credential has invalid type "%s"!', $type));
	}

	$timeline = $this->buildTransactionTimeline(
	$credential,
	new PassphraseCredentialTransactionQuery());
	$timeline->setShouldTerminate(true);

	$title = pht('%s %s', 'K'.$credential->getID(), $credential->getName());
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb('K'.$credential->getID());

	$header = $this->buildHeaderView($credential);
	$actions = $this->buildActionView($credential, $type);
	$properties = $this->buildPropertyView($credential, $type, $actions);

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	private function buildHeaderView(PassphraseCredential $credential) {
	$viewer = $this->getRequest()->getUser();

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($credential->getName())
	->setPolicyObject($credential);

	if ($credential->getIsDestroyed()) {
	$header->setStatus('fa-ban', 'red', pht('Destroyed'));
	}

	return $header;
	}

	private function buildActionView(
	PassphraseCredential $credential,
	PassphraseCredentialType $type) {
	$viewer = $this->getRequest()->getUser();

	$id = $credential->getID();

	$is_locked = $credential->getIsLocked();
	if ($is_locked) {
	$credential_lock_text = pht('Locked Permanently');
	$credential_lock_icon = 'fa-lock';
	} else {
	$credential_lock_text = pht('Lock Permanently');
	$credential_lock_icon = 'fa-unlock';
	}

	$allow_conduit = $credential->getAllowConduit();
	if ($allow_conduit) {
	$credential_conduit_text = pht('Prevent Conduit Access');
	$credential_conduit_icon = 'fa-ban';
	} else {
	$credential_conduit_text = pht('Allow Conduit Access');
	$credential_conduit_icon = 'fa-wrench';
	}

	$actions = id(new PhabricatorActionListView())
	- ->setObjectURI('/K'.$id)
	->setObject($credential)
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$credential,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Credential'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("edit/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	if (!$credential->getIsDestroyed()) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Destroy Credential'))
	->setIcon('fa-times')
	->setHref($this->getApplicationURI("destroy/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(true));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Show Secret'))
	->setIcon('fa-eye')
	->setHref($this->getApplicationURI("reveal/{$id}/"))
	->setDisabled(!$can_edit \|\| $is_locked)
	->setWorkflow(true));

	if ($type->hasPublicKey()) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Show Public Key'))
	->setIcon('fa-download')
	->setHref($this->getApplicationURI("public/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	}

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName($credential_conduit_text)
	->setIcon($credential_conduit_icon)
	->setHref($this->getApplicationURI("conduit/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(true));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName($credential_lock_text)
	->setIcon($credential_lock_icon)
	->setHref($this->getApplicationURI("lock/{$id}/"))
	->setDisabled(!$can_edit \|\| $is_locked)
	->setWorkflow(true));
	}


	return $actions;
	}

	private function buildPropertyView(
	PassphraseCredential $credential,
	PassphraseCredentialType $type,
	PhabricatorActionListView $actions) {
	$viewer = $this->getRequest()->getUser();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($credential)
	->setActionList($actions);

	$properties->addProperty(
	pht('Credential Type'),
	$type->getCredentialTypeName());

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$credential);

	$properties->addProperty(
	pht('Editable By'),
	$descriptions[PhabricatorPolicyCapability::CAN_EDIT]);

	if ($type->shouldRequireUsername()) {
	$properties->addProperty(
	pht('Username'),
	$credential->getUsername());
	}

	$used_by_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$credential->getPHID(),
	PhabricatorCredentialsUsedByObjectEdgeType::EDGECONST);

	if ($used_by_phids) {
	$properties->addProperty(
	pht('Used By'),
	$viewer->renderHandleList($used_by_phids));
	}

	$properties->invokeWillRenderEvent();

	$description = $credential->getDescription();
	if (strlen($description)) {
	$properties->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);
	$properties->addTextContent(
	new PHUIRemarkupView($viewer, $description));
	}

	return $properties;
	}

	}
	diff --git a/src/applications/paste/controller/PhabricatorPasteViewController.php b/src/applications/paste/controller/PhabricatorPasteViewController.php
	index 33766958d9..530b2245c5 100644
	--- a/src/applications/paste/controller/PhabricatorPasteViewController.php
	+++ b/src/applications/paste/controller/PhabricatorPasteViewController.php
	@@ -1,209 +1,208 @@
	<?php

	final class PhabricatorPasteViewController extends PhabricatorPasteController {

	private $highlightMap;

	public function shouldAllowPublic() {
	return true;
	}

	public function willProcessRequest(array $data) {
	$raw_lines = idx($data, 'lines');
	$map = array();
	if ($raw_lines) {
	$lines = explode('-', $raw_lines);
	$first = idx($lines, 0, 0);
	$last = idx($lines, 1);
	if ($last) {
	$min = min($first, $last);
	$max = max($first, $last);
	$map = array_fuse(range($min, $max));
	} else {
	$map[$first] = $first;
	}
	}
	$this->highlightMap = $map;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$paste = id(new PhabricatorPasteQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needContent(true)
	->needRawContent(true)
	->executeOne();
	if (!$paste) {
	return new Aphront404Response();
	}

	$forks = id(new PhabricatorPasteQuery())
	->setViewer($viewer)
	->withParentPHIDs(array($paste->getPHID()))
	->execute();
	$fork_phids = mpull($forks, 'getPHID');

	$header = $this->buildHeaderView($paste);
	$actions = $this->buildActionView($viewer, $paste);
	$properties = $this->buildPropertyView($paste, $fork_phids, $actions);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$source_code = $this->buildSourceCodeView($paste, $this->highlightMap);

	require_celerity_resource('paste-css');
	$source_code = phutil_tag(
	'div',
	array(
	'class' => 'container-of-paste',
	),
	$source_code);

	$monogram = $paste->getMonogram();
	$crumbs = $this->buildApplicationCrumbs()
	->addTextCrumb($monogram, '/'.$monogram);

	$timeline = $this->buildTransactionTimeline(
	$paste,
	new PhabricatorPasteTransactionQuery());

	$comment_view = id(new PhabricatorPasteEditEngine())
	->setViewer($viewer)
	->buildEditEngineCommentView($paste);

	$timeline->setQuoteRef($monogram);
	$comment_view->setTransactionTimeline($timeline);

	return $this->newPage()
	->setTitle($paste->getFullName())
	->setCrumbs($crumbs)
	->setPageObjectPHIDs(
	array(
	$paste->getPHID(),
	))
	->appendChild(
	array(
	$object_box,
	$source_code,
	$timeline,
	$comment_view,
	));
	}

	private function buildHeaderView(PhabricatorPaste $paste) {
	$title = (nonempty($paste->getTitle())) ?
	$paste->getTitle() : pht('(An Untitled Masterwork)');

	if ($paste->isArchived()) {
	$header_icon = 'fa-ban';
	$header_name = pht('Archived');
	$header_color = 'dark';
	} else {
	$header_icon = 'fa-check';
	$header_name = pht('Active');
	$header_color = 'bluegrey';
	}

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($this->getRequest()->getUser())
	->setStatus($header_icon, $header_color, $header_name)
	->setPolicyObject($paste);

	return $header;
	}

	private function buildActionView(
	PhabricatorUser $viewer,
	PhabricatorPaste $paste) {

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$paste,
	PhabricatorPolicyCapability::CAN_EDIT);

	$id = $paste->getID();

	$action_list = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($paste)
	- ->setObjectURI($this->getRequest()->getRequestURI());
	+ ->setObject($paste);

	$action_list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Paste'))
	->setIcon('fa-pencil')
	->setDisabled(!$can_edit)
	->setHref($this->getApplicationURI("edit/{$id}/")));

	if ($paste->isArchived()) {
	$action_list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Activate Paste'))
	->setIcon('fa-check')
	->setDisabled(!$can_edit)
	->setWorkflow($can_edit)
	->setHref($this->getApplicationURI("archive/{$id}/")));
	} else {
	$action_list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Archive Paste'))
	->setIcon('fa-ban')
	->setDisabled(!$can_edit)
	->setWorkflow($can_edit)
	->setHref($this->getApplicationURI("archive/{$id}/")));
	}

	$action_list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View Raw File'))
	->setIcon('fa-file-text-o')
	->setHref($this->getApplicationURI("raw/{$id}/")));

	return $action_list;
	}

	private function buildPropertyView(
	PhabricatorPaste $paste,
	array $child_phids,
	PhabricatorActionListView $actions) {
	$viewer = $this->getViewer();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($paste)
	->setActionList($actions);

	$properties->addProperty(
	pht('Author'),
	$viewer->renderHandle($paste->getAuthorPHID()));

	$properties->addProperty(
	pht('Created'),
	phabricator_datetime($paste->getDateCreated(), $viewer));

	if ($paste->getParentPHID()) {
	$properties->addProperty(
	pht('Forked From'),
	$viewer->renderHandle($paste->getParentPHID()));
	}

	if ($child_phids) {
	$properties->addProperty(
	pht('Forks'),
	$viewer->renderHandleList($child_phids));
	}

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$paste);

	return $properties;
	}

	}
	diff --git a/src/applications/people/controller/PhabricatorPeopleProfileController.php b/src/applications/people/controller/PhabricatorPeopleProfileController.php
	index b61d93f0e2..a4378f380c 100644
	--- a/src/applications/people/controller/PhabricatorPeopleProfileController.php
	+++ b/src/applications/people/controller/PhabricatorPeopleProfileController.php
	@@ -1,258 +1,257 @@
	<?php

	final class PhabricatorPeopleProfileController
	extends PhabricatorPeopleController {

	private $username;

	public function shouldAllowPublic() {
	return true;
	}

	public function shouldRequireAdmin() {
	return false;
	}

	public function willProcessRequest(array $data) {
	$this->username = idx($data, 'username');
	}

	public function processRequest() {
	$viewer = $this->getRequest()->getUser();

	$user = id(new PhabricatorPeopleQuery())
	->setViewer($viewer)
	->withUsernames(array($this->username))
	->needBadges(true)
	->needProfileImage(true)
	->needAvailability(true)
	->executeOne();
	if (!$user) {
	return new Aphront404Response();
	}

	$profile = $user->loadUserProfile();
	$username = phutil_escape_uri($user->getUserName());

	$picture = $user->getProfileImageURI();

	$header = id(new PHUIHeaderView())
	->setHeader($user->getFullName())
	->setSubheader($profile->getTitle())
	->setImage($picture);

	$actions = id(new PhabricatorActionListView())
	->setObject($user)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$user,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Profile'))
	->setHref($this->getApplicationURI('editprofile/'.$user->getID().'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-picture-o')
	->setName(pht('Edit Profile Picture'))
	->setHref($this->getApplicationURI('picture/'.$user->getID().'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$class = 'PhabricatorConpherenceApplication';
	if (PhabricatorApplication::isClassInstalledForViewer($class, $viewer)) {
	$href = id(new PhutilURI('/conpherence/new/'))
	->setQueryParam('participant', $user->getPHID());

	$can_send = $viewer->isLoggedIn();

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-comments')
	->setName(pht('Send Message'))
	->setWorkflow(true)
	->setDisabled(!$can_send)
	->setHref($href));
	}

	if ($viewer->getIsAdmin()) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-wrench')
	->setName(pht('Edit Settings'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit)
	->setHref('/settings/'.$user->getID().'/'));

	if ($user->getIsAdmin()) {
	$empower_icon = 'fa-arrow-circle-o-down';
	$empower_name = pht('Remove Administrator');
	} else {
	$empower_icon = 'fa-arrow-circle-o-up';
	$empower_name = pht('Make Administrator');
	}

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon($empower_icon)
	->setName($empower_name)
	->setDisabled(($user->getPHID() == $viewer->getPHID()))
	->setWorkflow(true)
	->setHref($this->getApplicationURI('empower/'.$user->getID().'/')));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-tag')
	->setName(pht('Change Username'))
	->setWorkflow(true)
	->setHref($this->getApplicationURI('rename/'.$user->getID().'/')));

	if ($user->getIsDisabled()) {
	$disable_icon = 'fa-check-circle-o';
	$disable_name = pht('Enable User');
	} else {
	$disable_icon = 'fa-ban';
	$disable_name = pht('Disable User');
	}

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon($disable_icon)
	->setName($disable_name)
	->setDisabled(($user->getPHID() == $viewer->getPHID()))
	->setWorkflow(true)
	->setHref($this->getApplicationURI('disable/'.$user->getID().'/')));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-times')
	->setName(pht('Delete User'))
	->setDisabled(($user->getPHID() == $viewer->getPHID()))
	->setWorkflow(true)
	->setHref($this->getApplicationURI('delete/'.$user->getID().'/')));

	$can_welcome = $user->canEstablishWebSessions();

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-envelope')
	->setName(pht('Send Welcome Email'))
	->setWorkflow(true)
	->setDisabled(!$can_welcome)
	->setHref($this->getApplicationURI('welcome/'.$user->getID().'/')));
	}

	$properties = $this->buildPropertyView($user, $actions);
	$name = $user->getUsername();

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($name);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$feed = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Recent Activity'))
	->appendChild($this->buildPeopleFeed($user, $viewer));

	$badges = $this->buildBadgesView($user);

	$nav = $this->buildIconNavView($user);
	$nav->selectFilter("{$name}/");
	$nav->appendChild($object_box);
	$nav->appendChild($badges);
	$nav->appendChild($feed);

	return $this->buildApplicationPage(
	$nav,
	array(
	'title' => $user->getUsername(),
	));
	}

	private function buildPropertyView(
	PhabricatorUser $user,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();
	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($user)
	->setActionList($actions);

	$field_list = PhabricatorCustomField::getObjectFields(
	$user,
	PhabricatorCustomField::ROLE_VIEW);
	$field_list->appendFieldsToPropertyList($user, $viewer, $view);

	return $view;
	}

	private function buildBadgesView(
	PhabricatorUser $user) {

	$viewer = $this->getViewer();
	$class = 'PhabricatorBadgesApplication';
	$box = null;

	if (PhabricatorApplication::isClassInstalledForViewer($class, $viewer)) {
	$badge_phids = $user->getBadgePHIDs();
	if ($badge_phids) {
	$badges = id(new PhabricatorBadgesQuery())
	->setViewer($viewer)
	->withPHIDs($badge_phids)
	->withStatuses(array(PhabricatorBadgesBadge::STATUS_ACTIVE))
	->execute();

	$flex = new PHUIBadgeBoxView();
	foreach ($badges as $badge) {
	$item = id(new PHUIBadgeView())
	->setIcon($badge->getIcon())
	->setHeader($badge->getName())
	->setSubhead($badge->getFlavor())
	->setQuality($badge->getQuality());
	$flex->addItem($item);
	}

	$box = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Badges'))
	->appendChild($flex);
	}
	}
	return $box;
	}

	private function buildPeopleFeed(
	PhabricatorUser $user,
	$viewer) {

	$query = new PhabricatorFeedQuery();
	$query->setFilterPHIDs(
	array(
	$user->getPHID(),
	));
	$query->setLimit(100);
	$query->setViewer($viewer);
	$stories = $query->execute();

	$builder = new PhabricatorFeedBuilder($stories);
	$builder->setUser($viewer);
	$builder->setShowHovercards(true);
	$builder->setNoDataString(pht('To begin on such a grand journey, '.
	'requires but just a single step.'));
	$view = $builder->buildView();

	return phutil_tag_div('phabricator-project-feed', $view->render());

	}

	}
	diff --git a/src/applications/phame/controller/blog/PhameBlogManageController.php b/src/applications/phame/controller/blog/PhameBlogManageController.php
	index 36cf7a4ddb..0402245d41 100644
	--- a/src/applications/phame/controller/blog/PhameBlogManageController.php
	+++ b/src/applications/phame/controller/blog/PhameBlogManageController.php
	@@ -1,184 +1,183 @@
	<?php

	final class PhameBlogManageController extends PhameBlogController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$blog = id(new PhameBlogQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needProfileImage(true)
	->executeOne();
	if (!$blog) {
	return new Aphront404Response();
	}

	if ($blog->isArchived()) {
	$header_icon = 'fa-ban';
	$header_name = pht('Archived');
	$header_color = 'dark';
	} else {
	$header_icon = 'fa-check';
	$header_name = pht('Active');
	$header_color = 'bluegrey';
	}

	$picture = $blog->getProfileImageURI();

	$header = id(new PHUIHeaderView())
	->setHeader($blog->getName())
	->setUser($viewer)
	->setPolicyObject($blog)
	->setImage($picture)
	->setStatus($header_icon, $header_color, $header_name);

	$actions = $this->renderActions($blog, $viewer);
	$properties = $this->renderProperties($blog, $viewer, $actions);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(
	pht('Blogs'),
	$this->getApplicationURI('blog/'));
	$crumbs->addTextCrumb(
	$blog->getName());

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$timeline = $this->buildTransactionTimeline(
	$blog,
	new PhameBlogTransactionQuery());
	$timeline->setShouldTerminate(true);

	return $this->newPage()
	->setTitle($blog->getName())
	->setCrumbs($crumbs)
	->appendChild(
	array(
	$object_box,
	$timeline,
	));
	}

	private function renderProperties(
	PhameBlog $blog,
	PhabricatorUser $viewer,
	PhabricatorActionListView $actions) {

	require_celerity_resource('aphront-tooltip-css');
	Javelin::initBehavior('phabricator-tooltips');

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($blog)
	->setActionList($actions);

	$domain = $blog->getDomain();
	if (!$domain) {
	$domain = phutil_tag('em', array(), pht('No external domain'));
	}

	$properties->addProperty(pht('Domain'), $domain);

	$feed_uri = PhabricatorEnv::getProductionURI(
	$this->getApplicationURI('blog/feed/'.$blog->getID().'/'));
	$properties->addProperty(
	pht('Atom URI'),
	javelin_tag('a',
	array(
	'href' => $feed_uri,
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => pht('Atom URI does not support custom domains.'),
	'size' => 320,
	),
	),
	$feed_uri));

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$blog);

	$properties->addProperty(
	pht('Editable By'),
	$descriptions[PhabricatorPolicyCapability::CAN_EDIT]);

	$engine = id(new PhabricatorMarkupEngine())
	->setViewer($viewer)
	->addObject($blog, PhameBlog::MARKUP_FIELD_DESCRIPTION)
	->process();

	$properties->invokeWillRenderEvent();

	if (strlen($blog->getDescription())) {
	$description = PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())->setContent($blog->getDescription()),
	'default',
	$viewer);
	$properties->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);
	$properties->addTextContent($description);
	}

	return $properties;
	}

	private function renderActions(PhameBlog $blog, PhabricatorUser $viewer) {
	$actions = id(new PhabricatorActionListView())
	->setObject($blog)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$blog,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI('blog/edit/'.$blog->getID().'/'))
	->setName(pht('Edit Blog'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-picture-o')
	->setHref($this->getApplicationURI('blog/picture/'.$blog->getID().'/'))
	->setName(pht('Edit Blog Picture'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	if ($blog->isArchived()) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Activate Blog'))
	->setIcon('fa-check')
	->setHref(
	$this->getApplicationURI('blog/archive/'.$blog->getID().'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	} else {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Archive Blog'))
	->setIcon('fa-ban')
	->setHref(
	$this->getApplicationURI('blog/archive/'.$blog->getID().'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	}

	return $actions;
	}

	}
	diff --git a/src/applications/phame/controller/blog/PhameBlogViewController.php b/src/applications/phame/controller/blog/PhameBlogViewController.php
	index 6c5836e997..dd963a327b 100644
	--- a/src/applications/phame/controller/blog/PhameBlogViewController.php
	+++ b/src/applications/phame/controller/blog/PhameBlogViewController.php
	@@ -1,143 +1,142 @@
	<?php

	final class PhameBlogViewController extends PhameLiveController {

	public function handleRequest(AphrontRequest $request) {
	$response = $this->setupLiveEnvironment();
	if ($response) {
	return $response;
	}

	$viewer = $this->getViewer();
	$blog = $this->getBlog();

	$is_live = $this->getIsLive();
	$is_external = $this->getIsExternal();

	$pager = id(new AphrontCursorPagerView())
	->readFromRequest($request);

	$post_query = id(new PhamePostQuery())
	->setViewer($viewer)
	->withBlogPHIDs(array($blog->getPHID()));

	if ($is_live) {
	$post_query->withVisibility(PhameConstants::VISIBILITY_PUBLISHED);
	}

	$posts = $post_query->executeWithCursorPager($pager);

	$header = id(new PHUIHeaderView())
	->setHeader($blog->getName())
	->setUser($viewer);

	if (!$is_external) {
	if ($blog->isArchived()) {
	$header_icon = 'fa-ban';
	$header_name = pht('Archived');
	$header_color = 'dark';
	} else {
	$header_icon = 'fa-check';
	$header_name = pht('Active');
	$header_color = 'bluegrey';
	}
	$header->setStatus($header_icon, $header_color, $header_name);

	$actions = $this->renderActions($blog);
	$action_button = id(new PHUIButtonView())
	->setTag('a')
	->setText(pht('Actions'))
	->setHref('#')
	->setIconFont('fa-bars')
	->addClass('phui-mobile-menu')
	->setDropdownMenu($actions);

	$header->addActionLink($action_button);

	$header->setPolicyObject($blog);
	}

	$post_list = id(new PhamePostListView())
	->setPosts($posts)
	->setViewer($viewer)
	->setIsExternal($is_external)
	->setIsLive($is_live)
	->setNodata(pht('This blog has no visible posts.'));

	$page = id(new PHUIDocumentViewPro())
	->setHeader($header)
	->appendChild($post_list);

	$description = null;
	if (strlen($blog->getDescription())) {
	$description = new PHUIRemarkupView(
	$viewer,
	$blog->getDescription());
	} else {
	$description = phutil_tag('em', array(), pht('No description.'));
	}

	$about = id(new PhameDescriptionView())
	->setTitle(pht('About %s', $blog->getName()))
	->setDescription($description)
	->setImage($blog->getProfileImageURI());

	$crumbs = $this->buildApplicationCrumbs();

	$page = $this->newPage()
	->setTitle($blog->getName())
	->setPageObjectPHIDs(array($blog->getPHID()))
	->setCrumbs($crumbs)
	->appendChild(
	array(
	$page,
	$about,
	));

	if ($is_live) {
	$page
	->setShowChrome(false)
	->setShowFooter(false);
	}

	return $page;
	}

	private function renderActions(PhameBlog $blog) {
	$viewer = $this->getViewer();

	$actions = id(new PhabricatorActionListView())
	->setObject($blog)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$blog,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-plus')
	->setHref($this->getApplicationURI('post/edit/?blog='.$blog->getID()))
	->setName(pht('Write Post'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setUser($viewer)
	->setIcon('fa-globe')
	->setHref($blog->getLiveURI())
	->setName(pht('View Live')));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI('blog/manage/'.$blog->getID().'/'))
	->setName(pht('Manage Blog')));

	return $actions;
	}

	}
	diff --git a/src/applications/phame/controller/post/PhamePostViewController.php b/src/applications/phame/controller/post/PhamePostViewController.php
	index f49bd0e727..240f8f3a69 100644
	--- a/src/applications/phame/controller/post/PhamePostViewController.php
	+++ b/src/applications/phame/controller/post/PhamePostViewController.php
	@@ -1,240 +1,239 @@
	<?php

	final class PhamePostViewController
	extends PhameLiveController {

	public function handleRequest(AphrontRequest $request) {
	$response = $this->setupLiveEnvironment();
	if ($response) {
	return $response;
	}

	$viewer = $request->getViewer();
	$moved = $request->getStr('moved');

	$post = $this->getPost();
	$blog = $this->getBlog();

	$is_live = $this->getIsLive();
	$is_external = $this->getIsExternal();

	$header = id(new PHUIHeaderView())
	->setHeader($post->getTitle())
	->setUser($viewer);

	if (!$is_external) {
	$actions = $this->renderActions($post);

	$action_button = id(new PHUIButtonView())
	->setTag('a')
	->setText(pht('Actions'))
	->setHref('#')
	->setIconFont('fa-bars')
	->addClass('phui-mobile-menu')
	->setDropdownMenu($actions);

	$header->setPolicyObject($post);
	$header->addActionLink($action_button);
	}

	$document = id(new PHUIDocumentViewPro())
	->setHeader($header);

	if ($moved) {
	$document->appendChild(
	id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
	->appendChild(pht('Post moved successfully.')));
	}

	if ($post->isDraft()) {
	$document->appendChild(
	id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
	->setTitle(pht('Draft Post'))
	->appendChild(
	pht('Only you can see this draft until you publish it. '.
	'Use "Publish" to publish this post.')));
	}

	if (!$post->getBlog()) {
	$document->appendChild(
	id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_WARNING)
	->setTitle(pht('Not On A Blog'))
	->appendChild(
	pht('This post is not associated with a blog (the blog may have '.
	'been deleted). Use "Move Post" to move it to a new blog.')));
	}

	$engine = id(new PhabricatorMarkupEngine())
	->setViewer($viewer)
	->addObject($post, PhamePost::MARKUP_FIELD_BODY)
	->process();

	$document->appendChild(
	phutil_tag(
	'div',
	array(
	'class' => 'phabricator-remarkup',
	),
	$engine->getOutput($post, PhamePost::MARKUP_FIELD_BODY)));

	$blogger = id(new PhabricatorPeopleQuery())
	->setViewer($viewer)
	->withPHIDs(array($post->getBloggerPHID()))
	->needProfileImage(true)
	->executeOne();
	$blogger_profile = $blogger->loadUserProfile();

	$author = phutil_tag(
	'a',
	array(
	'href' => '/p/'.$blogger->getUsername().'/',
	),
	$blogger->getUsername());

	$date = phabricator_datetime($post->getDatePublished(), $viewer);
	if ($post->isDraft()) {
	$subtitle = pht('Unpublished draft by %s.', $author);
	} else {
	$subtitle = pht('Written by %s on %s.', $author, $date);
	}

	$about = id(new PhameDescriptionView())
	->setTitle($subtitle)
	->setDescription($blogger_profile->getTitle())
	->setImage($blogger->getProfileImageURI())
	->setImageHref('/p/'.$blogger->getUsername());

	$timeline = $this->buildTransactionTimeline(
	$post,
	id(new PhamePostTransactionQuery())
	->withTransactionTypes(array(PhabricatorTransactions::TYPE_COMMENT)));
	$timeline = phutil_tag_div('phui-document-view-pro-box', $timeline);

	if ($is_external) {
	$add_comment = null;
	} else {
	$add_comment = $this->buildCommentForm($post);
	$add_comment = phutil_tag_div('mlb mlt', $add_comment);
	}

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($post);

	$properties->invokeWillRenderEvent();

	$crumbs = $this->buildApplicationCrumbs();

	$page = $this->newPage()
	->setTitle($post->getTitle())
	->setPageObjectPHIDs(array($post->getPHID()))
	->setCrumbs($crumbs)
	->appendChild(
	array(
	$document,
	$about,
	$properties,
	$timeline,
	$add_comment,
	));

	if ($is_live) {
	$page
	->setShowChrome(false)
	->setShowFooter(false);
	}

	return $page;
	}

	private function renderActions(PhamePost $post) {
	$viewer = $this->getViewer();

	$actions = id(new PhabricatorActionListView())
	->setObject($post)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$post,
	PhabricatorPolicyCapability::CAN_EDIT);

	$id = $post->getID();

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI('post/edit/'.$id.'/'))
	->setName(pht('Edit Post'))
	->setDisabled(!$can_edit));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-arrows')
	->setHref($this->getApplicationURI('post/move/'.$id.'/'))
	->setName(pht('Move Post'))
	->setDisabled(!$can_edit)
	->setWorkflow(true));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-history')
	->setHref($this->getApplicationURI('post/history/'.$id.'/'))
	->setName(pht('View History')));

	if ($post->isDraft()) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-eye')
	->setHref($this->getApplicationURI('post/publish/'.$id.'/'))
	->setName(pht('Publish'))
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	} else {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-eye-slash')
	->setHref($this->getApplicationURI('post/unpublish/'.$id.'/'))
	->setName(pht('Unpublish'))
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	}

	if ($post->isDraft()) {
	$live_name = pht('Preview');
	} else {
	$live_name = pht('View Live');
	}

	$actions->addAction(
	id(new PhabricatorActionView())
	->setUser($viewer)
	->setIcon('fa-globe')
	->setHref($post->getLiveURI())
	->setName($live_name));

	return $actions;
	}

	private function buildCommentForm(PhamePost $post) {
	$viewer = $this->getViewer();

	$draft = PhabricatorDraft::newFromUserAndKey(
	$viewer, $post->getPHID());

	$box = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($post->getPHID())
	->setDraft($draft)
	->setHeaderText(pht('Add Comment'))
	->setAction($this->getApplicationURI('post/comment/'.$post->getID().'/'))
	->setSubmitButtonName(pht('Add Comment'));

	return phutil_tag_div('phui-document-view-pro-box', $box);
	}

	}
	diff --git a/src/applications/phlux/controller/PhluxViewController.php b/src/applications/phlux/controller/PhluxViewController.php
	index f45154a158..384e15b57e 100644
	--- a/src/applications/phlux/controller/PhluxViewController.php
	+++ b/src/applications/phlux/controller/PhluxViewController.php
	@@ -1,75 +1,74 @@
	<?php

	final class PhluxViewController extends PhluxController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();
	$key = $request->getURIData('key');

	$var = id(new PhluxVariableQuery())
	->setViewer($viewer)
	->withKeys(array($key))
	->executeOne();

	if (!$var) {
	return new Aphront404Response();
	}

	$crumbs = $this->buildApplicationCrumbs();

	$title = $var->getVariableKey();

	$crumbs->addTextCrumb($title, $request->getRequestURI());

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($viewer)
	->setPolicyObject($var);

	$actions = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($request->getRequestURI())
	->setObject($var);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$var,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Variable'))
	->setHref($this->getApplicationURI('/edit/'.$var->getVariableKey().'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$display_value = json_encode($var->getVariableValue());

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($var)
	->setActionList($actions)
	->addProperty(pht('Value'), $display_value);

	$timeline = $this->buildTransactionTimeline(
	$var,
	new PhluxTransactionQuery());
	$timeline->setShouldTerminate(true);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	}
	diff --git a/src/applications/pholio/controller/PholioMockViewController.php b/src/applications/pholio/controller/PholioMockViewController.php
	index bd6573e7d4..78c1d4bfe9 100644
	--- a/src/applications/pholio/controller/PholioMockViewController.php
	+++ b/src/applications/pholio/controller/PholioMockViewController.php
	@@ -1,226 +1,225 @@
	<?php

	final class PholioMockViewController extends PholioController {

	private $maniphestTaskPHIDs = array();

	private function setManiphestTaskPHIDs($maniphest_task_phids) {
	$this->maniphestTaskPHIDs = $maniphest_task_phids;
	return $this;
	}
	private function getManiphestTaskPHIDs() {
	return $this->maniphestTaskPHIDs;
	}

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');
	$image_id = $request->getURIData('imageID');

	$mock = id(new PholioMockQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needImages(true)
	->needInlineComments(true)
	->executeOne();

	if (!$mock) {
	return new Aphront404Response();
	}

	$phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$mock->getPHID(),
	PholioMockHasTaskEdgeType::EDGECONST);
	$this->setManiphestTaskPHIDs($phids);

	$engine = id(new PhabricatorMarkupEngine())
	->setViewer($viewer);
	$engine->addObject($mock, PholioMock::MARKUP_FIELD_DESCRIPTION);

	$title = $mock->getName();

	if ($mock->isClosed()) {
	$header_icon = 'fa-ban';
	$header_name = pht('Closed');
	$header_color = 'dark';
	} else {
	$header_icon = 'fa-square-o';
	$header_name = pht('Open');
	$header_color = 'bluegrey';
	}

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($viewer)
	->setStatus($header_icon, $header_color, $header_name)
	->setPolicyObject($mock);

	$timeline = $this->buildTransactionTimeline(
	$mock,
	new PholioTransactionQuery(),
	$engine);
	$timeline->setMock($mock);

	$actions = $this->buildActionView($mock);
	$properties = $this->buildPropertyView($mock, $engine, $actions);

	require_celerity_resource('pholio-css');
	require_celerity_resource('pholio-inline-comments-css');

	$comment_form_id = celerity_generate_unique_node_id();
	$mock_view = id(new PholioMockImagesView())
	->setRequestURI($request->getRequestURI())
	->setCommentFormID($comment_form_id)
	->setUser($viewer)
	->setMock($mock)
	->setImageID($image_id);

	$output = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Image'))
	->appendChild($mock_view);

	$add_comment = $this->buildAddCommentView($mock, $comment_form_id);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb('M'.$mock->getID(), '/M'.$mock->getID());

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$thumb_grid = id(new PholioMockThumbGridView())
	->setUser($viewer)
	->setMock($mock);

	return $this->newPage()
	->setTitle('M'.$mock->getID().' '.$title)
	->setCrumbs($crumbs)
	->setPageObjectPHIDs(array($mock->getPHID()))
	->addQuicksandConfig(
	array('mockViewConfig' => $mock_view->getBehaviorConfig()))
	->appendChild(
	array(
	$object_box,
	$output,
	$thumb_grid,
	$timeline,
	$add_comment,
	));
	}

	private function buildActionView(PholioMock $mock) {
	$viewer = $this->getViewer();

	$actions = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($mock);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$mock,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Mock'))
	->setHref($this->getApplicationURI('/edit/'.$mock->getID().'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	if ($mock->isClosed()) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-check')
	->setName(pht('Open Mock'))
	->setHref($this->getApplicationURI('/archive/'.$mock->getID().'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	} else {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-ban')
	->setName(pht('Close Mock'))
	->setHref($this->getApplicationURI('/archive/'.$mock->getID().'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	}

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-anchor')
	->setName(pht('Edit Maniphest Tasks'))
	->setHref("/search/attach/{$mock->getPHID()}/TASK/edge/")
	->setDisabled(!$viewer->isLoggedIn())
	->setWorkflow(true));

	return $actions;
	}

	private function buildPropertyView(
	PholioMock $mock,
	PhabricatorMarkupEngine $engine,
	PhabricatorActionListView $actions) {

	$viewer = $this->getViewer();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($mock)
	->setActionList($actions);

	$properties->addProperty(
	pht('Author'),
	$viewer->renderHandle($mock->getAuthorPHID()));

	$properties->addProperty(
	pht('Created'),
	phabricator_datetime($mock->getDateCreated(), $viewer));

	if ($this->getManiphestTaskPHIDs()) {
	$properties->addProperty(
	pht('Maniphest Tasks'),
	$viewer->renderHandleList($this->getManiphestTaskPHIDs()));
	}

	$properties->invokeWillRenderEvent();

	$properties->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);

	$properties->addImageContent(
	$engine->getOutput($mock, PholioMock::MARKUP_FIELD_DESCRIPTION));

	return $properties;
	}

	private function buildAddCommentView(PholioMock $mock, $comment_form_id) {
	$viewer = $this->getViewer();

	$draft = PhabricatorDraft::newFromUserAndKey($viewer, $mock->getPHID());

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
	$title = $is_serious
	? pht('Add Comment')
	: pht('History Beckons');

	$form = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($mock->getPHID())
	->setFormID($comment_form_id)
	->setDraft($draft)
	->setHeaderText($title)
	->setSubmitButtonName(pht('Add Comment'))
	->setAction($this->getApplicationURI('/comment/'.$mock->getID().'/'))
	->setRequestURI($this->getRequest()->getRequestURI());

	return $form;
	}

	}
	diff --git a/src/applications/phortune/controller/PhortuneAccountViewController.php b/src/applications/phortune/controller/PhortuneAccountViewController.php
	index 7199b37799..f4791d8bb6 100644
	--- a/src/applications/phortune/controller/PhortuneAccountViewController.php
	+++ b/src/applications/phortune/controller/PhortuneAccountViewController.php
	@@ -1,387 +1,386 @@
	<?php

	final class PhortuneAccountViewController extends PhortuneController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();

	// TODO: Currently, you must be able to edit an account to view the detail
	// page, because the account must be broadly visible so merchants can
	// process orders but merchants should not be able to see all the details
	// of an account. Ideally this page should be visible to merchants, too,
	// just with less information.
	$can_edit = true;

	$account = id(new PhortuneAccountQuery())
	->setViewer($viewer)
	->withIDs(array($request->getURIData('accountID')))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$account) {
	return new Aphront404Response();
	}

	$title = $account->getName();

	$invoices = id(new PhortuneCartQuery())
	->setViewer($viewer)
	->withAccountPHIDs(array($account->getPHID()))
	->needPurchases(true)
	->withInvoices(true)
	->execute();

	$crumbs = $this->buildApplicationCrumbs();
	$this->addAccountCrumb($crumbs, $account, $link = false);

	$header = id(new PHUIHeaderView())
	->setHeader($title);

	$edit_uri = $this->getApplicationURI('account/edit/'.$account->getID().'/');

	$actions = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($request->getRequestURI())
	->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Account'))
	->setIcon('fa-pencil')
	->setHref($edit_uri)
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$properties = id(new PHUIPropertyListView())
	->setObject($account)
	->setUser($viewer);

	$properties->addProperty(
	pht('Members'),
	$viewer->renderHandleList($account->getMemberPHIDs()));

	$status_items = $this->getStatusItemsForAccount($account, $invoices);
	$status_view = new PHUIStatusListView();
	foreach ($status_items as $item) {
	$status_view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(
	idx($item, 'icon'),
	idx($item, 'color'),
	idx($item, 'label'))
	->setTarget(idx($item, 'target'))
	->setNote(idx($item, 'note')));
	}
	$properties->addProperty(
	pht('Status'),
	$status_view);

	$properties->setActionList($actions);

	$invoices = $this->buildInvoicesSection($account, $invoices);
	$purchase_history = $this->buildPurchaseHistorySection($account);
	$charge_history = $this->buildChargeHistorySection($account);
	$subscriptions = $this->buildSubscriptionsSection($account);
	$payment_methods = $this->buildPaymentMethodsSection($account);

	$timeline = $this->buildTransactionTimeline(
	$account,
	new PhortuneAccountTransactionQuery());
	$timeline->setShouldTerminate(true);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$invoices,
	$purchase_history,
	$charge_history,
	$subscriptions,
	$payment_methods,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	private function buildPaymentMethodsSection(PhortuneAccount $account) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$account,
	PhabricatorPolicyCapability::CAN_EDIT);

	$id = $account->getID();

	$header = id(new PHUIHeaderView())
	->setHeader(pht('Payment Methods'));

	$list = id(new PHUIObjectItemListView())
	->setUser($viewer)
	->setFlush(true)
	->setNoDataString(
	pht('No payment methods associated with this account.'));

	$methods = id(new PhortunePaymentMethodQuery())
	->setViewer($viewer)
	->withAccountPHIDs(array($account->getPHID()))
	->execute();

	foreach ($methods as $method) {
	$id = $method->getID();

	$item = new PHUIObjectItemView();
	$item->setHeader($method->getFullDisplayName());

	switch ($method->getStatus()) {
	case PhortunePaymentMethod::STATUS_ACTIVE:
	$item->setStatusIcon('fa-check green');

	$disable_uri = $this->getApplicationURI('card/'.$id.'/disable/');
	$item->addAction(
	id(new PHUIListItemView())
	->setIcon('fa-times')
	->setHref($disable_uri)
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	break;
	case PhortunePaymentMethod::STATUS_DISABLED:
	$item->setStatusIcon('fa-ban lightbluetext');
	$item->setDisabled(true);
	break;
	}

	$provider = $method->buildPaymentProvider();
	$item->addAttribute($provider->getPaymentMethodProviderDescription());

	$edit_uri = $this->getApplicationURI('card/'.$id.'/edit/');

	$item->addAction(
	id(new PHUIListItemView())
	->setIcon('fa-pencil')
	->setHref($edit_uri)
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$list->addItem($item);
	}

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->setObjectList($list);
	}

	private function buildInvoicesSection(
	PhortuneAccount $account,
	array $carts) {

	$request = $this->getRequest();
	$viewer = $request->getUser();

	$phids = array();
	foreach ($carts as $cart) {
	$phids[] = $cart->getPHID();
	$phids[] = $cart->getMerchantPHID();
	foreach ($cart->getPurchases() as $purchase) {
	$phids[] = $purchase->getPHID();
	}
	}
	$handles = $this->loadViewerHandles($phids);

	$table = id(new PhortuneOrderTableView())
	->setNoDataString(pht('You have no unpaid invoices.'))
	->setIsInvoices(true)
	->setUser($viewer)
	->setCarts($carts)
	->setHandles($handles);

	$header = id(new PHUIHeaderView())
	->setHeader(pht('Invoices Due'));

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->setTable($table);
	}

	private function buildPurchaseHistorySection(PhortuneAccount $account) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$carts = id(new PhortuneCartQuery())
	->setViewer($viewer)
	->withAccountPHIDs(array($account->getPHID()))
	->needPurchases(true)
	->withStatuses(
	array(
	PhortuneCart::STATUS_PURCHASING,
	PhortuneCart::STATUS_CHARGED,
	PhortuneCart::STATUS_HOLD,
	PhortuneCart::STATUS_REVIEW,
	PhortuneCart::STATUS_PURCHASED,
	))
	->setLimit(10)
	->execute();

	$phids = array();
	foreach ($carts as $cart) {
	$phids[] = $cart->getPHID();
	foreach ($cart->getPurchases() as $purchase) {
	$phids[] = $purchase->getPHID();
	}
	}
	$handles = $this->loadViewerHandles($phids);

	$orders_uri = $this->getApplicationURI($account->getID().'/order/');

	$table = id(new PhortuneOrderTableView())
	->setUser($viewer)
	->setCarts($carts)
	->setHandles($handles);

	$header = id(new PHUIHeaderView())
	->setHeader(pht('Recent Orders'))
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	->setIcon(
	id(new PHUIIconView())
	->setIconFont('fa-list'))
	->setHref($orders_uri)
	->setText(pht('View All Orders')));

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->setTable($table);
	}

	private function buildChargeHistorySection(PhortuneAccount $account) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$charges = id(new PhortuneChargeQuery())
	->setViewer($viewer)
	->withAccountPHIDs(array($account->getPHID()))
	->needCarts(true)
	->setLimit(10)
	->execute();

	$phids = array();
	foreach ($charges as $charge) {
	$phids[] = $charge->getProviderPHID();
	$phids[] = $charge->getCartPHID();
	$phids[] = $charge->getMerchantPHID();
	$phids[] = $charge->getPaymentMethodPHID();
	}

	$handles = $this->loadViewerHandles($phids);

	$charges_uri = $this->getApplicationURI($account->getID().'/charge/');

	$table = id(new PhortuneChargeTableView())
	->setUser($viewer)
	->setCharges($charges)
	->setHandles($handles);

	$header = id(new PHUIHeaderView())
	->setHeader(pht('Recent Charges'))
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	->setIcon(
	id(new PHUIIconView())
	->setIconFont('fa-list'))
	->setHref($charges_uri)
	->setText(pht('View All Charges')));

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->setTable($table);
	}

	private function buildSubscriptionsSection(PhortuneAccount $account) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$subscriptions = id(new PhortuneSubscriptionQuery())
	->setViewer($viewer)
	->withAccountPHIDs(array($account->getPHID()))
	->setLimit(10)
	->execute();

	$subscriptions_uri = $this->getApplicationURI(
	$account->getID().'/subscription/');

	$handles = $this->loadViewerHandles(mpull($subscriptions, 'getPHID'));

	$table = id(new PhortuneSubscriptionTableView())
	->setUser($viewer)
	->setHandles($handles)
	->setSubscriptions($subscriptions);

	$header = id(new PHUIHeaderView())
	->setHeader(pht('Recent Subscriptions'))
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	->setIcon(
	id(new PHUIIconView())
	->setIconFont('fa-list'))
	->setHref($subscriptions_uri)
	->setText(pht('View All Subscriptions')));

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->setTable($table);
	}

	protected function buildApplicationCrumbs() {
	$crumbs = parent::buildApplicationCrumbs();

	$crumbs->addAction(
	id(new PHUIListItemView())
	->setIcon('fa-exchange')
	->setHref($this->getApplicationURI('account/'))
	->setName(pht('Switch Accounts')));

	return $crumbs;
	}

	private function getStatusItemsForAccount(
	PhortuneAccount $account,
	array $invoices) {

	assert_instances_of($invoices, 'PhortuneCart');

	$items = array();

	if ($invoices) {
	$items[] = array(
	'icon' => PHUIStatusItemView::ICON_WARNING,
	'color' => 'yellow',
	'target' => pht('Invoices'),
	'note' => pht('You have %d unpaid invoice(s).', count($invoices)),
	);
	} else {
	$items[] = array(
	'icon' => PHUIStatusItemView::ICON_ACCEPT,
	'color' => 'green',
	'target' => pht('Invoices'),
	'note' => pht('This account has no unpaid invoices.'),
	);
	}

	// TODO: If a payment method has expired or is expiring soon, we should
	// add a status check for it.

	return $items;
	}

	}
	diff --git a/src/applications/phortune/controller/PhortuneProductViewController.php b/src/applications/phortune/controller/PhortuneProductViewController.php
	index 73d120bfd9..56bf0736d3 100644
	--- a/src/applications/phortune/controller/PhortuneProductViewController.php
	+++ b/src/applications/phortune/controller/PhortuneProductViewController.php
	@@ -1,57 +1,56 @@
	<?php

	final class PhortuneProductViewController extends PhortuneController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$product = id(new PhortuneProductQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$product) {
	return new Aphront404Response();
	}

	$title = pht('Product: %s', $product->getProductName());

	$header = id(new PHUIHeaderView())
	->setHeader($product->getProductName());

	$edit_uri = $this->getApplicationURI('product/edit/'.$product->getID().'/');

	$actions = id(new PhabricatorActionListView())
	- ->setUser($viewer)
	- ->setObjectURI($request->getRequestURI());
	+ ->setUser($viewer);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(
	pht('Products'),
	$this->getApplicationURI('product/'));
	$crumbs->addTextCrumb(
	pht('#%d', $product->getID()),
	$request->getRequestURI());

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions)
	->addProperty(
	pht('Price'),
	$product->getPriceAsCurrency()->formatForDisplay());

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	),
	array(
	'title' => $title,
	));
	}

	}
	diff --git a/src/applications/phortune/controller/PhortuneSubscriptionViewController.php b/src/applications/phortune/controller/PhortuneSubscriptionViewController.php
	index ad4d366d15..8804499056 100644
	--- a/src/applications/phortune/controller/PhortuneSubscriptionViewController.php
	+++ b/src/applications/phortune/controller/PhortuneSubscriptionViewController.php
	@@ -1,208 +1,207 @@
	<?php

	final class PhortuneSubscriptionViewController extends PhortuneController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();

	$authority = $this->loadMerchantAuthority();

	$subscription_query = id(new PhortuneSubscriptionQuery())
	->setViewer($viewer)
	->withIDs(array($request->getURIData('id')))
	->needTriggers(true);

	if ($authority) {
	$subscription_query->withMerchantPHIDs(array($authority->getPHID()));
	}

	$subscription = $subscription_query->executeOne();
	if (!$subscription) {
	return new Aphront404Response();
	}

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$subscription,
	PhabricatorPolicyCapability::CAN_EDIT);

	$merchant = $subscription->getMerchant();
	$account = $subscription->getAccount();

	$account_id = $account->getID();
	$subscription_id = $subscription->getID();

	$title = $subscription->getSubscriptionFullName();

	$header = id(new PHUIHeaderView())
	->setHeader($title);

	$actions = id(new PhabricatorActionListView())
	- ->setUser($viewer)
	- ->setObjectURI($request->getRequestURI());
	+ ->setUser($viewer);

	$edit_uri = $subscription->getEditURI();

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Subscription'))
	->setHref($edit_uri)
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));


	$crumbs = $this->buildApplicationCrumbs();
	if ($authority) {
	$this->addMerchantCrumb($crumbs, $merchant);
	} else {
	$this->addAccountCrumb($crumbs, $account);
	}
	$crumbs->addTextCrumb($subscription->getSubscriptionCrumbName());

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$next_invoice = $subscription->getTrigger()->getNextEventPrediction();
	$properties->addProperty(
	pht('Next Invoice'),
	phabricator_datetime($next_invoice, $viewer));

	$default_method = $subscription->getDefaultPaymentMethodPHID();
	if ($default_method) {
	$handles = $this->loadViewerHandles(array($default_method));
	$autopay_method = $handles[$default_method]->renderLink();
	} else {
	$autopay_method = phutil_tag(
	'em',
	array(),
	pht('No Autopay Method Configured'));
	}

	$properties->addProperty(
	pht('Autopay With'),
	$autopay_method);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$due_box = $this->buildDueInvoices($subscription, $authority);
	$invoice_box = $this->buildPastInvoices($subscription, $authority);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$due_box,
	$invoice_box,
	),
	array(
	'title' => $title,
	));
	}

	private function buildDueInvoices(
	PhortuneSubscription $subscription,
	$authority) {
	$viewer = $this->getViewer();

	$invoices = id(new PhortuneCartQuery())
	->setViewer($viewer)
	->withSubscriptionPHIDs(array($subscription->getPHID()))
	->needPurchases(true)
	->withInvoices(true)
	->execute();

	$phids = array();
	foreach ($invoices as $invoice) {
	$phids[] = $invoice->getPHID();
	$phids[] = $invoice->getMerchantPHID();
	foreach ($invoice->getPurchases() as $purchase) {
	$phids[] = $purchase->getPHID();
	}
	}
	$handles = $this->loadViewerHandles($phids);

	$invoice_table = id(new PhortuneOrderTableView())
	->setUser($viewer)
	->setCarts($invoices)
	->setIsInvoices(true)
	->setIsMerchantView((bool)$authority)
	->setHandles($handles);

	$invoice_header = id(new PHUIHeaderView())
	->setHeader(pht('Invoices Due'));

	return id(new PHUIObjectBoxView())
	->setHeader($invoice_header)
	->appendChild($invoice_table);
	}

	private function buildPastInvoices(
	PhortuneSubscription $subscription,
	$authority) {
	$viewer = $this->getViewer();

	$invoices = id(new PhortuneCartQuery())
	->setViewer($viewer)
	->withSubscriptionPHIDs(array($subscription->getPHID()))
	->needPurchases(true)
	->withStatuses(
	array(
	PhortuneCart::STATUS_PURCHASING,
	PhortuneCart::STATUS_CHARGED,
	PhortuneCart::STATUS_HOLD,
	PhortuneCart::STATUS_REVIEW,
	PhortuneCart::STATUS_PURCHASED,
	))
	->setLimit(50)
	->execute();

	$phids = array();
	foreach ($invoices as $invoice) {
	$phids[] = $invoice->getPHID();
	foreach ($invoice->getPurchases() as $purchase) {
	$phids[] = $purchase->getPHID();
	}
	}
	$handles = $this->loadViewerHandles($phids);

	$invoice_table = id(new PhortuneOrderTableView())
	->setUser($viewer)
	->setCarts($invoices)
	->setHandles($handles);

	$account = $subscription->getAccount();
	$merchant = $subscription->getMerchant();

	$account_id = $account->getID();
	$merchant_id = $merchant->getID();
	$subscription_id = $subscription->getID();

	if ($authority) {
	$invoices_uri = $this->getApplicationURI(
	"merchant/{$merchant_id}/subscription/order/{$subscription_id}/");
	} else {
	$invoices_uri = $this->getApplicationURI(
	"{$account_id}/subscription/order/{$subscription_id}/");
	}

	$invoice_header = id(new PHUIHeaderView())
	->setHeader(pht('Past Invoices'))
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	->setIcon(
	id(new PHUIIconView())
	->setIconFont('fa-list'))
	->setHref($invoices_uri)
	->setText(pht('View All Invoices')));

	return id(new PHUIObjectBoxView())
	->setHeader($invoice_header)
	->appendChild($invoice_table);
	}

	}
	diff --git a/src/applications/phragment/controller/PhragmentController.php b/src/applications/phragment/controller/PhragmentController.php
	index c08adcecc6..f9df7429be 100644
	--- a/src/applications/phragment/controller/PhragmentController.php
	+++ b/src/applications/phragment/controller/PhragmentController.php
	@@ -1,233 +1,232 @@
	<?php

	abstract class PhragmentController extends PhabricatorController {

	protected function loadParentFragments($path) {
	$components = explode('/', $path);

	$combinations = array();
	$current = '';
	foreach ($components as $component) {
	$current .= '/'.$component;
	$current = trim($current, '/');
	if (trim($current) === '') {
	continue;
	}

	$combinations[] = $current;
	}

	$fragments = array();
	$results = id(new PhragmentFragmentQuery())
	->setViewer($this->getRequest()->getUser())
	->needLatestVersion(true)
	->withPaths($combinations)
	->execute();
	foreach ($combinations as $combination) {
	$found = false;
	foreach ($results as $fragment) {
	if ($fragment->getPath() === $combination) {
	$fragments[] = $fragment;
	$found = true;
	break;
	}
	}
	if (!$found) {
	return null;
	}
	}
	return $fragments;
	}

	protected function buildApplicationCrumbsWithPath(array $fragments) {
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb('/', '/phragment/');
	foreach ($fragments as $parent) {
	$crumbs->addTextCrumb(
	$parent->getName(),
	'/phragment/browse/'.$parent->getPath());
	}
	return $crumbs;
	}

	protected function createCurrentFragmentView($fragment, $is_history_view) {
	if ($fragment === null) {
	return null;
	}

	$viewer = $this->getRequest()->getUser();

	$snapshot_phids = array();
	$snapshots = id(new PhragmentSnapshotQuery())
	->setViewer($viewer)
	->withPrimaryFragmentPHIDs(array($fragment->getPHID()))
	->execute();
	foreach ($snapshots as $snapshot) {
	$snapshot_phids[] = $snapshot->getPHID();
	}

	$file = null;
	$file_uri = null;
	if (!$fragment->isDirectory()) {
	$file = id(new PhabricatorFileQuery())
	->setViewer($viewer)
	->withPHIDs(array($fragment->getLatestVersion()->getFilePHID()))
	->executeOne();
	if ($file !== null) {
	$file_uri = $file->getDownloadURI();
	}
	}

	$header = id(new PHUIHeaderView())
	->setHeader($fragment->getName())
	->setPolicyObject($fragment)
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$fragment,
	PhabricatorPolicyCapability::CAN_EDIT);

	$zip_uri = $this->getApplicationURI('zip/'.$fragment->getPath());

	$actions = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($fragment)
	- ->setObjectURI($fragment->getURI());
	+ ->setObject($fragment);
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Download Fragment'))
	->setHref($this->isCorrectlyConfigured() ? $file_uri : null)
	->setDisabled($file === null \|\| !$this->isCorrectlyConfigured())
	->setIcon('fa-download'));
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Download Contents as ZIP'))
	->setHref($this->isCorrectlyConfigured() ? $zip_uri : null)
	->setDisabled(!$this->isCorrectlyConfigured())
	->setIcon('fa-floppy-o'));
	if (!$fragment->isDirectory()) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Update Fragment'))
	->setHref($this->getApplicationURI('update/'.$fragment->getPath()))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit)
	->setIcon('fa-refresh'));
	} else {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Convert to File'))
	->setHref($this->getApplicationURI('update/'.$fragment->getPath()))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit)
	->setIcon('fa-file-o'));
	}
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Set Fragment Policies'))
	->setHref($this->getApplicationURI('policy/'.$fragment->getPath()))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit)
	->setIcon('fa-asterisk'));
	if ($is_history_view) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View Child Fragments'))
	->setHref($this->getApplicationURI('browse/'.$fragment->getPath()))
	->setIcon('fa-search-plus'));
	} else {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View History'))
	->setHref($this->getApplicationURI('history/'.$fragment->getPath()))
	->setIcon('fa-list'));
	}
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Create Snapshot'))
	->setHref($this->getApplicationURI(
	'snapshot/create/'.$fragment->getPath()))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit)
	->setIcon('fa-files-o'));
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Promote Snapshot to Here'))
	->setHref($this->getApplicationURI(
	'snapshot/promote/latest/'.$fragment->getPath()))
	->setWorkflow(true)
	->setDisabled(!$can_edit)
	->setIcon('fa-arrow-circle-up'));

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($fragment)
	->setActionList($actions);

	if (!$fragment->isDirectory()) {
	if ($fragment->isDeleted()) {
	$properties->addProperty(
	pht('Type'),
	pht('File (Deleted)'));
	} else {
	$properties->addProperty(
	pht('Type'),
	pht('File'));
	}
	$properties->addProperty(
	pht('Latest Version'),
	$viewer->renderHandle($fragment->getLatestVersionPHID()));
	} else {
	$properties->addProperty(
	pht('Type'),
	pht('Directory'));
	}

	if (count($snapshot_phids) > 0) {
	$properties->addProperty(
	pht('Snapshots'),
	$viewer->renderHandleList($snapshot_phids));
	}

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);
	}

	public function renderConfigurationWarningIfRequired() {
	$alt = PhabricatorEnv::getEnvConfig('security.alternate-file-domain');
	if ($alt === null) {
	return id(new PHUIInfoView())
	->setTitle(pht(
	'%s must be configured!',
	'security.alternate-file-domain'))
	->setSeverity(PHUIInfoView::SEVERITY_ERROR)
	->appendChild(
	phutil_tag(
	'p',
	array(),
	pht(
	"Because Phragment generates files (such as ZIP archives and ".
	"patches) as they are requested, it requires that you configure ".
	"the `%s` option. This option on it's own will also provide ".
	"additional security when serving files across Phabricator.",
	'security.alternate-file-domain')));
	}
	return null;
	}

	/**
	* We use this to disable the download links if the alternate domain is
	* not configured correctly. Although the download links will mostly work
	* for logged in users without an alternate domain, the behaviour is
	* reasonably non-consistent and will deny public users, even if policies
	* are configured otherwise (because the Files app does not support showing
	* the info page to viewers who are not logged in).
	*/
	public function isCorrectlyConfigured() {
	$alt = PhabricatorEnv::getEnvConfig('security.alternate-file-domain');
	return $alt !== null;
	}

	}
	diff --git a/src/applications/phragment/controller/PhragmentSnapshotViewController.php b/src/applications/phragment/controller/PhragmentSnapshotViewController.php
	index 545e8806eb..fe499fffa1 100644
	--- a/src/applications/phragment/controller/PhragmentSnapshotViewController.php
	+++ b/src/applications/phragment/controller/PhragmentSnapshotViewController.php
	@@ -1,150 +1,149 @@
	<?php

	final class PhragmentSnapshotViewController extends PhragmentController {

	private $id;

	public function shouldAllowPublic() {
	return true;
	}

	public function willProcessRequest(array $data) {
	$this->id = idx($data, 'id', '');
	}

	public function processRequest() {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$snapshot = id(new PhragmentSnapshotQuery())
	->setViewer($viewer)
	->withIDs(array($this->id))
	->executeOne();
	if ($snapshot === null) {
	return new Aphront404Response();
	}

	$box = $this->createSnapshotView($snapshot);

	$fragment = id(new PhragmentFragmentQuery())
	->setViewer($viewer)
	->withPHIDs(array($snapshot->getPrimaryFragmentPHID()))
	->executeOne();
	if ($fragment === null) {
	return new Aphront404Response();
	}

	$parents = $this->loadParentFragments($fragment->getPath());
	if ($parents === null) {
	return new Aphront404Response();
	}

	$crumbs = $this->buildApplicationCrumbsWithPath($parents);
	$crumbs->addTextCrumb(pht('"%s" Snapshot', $snapshot->getName()));

	$children = id(new PhragmentSnapshotChildQuery())
	->setViewer($viewer)
	->needFragments(true)
	->needFragmentVersions(true)
	->withSnapshotPHIDs(array($snapshot->getPHID()))
	->execute();

	$list = id(new PHUIObjectItemListView())
	->setUser($viewer);

	foreach ($children as $child) {
	$item = id(new PHUIObjectItemView())
	->setHeader($child->getFragment()->getPath());

	if ($child->getFragmentVersion() !== null) {
	$item
	->setHref($child->getFragmentVersion()->getURI())
	->addAttribute(pht(
	'Version %s',
	$child->getFragmentVersion()->getSequence()));
	} else {
	$item
	->setHref($child->getFragment()->getURI())
	->addAttribute(pht('Directory'));
	}

	$list->addItem($item);
	}

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$this->renderConfigurationWarningIfRequired(),
	$box,
	$list,
	),
	array(
	'title' => pht('View Snapshot'),
	));
	}

	protected function createSnapshotView($snapshot) {
	if ($snapshot === null) {
	return null;
	}

	$viewer = $this->getRequest()->getUser();

	$header = id(new PHUIHeaderView())
	->setHeader(pht('"%s" Snapshot', $snapshot->getName()))
	->setPolicyObject($snapshot)
	->setUser($viewer);

	$zip_uri = $this->getApplicationURI(
	'zip@'.$snapshot->getName().
	'/'.$snapshot->getPrimaryFragment()->getPath());

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$snapshot,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($snapshot)
	- ->setObjectURI($snapshot->getURI());
	+ ->setObject($snapshot);
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Download Snapshot as ZIP'))
	->setHref($this->isCorrectlyConfigured() ? $zip_uri : null)
	->setDisabled(!$this->isCorrectlyConfigured())
	->setIcon('fa-floppy-o'));
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Delete Snapshot'))
	->setHref($this->getApplicationURI(
	'snapshot/delete/'.$snapshot->getID().'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(true)
	->setIcon('fa-times'));
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Promote Another Snapshot to Here'))
	->setHref($this->getApplicationURI(
	'snapshot/promote/'.$snapshot->getID().'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(true)
	->setIcon('fa-arrow-up'));

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($snapshot)
	->setActionList($actions);

	$properties->addProperty(
	pht('Name'),
	$snapshot->getName());
	$properties->addProperty(
	pht('Fragment'),
	$viewer->renderHandle($snapshot->getPrimaryFragmentPHID()));

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);
	}
	}
	diff --git a/src/applications/phragment/controller/PhragmentVersionController.php b/src/applications/phragment/controller/PhragmentVersionController.php
	index e2906a7454..29b920a4e5 100644
	--- a/src/applications/phragment/controller/PhragmentVersionController.php
	+++ b/src/applications/phragment/controller/PhragmentVersionController.php
	@@ -1,132 +1,131 @@
	<?php

	final class PhragmentVersionController extends PhragmentController {

	private $id;

	public function shouldAllowPublic() {
	return true;
	}

	public function willProcessRequest(array $data) {
	$this->id = idx($data, 'id', 0);
	}

	public function processRequest() {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$version = id(new PhragmentFragmentVersionQuery())
	->setViewer($viewer)
	->withIDs(array($this->id))
	->executeOne();
	if ($version === null) {
	return new Aphront404Response();
	}

	$parents = $this->loadParentFragments($version->getFragment()->getPath());
	if ($parents === null) {
	return new Aphront404Response();
	}
	$current = idx($parents, count($parents) - 1, null);

	$crumbs = $this->buildApplicationCrumbsWithPath($parents);
	$crumbs->addTextCrumb(pht('View Version %d', $version->getSequence()));

	$file = id(new PhabricatorFileQuery())
	->setViewer($viewer)
	->withPHIDs(array($version->getFilePHID()))
	->executeOne();
	if ($file !== null) {
	$file_uri = $file->getDownloadURI();
	}

	$header = id(new PHUIHeaderView())
	->setHeader(pht(
	'%s at version %d',
	$version->getFragment()->getName(),
	$version->getSequence()))
	->setPolicyObject($version)
	->setUser($viewer);

	$actions = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($version)
	- ->setObjectURI($version->getURI());
	+ ->setObject($version);
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Download Version'))
	->setDisabled($file === null \|\| !$this->isCorrectlyConfigured())
	->setHref($this->isCorrectlyConfigured() ? $file_uri : null)
	->setIcon('fa-download'));

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($version)
	->setActionList($actions);
	$properties->addProperty(
	pht('File'),
	$viewer->renderHandle($version->getFilePHID()));

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$this->renderConfigurationWarningIfRequired(),
	$box,
	$this->renderPreviousVersionList($version),
	),
	array(
	'title' => pht('View Version'),
	));
	}

	private function renderPreviousVersionList(
	PhragmentFragmentVersion $version) {

	$request = $this->getRequest();
	$viewer = $request->getUser();

	$previous_versions = id(new PhragmentFragmentVersionQuery())
	->setViewer($viewer)
	->withFragmentPHIDs(array($version->getFragmentPHID()))
	->withSequenceBefore($version->getSequence())
	->execute();

	$list = id(new PHUIObjectItemListView())
	->setUser($viewer);

	foreach ($previous_versions as $previous_version) {
	$item = id(new PHUIObjectItemView());
	$item->setHeader(pht('Version %s', $previous_version->getSequence()));
	$item->setHref($previous_version->getURI());
	$item->addAttribute(phabricator_datetime(
	$previous_version->getDateCreated(),
	$viewer));
	$patch_uri = $this->getApplicationURI(
	'patch/'.$previous_version->getID().'/'.$version->getID());
	$item->addAction(id(new PHUIListItemView())
	->setIcon('fa-file-o')
	->setName(pht('Get Patch'))
	->setHref($this->isCorrectlyConfigured() ? $patch_uri : null)
	->setDisabled(!$this->isCorrectlyConfigured()));
	$list->addItem($item);
	}

	$item = id(new PHUIObjectItemView());
	$item->setHeader(pht('Prior to Version 0'));
	$item->addAttribute(pht('Prior to any content (empty file)'));
	$item->addAction(id(new PHUIListItemView())
	->setIcon('fa-file-o')
	->setName(pht('Get Patch'))
	->setHref($this->getApplicationURI(
	'patch/x/'.$version->getID())));
	$list->addItem($item);

	return $list;
	}

	}
	diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
	index a6d88df341..49e7f29bff 100644
	--- a/src/applications/phriction/controller/PhrictionDocumentController.php
	+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
	@@ -1,476 +1,475 @@
	<?php

	final class PhrictionDocumentController
	extends PhrictionController {

	private $slug;

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$this->slug = $request->getURIData('slug');

	$slug = PhabricatorSlug::normalize($this->slug);
	if ($slug != $this->slug) {
	$uri = PhrictionDocument::getSlugURI($slug);
	// Canonicalize pages to their one true URI.
	return id(new AphrontRedirectResponse())->setURI($uri);
	}

	require_celerity_resource('phriction-document-css');

	$document = id(new PhrictionDocumentQuery())
	->setViewer($viewer)
	->withSlugs(array($slug))
	->executeOne();

	$version_note = null;
	$core_content = '';
	$move_notice = '';
	$properties = null;
	$content = null;
	$toc = null;

	if (!$document) {

	$document = PhrictionDocument::initializeNewDocument($viewer, $slug);

	$create_uri = '/phriction/edit/?slug='.$slug;

	$notice = new PHUIInfoView();
	$notice->setSeverity(PHUIInfoView::SEVERITY_WARNING);
	$notice->setTitle(pht('No content here!'));
	$notice->appendChild(
	pht(
	'No document found at %s. You can <strong>'.
	'<a href="%s">create a new document here</a></strong>.',
	phutil_tag('tt', array(), $slug),
	$create_uri));
	$core_content = $notice;

	$page_title = pht('Page Not Found');
	} else {
	$version = $request->getInt('v');

	if ($version) {
	$content = id(new PhrictionContent())->loadOneWhere(
	'documentID = %d AND version = %d',
	$document->getID(),
	$version);
	if (!$content) {
	return new Aphront404Response();
	}

	if ($content->getID() != $document->getContentID()) {
	$vdate = phabricator_datetime($content->getDateCreated(), $viewer);
	$version_note = new PHUIInfoView();
	$version_note->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	$version_note->appendChild(
	pht('You are viewing an older version of this document, as it '.
	'appeared on %s.', $vdate));
	}
	} else {
	$content = id(new PhrictionContent())->load($document->getContentID());
	}
	$page_title = $content->getTitle();
	$properties = $this
	->buildPropertyListView($document, $content, $slug);

	$doc_status = $document->getStatus();
	$current_status = $content->getChangeType();
	if ($current_status == PhrictionChangeType::CHANGE_EDIT \|\|
	$current_status == PhrictionChangeType::CHANGE_MOVE_HERE) {

	$core_content = $content->renderContent($viewer);
	$toc = $this->getToc($content);

	} else if ($current_status == PhrictionChangeType::CHANGE_DELETE) {
	$notice = new PHUIInfoView();
	$notice->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	$notice->setTitle(pht('Document Deleted'));
	$notice->appendChild(
	pht('This document has been deleted. You can edit it to put new '.
	'content here, or use history to revert to an earlier version.'));
	$core_content = $notice->render();
	} else if ($current_status == PhrictionChangeType::CHANGE_STUB) {
	$notice = new PHUIInfoView();
	$notice->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	$notice->setTitle(pht('Empty Document'));
	$notice->appendChild(
	pht('This document is empty. You can edit it to put some proper '.
	'content here.'));
	$core_content = $notice->render();
	} else if ($current_status == PhrictionChangeType::CHANGE_MOVE_AWAY) {
	$new_doc_id = $content->getChangeRef();
	$slug_uri = null;

	// If the new document exists and the viewer can see it, provide a link
	// to it. Otherwise, render a generic message.
	$new_docs = id(new PhrictionDocumentQuery())
	->setViewer($viewer)
	->withIDs(array($new_doc_id))
	->execute();
	if ($new_docs) {
	$new_doc = head($new_docs);
	$slug_uri = PhrictionDocument::getSlugURI($new_doc->getSlug());
	}

	$notice = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_NOTICE);

	if ($slug_uri) {
	$notice->appendChild(
	phutil_tag(
	'p',
	array(),
	pht(
	'This document has been moved to %s. You can edit it to put '.
	'new content here, or use history to revert to an earlier '.
	'version.',
	phutil_tag('a', array('href' => $slug_uri), $slug_uri))));
	} else {
	$notice->appendChild(
	phutil_tag(
	'p',
	array(),
	pht(
	'This document has been moved. You can edit it to put new '.
	'contne here, or use history to revert to an earlier '.
	'version.')));
	}

	$core_content = $notice->render();
	} else {
	throw new Exception(pht("Unknown document status '%s'!", $doc_status));
	}

	$move_notice = null;
	if ($current_status == PhrictionChangeType::CHANGE_MOVE_HERE) {
	$from_doc_id = $content->getChangeRef();

	$slug_uri = null;

	// If the old document exists and is visible, provide a link to it.
	$from_docs = id(new PhrictionDocumentQuery())
	->setViewer($viewer)
	->withIDs(array($from_doc_id))
	->execute();
	if ($from_docs) {
	$from_doc = head($from_docs);
	$slug_uri = PhrictionDocument::getSlugURI($from_doc->getSlug());
	}

	$move_notice = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_NOTICE);

	if ($slug_uri) {
	$move_notice->appendChild(
	pht(
	'This document was moved from %s.',
	phutil_tag('a', array('href' => $slug_uri), $slug_uri)));
	} else {
	// Render this for consistency, even though it's a bit silly.
	$move_notice->appendChild(
	pht('This document was moved from elsewhere.'));
	}
	}
	}

	$children = $this->renderDocumentChildren($slug);

	$actions = $this->buildActionView($viewer, $document);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->setBorder(true);
	$crumb_views = $this->renderBreadcrumbs($slug);
	foreach ($crumb_views as $view) {
	$crumbs->addCrumb($view);
	}

	$action_button = id(new PHUIButtonView())
	->setTag('a')
	->setText(pht('Actions'))
	->setHref('#')
	->setIconFont('fa-bars')
	->addClass('phui-mobile-menu')
	->setDropdownMenu($actions);

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setPolicyObject($document)
	->setHeader($page_title)
	->addActionLink($action_button);

	if ($content) {
	$header->setEpoch($content->getDateCreated());
	}

	$prop_list = null;
	if ($properties) {
	$prop_list = new PHUIPropertyGroupView();
	$prop_list->addPropertyList($properties);
	}

	$page_content = id(new PHUIDocumentViewPro())
	->setHeader($header)
	->setToc($toc)
	->appendChild(
	array(
	$version_note,
	$move_notice,
	$core_content,
	));

	return $this->buildApplicationPage(
	array(
	$crumbs->render(),
	$page_content,
	$prop_list,
	$children,
	),
	array(
	'pageObjects' => array($document->getPHID()),
	'title' => $page_title,
	));

	}

	private function buildPropertyListView(
	PhrictionDocument $document,
	PhrictionContent $content,
	$slug) {

	$viewer = $this->getRequest()->getUser();
	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($document);

	$view->addProperty(
	pht('Last Author'),
	$viewer->renderHandle($content->getAuthorPHID()));

	return $view;
	}

	private function buildActionView(
	PhabricatorUser $viewer,
	PhrictionDocument $document) {
	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$document,
	PhabricatorPolicyCapability::CAN_EDIT);

	$slug = PhabricatorSlug::normalize($this->slug);

	$action_view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($document);

	if (!$document->getID()) {
	return $action_view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Create This Document'))
	->setIcon('fa-plus-square')
	->setHref('/phriction/edit/?slug='.$slug));
	}

	$action_view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Document'))
	->setDisabled(!$can_edit)
	->setIcon('fa-pencil')
	->setHref('/phriction/edit/'.$document->getID().'/'));

	if ($document->getStatus() == PhrictionDocumentStatus::STATUS_EXISTS) {
	$action_view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Move Document'))
	->setDisabled(!$can_edit)
	->setIcon('fa-arrows')
	->setHref('/phriction/move/'.$document->getID().'/')
	->setWorkflow(true));

	$action_view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Delete Document'))
	->setDisabled(!$can_edit)
	->setIcon('fa-times')
	->setHref('/phriction/delete/'.$document->getID().'/')
	->setWorkflow(true));
	}

	return
	$action_view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View History'))
	->setIcon('fa-list')
	->setHref(PhrictionDocument::getSlugURI($slug, 'history')));
	}

	private function renderDocumentChildren($slug) {

	$d_child = PhabricatorSlug::getDepth($slug) + 1;
	$d_grandchild = PhabricatorSlug::getDepth($slug) + 2;
	$limit = 250;

	$query = id(new PhrictionDocumentQuery())
	->setViewer($this->getRequest()->getUser())
	->withDepths(array($d_child, $d_grandchild))
	->withSlugPrefix($slug == '/' ? '' : $slug)
	->withStatuses(array(
	PhrictionDocumentStatus::STATUS_EXISTS,
	PhrictionDocumentStatus::STATUS_STUB,
	))
	->setLimit($limit)
	->setOrder(PhrictionDocumentQuery::ORDER_HIERARCHY)
	->needContent(true);

	$children = $query->execute();
	if (!$children) {
	return;
	}

	// We're going to render in one of three modes to try to accommodate
	// different information scales:
	//
	// - If we found fewer than $limit rows, we know we have all the children
	// and grandchildren and there aren't all that many. We can just render
	// everything.
	// - If we found $limit rows but the results included some grandchildren,
	// we just throw them out and render only the children, as we know we
	// have them all.
	// - If we found $limit rows and the results have no grandchildren, we
	// have a ton of children. Render them and then let the user know that
	// this is not an exhaustive list.

	if (count($children) == $limit) {
	$more_children = true;
	foreach ($children as $child) {
	if ($child->getDepth() == $d_grandchild) {
	$more_children = false;
	}
	}
	$show_grandchildren = false;
	} else {
	$show_grandchildren = true;
	$more_children = false;
	}

	$children_dicts = array();
	$grandchildren_dicts = array();
	foreach ($children as $key => $child) {
	$child_dict = array(
	'slug' => $child->getSlug(),
	'depth' => $child->getDepth(),
	'title' => $child->getContent()->getTitle(),
	);
	if ($child->getDepth() == $d_child) {
	$children_dicts[] = $child_dict;
	continue;
	} else {
	unset($children[$key]);
	if ($show_grandchildren) {
	$ancestors = PhabricatorSlug::getAncestry($child->getSlug());
	$grandchildren_dicts[end($ancestors)][] = $child_dict;
	}
	}
	}

	// Fill in any missing children.
	$known_slugs = mpull($children, null, 'getSlug');
	foreach ($grandchildren_dicts as $slug => $ignored) {
	if (empty($known_slugs[$slug])) {
	$children_dicts[] = array(
	'slug' => $slug,
	'depth' => $d_child,
	'title' => PhabricatorSlug::getDefaultTitle($slug),
	'empty' => true,
	);
	}
	}

	$children_dicts = isort($children_dicts, 'title');

	$list = array();
	foreach ($children_dicts as $child) {
	$list[] = hsprintf('<li class="remarkup-list-item">');
	$list[] = $this->renderChildDocumentLink($child);
	$grand = idx($grandchildren_dicts, $child['slug'], array());
	if ($grand) {
	$list[] = hsprintf('<ul class="remarkup-list">');
	foreach ($grand as $grandchild) {
	$list[] = hsprintf('<li class="remarkup-list-item">');
	$list[] = $this->renderChildDocumentLink($grandchild);
	$list[] = hsprintf('</li>');
	}
	$list[] = hsprintf('</ul>');
	}
	$list[] = hsprintf('</li>');
	}
	if ($more_children) {
	$list[] = phutil_tag(
	'li',
	array(
	'class' => 'remarkup-list-item',
	),
	pht('More...'));
	}

	$header = id(new PHUIHeaderView())
	->setHeader(pht('Document Hierarchy'));

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->appendChild(phutil_tag(
	'div',
	array(
	'class' => 'phabricator-remarkup mlt mlb',
	),
	phutil_tag(
	'ul',
	array(
	'class' => 'remarkup-list',
	),
	$list)));

	return phutil_tag_div('phui-document-view-pro-box', $box);
	}

	private function renderChildDocumentLink(array $info) {
	$title = nonempty($info['title'], pht('(Untitled Document)'));
	$item = phutil_tag(
	'a',
	array(
	'href' => PhrictionDocument::getSlugURI($info['slug']),
	),
	$title);

	if (isset($info['empty'])) {
	$item = phutil_tag('em', array(), $item);
	}

	return $item;
	}

	protected function getDocumentSlug() {
	return $this->slug;
	}

	protected function getToc(PhrictionContent $content) {
	$toc = $content->getRenderedTableOfContents();
	if ($toc) {
	$toc = phutil_tag_div('phui-document-toc-content', array(
	phutil_tag_div(
	'phui-document-toc-header',
	pht('Contents')),
	$toc,
	));
	}
	return $toc;
	}

	}
	diff --git a/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php b/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php
	index 014d0eefef..51abcd8059 100644
	--- a/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php
	+++ b/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php
	@@ -1,154 +1,153 @@
	<?php

	final class PhabricatorPhurlURLViewController
	extends PhabricatorPhurlController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$timeline = null;

	$url = id(new PhabricatorPhurlURLQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$url) {
	return new Aphront404Response();
	}

	$title = $url->getMonogram();
	$page_title = $title.' '.$url->getName();
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($title, $url->getURI());

	$timeline = $this->buildTransactionTimeline(
	$url,
	new PhabricatorPhurlURLTransactionQuery());

	$header = $this->buildHeaderView($url);
	$actions = $this->buildActionView($url);
	$properties = $this->buildPropertyView($url);

	$properties->setActionList($actions);
	$url_error = id(new PHUIInfoView())
	->setErrors(array(pht('This URL is invalid due to a bad protocol.')))
	->setIsHidden($url->isValid());
	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties)
	->setInfoView($url_error);

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
	$add_comment_header = $is_serious
	? pht('Add Comment')
	: pht('More Cowbell');
	$draft = PhabricatorDraft::newFromUserAndKey($viewer, $url->getPHID());
	$comment_uri = $this->getApplicationURI(
	'/url/comment/'.$url->getID().'/');
	$add_comment_form = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($url->getPHID())
	->setDraft($draft)
	->setHeaderText($add_comment_header)
	->setAction($comment_uri)
	->setSubmitButtonName(pht('Add Comment'));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$timeline,
	$add_comment_form,
	),
	array(
	'title' => $page_title,
	'pageObjects' => array($url->getPHID()),
	));
	}

	private function buildHeaderView(PhabricatorPhurlURL $url) {
	$viewer = $this->getViewer();
	$icon = 'fa-compress';
	$color = 'green';
	$status = pht('Active');

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($url->getDisplayName())
	->setStatus($icon, $color, $status)
	->setPolicyObject($url);

	return $header;
	}

	private function buildActionView(PhabricatorPhurlURL $url) {
	$viewer = $this->getViewer();
	$id = $url->getID();

	$actions = id(new PhabricatorActionListView())
	- ->setObjectURI($url->getURI())
	->setUser($viewer)
	->setObject($url);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$url,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions
	->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("url/edit/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit))
	->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Visit URL'))
	->setIcon('fa-external-link')
	->setHref("u/{$id}")
	->setDisabled(!$url->isValid()));

	return $actions;
	}

	private function buildPropertyView(PhabricatorPhurlURL $url) {
	$viewer = $this->getViewer();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($url);

	$properties->addProperty(
	pht('Original URL'),
	$url->getLongURL());

	$properties->addProperty(
	pht('Alias'),
	$url->getAlias());

	$properties->invokeWillRenderEvent();

	if (strlen($url->getDescription())) {
	$description = PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())->setContent($url->getDescription()),
	'default',
	$viewer);

	$properties->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);

	$properties->addTextContent($description);
	}

	return $properties;
	}

	}
	diff --git a/src/applications/ponder/controller/PonderQuestionViewController.php b/src/applications/ponder/controller/PonderQuestionViewController.php
	index 0e92f8e90c..2ec911bdde 100644
	--- a/src/applications/ponder/controller/PonderQuestionViewController.php
	+++ b/src/applications/ponder/controller/PonderQuestionViewController.php
	@@ -1,309 +1,308 @@
	<?php

	final class PonderQuestionViewController extends PonderController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$question = id(new PonderQuestionQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needAnswers(true)
	->needProjectPHIDs(true)
	->executeOne();
	if (!$question) {
	return new Aphront404Response();
	}

	$answers = $this->buildAnswers($question);

	$answer_add_panel = id(new PonderAddAnswerView())
	->setQuestion($question)
	->setUser($viewer)
	->setActionURI('/ponder/answer/add/');

	$header = new PHUIHeaderView();
	$header->setHeader($question->getTitle());
	$header->setUser($viewer);
	$header->setPolicyObject($question);

	if ($question->getStatus() == PonderQuestionStatus::STATUS_OPEN) {
	$header->setStatus('fa-square-o', 'bluegrey', pht('Open'));
	} else {
	$text = PonderQuestionStatus::getQuestionStatusFullName(
	$question->getStatus());
	$icon = PonderQuestionStatus::getQuestionStatusIcon(
	$question->getStatus());
	$header->setStatus($icon, 'dark', $text);
	}

	$actions = $this->buildActionListView($question);
	$properties = $this->buildPropertyListView($question, $actions);
	$sidebar = $this->buildSidebar($question);

	$content_id = celerity_generate_unique_node_id();
	$timeline = $this->buildTransactionTimeline(
	$question,
	id(new PonderQuestionTransactionQuery())
	->withTransactionTypes(array(PhabricatorTransactions::TYPE_COMMENT)));
	$xactions = $timeline->getTransactions();

	$add_comment = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($question->getPHID())
	->setShowPreview(false)
	->setHeaderText(pht('Question Comment'))
	->setAction($this->getApplicationURI("/question/comment/{$id}/"))
	->setSubmitButtonName(pht('Comment'));

	$comment_view = phutil_tag(
	'div',
	array(
	'id' => $content_id,
	'style' => 'display: none;',
	),
	array(
	$timeline,
	$add_comment,
	));

	$footer = id(new PonderFooterView())
	->setContentID($content_id)
	->setCount(count($xactions));

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties)
	->appendChild($footer);

	if ($viewer->getPHID() == $question->getAuthorPHID()) {
	$status = $question->getStatus();
	$answers_list = $question->getAnswers();
	if ($answers_list && ($status == PonderQuestionStatus::STATUS_OPEN)) {
	$info_view = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_WARNING)
	->appendChild(
	pht(
	'If this question has been resolved, please consider closing
	the question and marking the answer as helpful.'));
	$object_box->setInfoView($info_view);
	}
	}

	$crumbs = $this->buildApplicationCrumbs($this->buildSideNavView());
	$crumbs->addTextCrumb('Q'.$id, '/Q'.$id);

	$answer_wiki = null;
	if ($question->getAnswerWiki()) {
	$answer = phutil_tag_div('mlt mlb msr msl', $question->getAnswerWiki());
	$answer_wiki = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Answer Summary'))
	->setColor(PHUIObjectBoxView::COLOR_BLUE)
	->appendChild($answer);
	}

	$ponder_view = id(new PHUITwoColumnView())
	->setMainColumn(array(
	$object_box,
	$comment_view,
	$answer_wiki,
	$answers,
	$answer_add_panel,
	))
	->setSideColumn($sidebar)
	->addClass('ponder-question-view');

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$ponder_view,
	),
	array(
	'title' => 'Q'.$question->getID().' '.$question->getTitle(),
	'pageObjects' => array_merge(
	array($question->getPHID()),
	mpull($question->getAnswers(), 'getPHID')),
	));
	}

	private function buildActionListView(PonderQuestion $question) {
	$viewer = $this->getViewer();
	$request = $this->getRequest();
	$id = $question->getID();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$question,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($question)
	- ->setObjectURI($request->getRequestURI());
	+ ->setObject($question);

	$view->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Question'))
	->setHref($this->getApplicationURI("/question/edit/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	if ($question->getStatus() == PonderQuestionStatus::STATUS_OPEN) {
	$name = pht('Close Question');
	$icon = 'fa-check-square-o';
	} else {
	$name = pht('Reopen Question');
	$icon = 'fa-square-o';
	}

	$view->addAction(
	id(new PhabricatorActionView())
	->setName($name)
	->setIcon($icon)
	->setWorkflow(true)
	->setDisabled(!$can_edit)
	->setHref($this->getApplicationURI("/question/status/{$id}/")));

	$view->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-list')
	->setName(pht('View History'))
	->setHref($this->getApplicationURI("/question/history/{$id}/")));

	return $view;
	}

	private function buildPropertyListView(
	PonderQuestion $question,
	PhabricatorActionListView $actions) {

	$viewer = $this->getViewer();
	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($question)
	->setActionList($actions);

	$view->addProperty(
	pht('Author'),
	$viewer->renderHandle($question->getAuthorPHID()));

	$view->addProperty(
	pht('Created'),
	phabricator_datetime($question->getDateCreated(), $viewer));

	$view->invokeWillRenderEvent();

	$details = PhabricatorMarkupEngine::renderOneObject(
	$question,
	$question->getMarkupField(),
	$viewer);

	if ($details) {
	$view->addSectionHeader(
	pht('Details'),
	PHUIPropertyListView::ICON_SUMMARY);

	$view->addTextContent(
	array(
	phutil_tag(
	'div',
	array(
	'class' => 'phabricator-remarkup',
	),
	$details),
	));
	}

	return $view;
	}

	/**
	* This is fairly non-standard; building N timelines at once (N = number of
	* answers) is tricky business.
	*
	* TODO - re-factor this to ajax in one answer panel at a time in a more
	* standard fashion. This is necessary to scale this application.
	*/
	private function buildAnswers(PonderQuestion $question) {
	$viewer = $this->getViewer();
	$answers = $question->getAnswers();

	$author_phids = mpull($answers, 'getAuthorPHID');
	$handles = $this->loadViewerHandles($author_phids);
	$answers_sort = array_reverse(msort($answers, 'getVoteCount'));

	$view = array();
	foreach ($answers_sort as $answer) {
	$id = $answer->getID();
	$handle = $handles[$answer->getAuthorPHID()];

	$timeline = $this->buildTransactionTimeline(
	$answer,
	id(new PonderAnswerTransactionQuery())
	->withTransactionTypes(array(PhabricatorTransactions::TYPE_COMMENT)));
	$xactions = $timeline->getTransactions();


	$view[] = id(new PonderAnswerView())
	->setUser($viewer)
	->setAnswer($answer)
	->setTransactions($xactions)
	->setTimeline($timeline)
	->setHandle($handle);

	}

	return $view;
	}

	private function buildSidebar(PonderQuestion $question) {
	$viewer = $this->getViewer();
	$status = $question->getStatus();
	$id = $question->getID();

	$questions = id(new PonderQuestionQuery())
	->setViewer($viewer)
	->withStatuses(array($status))
	->withEdgeLogicPHIDs(
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
	PhabricatorQueryConstraint::OPERATOR_OR,
	$question->getProjectPHIDs())
	->setLimit(10)
	->execute();

	$list = id(new PHUIObjectItemListView())
	->setUser($viewer)
	->setNoDataString(pht('No similar questions found.'));

	foreach ($questions as $question) {
	if ($id == $question->getID()) {
	continue;
	}
	$item = new PHUIObjectItemView();
	$item->setObjectName('Q'.$question->getID());
	$item->setHeader($question->getTitle());
	$item->setHref('/Q'.$question->getID());
	$item->setObject($question);

	$item->addAttribute(
	pht(
	'%s Answer(s)',
	new PhutilNumber($question->getAnswerCount())));

	$list->addItem($item);
	}

	$box = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Similar Questions'))
	->setObjectList($list);

	return $box;
	}

	}
	diff --git a/src/applications/ponder/view/PonderAnswerView.php b/src/applications/ponder/view/PonderAnswerView.php
	index 6f4bba539c..3951aa84a7 100644
	--- a/src/applications/ponder/view/PonderAnswerView.php
	+++ b/src/applications/ponder/view/PonderAnswerView.php
	@@ -1,212 +1,211 @@
	<?php

	final class PonderAnswerView extends AphrontTagView {

	private $answer;
	private $transactions;
	private $timeline;
	private $handle;

	public function setAnswer($answer) {
	$this->answer = $answer;
	return $this;
	}

	public function setTransactions($transactions) {
	$this->transactions = $transactions;
	return $this;
	}

	public function setTimeline($timeline) {
	$this->timeline = $timeline;
	return $this;
	}

	public function setHandle($handle) {
	$this->handle = $handle;
	return $this;
	}

	protected function getTagAttributes() {
	return array(
	'class' => 'ponder-answer-view',
	);
	}

	protected function getTagContent() {
	require_celerity_resource('ponder-view-css');
	$answer = $this->answer;
	$viewer = $this->getUser();
	$status = $answer->getStatus();
	$author_phid = $answer->getAuthorPHID();
	$actions = $this->buildAnswerActions();
	$handle = $this->handle;
	$id = $answer->getID();

	if ($status == PonderAnswerStatus::ANSWER_STATUS_HIDDEN) {
	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$answer,
	PhabricatorPolicyCapability::CAN_EDIT);

	$message = array();
	$message[] = phutil_tag(
	'em',
	array(),
	pht('This answer has been hidden.'));

	if ($can_edit) {
	$message[] = phutil_tag(
	'a',
	array(
	'href' => "/ponder/answer/edit/{$id}/",
	),
	pht('Edit Answer'));
	}
	$message = phutil_implode_html(' ', $message);

	return id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_NODATA)
	->appendChild($message);
	}

	$action_button = id(new PHUIButtonView())
	->setTag('a')
	->setText(pht('Actions'))
	->setHref('#')
	->setIconFont('fa-bars')
	->setDropdownMenu($actions);

	$header_name = phutil_tag(
	'a',
	array(
	'href' => $handle->getURI(),
	),
	$handle->getName());

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setEpoch($answer->getDateModified())
	->setHeader($header_name)
	->addActionLink($action_button)
	->setImage($handle->getImageURI())
	->setImageURL($handle->getURI());

	$content = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-remarkup mlt mlb msr msl',
	),
	PhabricatorMarkupEngine::renderOneObject(
	$answer,
	$answer->getMarkupField(),
	$viewer));

	$anchor = id(new PhabricatorAnchorView())
	->setAnchorName("A$id");

	$content_id = celerity_generate_unique_node_id();
	$footer = id(new PonderFooterView())
	->setContentID($content_id)
	->setCount(count($this->transactions));

	$votes = $answer->getVoteCount();
	$vote_class = null;
	if ($votes > 0) {
	$vote_class = 'ponder-footer-action-helpful';
	}
	$icon = id(new PHUIIconView())
	->setIconFont('fa-thumbs-up msr');
	$helpful = phutil_tag(
	'span',
	array(
	'class' => 'ponder-footer-action '.$vote_class,
	),
	array($icon, $votes));
	$footer->addAction($helpful);

	$answer_view = id(new PHUIObjectBoxView())
	->setHeader($header)
	->appendChild($anchor)
	->appendChild($content)
	->appendChild($footer);

	$comment_view = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($answer->getPHID())
	->setShowPreview(false)
	->setHeaderText(pht('Answer Comment'))
	->setAction("/ponder/answer/comment/{$id}/")
	->setSubmitButtonName(pht('Comment'));

	$hidden_view = phutil_tag(
	'div',
	array(
	'id' => $content_id,
	'style' => 'display: none;',
	),
	array(
	$this->timeline,
	$comment_view,
	));

	return array(
	$answer_view,
	$hidden_view,
	);
	}

	private function buildAnswerActions() {
	$viewer = $this->getUser();
	$answer = $this->answer;
	$id = $answer->getID();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$answer,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($answer)
	- ->setObjectURI('Q'.$answer->getQuestionID());
	+ ->setObject($answer);

	$user_marked = $answer->getUserVote();
	$can_vote = $viewer->isLoggedIn();

	if ($user_marked) {
	$helpful_uri = "/ponder/answer/helpful/remove/{$id}/";
	$helpful_icon = 'fa-times';
	$helpful_text = pht('Remove Helpful');
	} else {
	$helpful_uri = "/ponder/answer/helpful/add/{$id}/";
	$helpful_icon = 'fa-thumbs-up';
	$helpful_text = pht('Mark as Helpful');
	}

	$view->addAction(
	id(new PhabricatorActionView())
	->setIcon($helpful_icon)
	->setName($helpful_text)
	->setHref($helpful_uri)
	->setRenderAsForm(true)
	->setDisabled(!$can_vote)
	->setWorkflow($can_vote));

	$view->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Answer'))
	->setHref("/ponder/answer/edit/{$id}/")
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$view->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-list')
	->setName(pht('View History'))
	->setHref("/ponder/answer/history/{$id}/"));

	return $view;
	}
	}
	diff --git a/src/applications/project/controller/PhabricatorProjectColumnDetailController.php b/src/applications/project/controller/PhabricatorProjectColumnDetailController.php
	index bf0b659859..01b520c6c3 100644
	--- a/src/applications/project/controller/PhabricatorProjectColumnDetailController.php
	+++ b/src/applications/project/controller/PhabricatorProjectColumnDetailController.php
	@@ -1,123 +1,122 @@
	<?php

	final class PhabricatorProjectColumnDetailController
	extends PhabricatorProjectBoardController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');
	$project_id = $request->getURIData('projectID');

	$project = id(new PhabricatorProjectQuery())
	->setViewer($viewer)
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	))
	->withIDs(array($project_id))
	->needImages(true)
	->executeOne();
	if (!$project) {
	return new Aphront404Response();
	}
	$this->setProject($project);

	$column = id(new PhabricatorProjectColumnQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	))
	->executeOne();
	if (!$column) {
	return new Aphront404Response();
	}

	$timeline = $this->buildTransactionTimeline(
	$column,
	new PhabricatorProjectColumnTransactionQuery());
	$timeline->setShouldTerminate(true);

	$title = $column->getDisplayName();

	$header = $this->buildHeaderView($column);
	$actions = $this->buildActionView($column);
	$properties = $this->buildPropertyView($column, $actions);

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$nav = $this->buildIconNavView($project);
	$nav->appendChild($box);
	$nav->appendChild($timeline);

	return $this->buildApplicationPage(
	$nav,
	array(
	'title' => $title,
	));
	}

	private function buildHeaderView(PhabricatorProjectColumn $column) {
	$viewer = $this->getRequest()->getUser();

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($column->getDisplayName())
	->setPolicyObject($column);

	if ($column->isHidden()) {
	$header->setStatus('fa-ban', 'dark', pht('Hidden'));
	}

	return $header;
	}

	private function buildActionView(PhabricatorProjectColumn $column) {
	$viewer = $this->getRequest()->getUser();

	$id = $column->getID();
	$project_id = $this->getProject()->getID();
	$base_uri = '/board/'.$project_id.'/';

	$actions = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getApplicationURI($base_uri.'column/'.$id.'/'))
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$column,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Column'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI($base_uri.'edit/'.$id.'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	return $actions;
	}

	private function buildPropertyView(
	PhabricatorProjectColumn $column,
	PhabricatorActionListView $actions) {
	$viewer = $this->getRequest()->getUser();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($column)
	->setActionList($actions);

	$limit = $column->getPointLimit();
	$properties->addProperty(
	pht('Point Limit'),
	$limit ? $limit : pht('No Limit'));

	return $properties;
	}

	}
	diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php
	index 2420297c2f..e45da78fc8 100644
	--- a/src/applications/project/controller/PhabricatorProjectProfileController.php
	+++ b/src/applications/project/controller/PhabricatorProjectProfileController.php
	@@ -1,223 +1,222 @@
	<?php

	final class PhabricatorProjectProfileController
	extends PhabricatorProjectController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$user = $request->getUser();

	$query = id(new PhabricatorProjectQuery())
	->setViewer($user)
	->needMembers(true)
	->needWatchers(true)
	->needImages(true)
	->needSlugs(true);
	$id = $request->getURIData('id');
	$slug = $request->getURIData('slug');
	if ($slug) {
	$query->withSlugs(array($slug));
	} else {
	$query->withIDs(array($id));
	}
	$project = $query->executeOne();
	if (!$project) {
	return new Aphront404Response();
	}
	if ($slug && $slug != $project->getPrimarySlug()) {
	return id(new AphrontRedirectResponse())
	->setURI('/tag/'.$project->getPrimarySlug().'/');
	}

	$picture = $project->getProfileImageURI();

	$header = id(new PHUIHeaderView())
	->setHeader($project->getName())
	->setUser($user)
	->setPolicyObject($project)
	->setImage($picture);

	if ($project->getStatus() == PhabricatorProjectStatus::STATUS_ACTIVE) {
	$header->setStatus('fa-check', 'bluegrey', pht('Active'));
	} else {
	$header->setStatus('fa-ban', 'red', pht('Archived'));
	}

	$actions = $this->buildActionListView($project);
	$properties = $this->buildPropertyListView($project, $actions);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$timeline = $this->buildTransactionTimeline(
	$project,
	new PhabricatorProjectTransactionQuery());
	$timeline->setShouldTerminate(true);

	$nav = $this->buildIconNavView($project);
	$nav->selectFilter("profile/{$id}/");
	$nav->appendChild($object_box);
	$nav->appendChild($timeline);

	return $this->buildApplicationPage(
	$nav,
	array(
	'title' => $project->getName(),
	'pageObjects' => array($project->getPHID()),
	));
	}

	private function buildActionListView(PhabricatorProject $project) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$id = $project->getID();

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($project)
	- ->setObjectURI($request->getRequestURI());
	+ ->setObject($project);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$project,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Details'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("details/{$id}/"))
	->setDisabled(!$can_edit));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Picture'))
	->setIcon('fa-picture-o')
	->setHref($this->getApplicationURI("picture/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	if ($project->isArchived()) {
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Activate Project'))
	->setIcon('fa-check')
	->setHref($this->getApplicationURI("archive/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	} else {
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Archive Project'))
	->setIcon('fa-ban')
	->setHref($this->getApplicationURI("archive/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	}

	$action = null;
	if (!$project->isUserMember($viewer->getPHID())) {
	$can_join = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$project,
	PhabricatorPolicyCapability::CAN_JOIN);

	$action = id(new PhabricatorActionView())
	->setUser($viewer)
	->setRenderAsForm(true)
	->setHref('/project/update/'.$project->getID().'/join/')
	->setIcon('fa-plus')
	->setDisabled(!$can_join)
	->setName(pht('Join Project'));
	$view->addAction($action);
	} else {
	$action = id(new PhabricatorActionView())
	->setWorkflow(true)
	->setHref('/project/update/'.$project->getID().'/leave/')
	->setIcon('fa-times')
	->setName(pht('Leave Project...'));
	$view->addAction($action);

	if (!$project->isUserWatcher($viewer->getPHID())) {
	$action = id(new PhabricatorActionView())
	->setWorkflow(true)
	->setHref('/project/watch/'.$project->getID().'/')
	->setIcon('fa-eye')
	->setName(pht('Watch Project'));
	$view->addAction($action);
	} else {
	$action = id(new PhabricatorActionView())
	->setWorkflow(true)
	->setHref('/project/unwatch/'.$project->getID().'/')
	->setIcon('fa-eye-slash')
	->setName(pht('Unwatch Project'));
	$view->addAction($action);
	}
	}

	return $view;
	}

	private function buildPropertyListView(
	PhabricatorProject $project,
	PhabricatorActionListView $actions) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($project)
	->setActionList($actions);

	$hashtags = array();
	foreach ($project->getSlugs() as $slug) {
	$hashtags[] = id(new PHUITagView())
	->setType(PHUITagView::TYPE_OBJECT)
	->setName('#'.$slug->getSlug());
	}

	$view->addProperty(pht('Hashtags'), phutil_implode_html(' ', $hashtags));

	$view->addProperty(
	pht('Members'),
	$project->getMemberPHIDs()
	? $viewer
	->renderHandleList($project->getMemberPHIDs())
	->setAsInline(true)
	: phutil_tag('em', array(), pht('None')));

	$view->addProperty(
	pht('Watchers'),
	$project->getWatcherPHIDs()
	? $viewer
	->renderHandleList($project->getWatcherPHIDs())
	->setAsInline(true)
	: phutil_tag('em', array(), pht('None')));

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$project);

	$view->addProperty(
	pht('Looks Like'),
	$viewer->renderHandle($project->getPHID())->setAsTag(true));

	$view->addProperty(
	pht('Joinable By'),
	$descriptions[PhabricatorPolicyCapability::CAN_JOIN]);

	$field_list = PhabricatorCustomField::getObjectFields(
	$project,
	PhabricatorCustomField::ROLE_VIEW);
	$field_list->appendFieldsToPropertyList($project, $viewer, $view);

	return $view;
	}


	}
	diff --git a/src/applications/releeph/controller/branch/ReleephBranchViewController.php b/src/applications/releeph/controller/branch/ReleephBranchViewController.php
	index 11615fe3ed..cb4c3ed297 100644
	--- a/src/applications/releeph/controller/branch/ReleephBranchViewController.php
	+++ b/src/applications/releeph/controller/branch/ReleephBranchViewController.php
	@@ -1,150 +1,149 @@
	<?php

	final class ReleephBranchViewController extends ReleephBranchController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('branchID');
	$querykey = $request->getURIData('queryKey');

	$branch = id(new ReleephBranchQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$branch) {
	return new Aphront404Response();
	}
	$this->setBranch($branch);

	$controller = id(new PhabricatorApplicationSearchController())
	->setPreface($this->renderPreface())
	->setQueryKey($querykey)
	->setSearchEngine($this->getSearchEngine())
	->setNavigation($this->buildSideNavView());

	return $this->delegateToController($controller);
	}


	public function buildSideNavView($for_app = false) {
	$user = $this->getRequest()->getUser();

	$nav = new AphrontSideNavFilterView();
	$nav->setBaseURI(new PhutilURI($this->getApplicationURI()));

	$this->getSearchEngine()->addNavigationItems($nav->getMenu());

	$nav->selectFilter(null);

	return $nav;
	}

	private function getSearchEngine() {
	$branch = $this->getBranch();
	return id(new ReleephRequestSearchEngine())
	->setBranch($branch)
	->setBaseURI($this->getApplicationURI('branch/'.$branch->getID().'/'))
	->setViewer($this->getRequest()->getUser());
	}

	protected function buildApplicationCrumbs() {
	$crumbs = parent::buildApplicationCrumbs();

	$branch = $this->getBranch();
	if ($branch) {
	$pull_uri = $this->getApplicationURI('branch/pull/'.$branch->getID().'/');
	$crumbs->addAction(
	id(new PHUIListItemView())
	->setHref($pull_uri)
	->setName(pht('New Pull Request'))
	->setIcon('fa-plus-square')
	->setDisabled(!$branch->isActive()));
	}

	return $crumbs;
	}

	private function renderPreface() {
	$viewer = $this->getRequest()->getUser();

	$branch = $this->getBranch();
	$id = $branch->getID();

	$header = id(new PHUIHeaderView())
	->setHeader($branch->getDisplayName())
	->setUser($viewer)
	->setPolicyObject($branch);

	if ($branch->getIsActive()) {
	$header->setStatus('fa-check', 'bluegrey', pht('Active'));
	} else {
	$header->setStatus('fa-ban', 'dark', pht('Closed'));
	}

	$actions = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($branch)
	- ->setObjectURI($this->getRequest()->getRequestURI());
	+ ->setObject($branch);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$branch,
	PhabricatorPolicyCapability::CAN_EDIT);

	$edit_uri = $this->getApplicationURI("branch/edit/{$id}/");
	$close_uri = $this->getApplicationURI("branch/close/{$id}/");
	$reopen_uri = $this->getApplicationURI("branch/re-open/{$id}/");
	$history_uri = $this->getApplicationURI("branch/{$id}/history/");

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Branch'))
	->setHref($edit_uri)
	->setIcon('fa-pencil')
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	if ($branch->getIsActive()) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Close Branch'))
	->setHref($close_uri)
	->setIcon('fa-times')
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	} else {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Reopen Branch'))
	->setHref($reopen_uri)
	->setIcon('fa-plus')
	->setUser($viewer)
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	}

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View History'))
	->setHref($history_uri)
	->setIcon('fa-list'));

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($branch)
	->setActionList($actions);

	$properties->addProperty(
	pht('Branch'),
	$branch->getName());

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);
	}

	}
	diff --git a/src/applications/releeph/controller/product/ReleephProductViewController.php b/src/applications/releeph/controller/product/ReleephProductViewController.php
	index e35497eec7..963710c3ec 100644
	--- a/src/applications/releeph/controller/product/ReleephProductViewController.php
	+++ b/src/applications/releeph/controller/product/ReleephProductViewController.php
	@@ -1,154 +1,153 @@
	<?php

	final class ReleephProductViewController extends ReleephProductController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$id = $request->getURIData('projectID');
	$query_key = $request->getURIData('queryKey');
	$viewer = $request->getViewer();

	$product = id(new ReleephProductQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$product) {
	return new Aphront404Response();
	}
	$this->setProduct($product);

	$controller = id(new PhabricatorApplicationSearchController())
	->setQueryKey($query_key)
	->setPreface($this->renderPreface())
	->setSearchEngine(
	id(new ReleephBranchSearchEngine())
	->setProduct($product))
	->setNavigation($this->buildSideNavView());

	return $this->delegateToController($controller);
	}

	public function buildSideNavView($for_app = false) {
	$viewer = $this->getRequest()->getUser();
	$product = $this->getProduct();

	$nav = new AphrontSideNavFilterView();
	$nav->setBaseURI(new PhutilURI($this->getApplicationURI()));

	if ($for_app) {
	$nav->addFilter('product/create/', pht('Create Product'));
	}

	id(new ReleephBranchSearchEngine())
	->setProduct($product)
	->setViewer($viewer)
	->addNavigationItems($nav->getMenu());

	$nav->selectFilter(null);

	return $nav;
	}

	protected function buildApplicationCrumbs() {
	$crumbs = parent::buildApplicationCrumbs();

	$product = $this->getProduct();
	if ($product) {
	$crumbs->addAction(
	id(new PHUIListItemView())
	->setHref($product->getURI('cutbranch/'))
	->setName(pht('Cut New Branch'))
	->setIcon('fa-plus'));
	}

	return $crumbs;
	}

	private function renderPreface() {
	$viewer = $this->getRequest()->getUser();
	$product = $this->getProduct();

	$id = $product->getID();

	$header = id(new PHUIHeaderView())
	->setHeader($product->getName())
	->setUser($viewer)
	->setPolicyObject($product);

	if ($product->getIsActive()) {
	$header->setStatus('fa-check', 'bluegrey', pht('Active'));
	} else {
	$header->setStatus('fa-ban', 'dark', pht('Inactive'));
	}

	$actions = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($product)
	- ->setObjectURI($this->getRequest()->getRequestURI());
	+ ->setObject($product);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$product,
	PhabricatorPolicyCapability::CAN_EDIT);

	$edit_uri = $this->getApplicationURI("product/{$id}/edit/");
	$history_uri = $this->getApplicationURI("product/{$id}/history/");

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Product'))
	->setHref($edit_uri)
	->setIcon('fa-pencil')
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	if ($product->getIsActive()) {
	$status_name = pht('Deactivate Product');
	$status_href = "product/{$id}/action/deactivate/";
	$status_icon = 'fa-times';
	} else {
	$status_name = pht('Reactivate Product');
	$status_href = "product/{$id}/action/activate/";
	$status_icon = 'fa-plus-circle-o';
	}

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName($status_name)
	->setHref($this->getApplicationURI($status_href))
	->setIcon($status_icon)
	->setDisabled(!$can_edit)
	->setWorkflow(true));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View History'))
	->setHref($history_uri)
	->setIcon('fa-list'));

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($product);

	$properties->addProperty(
	pht('Repository'),
	$product->getRepository()->getName());

	$properties->setActionList($actions);

	$pushers = $product->getPushers();
	if ($pushers) {
	$properties->addProperty(
	pht('Pushers'),
	$viewer->renderHandleList($pushers));
	}

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);
	}

	}
	diff --git a/src/applications/spaces/controller/PhabricatorSpacesViewController.php b/src/applications/spaces/controller/PhabricatorSpacesViewController.php
	index 511d853151..7515b4dcc2 100644
	--- a/src/applications/spaces/controller/PhabricatorSpacesViewController.php
	+++ b/src/applications/spaces/controller/PhabricatorSpacesViewController.php
	@@ -1,144 +1,143 @@
	<?php

	final class PhabricatorSpacesViewController
	extends PhabricatorSpacesController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();

	$space = id(new PhabricatorSpacesNamespaceQuery())
	->setViewer($viewer)
	->withIDs(array($request->getURIData('id')))
	->executeOne();
	if (!$space) {
	return new Aphront404Response();
	}

	$action_list = $this->buildActionListView($space);
	$property_list = $this->buildPropertyListView($space);
	$property_list->setActionList($action_list);

	$xactions = id(new PhabricatorSpacesNamespaceTransactionQuery())
	->setViewer($viewer)
	->withObjectPHIDs(array($space->getPHID()))
	->execute();

	$timeline = $this->buildTransactionTimeline(
	$space,
	new PhabricatorSpacesNamespaceTransactionQuery());
	$timeline->setShouldTerminate(true);

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($space->getNamespaceName())
	->setPolicyObject($space);

	if ($space->getIsArchived()) {
	$header->setStatus('fa-ban', 'red', pht('Archived'));
	} else {
	$header->setStatus('fa-check', 'bluegrey', pht('Active'));
	}

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($property_list);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($space->getMonogram());

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$timeline,
	),
	array(
	'title' => array($space->getMonogram(), $space->getNamespaceName()),
	));
	}

	private function buildPropertyListView(PhabricatorSpacesNamespace $space) {
	$viewer = $this->getRequest()->getUser();

	$list = id(new PHUIPropertyListView())
	->setUser($viewer);

	$list->addProperty(
	pht('Default Space'),
	$space->getIsDefaultNamespace()
	? pht('Yes')
	: pht('No'));

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$space);

	$list->addProperty(
	pht('Editable By'),
	$descriptions[PhabricatorPolicyCapability::CAN_EDIT]);

	$description = $space->getDescription();
	if (strlen($description)) {
	$description = PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())->setContent($description),
	'default',
	$viewer);

	$list->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);

	$list->addTextContent($description);
	}

	return $list;
	}

	private function buildActionListView(PhabricatorSpacesNamespace $space) {
	$viewer = $this->getRequest()->getUser();

	$list = id(new PhabricatorActionListView())
	- ->setUser($viewer)
	- ->setObjectURI('/'.$space->getMonogram());
	+ ->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$space,
	PhabricatorPolicyCapability::CAN_EDIT);

	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Space'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI('edit/'.$space->getID().'/'))
	->setWorkflow(!$can_edit)
	->setDisabled(!$can_edit));

	$id = $space->getID();

	if ($space->getIsArchived()) {
	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Activate Space'))
	->setIcon('fa-check')
	->setHref($this->getApplicationURI("activate/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	} else {
	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Archive Space'))
	->setIcon('fa-ban')
	->setHref($this->getApplicationURI("archive/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	}

	return $list;
	}

	}
	diff --git a/src/view/layout/PhabricatorActionListView.php b/src/view/layout/PhabricatorActionListView.php
	index 82449951d7..6c343af4fe 100644
	--- a/src/view/layout/PhabricatorActionListView.php
	+++ b/src/view/layout/PhabricatorActionListView.php
	@@ -1,66 +1,59 @@
	<?php

	final class PhabricatorActionListView extends AphrontView {

	private $actions = array();
	private $object;
	- private $objectURI;
	private $id = null;

	public function setObject(PhabricatorLiskDAO $object) {
	$this->object = $object;
	return $this;
	}

	- public function setObjectURI($uri) {
	- $this->objectURI = $uri;
	- return $this;
	- }
	-
	public function addAction(PhabricatorActionView $view) {
	$this->actions[] = $view;
	return $this;
	}

	public function setID($id) {
	$this->id = $id;
	return $this;
	}

	public function render() {
	if (!$this->user) {
	throw new PhutilInvalidStateException('setUser');
	}

	$event = new PhabricatorEvent(
	PhabricatorEventType::TYPE_UI_DIDRENDERACTIONS,
	array(
	'object' => $this->object,
	'actions' => $this->actions,
	));
	$event->setUser($this->user);
	PhutilEventEngine::dispatchEvent($event);

	$actions = $event->getValue('actions');
	if (!$actions) {
	return null;
	}

	foreach ($actions as $action) {
	- $action->setObjectURI($this->objectURI);
	$action->setUser($this->user);
	}

	require_celerity_resource('phabricator-action-list-view-css');

	return phutil_tag(
	'ul',
	array(
	'class' => 'phabricator-action-list-view',
	'id' => $this->id,
	),
	$actions);
	}


	}
	diff --git a/src/view/layout/PhabricatorActionView.php b/src/view/layout/PhabricatorActionView.php
	index 8c56f66968..15ff0a0023 100644
	--- a/src/view/layout/PhabricatorActionView.php
	+++ b/src/view/layout/PhabricatorActionView.php
	@@ -1,223 +1,201 @@
	<?php

	final class PhabricatorActionView extends AphrontView {

	private $name;
	private $icon;
	private $href;
	private $disabled;
	private $label;
	private $workflow;
	private $renderAsForm;
	private $download;
	- private $objectURI;
	private $sigils = array();
	private $metadata;
	private $selected;
	private $openInNewWindow;

	public function setSelected($selected) {
	$this->selected = $selected;
	return $this;
	}

	public function getSelected() {
	return $this->selected;
	}

	public function setMetadata($metadata) {
	$this->metadata = $metadata;
	return $this;
	}

	public function getMetadata() {
	return $this->metadata;
	}

	- public function setObjectURI($object_uri) {
	- $this->objectURI = $object_uri;
	- return $this;
	- }
	-
	- public function getObjectURI() {
	- return $this->objectURI;
	- }
	-
	public function setDownload($download) {
	$this->download = $download;
	return $this;
	}

	public function getDownload() {
	return $this->download;
	}

	public function setHref($href) {
	$this->href = $href;
	return $this;
	}

	public function addSigil($sigil) {
	$this->sigils[] = $sigil;
	return $this;
	}

	- /**
	- * If the user is not logged in and the action is relatively complicated,
	- * give them a generic login link that will re-direct to the page they're
	- * viewing.
	- */
	public function getHref() {
	- if (($this->workflow \|\| $this->renderAsForm) && !$this->download) {
	- if (!$this->user \|\| !$this->user->isLoggedIn()) {
	- return id(new PhutilURI('/auth/start/'))
	- ->setQueryParam('next', (string)$this->getObjectURI());
	- }
	- }
	-
	return $this->href;
	}

	public function setIcon($icon) {
	$this->icon = $icon;
	return $this;
	}

	public function setName($name) {
	$this->name = $name;
	return $this;
	}

	public function setLabel($label) {
	$this->label = $label;
	return $this;
	}

	public function setDisabled($disabled) {
	$this->disabled = $disabled;
	return $this;
	}

	public function setWorkflow($workflow) {
	$this->workflow = $workflow;
	return $this;
	}

	public function setRenderAsForm($form) {
	$this->renderAsForm = $form;
	return $this;
	}

	public function setOpenInNewWindow($open_in_new_window) {
	$this->openInNewWindow = $open_in_new_window;
	return $this;
	}

	public function getOpenInNewWindow() {
	return $this->openInNewWindow;
	}

	public function render() {

	$icon = null;
	if ($this->icon) {
	$color = '';
	if ($this->disabled) {
	$color = ' grey';
	}
	$icon = id(new PHUIIconView())
	->addClass('phabricator-action-view-icon')
	->setIconFont($this->icon.$color);
	}

	if ($this->href) {

	$sigils = array();
	if ($this->workflow) {
	$sigils[] = 'workflow';
	}
	if ($this->download) {
	$sigils[] = 'download';
	}

	if ($this->sigils) {
	$sigils = array_merge($sigils, $this->sigils);
	}

	$sigils = $sigils ? implode(' ', $sigils) : null;

	if ($this->renderAsForm) {
	if (!$this->user) {
	throw new Exception(
	pht(
	'Call %s when rendering an action as a form.',
	'setUser()'));
	}

	$item = javelin_tag(
	'button',
	array(
	'class' => 'phabricator-action-view-item',
	),
	array($icon, $this->name));

	$item = phabricator_form(
	$this->user,
	array(
	'action' => $this->getHref(),
	'method' => 'POST',
	'sigil' => $sigils,
	'meta' => $this->metadata,
	),
	$item);
	} else {
	if ($this->getOpenInNewWindow()) {
	$target = '_blank';
	} else {
	$target = null;
	}

	$item = javelin_tag(
	'a',
	array(
	'href' => $this->getHref(),
	'class' => 'phabricator-action-view-item',
	'target' => $target,
	'sigil' => $sigils,
	'meta' => $this->metadata,
	),
	array($icon, $this->name));
	}
	} else {
	$item = phutil_tag(
	'span',
	array(
	'class' => 'phabricator-action-view-item',
	),
	array($icon, $this->name));
	}

	$classes = array();
	$classes[] = 'phabricator-action-view';

	if ($this->disabled) {
	$classes[] = 'phabricator-action-view-disabled';
	}

	if ($this->label) {
	$classes[] = 'phabricator-action-view-label';
	}

	if ($this->selected) {
	$classes[] = 'phabricator-action-view-selected';
	}

	return phutil_tag(
	'li',
	array(
	'class' => implode(' ', $classes),
	),
	$item);
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Tue, Jun 10, 9:08 PM (1 d, 4 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 141039
Default Alt Text: (404 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions