Skip to content

Commit 87bc6eb

Browse files
author
epriestley
committed
Use ObjectItemListView in Diviner
Summary: Ref T988. Nuke the old directory CSS. Test Plan: {F44796} Reviewers: chad, btrahan Reviewed By: chad CC: aran Maniphest Tasks: T988 Differential Revision: https://secure.phabricator.com/D6093
1 parent 59cea9b commit 87bc6eb

File tree

5 files changed

+97
-137
lines changed

5 files changed

+97
-137
lines changed

scripts/celerity_mapper.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
'aphront-typeahead-control-css',
7878
'aphront-list-filter-view-css',
7979

80-
'phabricator-directory-css',
8180
'phabricator-jump-nav',
8281

8382
'phabricator-remarkup-css',

src/__celerity_resource_map__.php

Lines changed: 75 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -2974,15 +2974,6 @@
29742974
),
29752975
'disk' => '/rsrc/css/layout/phabricator-crumbs-view.css',
29762976
),
2977-
'phabricator-directory-css' =>
2978-
array(
2979-
'uri' => '/res/61afca2b/rsrc/css/application/directory/phabricator-directory.css',
2980-
'type' => 'css',
2981-
'requires' =>
2982-
array(
2983-
),
2984-
'disk' => '/rsrc/css/application/directory/phabricator-directory.css',
2985-
),
29862977
'phabricator-drag-and-drop-file-upload' =>
29872978
array(
29882979
'uri' => '/res/396d3b3b/rsrc/js/core/DragAndDropFileUpload.js',
@@ -3988,7 +3979,7 @@
39883979
), array(
39893980
'packages' =>
39903981
array(
3991-
'504b6760' =>
3982+
'8e459ff2' =>
39923983
array(
39933984
'name' => 'core.pkg.css',
39943985
'symbols' =>
@@ -4004,40 +3995,39 @@
40043995
8 => 'aphront-tokenizer-control-css',
40053996
9 => 'aphront-typeahead-control-css',
40063997
10 => 'aphront-list-filter-view-css',
4007-
11 => 'phabricator-directory-css',
4008-
12 => 'phabricator-jump-nav',
4009-
13 => 'phabricator-remarkup-css',
4010-
14 => 'syntax-highlighting-css',
4011-
15 => 'aphront-pager-view-css',
4012-
16 => 'phabricator-transaction-view-css',
4013-
17 => 'aphront-tooltip-css',
4014-
18 => 'phabricator-flag-css',
4015-
19 => 'aphront-error-view-css',
4016-
20 => 'sprite-icons-css',
4017-
21 => 'sprite-gradient-css',
4018-
22 => 'sprite-menu-css',
4019-
23 => 'sprite-apps-large-css',
4020-
24 => 'phabricator-main-menu-view',
4021-
25 => 'phabricator-notification-css',
4022-
26 => 'phabricator-notification-menu-css',
4023-
27 => 'lightbox-attachment-css',
4024-
28 => 'phabricator-header-view-css',
4025-
29 => 'phabricator-form-view-css',
4026-
30 => 'phabricator-filetree-view-css',
4027-
31 => 'phabricator-nav-view-css',
4028-
32 => 'phabricator-side-menu-view-css',
4029-
33 => 'phabricator-crumbs-view-css',
4030-
34 => 'phabricator-object-item-list-view-css',
4031-
35 => 'global-drag-and-drop-css',
4032-
36 => 'spacing-css',
4033-
37 => 'phui-form-css',
4034-
38 => 'phui-icon-view-css',
4035-
39 => 'phabricator-application-launch-view-css',
4036-
40 => 'phabricator-action-list-view-css',
4037-
41 => 'phabricator-property-list-view-css',
4038-
42 => 'phabricator-tag-view-css',
3998+
11 => 'phabricator-jump-nav',
3999+
12 => 'phabricator-remarkup-css',
4000+
13 => 'syntax-highlighting-css',
4001+
14 => 'aphront-pager-view-css',
4002+
15 => 'phabricator-transaction-view-css',
4003+
16 => 'aphront-tooltip-css',
4004+
17 => 'phabricator-flag-css',
4005+
18 => 'aphront-error-view-css',
4006+
19 => 'sprite-icons-css',
4007+
20 => 'sprite-gradient-css',
4008+
21 => 'sprite-menu-css',
4009+
22 => 'sprite-apps-large-css',
4010+
23 => 'phabricator-main-menu-view',
4011+
24 => 'phabricator-notification-css',
4012+
25 => 'phabricator-notification-menu-css',
4013+
26 => 'lightbox-attachment-css',
4014+
27 => 'phabricator-header-view-css',
4015+
28 => 'phabricator-form-view-css',
4016+
29 => 'phabricator-filetree-view-css',
4017+
30 => 'phabricator-nav-view-css',
4018+
31 => 'phabricator-side-menu-view-css',
4019+
32 => 'phabricator-crumbs-view-css',
4020+
33 => 'phabricator-object-item-list-view-css',
4021+
34 => 'global-drag-and-drop-css',
4022+
35 => 'spacing-css',
4023+
36 => 'phui-form-css',
4024+
37 => 'phui-icon-view-css',
4025+
38 => 'phabricator-application-launch-view-css',
4026+
39 => 'phabricator-action-list-view-css',
4027+
40 => 'phabricator-property-list-view-css',
4028+
41 => 'phabricator-tag-view-css',
40394029
),
4040-
'uri' => '/res/pkg/504b6760/core.pkg.css',
4030+
'uri' => '/res/pkg/8e459ff2/core.pkg.css',
40414031
'type' => 'css',
40424032
),
40434033
'98f60e3f' =>
@@ -4231,16 +4221,16 @@
42314221
'reverse' =>
42324222
array(
42334223
'aphront-attached-file-view-css' => '6b1fccc6',
4234-
'aphront-dialog-view-css' => '504b6760',
4235-
'aphront-error-view-css' => '504b6760',
4236-
'aphront-form-view-css' => '504b6760',
4237-
'aphront-list-filter-view-css' => '504b6760',
4238-
'aphront-pager-view-css' => '504b6760',
4239-
'aphront-panel-view-css' => '504b6760',
4240-
'aphront-table-view-css' => '504b6760',
4241-
'aphront-tokenizer-control-css' => '504b6760',
4242-
'aphront-tooltip-css' => '504b6760',
4243-
'aphront-typeahead-control-css' => '504b6760',
4224+
'aphront-dialog-view-css' => '8e459ff2',
4225+
'aphront-error-view-css' => '8e459ff2',
4226+
'aphront-form-view-css' => '8e459ff2',
4227+
'aphront-list-filter-view-css' => '8e459ff2',
4228+
'aphront-pager-view-css' => '8e459ff2',
4229+
'aphront-panel-view-css' => '8e459ff2',
4230+
'aphront-table-view-css' => '8e459ff2',
4231+
'aphront-tokenizer-control-css' => '8e459ff2',
4232+
'aphront-tooltip-css' => '8e459ff2',
4233+
'aphront-typeahead-control-css' => '8e459ff2',
42444234
'differential-changeset-view-css' => 'dd27a69b',
42454235
'differential-core-view-css' => 'dd27a69b',
42464236
'differential-inline-comment-editor' => '9488bb69',
@@ -4254,7 +4244,7 @@
42544244
'differential-table-of-contents-css' => 'dd27a69b',
42554245
'diffusion-commit-view-css' => 'c8ce2d88',
42564246
'diffusion-icons-css' => 'c8ce2d88',
4257-
'global-drag-and-drop-css' => '504b6760',
4247+
'global-drag-and-drop-css' => '8e459ff2',
42584248
'inline-comment-summary-css' => 'dd27a69b',
42594249
'javelin-aphlict' => '98f60e3f',
42604250
'javelin-behavior' => 'a9f14d76',
@@ -4328,56 +4318,55 @@
43284318
'javelin-util' => 'a9f14d76',
43294319
'javelin-vector' => 'a9f14d76',
43304320
'javelin-workflow' => 'a9f14d76',
4331-
'lightbox-attachment-css' => '504b6760',
4321+
'lightbox-attachment-css' => '8e459ff2',
43324322
'maniphest-task-summary-css' => '6b1fccc6',
43334323
'maniphest-transaction-detail-css' => '6b1fccc6',
4334-
'phabricator-action-list-view-css' => '504b6760',
4335-
'phabricator-application-launch-view-css' => '504b6760',
4324+
'phabricator-action-list-view-css' => '8e459ff2',
4325+
'phabricator-application-launch-view-css' => '8e459ff2',
43364326
'phabricator-busy' => '98f60e3f',
43374327
'phabricator-content-source-view-css' => 'dd27a69b',
4338-
'phabricator-core-buttons-css' => '504b6760',
4339-
'phabricator-core-css' => '504b6760',
4340-
'phabricator-crumbs-view-css' => '504b6760',
4341-
'phabricator-directory-css' => '504b6760',
4328+
'phabricator-core-buttons-css' => '8e459ff2',
4329+
'phabricator-core-css' => '8e459ff2',
4330+
'phabricator-crumbs-view-css' => '8e459ff2',
43424331
'phabricator-drag-and-drop-file-upload' => '9488bb69',
43434332
'phabricator-dropdown-menu' => '98f60e3f',
43444333
'phabricator-file-upload' => '98f60e3f',
4345-
'phabricator-filetree-view-css' => '504b6760',
4346-
'phabricator-flag-css' => '504b6760',
4347-
'phabricator-form-view-css' => '504b6760',
4348-
'phabricator-header-view-css' => '504b6760',
4334+
'phabricator-filetree-view-css' => '8e459ff2',
4335+
'phabricator-flag-css' => '8e459ff2',
4336+
'phabricator-form-view-css' => '8e459ff2',
4337+
'phabricator-header-view-css' => '8e459ff2',
43494338
'phabricator-hovercard' => '98f60e3f',
4350-
'phabricator-jump-nav' => '504b6760',
4339+
'phabricator-jump-nav' => '8e459ff2',
43514340
'phabricator-keyboard-shortcut' => '98f60e3f',
43524341
'phabricator-keyboard-shortcut-manager' => '98f60e3f',
4353-
'phabricator-main-menu-view' => '504b6760',
4342+
'phabricator-main-menu-view' => '8e459ff2',
43544343
'phabricator-menu-item' => '98f60e3f',
4355-
'phabricator-nav-view-css' => '504b6760',
4344+
'phabricator-nav-view-css' => '8e459ff2',
43564345
'phabricator-notification' => '98f60e3f',
4357-
'phabricator-notification-css' => '504b6760',
4358-
'phabricator-notification-menu-css' => '504b6760',
4359-
'phabricator-object-item-list-view-css' => '504b6760',
4346+
'phabricator-notification-css' => '8e459ff2',
4347+
'phabricator-notification-menu-css' => '8e459ff2',
4348+
'phabricator-object-item-list-view-css' => '8e459ff2',
43604349
'phabricator-object-selector-css' => 'dd27a69b',
43614350
'phabricator-phtize' => '98f60e3f',
43624351
'phabricator-prefab' => '98f60e3f',
43634352
'phabricator-project-tag-css' => '6b1fccc6',
4364-
'phabricator-property-list-view-css' => '504b6760',
4365-
'phabricator-remarkup-css' => '504b6760',
4353+
'phabricator-property-list-view-css' => '8e459ff2',
4354+
'phabricator-remarkup-css' => '8e459ff2',
43664355
'phabricator-shaped-request' => '9488bb69',
4367-
'phabricator-side-menu-view-css' => '504b6760',
4368-
'phabricator-standard-page-view' => '504b6760',
4369-
'phabricator-tag-view-css' => '504b6760',
4356+
'phabricator-side-menu-view-css' => '8e459ff2',
4357+
'phabricator-standard-page-view' => '8e459ff2',
4358+
'phabricator-tag-view-css' => '8e459ff2',
43704359
'phabricator-textareautils' => '98f60e3f',
43714360
'phabricator-tooltip' => '98f60e3f',
4372-
'phabricator-transaction-view-css' => '504b6760',
4373-
'phabricator-zindex-css' => '504b6760',
4374-
'phui-form-css' => '504b6760',
4375-
'phui-icon-view-css' => '504b6760',
4376-
'spacing-css' => '504b6760',
4377-
'sprite-apps-large-css' => '504b6760',
4378-
'sprite-gradient-css' => '504b6760',
4379-
'sprite-icons-css' => '504b6760',
4380-
'sprite-menu-css' => '504b6760',
4381-
'syntax-highlighting-css' => '504b6760',
4361+
'phabricator-transaction-view-css' => '8e459ff2',
4362+
'phabricator-zindex-css' => '8e459ff2',
4363+
'phui-form-css' => '8e459ff2',
4364+
'phui-icon-view-css' => '8e459ff2',
4365+
'spacing-css' => '8e459ff2',
4366+
'sprite-apps-large-css' => '8e459ff2',
4367+
'sprite-gradient-css' => '8e459ff2',
4368+
'sprite-icons-css' => '8e459ff2',
4369+
'sprite-menu-css' => '8e459ff2',
4370+
'syntax-highlighting-css' => '8e459ff2',
43824371
),
43834372
));

