Skip to content

Commit c428ff7

Browse files
SorienSorien
committed
Prettify Timeline
1 parent f072d45 commit c428ff7

File tree

4 files changed

+186
-130
lines changed

4 files changed

+186
-130
lines changed

‎templates/repo/issue/view_content.tmpl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
{{ $createdStr:= TimeSinceUnix .Issue.CreatedUnix $.Lang }}
1212
<div class="twelve wide column comment-list prevent-before-timeline">
13-
<ui class="ui comments timeline-line">
14-
<div id="{{.Issue.HashTag}}" class="comment">
13+
<ui class="ui timeline">
14+
<div id="{{.Issue.HashTag}}" class="timeline-item comment first">
1515
{{if .Issue.OriginalAuthor }}
16-
<span class="avatar"><img src="/img/avatar_default.png"></span>
16+
<span class="timeline-avatar"><img src="/img/avatar_default.png"></span>
1717
{{else}}
18-
<a class="avatar" {{if gt .Issue.Poster.ID 0}}href="{{.Issue.Poster.HomeLink}}"{{end}}>
18+
<a class="timeline-avatar" {{if gt .Issue.Poster.ID 0}}href="{{.Issue.Poster.HomeLink}}"{{end}}>
1919
<img src="{{.Issue.Poster.RelAvatarLink}}">
2020
</a>
2121
{{end}}
@@ -67,8 +67,8 @@
6767
{{end}}
6868
{{if .IsSigned}}
6969
{{ if and (or .IsRepoAdmin .HasIssuesOrPullsWritePermission (or (not .Issue.IsLocked))) (not .Repository.IsArchived) }}
70-
<div class="comment form">
71-
<a class="avatar" href="{{.SignedUser.HomeLink}}">
70+
<div class="timeline-item comment form">
71+
<a class="timeline-avatar" href="{{.SignedUser.HomeLink}}">
7272
<img src="{{.SignedUser.RelAvatarLink}}">
7373
</a>
7474
<div class="content">
@@ -116,8 +116,8 @@
116116
{{else}}
117117
{{if .IsSigned}}
118118
{{if .Repository.IsArchived}}
119-
<div class="comment form">
120-
<a class="avatar" href="{{.SignedUser.HomeLink}}">
119+
<div class="timeline-item comment form">
120+
<a class="timeline-avatar" href="{{.SignedUser.HomeLink}}">
121121
<img src="{{.SignedUser.RelAvatarLink}}">
122122
</a>
123123
<div class="content">

‎templates/repo/issue/view_content/comments.tmpl

