Refactor repo/issue/view_content.tmpl (#1276)

1 files changed, 3 insertions, 310 deletions

diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 4e35614dbb..7de9502242 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -55,216 +55,10 @@
 				</div>
 			</div>
 
-			{{range .Issue.Comments}}
-				{{ $createdStr:= TimeSince .Created $.Lang }}
-
-				<!-- 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE_REF, 4 = COMMIT_REF, 5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL -->
-				{{if eq .Type 0}}
-					<div class="comment" id="{{.HashTag}}">
-						<a class="avatar" {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>
-							<img src="{{.Poster.RelAvatarLink}}">
-						</a>
-						<div class="content">
-							<div class="ui top attached header">
-								<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>
-								<div class="ui right actions">
-									{{if gt .ShowTag 0}}
-										<div class="item tag">
-											{{if eq .ShowTag 1}}
-												{{$.i18n.Tr "repo.issues.poster"}}
-											{{else if eq .ShowTag 2}}
-												{{$.i18n.Tr "repo.issues.collaborator"}}
-											{{else if eq .ShowTag 3}}
-												{{$.i18n.Tr "repo.issues.owner"}}
-											{{end}}
-										</div>
-									{{end}}
-									{{if or $.IsRepositoryAdmin (eq .Poster.ID $.SignedUserID)}}
-										<div class="item action">
-											<a class="edit-content" href="#"><i class="octicon octicon-pencil"></i></a>
-											<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>
-										</div>
-									{{end}}
-								</div>
-							</div>
-							<div class="ui attached segment">
-								<div class="render-content markdown has-emoji">
-									{{if .RenderedContent}}
-										{{.RenderedContent|Str2html}}
-									{{else}}
-										<span class="no-content">{{$.i18n.Tr "repo.issues.no_content"}}</span>
-									{{end}}
-								</div>
-								<div class="raw-content hide">{{.Content}}</div>
-								<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>
-							</div>
-							{{if .Attachments}}
-								<div class="ui bottom attached segment">
-									<div class="ui small images">
-										{{range .Attachments}}
-											<a target="_blank" rel="noopener" href="{{AppSubUrl}}/attachments/{{.UUID}}">
-												{{if FilenameIsImage .Name}}
-													<img class="ui image" src="{{AppSubUrl}}/attachments/{{.UUID}}" title='{{$.i18n.Tr "repo.issues.attachment.open_tab" .Name}}'>
-												{{else}}
-													<span class="ui image octicon octicon-desktop-download" title='{{$.i18n.Tr "repo.issues.attachment.download" .Name}}'></span>
-												{{end}}
-											</a>
-										{{end}}
-									</div>
-								</div>
-							{{end}}
-						</div>
-					</div>
-				{{else if eq .Type 1}}
-					<div class="event">
-						<span class="octicon octicon-primitive-dot"></span>
-						<a class="ui avatar image" href="{{.Poster.HomeLink}}">
-							<img src="{{.Poster.RelAvatarLink}}">
-						</a>
-						<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.reopened_at" .EventTag $createdStr | Safe}}</span>
-					</div>
-				{{else if eq .Type 2}}
-					<div class="event">
-						<span class="octicon octicon-circle-slash"></span>
-						<a class="ui avatar image" href="{{.Poster.HomeLink}}">
-							<img src="{{.Poster.RelAvatarLink}}">
-						</a>
-						<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}}</span>
-					</div>
-				{{else if eq .Type 4}}
-					<div class="event">
-						<span class="octicon octicon-bookmark"></span>
-						<a class="ui avatar image" href="{{.Poster.HomeLink}}">
-							<img src="{{.Poster.RelAvatarLink}}">
-						</a>
-						<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}}</span>
-
-						<div class="detail">
-							<span class="octicon octicon-git-commit"></span>
-							<span class="text grey">{{.Content | Str2html}}</span>
-						</div>
-					</div>
-				{{else if eq .Type 7}}
-					{{if .Label}}
-						<div class="event">
-							<span class="octicon octicon-primitive-dot"></span>
-							<a class="ui avatar image" href="{{.Poster.HomeLink}}">
-								<img src="{{.Poster.RelAvatarLink}}">
-							</a>
-							<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
-							{{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>
-						</div>
-					{{end}}
-				{{else if eq .Type 8}}
-					<div class="event">
-						<span class="octicon octicon-primitive-dot"></span>
-						<a class="ui avatar image" href="{{.Poster.HomeLink}}">
-							<img src="{{.Poster.RelAvatarLink}}">
-						</a>
-						<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
-						{{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>
-					</div>
-				{{else if eq .Type 9}}
-					<div class="event">
-						<span class="octicon octicon-primitive-dot"></span>
-						{{if gt .AssigneeID 0}}{{if eq .Poster.ID .AssigneeID}}<a class="ui avatar image" href="{{.Poster.HomeLink}}">
-							<img src="{{.Poster.RelAvatarLink}}">
-						</a> <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.self_assign_at" $createdStr | Safe}} </span>
-						{{else}}<a class="ui avatar image" href="{{.Assignee.HomeLink}}">
-							<img src="{{.Assignee.RelAvatarLink}}">
-						</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}}
-						<a class="ui avatar image" href="{{.Poster.HomeLink}}">
-							<img src="{{.Poster.RelAvatarLink}}">
-						</a> <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.remove_assignee_at" $createdStr | Safe}} </span>{{end}}
-					</div>
-				{{else if eq .Type 10}}
-					<div class="event">
-						<span class="octicon octicon-primitive-dot"></span>
-					</div>
-					<a class="ui avatar image" href="{{.Poster.HomeLink}}">
-						<img src="{{.Poster.RelAvatarLink}}">
-					</a>
-					<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
-					{{$.i18n.Tr "repo.issues.change_title_at" .OldTitle .NewTitle $createdStr | Safe}}
-					</span>
-				{{else if eq .Type 11}}
-					<div class="event">
-						<span class="octicon octicon-primitive-dot"></span>
-					</div>
-					<a class="ui avatar image" href="{{.Poster.HomeLink}}">
-						<img src="{{.Poster.RelAvatarLink}}">
-					</a>
-					<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
-					{{$.i18n.Tr "repo.issues.delete_branch_at" .CommitSHA $createdStr | Safe}}
-					</span>
-				{{end}}
-
-			{{end}}
+			{{ template "repo/issue/view_content/comments" . }}
 
 			{{if .Issue.IsPull}}
-				<div class="comment merge box">
-					<a class="avatar text
-					{{if .Issue.PullRequest.HasMerged}}purple
-					{{else if .Issue.IsClosed}}grey
-					{{else if .IsPullReuqestBroken}}red
-					{{else if .Issue.PullRequest.IsChecking}}yellow
-					{{else if .Issue.PullRequest.CanAutoMerge}}green
-					{{else}}red{{end}}"><span class="mega-octicon octicon-git-merge"></span></a>
-					<div class="content">
-						<div class="ui merge segment">
-							{{if .Issue.PullRequest.HasMerged}}
-								<div class="item text purple">
-									{{$.i18n.Tr "repo.pulls.has_merged"}}
-								</div>
-								{{if .IsPullBranchDeletable}}
-									<div class="ui divider"></div>
-									<div>
-										<a class="delete-button ui red button" href="" data-url="{{.DeleteBranchLink}}">{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</a>
-									</div>
-								{{end}}
-							{{else if .Issue.IsClosed}}
-								<div class="item text grey">
-									{{$.i18n.Tr "repo.pulls.reopen_to_merge"}}
-								</div>
-							{{else if .IsPullReuqestBroken}}
-								<div class="item text red">
-									<span class="octicon octicon-x"></span>
-									{{$.i18n.Tr "repo.pulls.data_broken"}}
-								</div>
-							{{else if .Issue.PullRequest.IsChecking}}
-								<div class="item text yellow">
-									<span class="octicon octicon-sync"></span>
-									{{$.i18n.Tr "repo.pulls.is_checking"}}
-								</div>
-							{{else if .Issue.PullRequest.CanAutoMerge}}
-								<div class="item text green">
-									<span class="octicon octicon-check"></span>
-									{{$.i18n.Tr "repo.pulls.can_auto_merge_desc"}}
-								</div>
-								{{if .IsRepositoryWriter}}
-									<div class="ui divider"></div>
-									<div>
-										<form class="ui form" action="{{.Link}}/merge" method="post">
-											{{.CsrfTokenHtml}}
-											<button class="ui green button">
-												<span class="octicon octicon-git-merge"></span> {{$.i18n.Tr "repo.pulls.merge_pull_request"}}
-											</button>
-										</form>
-									</div>
-								{{end}}
-							{{else}}
-								<div class="item text red">
-									<span class="octicon octicon-x"></span>
-									{{$.i18n.Tr "repo.pulls.cannot_auto_merge_desc"}}
-								</div>
-								<div class="item text grey">
-									<span class="octicon octicon-info"></span>
-									{{$.i18n.Tr "repo.pulls.cannot_auto_merge_helper"}}
-								</div>
-							{{end}}
-						</div>
-					</div>
-				</div>
+				{{ template "repo/issue/view_content/pull". }}
 			{{end}}
 
 			{{if .IsSigned}}
@@ -304,108 +98,7 @@
 		</ui>
 	</div>
 
-	<div class="four wide column">
-		<div class="ui segment metas">
-			<div class="ui {{if not .IsRepositoryWriter}}disabled{{end}} floating jump select-label dropdown">
-				<span class="text">
-					<strong>{{.i18n.Tr "repo.issues.new.labels"}}</strong>
-					<span class="octicon octicon-gear"></span>
-				</span>
-				<div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/labels">
-					<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_labels"}}</div>
-					{{range .Labels}}
-						<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>
-					{{end}}
-				</div>
-			</div>
-			<div class="ui labels list">
-				<span class="no-select item {{if .HasSelectedLabel}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_label"}}</span>
-				{{range .Labels}}
-					<div class="item">
-						<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>
-					</div>
-
-				{{end}}
-			</div>
-
-			<div class="ui divider"></div>
-
-			<div class="ui {{if not .IsRepositoryWriter}}disabled{{end}} floating jump select-milestone dropdown">
-				<span class="text">
-					<strong>{{.i18n.Tr "repo.issues.new.milestone"}}</strong>
-					<span class="octicon octicon-gear"></span>
-				</span>
-				<div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/milestone">
-					<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_milestone"}}</div>
-					{{if .OpenMilestones}}
-						<div class="divider"></div>
-						<div class="header">
-							<i class="octicon octicon-milestone"></i>
-							{{.i18n.Tr "repo.issues.new.open_milestone"}}
-						</div>
-						{{range .OpenMilestones}}
-							<div class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}"> {{.Name | Sanitize}}</div>
-						{{end}}
-					{{end}}
-					{{if .ClosedMilestones}}
-						<div class="divider"></div>
-						<div class="header">
-							<i class="octicon octicon-milestone"></i>
-							{{.i18n.Tr "repo.issues.new.closed_milestone"}}
-						</div>
-						{{range .ClosedMilestones}}
-							<a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}"> {{.Name | Sanitize}}</a>
-						{{end}}
-					{{end}}
-				</div>
-			</div>
-			<div class="ui select-milestone list">
-				<span class="no-select item {{if .Issue.Milestone}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_milestone"}}</span>
-				<div class="selected">
-					{{if .Issue.Milestone}}
-						<a class="item" href="{{.RepoLink}}/issues?milestone={{.Issue.Milestone.ID}}"> {{.Issue.Milestone.Name | Sanitize}}</a>
-					{{end}}
-				</div>
-			</div>
-
-			<div class="ui divider"></div>
-
-			<input id="assignee_id" name="assignee_id" type="hidden" value="{{.assignee_id}}">
-			<div class="ui {{if not .IsRepositoryWriter}}disabled{{end}} floating jump select-assignee dropdown">
-				<span class="text">
-					<strong>{{.i18n.Tr "repo.issues.new.assignee"}}</strong>
-					<span class="octicon octicon-gear"></span>
-				</span>
-				<div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/assignee">
-					<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_assignee"}}</div>
-					{{range .Assignees}}
-						<div class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?assignee={{.ID}}" data-avatar="{{.RelAvatarLink}}"><img src="{{.RelAvatarLink}}"> {{.Name}}</div>
-					{{end}}
-				</div>
-			</div>
-			<div class="ui select-assignee list">
-				<span class="no-select item {{if .Issue.Assignee}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_assignee"}}</span>
-				<div class="selected">
-					{{if .Issue.Assignee}}
-						<a class="item" href="{{$.RepoLink}}/issues?assignee={{.Issue.Assignee.ID}}"><img class="ui avatar image" src="{{.Issue.Assignee.RelAvatarLink}}"> {{.Issue.Assignee.Name}}</a>
-					{{end}}
-				</div>
-			</div>
-
-			<div class="ui divider"></div>
-
-			<div class="ui participants">
-				<span class="text"><strong>{{.i18n.Tr "repo.issues.num_participants" .NumParticipants}}</strong></span>
-				<div>
-					{{range .Participants}}
-						<a href="{{.HomeLink}}">
-							<img class="ui avatar image poping up" src="{{.RelAvatarLink}}" data-content="{{.DisplayName}}" data-position="top center" data-variation="small inverted">
-						</a>
-					{{end}}
-				</div>
-			</div>
-		</div>
-	</div>
+	{{ template "repo/issue/view_content/sidebar" . }}
 </div>
 
 <div class="hide" id="edit-content-form">