@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
Conpherence - fix a few bugs
Summary: Fixes T3280 - when a pontificate brought back multiple transactions, we were rendering a comma. Yay hsprintf. Also fixes the noconpherences view, which broke at some point recently.
Test Plan: sent comment, then replied from different browser. when both comments loaded noted no comma. loaded a conpherence view with no conpherences and verified it looked good.
Reviewers: epriestley
Reviewed By: epriestley
CC: aran, Korvin, chad
Maniphest Tasks: T3280
Differential Revision: https://secure.phabricator.com/D6079
+39
-17
+3
-3
src/__celerity_resource_map__.php
+3
-3
src/__celerity_resource_map__.php
···
918
918
),
919
919
'conpherence-menu-css' =>
920
920
array(
921
-
'uri' => '/res/60f38fbd/rsrc/css/application/conpherence/menu.css',
921
+
'uri' => '/res/61b6e414/rsrc/css/application/conpherence/menu.css',
922
922
'type' => 'css',
923
923
'requires' =>
924
924
array(
···
927
927
),
928
928
'conpherence-message-pane-css' =>
929
929
array(
930
-
'uri' => '/res/d9e90066/rsrc/css/application/conpherence/message-pane.css',
930
+
'uri' => '/res/cbd704df/rsrc/css/application/conpherence/message-pane.css',
931
931
'type' => 'css',
932
932
'requires' =>
933
933
array(
···
1294
1294
),
1295
1295
'javelin-behavior-conpherence-menu' =>
1296
1296
array(
1297
-
'uri' => '/res/87e901c2/rsrc/js/application/conpherence/behavior-menu.js',
1297
+
'uri' => '/res/567585ab/rsrc/js/application/conpherence/behavior-menu.js',
1298
1298
'type' => 'js',
1299
1299
'requires' =>
1300
1300
array(
+1
-1
src/applications/conpherence/controller/ConpherenceUpdateController.php
+1
-1
src/applications/conpherence/controller/ConpherenceUpdateController.php
···
320
320
}
321
321
322
322
$content = array(
323
-
'transactions' => $rendered_transactions,
323
+
'transactions' => hsprintf('%s', $rendered_transactions),
324
324
'latest_transaction_id' => $new_latest_transaction_id,
325
325
'nav_item' => hsprintf('%s', $nav_item),
326
326
'conpherence_phid' => $conpherence->getPHID(),
+8
-8
src/applications/conpherence/view/ConpherenceLayoutView.php
+8
-8
src/applications/conpherence/view/ConpherenceLayoutView.php
···
158
158
javelin_tag(
159
159
'div',
160
160
array(
161
+
'class' => 'conpherence-header-pane',
162
+
'id' => 'conpherence-header-pane',
163
+
'sigil' => 'conpherence-header-pane',
164
+
),
165
+
nonempty($this->header, '')),
166
+
javelin_tag(
167
+
'div',
168
+
array(
161
169
'class' => 'conpherence-no-threads',
162
170
'sigil' => 'conpherence-no-threads',
163
171
'style' => 'display: none;',
···
178
186
),
179
187
pht('Send a Message'))
180
188
)),
181
-
javelin_tag(
182
-
'div',
183
-
array(
184
-
'class' => 'conpherence-header-pane',
185
-
'id' => 'conpherence-header-pane',
186
-
'sigil' => 'conpherence-header-pane',
187
-
),
188
-
nonempty($this->header, '')),
189
189
javelin_tag(
190
190
'div',
191
191
array(
+12
-2
webroot/rsrc/css/application/conpherence/message-pane.css
+12
-2
webroot/rsrc/css/application/conpherence/message-pane.css
···
4
4
5
5
.conpherence-message-pane,
6
6
.loading .messages-loading-mask,
7
-
.loading .messages-loading-icon {
7
+
.loading .messages-loading-icon,
8
+
.conpherence-layout .conpherence-no-threads {
8
9
position: fixed;
9
10
left: 280px;
10
11
right: 241px;
···
16
17
17
18
.device .conpherence-message-pane,
18
19
.device .loading .messages-loading-mask,
19
-
.device .loading .messages-loading-icon {
20
+
.device .loading .messages-loading-icon,
21
+
.device .conpherence-layout .conpherence-no-threads {
20
22
left: 0;
21
23
right: 0;
22
24
width: 100%;
25
+
}
26
+
27
+
.conpherence-layout .conpherence-no-threads {
28
+
text-align: center;
29
+
}
30
+
31
+
.conpherence-layout .conpherence-no-threads .text {
32
+
margin: 16px 0px 16px 0px;
23
33
}
24
34
25
35
.conpherence-show-older-messages {