Lines changed: 80 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
22 = REVIEW, 23 = ISSUE_LOCKED, 24 = ISSUE_UNLOCKED, 25 = TARGET_BRANCH_CHANGED,
1010
26 = DELETE_TIME_MANUAL -->
1111
{{if eq .Type 0}}
12-
<div class="comment" id="{{.HashTag}}">
12+
<div class="timeline-item comment" id="{{.HashTag}}">
1313
{{if .OriginalAuthor }}
14-
<span class="avatar"><img src="/img/avatar_default.png"></span>
14+
<span class="timeline-avatar"><img src="/img/avatar_default.png"></span>
1515
{{else}}
16-
<a class="avatar" {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>
16+
<a class="timeline-avatar" {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>
1717
<img src="{{.Poster.RelAvatarLink}}">
1818
</a>
1919
{{end}}
@@ -69,16 +69,16 @@
6969
</div>
7070
</div>
7171
{{else if eq .Type 1}}
72-
<div class="event" id="{{.HashTag}}">
73-
{{svg "octicon-primitive-dot" 16}}
72+
<div class="timeline-item event" id="{{.HashTag}}">
73+
<span class="badge">{{svg "octicon-primitive-dot" 16}}</span>
7474
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
7575
<img src="{{.Poster.RelAvatarLink}}">
7676
</a>
7777
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a> {{$.i18n.Tr "repo.issues.reopened_at" .EventTag $createdStr | Safe}}</span>
7878
</div>
7979
{{else if eq .Type 2}}
80-
<div class="event" id="{{.HashTag}}">
81-
<span class="issue-symbol">{{svg "octicon-circle-slash" 16}}</span>
80+
<div class="timeline-item event" id="{{.HashTag}}">
81+
<span class="badge">{{svg "octicon-circle-slash" 16}}</span>
8282
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
8383
<img src="{{.Poster.RelAvatarLink}}">
8484
</a>
@@ -98,8 +98,8 @@
9898
{{ $refTr = "repo.issues.ref_reopening_from" }}
9999
{{end}}
100100
{{ $createdStr:= TimeSinceUnix .CreatedUnix $.Lang }}
101-
<div class="event" id="{{.HashTag}}">
102-
{{svg "octicon-bookmark" 16}}
101+
<div class="timeline-item event" id="{{.HashTag}}">
102+
<span class="badge">{{svg "octicon-bookmark" 16}}</span>
103103
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
104104
<img src="{{.Poster.RelAvatarLink}}">
105105
</a>
@@ -114,8 +114,8 @@
114114
</div>
115115
</div>
116116
{{else if eq .Type 4}}
117-
<div class="event" id="{{.HashTag}}">
118-
{{svg "octicon-bookmark" 16}}
117+
<div class="timeline-item event" id="{{.HashTag}}">
118+
<span class="badge">{{svg "octicon-bookmark" 16}}</span>
119119
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
120120
<img src="{{.Poster.RelAvatarLink}}">
121121
</a>
@@ -128,8 +128,8 @@
128128
</div>
129129
{{else if eq .Type 7}}
130130
{{if .Label}}
131-
<div class="event" id="{{.HashTag}}">
132-
{{svg "octicon-primitive-dot" 16}}
131+
<div class="timeline-item event" id="{{.HashTag}}">
132+
<span class="badge">{{svg "octicon-tag" 16}}</span>
133133
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
134134
<img src="{{.Poster.RelAvatarLink}}">
135135
</a>
@@ -138,17 +138,17 @@
138138
</div>
139139
{{end}}
140140
{{else if eq .Type 8}}
141-
<div class="event" id="{{.HashTag}}">
142-
{{svg "octicon-primitive-dot" 16}}
141+
<div class="timeline-item event" id="{{.HashTag}}">
142+
<span class="badge">{{svg "octicon-milestone" 16}}</span>
143143
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
144144
<img src="{{.Poster.RelAvatarLink}}">
145145
</a>
146146
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
147147
{{if gt .OldMilestoneID 0}}{{if gt .MilestoneID 0}}{{$.i18n.Tr "repo.issues.change_milestone_at" (.OldMilestone.Name|Escape) (.Milestone.Name|Escape) $createdStr | Safe}}{{else}}{{$.i18n.Tr "repo.issues.remove_milestone_at" (.OldMilestone.Name|Escape) $createdStr | Safe}}{{end}}{{else if gt .MilestoneID 0}}{{$.i18n.Tr "repo.issues.add_milestone_at" (.Milestone.Name|Escape) $createdStr | Safe}}{{end}}</span>
148148
</div>
149149
{{else if eq .Type 9}}
150-
<div class="event" id="{{.HashTag}}">
151-
{{svg "octicon-primitive-dot" 16}}
150+
<div class="timeline-item event" id="{{.HashTag}}">
151+
<span class="badge">{{svg "octicon-person" 16}}</span>
152152
{{if gt .AssigneeID 0}}
153153
{{if .RemovedAssignee}}
154154
<a class="ui avatar image" href="{{.Assignee.HomeLink}}">
@@ -178,8 +178,8 @@
178178
{{end}}
179179
</div>
180180
{{else if eq .Type 10}}
181-
<div class="event" id="{{.HashTag}}">
182-
{{svg "octicon-primitive-dot" 16}}
181+
<div class="timeline-item event" id="{{.HashTag}}">
182+
<span class="badge">{{svg "octicon-pencil" 16}}</span>
183183
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
184184
<img src="{{.Poster.RelAvatarLink}}">
185185
</a>
@@ -188,8 +188,8 @@
188188
</span>
189189
</div>
190190
{{else if eq .Type 11}}
191-
<div class="event" id="{{.HashTag}}">
192-
{{svg "octicon-primitive-dot" 16}}
191+
<div class="timeline-item event" id="{{.HashTag}}">
192+
<span class="badge">{{svg "octicon-git-branch" 16}}</span>
193193
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
194194
<img src="{{.Poster.RelAvatarLink}}">
195195
</a>
@@ -198,16 +198,16 @@
198198
</span>
199199
</div>
200200
{{else if eq .Type 12}}
201-
<div class="event" id="{{.HashTag}}">
202-
{{svg "octicon-primitive-dot" 16}}
201+
<div class="timeline-item event" id="{{.HashTag}}">
202+
<span class="badge">{{svg "octicon-clock" 16}}</span>
203203
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
204204
<img src="{{.Poster.RelAvatarLink}}">
205205
</a>
206206
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a> {{$.i18n.Tr "repo.issues.start_tracking_history" $createdStr | Safe}}</span>
207207
</div>
208208
{{else if eq .Type 13}}
209-
<div class="event" id="{{.HashTag}}">
210-
{{svg "octicon-primitive-dot" 16}}
209+
<div class="timeline-item event" id="{{.HashTag}}">
210+
<span class="badge">{{svg "octicon-clock" 16}}</span>
211211
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
212212
<img src="{{.Poster.RelAvatarLink}}">
213213
</a>
@@ -219,8 +219,8 @@
219219
</div>
220220
</div>
221221
{{else if eq .Type 14}}
222-
<div class="event" id="{{.HashTag}}">
223-
{{svg "octicon-primitive-dot" 16}}
222+
<div class="timeline-item event" id="{{.HashTag}}">
223+
<span class="badge">{{svg "octicon-clock" 16}}</span>
224224
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
225225
<img src="{{.Poster.RelAvatarLink}}">
226226
</a>
@@ -231,16 +231,16 @@
231231
</div>
232232
</div>
233233
{{else if eq .Type 15}}
234-
<div class="event" id="{{.HashTag}}">
235-
{{svg "octicon-primitive-dot" 16}}
234+
<div class="timeline-item event" id="{{.HashTag}}">
235+
<span class="badge">{{svg "octicon-clock" 16}}</span>
236236
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
237237
<img src="{{.Poster.RelAvatarLink}}">
238238
</a>
239239
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a> {{$.i18n.Tr "repo.issues.cancel_tracking_history" $createdStr | Safe}}</span>
240240
</div>
241241
{{else if eq .Type 16}}
242-
<div class="event" id="{{.HashTag}}">
243-
{{svg "octicon-primitive-dot" 16}}
242+
<div class="timeline-item event" id="{{.HashTag}}">
243+
<span class="badge">{{svg "octicon-clock" 16}}</span>
244244
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
245245
<img src="{{.Poster.RelAvatarLink}}">
246246
</a>
@@ -249,8 +249,8 @@
249249
</span>
250250
</div>
251251
{{else if eq .Type 17}}
252-
<div class="event" id="{{.HashTag}}">
253-
{{svg "octicon-primitive-dot" 16}}
252+
<div class="timeline-item event" id="{{.HashTag}}">
253+
<span class="badge">{{svg "octicon-clock" 16}}</span>
254254
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
255255
<img src="{{.Poster.RelAvatarLink}}">
256256
</a>
@@ -259,8 +259,8 @@
259259
</span>
260260
</div>
261261
{{else if eq .Type 18}}
262-
<div class="event" id="{{.HashTag}}">
263-
{{svg "octicon-primitive-dot" 16}}
262+
<div class="timeline-item event" id="{{.HashTag}}">
263+
<span class="badge">{{svg "octicon-clock" 16}}</span>
264264
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
265265
<img src="{{.Poster.RelAvatarLink}}">
266266
</a>
@@ -269,8 +269,8 @@
269269
</span>
270270
</div>
271271
{{else if eq .Type 19}}
272-
<div class="event" id="{{.HashTag}}">
273-
{{svg "octicon-primitive-dot" 16}}
272+
<div class="timeline-item event" id="{{.HashTag}}">
273+
<span class="badge">{{svg "octicon-dependent" 16}}</span>
274274
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
275275
<img src="{{.Poster.RelAvatarLink}}">
276276
</a>
@@ -293,8 +293,8 @@
293293
{{end}}
294294
</div>
295295
{{else if eq .Type 20}}
296-
<div class="event" id="{{.HashTag}}">
297-
{{svg "octicon-primitive-dot" 16}}
296+
<div class="timeline-item event" id="{{.HashTag}}">
297+
<span class="badge">{{svg "octicon-dependent" 16}}</span>
298298
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
299299
<img src="{{.Poster.RelAvatarLink}}">
300300
</a>
@@ -317,17 +317,17 @@
317317
{{end}}
318318
</div>
319319
{{else if eq .Type 22}}
320-
<div class="event" id="{{.HashTag}}">
321-
<span class="issue-symbol {{if eq .Review.Type 1}}green
322-
{{- else if eq .Review.Type 2}}grey
323-
{{- else if eq .Review.Type 3}}red
324-
{{- else}}grey{{end}}">{{svg (printf "octicon-%s" .Review.Type.Icon) 16}}</span>
320+
<div class="timeline-item event" id="{{.HashTag}}">
325321
{{if .OriginalAuthor }}
326322
{{else}}
327-
<a class="ui avatar image"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>
328-
<img src="{{.Poster.RelAvatarLink}}">
329-
</a>
323+
<a class="timeline-avatar"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>
324+
<img src="{{.Poster.RelAvatarLink}}">
325+
</a>
330326
{{end}}
327+
<span class="badge {{if eq .Review.Type 1}}green
328+
{{- else if eq .Review.Type 2}}grey
329+
{{- else if eq .Review.Type 3}}red
330+
{{- else}}grey{{end}}">{{svg (printf "octicon-%s" .Review.Type.Icon) 16}}</span>
331331
<span class="text grey">
332332
{{if .OriginalAuthor }}
333333
<span class="text black"><i class="fa {{MigrationIcon $.Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> {{ .OriginalAuthor }}</span><span class="text grey"> {{if $.Repository.OriginalURL}}</span><span class="text migrate">({{$.i18n.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname | Safe }}){{end}}</span>
@@ -345,12 +345,31 @@
345345
{{$.i18n.Tr "repo.issues.review.comment" $createdStr | Safe}}
346346
{{end}}
347347
</span>
348-
{{if .Content}}
349-
<div class="detail">
350-
{{svg "octicon-quote" 16}}
351-
<span class="text grey has-emoji">{{.Content}}</span>
348+
</div>
349+
{{if .Content}}
350+
<div class="timeline-item comment">
351+
<div class="content">
352+
<div class="ui top attached header arrow-top">
353+
<span class="text grey">
354+
{{if .OriginalAuthor }}
355+
<span class="text black"><i class="fa {{MigrationIcon $.Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> {{ .OriginalAuthor }}</span><span class="text grey"> {{if $.Repository.OriginalURL}}</span><span class="text migrate">({{$.i18n.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname | Safe }}){{end}}</span>
356+
{{else}}
357+
<a{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.GetDisplayName}}</a>
358+
{{end}}
359+
360+
{{$.i18n.Tr "repo.issues.review.leftcomment" | Safe}}
361+
</span>
352362
</div>
353-
{{end}}
363+
<div class="ui attached segment">
364+
<div class="detail">
365+
<span class="text grey has-emoji">{{.Content}}</span>
366+
</div>
367+
</div>
368+
</div>
369+
</div>
370+
{{end}}
371+
{{if .Review.CodeComments}}
372+
<div class="timeline-item event">
354373
{{ range $filename, $lines := .Review.CodeComments}}
355374
{{range $line, $comms := $lines}}
356375
<div class="ui segments">
@@ -418,9 +437,10 @@
418437
{{end}}
419438
{{end}}
420439
</div>
440+
{{end}}
421441
{{else if eq .Type 23}}
422-
<div class="event" id="{{.HashTag}}">
423-
<span class="issue-symbol">{{svg "octicon-lock" 16}}</span>
442+
<div class="timeline-item event" id="{{.HashTag}}">
443+
<span class="badge">{{svg "octicon-lock" 16}}</span>
424444
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
425445
<img src="{{.Poster.RelAvatarLink}}">
426446
</a>
@@ -436,8 +456,8 @@
436456
{{ end }}
437457
</div>
438458
{{else if eq .Type 24}}
439-
<div class="event" id="{{.HashTag}}">
440-
<span class="issue-symbol">{{svg "octicon-key" 16}}</span>
459+
<div class="timeline-item event" id="{{.HashTag}}">
460+
<span class="badge">{{svg "octicon-key" 16}}</span>
441461
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
442462
<img src="{{.Poster.RelAvatarLink}}">
443463
</a>
@@ -447,8 +467,8 @@
447467
</span>
448468
</div>
449469
{{else if eq .Type 25}}
450-
<div class="event">
451-
{{svg "octicon-primitive-dot" 16}}
470+
<div class="timeline-item event">
471+
<span class="badge">{{svg "octicon-git-branch" 16}}</span>
452472
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
453473
<img src="{{.Poster.RelAvatarLink}}">
454474
</a>
@@ -457,8 +477,8 @@
457477
</span>
458478
</div>
459479
{{else if eq .Type 26}}
460-
<div class="event" id="{{.HashTag}}">
461-
{{svg "octicon-primitive-dot" 16}}
480+
<div class="timeline-item event" id="{{.HashTag}}">
481+
<span class="badge">{{svg "octicon-clock" 16}}</span>
462482
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
463483
<img src="{{.Poster.RelAvatarLink}}">
464484
</a>

‎templates/repo/issue/view_content/pull.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
</div>
3939
</div>
4040
{{end}}
41-
<div class="comment merge box">
42-
<a class="avatar text {{if .Issue.PullRequest.HasMerged}}purple
41+
<div class="timeline-item comment merge box">
42+
<a class="timeline-avatar text {{if .Issue.PullRequest.HasMerged}}purple
4343
{{- else if .Issue.IsClosed}}grey
4444
{{- else if .IsPullWorkInProgress}}grey
4545
{{- else if .IsFilesConflicted}}grey

0 commit comments

Comments
 (0)