add comment form UI

3 files changed, 41 insertions, 17 deletions

diff --git a/templates/repo/issue/comment_tab.tmpl b/templates/repo/issue/comment_tab.tmpl
new file mode 100644
index 0000000000..969045e9a9
--- /dev/null
+++ b/templates/repo/issue/comment_tab.tmpl
@@ -0,0 +1,16 @@
+<div class="field">
+  <div class="ui top attached tabular menu">
+    <a class="active item" data-tab="write">{{.i18n.Tr "repo.release.write"}}</a>
+    <a class="item" data-tab="preview" data-url="/api/v1/markdown" data-context="{{.RepoLink}}">{{.i18n.Tr "repo.release.preview"}}</a>
+  </div>
+  <div class="ui bottom attached active tab segment" data-tab="write">
+    <textarea name="content"></textarea>
+  </div>
+  <div class="ui bottom attached tab segment markdown" data-tab="preview">
+    {{.i18n.Tr "repo.release.loading"}}
+  </div>
+</div>
+{{if .IsAttachmentEnabled}}
+<div class="attachments"></div>
+<div class="ui basic button dropzone" id="dropzone" data-upload-url="/issues/attachments" data-accepts="{{.AttachmentAllowedTypes}}" data-max-file="{{.AttachmentMaxFiles}}" data-max-size="2" data-default-message="{{.i18n.Tr "dropzone.default_message"}}" data-invalid-input-type="{{.i18n.Tr "dropzone.invalid_input_type"}}" data-file-too-big="{{.i18n.Tr "dropzone.file_too_big"}}" data-remove-file="{{.i18n.Tr "dropzone.remove_file"}}"></div>
+{{end}}
\ No newline at end of file
diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl
index dfd86e8491..79e3dd09de 100644
--- a/templates/repo/issue/new_form.tmpl
+++ b/templates/repo/issue/new_form.tmpl
@@ -15,22 +15,7 @@
 		      <div class="field">
 		      	<input name="title" placeholder="{{.i18n.Tr "repo.milestones.title"}}" value="{{.title}}" autofocus required>
 		      </div>
-		      <div class="field">
-			      <div class="ui top attached tabular menu">
-		          <a class="active item" data-tab="write">{{.i18n.Tr "repo.release.write"}}</a>
-		          <a class="item" data-tab="preview" data-url="/api/v1/markdown" data-context="{{.RepoLink}}">{{.i18n.Tr "repo.release.preview"}}</a>
-			      </div>
-			      <div class="ui bottom attached active tab segment" data-tab="write">
-		          <textarea name="content"></textarea>
-		        </div>
-			      <div class="ui bottom attached tab segment markdown" data-tab="preview">
-			        {{.i18n.Tr "repo.release.loading"}}
-			      </div>
-		      </div>
-		      {{if .IsAttachmentEnabled}}
-		      <div class="attachments"></div>
-		      <div class="ui basic button dropzone" id="dropzone" data-upload-url="/issues/attachments" data-accepts="{{.AttachmentAllowedTypes}}" data-max-file="{{.AttachmentMaxFiles}}" data-max-size="2" data-default-message="{{.i18n.Tr "dropzone.default_message"}}" data-invalid-input-type="{{.i18n.Tr "dropzone.invalid_input_type"}}" data-file-too-big="{{.i18n.Tr "dropzone.file_too_big"}}" data-remove-file="{{.i18n.Tr "dropzone.remove_file"}}"></div>
-		      {{end}}
+					{{template "repo/issue/comment_tab" .}}
 		      <div class="text right">
 						<button class="ui green button">
 							{{.i18n.Tr "repo.issues.create"}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index f5efce5e35..be80cb1555 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -32,19 +32,42 @@
 					  </div>
 					</div>
 			    <div class="ui attached segment markdown">
+			    	{{if .Issue.RenderedContent}}
 						{{.Issue.RenderedContent|Str2html}}
+			    	{{else}}
+						<span class="no-content">{{.i18n.Tr "repo.issues.no_content"}}</span>
+			    	{{end}}
 	  			</div>
 	  			{{if .Issue.Attachments}}
 					<div class="ui bottom attached segment">
 						<div class="ui small images">
 							{{range .Issue.Attachments}}
-						  <a href="/attachments/{{.UUID}}"><img class="ui image" src="/attachments/{{.UUID}}"></a>
+						  <a target="_blank" href="/attachments/{{.UUID}}"><img class="ui image" src="/attachments/{{.UUID}}"></a>
 						  {{end}}
 						</div>
 					</div>
 	  			{{end}}
 		    </div>
   		</div>
+
+		  <div class="comment form">
+		    <a class="avatar" href="{{.SignedUser.HomeLink}}">
+		      <img src="{{.SignedUser.AvatarLink}}">
+		    </a>
+		    <div class="content">
+			    <form class="ui segment form" action="{{.Link}}" method="post">
+						{{template "repo/issue/comment_tab" .}}
+			      <div class="text right">
+							<div class="ui red basic button" data-close="{{.i18n.Tr "repo.issues.close_issue"}}" data-close-and-comment="{{.i18n.Tr "repo.issues.close_comment_issue"}}">
+								{{.i18n.Tr "repo.issues.close_issue"}}
+							</div>
+							<div class="ui green button">
+								{{.i18n.Tr "repo.issues.create_comment"}}
+							</div>
+			      </div>
+			    </form>
+		    </div>
+		  </div>
   	</ui>
 	</div>