Skip to content

Commit 0693fbf

Browse files
bkcsoftlunny
bkcsoft
authored and
lunny
committed
Refactor repo/issue/view_content.tmpl (#1276)
1 parent 7a81cd1 commit 0693fbf

File tree

4 files changed

+312
-310
lines changed

4 files changed

+312
-310
lines changed

‎templates/repo/issue/view_content.tmpl

Lines changed: 3 additions & 310 deletions
Original file line numberDiff line numberDiff line change
@@ -55,216 +55,10 @@
5555
</div>
5656
</div>
5757

58-
{{range .Issue.Comments}}
59-
{{ $createdStr:= TimeSince .Created $.Lang }}
60-
61-
<!-- 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE_REF, 4 = COMMIT_REF, 5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL -->
62-
{{if eq .Type 0}}
63-
<div class="comment" id="{{.HashTag}}">
64-
<a class="avatar" {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>
65-
<img src="{{.Poster.RelAvatarLink}}">
66-
</a>
67-
<div class="content">
68-
<div class="ui top attached header">
69-
<span class="text grey"><a {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}}</span>
70-
<div class="ui right actions">
71-
{{if gt .ShowTag 0}}
72-
<div class="item tag">
73-
{{if eq .ShowTag 1}}
74-
{{$.i18n.Tr "repo.issues.poster"}}
75-
{{else if eq .ShowTag 2}}
76-
{{$.i18n.Tr "repo.issues.collaborator"}}
77-
{{else if eq .ShowTag 3}}
78-
{{$.i18n.Tr "repo.issues.owner"}}
79-
{{end}}
80-
</div>
81-
{{end}}
82-
{{if or $.IsRepositoryAdmin (eq .Poster.ID $.SignedUserID)}}
83-
<div class="item action">
84-
<a class="edit-content" href="#"><i class="octicon octicon-pencil"></i></a>
85-
<a class="delete-comment" href="#" data-comment-id={{.HashTag}} data-url="{{$.RepoLink}}/comments/{{.ID}}/delete" data-locale="{{$.i18n.Tr "repo.issues.delete_comment_confirm"}}"><i class="octicon octicon-x"></i></a>
86-
</div>
87-
{{end}}
88-
</div>
89-
</div>
90-
<div class="ui attached segment">
91-
<div class="render-content markdown has-emoji">
92-
{{if .RenderedContent}}
93-
{{.RenderedContent|Str2html}}
94-
{{else}}
95-
<span class="no-content">{{$.i18n.Tr "repo.issues.no_content"}}</span>
96-
{{end}}
97-
</div>
98-
<div class="raw-content hide">{{.Content}}</div>
99-
<div class="edit-content-zone hide" data-write="issuecomment-{{.ID}}-write" data-preview="issuecomment-{{.ID}}-preview" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-context="{{$.RepoLink}}"></div>
100-
</div>
101-
{{if .Attachments}}
102-
<div class="ui bottom attached segment">
103-
<div class="ui small images">
104-
{{range .Attachments}}
105-
<a target="_blank" rel="noopener" href="{{AppSubUrl}}/attachments/{{.UUID}}">
106-
{{if FilenameIsImage .Name}}
107-
<img class="ui image" src="{{AppSubUrl}}/attachments/{{.UUID}}" title='{{$.i18n.Tr "repo.issues.attachment.open_tab" .Name}}'>
108-
{{else}}
109-
<span class="ui image octicon octicon-desktop-download" title='{{$.i18n.Tr "repo.issues.attachment.download" .Name}}'></span>
110-
{{end}}
111-
</a>
112-
{{end}}
113-
</div>
114-
</div>
115-
{{end}}
116-
</div>
117-
</div>
118-
{{else if eq .Type 1}}
119-
<div class="event">
120-
<span class="octicon octicon-primitive-dot"></span>
121-
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
122-
<img src="{{.Poster.RelAvatarLink}}">
123-
</a>
124-
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.reopened_at" .EventTag $createdStr | Safe}}</span>
125-
</div>
126-
{{else if eq .Type 2}}
127-
<div class="event">
128-
<span class="octicon octicon-circle-slash"></span>
129-
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
130-
<img src="{{.Poster.RelAvatarLink}}">
131-
</a>
132-
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}}</span>
133-
</div>
134-
{{else if eq .Type 4}}
135-
<div class="event">
136-
<span class="octicon octicon-bookmark"></span>
137-
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
138-
<img src="{{.Poster.RelAvatarLink}}">
139-
</a>
140-
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}}</span>
141-
142-
<div class="detail">
143-
<span class="octicon octicon-git-commit"></span>
144-
<span class="text grey">{{.Content | Str2html}}</span>
145-
</div>
146-
</div>
147-
{{else if eq .Type 7}}
148-
{{if .Label}}
149-
<div class="event">
150-
<span class="octicon octicon-primitive-dot"></span>
151-
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
152-
<img src="{{.Poster.RelAvatarLink}}">
153-
</a>
154-
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
155-
{{if .Content}}{{$.i18n.Tr "repo.issues.add_label_at" .Label.ForegroundColor .Label.Color .Label.Name $createdStr | Safe}}{{else}}{{$.i18n.Tr "repo.issues.remove_label_at" .Label.ForegroundColor .Label.Color .Label.Name $createdStr | Safe}}{{end}}</span>
156-
</div>
157-
{{end}}
158-
{{else if eq .Type 8}}
159-
<div class="event">
160-
<span class="octicon octicon-primitive-dot"></span>
161-
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
162-
<img src="{{.Poster.RelAvatarLink}}">
163-
</a>
164-
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
165-
{{if gt .OldMilestoneID 0}}{{if gt .MilestoneID 0}}{{$.i18n.Tr "repo.issues.change_milestone_at" .OldMilestone.Name .Milestone.Name $createdStr | Safe}}{{else}}{{$.i18n.Tr "repo.issues.remove_milestone_at" .OldMilestone.Name $createdStr | Safe}}{{end}}{{else if gt .MilestoneID 0}}{{$.i18n.Tr "repo.issues.add_milestone_at" .Milestone.Name $createdStr | Safe}}{{end}}</span>
166-
</div>
167-
{{else if eq .Type 9}}
168-
<div class="event">
169-
<span class="octicon octicon-primitive-dot"></span>
170-
{{if gt .AssigneeID 0}}{{if eq .Poster.ID .AssigneeID}}<a class="ui avatar image" href="{{.Poster.HomeLink}}">
171-
<img src="{{.Poster.RelAvatarLink}}">
172-
</a> <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.self_assign_at" $createdStr | Safe}} </span>
173-
{{else}}<a class="ui avatar image" href="{{.Assignee.HomeLink}}">
174-
<img src="{{.Assignee.RelAvatarLink}}">
175-
</a><span class="text grey"><a href="{{.Assignee.HomeLink}}">{{.Assignee.Name}}</a> {{$.i18n.Tr "repo.issues.add_assignee_at" .Poster.Name $createdStr | Safe}} </span>{{end}}{{else if gt .OldAssigneeID 0}}
176-
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
177-
<img src="{{.Poster.RelAvatarLink}}">
178-
</a> <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.remove_assignee_at" $createdStr | Safe}} </span>{{end}}
179-
</div>
180-
{{else if eq .Type 10}}
181-
<div class="event">
182-
<span class="octicon octicon-primitive-dot"></span>
183-
</div>
184-
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
185-
<img src="{{.Poster.RelAvatarLink}}">
186-
</a>
187-
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
188-
{{$.i18n.Tr "repo.issues.change_title_at" .OldTitle .NewTitle $createdStr | Safe}}
189-
</span>
190-
{{else if eq .Type 11}}
191-
<div class="event">
192-
<span class="octicon octicon-primitive-dot"></span>
193-
</div>
194-
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
195-
<img src="{{.Poster.RelAvatarLink}}">
196-
</a>
197-
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
198-
{{$.i18n.Tr "repo.issues.delete_branch_at" .CommitSHA $createdStr | Safe}}
199-
</span>
200-
{{end}}
201-
202-
{{end}}
58+
{{ template "repo/issue/view_content/comments" . }}
20359

