From 5336dc80c0968947af76a9522985683033d7df68 Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Sun, 29 Mar 2020 11:10:26 +0800 Subject: [PATCH 1/2] ui: add more message on sidebar menus * add title on the menus * show some message instead of hide choose bar when have nothing to choose * add simply filter for each menus * do same changes in mew_form.tmpl * remove some unusefull comments in mew_form.tmpl Signed-off-by: a1012112796 <1012112796@qq.com> --- options/locale/locale_en-US.ini | 4 + routers/repo/compare.go | 2 + routers/repo/issue.go | 2 + templates/repo/issue/new_form.tmpl | 118 ++++++++++-------- .../repo/issue/view_content/sidebar.tmpl | 77 ++++++++---- 5 files changed, 127 insertions(+), 76 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ed6d74d35a6cd..3208414beb2b0 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -827,14 +827,18 @@ issues.desc = Organize bug reports, tasks and milestones. issues.new = New Issue issues.new.title_empty = Title cannot be empty issues.new.labels = Labels +issues.new.add_labels_title = Apply labels issues.new.no_label = No Label issues.new.clear_labels = Clear labels +issues.new.no_items = No items issues.new.milestone = Milestone +issues.new.add_milestone_title = Set milestone issues.new.no_milestone = No Milestone issues.new.clear_milestone = Clear milestone issues.new.open_milestone = Open Milestones issues.new.closed_milestone = Closed Milestones issues.new.assignees = Assignees +issues.new.add_assignees_title = Assign users issues.new.clear_assignees = Clear assignees issues.new.no_assignees = No Assignees issues.no_ref = No Branch/Tag Specified diff --git a/routers/repo/compare.go b/routers/repo/compare.go index 87b66dc7fb539..5ec5c53fd76d4 100644 --- a/routers/repo/compare.go +++ b/routers/repo/compare.go @@ -432,6 +432,8 @@ func CompareDiff(ctx *context.Context) { setTemplateIfExists(ctx, pullRequestTemplateKey, pullRequestTemplateCandidates) renderAttachmentSettings(ctx) + ctx.Data["IsIssueWriter"] = ctx.Repo.CanWrite(models.UnitTypePullRequests) + ctx.HTML(200, tplCompare) } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 6dbf9cf5c8639..fa25e26852879 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -487,6 +487,8 @@ func NewIssue(ctx *context.Context) { return } + ctx.Data["IsIssueWriter"] = ctx.Repo.CanWrite(models.UnitTypeIssues) + ctx.HTML(200, tplIssueNew) } diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index a53bbdc685aba..2a606e5218b54 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -38,21 +38,35 @@ {{template "repo/issue/branch_selector_field" .}} -
+
{{.i18n.Tr "repo.issues.new.labels"}} - {{svg "octicon-gear" 16}} + {{if .IsIssueWriter}} + {{svg "octicon-gear" 16}} + {{end}}
-
{{.i18n.Tr "repo.issues.new.clear_labels"}}
- {{range .Labels}} - {{svg "octicon-check" 16}} {{.Name}} - {{if .Description }}
{{.Description}}{{end}} +
{{.i18n.Tr "repo.issues.new.add_labels_title"}}
+ {{if or .Labels .OrgLabels}} +
+ + +
{{end}} -
- {{range .OrgLabels}} - {{svg "octicon-check" 16}} {{.Name}} - {{if .Description }}
{{.Description}}{{end}} +
{{.i18n.Tr "repo.issues.new.clear_labels"}}
+ {{if or .Labels .OrgLabels}} + {{range .Labels}} + {{svg "octicon-check" 16}} {{.Name}} + {{if .Description }}
{{.Description}}{{end}} + {{end}} + +
+ {{range .OrgLabels}} + {{svg "octicon-check" 16}} {{.Name}} + {{if .Description }}
{{.Description}}{{end}} + {{end}} + {{else}} +
{{.i18n.Tr "repo.issues.new.no_items"}}
{{end}}
@@ -69,31 +83,46 @@
-
+
{{.i18n.Tr "repo.issues.new.milestone"}} - {{svg "octicon-gear" 16}} + {{if .IsIssueWriter}} + {{svg "octicon-gear" 16}} + {{end}}
+
{{.i18n.Tr "repo.issues.new.add_milestone_title"}}
+ {{if or .OpenMilestones .ClosedMilestones}} +
+ + +
+ {{end}}
{{.i18n.Tr "repo.issues.new.clear_milestone"}}
- {{if .OpenMilestones}} -
-
- {{svg "octicon-milestone" 16}} - {{.i18n.Tr "repo.issues.new.open_milestone"}} + {{if and (not .OpenMilestones) (not .ClosedMilestones)}} +
+ {{.i18n.Tr "repo.issues.new.no_items"}}
- {{range .OpenMilestones}} -
{{.Name}}
+ {{else}} + {{if .OpenMilestones}} +
+
+ {{svg "octicon-milestone" 16}} + {{.i18n.Tr "repo.issues.new.open_milestone"}} +
+ {{range .OpenMilestones}} +
{{.Name}}
+ {{end}} {{end}} - {{end}} - {{if .ClosedMilestones}} -
-
- {{svg "octicon-milestone" 16}} - {{.i18n.Tr "repo.issues.new.closed_milestone"}} -
- {{range .ClosedMilestones}} - {{.Name}} + {{if .ClosedMilestones}} +
+
+ {{svg "octicon-milestone" 16}} + {{.i18n.Tr "repo.issues.new.closed_milestone"}} +
+ {{range .ClosedMilestones}} + {{.Name}} + {{end}} {{end}} {{end}}
@@ -110,12 +139,19 @@
-
+
{{.i18n.Tr "repo.issues.new.assignees"}} - {{svg "octicon-gear" 16}} + {{if .IsIssueWriter}} + {{svg "octicon-gear" 16}} + {{end}}
+
{{.i18n.Tr "repo.issues.new.add_assignees_title"}}
+
+ + +
{{.i18n.Tr "repo.issues.new.clear_assignees"}}
{{range .Assignees}} @@ -137,28 +173,6 @@ {{end}}
- -
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index d0275c23f4aa7..14dcc3aa34847 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -10,15 +10,26 @@ {{end}}
-
{{.i18n.Tr "repo.issues.new.clear_labels"}}
- {{range .Labels}} - {{svg "octicon-check" 16}} {{.Name}} - {{if .Description }}
{{.Description}}{{end}} +
{{.i18n.Tr "repo.issues.new.add_labels_title"}}
+ {{if or .Labels .OrgLabels}} +
+ + +
{{end}} -
- {{range .OrgLabels}} - {{svg "octicon-check" 16}} {{.Name}} - {{if .Description }}
{{.Description}}{{end}} +
{{.i18n.Tr "repo.issues.new.clear_labels"}}
+ {{if or .Labels .OrgLabels}} + {{range .Labels}} + {{svg "octicon-check" 16}} {{.Name}} + {{if .Description }}
{{.Description}}{{end}} + {{end}} +
+ {{range .OrgLabels}} + {{svg "octicon-check" 16}} {{.Name}} + {{if .Description }}
{{.Description}}{{end}} + {{end}} + {{else}} +
{{.i18n.Tr "repo.issues.new.no_items"}}
{{end}}
@@ -47,25 +58,38 @@ {{end}}
+
{{.i18n.Tr "repo.issues.new.add_milestone_title"}}
+ {{if or .OpenMilestones .ClosedMilestones}} +
+ + +
+ {{end}}
{{.i18n.Tr "repo.issues.new.clear_milestone"}}
- {{if .OpenMilestones}} -
-
- {{svg "octicon-milestone" 16}} - {{.i18n.Tr "repo.issues.new.open_milestone"}} + {{if and (not .OpenMilestones) (not .ClosedMilestones)}} +
+ {{.i18n.Tr "repo.issues.new.no_items"}}
- {{range .OpenMilestones}} -
{{.Name}}
+ {{else}} + {{if .OpenMilestones}} +
+
+ {{svg "octicon-milestone" 16}} + {{.i18n.Tr "repo.issues.new.open_milestone"}} +
+ {{range .OpenMilestones}} +
{{.Name}}
+ {{end}} {{end}} - {{end}} - {{if .ClosedMilestones}} -
-
- {{svg "octicon-milestone" 16}} - {{.i18n.Tr "repo.issues.new.closed_milestone"}} -
- {{range .ClosedMilestones}} - {{.Name}} + {{if .ClosedMilestones}} +
+
+ {{svg "octicon-milestone" 16}} + {{.i18n.Tr "repo.issues.new.closed_milestone"}} +
+ {{range .ClosedMilestones}} + {{.Name}} + {{end}} {{end}} {{end}}
@@ -90,6 +114,11 @@ {{end}}
+
{{.i18n.Tr "repo.issues.new.add_assignees_title"}}
+
+ + +
{{.i18n.Tr "repo.issues.new.clear_assignees"}}
{{range .Assignees}} From fa2f79496d6f4ddf75790ea877db97b717ecdd92 Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Sat, 4 Apr 2020 00:34:50 +0800 Subject: [PATCH 2/2] do review suggestions * add filter message on sidebar filter * change IsIssueWriter to HasIssuesOrPullsWritePermission --- options/locale/locale_en-US.ini | 3 +++ routers/repo/compare.go | 2 +- routers/repo/issue.go | 4 ++-- routers/repo/pull.go | 2 +- templates/repo/issue/new_form.tmpl | 18 +++++++-------- templates/repo/issue/view_content.tmpl | 6 ++--- .../repo/issue/view_content/context_menu.tmpl | 2 +- .../repo/issue/view_content/sidebar.tmpl | 22 +++++++++---------- templates/repo/issue/view_title.tmpl | 2 +- 9 files changed, 32 insertions(+), 29 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 3208414beb2b0..cb34e695ec960 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -824,6 +824,9 @@ ext_issues = Ext. Issues ext_issues.desc = Link to an external issue tracker. issues.desc = Organize bug reports, tasks and milestones. +issues.filter_assignees = Filter Assignee +issues.filter_milestones = Filter Milestone +issues.filter_labels = Filter Label issues.new = New Issue issues.new.title_empty = Title cannot be empty issues.new.labels = Labels diff --git a/routers/repo/compare.go b/routers/repo/compare.go index 5ec5c53fd76d4..198c75e6521c7 100644 --- a/routers/repo/compare.go +++ b/routers/repo/compare.go @@ -432,7 +432,7 @@ func CompareDiff(ctx *context.Context) { setTemplateIfExists(ctx, pullRequestTemplateKey, pullRequestTemplateCandidates) renderAttachmentSettings(ctx) - ctx.Data["IsIssueWriter"] = ctx.Repo.CanWrite(models.UnitTypePullRequests) + ctx.Data["HasIssuesOrPullsWritePermission"] = ctx.Repo.CanWrite(models.UnitTypePullRequests) ctx.HTML(200, tplCompare) } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index fa25e26852879..0697d11a6623c 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -487,7 +487,7 @@ func NewIssue(ctx *context.Context) { return } - ctx.Data["IsIssueWriter"] = ctx.Repo.CanWrite(models.UnitTypeIssues) + ctx.Data["HasIssuesOrPullsWritePermission"] = ctx.Repo.CanWrite(models.UnitTypeIssues) ctx.HTML(200, tplIssueNew) } @@ -1078,7 +1078,7 @@ func ViewIssue(ctx *context.Context) { ctx.Data["ReadOnly"] = true ctx.Data["SignInLink"] = setting.AppSubURL + "/user/login?redirect_to=" + ctx.Data["Link"].(string) ctx.Data["IsIssuePoster"] = ctx.IsSigned && issue.IsPoster(ctx.User.ID) - ctx.Data["IsIssueWriter"] = ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) + ctx.Data["HasIssuesOrPullsWritePermission"] = ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) ctx.Data["IsRepoAdmin"] = ctx.IsSigned && (ctx.Repo.IsAdmin() || ctx.User.IsAdmin) ctx.Data["LockReasons"] = setting.Repository.Issue.LockReasons ctx.HTML(200, tplIssueView) diff --git a/routers/repo/pull.go b/routers/repo/pull.go index c29cfb81b22d0..55b8bbb42f521 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -652,7 +652,7 @@ func ViewPullFiles(ctx *context.Context) { } getBranchData(ctx, issue) ctx.Data["IsIssuePoster"] = ctx.IsSigned && issue.IsPoster(ctx.User.ID) - ctx.Data["IsIssueWriter"] = ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) + ctx.Data["HasIssuesOrPullsWritePermission"] = ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) ctx.HTML(200, tplPullFiles) } diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 2a606e5218b54..0f6cd160720d2 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -38,10 +38,10 @@ {{template "repo/issue/branch_selector_field" .}} -
+
{{.i18n.Tr "repo.issues.new.labels"}} - {{if .IsIssueWriter}} + {{if .HasIssuesOrPullsWritePermission}} {{svg "octicon-gear" 16}} {{end}} @@ -50,7 +50,7 @@ {{if or .Labels .OrgLabels}}
- +
{{end}}
{{.i18n.Tr "repo.issues.new.clear_labels"}}
@@ -83,10 +83,10 @@
-
+
{{.i18n.Tr "repo.issues.new.milestone"}} - {{if .IsIssueWriter}} + {{if .HasIssuesOrPullsWritePermission}} {{svg "octicon-gear" 16}} {{end}} @@ -95,7 +95,7 @@ {{if or .OpenMilestones .ClosedMilestones}}
- +
{{end}}
{{.i18n.Tr "repo.issues.new.clear_milestone"}}
@@ -139,10 +139,10 @@
-
+
{{.i18n.Tr "repo.issues.new.assignees"}} - {{if .IsIssueWriter}} + {{if .HasIssuesOrPullsWritePermission}} {{svg "octicon-gear" 16}} {{end}} @@ -150,7 +150,7 @@
{{.i18n.Tr "repo.issues.new.add_assignees_title"}}
- +
{{.i18n.Tr "repo.issues.new.clear_assignees"}}
{{range .Assignees}} diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index d336b78049bcc..622c09dc024cc 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -66,7 +66,7 @@ {{ template "repo/issue/view_content/pull". }} {{end}} {{if .IsSigned}} - {{ if and (or .IsRepoAdmin .IsIssueWriter (or (not .Issue.IsLocked))) (not .Repository.IsArchived) }} + {{ if and (or .IsRepoAdmin .HasIssuesOrPullsWritePermission (or (not .Issue.IsLocked))) (not .Repository.IsArchived) }}
@@ -77,7 +77,7 @@ {{.CsrfTokenHtml}}
- {{if and (or .IsIssueWriter .IsIssuePoster) (not .DisableStatusChange)}} + {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .DisableStatusChange)}} {{if .Issue.IsClosed}}
{{.i18n.Tr "repo.issues.reopen_issue"}} @@ -126,7 +126,7 @@ {{.CsrfTokenHtml}}
- {{if and (or .IsIssueWriter .IsIssuePoster) (not .DisableStatusChange)}} + {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .DisableStatusChange)}} {{if .Issue.IsClosed}}
{{.i18n.Tr "repo.issues.reopen_issue"}} diff --git a/templates/repo/issue/view_content/context_menu.tmpl b/templates/repo/issue/view_content/context_menu.tmpl index 8a96f27ff92fe..ca900a7714cd3 100644 --- a/templates/repo/issue/view_content/context_menu.tmpl +++ b/templates/repo/issue/view_content/context_menu.tmpl @@ -10,7 +10,7 @@
{{.ctx.i18n.Tr "repo.issues.context.copy_link"}}
{{end}}
{{.ctx.i18n.Tr "repo.issues.context.quote_reply"}}
- {{if or .ctx.Permission.IsAdmin .ctx.IsIssuePoster .ctx.IsIssueWriter}} + {{if or .ctx.Permission.IsAdmin .ctx.IsIssuePoster .ctx.HasIssuesOrPullsWritePermission}}
{{.ctx.i18n.Tr "repo.issues.context.edit"}}
{{if .delete}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 14dcc3aa34847..2aed8f31580bd 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -2,10 +2,10 @@
{{template "repo/issue/branch_selector_field" .}} -
+
{{.i18n.Tr "repo.issues.new.labels"}} - {{if and .IsIssueWriter (not .Repository.IsArchived)}} + {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} {{svg "octicon-gear" 16}} {{end}} @@ -14,7 +14,7 @@ {{if or .Labels .OrgLabels}}
- +
{{end}}
{{.i18n.Tr "repo.issues.new.clear_labels"}}
@@ -50,10 +50,10 @@
-
+
{{.i18n.Tr "repo.issues.new.milestone"}} - {{if and .IsIssueWriter (not .Repository.IsArchived)}} + {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} {{svg "octicon-gear" 16}} {{end}} @@ -62,7 +62,7 @@ {{if or .OpenMilestones .ClosedMilestones}}
- +
{{end}}
{{.i18n.Tr "repo.issues.new.clear_milestone"}}
@@ -106,10 +106,10 @@
-
+
{{.i18n.Tr "repo.issues.new.assignees"}} - {{if and .IsIssueWriter (not .Repository.IsArchived)}} + {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} {{svg "octicon-gear" 16}} {{end}} @@ -117,7 +117,7 @@
{{.i18n.Tr "repo.issues.new.add_assignees_title"}}
- +
{{.i18n.Tr "repo.issues.new.clear_assignees"}}
{{range .Assignees}} @@ -270,7 +270,7 @@ {{if .Issue.IsOverdue}} {{.i18n.Tr "repo.issues.due_date_overdue"}} {{end}} - {{if and .IsIssueWriter (not .Repository.IsArchived)}} + {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
{{$.i18n.Tr "repo.issues.due_date_form_edit"}} - {{$.i18n.Tr "repo.issues.due_date_form_remove"}} @@ -280,7 +280,7 @@

{{.i18n.Tr "repo.issues.due_date_not_set"}}

{{end}} - {{if and .IsIssueWriter (not .Repository.IsArchived)}} + {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - {{if and (or .IsIssueWriter .IsIssuePoster) (not .Repository.IsArchived)}} + {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}
{{.i18n.Tr "repo.issues.edit"}}