From a03f380fa86f83f35a5636535ec3002100b335bb Mon Sep 17 00:00:00 2001 From: FuXiaoHei Date: Thu, 8 May 2014 21:49:05 +0800 Subject: [PATCH] assignee ui in issue view --- public/css/gogs.css | 20 +++++-- templates/issue/view.tmpl | 122 ++++++++++++++++++++------------------ 2 files changed, 80 insertions(+), 62 deletions(-) diff --git a/public/css/gogs.css b/public/css/gogs.css index bf43375b7e..f245a56b85 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -1434,35 +1434,45 @@ html, body { margin-bottom: 8px; } -#issue .milestone-item .label{ +#issue .milestone-item .label { margin-top: 8px; float: left; padding: .5em; margin-left: .8em; } -#issue .assignee,#issue .assignee ul{ +#issue .assignee.dropdown-menu, #issue .assignee ul { padding: 0; margin: 0; min-width: 300px; } -#issue .assignee li{ +#issue .assignee li { padding: 4px 12px; line-height: 30px; } -#issue .assignee li:hover{ +#issue .assignee li:hover { background-color: #e8f0ff; cursor: pointer; } -#issue .assignee li img{ +#issue .assignee li img, #issue .issue-bar .assignee img { width: 28px; height: 28px; margin-right: 12px; } +#issue .issue-bar > div { + padding-bottom: 8px; + margin-bottom: 8px; + border-bottom: 1px solid #CCC; +} + +#issue .issue-bar .assignee { + line-height: 30px; +} + /* wrapper and footer */ #wrapper { diff --git a/templates/issue/view.tmpl b/templates/issue/view.tmpl index 19dce4f2df..6c069f3c86 100644 --- a/templates/issue/view.tmpl +++ b/templates/issue/view.tmpl @@ -5,64 +5,65 @@
-
-
#{{.Issue.Index}}
- -

{{.Issue.Name}}

- - -

- {{if .IsIssueOwner}}Edit - - {{end}} - {{if .Issue.IsClosed}}Closed{{else}}Open{{end}} - {{.Issue.Poster.Name}} opened this issue - {{TimeSince .Issue.Created}} · {{.Issue.NumComments}} comments -

-
-
-
-
-
- {{str2html .Issue.RenderedContent}} -
- -
-
- {{range .Comments}} - {{if eq .Type 0}} -
- -
-
- {{.Poster.Name}} commented {{TimeSince .Created}} - - Owner -
-
- {{str2html .Content}} -
-
-
- {{else if eq .Type 1}} -
- -
- {{.Poster.Name}} Reopened this issue {{TimeSince .Created}} -
-
- {{else if eq .Type 2}} -
- -
- {{.Poster.Name}} Closed this issue {{TimeSince .Created}} +
+
+
#{{.Issue.Index}}
+ +

{{.Issue.Name}}

+ + +

+ {{if .IsIssueOwner}}Edit + + {{end}} + {{if .Issue.IsClosed}}Closed{{else}}Open{{end}} + {{.Issue.Poster.Name}} opened this issue + {{TimeSince .Issue.Created}} · {{.Issue.NumComments}} comments +

+
+
+
+
+
+ {{str2html .Issue.RenderedContent}} +
+ +
-
- {{end}} - {{end}} -
- {{if .SignedUser}}
+ {{range .Comments}} + {{if eq .Type 0}} +
+ +
+
+ {{.Poster.Name}} commented {{TimeSince .Created}} + + Owner +
+
+ {{str2html .Content}} +
+
+
+ {{else if eq .Type 1}} +
+ +
+ {{.Poster.Name}} Reopened this issue {{TimeSince .Created}} +
+
+ {{else if eq .Type 2}} +
+ +
+ {{.Poster.Name}} Closed this issue {{TimeSince .Created}} +
+
+ {{end}} + {{end}} +
+ {{if .SignedUser}}
{{.CsrfTokenHtml}} @@ -95,6 +96,13 @@
{{else}}
Sign up for free to join this conversation. Already have an account? Sign in to comment
{{end}} +
+
+
+
+

Assignee

+

fuxiaohei

+