From 23d103c72163cdb4ea65c9756edf22c597060a7e Mon Sep 17 00:00:00 2001 From: FuXiaoHei Date: Tue, 25 Mar 2014 23:00:26 +0800 Subject: [PATCH] issue list in user --- public/css/gogs.css | 12 +++++++ routers/user/user.go | 3 +- templates/issue/repo.tmpl | 56 ++++++++++++++++++++++++++++++ templates/issue/user.tmpl | 70 ++++++++++++++++++++++++++++++++++++++ templates/repo/issues.tmpl | 10 ------ templates/user/issues.tmpl | 17 --------- 6 files changed, 140 insertions(+), 28 deletions(-) create mode 100644 templates/issue/repo.tmpl create mode 100644 templates/issue/user.tmpl delete mode 100644 templates/repo/issues.tmpl delete mode 100644 templates/user/issues.tmpl diff --git a/public/css/gogs.css b/public/css/gogs.css index ae970b4799..06f5931916 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -1026,6 +1026,14 @@ html, body { color: #444; } +#issue .filter-list a.sm{ + font-size: 13px; +} + +#issue .filter-list hr{ + border-color: #CCC; +} + #issue .filter-list a:hover { background-color: #DDD; text-decoration: none; @@ -1044,6 +1052,10 @@ html, body { background-color: #FFF; } +#issue .issue-item:hover{ + background-color: rgba(19, 95, 215, 0.03); +} + #issue .list-group .list-group-item.unread { border-left: 2px solid #DD4B39; } diff --git a/routers/user/user.go b/routers/user/user.go index a0321f187b..d3ef96211e 100644 --- a/routers/user/user.go +++ b/routers/user/user.go @@ -285,7 +285,8 @@ func Feeds(ctx *middleware.Context, form auth.FeedsForm) { } func Issues(ctx *middleware.Context) { - ctx.HTML(200, "user/issues") + ctx.Data["Title"] = "Your Issues" + ctx.HTML(200, "issue/user") } func Pulls(ctx *middleware.Context) { diff --git a/templates/issue/repo.tmpl b/templates/issue/repo.tmpl new file mode 100644 index 0000000000..c348f27ff6 --- /dev/null +++ b/templates/issue/repo.tmpl @@ -0,0 +1,56 @@ +{{template "base/head" .}} +{{template "base/navbar" .}} +{{template "repo/nav" .}} +{{template "repo/toolbar" .}} +
+ +
+{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/issue/user.tmpl b/templates/issue/user.tmpl new file mode 100644 index 0000000000..2cf9571306 --- /dev/null +++ b/templates/issue/user.tmpl @@ -0,0 +1,70 @@ +{{template "base/head" .}} +{{template "base/navbar" .}} +
+
+ +

Your Issues

+
+
+
+ {{if .HasInfo}}
{{.InfoMsg}}
{{end}} + +
+{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/repo/issues.tmpl b/templates/repo/issues.tmpl deleted file mode 100644 index df53197c36..0000000000 --- a/templates/repo/issues.tmpl +++ /dev/null @@ -1,10 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -{{template "repo/nav" .}} -{{template "repo/toolbar" .}} -
-
- issues -
-
-{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/user/issues.tmpl b/templates/user/issues.tmpl deleted file mode 100644 index dd17b667d1..0000000000 --- a/templates/user/issues.tmpl +++ /dev/null @@ -1,17 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
-
- -

Issues

-
-
-
- {{if .HasInfo}}
{{.InfoMsg}}
{{end}} -
-{{template "base/footer" .}} \ No newline at end of file