Skip to content

Commit 170dc15

Browse files
committed
Make border conditional in crumbs
Summary: Add a setBorder call to CrumbsView to be more deliberate when a border is drawn. Could not find any CSS hacks to set it conditionally CSS. Test Plan: Browsed every application that called crumbs and make a design decision. Also fixed a few bad layouts. Reviewers: btrahan, epriestley Reviewed By: btrahan Subscribers: Korvin, epriestley Differential Revision: https://secure.phabricator.com/D11533
1 parent 99722e0 commit 170dc15

File tree

16 files changed

+49
-31
lines changed

16 files changed

+49
-31
lines changed

resources/celerity/map.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88
return array(
99
'names' => array(
10-
'core.pkg.css' => '63e9e0b7',
10+
'core.pkg.css' => '8815f87d',
1111
'core.pkg.js' => 'efa12ecc',
1212
'darkconsole.pkg.js' => '8ab24e01',
1313
'differential.pkg.css' => '8af45893',
@@ -125,7 +125,7 @@
125125
'rsrc/css/phui/phui-action-list.css' => '9ee9910a',
126126
'rsrc/css/phui/phui-box.css' => '7b3a2eed',
127127
'rsrc/css/phui/phui-button.css' => '008ba5e2',
128-
'rsrc/css/phui/phui-crumbs-view.css' => '3e362700',
128+
'rsrc/css/phui/phui-crumbs-view.css' => '646a8830',
129129
'rsrc/css/phui/phui-document.css' => 'bbeb1890',
130130
'rsrc/css/phui/phui-feed-story.css' => 'c9f3a0b5',
131131
'rsrc/css/phui/phui-fontkit.css' => '9c3d2dce',
@@ -770,7 +770,7 @@
770770
'phui-calendar-day-css' => 'de035c8a',
771771
'phui-calendar-list-css' => 'c1d0ca59',
772772
'phui-calendar-month-css' => 'a92e47d2',
773-
'phui-crumbs-view-css' => '3e362700',
773+
'phui-crumbs-view-css' => '646a8830',
774774
'phui-document-view-css' => 'bbeb1890',
775775
'phui-feed-story-css' => 'c9f3a0b5',
776776
'phui-font-icon-base-css' => '3dad2ae3',

src/applications/auth/controller/config/PhabricatorAuthListController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ public function processRequest() {
9090
pht('Add Authentication Provider'))));
9191

9292
$crumbs = $this->buildApplicationCrumbs();
93+
$crumbs->setBorder(true);
9394
$crumbs->addTextCrumb(pht('Auth Providers'));
9495

9596
$config_name = 'auth.email-domains';

src/applications/config/controller/PhabricatorConfigHistoryController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public function processRequest() {
3333
$title = pht('Settings History');
3434

3535
$crumbs = $this->buildApplicationCrumbs();
36+
$crumbs->setBorder(true);
3637
$crumbs->addTextCrumb('Config', $this->getApplicationURI());
3738
$crumbs->addTextCrumb($title, '/config/history/');
3839

src/applications/conpherence/controller/ConpherenceController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public function buildApplicationMenu() {
3232

3333
protected function buildApplicationCrumbs() {
3434
$crumbs = parent::buildApplicationCrumbs();
35+
$crumbs->setBorder(true);
3536

3637
$crumbs
3738
->addAction(

src/applications/differential/controller/DifferentialRevisionViewController.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -442,15 +442,9 @@ public function processRequest() {
442442
->setRequestURI($request->getRequestURI()));
443443
}
444444

445-
446445
$object_id = 'D'.$revision->getID();
447446

448-
$top_anchor = id(new PhabricatorAnchorView())
449-
->setAnchorName('top')
450-
->setNavigationMarker(true);
451-
452447
$content = array(
453-
$top_anchor,
454448
$revision_detail_box,
455449
$page_pane,
456450
);
@@ -467,7 +461,6 @@ public function processRequest() {
467461
false);
468462

469463
$nav = id(new DifferentialChangesetFileTreeSideNavBuilder())
470-
->setAnchorName('top')
471464
->setTitle('D'.$revision->getID())
472465
->setBaseURI(new PhutilURI('/D'.$revision->getID()))
473466
->setCollapsed((bool)$collapsed)

src/applications/diffusion/controller/DiffusionCommitController.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,6 @@ protected function processDiffusionRequest(AphrontRequest $request) {
6969
));
7070
}
7171

72-
73-
$top_anchor = id(new PhabricatorAnchorView())
74-
->setAnchorName('top')
75-
->setNavigationMarker(true);
76-
7772
$audit_requests = $commit->getAudits();
7873
$this->auditAuthorityPHIDs =
7974
PhabricatorAuditCommentEditor::loadAuditPHIDsForUser($user);
@@ -93,7 +88,6 @@ protected function processDiffusionRequest(AphrontRequest $request) {
9388
"didn't affect the tracked subdirectory ('%s'), so no ".
9489
"information is available.", $subpath));
9590
$content[] = $error_panel;
96-
$content[] = $top_anchor;
9791
} else {
9892
$engine = PhabricatorMarkupEngine::newDifferentialMarkupEngine();
9993
$engine->setConfig('viewer', $user);
@@ -151,7 +145,6 @@ protected function processDiffusionRequest(AphrontRequest $request) {
151145
'class' => 'diffusion-commit-message phabricator-remarkup',
152146
),
153147
$message));
154-
$content[] = $top_anchor;
155148

