diff --git a/roles/gitea/files/tmpl/user/dashboard/feeds.tmpl b/roles/gitea/files/tmpl/user/dashboard/feeds.tmpl index 20af51f..a534951 100644 --- a/roles/gitea/files/tmpl/user/dashboard/feeds.tmpl +++ b/roles/gitea/files/tmpl/user/dashboard/feeds.tmpl @@ -1,128 +1,128 @@ {{range .Feeds}} {{if and (ne .ActUser.ID 2) (ne .ActUser.ID 17)}} -
-
- {{avatarByAction .}} -
-
-
-
-

- {{if gt .ActUser.ID 0}} - {{.GetDisplayName}} - {{else}} - {{.ShortActUserName}} - {{end}} - {{if eq .GetOpType 1}} - {{$.i18n.Tr "action.create_repo" (.GetRepoLink|Escape) (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 2}} - {{$.i18n.Tr "action.rename_repo" (.GetContent|Escape) (.GetRepoLink|Escape) (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 5}} - {{if .Content}} - {{$.i18n.Tr "action.commit_repo" (.GetRepoLink|Escape) (.GetRefLink|Escape) (Escape .GetBranch) (.ShortRepoPath|Escape) | Str2html}} - {{else}} - {{$.i18n.Tr "action.create_branch" (.GetRepoLink|Escape) (.GetRefLink|Escape) (Escape .GetBranch) (.ShortRepoPath|Escape) | Str2html}} - {{end}} - {{else if eq .GetOpType 6}} - {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.create_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 7}} - {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.create_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 8}} - {{$.i18n.Tr "action.transfer_repo" .GetContent (.GetRepoLink|Escape) (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 9}} - {{$.i18n.Tr "action.push_tag" (.GetRepoLink|Escape) (.GetRefLink|Escape) (.GetTag|Escape) (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 10}} - {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.comment_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 11}} - {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.merge_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 12}} - {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.close_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 13}} - {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.reopen_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 14}} - {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.close_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 15}} - {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.reopen_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 16}} - {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.delete_tag" (.GetRepoLink|Escape) (.GetTag|Escape) (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 17}} - {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.delete_branch" (.GetRepoLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 18}} - {{$.i18n.Tr "action.mirror_sync_push" (.GetRepoLink|Escape) (.GetRefLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 19}} - {{$.i18n.Tr "action.mirror_sync_create" (.GetRepoLink|Escape) (.GetRefLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 20}} - {{$.i18n.Tr "action.mirror_sync_delete" (.GetRepoLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 21}} - {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.approve_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 22}} - {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.reject_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 23}} - {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.comment_pull" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} - {{else if eq .GetOpType 24}} - {{ $linkText := .Content | RenderEmoji }} - {{$.i18n.Tr "action.publish_release" (.GetRepoLink|Escape) ((printf "%s/releases/tag/%s" .GetRepoLink .GetTag)|Escape) (.ShortRepoPath|Escape) $linkText | Str2html}} - {{else if eq .GetOpType 25}} - {{ $index := index .GetIssueInfos 0}} - {{ $reviewer := index .GetIssueInfos 1}} - {{$.i18n.Tr "action.review_dismissed" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) $reviewer | Str2html}} - {{end}} -

- {{if or (eq .GetOpType 5) (eq .GetOpType 18)}} -
-
    - {{ $push := ActionContent2Commits .}} - {{ $repoLink := .GetRepoLink}} - {{range $push.Commits}} - {{ $commitLink := printf "%s/commit/%s" $repoLink .Sha1}} -
  • - {{avatarHTML ($push.AvatarLink .AuthorEmail) 16 "mr-2" .AuthorName}} - {{ShortSha .Sha1}} - - {{RenderCommitMessage $.Context .Message $repoLink $.ComposeMetas}} - -
    • - {{end}} - {{if and (gt $push.Len 1) $push.CompareURL}}
  • {{$.i18n.Tr "action.compare_commits" $push.Len}} »
    • {{end}} -
-
- {{else if eq .GetOpType 6}} - {{index .GetIssueInfos 1 | RenderEmoji}} - {{else if eq .GetOpType 7}} - {{index .GetIssueInfos 1 | RenderEmoji}} - {{else if or (eq .GetOpType 10) (eq .GetOpType 21) (eq .GetOpType 22) (eq .GetOpType 23)}} - {{.GetIssueTitle | RenderEmoji}} - {{$comment := index .GetIssueInfos 1}} - {{if gt (len $comment) 0}}

{{$comment | RenderEmoji}}

{{end}} - {{else if eq .GetOpType 11}} -

{{index .GetIssueInfos 1}}

- {{else if or (eq .GetOpType 12) (eq .GetOpType 13) (eq .GetOpType 14) (eq .GetOpType 15)}} - {{.GetIssueTitle | RenderEmoji}} - {{else if eq .GetOpType 25}} -

{{$.i18n.Tr "action.review_dismissed_reason"}}

-

{{index .GetIssueInfos 2 | RenderEmoji}}

- {{end}} -

{{TimeSince .GetCreate $.i18n.Lang}}

-
-
-
- {{svg (printf "octicon-%s" (ActionIcon .GetOpType)) 32}} -
-
-
-
+
+
+ {{avatarByAction .}} +
+
+
+
+

+ {{if gt .ActUser.ID 0}} + {{.GetDisplayName}} + {{else}} + {{.ShortActUserName}} + {{end}} + {{if eq .GetOpType 1}} + {{$.locale.Tr "action.create_repo" (.GetRepoLink|Escape) (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 2}} + {{$.locale.Tr "action.rename_repo" (.GetContent|Escape) (.GetRepoLink|Escape) (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 5}} + {{if .Content}} + {{$.locale.Tr "action.commit_repo" (.GetRepoLink|Escape) (.GetRefLink|Escape) (Escape .GetBranch) (.ShortRepoPath|Escape) | Str2html}} + {{else}} + {{$.locale.Tr "action.create_branch" (.GetRepoLink|Escape) (.GetRefLink|Escape) (Escape .GetBranch) (.ShortRepoPath|Escape) | Str2html}} + {{end}} + {{else if eq .GetOpType 6}} + {{$index := index .GetIssueInfos 0}} + {{$.locale.Tr "action.create_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 7}} + {{$index := index .GetIssueInfos 0}} + {{$.locale.Tr "action.create_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 8}} + {{$.locale.Tr "action.transfer_repo" .GetContent (.GetRepoLink|Escape) (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 9}} + {{$.locale.Tr "action.push_tag" (.GetRepoLink|Escape) (.GetRefLink|Escape) (.GetTag|Escape) (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 10}} + {{$index := index .GetIssueInfos 0}} + {{$.locale.Tr "action.comment_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 11}} + {{$index := index .GetIssueInfos 0}} + {{$.locale.Tr "action.merge_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 12}} + {{$index := index .GetIssueInfos 0}} + {{$.locale.Tr "action.close_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 13}} + {{$index := index .GetIssueInfos 0}} + {{$.locale.Tr "action.reopen_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 14}} + {{$index := index .GetIssueInfos 0}} + {{$.locale.Tr "action.close_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 15}} + {{$index := index .GetIssueInfos 0}} + {{$.locale.Tr "action.reopen_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 16}} + {{$index := index .GetIssueInfos 0}} + {{$.locale.Tr "action.delete_tag" (.GetRepoLink|Escape) (.GetTag|Escape) (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 17}} + {{$index := index .GetIssueInfos 0}} + {{$.locale.Tr "action.delete_branch" (.GetRepoLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 18}} + {{$.locale.Tr "action.mirror_sync_push" (.GetRepoLink|Escape) (.GetRefLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 19}} + {{$.locale.Tr "action.mirror_sync_create" (.GetRepoLink|Escape) (.GetRefLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 20}} + {{$.locale.Tr "action.mirror_sync_delete" (.GetRepoLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 21}} + {{$index := index .GetIssueInfos 0}} + {{$.locale.Tr "action.approve_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 22}} + {{$index := index .GetIssueInfos 0}} + {{$.locale.Tr "action.reject_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 23}} + {{$index := index .GetIssueInfos 0}} + {{$.locale.Tr "action.comment_pull" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{else if eq .GetOpType 24}} + {{$linkText := .Content | RenderEmoji}} + {{$.locale.Tr "action.publish_release" (.GetRepoLink|Escape) ((printf "%s/releases/tag/%s" .GetRepoLink .GetTag)|Escape) (.ShortRepoPath|Escape) $linkText | Str2html}} + {{else if eq .GetOpType 25}} + {{$index := index .GetIssueInfos 0}} + {{$reviewer := index .GetIssueInfos 1}} + {{$.locale.Tr "action.review_dismissed" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) $reviewer | Str2html}} + {{end}} +

+ {{if or (eq .GetOpType 5) (eq .GetOpType 18)}} +
+
    + {{$push := ActionContent2Commits .}} + {{$repoLink := .GetRepoLink}} + {{range $push.Commits}} + {{$commitLink := printf "%s/commit/%s" $repoLink .Sha1}} +
  • + {{avatarHTML ($push.AvatarLink .AuthorEmail) 16 "mr-2" .AuthorName}} + {{ShortSha .Sha1}} + + {{RenderCommitMessage $.Context .Message $repoLink $.ComposeMetas}} + +
    • + {{end}} + {{if and (gt $push.Len 1) $push.CompareURL}}
  • {{$.locale.Tr "action.compare_commits" $push.Len}} »
    • {{end}} +
+
+ {{else if eq .GetOpType 6}} + {{index .GetIssueInfos 1 | RenderEmoji | RenderCodeBlock}} + {{else if eq .GetOpType 7}} + {{index .GetIssueInfos 1 | RenderEmoji | RenderCodeBlock}} + {{else if or (eq .GetOpType 10) (eq .GetOpType 21) (eq .GetOpType 22) (eq .GetOpType 23)}} + {{.GetIssueTitle | RenderEmoji | RenderCodeBlock}} + {{$comment := index .GetIssueInfos 1}} + {{if gt (len $comment) 0}}

{{$comment | RenderEmoji}}

{{end}} + {{else if eq .GetOpType 11}} +

{{index .GetIssueInfos 1}}

+ {{else if or (eq .GetOpType 12) (eq .GetOpType 13) (eq .GetOpType 14) (eq .GetOpType 15)}} + {{.GetIssueTitle | RenderEmoji | RenderCodeBlock}} + {{else if eq .GetOpType 25}} +

{{$.locale.Tr "action.review_dismissed_reason"}}

+

{{index .GetIssueInfos 2 | RenderEmoji}}

+ {{end}} +

{{TimeSince .GetCreate $.locale}}

+
+
+
+ {{svg (printf "octicon-%s" (ActionIcon .GetOpType)) 32}} +
+
+
+
{{end}} {{end}} diff --git a/roles/gitea/files/tmpl/user/dashboard/feeds.tmpl.patch b/roles/gitea/files/tmpl/user/dashboard/feeds.tmpl.patch new file mode 100644 index 0000000..06d7e12 --- /dev/null +++ b/roles/gitea/files/tmpl/user/dashboard/feeds.tmpl.patch @@ -0,0 +1,28 @@ +From 6f11836b767f23b8da0588b76794aa4b80b029ea Mon Sep 17 00:00:00 2001 +From: Ben Kristinsson +Date: Thu, 27 Oct 2022 17:26:03 +0200 +Subject: [PATCH] applied patch to feeds.tml + +--- + roles/gitea/files/tmpl/user/dashboard/feeds.tmpl | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/roles/gitea/files/tmpl/user/dashboard/feeds.tmpl b/roles/gitea/files/tmpl/user/dashboard/feeds.tmpl +index 94bbbc4..a534951 100644 +--- a/roles/gitea/files/tmpl/user/dashboard/feeds.tmpl ++++ b/roles/gitea/files/tmpl/user/dashboard/feeds.tmpl +@@ -1,4 +1,5 @@ + {{range .Feeds}} ++ {{if and (ne .ActUser.ID 2) (ne .ActUser.ID 17)}} +
+
+ {{avatarByAction .}} +@@ -123,4 +124,5 @@ +
+
+
++ {{end}} + {{end}} +-- +2.35.1 + diff --git a/roles/gitea/files/tmpl/user/dashboard/repolist.tmpl b/roles/gitea/files/tmpl/user/dashboard/repolist.tmpl index 116119b..620cc32 100644 --- a/roles/gitea/files/tmpl/user/dashboard/repolist.tmpl +++ b/roles/gitea/files/tmpl/user/dashboard/repolist.tmpl @@ -1,202 +1,199 @@
- -
-
- {{.i18n.Tr "repository"}} - {{.i18n.Tr "organization"}} -
-
-

-
- {{.i18n.Tr "home.my_repos"}} - ${reposTotalCount} -
- - {{svg "octicon-plus"}} - {{.i18n.Tr "new_repo"}} - -

-
-
- - {{svg "octicon-search" 16}} -
- {{svg "octicon-filter" 16}} -
-
- -
- - -
-
- - -
-
- - -
- -
-
- -
- - -
-
- - -
-
- - -
- -
- -
-
-
-
- - - {{.i18n.Tr "all"}} -
${repoTypeCount}
- - - - {{.i18n.Tr "sources"}} -
${repoTypeCount}
- - - - {{.i18n.Tr "forks"}} -
${repoTypeCount}
- - - - {{.i18n.Tr "mirrors"}} -
${repoTypeCount}
- - - - {{.i18n.Tr "collaborative"}} -
${repoTypeCount}
- - -
-
-
- -
- -
-
-
-
-

-
- {{.i18n.Tr "home.my_orgs"}} - ${organizationsTotalCount} -
- - {{svg "octicon-plus"}} - {{.i18n.Tr "new_org"}} - -

-
- -
-
-
- +
+ +