src/__phutil_library_map__.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3060,7 +3060,7 @@
30603060
),
30613061
'PhabricatorPeopleLogsController' => 'PhabricatorPeopleController',
30623062
'PhabricatorPeopleProfileController' => 'PhabricatorPeopleController',
3063-
'PhabricatorPeopleQuery' => 'PhabricatorPolicyAwareCursorPagedQuery',
3063+
'PhabricatorPeopleQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
30643064
'PhabricatorPeopleSearchEngine' => 'PhabricatorApplicationSearchEngine',
30653065
'PhabricatorPeopleTestDataGenerator' => 'PhabricatorTestDataGenerator',
30663066
'PhabricatorPhabricatorOAuthConfigOptions' => 'PhabricatorApplicationConfigOptions',

src/applications/diviner/controller/DivinerListController.php

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,37 +26,35 @@ public function processRequest() {
2626
),
2727
);
2828

29-
require_celerity_resource('phabricator-directory-css');
29+
$request = $this->getRequest();
30+
$viewer = $request->getUser();
31+
32+
$list = id(new PhabricatorObjectItemListView())
33+
->setUser($viewer);
3034

31-
$out = array();
3235
foreach ($links as $href => $link) {
33-
$name = $link['name'];
34-
$flavor = $link['flavor'];
35-
36-
$link = phutil_tag(
37-
'a',
38-
array(
39-
'href' => $href,
40-
'target' => '_blank',
41-
),
42-
$name);
43-
44-
$out[] = hsprintf(
45-
'<div class="aphront-directory-item">'.
46-
'<h1>%s</h1>'.
47-
'<p>%s</p>'.
48-
'</div>',
49-
$link,
50-
$flavor);
36+
$item = id(new PhabricatorObjectItemView())
37+
->setHref($href)
38+
->setHeader($link['name'])
39+
->addAttribute($link['flavor']);
40+
41+
$list->addItem($item);
5142
}
5243

53-
$out = phutil_tag('div', array('class' => 'aphront-directory-list'), $out);
44+
$crumbs = $this->buildApplicationCrumbs();
45+
$crumbs->addCrumb(
46+
id(new PhabricatorCrumbView())
47+
->setName(pht('Documentation')));
5448

5549
return $this->buildApplicationPage(
56-
$out,
5750
array(
51+
$crumbs,
52+
$list,
53+
),
54+
array(
55+
'title' => pht('Documentation'),
56+
'dust' => true,
5857
'device' => true,
59-
'title' => 'Documentation',
6058
));
6159
}
6260
}

webroot/rsrc/css/application/directory/phabricator-directory.css

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)