From 86dbda0b42d05caf11d5c6d040f18dfbcc742e04 Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Fri, 24 Jul 2015 16:42:47 +0800
Subject: UI: basci issue list without filters

- fix isRead check
- fix paging
---
 templates/repo/issue/list.tmpl           | 17 +++++++++++------
 templates/repo/issue/milestone.tmpl      | 14 +++++++-------
 templates/repo/issue/milestone_edit.tmpl |  2 +-
 templates/repo/issue/milestone_new.tmpl  |  2 +-
 4 files changed, 20 insertions(+), 15 deletions(-)

(limited to 'templates/repo/issue')

diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 6f16a6c7..5513ae4c 100644
--- a/templates/repo/issue/list.tmpl
+++ b/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>
diff --git a/templates/repo/issue/milestone.tmpl b/templates/repo/issue/milestone.tmpl
index a09b2600..6a9e5f37 100644
--- a/templates/repo/issue/milestone.tmpl
+++ b/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/>
diff --git a/templates/repo/issue/milestone_edit.tmpl b/templates/repo/issue/milestone_edit.tmpl
index f3898fa8..dee36152 100644
--- a/templates/repo/issue/milestone_edit.tmpl
+++ b/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">
diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl
index 2d9f60f4..f90772f6 100644
--- a/templates/repo/issue/milestone_new.tmpl
+++ b/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">
-- 
cgit v1.2.3