Skip to content

Commit 0c4cff2

Browse files
author
Chad Little
committedJul 12, 2017
Clean up NUX a bit on Diffusion
Summary: Just some cleanup. Make sure action-bar has consistent space if locate is there or not, hide tabs if repository has no content. Use clone or checkout language depending on SCM. Fixes T12915. Test Plan: Test git, hg, svn blank states. {F5042707} Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Maniphest Tasks: T12915 Differential Revision: https://secure.phabricator.com/D18208
1 parent db57da0 commit 0c4cff2

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed
 

‎resources/celerity/map.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
'rsrc/css/application/diffusion/diffusion-readme.css' => '419dd5b6',
7676
'rsrc/css/application/diffusion/diffusion-repository.css' => 'ee6f20ec',
7777
'rsrc/css/application/diffusion/diffusion-source.css' => '750add59',
78-
'rsrc/css/application/diffusion/diffusion.css' => '08991f7e',
78+
'rsrc/css/application/diffusion/diffusion.css' => '8d01932f',
7979
'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
8080
'rsrc/css/application/files/global-drag-and-drop.css' => '5c1b47c2',
8181
'rsrc/css/application/flag/flag.css' => 'bba8f811',
@@ -571,7 +571,7 @@
571571
'differential-revision-history-css' => '0e8eb855',
572572
'differential-revision-list-css' => 'f3c47d33',
573573
'differential-table-of-contents-css' => 'ae4b7a55',
574-
'diffusion-css' => '08991f7e',
574+
'diffusion-css' => '8d01932f',
575575
'diffusion-icons-css' => '0c15255e',
576576
'diffusion-readme-css' => '419dd5b6',
577577
'diffusion-repository-css' => 'ee6f20ec',

‎src/applications/diffusion/controller/DiffusionRepositoryController.php

+13-3
Original file line numberDiff line numberDiff line change
@@ -94,27 +94,37 @@ public function handleRequest(AphrontRequest $request) {
9494
'action' => 'clone',
9595
));
9696

97+
if ($repository->isSVN()) {
98+
$clone_text = pht('Checkout');
99+
} else {
100+
$clone_text = pht('Clone');
101+
}
102+
97103
$clone_button = id(new PHUIButtonView())
98104
->setTag('a')
99-
->setText('Clone')
105+
->setText($clone_text)
100106
->setColor(PHUIButtonView::GREEN)
101107
->setIcon('fa-download')
102108
->setWorkflow(true)
103109
->setHref($clone_uri);
104110

105111
$bar = id(new PHUILeftRightView())
106112
->setLeft($locate_file)
107-
->setRight($clone_button);
113+
->setRight($clone_button)
114+
->addClass('diffusion-action-bar');
108115

109116
$view = id(new PHUITwoColumnView())
110117
->setHeader($header)
111-
->setTabs($tabs)
112118
->setFooter(array(
113119
$bar,
114120
$description,
115121
$content,
116122
));
117123

124+
if ($page_has_content) {
125+
$view->setTabs($tabs);
126+
}
127+
118128
return $this->newPage()
119129
->setTitle(
120130
array(

‎webroot/rsrc/css/application/diffusion/diffusion.css

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@
1212
display: block;
1313
}
1414

15+
.diffusion-action-bar {
16+
margin-bottom: 16px;
17+
}
18+
1519
.diffusion-profile-locate .phui-form-view {
16-
margin: 0 0 16px 0;
20+
margin: 0;
1721
padding: 0;
1822
}
1923

0 commit comments

Comments
 (0)
Failed to load comments.