From 3ff5727ecc01369fe6b17c3348bcbb3de0f12647 Mon Sep 17 00:00:00 2001 From: NorthRealm <155140859+NorthRealm@users.noreply.github.com> Date: Thu, 24 Jul 2025 19:49:42 +0800 Subject: [PATCH] UPDATE --- templates/mail/footer_gitea.tmpl | 6 ++++++ templates/mail/footer_view_on_gitea.tmpl | 12 ++++++++++++ templates/mail/org/team_invite.tmpl | 2 +- templates/mail/repo/collaborator.tmpl | 8 +------- templates/mail/repo/issue/assigned.tmpl | 8 +------- templates/mail/repo/issue/default.devtest.yml | 1 + templates/mail/repo/issue/default.tmpl | 8 +------- templates/mail/repo/release.tmpl | 8 +------- templates/mail/repo/transfer.tmpl | 8 +------- templates/mail/user/auth/activate.tmpl | 2 +- templates/mail/user/auth/activate_email.tmpl | 2 +- templates/mail/user/auth/register_notify.tmpl | 2 +- templates/mail/user/auth/reset_passwd.tmpl | 2 +- 13 files changed, 29 insertions(+), 40 deletions(-) create mode 100644 templates/mail/footer_gitea.tmpl create mode 100644 templates/mail/footer_view_on_gitea.tmpl create mode 100644 templates/mail/repo/issue/default.devtest.yml diff --git a/templates/mail/footer_gitea.tmpl b/templates/mail/footer_gitea.tmpl new file mode 100644 index 00000000000..6ec5bee0164 --- /dev/null +++ b/templates/mail/footer_gitea.tmpl @@ -0,0 +1,6 @@ + + + +

© {{AppName}}

+ + diff --git a/templates/mail/footer_view_on_gitea.tmpl b/templates/mail/footer_view_on_gitea.tmpl new file mode 100644 index 00000000000..3625a58e5d8 --- /dev/null +++ b/templates/mail/footer_view_on_gitea.tmpl @@ -0,0 +1,12 @@ + + + +
+

+ --- +
+ {{.locale.Tr "mail.view_it_on" AppName}}{{if .CanReply}} {{.locale.Tr "mail.reply"}}{{end}}. +

+
+ + diff --git a/templates/mail/org/team_invite.tmpl b/templates/mail/org/team_invite.tmpl index cb0c0c0a50b..29dc9a37ae5 100644 --- a/templates/mail/org/team_invite.tmpl +++ b/templates/mail/org/team_invite.tmpl @@ -10,6 +10,6 @@

{{.locale.Tr "mail.link_not_working_do_paste"}}

{{.locale.Tr "mail.team_invite.text_3" .Invite.Email}}

-

© {{AppName}}

+ {{template "footer_gitea"}} diff --git a/templates/mail/repo/collaborator.tmpl b/templates/mail/repo/collaborator.tmpl index 3fe490e2211..7c3074561f6 100644 --- a/templates/mail/repo/collaborator.tmpl +++ b/templates/mail/repo/collaborator.tmpl @@ -7,12 +7,6 @@

{{.locale.Tr "mail.repo.collaborator.added.text"}} {{.RepoName}}

-
-

- --- -
- {{.locale.Tr "mail.view_it_on" AppName}}. -

-
+ {{template "footer_view_on_gitea" .}} diff --git a/templates/mail/repo/issue/assigned.tmpl b/templates/mail/repo/issue/assigned.tmpl index cdba7a0ad07..80c60c7e729 100644 --- a/templates/mail/repo/issue/assigned.tmpl +++ b/templates/mail/repo/issue/assigned.tmpl @@ -15,12 +15,6 @@ {{.locale.Tr "mail.issue_assigned.issue" .Doer.Name $link $repo_url}} {{end}}

-
-

- --- -
- {{.locale.Tr "mail.view_it_on" AppName}}. -