20460
{{if .Issue.IsPull}}
205-
<div class="comment merge box">
206-
<a class="avatar text
207-
{{if .Issue.PullRequest.HasMerged}}purple
208-
{{else if .Issue.IsClosed}}grey
209-
{{else if .IsPullReuqestBroken}}red
210-
{{else if .Issue.PullRequest.IsChecking}}yellow
211-
{{else if .Issue.PullRequest.CanAutoMerge}}green
212-
{{else}}red{{end}}"><span class="mega-octicon octicon-git-merge"></span></a>
213-
<div class="content">
214-
<div class="ui merge segment">
215-
{{if .Issue.PullRequest.HasMerged}}
216-
<div class="item text purple">
217-
{{$.i18n.Tr "repo.pulls.has_merged"}}
218-
</div>
219-
{{if .IsPullBranchDeletable}}
220-
<div class="ui divider"></div>
221-
<div>
222-
<a class="delete-button ui red button" href="" data-url="{{.DeleteBranchLink}}">{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</a>
223-
</div>
224-
{{end}}
225-
{{else if .Issue.IsClosed}}
226-
<div class="item text grey">
227-
{{$.i18n.Tr "repo.pulls.reopen_to_merge"}}
228-
</div>
229-
{{else if .IsPullReuqestBroken}}
230-
<div class="item text red">
231-
<span class="octicon octicon-x"></span>
232-
{{$.i18n.Tr "repo.pulls.data_broken"}}
233-
</div>
234-
{{else if .Issue.PullRequest.IsChecking}}
235-
<div class="item text yellow">
236-
<span class="octicon octicon-sync"></span>
237-
{{$.i18n.Tr "repo.pulls.is_checking"}}
238-
</div>
239-
{{else if .Issue.PullRequest.CanAutoMerge}}
240-
<div class="item text green">
241-
<span class="octicon octicon-check"></span>
242-
{{$.i18n.Tr "repo.pulls.can_auto_merge_desc"}}
243-
</div>
244-
{{if .IsRepositoryWriter}}
245-
<div class="ui divider"></div>
246-
<div>
247-
<form class="ui form" action="{{.Link}}/merge" method="post">
248-
{{.CsrfTokenHtml}}
249-
<button class="ui green button">
250-
<span class="octicon octicon-git-merge"></span> {{$.i18n.Tr "repo.pulls.merge_pull_request"}}
251-
</button>
252-
</form>
253-
</div>
254-
{{end}}
255-
{{else}}
256-
<div class="item text red">
257-
<span class="octicon octicon-x"></span>
258-
{{$.i18n.Tr "repo.pulls.cannot_auto_merge_desc"}}
259-
</div>
260-
<div class="item text grey">
261-
<span class="octicon octicon-info"></span>
262-
{{$.i18n.Tr "repo.pulls.cannot_auto_merge_helper"}}
263-
</div>
264-
{{end}}
265-
</div>
266-
</div>
267-
</div>
61+
{{ template "repo/issue/view_content/pull". }}
26862
{{end}}
26963

27064
{{if .IsSigned}}
@@ -304,108 +98,7 @@
30498
</ui>
30599
</div>
306100

307-
<div class="four wide column">
308-
<div class="ui segment metas">
309-
<div class="ui {{if not .IsRepositoryWriter}}disabled{{end}} floating jump select-label dropdown">
310-
<span class="text">
311-
<strong>{{.i18n.Tr "repo.issues.new.labels"}}</strong>
312-
<span class="octicon octicon-gear"></span>
313-
</span>
314-
<div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/labels">
315-
<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_labels"}}</div>
316-
{{range .Labels}}
317-
<a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon {{if .IsChecked}}octicon-check{{end}}"></span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name}}</a>
318-
{{end}}
319-
</div>
320-
</div>
321-
<div class="ui labels list">
322-
<span class="no-select item {{if .HasSelectedLabel}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_label"}}</span>
323-
{{range .Labels}}
324-
<div class="item">
325-
<a class="ui label {{if not .IsChecked}}hide{{end}}" id="label_{{.ID}}" href="{{$.RepoLink}}/issues?labels={{.ID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}">{{.Name | Sanitize}}</a>
326-
</div>
327-
328-
{{end}}
329-
</div>
330-
331-
<div class="ui divider"></div>
332-
333-
<div class="ui {{if not .IsRepositoryWriter}}disabled{{end}} floating jump select-milestone dropdown">
334-
<span class="text">
335-
<strong>{{.i18n.Tr "repo.issues.new.milestone"}}</strong>
336-
<span class="octicon octicon-gear"></span>
337-
</span>
338-
<div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/milestone">
339-
<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_milestone"}}</div>
340-
{{if .OpenMilestones}}
341-
<div class="divider"></div>
342-
<div class="header">
343-
<i class="octicon octicon-milestone"></i>
344-
{{.i18n.Tr "repo.issues.new.open_milestone"}}
345-
</div>
346-
{{range .OpenMilestones}}
347-
<div class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}"> {{.Name | Sanitize}}</div>
348-
{{end}}
349-
{{end}}
350-
{{if .ClosedMilestones}}
351-
<div class="divider"></div>
352-
<div class="header">
353-
<i class="octicon octicon-milestone"></i>
354-
{{.i18n.Tr "repo.issues.new.closed_milestone"}}
355-
</div>
356-
{{range .ClosedMilestones}}
357-
<a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}"> {{.Name | Sanitize}}</a>
358-
{{end}}
359-
{{end}}
360-
</div>
361-
</div>
362-
<div class="ui select-milestone list">
363-
<span class="no-select item {{if .Issue.Milestone}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_milestone"}}</span>
364-
<div class="selected">
365-
{{if .Issue.Milestone}}
366-
<a class="item" href="{{.RepoLink}}/issues?milestone={{.Issue.Milestone.ID}}"> {{.Issue.Milestone.Name | Sanitize}}</a>
367-
{{end}}
368-
</div>
369-
</div>
370-
371-
<div class="ui divider"></div>
372-
373-
<input id="assignee_id" name="assignee_id" type="hidden" value="{{.assignee_id}}">
374-
<div class="ui {{if not .IsRepositoryWriter}}disabled{{end}} floating jump select-assignee dropdown">
375-
<span class="text">
376-
<strong>{{.i18n.Tr "repo.issues.new.assignee"}}</strong>
377-
<span class="octicon octicon-gear"></span>
378-
</span>
379-
<div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/assignee">
380-
<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_assignee"}}</div>
381-
{{range .Assignees}}
382-
<div class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?assignee={{.ID}}" data-avatar="{{.RelAvatarLink}}"><img src="{{.RelAvatarLink}}"> {{.Name}}</div>
383-
{{end}}
384-
</div>
385-
</div>
386-
<div class="ui select-assignee list">
387-
<span class="no-select item {{if .Issue.Assignee}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_assignee"}}</span>
388-
<div class="selected">
389-
{{if .Issue.Assignee}}
390-
<a class="item" href="{{$.RepoLink}}/issues?assignee={{.Issue.Assignee.ID}}"><img class="ui avatar image" src="{{.Issue.Assignee.RelAvatarLink}}"> {{.Issue.Assignee.Name}}</a>
391-
{{end}}
392-
</div>
393-
</div>
394-
395-
<div class="ui divider"></div>
396-
397-
<div class="ui participants">
398-
<span class="text"><strong>{{.i18n.Tr "repo.issues.num_participants" .NumParticipants}}</strong></span>
399-
<div>
400-
{{range .Participants}}
401-
<a href="{{.HomeLink}}">
402-
<img class="ui avatar image poping up" src="{{.RelAvatarLink}}" data-content="{{.DisplayName}}" data-position="top center" data-variation="small inverted">
403-
</a>
404-
{{end}}
405-
</div>
406-
</div>
407-
</div>
408-
</div>
101+
{{ template "repo/issue/view_content/sidebar" . }}
409102
</div>
410103

411104
<div class="hide" id="edit-content-form">

0 commit comments

Comments
 (0)