Page MenuHomePhabricator
Files F15394673

D15385.id37097.diff
No OneTemporary
Actions

D15385.id37097.diff
View Options

diff --git a/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php b/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php
--- a/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php
+++ b/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php
@@ -25,6 +25,7 @@
$page_title = $title.' '.$url->getName();
$crumbs = $this->buildApplicationCrumbs();
$crumbs->addTextCrumb($title, $url->getURI());
+ $crumbs->setBorder(true);
$timeline = $this->buildTransactionTimeline(
$url,
@@ -33,15 +34,11 @@
$header = $this->buildHeaderView($url);
$actions = $this->buildActionView($url);
$properties = $this->buildPropertyView($url);
+ $details = $this->buildPropertySectionView($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
@@ -58,30 +55,49 @@
->setAction($comment_uri)
->setSubmitButtonName(pht('Add Comment'));
- return $this->buildApplicationPage(
- array(
- $crumbs,
- $box,
+ $view = id(new PHUITwoColumnView())
+ ->setHeader($header)
+ ->setMainColumn(array(
+ $url_error,
+ $details,
$timeline,
$add_comment_form,
- ),
- array(
- 'title' => $page_title,
- 'pageObjects' => array($url->getPHID()),
+ ))
+ ->setPropertyList($properties)
+ ->setActionList($actions);
+
+ return $this->newPage()
+ ->setTitle($page_title)
+ ->setCrumbs($crumbs)
+ ->setPageObjectPHIDs(array($url->getPHID()))
+ ->appendChild(
+ array(
+ $view,
));
+
}
private function buildHeaderView(PhabricatorPhurlURL $url) {
$viewer = $this->getViewer();
- $icon = 'fa-compress';
- $color = 'green';
+ $icon = 'fa-check';
+ $color = 'bluegrey';
$status = pht('Active');
+ $id = $url->getID();
+
+ $visit = id(new PHUIButtonView())
+ ->setTag('a')
+ ->setText(pht('Visit URL'))
+ ->setIcon('fa-external-link')
+ ->setHref("u/{$id}")
+ ->setDisabled(!$url->isValid());
$header = id(new PHUIHeaderView())
->setUser($viewer)
->setHeader($url->getDisplayName())
->setStatus($icon, $color, $status)
- ->setPolicyObject($url);
+ ->setPolicyObject($url)
+ ->setHeaderIcon('fa-compress')
+ ->addActionLink($visit);
return $header;
}
@@ -106,23 +122,16 @@
->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()));
+ ->setWorkflow(!$can_edit));
return $actions;
}
- private function buildPropertyView(PhabricatorPhurlURL $url) {
+ private function buildPropertySectionView(PhabricatorPhurlURL $url) {
$viewer = $this->getViewer();
$properties = id(new PHUIPropertyListView())
- ->setUser($viewer)
- ->setObject($url);
+ ->setUser($viewer);
$properties->addProperty(
pht('Original URL'),
@@ -132,17 +141,28 @@
pht('Alias'),
$url->getAlias());
- $properties->invokeWillRenderEvent();
-
$description = $url->getDescription();
if (strlen($description)) {
$description = new PHUIRemarkupView($viewer, $description);
- $properties->addSectionHeader(
- pht('Description'),
- PHUIPropertyListView::ICON_SUMMARY);
+ $properties->addSectionHeader(pht('Description'));
$properties->addTextContent($description);
}
+ return id(new PHUIObjectBoxView())
+ ->setHeaderText(pht('DETAILS'))
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+ ->appendChild($properties);
+ }
+
+ private function buildPropertyView(PhabricatorPhurlURL $url) {
+ $viewer = $this->getViewer();
+
+ $properties = id(new PHUIPropertyListView())
+ ->setUser($viewer)
+ ->setObject($url);
+
+ $properties->invokeWillRenderEvent();
+
return $properties;
}

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 17, 12:00 AM (2 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7707891
Default Alt Text
D15385.id37097.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility