UI: basci issue list without filters

- fix isRead check
- fix paging

templates/base/head.tmpl

@@ -44,7 +44,7 @@
 		      		<img class="img-15" src="{{.SignedUser.AvatarLink}}"/>
 		      		<span class="sr-only">{{.SignedUser.Name}}</span>
 		      	</a>
-						<div class="ui pointing dropdown head link item">
+						<div class="ui pointing dropdown head link jump item">
 							<span class="text">
 								<i class="octicon octicon-plus"></i>
 								<i class="dropdown icon"></i>

templates/repo/issue/list.tmpl

@@ -22,7 +22,7 @@
 			</div>
 		</div>
 		<div class="ui right floated secondary filter menu">
-			<div class="ui {{if not .Labels}}disabled{{end}} pointing dropdown item">
+			<div class="ui {{if not .Labels}}disabled{{end}} pointing dropdown jump item">
 				<span class="text">
 					{{.i18n.Tr "repo.issues.filter_label"}}
 					<i class="dropdown icon"></i>
@@ -33,7 +33,7 @@
           {{end}}
 				</div>
 			</div>
-			<div class="ui {{if not .Milestones}}disabled{{end}} pointing dropdown item">
+			<div class="ui {{if not .Milestones}}disabled{{end}} pointing dropdown jump item">
 				<span class="text">
 					{{.i18n.Tr "repo.issues.filter_milestone"}}
 					<i class="dropdown icon"></i>
@@ -44,7 +44,7 @@
           {{end}}
 				</div>
 			</div>
-			<div class="ui {{if not .Assignees}}disabled{{end}} pointing dropdown item">
+			<div class="ui {{if not .Assignees}}disabled{{end}} pointing dropdown jump item">
 				<span class="text">
 					{{.i18n.Tr "repo.issues.filter_assignee"}}
 					<i class="dropdown icon"></i>
@@ -55,7 +55,7 @@
           {{end}}
 				</div>
 			</div>
-			<div class="ui pointing dropdown type item">
+			<div class="ui pointing dropdown type jump item">
 				<span class="text">
 					{{.i18n.Tr "repo.issues.filter_type"}}
 					<i class="dropdown icon"></i>
@@ -73,12 +73,17 @@
 			{{range .Issues}}
 			{{ $timeStr:= TimeSince .Created $.Lang }}
       <li class="item">
-      	<div class="ui black label">#{{.Id}}</div>
+      	<div class="ui {{if .IsRead}}black{{else}}green{{end}} label">#{{.Id}}</div>
       	<a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Name}}</a>
-        <p class="desc">{{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.Name|Str2html}}</p>
       	{{if .NumComments}}<span class="comment ui right"><i class="octicon octicon-comment"></i> {{.NumComments}}</span>{{end}}
+        <p class="desc">{{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.Name|Str2html}}</p>
       </li>
       {{end}}
+			
+			<div class="center page buttons">
+			<a class="ui {{if not .PreviousPage}}disabled{{end}} blue button" href="{{.RepoLink}}/issues?page={{.PreviousPage}}">{{.i18n.Tr "repo.issues.previous"}}</a>
+			<a class="ui {{if not .NextPage}}disabled{{end}} blue button" href="{{.RepoLink}}/issues?page={{.NextPage}}">{{.i18n.Tr "repo.issues.next"}}</a>
+			</div>
 		</div>
 	</div>
 </div>

templates/repo/issue/milestone.tmpl

@@ -6,11 +6,11 @@
     <div id="issue">
         <div class="col-md-3 filter-list">
             <ul class="list-unstyled">
-                <li><a href="{{.RepoLink}}/issues/milestones"{{if eq .State "open"}} class="active"{{end}}>Open Milestones <strong class="pull-right">{{.Repository.NumOpenMilestones}}</strong></a></li>
-                <li><a href="{{.RepoLink}}/issues/milestones?state=closed"{{if eq .State "closed"}} class="active"{{end}}>Close Milestones <strong class="pull-right">{{.Repository.NumClosedMilestones}}</strong></a></li>
+                <li><a href="{{.RepoLink}}/milestones"{{if eq .State "open"}} class="active"{{end}}>Open Milestones <strong class="pull-right">{{.Repository.NumOpenMilestones}}</strong></a></li>
+                <li><a href="{{.RepoLink}}/milestones?state=closed"{{if eq .State "closed"}} class="active"{{end}}>Close Milestones <strong class="pull-right">{{.Repository.NumClosedMilestones}}</strong></a></li>
             </ul>
             <hr/>
