finish view issue without comments and ops

5 files changed, 441 insertions, 286 deletions

diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 640112e4a6..9ec4cb6551 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -85,7 +85,7 @@
       	{{end}}
 
         <p class="desc">
-        	{{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.Name|Str2html}}
+        	{{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.Name | Safe}}
 	        {{if .Milestone}}
 					<a class="milestone" href="{{$.RepoLink}}/issues?type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.Milestone.ID}}">
 						<span class="octicon octicon-milestone"></span> {{.Milestone.Name}}
diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl
index 7b89e5fad1..dfd86e8491 100644
--- a/templates/repo/issue/new_form.tmpl
+++ b/templates/repo/issue/new_form.tmpl
@@ -41,7 +41,6 @@
 		</div>
 	</div>
 
-	{{if .IsRepositoryAdmin}}
 	<div class="four wide column">
 		<div class="ui segment metas">
 			<input id="label_ids" name="label_ids" type="hidden" value="{{.label_ids}}">
@@ -130,5 +129,4 @@
 			</div>
 		</div>
 	</div>
-	{{end}}
 </form>
\ No newline at end of file
diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl
index d13364aa54..129bfd0859 100644
--- a/templates/repo/issue/view.tmpl
+++ b/templates/repo/issue/view.tmpl
@@ -1,284 +1,15 @@
-{{template "base/head_old" .}}
-{{template "base/navbar" .}}
-{{template "repo/nav" .}}
-{{template "repo/toolbar" .}}
-<div id="body" class="container">
-    <div id="issue" data-id="{{.Issue.ID}}">
-        <div id="issue-{{.Issue.ID}}" class="issue-whole issue-is-opening">
-            <div class="issue-wrap col-md-10">
-                <div class="issue-head clearfix">
-                    <div class="number pull-right">#{{.Issue.Index}}</div>
-                    <a class="author pull-left" href="{{AppSubUrl}}/{{.Issue.Poster.Name}}"><img class="avatar" src="{{.Issue.Poster.AvatarLink}}" alt="" width="30"/></a>
-                    <h1 class="title pull-left">{{.Issue.Name}}</h1>
-                    <input id="issue-edit-title" class="form-control input-lg pull-left hidden" type="text" value="{{.Issue.Name}}" data-ajax-rel="issue-edit-save" data-ajax-val="val" data-ajax-field="title"/>
-                    <input type="hidden" value="{{.Issue.ID}}" data-ajax-rel="issue-edit-save" data-ajax-val="val" data-ajax-field="issue_id"/>
-                    <p class="info pull-left">
-                        {{if .IsIssueOwner}}<a class="btn btn-default pull-right issue-edit" href="#" id="issue-edit-btn">Edit</a>
-                        <a class="btn btn-danger pull-right issue-edit-cancel hidden" href="#">Cancel</a>
-                        <a class="btn btn-primary pull-right issue-edit-save hidden" href="#" data-ajax="{{.RepoLink}}/issues/{{.Issue.Index}}" data-ajax-name="issue-edit-save" data-ajax-method="post">Save</a>{{end}}
-                        <span class="status label label-{{if .Issue.IsClosed}}danger{{else}}success{{end}}">{{if .Issue.IsClosed}}Closed{{else}}Open{{end}}</span>
-                        <a href="{{AppSubUrl}}/{{.Issue.Poster.Name}}" class="author"><strong>{{.Issue.Poster.Name}}</strong></a> opened this issue
-                        <span class="time">{{TimeSince .Issue.Created $.Lang}}</span> · {{.Issue.NumComments}} comments
-                    </p>
-                </div>
-                <div class="issue-main">
-                    <div class="panel panel-default issue-content">
-                        <div class="panel-body">
-                            <div class="content markdown">
-                                {{Str2html .Issue.RenderedContent}}
-                            </div>
-                            <div class="issue-edit-content hidden">
-                                <div class="form-group">
-                                    <div class="md-help pull-right">Content with <a href="https://help.github.com/articles/markdown-basics">Markdown</a>
-                                    </div>
-                                    <ul class="nav nav-tabs" data-init="tabs">
-                                        <li class="issue-write active"><a href="#issue-edit-textarea" data-toggle="tab">Write</a></li>
-                                        <li class="issue-preview"><a href="#issue-edit-preview" data-toggle="tab" data-ajax="/api/v1/markdown" data-ajax-name="issue-edit-preview" data-ajax-context="{{.RepoLink}}" data-ajax-method="post" data-preview="#issue-edit-preview">Preview</a></li>
-                                    </ul>
-                                    <div class="tab-content">
-                                        <div class="tab-pane active" id="issue-edit-textarea">
-                                            <div class="form-group">
-                                                <input type="hidden" value="1" name="issueIndex">
-                                                <textarea class="form-control" name="content" id="issue-edit-content" rows="10" placeholder="Write some content" data-ajax-rel="issue-edit-preview" data-ajax-val="val" data-ajax-field="text">{{.Issue.Content}}</textarea>
-                                            </div>
-                                        </div>
-                                        <div class="tab-pane issue-preview-content" id="issue-edit-preview">Loading...</div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        {{with $attachments := .Issue.Attachments}}
-                        {{if $attachments}}
-                        <div class="attachments">
-                            <span class="attachment-label label label-info">Attachments:</span>
-
-                            {{range $attachments}}
-                            <a class="attachment label label-default" href="/attachments/{{.UUID}}">{{.Name}}</a>
-                            {{end}}
-                        </div>
-                        {{end}}
-                        {{end}}
-                    </div>
-                    {{range .Comments}}
-                    {{/* 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE, 4 = COMMIT, 5 = PULL */}}
-                    {{if eq .Type 0}}
-                    <div class="issue-child" id="issue-comment-{{.Id}}">
-                        <a class="user pull-left" href="{{AppSubUrl}}/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a>
-                        <div class="issue-content panel panel-default">
-                            <div class="panel-heading">
-                                <a href="{{AppSubUrl}}/{{.Poster.Name}}" class="user">{{.Poster.Name}}</a> commented <span class="time">{{TimeSince .Created $.Lang}}</span>
-                                <!-- <a class="issue-comment-del pull-right issue-action" href="#" title="Edit Comment"><i class="fa fa-times-circle"></i></a>
-                                <a class="issue-comment-edit pull-right issue-action" href="#" title="Remove Comment" data-url="{remove-link}"><i class="fa fa-edit"></i></a> -->
-                                {{if eq .Poster.Id $.Owner.Id}}
-                                <span class="role label label-default pull-right">Owner</span>
-                                {{end}}
-                            </div>
-                            <div class="panel-body markdown">
-                                {{if len .Content}}
-                                {{Str2html .Content}}
-                                {{else}}
-                                <i>No comment entered</i>
-                                {{end}}
-                            </div>
-                            {{with $attachments := .Attachments}}
-                            {{if $attachments}}
-                            <div class="attachments">
-                                <span class="attachment-label label label-info">Attachments:</span>
-
-                                {{range $attachments}}
-                                <a class="attachment label label-default" href="{{.IssueId}}/attachment/{{.Id}}">{{.Name}}</a>
-                                {{end}}
-                            </div>
-                            {{end}}
-                            {{end}}
-                        </div>
-                    </div>
-                    {{else if eq .Type 1}}
-                    <div class="issue-child issue-opened">
-                        <a class="user pull-left" href="{{AppSubUrl}}/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt="" /></a>
-                        <div class="issue-content">
-                            <a class="user pull-left" href="{{AppSubUrl}}/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-success">Reopened</span> this issue <span class="time">{{TimeSince .Created $.Lang}}</span>
-                        </div>
-                    </div>
-                    {{else if eq .Type 2}}
-                    <div class="issue-child issue-closed">
-                        <a class="user pull-left" href="{{AppSubUrl}}/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a>
-                        <div class="issue-content">
-                            <a class="user pull-left" href="{{AppSubUrl}}/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-danger">Closed</span> this issue <span class="time">{{TimeSince .Created $.Lang}}</span>
-                        </div>
-                    </div>
-                    {{else if eq .Type 4}}
-                    <div class="issue-child issue-reference issue-reference-commit">
-                        <a class="user pull-left" href="{{AppSubUrl}}/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a>
-                        <div class="issue-content">
-                            <a class="user pull-left" href="{{AppSubUrl}}/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-primary">Referenced</span> this issue <span class="time">{{TimeSince .Created $.Lang}}</span>
-                            <p>
-                                <a class="user pull-left" href="{{AppSubUrl}}/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a>
-                                {{.ContentHtml}}
-                            </p>
-                        </div>
-                    </div>
-                    {{end}}
-                    {{end}}
-                    <hr class="issue-line"/>
-                    {{if .SignedUser}}<div class="issue-child issue-reply">
-                    <a class="user pull-left" href="{{AppSubUrl}}/{{.SignedUser.Name}}"><img class="avatar" src="{{.SignedUser.AvatarLink}}" alt=""/></a>
-                    <form class="panel panel-default issue-content" action="{{.RepoLink}}/comment/new" method="post" enctype="multipart/form-data">
-                        {{.CsrfTokenHtml}}
-                        <div class="panel-body">
-                            <div class="form-group">
-                                <div class="md-help pull-right">Content with <a href="https://help.github.com/articles/markdown-basics">Markdown</a>
-                                </div>
-                                <ul class="nav nav-tabs" data-init="tabs">
-                                    <li class="active issue-write"><a href="#issue-textarea" data-toggle="tab">Write</a></li>
-                                    <li class="issue-preview"><a href="#issue-preview" data-toggle="tab" data-ajax="/api/v1/markdown" data-ajax-name="issue-preview"  data-ajax-context="{{.RepoLink}}" data-ajax-method="post" data-preview="#issue-preview">Preview</a></li>
-                                </ul>
-                                <div class="tab-content">
-                                    <div class="tab-pane" id="issue-textarea">
-                                        <div class="form-group">
-                                            <div id="submit-error" class="text-danger"></div>
-                                            <input type="hidden" value="{{.Issue.Index}}" name="issueIndex"/>
-                                            <textarea class="form-control" name="content" id="issue-reply-content" rows="10" placeholder="Write some content" data-ajax-rel="issue-preview" data-ajax-val="val" data-ajax-field="text">{{.content}}</textarea>
-                                        </div>
-                                    </div>
-                                    <div class="tab-pane issue-preview-content" id="issue-preview">Loading...</div>
-                                </div>
-                            </div>
-                            {{if .AttachmentsEnabled}}
-                            <!-- <div id="attached">
-                                <div id="attached-list">
-                                    <b>Attachments:</b>
-                                </div>
-                            </div> -->
-                            {{end}}
-                            <div class="text-right">
-                                <div class="form-group">
-                                    {{if .AttachmentsEnabled}}
-                                    <!-- <input type="file" accept="{{.AllowedTypes}}" style="display: none;" id="attachments-input" name="attachments" multiple />
-                                    <button class="btn-default btn attachment-add" id="attachments-button">Select Attachments...</button> -->
-                                    {{end}}
-                                    {{if .IsIssueOwner}}{{if .Issue.IsClosed}}
-                                    <input type="submit" class="btn-default btn issue-open" id="issue-open-btn" data-origin="Reopen" data-text="Reopen & Comment" name="change_status" value="Reopen"/>{{else}}
-                                    <input type="submit" class="btn-default btn issue-close" id="issue-close-btn" data-origin="Close" data-text="Close & Comment" name="change_status" value="Close"/>{{end}}{{end}}&nbsp;&nbsp;
-                                    <button class="btn-success btn" id="issue-reply-btn">Comment</button>
-                                </div>
-                            </div>
-                        </div>
-                    </form>
-                </div>{{else}}<div class="alert alert-warning"><a class="btn btn-success btn-lg" href="{{AppSubUrl}}/user/sign_up">Sign up for free</a> to join this conversation. Already have an account? <a href="{{AppSubUrl}}/user/login">Sign in to comment</a></div>{{end}}
-                </div>
-            </div>
-
-            <div class="issue-bar col-md-2">
-                <div class="labels" data-ajax="{{.Issue.Index}}/label">
-                    {{if .IsRepositoryOwner}}
-                    <div class="pull-right action">
-                        <button class="btn btn-default btn-sm" data-toggle="dropdown">
-                            <i class="fa fa-tags"></i>
-                            <span class="caret"></span>
-                        </button>
-                        <div class="dropdown-menu dropdown-menu-right no">
-                            <ul class="list-unstyled">
-                                {{range .Labels}}
-                                <li class="{{if not .IsChecked}}no-{{end}}checked" data-id="{{.ID}}">
-                                    {{if .IsChecked}}<span class="check pull-left"><i class="fa fa-check"></i></span>{{end}}
-                                    <span class="color" style="background-color: {{.Color}}"></span>
-                                    <span class="name">{{.Name}}</span>
-                                </li>
-                                {{end}}
-                            </ul>
-                        </div>
-                    </div>
-                    {{end}}
-                    <h4>Labels</h4>
-                    {{if .Issue.Labels}}
-                    {{range .Issue.Labels}}
-                    <p id="label-{{.ID}}" class="label-item label-white" style="background-color: {{.Color}}"><strong>{{.Name}}</strong></p>
-                    {{end}}
-                    {{else}}
-                    <p>None yet</p>
-                    {{end}}
-                </div>
-                <div class="milestone" data-milestone="{{.Milestone.ID}}" data-ajax="{{.Issue.Index}}/milestone">
-                    <div class="pull-right action">
-                        {{if .IsRepositoryOwner}}
-                        <button class="btn btn-default btn-sm" data-toggle="dropdown">
-                            <i class="fa fa-check-square-o"></i>
-                            <span class="caret"></span>
-                        </button>
-                        <div class="dropdown-menu dropdown-menu-right">
-                            <ul class="list-unstyled">
-                                <li data-id="0" class="clear-milestone milestone-item  hidden"><i class="fa fa-times-circle-o"></i> Clear milestone </li>
-                                <li class="milestone-list">
-                                    <ul class="nav nav-tabs" data-init="tabs">
-                                        <li class="active"><a href="#milestone-open" data-toggle="tab">Open</a></li>
-                                        <li><a href="#milestone-close" data-toggle="tab">Closed</a></li>
-                                    </ul>
-                                    <div class="tab-content">
-                                        <div class="tab-pane active" id="milestone-open">
-                                            {{if not .OpenMilestones}}
-                                            <p class="milestone-item">Nothing to show</p>
-                                            {{else}}
-                                            <ul class="list-unstyled">
-                                                {{range .OpenMilestones}}
-                                                <li class="milestone-item" data-id="{{.ID}}">
-                                                    <p><strong>{{.Name}}</strong></p>
-                                                    <!-- <p>due to 3 days later</p> -->
-                                                </li>
-                                                {{end}}
-                                            </ul>
-                                            {{end}}
-                                        </div>
-
-                                        <div class="tab-pane" id="milestone-close">
-                                            {{if not .ClosedMilestones}}
-                                            <p class="milestone-item">Nothing to show</p>
-                                            {{else}}
-                                            <ul class="list-unstyled">
-                                                {{range .ClosedMilestones}}
-                                                <li class="milestone-item" data-id="{{.ID}}">
-                                                    <p><strong>{{.Name}}</strong></p>
-                                                    <p>Closed {{TimeSince .ClosedDate $.Lang}}</p>
-                                                </li>
-                                                {{end}}
-                                            </ul>
-                                            {{end}}
-                                        </div>
-                                    </div>
-                                </li>
-                            </ul>
-                        </div>
-                        {{end}}
-                    </div>
-                    <h4>Milestone</h4>
-                    {{if .Milestone}}
-                    <p class="completion{{if eq .Milestone.Completeness 0}} hidden{{end}}"><span style="width:{{.Milestone.Completeness}}%">&nbsp;</span></p>
-                    <p class="name"><strong><a href="{{$.RepoLink}}/issues?milestone={{.Milestone.ID}}{{if $.Issue.IsClosed}}&state=closed{{end}}">{{.Milestone.Name}}</a></strong></p>
-                    {{else}}
-                    <p class="name">No milestone</p>
-                    {{end}}
-                </div>
-
-                <div class="assignee" data-assigned="{{if .Issue.Assignee}}{{.Issue.Assignee.Id}}{{else}}0{{end}}" data-ajax="{{.Issue.Index}}/assignee">{{if .IsRepositoryOwner}}
-                    <div class="pull-right action">
-                        <button type="button" class="dropdown-toggle btn btn-default btn-sm" data-toggle="dropdown">
-                            <i class="fa fa-group"></i>
-                            <span class="caret"></span>
-                        </button>
-                        <div class="dropdown-menu dropdown-menu-right">
-                            <ul class="list-unstyled">
-                                <li data-uid="0" class="clear-assignee hidden"><i class="fa fa-times-circle-o"></i> Clear assignee</li>
-                                {{range .Collaborators}}
-                                <li data-uid="{{.Id}}"><img src="{{.AvatarLink}}"><strong>{{.Name}}</strong></li>
-                                {{end}}
-                            </ul>
-                        </div>
-                    </div>{{end}}
-                    <h4>Assignee</h4>
-                    <p>{{if .Issue.Assignee}}<img src="{{.Issue.Assignee.AvatarLink}}"><strong>{{.Issue.Assignee.Name}}</strong>{{else}}No one assigned{{end}}</p>
-                </div>
-            </div>
-        </div>
-    </div>
+{{template "base/head" .}}
+<div class="repository view issue">
+	{{template "repo/header" .}}
+	<div class="ui container">
+		<div class="navbar">
+			{{template "repo/issue/navbar" .}}
+			<div class="ui right">
+				<a class="ui green button" href="{{$.RepoLink}}/issues/new">{{.i18n.Tr "repo.issues.new"}}</a>
+			</div>
+		</div>
+		<div class="ui divider"></div>
+		{{template "repo/issue/view_content" .}}
+	</div>
 </div>
