2 files changed, 60 insertions, 43 deletions
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index 86860fe8f4..1ea626ab84 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -23,28 +23,23 @@
 				{{else}}
 					<span class="text grey"><a {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.GetDisplayName}}</a> {{$.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}}</span>
 				{{end}}
-                    {{if not $.Repository.IsArchived}}
-                        <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}}
-                            {{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID) }}
-                            {{if or $.Permission.IsAdmin (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>
-                    {{end}}
+					{{if not $.Repository.IsArchived}}
+						<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}}
+							{{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID) }}
+							{{template "repo/issue/view_content/context_menu" Dict "ctx" $ "item" . "delete" true "diff" false }}
+						</div>
+					{{end}}
 				</div>
 				<div class="ui attached segment">
 					<div class="render-content markdown has-emoji">
@@ -54,7 +49,7 @@
 							<span class="no-content">{{$.i18n.Tr "repo.issues.no_content"}}</span>
 						{{end}}
 					</div>
-					<div class="raw-content hide">{{.Content}}</div>
+					<div id="comment-{{.ID}}" 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}}" data-attachment-url="{{$.RepoLink}}/comments/{{.ID}}/attachments"></div>
 				</div>
 				{{$reactions := .Reactions.GroupByType}}
@@ -277,29 +272,29 @@
 			<span class="octicon octicon-primitive-dot"></span>
 			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
 				<img src="{{.Poster.RelAvatarLink}}">
-		 	</a>
-		 	<span class="text grey">
-			 	{{$.i18n.Tr "repo.issues.dependency.added_dependency" .Poster.HomeLink (.Poster.GetDisplayName|Escape) $createdStr | Safe}}
-		 	</span>
-		 	<div class="detail">
+			</a>
+			<span class="text grey">
+				{{$.i18n.Tr "repo.issues.dependency.added_dependency" .Poster.HomeLink (.Poster.GetDisplayName|Escape) $createdStr | Safe}}
+			</span>
+			<div class="detail">
 				<span class="octicon octicon-plus"></span>
-			 	<span class="text grey"><a href="{{$.RepoLink}}/issues/{{.DependentIssue.Index}}">#{{.DependentIssue.Index}} {{.DependentIssue.Title}}</a></span>
-		 	</div>
-	 	</div>
+				<span class="text grey"><a href="{{$.RepoLink}}/issues/{{.DependentIssue.Index}}">#{{.DependentIssue.Index}} {{.DependentIssue.Title}}</a></span>
+			</div>
+		</div>
 	{{else if eq .Type 20}}
 		<div class="event" id="{{.HashTag}}">
-		 	<span class="octicon octicon-primitive-dot"></span>
-		 	<a class="ui avatar image" href="{{.Poster.HomeLink}}">
-			 	<img src="{{.Poster.RelAvatarLink}}">
-		 	</a>
-		 	<span class="text grey">
-			 	{{$.i18n.Tr "repo.issues.dependency.removed_dependency" .Poster.HomeLink (.Poster.GetDisplayName|Escape) $createdStr | Safe}}
-		 	</span>
-		 	<div class="detail">
-			 	<span class="text grey octicon octicon-trashcan"></span>
-			 	<span class="text grey"><a href="{{$.RepoLink}}/issues/{{.DependentIssue.Index}}">#{{.DependentIssue.Index}} {{.DependentIssue.Title}}</a></span>
-		 	</div>
-	 	</div>
+			<span class="octicon octicon-primitive-dot"></span>
+			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
+				<img src="{{.Poster.RelAvatarLink}}">
+			</a>
+			<span class="text grey">
+				{{$.i18n.Tr "repo.issues.dependency.removed_dependency" .Poster.HomeLink (.Poster.GetDisplayName|Escape) $createdStr | Safe}}
+			</span>
+			<div class="detail">
+				<span class="text grey octicon octicon-trashcan"></span>
+				<span class="text grey"><a href="{{$.RepoLink}}/issues/{{.DependentIssue.Index}}">#{{.DependentIssue.Index}} {{.DependentIssue.Title}}</a></span>
+			</div>
+		</div>
 	{{else if eq .Type 22}}
 		<div class="event" id="{{.HashTag}}">
 			<span class="octicon octicon-{{.Review.Type.Icon}} issue-symbol"></span>
diff --git a/templates/repo/issue/view_content/context_menu.tmpl b/templates/repo/issue/view_content/context_menu.tmpl
new file mode 100644
index 0000000000..468e004c91
--- /dev/null
+++ b/templates/repo/issue/view_content/context_menu.tmpl
@@ -0,0 +1,22 @@
+{{if .ctx.IsSigned}}
+<div class="item action ui pointing top right custom dropdown context-dropdown">
+	<a class="context-menu">
+		<i class="fa fa-ellipsis-h"></i>
+	</a>
+	<div class="menu">
+		{{if .diff}}
+			<div class="item context clipboard" data-clipboard-text="{{Printf "%s%s/pulls/%d/files#%s" AppUrl .ctx.Repository.FullName .ctx.Issue.Index .item.HashTag}}">{{.ctx.i18n.Tr "repo.issues.context.copy_link"}}</div>
+		{{else}}
+			<div class="item context clipboard" data-clipboard-text="{{Printf "%s%s/issues/%d#%s" AppUrl .ctx.Repository.FullName .ctx.Issue.Index .item.HashTag}}">{{.ctx.i18n.Tr "repo.issues.context.copy_link"}}</div>
+		{{end}}
+		<div class="item context quote-reply {{if .diff}}quote-reply-diff{{end}}" data-target="{{.item.ID}}">{{.ctx.i18n.Tr "repo.issues.context.quote_reply"}}</div>
+		{{if or .ctx.Permission.IsAdmin (eq .item.Poster.ID .ctx.SignedUserID)}}
+			<div class="divider"></div>
+			<div class="item context edit-content">{{.ctx.i18n.Tr "repo.issues.context.edit"}}</div>
+			{{if .delete}}
+				<div class="item context delete-comment" data-comment-id={{.item.HashTag}} data-url="{{.ctx.RepoLink}}/comments/{{.item.ID}}/delete" data-locale="{{.ctx.i18n.Tr "repo.issues.delete_comment_confirm"}}">{{.ctx.i18n.Tr "repo.issues.context.delete"}}</div>
+			{{end}}
+		{{end}}
+	</div>
+</div>
+{{end}}