@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Move setLaunchButton to setSideColumn for ObjectItem
Summary: Makes this a bit more flexible and allow UI to take over `col-2` completely. Also cleaned up application search a little with tags
Test Plan: Review various pages, grep for callsites.
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: Korvin
Differential Revision: https://secure.phabricator.com/D18021
+41
-25
+3
-3
resources/celerity/map.php
+3
-3
resources/celerity/map.php
···
9
9
'names' => array(
10
10
'conpherence.pkg.css' => 'ff161f2d',
11
11
'conpherence.pkg.js' => 'b5b51108',
12
-
'core.pkg.css' => '2c6a5ba4',
12
+
'core.pkg.css' => 'b666574e',
13
13
'core.pkg.js' => '21d34805',
14
14
'darkconsole.pkg.js' => '1f9a31bc',
15
15
'differential.pkg.css' => '7d4cfa59',
···
132
132
'rsrc/css/phui/object-item/phui-oi-color.css' => 'cd2b9b77',
133
133
'rsrc/css/phui/object-item/phui-oi-drag-ui.css' => '08f4ccc3',
134
134
'rsrc/css/phui/object-item/phui-oi-flush-ui.css' => '9d9685d6',
135
-
'rsrc/css/phui/object-item/phui-oi-list-view.css' => '78fdc98e',
135
+
'rsrc/css/phui/object-item/phui-oi-list-view.css' => 'ed19241b',
136
136
'rsrc/css/phui/object-item/phui-oi-simple-ui.css' => 'a8beebea',
137
137
'rsrc/css/phui/phui-action-list.css' => 'c01858f4',
138
138
'rsrc/css/phui/phui-action-panel.css' => '91c7b835',
···
875
875
'phui-oi-color-css' => 'cd2b9b77',
876
876
'phui-oi-drag-ui-css' => '08f4ccc3',
877
877
'phui-oi-flush-ui-css' => '9d9685d6',
878
-
'phui-oi-list-view-css' => '78fdc98e',
878
+
'phui-oi-list-view-css' => 'ed19241b',
879
879
'phui-oi-simple-ui-css' => 'a8beebea',
880
880
'phui-pager-css' => '77d8a794',
881
881
'phui-pinboard-view-css' => '2495140e',
+2
-2
src/applications/guides/view/PhabricatorGuideListView.php
+2
-2
src/applications/guides/view/PhabricatorGuideListView.php
+24
-9
src/applications/meta/query/PhabricatorAppSearchEngine.php
+24
-9
src/applications/meta/query/PhabricatorAppSearchEngine.php
···
218
218
219
219
$configure = id(new PHUIButtonView())
220
220
->setTag('a')
221
+
->setIcon('fa-gears')
221
222
->setHref('/applications/view/'.get_class($application).'/')
222
223
->setText(pht('Configure'))
223
224
->setColor(PHUIButtonView::GREY);
224
225
225
226
$name = $application->getName();
226
-
if ($application->isPrototype()) {
227
-
$name = $name.' '.pht('(Prototype)');
228
-
}
229
227
230
228
$item = id(new PHUIObjectItemView())
231
229
->setHeader($name)
232
230
->setImageIcon($icon)
233
-
->setSubhead($description)
234
-
->setLaunchButton($configure);
231
+
->setSideColumn($configure);
232
+
233
+
if (!$application->isFirstParty()) {
234
+
$tag = id(new PHUITagView())
235
+
->setName(pht('Extension'))
236
+
->setIcon('fa-puzzle-piece')
237
+
->setColor(PHUITagView::COLOR_BLUE)
238
+
->setType(PHUITagView::TYPE_SHADE)
239
+
->setSlimShady(true);
240
+
$item->addAttribute($tag);
241
+
}
242
+
243
+
if ($application->isPrototype()) {
244
+
$prototype_tag = id(new PHUITagView())
245
+
->setName(pht('Prototype'))
246
+
->setIcon('fa-exclamation-circle')
247
+
->setColor(PHUITagView::COLOR_ORANGE)
248
+
->setType(PHUITagView::TYPE_SHADE)
249
+
->setSlimShady(true);
250
+
$item->addAttribute($prototype_tag);
251
+
}
252
+
253
+
$item->addAttribute($description);
235
254
236
255
if ($application->getBaseURI() && $application->isInstalled()) {
237
256
$item->setHref($application->getBaseURI());
···
240
259
if (!$application->isInstalled()) {
241
260
$item->addAttribute(pht('Uninstalled'));
242
261
$item->setDisabled(true);
243
-
}
244
-
245
-
if (!$application->isFirstParty()) {
246
-
$item->addAttribute(pht('Extension'));
247
262
}
248
263
249
264
$list->addItem($item);
+3
-2
src/applications/phame/query/PhameBlogSearchEngine.php
+3
-2
src/applications/phame/query/PhameBlogSearchEngine.php
···
97
97
$button = id(new PHUIButtonView())
98
98
->setTag('a')
99
99
->setText('New Post')
100
-
->setHref($this->getApplicationURI('/post/edit/?blog='.$id));
101
-
$item->setLaunchButton($button);
100
+
->setHref($this->getApplicationURI('/post/edit/?blog='.$id))
101
+
->setColor(PHUIButtonView::SIMPLE);
102
+
$item->setSideColumn($button);
102
103
}
103
104
104
105
$list->addItem($item);
+7
-7
src/view/phui/PHUIObjectItemView.php
+7
-7
src/view/phui/PHUIObjectItemView.php
···
25
25
private $badge;
26
26
private $countdownNum;
27
27
private $countdownNoun;
28
-
private $launchButton;
28
+
private $sideColumn;
29
29
private $coverImage;
30
30
private $description;
31
31
···
229
229
return $this;
230
230
}
231
231
232
-
public function setLaunchButton(PHUIButtonView $button) {
233
-
$button->setSize(PHUIButtonView::SMALL);
234
-
$this->launchButton = $button;
232
+
public function setSideColumn($column) {
233
+
$this->sideColumn = $column;
235
234
return $this;
236
235
}
237
236
···
652
651
));
653
652
}
654
653
655
-
if ($this->launchButton) {
654
+
/* Fixed width, right column container. */
655
+
if ($this->sideColumn) {
656
656
$column2 = phutil_tag(
657
657
'div',
658
658
array(
659
-
'class' => 'phui-oi-col2 phui-oi-launch-button',
659
+
'class' => 'phui-oi-col2 phui-oi-side-column',
660
660
),
661
661
array(
662
-
$this->launchButton,
662
+
$this->sideColumn,
663
663
));
664
664
}
665
665
+2
-2
webroot/rsrc/css/phui/object-item/phui-oi-list-view.css
+2
-2
webroot/rsrc/css/phui/object-item/phui-oi-list-view.css
···
650
650
651
651
/* - Launcher Button -------------------------------------------------------- */
652
652
653
-
.phui-oi-col2.phui-oi-launch-button {
653
+
.phui-oi-col2.phui-oi-side-column {
654
654
text-align: right;
655
655
vertical-align: middle;
656
656
padding-right: 4px;
657
657
}
658
658
659
-
.device-phone .phui-oi-col2.phui-oi-launch-button {
659
+
.device-phone .phui-oi-col2.phui-oi-side-column {
660
660
padding: 0 8px 8px;
661
661
text-align: left;
662
662
}