@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
Clean up nux state with durable column
Summary: Remove policy icons from durable column, create a basic nux layout and style.
Test Plan: leave all rooms, pop open chat, see helpful text and button.
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: Korvin
Differential Revision: https://secure.phabricator.com/D16655
+33
-47
+3
-3
resources/celerity/map.php
+3
-3
resources/celerity/map.php
···
7
7
*/
8
8
return array(
9
9
'names' => array(
10
-
'conpherence.pkg.css' => '5f3eb99c',
10
+
'conpherence.pkg.css' => '1bc6cd0d',
11
11
'conpherence.pkg.js' => '11f3e07e',
12
12
'core.pkg.css' => '3fa66cb3',
13
13
'core.pkg.js' => '30185d95',
···
46
46
'rsrc/css/application/config/config-template.css' => '8f18fa41',
47
47
'rsrc/css/application/config/setup-issue.css' => 'f794cfc3',
48
48
'rsrc/css/application/config/unhandled-exception.css' => '4c96257a',
49
-
'rsrc/css/application/conpherence/durable-column.css' => '6127de1b',
49
+
'rsrc/css/application/conpherence/durable-column.css' => '44bcaa19',
50
50
'rsrc/css/application/conpherence/header-pane.css' => '517de9fe',
51
51
'rsrc/css/application/conpherence/menu.css' => '78c7b811',
52
52
'rsrc/css/application/conpherence/message-pane.css' => '0d7dff02',
···
618
618
'conduit-api-css' => '7bc725c4',
619
619
'config-options-css' => '0ede4c9b',
620
620
'config-page-css' => '8798e14f',
621
-
'conpherence-durable-column-view' => '6127de1b',
621
+
'conpherence-durable-column-view' => '44bcaa19',
622
622
'conpherence-header-pane-css' => '517de9fe',
623
623
'conpherence-menu-css' => '78c7b811',
624
624
'conpherence-message-pane-css' => '0d7dff02',
+20
-33
src/applications/conpherence/view/ConpherenceDurableColumnView.php
+20
-33
src/applications/conpherence/view/ConpherenceDurableColumnView.php
···
150
150
151
151
$icon_bar = null;
152
152
if ($this->conpherences) {
153
-
$icon_bar = phutil_tag(
154
-
'div',
155
-
array(
156
-
'class' => 'conpherence-durable-column-icon-bar',
157
-
),
158
-
$this->buildIconBar());
153
+
$icon_bar = $this->buildIconBar();
159
154
}
155
+
$icon_bar = phutil_tag(
156
+
'div',
157
+
array(
158
+
'class' => 'conpherence-durable-column-icon-bar',
159
+
),
160
+
$icon_bar);
160
161
161
162
$transactions = $this->buildTransactions();
162
163
···
198
199
);
199
200
}
200
201
201
-
private function getPolicyIcon(
202
-
ConpherenceThread $conpherence,
203
-
array $policy_objects) {
204
-
205
-
assert_instances_of($policy_objects, 'PhabricatorPolicy');
206
-
207
-
$icon = $conpherence->getPolicyIconName($policy_objects);
208
-
$icon = id(new PHUIIconView())
209
-
->addClass('mmr')
210
-
->setIcon($icon);
211
-
return $icon;
212
-
}
213
-
214
202
private function buildIconBar() {
215
203
$icons = array();
216
204
$selected_conpherence = $this->getSelectedConpherence();
···
222
210
$classes[] = 'selected';
223
211
}
224
212
$data = $conpherence->getDisplayData($this->getUser());
225
-
$icon = $this->getPolicyIcon($conpherence, $this->getPolicyObjects());
226
213
$thread_title = phutil_tag(
227
214
'span',
228
215
array(),
229
216
array(
230
-
$icon,
231
217
$data['title'],
232
218
));
233
219
$image = $data['image'];
···
324
310
->addMenuItem($minimize)
325
311
->addClass('phabricator-application-menu');
326
312
327
-
$header = null;
328
313
if ($conpherence) {
329
314
$data = $conpherence->getDisplayData($this->getUser());
330
315
$header = phutil_tag(
331
316
'span',
332
317
array(),
333
-
array(
334
-
$this->getPolicyIcon($conpherence, $this->getPolicyObjects()),
335
-
$data['title'],
336
-
));
337
-
}
318
+
$data['title']);
319
+
} else {
320
+
$header = phutil_tag(
321
+
'span',
322
+
array(),
323
+
pht('Conpherence'));
324
+
}
338
325
339
326
$status = new PhabricatorNotificationStatusView();
340
327
···
406
393
if (!$this->getVisible() || $this->getInitialLoad()) {
407
394
return pht('Loading...');
408
395
}
409
-
return array(
396
+
$view = array(
410
397
phutil_tag(
411
398
'div',
412
399
array(
413
-
'class' => 'mmb',
400
+
'class' => 'column-no-rooms-text',
414
401
),
415
-
pht('You are not in any rooms yet.')),
402
+
pht('You have not joined any rooms yet.')),
416
403
javelin_tag(
417
404
'a',
418
405
array(
419
-
'href' => '/conpherence/new/',
406
+
'href' => '/conpherence/search/',
420
407
'class' => 'button grey',
421
-
'sigil' => 'workflow',
422
408
),
423
-
pht('Create a Room')),
409
+
pht('Find Rooms')),
424
410
);
411
+
return phutil_tag_div('column-no-rooms', $view);
425
412
}
426
413
427
414
$data = ConpherenceTransactionRenderer::renderTransactions(
+10
-11
webroot/rsrc/css/application/conpherence/durable-column.css
+10
-11
webroot/rsrc/css/application/conpherence/durable-column.css
···
118
118
padding: 10px 8px 10px 8px;
119
119
}
120
120
121
-
.conpherence-durable-column-header-text .phui-icon-view {
122
-
color: #fff;
123
-
text-shadow: 1px 1px 0 rgba(0,0,0,.6);
124
-
}
125
-
126
121
.conpherence-durable-column-icon-bar {
127
122
width: 36px;
128
123
background-color: {$lightgreybackground};
···
169
164
left: 34px;
170
165
right: 0;
171
166
overflow-x: hidden;
167
+
}
168
+
169
+
.conpherence-durable-column .column-no-rooms {
170
+
padding: 12px 8px;
171
+
}
172
+
173
+
.conpherence-durable-column .column-no-rooms-text {
174
+
color: {$greytext};
175
+
font-style: italic;
176
+
margin-bottom: 16px;
172
177
}
173
178
174
179
.conpherence-durable-column-transactions {
···
314
319
.minimize-column .conpherence-durable-column
315
320
.conpherence-durable-column-header-text {
316
321
width: 100px;
317
-
color: {$darkbluetext};
318
-
text-shadow: none;
319
-
}
320
-
321
-
.minimize-column .conpherence-durable-column
322
-
.conpherence-durable-column-header-text .phui-icon-view {
323
322
color: {$darkbluetext};
324
323
text-shadow: none;
325
324
}