@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
Show shorter time in Conpherence, revisit spacing/colors
Summary: This adds a parameter for time only on Conpherence Transactions, although grepping around, Conpherence might be the only user of this View at this point. Since we have the date markers separately, we can use just the timestamp for a cleaner feel. Also updated a bit of the spacing and colors to match Conpherence Full. Ref T7531
Test Plan:
A lot of Photoshop, and different types of chats.
{F336204}
Reviewers: btrahan, epriestley
Reviewed By: epriestley
Subscribers: Korvin, epriestley
Maniphest Tasks: T7531
Differential Revision: https://secure.phabricator.com/D12049
+44
-19
+2
-2
resources/celerity/map.php
+2
-2
resources/celerity/map.php
···
44
44
'rsrc/css/application/config/config-welcome.css' => '6abd79be',
45
45
'rsrc/css/application/config/setup-issue.css' => '22270af2',
46
46
'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2',
47
-
'rsrc/css/application/conpherence/durable-column.css' => '587fc261',
47
+
'rsrc/css/application/conpherence/durable-column.css' => 'e3433ca7',
48
48
'rsrc/css/application/conpherence/menu.css' => 'c6ac5299',
49
49
'rsrc/css/application/conpherence/message-pane.css' => '5930260a',
50
50
'rsrc/css/application/conpherence/notification.css' => '04a6e10a',
···
514
514
'changeset-view-manager' => '88be0133',
515
515
'config-options-css' => '7fedf08b',
516
516
'config-welcome-css' => '6abd79be',
517
-
'conpherence-durable-column-view' => '587fc261',
517
+
'conpherence-durable-column-view' => 'e3433ca7',
518
518
'conpherence-menu-css' => 'c6ac5299',
519
519
'conpherence-message-pane-css' => '5930260a',
520
520
'conpherence-notification-css' => '04a6e10a',
+3
-3
src/applications/conpherence/storage/ConpherenceTransaction.php
+3
-3
src/applications/conpherence/storage/ConpherenceTransaction.php
···
55
55
case ConpherenceTransactionType::TYPE_TITLE:
56
56
if ($old && $new) {
57
57
$title = pht(
58
-
'%s renamed this conpherence from "%s" to "%s".',
58
+
'%s renamed this Thread from "%s" to "%s".',
59
59
$this->renderHandleLink($author_phid),
60
60
$old,
61
61
$new);
62
62
} else if ($old) {
63
63
$title = pht(
64
-
'%s deleted the conpherence name "%s".',
64
+
'%s deleted the Thread name "%s".',
65
65
$this->renderHandleLink($author_phid),
66
66
$old);
67
67
} else {
68
68
$title = pht(
69
-
'%s named this conpherence "%s".',
69
+
'%s named this Thread "%s".',
70
70
$this->renderHandleLink($author_phid),
71
71
$new);
72
72
}
+2
-1
src/applications/conpherence/view/ConpherenceTransactionView.php
+2
-1
src/applications/conpherence/view/ConpherenceTransactionView.php
···
79
79
$author = $handles[$transaction->getAuthorPHID()];
80
80
$transaction_view = id(new PhabricatorTransactionView())
81
81
->setUser($user)
82
-
->setEpoch($transaction->getDateCreated());
82
+
->setEpoch($transaction->getDateCreated())
83
+
->setTimeOnly(true);
83
84
if ($this->getShowContentSource()) {
84
85
$transaction_view->setContentSource($transaction->getContentSource());
85
86
}
+15
-4
src/view/layout/PhabricatorTransactionView.php
+15
-4
src/view/layout/PhabricatorTransactionView.php
···
10
10
private $anchorText;
11
11
private $isPreview;
12
12
private $classes = array();
13
+
private $timeOnly;
13
14
14
15
public function setImageURI($uri) {
15
16
$this->imageURI = $uri;
···
47
48
return $this;
48
49
}
49
50
51
+
public function setTimeOnly($time) {
52
+
$this->timeOnly = $time;
53
+
return $this;
54
+
}
55
+
50
56
public function render() {
51
57
if (!$this->user) {
52
58
throw new Exception(pht('Call setUser() before render()!'));
···
64
70
65
71
$header = phutil_tag_div(
66
72
'phabricator-transaction-header grouped',
67
-
array($info, $actions));
73
+
array($actions, $info));
68
74
69
75
return phutil_tag(
70
76
'div',
···
93
99
}
94
100
95
101
if ($this->isPreview) {
96
-
$info[] = 'PREVIEW';
102
+
$info[] = pht('PREVIEW');
97
103
} else if ($this->epoch) {
98
-
$info[] = phabricator_datetime($this->epoch, $this->user);
104
+
if ($this->timeOnly) {
105
+
$info[] = phabricator_time($this->epoch, $this->user);
106
+
} else {
107
+
$info[] = phabricator_datetime($this->epoch, $this->user);
108
+
}
99
109
}
100
110
101
111
if ($this->anchorName) {
···
118
128
119
129
return phutil_tag(
120
130
'span',
121
-
array('class' => 'phabricator-transaction-info'),
131
+
array(
132
+
'class' => 'phabricator-transaction-info',),
122
133
$info);
123
134
}
124
135
+22
-9
webroot/rsrc/css/application/conpherence/durable-column.css
+22
-9
webroot/rsrc/css/application/conpherence/durable-column.css
···
103
103
left: 0;
104
104
right: 0;
105
105
overflow-x: hidden;
106
-
overflow-y: auto;
107
106
border-top: 1px solid {$thinblueborder};
108
107
}
109
108
···
132
131
.conpherence-durable-column-transactions .phabricator-transaction-detail
133
132
.phabricator-transaction-header {
134
133
background: none;
135
-
padding: 0;
134
+
padding: 0 0 4px 0;
136
135
}
137
136
138
137
.conpherence-durable-column-transactions .date-marker {
139
138
border-top: 1px solid {$thinblueborder};
140
-
margin: 20px 0px 4px;
139
+
margin: 20px 0px 8px;
141
140
}
142
141
143
142
.conpherence-durable-column-transactions .date-marker .date {
144
143
position: relative;
145
144
top: -11px;
146
-
left: 8px;
145
+
left: 0;
147
146
background-color: #fff;
148
-
color: {$lightgreytext};
147
+
color: {$lightbluetext};
149
148
font-size: 12px;
150
-
padding: 0 4px;
149
+
padding: 0 6px 0 0;
151
150
}
152
151
153
152
.conpherence-durable-column-transactions .phabricator-transaction-detail
154
153
.phabricator-transaction-header .phabricator-transaction-info {
155
-
margin: 3px 0px 0px 0px;
156
-
color: {$lightgreytext};
154
+
color: {$lightbluetext};
155
+
float: none;
156
+
font-size: 12px;
157
+
}
158
+
159
+
.conpherence-durable-column-transactions .phabricator-transaction-detail
160
+
.phabricator-transaction-header .phui-link-person {
161
+
color: {$darkbluetext};
162
+
padding: 0 8px 0 0;
163
+
}
164
+
165
+
.conpherence-durable-column-transactions .phabricator-transaction-detail
166
+
.phabricator-transaction-content .phui-link-person {
167
+
font-weight: bold;
168
+
color: {$darkbluetext};
157
169
}
158
170
159
171
.conpherence-durable-column-transactions .phabricator-transaction-detail
160
172
.phabricator-transaction-content {
161
-
padding: 0;
173
+
padding: 0 0 8px 0;
162
174
}
163
175
164
176
.conpherence-durable-column-textarea {
···
182
194
border-top-color: {$sky};
183
195
border-bottom-color: {$sky};
184
196
box-shadow: none;
197
+
opacity: 0.6;
185
198
}
186
199
187
200
.conpherence-durable-column-footer {