Skip to content

Commit 39e5da7

Browse files
author
Chad Little
committedJul 9, 2017
Simplify Diffusion Browse Table
Summary: Cleans up colors, removes commit hash and links the text instead. Also unsure how valuable "lint" column is here, but left it. I'd maybe like to understand that workflow since it just seems like clutter overall. Also Fixes T12905 Test Plan: Review Phabricator, hg, and a few other test repositories locally. Holler if anything here seems bad, but this feels easier to read and use to me. {F5038425} Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Maniphest Tasks: T12905 Differential Revision: https://secure.phabricator.com/D18189
1 parent 0bd1dfd commit 39e5da7

File tree

8 files changed

+55
-35
lines changed

8 files changed

+55
-35
lines changed
 

‎resources/celerity/map.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
'names' => array(
1010
'conpherence.pkg.css' => 'ff161f2d',
1111
'conpherence.pkg.js' => 'b5b51108',
12-
'core.pkg.css' => '37dd219b',
12+
'core.pkg.css' => '7ae9e755',
1313
'core.pkg.js' => '5d80e0db',
1414
'darkconsole.pkg.js' => '1f9a31bc',
1515
'differential.pkg.css' => '4ec4a37a',
1616
'differential.pkg.js' => 'd4ab0e81',
17-
'diffusion.pkg.css' => 'b93d9b8c',
17+
'diffusion.pkg.css' => 'a2d17c7d',
1818
'diffusion.pkg.js' => '6134c5a1',
1919
'favicon.ico' => '30672e08',
2020
'maniphest.pkg.css' => '4845691a',
@@ -71,8 +71,8 @@
7171
'rsrc/css/application/differential/revision-history.css' => '0e8eb855',
7272
'rsrc/css/application/differential/revision-list.css' => 'f3c47d33',
7373
'rsrc/css/application/differential/table-of-contents.css' => 'ae4b7a55',
74-
'rsrc/css/application/diffusion/diffusion-history.css' => '4540f568',
75-
'rsrc/css/application/diffusion/diffusion-icons.css' => 'a6a1e2ba',
74+
'rsrc/css/application/diffusion/diffusion-history.css' => '898ed727',
75+
'rsrc/css/application/diffusion/diffusion-icons.css' => '0c15255e',
7676
'rsrc/css/application/diffusion/diffusion-readme.css' => '419dd5b6',
7777
'rsrc/css/application/diffusion/diffusion-repository.css' => 'ee6f20ec',
7878
'rsrc/css/application/diffusion/diffusion-source.css' => '750add59',
@@ -161,7 +161,7 @@
161161
'rsrc/css/phui/phui-header-view.css' => 'e7de7ee2',
162162
'rsrc/css/phui/phui-hovercard.css' => 'f0592bcf',
163163
'rsrc/css/phui/phui-icon-set-selector.css' => '87db8fee',
164-
'rsrc/css/phui/phui-icon.css' => '4c46b6ba',
164+
'rsrc/css/phui/phui-icon.css' => '5c4a5de6',
165165
'rsrc/css/phui/phui-image-mask.css' => 'a8498f9c',
166166
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
167167
'rsrc/css/phui/phui-info-view.css' => '6e217679',
@@ -570,8 +570,8 @@
570570
'differential-revision-history-css' => '0e8eb855',
571571
'differential-revision-list-css' => 'f3c47d33',
572572
'differential-table-of-contents-css' => 'ae4b7a55',
573-
'diffusion-history-css' => '4540f568',
574-
'diffusion-icons-css' => 'a6a1e2ba',
573+
'diffusion-history-css' => '898ed727',
574+
'diffusion-icons-css' => '0c15255e',
575575
'diffusion-readme-css' => '419dd5b6',
576576
'diffusion-repository-css' => 'ee6f20ec',
577577
'diffusion-source-css' => '750add59',
@@ -849,7 +849,7 @@
849849
'phui-hovercard' => '1bd28176',
850850
'phui-hovercard-view-css' => 'f0592bcf',
851851
'phui-icon-set-selector-css' => '87db8fee',
852-
'phui-icon-view-css' => '4c46b6ba',
852+
'phui-icon-view-css' => '5c4a5de6',
853853
'phui-image-mask-css' => 'a8498f9c',
854854
'phui-info-panel-css' => '27ea50a1',
855855
'phui-info-view-css' => '6e217679',

‎src/applications/differential/constants/DifferentialChangeType.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public static function getIconForFileType($type) {
7171
self::FILE_TEXT => 'fa-file-text-o',
7272
self::FILE_IMAGE => 'fa-file-image-o',
7373
self::FILE_BINARY => 'fa-file',
74-
self::FILE_DIRECTORY => 'fa-folder-open',
74+
self::FILE_DIRECTORY => 'fa-folder',
7575
self::FILE_SYMLINK => 'fa-link',
7676
self::FILE_DELETED => 'fa-file',
7777
self::FILE_NORMAL => 'fa-file-text-o',
@@ -83,14 +83,14 @@ public static function getIconForFileType($type) {
8383

8484
public static function getIconColorForFileType($type) {
8585
static $icons = array(
86-
self::FILE_TEXT => 'black',
87-
self::FILE_IMAGE => 'black',
86+
self::FILE_TEXT => 'bluetext',
87+
self::FILE_IMAGE => 'bluetext',
8888
self::FILE_BINARY => 'green',
89-
self::FILE_DIRECTORY => 'blue',
90-
self::FILE_SYMLINK => 'blue',
89+
self::FILE_DIRECTORY => 'bluetext',
90+
self::FILE_SYMLINK => 'bluetext',
9191
self::FILE_DELETED => 'red',
92-
self::FILE_NORMAL => 'black',
93-
self::FILE_SUBMODULE => 'blue',
92+
self::FILE_NORMAL => 'bluetext',
93+
self::FILE_SUBMODULE => 'bluetext',
9494
);
9595

9696
return idx($icons, $type, 'black');

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,11 @@ private function renderColumns(
132132
}
133133
}
134134

135-
$details = AphrontTableView::renderSingleDisplayLine($data->getSummary());
135+
$details = DiffusionView::linkDetail(
136+
$drequest->getRepository(),
137+
$commit->getCommitIdentifier(),
138+
$data->getSummary());
139+
$details = AphrontTableView::renderSingleDisplayLine($details);
136140
} else {
137141
$author = '';
138142
$details = '';

‎src/applications/diffusion/view/DiffusionBrowseTableView.php

+7-19
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public function setHandles(array $handles) {
2020
public function render() {
2121
$request = $this->getDiffusionRequest();
2222
$repository = $request->getRepository();
23+
require_celerity_resource('diffusion-history-css');
2324

2425
$base_path = trim($request->getPath(), '/');
2526
if ($base_path) {
@@ -74,7 +75,6 @@ public function render() {
7475

7576
$dict = array(
7677
'lint' => celerity_generate_unique_node_id(),
77-
'commit' => celerity_generate_unique_node_id(),
7878
'date' => celerity_generate_unique_node_id(),
7979
'author' => celerity_generate_unique_node_id(),
8080
'details' => celerity_generate_unique_node_id(),
@@ -86,13 +86,13 @@ public function render() {
8686
}
8787

8888
$rows[] = array(
89-
$history_link,
9089
$browse_link,
9190
idx($dict, 'lint'),
92-
$dict['commit'],
9391
$dict['details'],
9492
$dict['date'],
93+
$history_link,
9594
);
95+
9696
}
9797

9898
if ($need_pull) {
@@ -113,27 +113,16 @@ public function render() {
113113
$lint = $request->getLint();
114114

115115
$view = new AphrontTableView($rows);
116-
$view->setHeaders(
117-
array(
118-
null,
119-
pht('Path'),
120-
($lint ? $lint : pht('Lint')),
121-
pht('Modified'),
122-
pht('Details'),
123-
pht('Committed'),
124-
));
125116
$view->setColumnClasses(
126117
array(
127-
'nudgeright',
128118
'',
129119
'',
130-
'',
131-
'wide',
120+
'wide commit-detail',
132121
'right',
122+
'right narrow',
133123
));
134124
$view->setColumnVisibility(
135125
array(
136-
true,
137126
true,
138127
$show_lint,
139128
true,
@@ -143,16 +132,15 @@ public function render() {
143132

144133
$view->setDeviceVisibility(
145134
array(
146-
true,
147135
true,
148136
false,
149-
false,
150137
true,
151138
false,
139+
false,
152140
));
153141

154142

155-
return $view->render();
143+
return phutil_tag_div('diffusion-browse-table', $view->render());
156144
}
157145

158146
}

‎src/applications/diffusion/view/DiffusionView.php

+13
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,19 @@ final public static function linkCommit(
156156
$commit_name);
157157
}
158158

159+
final public static function linkDetail(
160+
PhabricatorRepository $repository,
161+
$commit,
162+
$detail) {
163+
164+
return phutil_tag(
165+
'a',
166+
array(
167+
'href' => $repository->getCommitURI($commit),
168+
),
169+
$detail);
170+
}
171+
159172
final public static function linkRevision($id) {
160173
if (!$id) {
161174
return null;

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

+10
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,16 @@
4848
margin-right: 4px;
4949
}
5050

51+
/* - Browse Styles ----------------------------------------------------------*/
52+
53+
.diffusion-browse-table .commit-detail {
54+
padding-left: 32px;
55+
}
56+
57+
.diffusion-browse-table .commit-detail a {
58+
color: {$darkbluetext};
59+
}
60+
5161
/* - Phone Style ------------------------------------------------------------*/
5262

5363
.device-phone.diffusion-history-view .phui-two-column-view

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

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ input.diffusion-clone-uri {
2020

2121
.diffusion-browse-name {
2222
margin-left: 8px;
23+
letter-spacing: 0.02em;
2324
}
2425

2526
.diffusion-link-icon + .diffusion-link-icon {

‎webroot/rsrc/css/phui/phui-icon.css

+4
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ img.phui-image-disabled {
4545
filter: grayscale(100%);
4646
}
4747

48+
.phui-icon-view.bluetext {
49+
color: {$bluetext};
50+
}
51+
4852
/* - Icon in a Circle ------------------------------------------------------- */
4953

5054
.phui-icon-circle {

0 commit comments

Comments
 (0)
Failed to load comments.