-            <a href="{{.RepoLink}}/issues/milestones/new" class="text-center">
+            <a href="{{.RepoLink}}/milestones/new" class="text-center">
                 <button class="btn btn-default btn-block">Create new milestone</button>
             </a>
         </div>
@@ -22,13 +22,13 @@
                     <span class="issue-open label label-success">{{.NumOpenIssues}}</span>
                     <span class="issue-close label label-warning">{{.NumClosedIssues}}</span>
                     <p class="actions pull-right">
-                        <a href="{{$.RepoLink}}/issues/milestones/{{.Index}}/edit">Edit</a>
+                        <a href="{{$.RepoLink}}/milestones/{{.Index}}/edit">Edit</a>
                         {{if .IsClosed}}
-                        <a href="{{$.RepoLink}}/issues/milestones/{{.Index}}/open">Open</a>
+                        <a href="{{$.RepoLink}}/milestones/{{.Index}}/open">Open</a>
                         {{else}}
-                        <a href="{{$.RepoLink}}/issues/milestones/{{.Index}}/close">Close</a>
+                        <a href="{{$.RepoLink}}/milestones/{{.Index}}/close">Close</a>
                         {{end}}
-                        <a class="text-danger" href="{{$.RepoLink}}/issues/milestones/{{.Index}}/delete">Delete</a>
+                        <a class="text-danger" href="{{$.RepoLink}}/milestones/{{.Index}}/delete">Delete</a>
                         <a href="{{$.RepoLink}}/issues?milestone={{.Index}}{{if .IsClosed}}&state=closed{{end}}">Issues</a>
                     </p>
                     <hr/>

templates/repo/issue/milestone_edit.tmpl

@@ -4,7 +4,7 @@
 {{template "repo/toolbar" .}}
 <div id="body" class="container">
     <div id="issue">
-        <form class="form" action="{{.RepoLink}}/issues/milestones/{{.Milestone.Index}}/edit" method="post" id="issue-create-form">
+        <form class="form" action="{{.RepoLink}}/milestones/{{.Milestone.Index}}/edit" method="post" id="issue-create-form">
             {{.CsrfTokenHtml}}
             {{template "base/alert" .}}
             <div class="col-md-1">

templates/repo/issue/milestone_new.tmpl

@@ -4,7 +4,7 @@
 {{template "repo/toolbar" .}}
 <div id="body" class="container">
     <div id="issue">
-        <form class="form" action="{{.RepoLink}}/issues/milestones/new" method="post" id="issue-create-form">
+        <form class="form" action="{{.RepoLink}}/milestones/new" method="post" id="issue-create-form">
             {{.CsrfTokenHtml}}
             {{template "base/alert" .}}
             <div class="col-md-1">

templates/repo/issue2/list.tmpl