156149
$object_box = id(new PHUIObjectBoxView())
157150
->setHeader($headsup_view)
@@ -381,7 +374,6 @@ protected function processDiffusionRequest(AphrontRequest $request) {
381374

382375
if ($changesets && $show_filetree) {
383376
$nav = id(new DifferentialChangesetFileTreeSideNavBuilder())
384-
->setAnchorName('top')
385377
->setTitle($short_name)
386378
->setBaseURI(new PhutilURI('/'.$commit_id))
387379
->build($changesets)

src/applications/herald/controller/HeraldRuleEditHistoryController.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@ public function processRequest() {
3030
->setHandles($handles)
3131
->setUser($this->getRequest()->getUser());
3232

33-
$panel = new AphrontPanelView();
34-
$panel->setHeader(pht('Edit History'));
33+
$panel = new PHUIObjectBoxView();
34+
$panel->setHeaderText(pht('Edit History'));
3535
$panel->appendChild($list_view);
36-
$panel->setNoBackground();
3736

3837
$crumbs = $this
3938
->buildApplicationCrumbs($can_create = false)

src/applications/legalpad/controller/LegalpadDocumentSignController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ public function processRequest() {
276276
}
277277

278278
$crumbs = $this->buildApplicationCrumbs();
279+
$crumbs->setBorder(true);
279280
$crumbs->addTextCrumb($document->getMonogram());
280281

281282
return $this->buildApplicationPage(

src/applications/people/controller/PhabricatorPeopleLdapController.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,9 @@ public function handleRequest(AphrontRequest $request) {
3232
id(new AphrontFormSubmitControl())
3333
->setValue(pht('Search')));
3434

35-
$panel = id(new AphrontPanelView())
36-
->setHeader(pht('Import LDAP Users'))
37-
->setNoBackground()
38-
->setWidth(AphrontPanelView::WIDTH_FORM)
39-
->appendChild($form);
35+
$panel = id(new PHUIObjectBoxView())
36+
->setHeaderText(pht('Import LDAP Users'))
37+
->setForm($form);
4038

4139
$crumbs = $this->buildApplicationCrumbs();
4240
$crumbs->addTextCrumb(

src/applications/phame/controller/post/PhamePostListController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ public function processRequest() {
7575
->appendChild($post_list);
7676

7777
$crumbs = $this->buildApplicationCrumbs();
78+
$crumbs->setBorder(true);
7879
$crumbs->addTextCrumb($title, $this->getApplicationURI());
7980

8081
$nav->appendChild(

src/applications/phriction/controller/PhrictionDocumentController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ public function processRequest() {
185185
$actions = $this->buildActionView($user, $document);
186186

187187
$crumbs = $this->buildApplicationCrumbs();
188+
$crumbs->setBorder(true);
188189
$crumb_views = $this->renderBreadcrumbs($slug);
189190
foreach ($crumb_views as $view) {
190191
$crumbs->addCrumb($view);

src/applications/search/controller/PhabricatorApplicationSearchController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ private function processSearchRequest() {
261261

262262
$crumbs = $parent
263263
->buildApplicationCrumbs()
264+
->setBorder(true)
264265
->addTextCrumb($title);
265266

266267
$nav->setCrumbs($crumbs);

src/applications/tokens/controller/PhabricatorTokenGivenController.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public function processRequest() {
3939
}
4040

4141
$list = new PHUIObjectItemListView();
42+
$list->setStackable(true);
4243
foreach ($tokens_given as $token_given) {
4344
$handle = $handles[$token_given->getObjectPHID()];
4445
$token = idx($tokens, $token_given->getTokenPHID());
@@ -57,17 +58,20 @@ public function processRequest() {
5758

5859
$list->addItem($item);
5960
}
60-
$list->setPager($pager);
61-
6261
$title = pht('Tokens Given');
6362

63+
$box = id(new PHUIObjectBoxView())
64+
->setHeaderText($title)
65+
->appendChild($list);
66+
6467
$nav = $this->buildSideNav();
6568
$nav->setCrumbs(
6669
$this->buildApplicationCrumbs()
6770
->addTextCrumb($title));
6871
$nav->selectFilter('given/');
6972

70-
$nav->appendChild($list);
73+
$nav->appendChild($box);
74+
$nav->appendChild($pager);
7175

7276
return $this->buildApplicationPage(
7377
$nav,

src/applications/tokens/controller/PhabricatorTokenLeaderController.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public function processRequest() {
3030
}
3131

3232
$list = new PHUIObjectItemListView();
33+
$list->setStackable(true);
3334
foreach ($phids as $object) {
3435
$count = idx($counts, $object, 0);
3536
$item = id(new PHUIObjectItemView());
@@ -43,13 +44,17 @@ public function processRequest() {
4344

4445
$title = pht('Token Leader Board');
4546

47+
$box = id(new PHUIObjectBoxView())
48+
->setHeaderText($title)
49+
->appendChild($list);
50+
4651
$nav = $this->buildSideNav();
4752
$nav->setCrumbs(
4853
$this->buildApplicationCrumbs()
4954
->addTextCrumb($title));
5055
$nav->selectFilter('leaders/');
5156

52-
$nav->appendChild($list);
57+
$nav->appendChild($box);
5358
$nav->appendChild($pager);
5459

5560
return $this->buildApplicationPage(

src/view/phui/PHUICrumbsView.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ final class PHUICrumbsView extends AphrontView {
44

55
private $crumbs = array();
66
private $actions = array();
7+
private $border;
78

89
protected function canAppendChild() {
910
return false;
@@ -35,6 +36,11 @@ public function addAction(PHUIListItemView $action) {
3536
return $this;
3637
}
3738

39+
public function setBorder($border) {
40+
$this->border = $border;
41+
return $this;
42+
}
43+
3844
public function render() {
3945
require_celerity_resource('phui-crumbs-view-css');
4046

@@ -99,6 +105,9 @@ public function render() {
99105

100106
$classes = array();
101107
$classes[] = 'phui-crumbs-view';
108+
if ($this->border) {
109+
$classes[] = 'phui-crumbs-border';
110+
}
102111

103112
return phutil_tag(
104113
'div',

webroot/rsrc/css/phui/phui-crumbs-view.css

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
Remove this once that gets sorted out. */
1111
position: relative;
1212
-webkit-font-smoothing: antialiased;
13-
border-bottom: 1px solid rgba(205, 207, 211, 1);
1413
}
1514

1615
.phui-crumbs-view,
@@ -99,3 +98,15 @@ a.phui-crumbs-action .phui-icon-view {
9998
.phui-crumb-divider {
10099
margin: 2px 8px;
101100
}
101+
102+
.phui-crumbs-view.phui-crumbs-border {
103+
border-bottom: 1px solid rgba(205, 207, 211, 1);
104+
}
105+
106+
.phui-crumbs-view + .phui-object-box {
107+
margin-top: 0;
108+
}
109+
110+
body .phui-crumbs-view + .phui-object-item-list-view {
111+
padding-top: 0;
112+
}

0 commit comments

Comments
 (0)