Page MenuHomePhabricator
Files F13183550

D14059.id33990.diff
No OneTemporary
Actions

D14059.id33990.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
*/
return array(
'names' => array(
- 'core.pkg.css' => '994de4ed',
+ 'core.pkg.css' => 'a40c0b28',
'core.pkg.js' => '47dc9ebb',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '2de124c9',
@@ -93,7 +93,7 @@
'rsrc/css/application/policy/policy-edit.css' => '815c66f7',
'rsrc/css/application/policy/policy-transaction-detail.css' => '82100a43',
'rsrc/css/application/policy/policy.css' => '957ea14c',
- 'rsrc/css/application/ponder/ponder-view.css' => 'bef48f86',
+ 'rsrc/css/application/ponder/ponder-view.css' => '7b0df4da',
'rsrc/css/application/projects/project-icon.css' => '4e3eaa5a',
'rsrc/css/application/releeph/releeph-core.css' => '9b3c5733',
'rsrc/css/application/releeph/releeph-preview-branch.css' => 'b7a6f4a5',
@@ -104,7 +104,7 @@
'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
'rsrc/css/application/uiexample/example.css' => '528b19de',
'rsrc/css/core/core.css' => 'a76cefc9',
- 'rsrc/css/core/remarkup.css' => '73fc4395',
+ 'rsrc/css/core/remarkup.css' => 'ef286a6e',
'rsrc/css/core/syntax.css' => '9fd11da8',
'rsrc/css/core/z-index.css' => '57ddcaa2',
'rsrc/css/diviner/diviner-shared.css' => '5a337049',
@@ -138,10 +138,10 @@
'rsrc/css/phui/phui-info-view.css' => '5b16bac6',
'rsrc/css/phui/phui-list.css' => '125599df',
'rsrc/css/phui/phui-object-box.css' => '407eaf5a',
- 'rsrc/css/phui/phui-object-item-list-view.css' => 'ab1bf393',
+ 'rsrc/css/phui/phui-object-item-list-view.css' => '26c30d3f',
'rsrc/css/phui/phui-pager.css' => 'bea33d23',
'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
- 'rsrc/css/phui/phui-property-list-view.css' => '318d4dea',
+ 'rsrc/css/phui/phui-property-list-view.css' => '03904f6b',
'rsrc/css/phui/phui-remarkup-preview.css' => '867f85b3',
'rsrc/css/phui/phui-spacing.css' => '042804d6',
'rsrc/css/phui/phui-status.css' => '888cedb8',
@@ -737,7 +737,7 @@
'phabricator-object-selector-css' => '85ee8ce6',
'phabricator-phtize' => 'd254d646',
'phabricator-prefab' => '6920d200',
- 'phabricator-remarkup-css' => '73fc4395',
+ 'phabricator-remarkup-css' => 'ef286a6e',
'phabricator-search-results-css' => '7dea472c',
'phabricator-shaped-request' => '7cbe244b',
'phabricator-side-menu-view-css' => 'bec2458e',
@@ -791,10 +791,10 @@
'phui-inline-comment-view-css' => '0fdb3667',
'phui-list-view-css' => '125599df',
'phui-object-box-css' => '407eaf5a',
- 'phui-object-item-list-view-css' => 'ab1bf393',
+ 'phui-object-item-list-view-css' => '26c30d3f',
'phui-pager-css' => 'bea33d23',
'phui-pinboard-view-css' => '2495140e',
- 'phui-property-list-view-css' => '318d4dea',
+ 'phui-property-list-view-css' => '03904f6b',
'phui-remarkup-preview-css' => '867f85b3',
'phui-spacing-css' => '042804d6',
'phui-status-list-view-css' => '888cedb8',
@@ -811,7 +811,7 @@
'policy-css' => '957ea14c',
'policy-edit-css' => '815c66f7',
'policy-transaction-detail-css' => '82100a43',
- 'ponder-view-css' => 'bef48f86',
+ 'ponder-view-css' => '7b0df4da',
'project-icon-css' => '4e3eaa5a',
'raphael-core' => '51ee6b43',
'raphael-g' => '40dde778',
diff --git a/src/applications/meta/query/PhabricatorAppSearchEngine.php b/src/applications/meta/query/PhabricatorAppSearchEngine.php
--- a/src/applications/meta/query/PhabricatorAppSearchEngine.php
+++ b/src/applications/meta/query/PhabricatorAppSearchEngine.php
@@ -226,39 +226,36 @@
),
'');
- $description = phutil_tag(
- 'div',
- array(
- 'style' => 'white-space: nowrap; '.
- 'overflow: hidden; '.
- 'text-overflow: ellipsis;',
- ),
- $application->getShortDescription());
+ $description = $application->getShortDescription();
+
+ $configure = id(new PHUIButtonView())
+ ->setTag('a')
+ ->setHref('/applications/view/'.get_class($application).'/')
+ ->setText(pht('Configure'))
+ ->setColor(PHUIButtonView::GREY);
+
+ $name = $application->getName();
+ if ($application->isPrototype()) {
+ $name = $name.' '.pht('(Prototype)');
+ }
$item = id(new PHUIObjectItemView())
- ->setHeader($application->getName())
+ ->setHeader($name)
->setImageIcon($icon_view)
- ->addAttribute($description)
- ->addAction(
- id(new PHUIListItemView())
- ->setName(pht('Help/Options'))
- ->setIcon('fa-cog')
- ->setHref('/applications/view/'.get_class($application).'/'));
+ ->setSubhead($description)
+ ->setLaunchButton($configure);
if ($application->getBaseURI() && $application->isInstalled()) {
$item->setHref($application->getBaseURI());
}
if (!$application->isInstalled()) {
- $item->addIcon('fa-times', pht('Uninstalled'));
- }
-
- if ($application->isPrototype()) {
- $item->addIcon('fa-bomb grey', pht('Prototype'));
+ $item->addAttribute(pht('Uninstalled'));
+ $item->setDisabled(true);
}
if (!$application->isFirstParty()) {
- $item->addIcon('fa-puzzle-piece', pht('Extension'));
+ $item->addAttribute(pht('Extension'));
}
$list->addItem($item);
diff --git a/src/view/phui/PHUIObjectItemView.php b/src/view/phui/PHUIObjectItemView.php
--- a/src/view/phui/PHUIObjectItemView.php
+++ b/src/view/phui/PHUIObjectItemView.php
@@ -26,6 +26,7 @@
private $badge;
private $countdownNum;
private $countdownNoun;
+ private $launchButton;
const AGE_FRESH = 'fresh';
const AGE_STALE = 'stale';
@@ -260,6 +261,12 @@
return $this;
}
+ public function setLaunchButton(PHUIButtonView $button) {
+ $button->setSize(PHUIButtonView::SMALL);
+ $this->launchButton = $button;
+ return $this;
+ }
+
protected function getTagName() {
return 'li';
}
@@ -652,6 +659,17 @@
));
}
+ if ($this->launchButton) {
+ $column2 = phutil_tag(
+ 'div',
+ array(
+ 'class' => 'phui-object-item-col2 phui-object-item-launch-button',
+ ),
+ array(
+ $this->launchButton,
+ ));
+ }
+
$table = phutil_tag(
'div',
array(
diff --git a/webroot/rsrc/css/phui/phui-object-item-list-view.css b/webroot/rsrc/css/phui/phui-object-item-list-view.css
--- a/webroot/rsrc/css/phui/phui-object-item-list-view.css
+++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css
@@ -747,3 +747,16 @@
.phui-object-item-with-image .phui-object-item-content-box {
margin-left: 46px;
}
+
+/* - Launcher Button -------------------------------------------------------- */
+
+.phui-object-item-col2.phui-object-item-launch-button {
+ text-align: right;
+ vertical-align: middle;
+ padding-right: 4px;
+}
+
+.device-phone .phui-object-item-col2.phui-object-item-launch-button {
+ padding: 0 8px 8px;
+ text-align: left;
+}

File Metadata

Mime Type
text/plain
Expires
Sat, May 11, 10:20 AM (3 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6285397
Default Alt Text
D14059.id33990.diff (7 KB)

Event Timeline

Phabricator · Built by Phacility