@@ -1,101 +0,0 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-<div id="repo-wrapper">
-    {{template "repo/header_old" .}}
-    <div class="issue-main container repo-wide-wrapper">
-        <ul id="issue-list-nav" class="menu menu-line">
-            <li class="current"><a href="#">Issue</a></li>
-            <li><a href="#">Pull Request</a></li>
-            <li><a href="#">Labels</a></li>
-            <li><a href="#">Milestones</a></li>
-            <li class="right" id="issue-new"><a href="#"><button id="issue-new-btn" class="btn btn-green text-bold">New Issue</button></a></li>
-            <!--<li class="right"><a href="#">Filter</a></li>-->
-        </ul>
-        <div id="issue-list-container">
-            <div id="issue-list-menu">
-                <div class="left">
-                    <span class="mark open hover"><a href="#">
-                        <i class="octicon octicon-issue-opened"></i> 88 Open
-                    </a></span>
-                    <span class="mark close"><a href="">
-                        <i class="octicon octicon-issue-closed"></i> 12 Close
-                    </a></span>
-                </div>
-                <ul id="issue-list-filter" class="right menu menu-line">
-                    <li class="down drop label-filter">
-                        <a href="#">Labels</a>
-                        <div class="drop-down">
-                            <h4>Labels</h4>
-                            <ul class="labels list-no-style">
-                                <li class="no-label"><strong>no label</strong></li>
-                                <li><a href="#"><span class="color"></span><span class="name">bug</span></a></li>
-                                <li><a href="#"><span class="color"></span><span class="name">feature</span></a></li>
-                                <li><a href="#"><span class="color"></span><span class="name">roadmap</span></a></li>
-                            </ul>
-                        </div>
-                    </li>
-                    <li class="down drop milestone-filter">
-                        <a href="#">Milestones</a>
-                        <div class="drop-down">
-                            <h4>Milestones</h4>
-                            <ul class="milestones list-no-style">
-                                <li class="no-label"><strong>no milestone</strong></li>
-                                <li><a href="#">v1</a></li>
-                            </ul>
-                        </div>
-                    </li>
-                    <li class="down drop assignee-list">
-                        <a href="#">Assignee</a>
-                        <div class="drop-down">
-                            aabbcc
-                        </div>
-                    </li>
-                </ul>
-                <div class="clear"></div>
-            </div>
-            <ul id="issue-list" class="list-no-style">
-                <li class="item" id="issue-id">
-                    <a class="comment" href="#">
-                        <i class="octicon octicon-comment"></i> 7
-                    </a>
-                    <p class="title text-bold">
-                        <span class="label label-black index-num">#588</span>
-                        <a href="#" class="title-text">Delete account text and/or translations missing</a>
-                        <span class="label label-red issue-label"><a href="#">bug</a></span>
-                    </p>
-                    <p class="desc">opened 7 days ago by <a href="#">marcuspoehls</a></p>
-                </li>
-                <li class="item" id="issue-id2">
-                    <a class="comment" href="#">
-                        <i class="octicon octicon-comment"></i> 7
-                    </a>
-                    <p class="title text-bold">
-                        <span class="label label-black index-num">#588</span>
-                        <a href="#" class="title-text">Delete account text and/or translations missing</a>
-                        <span class="label label-red issue-label"><a href="#">bug</a></span>
-                    </p>
-                    <p class="desc">opened 7 days ago by <a href="#">marcuspoehls</a></p>
-                </li>
-                <li class="item" id="issue-id3">
-                    <a class="comment" href="#">
-                        <i class="octicon octicon-comment"></i> 7
-                    </a>
-                    <p class="title text-bold">
-                        <span class="label label-black index-num">#588</span>
-                        <a href="#" class="title-text">Disabling attachments breaks issues and comments ajax submit</a>
-                        <span class="label label-red issue-label"><a href="#">bug</a></span>
-                    </p>
-                    <p class="desc">opened 7 days ago by <a href="#">marcuspoehls</a></p>
-                </li>
-            </ul>
-            <div id="issue-list-pager" class="pager text-center">
-                <a class="prev invalid" href="#">Prev</a>
-                <a class="page" href="#">1</a>
-                <a class="page hover" href="#">2</a>
-                <a class="page" href="#">3</a>
-                <a class="next" href="#">Next</a>
-            </div>
-        </div>
-    </div>
-</div>
-{{template "ng/base/footer" .}}

templates/repo/toolbar.tmpl

@@ -12,7 +12,7 @@
                     {{if .IsRepoToolbarIssues}}
                     <li class="tmp">{{if .IsRepoToolbarIssuesList}}
                         <a href="{{.RepoLink}}/issues/new"><button class="btn btn-primary btn-sm">New Issue</button></a>
-                        <a href="{{.RepoLink}}/issues/milestones"><button class="btn btn-success btn-sm">Milestones</button></a>
+                        <a href="{{.RepoLink}}/milestones"><button class="btn btn-success btn-sm">Milestones</button></a>
                         {{end}}</li>
                     {{end}}
                     <li class="{{if .IsRepoToolbarReleases}}active{{end}}"><a href="{{.RepoLink}}/releases">{{if .Repository.NumTags}}<span class="badge">{{.Repository.NumTags}}</span> {{end}}Releases</a></li>