-{{template "base/footer_old" .}}
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
new file mode 100644
index 0000000000..f5efce5e35
--- /dev/null
+++ b/templates/repo/issue/view_content.tmpl
@@ -0,0 +1,142 @@
+<div class="ui grid">
+	{{if .Flash}}
+	<div class="sixteen wide column">
+  	{{template "base/alert" .}}
+  </div>
+  {{end}}
+  <div class="sixteen wide column title">
+		<h1><span class="index">#{{.Issue.Index}}</span> {{.Issue.Name}}</h1>
+		{{if .Issue.IsClosed}}
+		<div class="ui red large label"><i class="octicon octicon-issue-closed"></i> {{.i18n.Tr "repo.issues.closed_title"}}</div>
+		{{else}}
+		<div class="ui green large label"><i class="octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues.open_title"}}</div>
+		{{end}}
+		{{ $createdStr:= TimeSince .Issue.Created $.Lang }}
+		<span class="time-desc">
+			{{$.i18n.Tr "repo.issues.opened_by" $createdStr .Issue.Poster.Name|Str2html}}
+			·
+			{{$.i18n.Tr "repo.issues.num_comments" .Issue.NumComments}}
+		</span>
+  	<div class="ui divider"></div>
+  </div>
+	<div class="twelve wide column comment-list">
+  	<ui class="ui comments">
+  		<div class="comment">
+		    <a class="avatar" href="{{.SignedUser.HomeLink}}">
+		      <img src="{{.SignedUser.AvatarLink}}">
+		    </a>
+		    <div class="content">
+					<div class="ui top attached header">
+						<span class="text"><a href="{{.Issue.Poster.HomeLink}}">{{.Issue.Poster.Name}}</a> {{.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}}</span>
+					  <div class="ui right actions">
+					  </div>
+					</div>
+			    <div class="ui attached segment markdown">
+						{{.Issue.RenderedContent|Str2html}}
+	  			</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>
+						  {{end}}
+						</div>
+					</div>
+	  			{{end}}
+		    </div>
+  		</div>
+  	</ui>
+	</div>
+
+	<div class="four wide column">
+		<div class="ui segment metas">
+			<input id="label_ids" name="label_ids" type="hidden" value="{{.label_ids}}">
+			<div class="ui {{if not .Labels}}disabled{{end}} 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-id="#label_ids">
+        	<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">
+				{{if not .Issue.Labels}}
+				<span class="no-select item {{if .HasSelectedLabel}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_label"}}</span>
+				{{else}}
+      	{{range .Issue.Labels}}
+      	<a class="item" id="label_{{.ID}}" href="{{$.RepoLink}}/issues?labels={{.ID}}"><span class="label color" style="background-color: {{.Color}}"></span> <span class="text">{{.Name}}</span></a>
+        {{end}}
+        {{end}}
+			</div>
+
+			<div class="ui divider"></div>
+
+			<input id="milestone_id" name="milestone_id" type="hidden" value="{{.milestone_id}}">
+			<div class="ui {{if not (or .OpenMilestones .ClosedMilestones)}}disabled{{end}} 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">
+        	<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}}</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}}</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}}</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 .Assignees}}disabled{{end}} 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">
+        	<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_assignee"}}</div>
+        	{{range .Assignees}}
+        	<div class="item" data-id="{{.Id}}" data-href="{{.HomeLink}}" data-avatar="{{.AvatarLink}}"><img src="{{.AvatarLink}}"> {{.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="{{.Issue.Assignee.HomeLink}}"><img class="ui avatar image" src="{{.Issue.Assignee.AvatarLink}}"> {{.Issue.Assignee.Name}}</a>
+					{{end}}
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/repo/issue/view_old.tmpl b/templates/repo/issue/view_old.tmpl
new file mode 100644
index 0000000000..d13364aa54
--- /dev/null
+++ b/templates/repo/issue/view_old.tmpl
@@ -0,0 +1,284 @@
+{{template "base/head_old" .}}
+{{template "base/navbar" .}}
+{{template "repo/nav" .}}
+{{template "repo/toolbar" .}}
+<div id="body" class="container">
+    <div id="issue" data-id="{{.Issue.ID}}">
+        <div id="issue-{{.Issue.ID}}" class="issue-whole issue-is-opening">
+            <div class="issue-wrap col-md-10">
+                <div class="issue-head clearfix">
+                    <div class="number pull-right">#{{.Issue.Index}}</div>
+                    <a class="author pull-left" href="{{AppSubUrl}}/{{.Issue.Poster.Name}}"><img class="avatar" src="{{.Issue.Poster.AvatarLink}}" alt="" width="30"/></a>
+                    <h1 class="title pull-left">{{.Issue.Name}}</h1>
+                    <input id="issue-edit-title" class="form-control input-lg pull-left hidden" type="text" value="{{.Issue.Name}}" data-ajax-rel="issue-edit-save" data-ajax-val="val" data-ajax-field="title"/>
+                    <input type="hidden" value="{{.Issue.ID}}" data-ajax-rel="issue-edit-save" data-ajax-val="val" data-ajax-field="issue_id"/>
+                    <p class="info pull-left">
+                        {{if .IsIssueOwner}}<a class="btn btn-default pull-right issue-edit" href="#" id="issue-edit-btn">Edit</a>
+                        <a class="btn btn-danger pull-right issue-edit-cancel hidden" href="#">Cancel</a>
+                        <a class="btn btn-primary pull-right issue-edit-save hidden" href="#" data-ajax="{{.RepoLink}}/issues/{{.Issue.Index}}" data-ajax-name="issue-edit-save" data-ajax-method="post">Save</a>{{end}}
+                        <span class="status label label-{{if .Issue.IsClosed}}danger{{else}}success{{end}}">{{if .Issue.IsClosed}}Closed{{else}}Open{{end}}</span>
+                        <a href="{{AppSubUrl}}/{{.Issue.Poster.Name}}" class="author"><strong>{{.Issue.Poster.Name}}</strong></a> opened this issue
+                        <span class="time">{{TimeSince .Issue.Created $.Lang}}</span> · {{.Issue.NumComments}} comments
+                    </p>
+                </div>
+                <div class="issue-main">
+                    <div class="panel panel-default issue-content">
+                        <div class="panel-body">
+                            <div class="content markdown">
+                                {{Str2html .Issue.RenderedContent}}
+                            </div>
+                            <div class="issue-edit-content hidden">
+                                <div class="form-group">
+                                    <div class="md-help pull-right">Content with <a href="https://help.github.com/articles/markdown-basics">Markdown</a>
+                                    </div>
+                                    <ul class="nav nav-tabs" data-init="tabs">
+                                        <li class="issue-write active"><a href="#issue-edit-textarea" data-toggle="tab">Write</a></li>
+                                        <li class="issue-preview"><a href="#issue-edit-preview" data-toggle="tab" data-ajax="/api/v1/markdown" data-ajax-name="issue-edit-preview" data-ajax-context="{{.RepoLink}}" data-ajax-method="post" data-preview="#issue-edit-preview">Preview</a></li>
+                                    </ul>
+                                    <div class="tab-content">
+                                        <div class="tab-pane active" id="issue-edit-textarea">
+                                            <div class="form-group">
+                                                <input type="hidden" value="1" name="issueIndex">
+                                                <textarea class="form-control" name="content" id="issue-edit-content" rows="10" placeholder="Write some content" data-ajax-rel="issue-edit-preview" data-ajax-val="val" data-ajax-field="text">{{.Issue.Content}}</textarea>
+                                            </div>
+                                        </div>
+                                        <div class="tab-pane issue-preview-content" id="issue-edit-preview">Loading...</div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        {{with $attachments := .Issue.Attachments}}
+                        {{if $attachments}}
+                        <div class="attachments">
+                            <span class="attachment-label label label-info">Attachments:</span>
+
+                            {{range $attachments}}
+                            <a class="attachment label label-default" href="/attachments/{{.UUID}}">{{.Name}}</a>
+                            {{end}}
+                        </div>
+                        {{end}}
+                        {{end}}
+                    </div>
+                    {{range .Comments}}
+                    {{/* 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE, 4 = COMMIT, 5 = PULL */}}
+                    {{if eq .Type 0}}
+                    <div class="issue-child" id="issue-comment-{{.Id}}">
+                        <a class="user pull-left" href="{{AppSubUrl}}/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a>
+                        <div class="issue-content panel panel-default">
+                            <div class="panel-heading">
+                                <a href="{{AppSubUrl}}/{{.Poster.Name}}" class="user">{{.Poster.Name}}</a> commented <span class="time">{{TimeSince .Created $.Lang}}</span>
+                                <!-- <a class="issue-comment-del pull-right issue-action" href="#" title="Edit Comment"><i class="fa fa-times-circle"></i></a>
+                                <a class="issue-comment-edit pull-right issue-action" href="#" title="Remove Comment" data-url="{remove-link}"><i class="fa fa-edit"></i></a> -->
+                                {{if eq .Poster.Id $.Owner.Id}}
+                                <span class="role label label-default pull-right">Owner</span>
+                                {{end}}
+                            </div>
+                            <div class="panel-body markdown">
+                                {{if len .Content}}
+                                {{Str2html .Content}}
+                                {{else}}
+                                <i>No comment entered</i>
+                                {{end}}
+                            </div>
+                            {{with $attachments := .Attachments}}
+                            {{if $attachments}}
+                            <div class="attachments">
+                                <span class="attachment-label label label-info">Attachments:</span>
+
+                                {{range $attachments}}
+                                <a class="attachment label label-default" href="{{.IssueId}}/attachment/{{.Id}}">{{.Name}}</a>
+                                {{end}}
+                            </div>
+                            {{end}}
+                            {{end}}
+                        </div>
+                    </div>
+                    {{else if eq .Type 1}}
+                    <div class="issue-child issue-opened">
+                        <a class="user pull-left" href="{{AppSubUrl}}/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt="" /></a>
+                        <div class="issue-content">
+                            <a class="user pull-left" href="{{AppSubUrl}}/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-success">Reopened</span> this issue <span class="time">{{TimeSince .Created $.Lang}}</span>
+                        </div>
+                    </div>
+                    {{else if eq .Type 2}}
+                    <div class="issue-child issue-closed">
+                        <a class="user pull-left" href="{{AppSubUrl}}/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a>
+                        <div class="issue-content">
+                            <a class="user pull-left" href="{{AppSubUrl}}/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-danger">Closed</span> this issue <span class="time">{{TimeSince .Created $.Lang}}</span>
+                        </div>
+                    </div>
+                    {{else if eq .Type 4}}
+                    <div class="issue-child issue-reference issue-reference-commit">
+                        <a class="user pull-left" href="{{AppSubUrl}}/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a>
+                        <div class="issue-content">
+                            <a class="user pull-left" href="{{AppSubUrl}}/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-primary">Referenced</span> this issue <span class="time">{{TimeSince .Created $.Lang}}</span>
+                            <p>
+                                <a class="user pull-left" href="{{AppSubUrl}}/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a>
+                                {{.ContentHtml}}
+                            </p>
+                        </div>
+                    </div>
+                    {{end}}
+                    {{end}}
+                    <hr class="issue-line"/>
+                    {{if .SignedUser}}<div class="issue-child issue-reply">
+                    <a class="user pull-left" href="{{AppSubUrl}}/{{.SignedUser.Name}}"><img class="avatar" src="{{.SignedUser.AvatarLink}}" alt=""/></a>
+                    <form class="panel panel-default issue-content" action="{{.RepoLink}}/comment/new" method="post" enctype="multipart/form-data">
+                        {{.CsrfTokenHtml}}
+                        <div class="panel-body">
+                            <div class="form-group">
+                                <div class="md-help pull-right">Content with <a href="https://help.github.com/articles/markdown-basics">Markdown</a>
+                                </div>
+                                <ul class="nav nav-tabs" data-init="tabs">
+                                    <li class="active issue-write"><a href="#issue-textarea" data-toggle="tab">Write</a></li>
+                                    <li class="issue-preview"><a href="#issue-preview" data-toggle="tab" data-ajax="/api/v1/markdown" data-ajax-name="issue-preview"  data-ajax-context="{{.RepoLink}}" data-ajax-method="post" data-preview="#issue-preview">Preview</a></li>
+                                </ul>
+                                <div class="tab-content">
+                                    <div class="tab-pane" id="issue-textarea">
+                                        <div class="form-group">
+                                            <div id="submit-error" class="text-danger"></div>
+                                            <input type="hidden" value="{{.Issue.Index}}" name="issueIndex"/>
+                                            <textarea class="form-control" name="content" id="issue-reply-content" rows="10" placeholder="Write some content" data-ajax-rel="issue-preview" data-ajax-val="val" data-ajax-field="text">{{.content}}</textarea>
+                                        </div>
+                                    </div>
+                                    <div class="tab-pane issue-preview-content" id="issue-preview">Loading...</div>
+                                </div>
+                            </div>
+                            {{if .AttachmentsEnabled}}
+                            <!-- <div id="attached">
+                                <div id="attached-list">
+                                    <b>Attachments:</b>
+                                </div>
+                            </div> -->
+                            {{end}}
+                            <div class="text-right">
+                                <div class="form-group">
+                                    {{if .AttachmentsEnabled}}
+                                    <!-- <input type="file" accept="{{.AllowedTypes}}" style="display: none;" id="attachments-input" name="attachments" multiple />
+                                    <button class="btn-default btn attachment-add" id="attachments-button">Select Attachments...</button> -->
+                                    {{end}}
+                                    {{if .IsIssueOwner}}{{if .Issue.IsClosed}}
+                                    <input type="submit" class="btn-default btn issue-open" id="issue-open-btn" data-origin="Reopen" data-text="Reopen & Comment" name="change_status" value="Reopen"/>{{else}}
+                                    <input type="submit" class="btn-default btn issue-close" id="issue-close-btn" data-origin="Close" data-text="Close & Comment" name="change_status" value="Close"/>{{end}}{{end}}&nbsp;&nbsp;
+                                    <button class="btn-success btn" id="issue-reply-btn">Comment</button>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>{{else}}<div class="alert alert-warning"><a class="btn btn-success btn-lg" href="{{AppSubUrl}}/user/sign_up">Sign up for free</a> to join this conversation. Already have an account? <a href="{{AppSubUrl}}/user/login">Sign in to comment</a></div>{{end}}
+                </div>
+            </div>
+
+            <div class="issue-bar col-md-2">
+                <div class="labels" data-ajax="{{.Issue.Index}}/label">
+                    {{if .IsRepositoryOwner}}
+                    <div class="pull-right action">
+                        <button class="btn btn-default btn-sm" data-toggle="dropdown">
+                            <i class="fa fa-tags"></i>
+                            <span class="caret"></span>
+                        </button>
+                        <div class="dropdown-menu dropdown-menu-right no">
+                            <ul class="list-unstyled">
+                                {{range .Labels}}
+                                <li class="{{if not .IsChecked}}no-{{end}}checked" data-id="{{.ID}}">
+                                    {{if .IsChecked}}<span class="check pull-left"><i class="fa fa-check"></i></span>{{end}}
+                                    <span class="color" style="background-color: {{.Color}}"></span>
+                                    <span class="name">{{.Name}}</span>
+                                </li>
+                                {{end}}
+                            </ul>
+                        </div>
+                    </div>
+                    {{end}}
+                    <h4>Labels</h4>
+                    {{if .Issue.Labels}}
+                    {{range .Issue.Labels}}
+                    <p id="label-{{.ID}}" class="label-item label-white" style="background-color: {{.Color}}"><strong>{{.Name}}</strong></p>
+                    {{end}}
+                    {{else}}
+                    <p>None yet</p>
+                    {{end}}
+                </div>
+                <div class="milestone" data-milestone="{{.Milestone.ID}}" data-ajax="{{.Issue.Index}}/milestone">
+                    <div class="pull-right action">
+                        {{if .IsRepositoryOwner}}
+                        <button class="btn btn-default btn-sm" data-toggle="dropdown">
+                            <i class="fa fa-check-square-o"></i>
+                            <span class="caret"></span>
+                        </button>
+                        <div class="dropdown-menu dropdown-menu-right">
+                            <ul class="list-unstyled">
+                                <li data-id="0" class="clear-milestone milestone-item  hidden"><i class="fa fa-times-circle-o"></i> Clear milestone </li>
+                                <li class="milestone-list">
+                                    <ul class="nav nav-tabs" data-init="tabs">
+                                        <li class="active"><a href="#milestone-open" data-toggle="tab">Open</a></li>
+                                        <li><a href="#milestone-close" data-toggle="tab">Closed</a></li>
+                                    </ul>
+                                    <div class="tab-content">
+                                        <div class="tab-pane active" id="milestone-open">
+                                            {{if not .OpenMilestones}}
+                                            <p class="milestone-item">Nothing to show</p>
+                                            {{else}}
+                                            <ul class="list-unstyled">
+                                                {{range .OpenMilestones}}
+                                                <li class="milestone-item" data-id="{{.ID}}">
+                                                    <p><strong>{{.Name}}</strong></p>
+                                                    <!-- <p>due to 3 days later</p> -->
+                                                </li>
+                                                {{end}}
+                                            </ul>
+                                            {{end}}
+                                        </div>
+
+                                        <div class="tab-pane" id="milestone-close">
+                                            {{if not .ClosedMilestones}}
+                                            <p class="milestone-item">Nothing to show</p>
+                                            {{else}}
+                                            <ul class="list-unstyled">
+                                                {{range .ClosedMilestones}}
+                                                <li class="milestone-item" data-id="{{.ID}}">
+                                                    <p><strong>{{.Name}}</strong></p>
+                                                    <p>Closed {{TimeSince .ClosedDate $.Lang}}</p>
+                                                </li>
+                                                {{end}}
+                                            </ul>
+                                            {{end}}
+                                        </div>
+                                    </div>
+                                </li>
+                            </ul>
+                        </div>
+                        {{end}}
+                    </div>
+                    <h4>Milestone</h4>
+                    {{if .Milestone}}
+                    <p class="completion{{if eq .Milestone.Completeness 0}} hidden{{end}}"><span style="width:{{.Milestone.Completeness}}%">&nbsp;</span></p>
+                    <p class="name"><strong><a href="{{$.RepoLink}}/issues?milestone={{.Milestone.ID}}{{if $.Issue.IsClosed}}&state=closed{{end}}">{{.Milestone.Name}}</a></strong></p>
+                    {{else}}
+                    <p class="name">No milestone</p>
+                    {{end}}
+                </div>
+
+                <div class="assignee" data-assigned="{{if .Issue.Assignee}}{{.Issue.Assignee.Id}}{{else}}0{{end}}" data-ajax="{{.Issue.Index}}/assignee">{{if .IsRepositoryOwner}}
+                    <div class="pull-right action">
+                        <button type="button" class="dropdown-toggle btn btn-default btn-sm" data-toggle="dropdown">
+                            <i class="fa fa-group"></i>
+                            <span class="caret"></span>
+                        </button>
+                        <div class="dropdown-menu dropdown-menu-right">
+                            <ul class="list-unstyled">
+                                <li data-uid="0" class="clear-assignee hidden"><i class="fa fa-times-circle-o"></i> Clear assignee</li>
+                                {{range .Collaborators}}
+                                <li data-uid="{{.Id}}"><img src="{{.AvatarLink}}"><strong>{{.Name}}</strong></li>
+                                {{end}}
+                            </ul>
+                        </div>
+                    </div>{{end}}
+                    <h4>Assignee</h4>
+                    <p>{{if .Issue.Assignee}}<img src="{{.Issue.Assignee.AvatarLink}}"><strong>{{.Issue.Assignee.Name}}</strong>{{else}}No one assigned{{end}}</p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{{template "base/footer_old" .}}