From 5d2815f08bdf41f0d884d79becdd9ff2b3c33455 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 7 Oct 2023 13:09:32 +0200 Subject: [PATCH 1/3] Improve feed icons and feed merge text color Fixes: https://github.com/go-gitea/gitea/issues/27495 --- modules/templates/util_misc.go | 24 ++++++++++++++---------- templates/user/dashboard/feeds.tmpl | 6 +++--- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/modules/templates/util_misc.go b/modules/templates/util_misc.go index fe02e4b0c31c8..6c1b4ab240e34 100644 --- a/modules/templates/util_misc.go +++ b/modules/templates/util_misc.go @@ -74,27 +74,31 @@ func ActionIcon(opType activities_model.ActionType) string { switch opType { case activities_model.ActionCreateRepo, activities_model.ActionTransferRepo, activities_model.ActionRenameRepo: return "repo" - case activities_model.ActionCommitRepo, activities_model.ActionPushTag, activities_model.ActionDeleteTag, activities_model.ActionDeleteBranch: + case activities_model.ActionCommitRepo: return "git-commit" - case activities_model.ActionCreateIssue: - return "issue-opened" - case activities_model.ActionCreatePullRequest: - return "git-pull-request" - case activities_model.ActionCommentIssue, activities_model.ActionCommentPull: - return "comment-discussion" + case activities_model.ActionDeleteBranch: + return "git-branch" case activities_model.ActionMergePullRequest, activities_model.ActionAutoMergePullRequest: return "git-merge" - case activities_model.ActionCloseIssue, activities_model.ActionClosePullRequest: + case activities_model.ActionCreatePullRequest: + return "git-pull-request" + case activities_model.ActionClosePullRequest: + return "git-pull-request-closed" + case activities_model.ActionCreateIssue: + return "issue-opened" + case activities_model.ActionCloseIssue: return "issue-closed" case activities_model.ActionReopenIssue, activities_model.ActionReopenPullRequest: return "issue-reopened" + case activities_model.ActionCommentIssue, activities_model.ActionCommentPull: + return "comment-discussion" case activities_model.ActionMirrorSyncPush, activities_model.ActionMirrorSyncCreate, activities_model.ActionMirrorSyncDelete: return "mirror" case activities_model.ActionApprovePullRequest: return "check" case activities_model.ActionRejectPullRequest: - return "diff" - case activities_model.ActionPublishRelease: + return "file-diff" + case activities_model.ActionPublishRelease, activities_model.ActionPushTag, activities_model.ActionDeleteTag: return "tag" case activities_model.ActionPullReviewDismissed: return "x" diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 08b3377aab804..c986dcfb44234 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -109,12 +109,12 @@
{{RenderMarkdownToHtml ctx $comment}}
{{end}} {{else if .GetOpType.InActions "merge_pull_request"}} -
{{index .GetIssueInfos 1}}
+
{{index .GetIssueInfos 1}}
{{else if .GetOpType.InActions "close_issue" "reopen_issue" "close_pull_request" "reopen_pull_request"}} {{(.GetIssueTitle ctx) | RenderEmoji $.Context | RenderCodeBlock}} {{else if .GetOpType.InActions "pull_review_dismissed"}} -
{{ctx.Locale.Tr "action.review_dismissed_reason"}}
-
{{index .GetIssueInfos 2 | RenderEmoji $.Context}}
+
{{ctx.Locale.Tr "action.review_dismissed_reason"}}
+
{{index .GetIssueInfos 2 | RenderEmoji $.Context}}
{{end}}
From 1dc20219f8c676d31e8be7c7d710db14d57fa71c Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 7 Oct 2023 13:13:36 +0200 Subject: [PATCH 2/3] use x for ActionDeleteBranch --- modules/templates/util_misc.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/templates/util_misc.go b/modules/templates/util_misc.go index 6c1b4ab240e34..32c86aefc3c56 100644 --- a/modules/templates/util_misc.go +++ b/modules/templates/util_misc.go @@ -76,8 +76,6 @@ func ActionIcon(opType activities_model.ActionType) string { return "repo" case activities_model.ActionCommitRepo: return "git-commit" - case activities_model.ActionDeleteBranch: - return "git-branch" case activities_model.ActionMergePullRequest, activities_model.ActionAutoMergePullRequest: return "git-merge" case activities_model.ActionCreatePullRequest: @@ -100,7 +98,7 @@ func ActionIcon(opType activities_model.ActionType) string { return "file-diff" case activities_model.ActionPublishRelease, activities_model.ActionPushTag, activities_model.ActionDeleteTag: return "tag" - case activities_model.ActionPullReviewDismissed: + case activities_model.ActionPullReviewDismissed, activities_model.ActionDeleteBranch: return "x" default: return "question" From 051ccf328e4979957500f4fd9725273ba81d99fe Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 7 Oct 2023 13:16:20 +0200 Subject: [PATCH 3/3] Revert "use x for ActionDeleteBranch" This reverts commit 1dc20219f8c676d31e8be7c7d710db14d57fa71c. --- modules/templates/util_misc.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/templates/util_misc.go b/modules/templates/util_misc.go index 32c86aefc3c56..6c1b4ab240e34 100644 --- a/modules/templates/util_misc.go +++ b/modules/templates/util_misc.go @@ -76,6 +76,8 @@ func ActionIcon(opType activities_model.ActionType) string { return "repo" case activities_model.ActionCommitRepo: return "git-commit" + case activities_model.ActionDeleteBranch: + return "git-branch" case activities_model.ActionMergePullRequest, activities_model.ActionAutoMergePullRequest: return "git-merge" case activities_model.ActionCreatePullRequest: @@ -98,7 +100,7 @@ func ActionIcon(opType activities_model.ActionType) string { return "file-diff" case activities_model.ActionPublishRelease, activities_model.ActionPushTag, activities_model.ActionDeleteTag: return "tag" - case activities_model.ActionPullReviewDismissed, activities_model.ActionDeleteBranch: + case activities_model.ActionPullReviewDismissed: return "x" default: return "question"