Page MenuHomePhabricator
Files F13243378

D9524.id22827.diff
No OneTemporary
Actions

D9524.id22827.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,8 +7,8 @@
return array(
'names' =>
array(
- 'core.pkg.css' => '6cdd937e',
- 'core.pkg.js' => '8335fe3f',
+ 'core.pkg.css' => '0bb38558',
+ 'core.pkg.js' => '07b01d4f',
'darkconsole.pkg.js' => 'ca8671ce',
'differential.pkg.css' => '4a93db37',
'differential.pkg.js' => 'eca39a2c',
@@ -36,7 +36,7 @@
'rsrc/css/aphront/two-column.css' => '16ab3ad2',
'rsrc/css/aphront/typeahead.css' => 'a989b5b3',
'rsrc/css/application/auth/auth.css' => '1e655982',
- 'rsrc/css/application/base/main-menu-view.css' => '72d1d2ef',
+ 'rsrc/css/application/base/main-menu-view.css' => 'bbeca15b',
'rsrc/css/application/base/notification-menu.css' => 'cbff1b94',
'rsrc/css/application/base/phabricator-application-launch-view.css' => '8b7e271d',
'rsrc/css/application/base/standard-page-view.css' => '517cdfb1',
@@ -464,7 +464,7 @@
'rsrc/js/core/behavior-remarkup-preview.js' => 'f7379f45',
'rsrc/js/core/behavior-reorder-applications.js' => 'a8e3795d',
'rsrc/js/core/behavior-reveal-content.js' => '8f24abfc',
- 'rsrc/js/core/behavior-search-typeahead.js' => '86549ee3',
+ 'rsrc/js/core/behavior-search-typeahead.js' => 'fbeabd1e',
'rsrc/js/core/behavior-select-on-click.js' => '0e34ca02',
'rsrc/js/core/behavior-toggle-class.js' => 'a82a7769',
'rsrc/js/core/behavior-tokenizer.js' => 'b3a4b884',
@@ -605,7 +605,7 @@
'javelin-behavior-phabricator-oncopy' => 'c3e218fe',
'javelin-behavior-phabricator-remarkup-assist' => 'ba22863c',
'javelin-behavior-phabricator-reveal-content' => '8f24abfc',
- 'javelin-behavior-phabricator-search-typeahead' => '86549ee3',
+ 'javelin-behavior-phabricator-search-typeahead' => 'fbeabd1e',
'javelin-behavior-phabricator-show-all-transactions' => '7c273581',
'javelin-behavior-phabricator-tooltips' => '48db4145',
'javelin-behavior-phabricator-transaction-comment-form' => '9084a36f',
@@ -706,7 +706,7 @@
'phabricator-hovercard-view-css' => 'cae6e28f',
'phabricator-keyboard-shortcut' => '1ae869f2',
'phabricator-keyboard-shortcut-manager' => 'ad7a69ca',
- 'phabricator-main-menu-view' => '72d1d2ef',
+ 'phabricator-main-menu-view' => 'bbeca15b',
'phabricator-nav-view-css' => '9283c2df',
'phabricator-notification' => '0c6946e7',
'phabricator-notification-css' => 'ef2c9b34',
@@ -1442,16 +1442,6 @@
1 => 'javelin-dom',
2 => 'javelin-reactor-dom',
),
- '86549ee3' =>
- array(
- 0 => 'javelin-behavior',
- 1 => 'javelin-typeahead-ondemand-source',
- 2 => 'javelin-typeahead',
- 3 => 'javelin-dom',
- 4 => 'javelin-uri',
- 5 => 'javelin-util',
- 6 => 'javelin-stratcom',
- ),
'8a3ed18b' =>
array(
0 => 'javelin-magical-init',
@@ -2058,6 +2048,16 @@
0 => 'phabricator-busy',
1 => 'javelin-behavior',
),
+ 'fbeabd1e' =>
+ array(
+ 0 => 'javelin-behavior',
+ 1 => 'javelin-typeahead-ondemand-source',
+ 2 => 'javelin-typeahead',
+ 3 => 'javelin-dom',
+ 4 => 'javelin-uri',
+ 5 => 'javelin-util',
+ 6 => 'javelin-stratcom',
+ ),
'fe2e0ba4' =>
array(
0 => 'javelin-behavior',
diff --git a/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php b/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php
--- a/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php
+++ b/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php
@@ -315,7 +315,7 @@
$packages = id(new PhabricatorOwnersPackage())->loadAll();
foreach ($packages as $package) {
$results[] = id(new PhabricatorTypeaheadResult())
- ->setIcon('pl-testplan')
+ ->setIcon('fa-list-alt bluegrey')
->setName($package->getName())
->setURI('/owners/package/'.$package->getID().'/')
->setPHID($package->getPHID());
@@ -339,7 +339,7 @@
continue;
}
$name = $application->getName().' '.$application->getShortDescription();
-
+ $img = 'apps-'.$application->getIconName().'-dark-large';
$results[] = id(new PhabricatorTypeaheadResult())
->setName($name)
->setURI($uri)
@@ -348,7 +348,8 @@
->setDisplayName($application->getName())
->setDisplayType($application->getShortDescription())
->setImageuRI($application->getIconURI())
- ->setPriorityType('apps');
+ ->setPriorityType('apps')
+ ->setImageSprite('phabricator-search-icon sprite-apps-large '.$img);
}
}
@@ -424,6 +425,7 @@
'Display Type',
'Image URI',
'Priority Type',
+ 'Sprite Class',
));
$panel = new AphrontPanelView();
@@ -433,7 +435,8 @@
return $this->buildStandardPageResponse(
$panel,
array(
- 'title' => 'Typeahead Results',
+ 'title' => pht('Typeahead Results'),
+ 'device' => true
));
}
diff --git a/src/applications/typeahead/storage/PhabricatorTypeaheadResult.php b/src/applications/typeahead/storage/PhabricatorTypeaheadResult.php
--- a/src/applications/typeahead/storage/PhabricatorTypeaheadResult.php
+++ b/src/applications/typeahead/storage/PhabricatorTypeaheadResult.php
@@ -10,6 +10,7 @@
private $displayType;
private $imageURI;
private $priorityType;
+ private $imageSprite;
private $icon;
private $closed;
@@ -58,6 +59,11 @@
return $this;
}
+ public function setImageSprite($image_sprite) {
+ $this->imageSprite = $image_sprite;
+ return $this;
+ }
+
public function setClosed($closed) {
$this->closed = $closed;
return $this;
@@ -75,6 +81,7 @@
$this->priorityType,
$this->icon,
$this->closed,
+ $this->imageSprite ? (string)$this->imageSprite : null,
);
while (end($data) === null) {
array_pop($data);
diff --git a/webroot/rsrc/css/application/base/main-menu-view.css b/webroot/rsrc/css/application/base/main-menu-view.css
--- a/webroot/rsrc/css/application/base/main-menu-view.css
+++ b/webroot/rsrc/css/application/base/main-menu-view.css
@@ -201,12 +201,22 @@
margin-left: 40px;
}
+.phabricator-main-search-typeahead-result .phabricator-search-icon {
+ display: inline-block;
+ width: 28px;
+ height: 28px;
+ position: absolute;
+ top: 8px;
+ left: 8px;
+}
+
.phabricator-main-search-typeahead-result {
display: block;
padding: 6px 8px 8px 44px;
background-position: 8px;
background-size: 30px 30px;
background-repeat: no-repeat;
+ position: relative;
}
.phabricator-main-search-typeahead-result .result-name {
diff --git a/webroot/rsrc/js/core/behavior-search-typeahead.js b/webroot/rsrc/js/core/behavior-search-typeahead.js
--- a/webroot/rsrc/js/core/behavior-search-typeahead.js
+++ b/webroot/rsrc/js/core/behavior-search-typeahead.js
@@ -26,6 +26,7 @@
'span',
attr,
[
+ JX.$N('span', {className: object[10]}),
JX.$N('span', {className: 'result-name'}, object[4] || object[0]),
JX.$N('span', {className: 'result-type'}, object[5])
]);

File Metadata

Mime Type
text/plain
Expires
Fri, May 24, 3:51 AM (3 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6300754
Default Alt Text
D9524.id22827.diff (7 KB)

Event Timeline

Phabricator · Built by Phacility