-
+ {{template "footer_view_on_gitea" .}} diff --git a/templates/mail/repo/issue/default.devtest.yml b/templates/mail/repo/issue/default.devtest.yml new file mode 100644 index 00000000000..5a7953639bb --- /dev/null +++ b/templates/mail/repo/issue/default.devtest.yml @@ -0,0 +1 @@ +CanReply: true diff --git a/templates/mail/repo/issue/default.tmpl b/templates/mail/repo/issue/default.tmpl index 07320bc43ce..ba9b58bc862 100644 --- a/templates/mail/repo/issue/default.tmpl +++ b/templates/mail/repo/issue/default.tmpl @@ -75,12 +75,6 @@ {{end}}

-
-

- --- -
- {{.locale.Tr "mail.view_it_on" AppName}}{{if .CanReply}} {{.locale.Tr "mail.reply"}}{{end}}. -

-
+ {{template "footer_view_on_gitea" .}} diff --git a/templates/mail/repo/release.tmpl b/templates/mail/repo/release.tmpl index 3172e6a19d7..95c63fb079b 100644 --- a/templates/mail/repo/release.tmpl +++ b/templates/mail/repo/release.tmpl @@ -49,12 +49,6 @@ {{end}}

-
-

- --- -
- {{.locale.Tr "mail.view_it_on" AppName}}. -

-
+ {{template "footer_view_on_gitea" .}} diff --git a/templates/mail/repo/transfer.tmpl b/templates/mail/repo/transfer.tmpl index 43083b97b73..9d3d24dd987 100644 --- a/templates/mail/repo/transfer.tmpl +++ b/templates/mail/repo/transfer.tmpl @@ -10,12 +10,6 @@

{{.Subject}}. {{.locale.Tr "mail.repo.transfer.body" $url}}

-
-

- --- -
- {{.locale.Tr "mail.view_it_on" AppName}}. -

-
+ {{template "footer_view_on_gitea" .}} diff --git a/templates/mail/user/auth/activate.tmpl b/templates/mail/user/auth/activate.tmpl index b1bb4cb4631..9f3202d1af2 100644 --- a/templates/mail/user/auth/activate.tmpl +++ b/templates/mail/user/auth/activate.tmpl @@ -12,6 +12,6 @@

{{.locale.Tr "mail.activate_account.text_2" .ActiveCodeLives}}

{{$activate_url}}


{{.locale.Tr "mail.link_not_working_do_paste"}}

-

© {{AppName}}

+ {{template "footer_gitea"}} diff --git a/templates/mail/user/auth/activate_email.tmpl b/templates/mail/user/auth/activate_email.tmpl index 3d32f80a4e5..e35b1c33653 100644 --- a/templates/mail/user/auth/activate_email.tmpl +++ b/templates/mail/user/auth/activate_email.tmpl @@ -12,6 +12,6 @@

{{.locale.Tr "mail.activate_email.text" .ActiveCodeLives}}

{{$activate_url}}


{{.locale.Tr "mail.link_not_working_do_paste"}}

-

© {{AppName}}

+ {{template "footer_gitea"}} diff --git a/templates/mail/user/auth/register_notify.tmpl b/templates/mail/user/auth/register_notify.tmpl index 62dbf7d9271..11effd66dce 100644 --- a/templates/mail/user/auth/register_notify.tmpl +++ b/templates/mail/user/auth/register_notify.tmpl @@ -13,6 +13,6 @@

{{.locale.Tr "mail.register_notify.text_2" .Username}}

{{AppUrl}}user/login


{{.locale.Tr "mail.register_notify.text_3" $set_pwd_url}}


-

© {{AppName}}

+ {{template "footer_gitea"}} diff --git a/templates/mail/user/auth/reset_passwd.tmpl b/templates/mail/user/auth/reset_passwd.tmpl index 55b1ecec3f6..f9b47d7df83 100644 --- a/templates/mail/user/auth/reset_passwd.tmpl +++ b/templates/mail/user/auth/reset_passwd.tmpl @@ -12,6 +12,6 @@

{{.locale.Tr "mail.reset_password.text" .ResetPwdCodeLives}}

{{$recover_url}}


{{.locale.Tr "mail.link_not_working_do_paste"}}

-

© {{AppName}}

+ {{template "footer_gitea"}}