From ad9add55008bb9f61c2ffa33c951e65352eb8041 Mon Sep 17 00:00:00 2001 From: JFronny Date: Tue, 18 Jul 2023 13:49:54 +0200 Subject: [PATCH] Update templates --- templates/repo/issue/list.tmpl | 187 ++++++++++++++++++------- templates/repo/issue/view.tmpl | 36 ----- templates/repo/issue/view_content.tmpl | 69 ++++----- templates/repo/issue/view_title.tmpl | 122 ++++++++++++++++ 4 files changed, 292 insertions(+), 122 deletions(-) delete mode 100644 templates/repo/issue/view.tmpl create mode 100644 templates/repo/issue/view_title.tmpl diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 4425994..f23095d 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -2,44 +2,97 @@
{{template "repo/header" .}}
-
-
- {{template "repo/issue/navbar" .}} -
-
- {{template "repo/issue/search" .}} -
- {{if not .Repository.IsArchived}} -
- {{if .PageIsIssueList}} - {{if .IsSigned}} - {{.locale.Tr "repo.issues.new"}} + + {{if .PinnedIssues}} +
+ {{range .PinnedIssues}} +
+ {{if eq $.Project.CardType 1}} +
+ {{range (index $.issuesAttachmentMap .ID)}} + {{.Name}} + {{end}} +
+ {{end}} +
+
+
+ {{template "shared/issueicon" .}} +
+ {{.Title | RenderEmoji $.Context | RenderCodeBlock}} + {{if $.IsRepoAdmin}} + + {{svg "octicon-x" 16}} + + {{end}} +
+
+ + #{{.Index}} + {{$timeStr := TimeSinceUnix .GetLastEventTimestamp $.locale}} + {{if .OriginalAuthor}} + {{$.locale.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}} + {{else if gt .Poster.ID 0}} + {{$.locale.Tr .GetLastEventLabel $timeStr (.Poster.HomeLink|Escape) (.Poster.GetDisplayName | Escape) | Safe}} + {{else}} + {{$.locale.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}} + {{end}} + +
+ {{- if .MilestoneID}} +
+ + {{svg "octicon-milestone" 16 "gt-mr-2 gt-vm"}} + {{.Milestone.Name}} + +
+ {{- end}} +
+ + {{if or .Labels .Assignees}} +
+ {{range .Labels}} + {{RenderLabel $.Context .}} {{end}} - Helpdesk - {{else}} - {{.locale.Tr "repo.pulls.new"}} +
+ {{range .Assignees}} + {{avatar $.Context . 28 "mini gt-mr-3"}} + {{end}} +
+
{{end}}
+ {{end}} +
+ {{end}} + +
+ {{template "repo/issue/navbar" .}} + {{template "repo/issue/search" .}} + {{if not .Repository.IsArchived}} + {{if .PageIsIssueList}} + {{.locale.Tr "repo.issues.new"}} + Helpdesk + {{else}} + {{.locale.Tr "repo.pulls.new"}} + {{end}} {{else}} {{if not .PageIsIssueList}} -
- {{$.locale.Tr "action.compare_commits_general"}} -
+ {{$.locale.Tr "action.compare_commits_general"}} {{end}} {{end}}
-
-
-
- {{if $.CanWriteIssuesOrPulls}} - +
+
+ {{if and ($.CanWriteIssuesOrPulls) (gt (len .Issues) 0)}} + {{end}} {{template "repo/issue/openclose" .}}
-
-
+
+
-
+
{{.locale.Tr "repo.issues.filter_label"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -50,11 +103,13 @@
{{.locale.Tr "repo.issues.filter_label_exclude" | Safe}} +
+ {{.locale.Tr "repo.issues.filter_label_select_no_label"}} {{.locale.Tr "repo.issues.filter_label_no_select"}} {{$previousExclusiveScope := "_no_scope"}} {{range .Labels}} {{$exclusiveScope := .ExclusiveScope}} - {{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}} + {{if and (ne $previousExclusiveScope $exclusiveScope)}}
{{end}} {{$previousExclusiveScope = $exclusiveScope}} @@ -64,7 +119,7 @@
-
+
{{.locale.Tr "repo.issues.filter_milestone"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -74,9 +129,28 @@ {{svg "octicon-search" 16}}
- {{.locale.Tr "repo.issues.filter_milestone_no_select"}} - {{range .Milestones}} - {{.Name}} +
+ {{.locale.Tr "repo.issues.filter_milestone_all"}} + {{.locale.Tr "repo.issues.filter_milestone_none"}} + {{if .OpenMilestones}} +
+
{{.locale.Tr "repo.issues.filter_milestone_open"}}
+ {{range .OpenMilestones}} + + {{svg "octicon-milestone" 16 "mr-2"}} + {{.Name}} + + {{end}} + {{end}} + {{if .ClosedMilestones}} +
+
{{.locale.Tr "repo.issues.filter_milestone_closed"}}
+ {{range .ClosedMilestones}} + + {{svg "octicon-milestone" 16 "mr-2"}} + {{.Name}} + + {{end}} {{end}}
@@ -149,6 +223,7 @@ {{svg "octicon-search" 16}}
+ {{.locale.Tr "repo.issues.filter_assginee_no_assignee"}} {{.locale.Tr "repo.issues.filter_assginee_no_select"}} {{range .Assignees}} @@ -179,7 +254,7 @@ {{end}} -
+
{{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -198,22 +273,19 @@
-
-
+ +
+
{{template "repo/issue/openclose" .}}
- {{/* Ten wide does not cope well and makes the columns stack. - This seems to be related to jQuery's hide/show: in fact, switching - issue-actions and issue-filters and having this ten wide will show - this one correctly, but not the other one. */}} -
-
+
+
{{if not .Repository.IsArchived}} {{if .IsShowClosed}} - + {{else}} - + {{end}}
@@ -222,6 +294,9 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
+
+ {{.locale.Tr "repo.issues.new.clear_labels"}} +
{{$previousExclusiveScope := "_no_scope"}} {{range .Labels}} {{$exclusiveScope := .ExclusiveScope}} @@ -230,14 +305,14 @@ {{end}} {{$previousExclusiveScope = $exclusiveScope}}
- {{if contain $.SelLabelIDs .ID}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context .}} + {{if SliceUtils.Contains $.SelLabelIDs .ID}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context .}}
{{end}}
-
+
{{.locale.Tr "repo.issues.action_milestone"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -246,10 +321,23 @@
{{.locale.Tr "repo.issues.action_milestone_no_select"}}
- {{range .Milestones}} -
- {{.Name}} -
+ {{if .OpenMilestones}} +
+
{{.locale.Tr "repo.issues.filter_milestone_open"}}
+ {{range .OpenMilestones}} +
+ {{.Name}} +
+ {{end}} + {{end}} + {{if .ClosedMilestones}} +
+
{{.locale.Tr "repo.issues.filter_milestone_open"}}
+ {{range .ClosedMilestones}} +
+ {{.Name}} +
+ {{end}} {{end}}
@@ -296,6 +384,9 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
+
+ {{.locale.Tr "repo.issues.new.clear_assignees"}} +
{{.locale.Tr "repo.issues.action_assignee_no_select"}}
diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl deleted file mode 100644 index f91f975..0000000 --- a/templates/repo/issue/view.tmpl +++ /dev/null @@ -1,36 +0,0 @@ -{{template "base/head" .}} -
- {{template "repo/header" .}} -
-
-
- {{template "repo/issue/navbar" .}} -
- {{if and (not .Repository.IsArchived) (not .Issue.IsPull)}} -
- {{if .PageIsIssueList}} - {{if .IsSigned}} - {{.locale.Tr "repo.issues.new"}} - {{end}} - Helpdesk - {{else}} - {{.locale.Tr "repo.pulls.new"}} - {{end}} -
- {{end}} -
-
- {{if .Issue.IsPull}} - {{template "repo/issue/view_title" .}} - {{template "repo/pulls/tab_menu" .}} -
- {{template "repo/issue/view_content" .}} -
- {{else}} -
- {{template "repo/issue/view_content" .}} -
- {{end}} -
-
-{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index f3e0c5f..a9737e5 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -1,13 +1,4 @@ -
- {{if .Flash}} -
- {{template "base/alert" .}} -
- {{end}} - {{if not .Issue.IsPull}} - {{template "repo/issue/view_title" .}} - {{end}} - +
@@ -16,25 +7,27 @@ {{$createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale}} -
+
{{if .Issue.OriginalAuthor}} - + + + {{else}} - {{avatar $.Context .Issue.Poster}} + {{avatar $.Context .Issue.Poster 40}} {{end}}
{{if .Issue.OriginalAuthor}} - + {{svg (MigrationIcon .Repository.GetOriginalURLHostname)}} {{.Issue.OriginalAuthor}} - + {{.locale.Tr "repo.issues.commented_at" (.Issue.HashTag|Escape) $createdStr | Safe}} @@ -42,9 +35,9 @@ {{else}} - {{avatar $.Context .Issue.Poster}} + {{avatar $.Context .Issue.Poster 24}} - + {{template "shared/user/authorlink" .Issue.Poster}} {{.locale.Tr "repo.issues.commented_at" (.Issue.HashTag|Escape) $createdStr | Safe}} @@ -78,16 +71,14 @@ {{end}}
{{.Issue.Content}}
-
+
{{if .Issue.Attachments}} {{template "repo/issue/view_content/attachments" dict "ctxData" $ "Attachments" .Issue.Attachments "Content" .Issue.RenderedContent}} {{end}}
{{$reactions := .Issue.Reactions.GroupByType}} {{if $reactions}} -
- {{template "repo/issue/view_content/reactions" dict "ctxData" $ "ActionURL" (printf "%s/issues/%d/reactions" $.RepoLink .Issue.Index) "Reactions" $reactions}} -
+ {{template "repo/issue/view_content/reactions" dict "ctxData" $ "ActionURL" (printf "%s/issues/%d/reactions" $.RepoLink .Issue.Index) "Reactions" $reactions}} {{end}}
@@ -102,7 +93,7 @@ {{if and (or .IsRepoAdmin .HasIssuesOrPullsWritePermission (not .Issue.IsLocked)) (not .Repository.IsArchived)}}
- {{avatar $.Context .SignedUser}} + {{avatar $.Context .SignedUser 40}}
@@ -153,10 +144,10 @@ {{end}}
{{else}} - {{if .Issue.IsPull}} -
- {{.locale.Tr "repo.issues.sign_in_require_desc" (.SignInLink|Escape) | Safe}} -
+ {{if .Issue.IsPull}} +
+ {{.locale.Tr "repo.issues.sign_in_require_desc" (.SignInLink|Escape) | Safe}} +
{{else}} {{.locale.Tr "repo.issues.create_comment"}} {{end}} @@ -170,13 +161,15 @@