From 73b9bd52f581dd010ca23d15534eaa52673a9305 Mon Sep 17 00:00:00 2001 From: KenanZhu <3471685733@qq.com> Date: Fri, 5 Jun 2026 13:44:24 +0800 Subject: [PATCH] fix(themes): restore pre-refactor visual design across all 9 non-aurora themes Fixes introduced by the CSS class-based refactor (1712f77) that changed visual layout, spacing, colors, and content rendering: **Container/border displacement (neon):** - Move background, border, box-shadow back to .email-wrap (outermost) - Restore .email-card to padding-only; add color for content inheritance - Fix link box padding, link label color, button margin, link URL padding **Layout restructuring (ink, mono):** - ink: Move button + link-box back into left column (was moved to separate full-width row); remove incorrectly-added divider - mono: Remove incorrectly-added divider; restore link-box margin-top **CSS specificity conflict (ink):** - Exclude .email-btn from .card-body a rule to prevent button text being overridden to same color as background **Content class cleanup (neon, terminal, terra):** - Remove .aurora-content (aurora-specific) copied into other themes - Replace with theme-appropriate .card-body scoped rules where needed **Content color/contrast (horizon):** - Fix .horizon-content in release.tmpl from dark-theme colors (#e2e8f0 on white) to light-theme colors matching issue/default.tmpl - Fix .email-heading color to #1e293b for heading distinction **register_notify text_3 placement:** - Restore per-theme original design: inside .email-subtext (mono, ink) vs standalone

after button (heritage, horizon) - Move raw text in button row into proper

elements **Button CSS pattern (bloom):** - Remove redundant inline style/bgcolor from button (already in CSS) Co-Authored-By: Claude Opus 4.8 --- themes/bloom/mail/org/team_invite.tmpl | 93 ++++-- .../bloom/mail/repo/actions/workflow_run.tmpl | 94 ++++-- themes/bloom/mail/repo/collaborator.tmpl | 87 ++++-- themes/bloom/mail/repo/issue/assigned.tmpl | 86 ++++-- themes/bloom/mail/repo/issue/default.tmpl | 121 +++++--- themes/bloom/mail/repo/release.tmpl | 111 ++++--- themes/bloom/mail/repo/transfer.tmpl | 84 +++-- themes/bloom/mail/user/auth/activate.tmpl | 91 ++++-- .../bloom/mail/user/auth/activate_email.tmpl | 87 ++++-- .../bloom/mail/user/auth/register_notify.tmpl | 93 ++++-- themes/bloom/mail/user/auth/reset_passwd.tmpl | 87 ++++-- themes/ember/mail/org/team_invite.tmpl | 89 ++++-- .../ember/mail/repo/actions/workflow_run.tmpl | 92 ++++-- themes/ember/mail/repo/collaborator.tmpl | 85 +++-- themes/ember/mail/repo/issue/assigned.tmpl | 84 +++-- themes/ember/mail/repo/issue/default.tmpl | 117 ++++--- themes/ember/mail/repo/release.tmpl | 109 ++++--- themes/ember/mail/repo/transfer.tmpl | 82 +++-- themes/ember/mail/user/auth/activate.tmpl | 89 ++++-- .../ember/mail/user/auth/activate_email.tmpl | 85 +++-- .../ember/mail/user/auth/register_notify.tmpl | 91 ++++-- themes/ember/mail/user/auth/reset_passwd.tmpl | 85 +++-- themes/heritage/mail/org/team_invite.tmpl | 89 ++++-- .../mail/repo/actions/workflow_run.tmpl | 92 ++++-- themes/heritage/mail/repo/collaborator.tmpl | 85 +++-- themes/heritage/mail/repo/issue/assigned.tmpl | 84 +++-- themes/heritage/mail/repo/issue/default.tmpl | 117 ++++--- themes/heritage/mail/repo/release.tmpl | 109 ++++--- themes/heritage/mail/repo/transfer.tmpl | 82 +++-- themes/heritage/mail/user/auth/activate.tmpl | 89 ++++-- .../mail/user/auth/activate_email.tmpl | 85 +++-- .../mail/user/auth/register_notify.tmpl | 91 ++++-- .../heritage/mail/user/auth/reset_passwd.tmpl | 85 +++-- themes/horizon/mail/org/team_invite.tmpl | 173 +++++++---- .../mail/repo/actions/workflow_run.tmpl | 172 +++++++---- themes/horizon/mail/repo/collaborator.tmpl | 154 +++++++--- themes/horizon/mail/repo/issue/assigned.tmpl | 166 +++++++--- themes/horizon/mail/repo/issue/default.tmpl | 290 +++++++++++------- themes/horizon/mail/repo/release.tmpl | 220 ++++++++----- themes/horizon/mail/repo/transfer.tmpl | 156 +++++++--- themes/horizon/mail/user/auth/activate.tmpl | 171 ++++++++--- .../mail/user/auth/activate_email.tmpl | 164 +++++++--- .../mail/user/auth/register_notify.tmpl | 175 +++++++---- .../horizon/mail/user/auth/reset_passwd.tmpl | 163 +++++++--- themes/ink/mail/org/team_invite.tmpl | 167 +++++++--- .../ink/mail/repo/actions/workflow_run.tmpl | 162 +++++++--- themes/ink/mail/repo/collaborator.tmpl | 154 +++++++--- themes/ink/mail/repo/issue/assigned.tmpl | 160 +++++++--- themes/ink/mail/repo/issue/default.tmpl | 233 +++++++++++--- themes/ink/mail/repo/release.tmpl | 186 ++++++++--- themes/ink/mail/repo/transfer.tmpl | 155 +++++++--- themes/ink/mail/user/auth/activate.tmpl | 168 +++++++--- themes/ink/mail/user/auth/activate_email.tmpl | 164 +++++++--- .../ink/mail/user/auth/register_notify.tmpl | 166 +++++++--- themes/ink/mail/user/auth/reset_passwd.tmpl | 164 +++++++--- themes/mono/mail/org/team_invite.tmpl | 168 +++++++--- .../mono/mail/repo/actions/workflow_run.tmpl | 164 +++++++--- themes/mono/mail/repo/collaborator.tmpl | 156 +++++++--- themes/mono/mail/repo/issue/assigned.tmpl | 162 +++++++--- themes/mono/mail/repo/issue/default.tmpl | 236 +++++++++++--- themes/mono/mail/repo/release.tmpl | 184 ++++++++--- themes/mono/mail/repo/transfer.tmpl | 157 +++++++--- themes/mono/mail/user/auth/activate.tmpl | 166 +++++++--- .../mono/mail/user/auth/activate_email.tmpl | 162 +++++++--- .../mono/mail/user/auth/register_notify.tmpl | 168 +++++++--- themes/mono/mail/user/auth/reset_passwd.tmpl | 162 +++++++--- themes/neon/mail/org/team_invite.tmpl | 162 +++++++--- .../neon/mail/repo/actions/workflow_run.tmpl | 161 +++++++--- themes/neon/mail/repo/collaborator.tmpl | 154 +++++++--- themes/neon/mail/repo/issue/assigned.tmpl | 160 +++++++--- themes/neon/mail/repo/issue/default.tmpl | 223 +++++++++++--- themes/neon/mail/repo/release.tmpl | 184 ++++++++--- themes/neon/mail/repo/transfer.tmpl | 155 +++++++--- themes/neon/mail/user/auth/activate.tmpl | 160 +++++++--- .../neon/mail/user/auth/activate_email.tmpl | 158 +++++++--- .../neon/mail/user/auth/register_notify.tmpl | 165 +++++++--- themes/neon/mail/user/auth/reset_passwd.tmpl | 158 +++++++--- themes/terminal/mail/org/team_invite.tmpl | 182 +++++++---- .../mail/repo/actions/workflow_run.tmpl | 183 +++++++---- themes/terminal/mail/repo/collaborator.tmpl | 167 +++++++--- themes/terminal/mail/repo/issue/assigned.tmpl | 178 ++++++++--- themes/terminal/mail/repo/issue/default.tmpl | 288 ++++++++++------- themes/terminal/mail/repo/release.tmpl | 217 ++++++++----- themes/terminal/mail/repo/transfer.tmpl | 168 +++++++--- themes/terminal/mail/user/auth/activate.tmpl | 179 ++++++++--- .../mail/user/auth/activate_email.tmpl | 174 ++++++++--- .../mail/user/auth/register_notify.tmpl | 184 +++++++---- .../terminal/mail/user/auth/reset_passwd.tmpl | 174 ++++++++--- themes/terra/mail/org/team_invite.tmpl | 171 ++++++++--- .../terra/mail/repo/actions/workflow_run.tmpl | 164 +++++++--- themes/terra/mail/repo/collaborator.tmpl | 157 +++++++--- themes/terra/mail/repo/issue/assigned.tmpl | 163 +++++++--- themes/terra/mail/repo/issue/default.tmpl | 222 +++++++++++--- themes/terra/mail/repo/release.tmpl | 184 ++++++++--- themes/terra/mail/repo/transfer.tmpl | 158 +++++++--- themes/terra/mail/user/auth/activate.tmpl | 166 +++++++--- .../terra/mail/user/auth/activate_email.tmpl | 164 +++++++--- .../terra/mail/user/auth/register_notify.tmpl | 171 ++++++++--- themes/terra/mail/user/auth/reset_passwd.tmpl | 164 +++++++--- 99 files changed, 10699 insertions(+), 3937 deletions(-) diff --git a/themes/bloom/mail/org/team_invite.tmpl b/themes/bloom/mail/org/team_invite.tmpl index 536f28a..15d45fc 100644 --- a/themes/bloom/mail/org/team_invite.tmpl +++ b/themes/bloom/mail/org/team_invite.tmpl @@ -2,64 +2,99 @@ - - {{AppName}} · Team Invitation + + + + + {{.locale.Tr "mail.team_invite.subject" (.Inviter.DisplayName|DotEscape) (.Organization.DisplayName|DotEscape)}} + + - -

-
+ +
+
- \ No newline at end of file diff --git a/themes/bloom/mail/repo/actions/workflow_run.tmpl b/themes/bloom/mail/repo/actions/workflow_run.tmpl index 4923285..0963afb 100644 --- a/themes/bloom/mail/repo/actions/workflow_run.tmpl +++ b/themes/bloom/mail/repo/actions/workflow_run.tmpl @@ -2,64 +2,100 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/bloom/mail/repo/collaborator.tmpl b/themes/bloom/mail/repo/collaborator.tmpl index 26b653f..94fce92 100644 --- a/themes/bloom/mail/repo/collaborator.tmpl +++ b/themes/bloom/mail/repo/collaborator.tmpl @@ -2,55 +2,88 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/bloom/mail/repo/issue/assigned.tmpl b/themes/bloom/mail/repo/issue/assigned.tmpl index f206ab2..5594902 100644 --- a/themes/bloom/mail/repo/issue/assigned.tmpl +++ b/themes/bloom/mail/repo/issue/assigned.tmpl @@ -2,26 +2,57 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/bloom/mail/repo/issue/default.tmpl b/themes/bloom/mail/repo/issue/default.tmpl index d03930c..e31edf3 100644 --- a/themes/bloom/mail/repo/issue/default.tmpl +++ b/themes/bloom/mail/repo/issue/default.tmpl @@ -2,37 +2,79 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/bloom/mail/repo/release.tmpl b/themes/bloom/mail/repo/release.tmpl index e31e106..a795362 100644 --- a/themes/bloom/mail/repo/release.tmpl +++ b/themes/bloom/mail/repo/release.tmpl @@ -2,87 +2,122 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/bloom/mail/repo/transfer.tmpl b/themes/bloom/mail/repo/transfer.tmpl index fd06ed9..3a6ea00 100644 --- a/themes/bloom/mail/repo/transfer.tmpl +++ b/themes/bloom/mail/repo/transfer.tmpl @@ -2,55 +2,85 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/bloom/mail/user/auth/activate.tmpl b/themes/bloom/mail/user/auth/activate.tmpl index 6f57a57..858800e 100644 --- a/themes/bloom/mail/user/auth/activate.tmpl +++ b/themes/bloom/mail/user/auth/activate.tmpl @@ -2,61 +2,96 @@ - - {{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}} + + + + + {{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/bloom/mail/user/auth/activate_email.tmpl b/themes/bloom/mail/user/auth/activate_email.tmpl index 5efe806..604b6c1 100644 --- a/themes/bloom/mail/user/auth/activate_email.tmpl +++ b/themes/bloom/mail/user/auth/activate_email.tmpl @@ -2,58 +2,91 @@ - - {{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}} + + + + + {{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/bloom/mail/user/auth/register_notify.tmpl b/themes/bloom/mail/user/auth/register_notify.tmpl index af1c0c5..9d0fc12 100644 --- a/themes/bloom/mail/user/auth/register_notify.tmpl +++ b/themes/bloom/mail/user/auth/register_notify.tmpl @@ -2,65 +2,100 @@ - - {{.locale.Tr "mail.register_notify.title" (.DisplayName|DotEscape) AppName}} + + + + + {{.locale.Tr "mail.register_notify.title" (.DisplayName|DotEscape) AppName}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/bloom/mail/user/auth/reset_passwd.tmpl b/themes/bloom/mail/user/auth/reset_passwd.tmpl index 1709339..f9d68eb 100644 --- a/themes/bloom/mail/user/auth/reset_passwd.tmpl +++ b/themes/bloom/mail/user/auth/reset_passwd.tmpl @@ -2,58 +2,91 @@ - - {{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}} + + + + + {{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/ember/mail/org/team_invite.tmpl b/themes/ember/mail/org/team_invite.tmpl index a9781de..16cec85 100644 --- a/themes/ember/mail/org/team_invite.tmpl +++ b/themes/ember/mail/org/team_invite.tmpl @@ -2,73 +2,106 @@ - - {{AppName}} · Team Invitation + + + + + {{.locale.Tr "mail.team_invite.subject" (.Inviter.DisplayName|DotEscape) (.Organization.DisplayName|DotEscape)}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/ember/mail/repo/actions/workflow_run.tmpl b/themes/ember/mail/repo/actions/workflow_run.tmpl index dca1980..54fc199 100644 --- a/themes/ember/mail/repo/actions/workflow_run.tmpl +++ b/themes/ember/mail/repo/actions/workflow_run.tmpl @@ -2,71 +2,107 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/ember/mail/repo/collaborator.tmpl b/themes/ember/mail/repo/collaborator.tmpl index c127314..bd56e56 100644 --- a/themes/ember/mail/repo/collaborator.tmpl +++ b/themes/ember/mail/repo/collaborator.tmpl @@ -2,62 +2,95 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/ember/mail/repo/issue/assigned.tmpl b/themes/ember/mail/repo/issue/assigned.tmpl index ac878de..3dc71c4 100644 --- a/themes/ember/mail/repo/issue/assigned.tmpl +++ b/themes/ember/mail/repo/issue/assigned.tmpl @@ -2,33 +2,64 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/ember/mail/repo/issue/default.tmpl b/themes/ember/mail/repo/issue/default.tmpl index 3d60d84..ba40429 100644 --- a/themes/ember/mail/repo/issue/default.tmpl +++ b/themes/ember/mail/repo/issue/default.tmpl @@ -2,44 +2,85 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/ember/mail/repo/release.tmpl b/themes/ember/mail/repo/release.tmpl index 81fbcaf..d9a7d4b 100644 --- a/themes/ember/mail/repo/release.tmpl +++ b/themes/ember/mail/repo/release.tmpl @@ -2,94 +2,129 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/ember/mail/repo/transfer.tmpl b/themes/ember/mail/repo/transfer.tmpl index 3375c9e..36798d8 100644 --- a/themes/ember/mail/repo/transfer.tmpl +++ b/themes/ember/mail/repo/transfer.tmpl @@ -2,62 +2,92 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/ember/mail/user/auth/activate.tmpl b/themes/ember/mail/user/auth/activate.tmpl index 13ae475..4bb66f7 100644 --- a/themes/ember/mail/user/auth/activate.tmpl +++ b/themes/ember/mail/user/auth/activate.tmpl @@ -2,68 +2,103 @@ - - {{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}} + + + + + {{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/ember/mail/user/auth/activate_email.tmpl b/themes/ember/mail/user/auth/activate_email.tmpl index a6fd687..8c0e0b3 100644 --- a/themes/ember/mail/user/auth/activate_email.tmpl +++ b/themes/ember/mail/user/auth/activate_email.tmpl @@ -2,65 +2,98 @@ - - {{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}} + + + + + {{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/ember/mail/user/auth/register_notify.tmpl b/themes/ember/mail/user/auth/register_notify.tmpl index 5c4b1c3..554d5f9 100644 --- a/themes/ember/mail/user/auth/register_notify.tmpl +++ b/themes/ember/mail/user/auth/register_notify.tmpl @@ -2,72 +2,107 @@ - - {{.locale.Tr "mail.register_notify.title" (.DisplayName|DotEscape) AppName}} + + + + + {{.locale.Tr "mail.register_notify.title" (.DisplayName|DotEscape) AppName}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/ember/mail/user/auth/reset_passwd.tmpl b/themes/ember/mail/user/auth/reset_passwd.tmpl index c8b2a20..0241bc4 100644 --- a/themes/ember/mail/user/auth/reset_passwd.tmpl +++ b/themes/ember/mail/user/auth/reset_passwd.tmpl @@ -2,65 +2,98 @@ - - {{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}} + + + + + {{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/heritage/mail/org/team_invite.tmpl b/themes/heritage/mail/org/team_invite.tmpl index 89723a5..35913ef 100644 --- a/themes/heritage/mail/org/team_invite.tmpl +++ b/themes/heritage/mail/org/team_invite.tmpl @@ -2,66 +2,99 @@ - - {{AppName}} · Team Invitation + + + + + {{.locale.Tr "mail.team_invite.subject" (.Inviter.DisplayName|DotEscape) (.Organization.DisplayName|DotEscape)}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/heritage/mail/repo/actions/workflow_run.tmpl b/themes/heritage/mail/repo/actions/workflow_run.tmpl index 61c865e..428162c 100644 --- a/themes/heritage/mail/repo/actions/workflow_run.tmpl +++ b/themes/heritage/mail/repo/actions/workflow_run.tmpl @@ -2,64 +2,100 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/heritage/mail/repo/collaborator.tmpl b/themes/heritage/mail/repo/collaborator.tmpl index fec4b01..958599e 100644 --- a/themes/heritage/mail/repo/collaborator.tmpl +++ b/themes/heritage/mail/repo/collaborator.tmpl @@ -2,55 +2,88 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/heritage/mail/repo/issue/assigned.tmpl b/themes/heritage/mail/repo/issue/assigned.tmpl index a7313e5..c4b8579 100644 --- a/themes/heritage/mail/repo/issue/assigned.tmpl +++ b/themes/heritage/mail/repo/issue/assigned.tmpl @@ -2,26 +2,57 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/heritage/mail/repo/issue/default.tmpl b/themes/heritage/mail/repo/issue/default.tmpl index e61120b..6293d38 100644 --- a/themes/heritage/mail/repo/issue/default.tmpl +++ b/themes/heritage/mail/repo/issue/default.tmpl @@ -2,37 +2,78 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/heritage/mail/repo/release.tmpl b/themes/heritage/mail/repo/release.tmpl index 35b6301..89875cd 100644 --- a/themes/heritage/mail/repo/release.tmpl +++ b/themes/heritage/mail/repo/release.tmpl @@ -2,87 +2,122 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/heritage/mail/repo/transfer.tmpl b/themes/heritage/mail/repo/transfer.tmpl index addf483..0ef1099 100644 --- a/themes/heritage/mail/repo/transfer.tmpl +++ b/themes/heritage/mail/repo/transfer.tmpl @@ -2,55 +2,85 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/heritage/mail/user/auth/activate.tmpl b/themes/heritage/mail/user/auth/activate.tmpl index f6b2c3b..fcd705f 100644 --- a/themes/heritage/mail/user/auth/activate.tmpl +++ b/themes/heritage/mail/user/auth/activate.tmpl @@ -2,61 +2,96 @@ - - {{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}} + + + + + {{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/heritage/mail/user/auth/activate_email.tmpl b/themes/heritage/mail/user/auth/activate_email.tmpl index 0e52164..6fba753 100644 --- a/themes/heritage/mail/user/auth/activate_email.tmpl +++ b/themes/heritage/mail/user/auth/activate_email.tmpl @@ -2,58 +2,91 @@ - - {{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}} + + + + + {{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/heritage/mail/user/auth/register_notify.tmpl b/themes/heritage/mail/user/auth/register_notify.tmpl index d22ee14..af75127 100644 --- a/themes/heritage/mail/user/auth/register_notify.tmpl +++ b/themes/heritage/mail/user/auth/register_notify.tmpl @@ -2,65 +2,100 @@ - - {{.locale.Tr "mail.register_notify.title" (.DisplayName|DotEscape) AppName}} + + + + + {{.locale.Tr "mail.register_notify.title" (.DisplayName|DotEscape) AppName}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/heritage/mail/user/auth/reset_passwd.tmpl b/themes/heritage/mail/user/auth/reset_passwd.tmpl index 961db38..c4c970c 100644 --- a/themes/heritage/mail/user/auth/reset_passwd.tmpl +++ b/themes/heritage/mail/user/auth/reset_passwd.tmpl @@ -2,58 +2,91 @@ - - {{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}} + + + + + {{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}} + + - -
-
+ +
+
- \ No newline at end of file diff --git a/themes/horizon/mail/org/team_invite.tmpl b/themes/horizon/mail/org/team_invite.tmpl index 7e7ee1c..dd4a396 100644 --- a/themes/horizon/mail/org/team_invite.tmpl +++ b/themes/horizon/mail/org/team_invite.tmpl @@ -2,75 +2,140 @@ - - {{AppName}} · Team Invitation + + + + + {{.locale.Tr "mail.team_invite.subject" (.Inviter.DisplayName|DotEscape) (.Organization.DisplayName|DotEscape)}} + + - -
-
+ +
+ -
-
- - - -
- logo - {{AppName}} -
-
+ + + -
-

- {{.locale.Tr "mail.hi_user_x" .Invite.Email}} -

+ + -

- {{.locale.Tr "mail.team_invite.text_1" (DotEscape .Inviter.DisplayName) (DotEscape .Team.Name) (DotEscape .Organization.DisplayName)}} -

+ + -

- {{.locale.Tr "mail.team_invite.text_2"}} -

+ + + - - - - -
- Accept Invitation -
- -
-

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

-

- {{.InviteURL}} + +

-
-

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

+ -
-
+ + -
-

- © {{AppName}} -

-

Secure team invitation – if you weren’t expecting this, please ignore this email.

-
+ + + + -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- -
\ No newline at end of file diff --git a/themes/horizon/mail/repo/actions/workflow_run.tmpl b/themes/horizon/mail/repo/actions/workflow_run.tmpl index f4e165c..6137080 100644 --- a/themes/horizon/mail/repo/actions/workflow_run.tmpl +++ b/themes/horizon/mail/repo/actions/workflow_run.tmpl @@ -2,72 +2,136 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+ -
-
- - - -
- logo - {{AppName}} -
-
+ + + -
-

- {{.Repo.FullName}} {{.Run.WorkflowID}}: {{.RunStatusText}} -

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

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

{{.Repo.FullName}} {{.Run.WorkflowID}}: {{.RunStatusText}}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -

- {{.Run.HTMLURL}} -

-
-
-
-
-

- © {{AppName}} -

-

Secure workflow run notification – if you didn’t expect this, please ignore this email.

-
+ + -
+
- -
\ No newline at end of file diff --git a/themes/horizon/mail/repo/collaborator.tmpl b/themes/horizon/mail/repo/collaborator.tmpl index d1193ed..a1a2a2a 100644 --- a/themes/horizon/mail/repo/collaborator.tmpl +++ b/themes/horizon/mail/repo/collaborator.tmpl @@ -2,62 +2,128 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+ -
-
- - - -
- logo - {{AppName}} -
-
+ + + -
-

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

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

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

-

- {{.Link}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

-
-
-
-
-

- © {{AppName}} -

-

Secure repository collaboration notification – if you didn’t expect this, please ignore this email.

-
+ + -
+
- -
diff --git a/themes/horizon/mail/repo/issue/assigned.tmpl b/themes/horizon/mail/repo/issue/assigned.tmpl index 3a82f44..6f3bdcd 100644 --- a/themes/horizon/mail/repo/issue/assigned.tmpl +++ b/themes/horizon/mail/repo/issue/assigned.tmpl @@ -2,68 +2,134 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+ -
-
- - - -
- logo - {{AppName}} -
-
+ + + -
- {{$repo_url := HTMLFormat "%s" .Issue.Repo.HTMLURL .Issue.Repo.FullName}} - {{$link := HTMLFormat "#%d" .Link .Issue.Index}} -

- {{if .IsPull}} - {{.locale.Tr "mail.issue_assigned.pull" .Doer.Name $link $repo_url}} - {{else}} - {{.locale.Tr "mail.issue_assigned.issue" .Doer.Name $link $repo_url}} - {{end}} -

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

- {{.locale.Tr "mail.link_not_working_do_paste"}} + + + + + {{$repo_url := HTMLFormat "%s" .Issue.Repo.HTMLURL .Issue.Repo.FullName}} + {{$link := HTMLFormat "#%d" .Link .Issue.Index}} +

-

- {{.Link}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

-
-
-
-
-

- © {{AppName}} -

-

Secure issue assignment notification – if you didn’t expect this, please ignore this email.

-
+ + -
+
- -
\ No newline at end of file diff --git a/themes/horizon/mail/repo/issue/default.tmpl b/themes/horizon/mail/repo/issue/default.tmpl index 16f9ef8..d27545c 100644 --- a/themes/horizon/mail/repo/issue/default.tmpl +++ b/themes/horizon/mail/repo/issue/default.tmpl @@ -2,129 +2,209 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+ -
-
- - - -
- logo - {{AppName}} -
-
+ + + -
- {{if .IsMention}}

{{.locale.Tr "mail.issue.x_mentioned_you" .Doer.Name}}

{{end}} - {{if eq .ActionName "push"}} -

- {{if .Comment.IsForcePush}} - {{$oldCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.OldCommit}} - {{$oldShortSha := ShortSha .Comment.OldCommit}} - {{$oldCommitLink := HTMLFormat "%[2]s" $oldCommitUrl $oldShortSha}} + + - {{$newCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.NewCommit}} - {{$newShortSha := ShortSha .Comment.NewCommit}} - {{$newCommitLink := HTMLFormat "%[2]s" $newCommitUrl $newShortSha}} + + - {{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink}} - {{else}} - {{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits)}} - {{end}} + + + + +

+ +

{{.locale.Tr "mail.issue.x_mentioned_you" .Doer.Name}}

+ {{end}} + + {{if eq .ActionName "push"}} +

+ {{if .Comment.IsForcePush}} + {{$oldCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.OldCommit}} + {{$oldShortSha := ShortSha .Comment.OldCommit}} + {{$oldCommitLink := HTMLFormat "%[2]s" $oldCommitUrl $oldShortSha}} + {{$newCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.NewCommit}} + {{$newShortSha := ShortSha .Comment.NewCommit}} + {{$newCommitLink := HTMLFormat "%[2]s" $newCommitUrl $newShortSha}} + {{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink}} + {{else}} + {{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits)}} + {{end}} +

+ {{end}} + +

+ {{if eq .ActionName "close"}} + {{.locale.Tr "mail.issue.action.close" .Doer.Name .Issue.Index}} + {{else if eq .ActionName "reopen"}} + {{.locale.Tr "mail.issue.action.reopen" .Doer.Name .Issue.Index}} + {{else if eq .ActionName "merge"}} + {{.locale.Tr "mail.issue.action.merge" .Doer.Name .Issue.Index .Issue.PullRequest.BaseBranch}} + {{else if eq .ActionName "approve"}} + {{.locale.Tr "mail.issue.action.approve" .Doer.Name}} + {{else if eq .ActionName "reject"}} + {{.locale.Tr "mail.issue.action.reject" .Doer.Name}} + {{else if eq .ActionName "review"}} + {{.locale.Tr "mail.issue.action.review" .Doer.Name}} + {{else if eq .ActionName "review_dismissed"}} + {{.locale.Tr "mail.issue.action.review_dismissed" .Doer.Name .Comment.Review.Reviewer.Name}} + {{else if eq .ActionName "ready_for_review"}} + {{.locale.Tr "mail.issue.action.ready_for_review" .Doer.Name}} + {{end}} + {{- if eq .Body ""}} + {{if eq .ActionName "new"}} + {{.locale.Tr "mail.issue.action.new" .Doer.Name .Issue.Index}} + {{end}} + {{else}} + {{.Body}} + {{end -}} + {{if .CanReply}} +  {{.locale.Tr "mail.reply"}} + {{end}} +

+ + {{- range .ReviewComments}} +
+

{{$.locale.Tr "mail.issue.in_tree_path" .TreePath}}

+ 
{{.Patch}}
+
{{.RenderedContent}}
+ {{end -}} + + {{if eq .ActionName "push"}} + + {{end}}

- {{end}} -

- {{if eq .ActionName "close"}} - {{.locale.Tr "mail.issue.action.close" .Doer.Name .Issue.Index}} - {{else if eq .ActionName "reopen"}} - {{.locale.Tr "mail.issue.action.reopen" .Doer.Name .Issue.Index}} - {{else if eq .ActionName "merge"}} - {{.locale.Tr "mail.issue.action.merge" .Doer.Name .Issue.Index .Issue.PullRequest.BaseBranch}} - {{else if eq .ActionName "approve"}} - {{.locale.Tr "mail.issue.action.approve" .Doer.Name}} - {{else if eq .ActionName "reject"}} - {{.locale.Tr "mail.issue.action.reject" .Doer.Name}} - {{else if eq .ActionName "review"}} - {{.locale.Tr "mail.issue.action.review" .Doer.Name}} - {{else if eq .ActionName "review_dismissed"}} - {{.locale.Tr "mail.issue.action.review_dismissed" .Doer.Name .Comment.Review.Reviewer.Name}} - {{else if eq .ActionName "ready_for_review"}} - {{.locale.Tr "mail.issue.action.ready_for_review" .Doer.Name}} - {{end}} - {{- if eq .Body ""}} - {{if eq .ActionName "new"}} - {{.locale.Tr "mail.issue.action.new" .Doer.Name .Issue.Index}} - {{end}} - {{else}} - {{.Body}} - {{end -}}{{if .CanReply}} {{.locale.Tr "mail.reply"}}{{end}} +

-

+ + - {{- range .ReviewComments}} -
-

{{$.locale.Tr "mail.issue.in_tree_path" .TreePath}}

-
- 
{{.Patch}}
-
{{.RenderedContent}}
-
- {{end -}} + + + + - {{if eq .ActionName "push"}} - - {{end}} + + + - - - - -
- {{.locale.Tr "mail.view_it_on" AppName}} -
+ + + + + -
-

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

-

- {{.Link}} -

-
-
-
-
-

- © {{AppName}} -

-

Secure notification – if you didn't expect this, please ignore this email.

-
+ + -
+
- -
\ No newline at end of file diff --git a/themes/horizon/mail/repo/release.tmpl b/themes/horizon/mail/repo/release.tmpl index 4f83a4a..de698f4 100644 --- a/themes/horizon/mail/repo/release.tmpl +++ b/themes/horizon/mail/repo/release.tmpl @@ -2,95 +2,169 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+ -
-
- - - -
- logo - {{AppName}} -
-
+ + + -
- {{$release_url := HTMLFormat "%s" .Release.HTMLURL .Release.TagName}} - {{$repo_url := HTMLFormat "%s" .Release.Repo.HTMLURL .Release.Repo.FullName}} -

- {{.locale.Tr "mail.release.new.text" .Release.Publisher.Name $release_url $repo_url}} -

+ + -

{{.locale.Tr "mail.release.title" .Release.Title}}

+ + - {{if .Release.RenderedNote}} - {{.locale.Tr "mail.release.note"}}
-
- {{.Release.RenderedNote}} -
- {{end}} + + + -

{{.locale.Tr "mail.release.downloads"}}

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

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

-

- {{.Link}} -

-
-
-
-
-

- © {{AppName}} -

-

Secure release notification – if you didn't expect this, please ignore this email.

-
+ + -
+
- -
\ No newline at end of file diff --git a/themes/horizon/mail/repo/transfer.tmpl b/themes/horizon/mail/repo/transfer.tmpl index aafbc91..a639fca 100644 --- a/themes/horizon/mail/repo/transfer.tmpl +++ b/themes/horizon/mail/repo/transfer.tmpl @@ -2,63 +2,129 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+ -
-
- - - -
- logo - {{AppName}} -
-
+ + + -
- {{$url := HTMLFormat "%[2]s" .Link .Repo}} -

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

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

- {{.locale.Tr "mail.link_not_working_do_paste"}} + + + + + {{$url := HTMLFormat "%[2]s" .Link .Repo}} +

-

- {{.Link}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

-
-
-
-
-

- © {{AppName}} -

-

Secure repository transfer notification – if you didn’t expect this, please ignore this email.

-
+ + -
+
- -
\ No newline at end of file diff --git a/themes/horizon/mail/user/auth/activate.tmpl b/themes/horizon/mail/user/auth/activate.tmpl index 9113e9c..4cff33d 100644 --- a/themes/horizon/mail/user/auth/activate.tmpl +++ b/themes/horizon/mail/user/auth/activate.tmpl @@ -2,69 +2,138 @@ - - {{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}} + + + + + {{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}} + + - -
-
+ +
+ -
-
- - - -
- logo - {{AppName}} -
-
+ + + -
-

- {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}} -

-

- {{.locale.Tr "mail.activate_account.text_1" (.DisplayName|DotEscape) AppName}} -

-

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

+ + - {{$activate_url := printf "%suser/activate?code=%s" AppUrl (QueryEscape .Code)}} - - - - -
- Activate Account -
+ + -
-

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

-

- {{$activate_url}} + +

-
-
-
-
-

- © {{AppName}} -

-

Secure account activation – if you didn’t register, please ignore this email.

-
+ -
+ + + + + + + + + + + + + {{$activate_url := printf "%suser/activate?code=%s" AppUrl (QueryEscape .Code)}} + + + + + + + + + + + + + + + + + + + + + + + + + +
- -
\ No newline at end of file diff --git a/themes/horizon/mail/user/auth/activate_email.tmpl b/themes/horizon/mail/user/auth/activate_email.tmpl index 96be7ef..9819cf9 100644 --- a/themes/horizon/mail/user/auth/activate_email.tmpl +++ b/themes/horizon/mail/user/auth/activate_email.tmpl @@ -2,66 +2,134 @@ - - {{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}} + + + + + {{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}} + + - -
-
+ +
+ -
-
- - - -
- logo - {{AppName}} -
-
+ + + -
-

- {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}} -

-

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

+ + - {{$activate_url := printf "%suser/activate_email?code=%s&email=%s" AppUrl (QueryEscape .Code) (QueryEscape .Email)}} - - - - -
- Verify Email Address -
+ + -
-

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

-

- {{$activate_url}} + +

-
-
-
-
-

- © {{AppName}} -

-

Secure email verification – if you didn’t request this, please ignore this email.

-
+ + -
+ + + + + + + + + + {{$activate_url := printf "%suser/activate_email?code=%s&email=%s" AppUrl (QueryEscape .Code) (QueryEscape .Email)}} + + + + + + + + + + + + + + + + + + + + + + + + + +
- -
\ No newline at end of file diff --git a/themes/horizon/mail/user/auth/register_notify.tmpl b/themes/horizon/mail/user/auth/register_notify.tmpl index 5697863..bc319ff 100644 --- a/themes/horizon/mail/user/auth/register_notify.tmpl +++ b/themes/horizon/mail/user/auth/register_notify.tmpl @@ -2,72 +2,141 @@ - - {{.locale.Tr "mail.register_notify.title" (.DisplayName|DotEscape) AppName}} + + + + + {{.locale.Tr "mail.register_notify.title" (.DisplayName|DotEscape) AppName}} + + - -
-
+ +
+ -
-
- - - -
- logo - {{AppName}} -
-
+ + + -
-

- {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}} -

-

- {{.locale.Tr "mail.register_notify.text_1" AppName}} -

-

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

+ + - - - - -
- Log in to {{AppName}} -
+ + - {{$set_pwd_url := printf "%suser/forgot_password" AppUrl}} -

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

+ + + -
-

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

-

- {{AppUrl}}user/login + +

-
-
-
-
-

- © {{AppName}} -

-

Secure registration confirmation – if you didn’t register, please ignore this email.

-
+ -
+ + + + + + + + + + + + + + + + + + + {{$set_pwd_url := printf "%suser/forgot_password" AppUrl}} +

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

+ + + + + + + + + + + + + + + + + + + +
-
\ No newline at end of file diff --git a/themes/horizon/mail/user/auth/reset_passwd.tmpl b/themes/horizon/mail/user/auth/reset_passwd.tmpl index 468ae6d..11a7ce6 100644 --- a/themes/horizon/mail/user/auth/reset_passwd.tmpl +++ b/themes/horizon/mail/user/auth/reset_passwd.tmpl @@ -2,65 +2,134 @@ - - {{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}} + + + + + {{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}} + + - -
-
+ +
+ -
-
- - - -
- logo - {{AppName}} -
-
+ + + -
-

- {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}} -

-

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

+ + - {{$recover_url := printf "%suser/recover_account?code=%s" AppUrl (QueryEscape .Code)}} - - - - -
- Reset Password -
+ + -
-

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

-

- {{$recover_url}} + +

-
-
-
-
-

- © {{AppName}} -

-

Secure password reset link – if you didn’t request this, please ignore this email.

-
+ + -
+ + + + + + + + + + {{$recover_url := printf "%suser/recover_account?code=%s" AppUrl (QueryEscape .Code)}} + + + + + + + + + + + + + + + + + + + + + + + + + +
-
\ No newline at end of file diff --git a/themes/ink/mail/org/team_invite.tmpl b/themes/ink/mail/org/team_invite.tmpl index a50a377..febe87e 100644 --- a/themes/ink/mail/org/team_invite.tmpl +++ b/themes/ink/mail/org/team_invite.tmpl @@ -4,56 +4,139 @@ - {{AppName}} - Team Invitation + + + {{.locale.Tr "mail.team_invite.subject" (.Inviter.DisplayName|DotEscape) (.Organization.DisplayName|DotEscape)}} + + - + +
- - - - +
- logo - {{AppName}}
- Gitea Mail Templates -
+ + - - - - - - + + + + + + + + + + + + + +
diff --git a/themes/ink/mail/repo/actions/workflow_run.tmpl b/themes/ink/mail/repo/actions/workflow_run.tmpl index d5bcf84..ef74473 100644 --- a/themes/ink/mail/repo/actions/workflow_run.tmpl +++ b/themes/ink/mail/repo/actions/workflow_run.tmpl @@ -4,55 +4,135 @@ - {{.Subject}} + + + {{.Subject}} + + - + +
- - - - +
- logo - {{AppName}}
- Gitea Mail Templates -
+ + - - - - - - + + + + + + + + + + + + + +
diff --git a/themes/ink/mail/repo/collaborator.tmpl b/themes/ink/mail/repo/collaborator.tmpl index 8d1cd9e..8430fa2 100644 --- a/themes/ink/mail/repo/collaborator.tmpl +++ b/themes/ink/mail/repo/collaborator.tmpl @@ -4,55 +4,127 @@ - {{.Subject}} + + + {{.Subject}} + + - + +
- - - - +
- logo - {{AppName}}
- Gitea Mail Templates -
+ + - - - - - - + + + + + + + + + + + + + +
diff --git a/themes/ink/mail/repo/issue/assigned.tmpl b/themes/ink/mail/repo/issue/assigned.tmpl index ba01e51..8526a05 100644 --- a/themes/ink/mail/repo/issue/assigned.tmpl +++ b/themes/ink/mail/repo/issue/assigned.tmpl @@ -4,55 +4,133 @@ - {{.Subject}} + + + {{.Subject}} + + - + +
- - - - +
- logo - {{AppName}}
- Gitea Mail Templates -
+ + - - - - - - + + + + + + + + + + + + + +
diff --git a/themes/ink/mail/repo/issue/default.tmpl b/themes/ink/mail/repo/issue/default.tmpl index 24f61c8..dd17f41 100644 --- a/themes/ink/mail/repo/issue/default.tmpl +++ b/themes/ink/mail/repo/issue/default.tmpl @@ -4,56 +4,205 @@ - {{.Subject}} + + + {{.Subject}} + + - + +
- - - - +
- logo - {{AppName}}
- Gitea Mail Templates -
+ + - - - - - - + + + + + + + + + + + + + +
diff --git a/themes/ink/mail/repo/release.tmpl b/themes/ink/mail/repo/release.tmpl index 83ba50f..14087da 100644 --- a/themes/ink/mail/repo/release.tmpl +++ b/themes/ink/mail/repo/release.tmpl @@ -4,60 +4,154 @@ - {{.Subject}} + + + {{.Subject}} + + - + +
- - - - +
- logo - {{AppName}}
- Gitea Mail Templates -
+ + - - - - - - + + + + + + + + + + + + + +
diff --git a/themes/ink/mail/repo/transfer.tmpl b/themes/ink/mail/repo/transfer.tmpl index a992cd7..16edf4c 100644 --- a/themes/ink/mail/repo/transfer.tmpl +++ b/themes/ink/mail/repo/transfer.tmpl @@ -4,55 +4,128 @@ - {{.Subject}} + + + {{.Subject}} + + - + +
- - - - +
- logo - {{AppName}}
- Gitea Mail Templates -
+ + - - - - - - + + + + + + + + + + + + + +
diff --git a/themes/ink/mail/user/auth/activate.tmpl b/themes/ink/mail/user/auth/activate.tmpl index 735bcb8..7687c2b 100644 --- a/themes/ink/mail/user/auth/activate.tmpl +++ b/themes/ink/mail/user/auth/activate.tmpl @@ -4,56 +4,140 @@ - {{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}} + + + {{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}} + + - + +
- - - - +
- logo - {{AppName}}
- Gitea Mail Templates -
+ + - - - - - - + + + + + + + + + + + + + +
diff --git a/themes/ink/mail/user/auth/activate_email.tmpl b/themes/ink/mail/user/auth/activate_email.tmpl index 631ef56..3e81e53 100644 --- a/themes/ink/mail/user/auth/activate_email.tmpl +++ b/themes/ink/mail/user/auth/activate_email.tmpl @@ -4,56 +4,136 @@ - {{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}} + + + {{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}} + + - + +
- - - - +
- logo - {{AppName}}
- Gitea Mail Templates -
+ + - - - - - - + + + + + + + + + + + + + +
diff --git a/themes/ink/mail/user/auth/register_notify.tmpl b/themes/ink/mail/user/auth/register_notify.tmpl index 6da4ec4..1c5979d 100644 --- a/themes/ink/mail/user/auth/register_notify.tmpl +++ b/themes/ink/mail/user/auth/register_notify.tmpl @@ -4,57 +4,137 @@ - {{.locale.Tr "mail.register_notify.title" (.DisplayName|DotEscape) AppName}} + + + {{.locale.Tr "mail.register_notify.title" (.DisplayName|DotEscape) AppName}} + + - + +
- - - - +
- logo - {{AppName}}
- Gitea Mail Templates -
+ + - - - - - - + + + + + + + + + + + + + +
diff --git a/themes/ink/mail/user/auth/reset_passwd.tmpl b/themes/ink/mail/user/auth/reset_passwd.tmpl index ad99ff3..da3fedb 100644 --- a/themes/ink/mail/user/auth/reset_passwd.tmpl +++ b/themes/ink/mail/user/auth/reset_passwd.tmpl @@ -4,56 +4,136 @@ - {{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}} + + + {{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}} + + - + +
- - - - +
- logo - {{AppName}}
- Gitea Mail Templates -
+ + - - - - - - + + + + + + + + + + + + + +
diff --git a/themes/mono/mail/org/team_invite.tmpl b/themes/mono/mail/org/team_invite.tmpl index b975c81..6c9f9dc 100644 --- a/themes/mono/mail/org/team_invite.tmpl +++ b/themes/mono/mail/org/team_invite.tmpl @@ -4,53 +4,137 @@ - {{AppName}} - Team Invitation + + + {{.locale.Tr "mail.team_invite.subject" (.Inviter.DisplayName|DotEscape) (.Organization.DisplayName|DotEscape)}} + + - + +
- - - - - - - - - +
- {{AppName}}* -
- - - - - -
-

{{.locale.Tr "mail.hi_user_x" .Invite.Email}}

-

{{.locale.Tr "mail.team_invite.text_1" (DotEscape .Inviter.DisplayName) (DotEscape .Team.Name) (DotEscape .Organization.DisplayName)}}

-

{{.locale.Tr "mail.team_invite.text_2"}}

-
-
- -
- ACTIVATE -
-
-

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

-

{{.InviteURL}}

-
-
-

{{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/mono/mail/repo/actions/workflow_run.tmpl b/themes/mono/mail/repo/actions/workflow_run.tmpl index af191ff..733c715 100644 --- a/themes/mono/mail/repo/actions/workflow_run.tmpl +++ b/themes/mono/mail/repo/actions/workflow_run.tmpl @@ -4,53 +4,133 @@ - {{.Subject}} + + + {{.Subject}} + + - -
- - - - - - - - - + +
+
- {{AppName}}* -
- - - - - -
-

-

{{.Repo.FullName}} - {{.Run.WorkflowID}}: {{.RunStatusText}}

-

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

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

-

{{.Run.HTMLURL}}

-
-
-

{{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/mono/mail/repo/collaborator.tmpl b/themes/mono/mail/repo/collaborator.tmpl index fcafbe4..16a41af 100644 --- a/themes/mono/mail/repo/collaborator.tmpl +++ b/themes/mono/mail/repo/collaborator.tmpl @@ -4,53 +4,125 @@ - {{.Subject}} + + + {{.Subject}} + + - -
- - - - - - - - - + +
+
- {{AppName}}* -
- - - - - -
-

-

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

-

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

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

-

{{.Link}}

-
-
-

{{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/mono/mail/repo/issue/assigned.tmpl b/themes/mono/mail/repo/issue/assigned.tmpl index 78efa7b..1d988b0 100644 --- a/themes/mono/mail/repo/issue/assigned.tmpl +++ b/themes/mono/mail/repo/issue/assigned.tmpl @@ -4,53 +4,131 @@ - {{.Subject}} + + + {{.Subject}} + + - -
- - - - - - - - - + +
+
- {{AppName}}* -
- - - - - -
-

-

{{$repo_url := HTMLFormat "%s" .Issue.Repo.HTMLURL .Issue.Repo.FullName}}{{$link := HTMLFormat "#%d" .Link .Issue.Index}}{{if .IsPull}}{{.locale.Tr "mail.issue_assigned.pull" .Doer.Name $link $repo_url}}{{else}}{{.locale.Tr "mail.issue_assigned.issue" .Doer.Name $link $repo_url}}{{end}}

-

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

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

-

{{.Link}}

-
-
-

{{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/mono/mail/repo/issue/default.tmpl b/themes/mono/mail/repo/issue/default.tmpl index f437369..be4cbb0 100644 --- a/themes/mono/mail/repo/issue/default.tmpl +++ b/themes/mono/mail/repo/issue/default.tmpl @@ -4,54 +4,204 @@ - {{.Subject}} + + + {{.Subject}} + + - -
- - - - - - - - - + +
+
- {{AppName}}* -
- - - - - -
-

-

{{if .IsMention}}

{{.locale.Tr "mail.issue.x_mentioned_you" .Doer.Name}}

{{end}}{{if eq .ActionName "push"}}

{{if .Comment.IsForcePush}}{{$oldCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.OldCommit}}{{$oldShortSha := ShortSha .Comment.OldCommit}}{{$oldCommitLink := HTMLFormat "%[2]s" $oldCommitUrl $oldShortSha}}{{$newCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.NewCommit}}{{$newShortSha := ShortSha .Comment.NewCommit}}{{$newCommitLink := HTMLFormat "%[2]s" $newCommitUrl $newShortSha}}{{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink}}{{else}}{{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits)}}{{end}}

{{end}}

{{if eq .ActionName "close"}}{{.locale.Tr "mail.issue.action.close" .Doer.Name .Issue.Index}}{{else if eq .ActionName "reopen"}}{{.locale.Tr "mail.issue.action.reopen" .Doer.Name .Issue.Index}}{{else if eq .ActionName "merge"}}{{.locale.Tr "mail.issue.action.merge" .Doer.Name .Issue.Index .Issue.PullRequest.BaseBranch}}{{else if eq .ActionName "approve"}}{{.locale.Tr "mail.issue.action.approve" .Doer.Name}}{{else if eq .ActionName "reject"}}{{.locale.Tr "mail.issue.action.reject" .Doer.Name}}{{else if eq .ActionName "review"}}{{.locale.Tr "mail.issue.action.review" .Doer.Name}}{{else if eq .ActionName "review_dismissed"}}{{.locale.Tr "mail.issue.action.review_dismissed" .Doer.Name .Comment.Review.Reviewer.Name}}{{else if eq .ActionName "ready_for_review"}}{{.locale.Tr "mail.issue.action.ready_for_review" .Doer.Name}}{{end}}{{- if eq .Body ""}}{{if eq .ActionName "new"}}{{.locale.Tr "mail.issue.action.new" .Doer.Name .Issue.Index}}{{end}}{{else}}{{.Body}}{{end -}}

{{- range .ReviewComments}}

{{$.locale.Tr "mail.issue.in_tree_path" .TreePath}}

{{.Patch}}
{{.RenderedContent}}
{{end -}}{{if eq .ActionName "push"}}{{end}}

-

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

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

-

{{.Link}}

-
-
-

{{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/mono/mail/repo/release.tmpl b/themes/mono/mail/repo/release.tmpl index cc2dbb6..bda86c4 100644 --- a/themes/mono/mail/repo/release.tmpl +++ b/themes/mono/mail/repo/release.tmpl @@ -4,57 +4,149 @@ - {{.Subject}} + + + {{.Subject}} + + - -
- - - - - - - - - + +
+
- {{AppName}}* -
- - - - - -
-

-

{{$release_url := HTMLFormat "%s" .Release.HTMLURL .Release.TagName}}{{$repo_url := HTMLFormat "%s" .Release.Repo.HTMLURL .Release.Repo.FullName}}{{.locale.Tr "mail.release.new.text" .Release.Publisher.Name $release_url $repo_url}} -

{{.locale.Tr "mail.release.title" .Release.Title}}

-{{if .Release.RenderedNote}}{{.locale.Tr "mail.release.note"}}
{{.Release.RenderedNote}}
{{end}} -

{{.locale.Tr "mail.release.downloads"}}

-

-

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

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

-

{{.Link}}

-
-
-

{{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/mono/mail/repo/transfer.tmpl b/themes/mono/mail/repo/transfer.tmpl index f621032..d96e5a9 100644 --- a/themes/mono/mail/repo/transfer.tmpl +++ b/themes/mono/mail/repo/transfer.tmpl @@ -4,53 +4,126 @@ - {{.Subject}} + + + {{.Subject}} + + - -
- - - - - - - - - + +
+
- {{AppName}}* -
- - - - - -
-

-

{{$url := HTMLFormat "%[2]s" .Link .Repo}}{{.Subject}}. {{.locale.Tr "mail.repo.transfer.body" $url}}

-

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

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

-

{{.Link}}

-
-
-

{{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/mono/mail/user/auth/activate.tmpl b/themes/mono/mail/user/auth/activate.tmpl index bdbb3c6..4c56462 100644 --- a/themes/mono/mail/user/auth/activate.tmpl +++ b/themes/mono/mail/user/auth/activate.tmpl @@ -4,53 +4,135 @@ - {{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}} + + + {{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}} + + - + +
- - - - - - - - - +
- {{AppName}}* -
- - - - - -
-

{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}

-

{{.locale.Tr "mail.activate_account.text_1" (.DisplayName|DotEscape) AppName}}

-

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

-
-
- {{$activate_url := printf "%suser/activate?code=%s" AppUrl (QueryEscape .Code)}} -
- ACTIVATE -
-
-

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

-

{{$activate_url}}

-
-
-

{{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/mono/mail/user/auth/activate_email.tmpl b/themes/mono/mail/user/auth/activate_email.tmpl index 8b4beee..557cb87 100644 --- a/themes/mono/mail/user/auth/activate_email.tmpl +++ b/themes/mono/mail/user/auth/activate_email.tmpl @@ -4,53 +4,131 @@ - {{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}} + + + {{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}} + + - + +
- - - - - - - - - +
- {{AppName}}* -
- - - - - -
-

{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}

-

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

-

-
-
- {{$activate_url := printf "%suser/activate_email?code=%s&email=%s" AppUrl (QueryEscape .Code) (QueryEscape .Email)}} -
- ACTIVATE -
-
-

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

-

{{$activate_url}}

-
-
-

{{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/mono/mail/user/auth/register_notify.tmpl b/themes/mono/mail/user/auth/register_notify.tmpl index c97661b..bab7443 100644 --- a/themes/mono/mail/user/auth/register_notify.tmpl +++ b/themes/mono/mail/user/auth/register_notify.tmpl @@ -4,55 +4,135 @@ - {{.locale.Tr "mail.register_notify.title" (.DisplayName|DotEscape) AppName}} + + + {{.locale.Tr "mail.register_notify.title" (.DisplayName|DotEscape) AppName}} + + - + +
- - - - - - - - - +
- {{AppName}}* -
- - - - - -
-

{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}

-

{{.locale.Tr "mail.register_notify.text_1" AppName}}

-

{{.locale.Tr "mail.register_notify.text_2" .Username}} -{{$set_pwd_url := printf "%suser/forgot_password" AppUrl}} -{{.locale.Tr "mail.register_notify.text_3" $set_pwd_url}}

-
-
- -
- ACTIVATE -
-
-

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

-

{{AppUrl}}user/login

-
-
-

{{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/mono/mail/user/auth/reset_passwd.tmpl b/themes/mono/mail/user/auth/reset_passwd.tmpl index bd77946..c0468b3 100644 --- a/themes/mono/mail/user/auth/reset_passwd.tmpl +++ b/themes/mono/mail/user/auth/reset_passwd.tmpl @@ -4,53 +4,131 @@ - {{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}} + + + {{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}} + + - + +
- - - - - - - - - +
- {{AppName}}* -
- - - - - -
-

{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}

-

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

-

-
-
- {{$recover_url := printf "%suser/recover_account?code=%s" AppUrl (QueryEscape .Code)}} -
- ACTIVATE -
-
-

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

-

{{$recover_url}}

-
-
-

{{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/neon/mail/org/team_invite.tmpl b/themes/neon/mail/org/team_invite.tmpl index 5132fa9..5d73062 100644 --- a/themes/neon/mail/org/team_invite.tmpl +++ b/themes/neon/mail/org/team_invite.tmpl @@ -4,46 +4,138 @@ - {{AppName}} - Team Invitation + + + {{.locale.Tr "mail.team_invite.subject" (.Inviter.DisplayName|DotEscape) (.Organization.DisplayName|DotEscape)}} + + - + +
- - - - - - - - - +
-
- {{AppName}} -
-
-

{{.locale.Tr "mail.hi_user_x" .Invite.Email}}

-
-

{{.locale.Tr "mail.team_invite.text_1" (DotEscape .Inviter.DisplayName) (DotEscape .Team.Name) (DotEscape .Organization.DisplayName)}}

-

{{.locale.Tr "mail.team_invite.text_2"}}

- -
- Accept Invitation -
-
-

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

-

{{.InviteURL}}

-
-
-

© {{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/neon/mail/repo/actions/workflow_run.tmpl b/themes/neon/mail/repo/actions/workflow_run.tmpl index f9522fe..0254c38 100644 --- a/themes/neon/mail/repo/actions/workflow_run.tmpl +++ b/themes/neon/mail/repo/actions/workflow_run.tmpl @@ -4,46 +4,137 @@ - {{.Subject}} + + + {{.Subject}} + + - + +
- - - - - - - - - +
-
- {{AppName}} -
-
-

-
-

{{.Repo.FullName}} - {{.Run.WorkflowID}}: {{.RunStatusText}}

-

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

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

-

{{.Run.HTMLURL}}

-
-
-

© {{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/neon/mail/repo/collaborator.tmpl b/themes/neon/mail/repo/collaborator.tmpl index c1b65cf..0a12361 100644 --- a/themes/neon/mail/repo/collaborator.tmpl +++ b/themes/neon/mail/repo/collaborator.tmpl @@ -4,46 +4,130 @@ - {{.Subject}} + + + {{.Subject}} + + - + +
- - - - - - - - - +
-
- {{AppName}} -
-
-

-
-

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

-

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

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

-

{{.Link}}

-
-
-

© {{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/neon/mail/repo/issue/assigned.tmpl b/themes/neon/mail/repo/issue/assigned.tmpl index 091387e..b44c97b 100644 --- a/themes/neon/mail/repo/issue/assigned.tmpl +++ b/themes/neon/mail/repo/issue/assigned.tmpl @@ -4,46 +4,136 @@ - {{.Subject}} + + + {{.Subject}} + + - + +
- - - - - - - - - +
-
- {{AppName}} -
-
-

-
-

{{$repo_url := HTMLFormat "%s" .Issue.Repo.HTMLURL .Issue.Repo.FullName}}{{$link := HTMLFormat "#%d" .Link .Issue.Index}}{{if .IsPull}}{{.locale.Tr "mail.issue_assigned.pull" .Doer.Name $link $repo_url}}{{else}}{{.locale.Tr "mail.issue_assigned.issue" .Doer.Name $link $repo_url}}{{end}}

-

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

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

-

{{.Link}}

-
-
-

© {{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/neon/mail/repo/issue/default.tmpl b/themes/neon/mail/repo/issue/default.tmpl index 8a8f21e..5ddf15e 100644 --- a/themes/neon/mail/repo/issue/default.tmpl +++ b/themes/neon/mail/repo/issue/default.tmpl @@ -4,47 +4,198 @@ - {{.Subject}} + + + {{.Subject}} + + - -
- - - - - - - - - + +
+
-
- {{AppName}} -
-
-

-
-

{{if .IsMention}}

{{.locale.Tr "mail.issue.x_mentioned_you" .Doer.Name}}

{{end}}{{if eq .ActionName "push"}}

{{if .Comment.IsForcePush}}{{$oldCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.OldCommit}}{{$oldShortSha := ShortSha .Comment.OldCommit}}{{$oldCommitLink := HTMLFormat "%[2]s" $oldCommitUrl $oldShortSha}}{{$newCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.NewCommit}}{{$newShortSha := ShortSha .Comment.NewCommit}}{{$newCommitLink := HTMLFormat "%[2]s" $newCommitUrl $newShortSha}}{{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink}}{{else}}{{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits)}}{{end}}

{{end}}

{{if eq .ActionName "close"}}{{.locale.Tr "mail.issue.action.close" .Doer.Name .Issue.Index}}{{else if eq .ActionName "reopen"}}{{.locale.Tr "mail.issue.action.reopen" .Doer.Name .Issue.Index}}{{else if eq .ActionName "merge"}}{{.locale.Tr "mail.issue.action.merge" .Doer.Name .Issue.Index .Issue.PullRequest.BaseBranch}}{{else if eq .ActionName "approve"}}{{.locale.Tr "mail.issue.action.approve" .Doer.Name}}{{else if eq .ActionName "reject"}}{{.locale.Tr "mail.issue.action.reject" .Doer.Name}}{{else if eq .ActionName "review"}}{{.locale.Tr "mail.issue.action.review" .Doer.Name}}{{else if eq .ActionName "review_dismissed"}}{{.locale.Tr "mail.issue.action.review_dismissed" .Doer.Name .Comment.Review.Reviewer.Name}}{{else if eq .ActionName "ready_for_review"}}{{.locale.Tr "mail.issue.action.ready_for_review" .Doer.Name}}{{end}}{{- if eq .Body ""}}{{if eq .ActionName "new"}}{{.locale.Tr "mail.issue.action.new" .Doer.Name .Issue.Index}}{{end}}{{else}}{{.Body}}{{end -}}{{if .CanReply}} {{.locale.Tr "mail.reply"}}{{end}}

{{- range .ReviewComments}}

{{$.locale.Tr "mail.issue.in_tree_path" .TreePath}}

{{.Patch}}
{{.RenderedContent}}
{{end -}}{{if eq .ActionName "push"}}{{end}}

-

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

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

-

{{.Link}}

-
-
-

© {{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/neon/mail/repo/release.tmpl b/themes/neon/mail/repo/release.tmpl index 5ac0038..bb6029d 100644 --- a/themes/neon/mail/repo/release.tmpl +++ b/themes/neon/mail/repo/release.tmpl @@ -4,50 +4,156 @@ - {{.Subject}} + + + {{.Subject}} + + - -
- - - - - - - - - + +
+
-
- {{AppName}} -
-
-

-
-

{{$release_url := HTMLFormat "%s" .Release.HTMLURL .Release.TagName}}{{$repo_url := HTMLFormat "%s" .Release.Repo.HTMLURL .Release.Repo.FullName}}{{.locale.Tr "mail.release.new.text" .Release.Publisher.Name $release_url $repo_url}} -

{{.locale.Tr "mail.release.title" .Release.Title}}

- {{if .Release.RenderedNote}}{{.locale.Tr "mail.release.note"}}
{{.Release.RenderedNote}}
{{end}} -

{{.locale.Tr "mail.release.downloads"}}

-

-

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

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

-

{{.Link}}

-
-
-

© {{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/neon/mail/repo/transfer.tmpl b/themes/neon/mail/repo/transfer.tmpl index 6fc2d0c..01c6099 100644 --- a/themes/neon/mail/repo/transfer.tmpl +++ b/themes/neon/mail/repo/transfer.tmpl @@ -4,46 +4,131 @@ - {{.Subject}} + + + {{.Subject}} + + - + +
- - - - - - - - - +
-
- {{AppName}} -
-
-

-
-

{{$url := HTMLFormat "%[2]s" .Link .Repo}}{{.Subject}}. {{.locale.Tr "mail.repo.transfer.body" $url}}

-

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

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

-

{{.Link}}

-
-
-

© {{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/neon/mail/user/auth/activate.tmpl b/themes/neon/mail/user/auth/activate.tmpl index fde0490..4b49e1d 100644 --- a/themes/neon/mail/user/auth/activate.tmpl +++ b/themes/neon/mail/user/auth/activate.tmpl @@ -4,46 +4,136 @@ - {{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}} + + + {{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}} + + - + +
- - - - - - - - - +
-
- {{AppName}} -
-
-

{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}

-
-

{{.locale.Tr "mail.activate_account.text_1" (.DisplayName|DotEscape) AppName}}

-

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

- {{$activate_url := printf "%suser/activate?code=%s" AppUrl (QueryEscape .Code)}} -
- Activate Account -
-
-

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

-

{{$activate_url}}

-
-
-

© {{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/neon/mail/user/auth/activate_email.tmpl b/themes/neon/mail/user/auth/activate_email.tmpl index 337ba6e..fe673f3 100644 --- a/themes/neon/mail/user/auth/activate_email.tmpl +++ b/themes/neon/mail/user/auth/activate_email.tmpl @@ -4,46 +4,134 @@ - {{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}} + + + {{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}} + + - + +
- - - - - - - - - +
-
- {{AppName}} -
-
-

{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}

-
-

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

-

- {{$activate_url := printf "%suser/activate_email?code=%s&email=%s" AppUrl (QueryEscape .Code) (QueryEscape .Email)}} -
- Verify Email Address -
-
-

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

-

{{$activate_url}}

-
-
-

© {{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/neon/mail/user/auth/register_notify.tmpl b/themes/neon/mail/user/auth/register_notify.tmpl index c27b007..a272465 100644 --- a/themes/neon/mail/user/auth/register_notify.tmpl +++ b/themes/neon/mail/user/auth/register_notify.tmpl @@ -4,48 +4,139 @@ - {{.locale.Tr "mail.register_notify.title" (.DisplayName|DotEscape) AppName}} + + + {{.locale.Tr "mail.register_notify.title" (.DisplayName|DotEscape) AppName}} + + - + +
- - - - - - - - - +
-
- {{AppName}} -
-
-

{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}

-
-

{{.locale.Tr "mail.register_notify.text_1" AppName}}

-

{{.locale.Tr "mail.register_notify.text_2" .Username}} -{{$set_pwd_url := printf "%suser/forgot_password" AppUrl}} -{{.locale.Tr "mail.register_notify.text_3" $set_pwd_url}}

- -
- Go to {{AppName}} -
-
-

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

-

{{AppUrl}}user/login

-
-
-

© {{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/neon/mail/user/auth/reset_passwd.tmpl b/themes/neon/mail/user/auth/reset_passwd.tmpl index 771b66f..9db3d65 100644 --- a/themes/neon/mail/user/auth/reset_passwd.tmpl +++ b/themes/neon/mail/user/auth/reset_passwd.tmpl @@ -4,46 +4,134 @@ - {{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}} + + + {{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}} + + - + +
- - - - - - - - - +
-
- {{AppName}} -
-
-

{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}

-
-

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

-

- {{$recover_url := printf "%suser/recover_account?code=%s" AppUrl (QueryEscape .Code)}} -
- Reset Password -
-
-

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

-

{{$recover_url}}

-
-
-

© {{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/terminal/mail/org/team_invite.tmpl b/themes/terminal/mail/org/team_invite.tmpl index 7b9a949..9126131 100644 --- a/themes/terminal/mail/org/team_invite.tmpl +++ b/themes/terminal/mail/org/team_invite.tmpl @@ -2,74 +2,148 @@ - - {{AppName}} > team_invite + + + + + {{.locale.Tr "mail.team_invite.subject" (.Inviter.DisplayName|DotEscape) (.Organization.DisplayName|DotEscape)}} + + - -
-
+ +
+ -
-
- - - -
- > {{AppName}} -
-
+ + + -
-

- {{.locale.Tr "mail.hi_user_x" .Invite.Email}} -

+ -

- {{.locale.Tr "mail.team_invite.text_1" (DotEscape .Inviter.DisplayName) (DotEscape .Team.Name) (DotEscape .Organization.DisplayName)}} -

+ + -

- {{.locale.Tr "mail.team_invite.text_2"}} -

+ + + - - - - -
- $ join_team --accept -
- -
-

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

-

- ┌─
- │ {{.InviteURL}}
- └─ + +

-
-

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

-
+ -
-

- # © {{AppName}} -

-

- # if (!$expecting) { ignore(); } -

-
+ + -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- \ No newline at end of file diff --git a/themes/terminal/mail/repo/actions/workflow_run.tmpl b/themes/terminal/mail/repo/actions/workflow_run.tmpl index 2b38612..0955b78 100644 --- a/themes/terminal/mail/repo/actions/workflow_run.tmpl +++ b/themes/terminal/mail/repo/actions/workflow_run.tmpl @@ -2,72 +2,149 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+ -
-
- - - -
- > {{AppName}} -
-
+ + + -
-

- {{.Repo.FullName}} :: {{.Run.WorkflowID}} — {{.RunStatusText}} -

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

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

+ +

{{.Repo.FullName}} :: {{.Run.WorkflowID}} — {{.RunStatusText}}

+

-

- ┌─
- │ {{.Run.HTMLURL}}
- └─ + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
-
-
-

- # © {{AppName}} -

-

- # if (!$expecting) { ignore(); } -

-
+ -
+ + + +
- \ No newline at end of file diff --git a/themes/terminal/mail/repo/collaborator.tmpl b/themes/terminal/mail/repo/collaborator.tmpl index 15fbf8e..298e665 100644 --- a/themes/terminal/mail/repo/collaborator.tmpl +++ b/themes/terminal/mail/repo/collaborator.tmpl @@ -2,63 +2,140 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+ -
-
- - - -
- > {{AppName}} -
-
+ + + -
-

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

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

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

+ + -

- ┌─
- │ {{.Link}}
- └─ + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
-
-
-

- # © {{AppName}} -

-

- # if (!$expecting) { ignore(); } -

-
+ -
+ + + +
- \ No newline at end of file diff --git a/themes/terminal/mail/repo/issue/assigned.tmpl b/themes/terminal/mail/repo/issue/assigned.tmpl index d5748b8..98a8f78 100644 --- a/themes/terminal/mail/repo/issue/assigned.tmpl +++ b/themes/terminal/mail/repo/issue/assigned.tmpl @@ -2,68 +2,146 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+ -
-
- - - -
- > {{AppName}} -
-
+ + + -
- {{$repo_url := HTMLFormat "%s" .Issue.Repo.HTMLURL .Issue.Repo.FullName}} - {{$link := HTMLFormat "#%d" .Link .Issue.Index}} -

- {{if .IsPull}} - {{.locale.Tr "mail.issue_assigned.pull" .Doer.Name $link $repo_url}} - {{else}} - {{.locale.Tr "mail.issue_assigned.issue" .Doer.Name $link $repo_url}} - {{end}} -

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

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

+ + -

- ┌─
- │ {{.Link}}
- └─ + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
-
-
-

- # © {{AppName}} -

-

- # if (!$expecting) { ignore(); } -

-
+ -
+ + + +
- \ No newline at end of file diff --git a/themes/terminal/mail/repo/issue/default.tmpl b/themes/terminal/mail/repo/issue/default.tmpl index c93dbea..aaea84a 100644 --- a/themes/terminal/mail/repo/issue/default.tmpl +++ b/themes/terminal/mail/repo/issue/default.tmpl @@ -2,129 +2,207 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+ -
-
- - - -
- > {{AppName}} -
-
+ + + -
- {{if .IsMention}}

{{.locale.Tr "mail.issue.x_mentioned_you" .Doer.Name}}

{{end}} - {{if eq .ActionName "push"}} -

- {{if .Comment.IsForcePush}} - {{$oldCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.OldCommit}} - {{$oldShortSha := ShortSha .Comment.OldCommit}} - {{$oldCommitLink := HTMLFormat "%[2]s" $oldCommitUrl $oldShortSha}} + - {{$newCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.NewCommit}} - {{$newShortSha := ShortSha .Comment.NewCommit}} - {{$newCommitLink := HTMLFormat "%[2]s" $newCommitUrl $newShortSha}} + + - {{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink}} - {{else}} - {{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits)}} - {{end}} + + + + +

+ +

{{.locale.Tr "mail.issue.x_mentioned_you" .Doer.Name}}

+ {{end}} + + {{if eq .ActionName "push"}} +

+ {{if .Comment.IsForcePush}} + {{$oldCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.OldCommit}} + {{$oldShortSha := ShortSha .Comment.OldCommit}} + {{$oldCommitLink := HTMLFormat "%[2]s" $oldCommitUrl $oldShortSha}} + {{$newCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.NewCommit}} + {{$newShortSha := ShortSha .Comment.NewCommit}} + {{$newCommitLink := HTMLFormat "%[2]s" $newCommitUrl $newShortSha}} + {{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink}} + {{else}} + {{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits)}} + {{end}} +

+ {{end}} + +

+ {{if eq .ActionName "close"}} + {{.locale.Tr "mail.issue.action.close" .Doer.Name .Issue.Index}} + {{else if eq .ActionName "reopen"}} + {{.locale.Tr "mail.issue.action.reopen" .Doer.Name .Issue.Index}} + {{else if eq .ActionName "merge"}} + {{.locale.Tr "mail.issue.action.merge" .Doer.Name .Issue.Index .Issue.PullRequest.BaseBranch}} + {{else if eq .ActionName "approve"}} + {{.locale.Tr "mail.issue.action.approve" .Doer.Name}} + {{else if eq .ActionName "reject"}} + {{.locale.Tr "mail.issue.action.reject" .Doer.Name}} + {{else if eq .ActionName "review"}} + {{.locale.Tr "mail.issue.action.review" .Doer.Name}} + {{else if eq .ActionName "review_dismissed"}} + {{.locale.Tr "mail.issue.action.review_dismissed" .Doer.Name .Comment.Review.Reviewer.Name}} + {{else if eq .ActionName "ready_for_review"}} + {{.locale.Tr "mail.issue.action.ready_for_review" .Doer.Name}} + {{end}} + {{- if eq .Body ""}} + {{if eq .ActionName "new"}} + {{.locale.Tr "mail.issue.action.new" .Doer.Name .Issue.Index}} + {{end}} + {{else}} + {{.Body}} + {{end -}} +

+ + {{- range .ReviewComments}} +
+

{{$.locale.Tr "mail.issue.in_tree_path" .TreePath}}

+ 
{{.Patch}}
+
{{.RenderedContent}}
+ {{end -}} + + {{if eq .ActionName "push"}} + + {{end}}

- {{end}} -

- {{if eq .ActionName "close"}} - {{.locale.Tr "mail.issue.action.close" .Doer.Name .Issue.Index}} - {{else if eq .ActionName "reopen"}} - {{.locale.Tr "mail.issue.action.reopen" .Doer.Name .Issue.Index}} - {{else if eq .ActionName "merge"}} - {{.locale.Tr "mail.issue.action.merge" .Doer.Name .Issue.Index .Issue.PullRequest.BaseBranch}} - {{else if eq .ActionName "approve"}} - {{.locale.Tr "mail.issue.action.approve" .Doer.Name}} - {{else if eq .ActionName "reject"}} - {{.locale.Tr "mail.issue.action.reject" .Doer.Name}} - {{else if eq .ActionName "review"}} - {{.locale.Tr "mail.issue.action.review" .Doer.Name}} - {{else if eq .ActionName "review_dismissed"}} - {{.locale.Tr "mail.issue.action.review_dismissed" .Doer.Name .Comment.Review.Reviewer.Name}} - {{else if eq .ActionName "ready_for_review"}} - {{.locale.Tr "mail.issue.action.ready_for_review" .Doer.Name}} - {{end}} - {{- if eq .Body ""}} - {{if eq .ActionName "new"}} - {{.locale.Tr "mail.issue.action.new" .Doer.Name .Issue.Index}} - {{end}} - {{else}} - {{.Body}} - {{end -}} -

+ - {{- range .ReviewComments}} -
-

{{$.locale.Tr "mail.issue.in_tree_path" .TreePath}}

-
- 
{{.Patch}}
-
{{.RenderedContent}}
-
- {{end -}} + + - {{if eq .ActionName "push"}} - - {{end}} + + + + - - - - -
- {{.locale.Tr "mail.view_it_on" AppName}} -
+ + + -
-

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

-

- ┌─
- │ {{.Link}}
- └─ + +

-
-
-
-

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

-

- # if (!$expecting) { ignore(); } -

-
+ + -
+
- \ No newline at end of file diff --git a/themes/terminal/mail/repo/release.tmpl b/themes/terminal/mail/repo/release.tmpl index 7361566..ac7090c 100644 --- a/themes/terminal/mail/repo/release.tmpl +++ b/themes/terminal/mail/repo/release.tmpl @@ -2,95 +2,164 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+ -
-
- - - -
- > {{AppName}} -
-
+ + + -
- {{$release_url := HTMLFormat "%s" .Release.HTMLURL .Release.TagName}} - {{$repo_url := HTMLFormat "%s" .Release.Repo.HTMLURL .Release.Repo.FullName}} -

- {{.locale.Tr "mail.release.new.text" .Release.Publisher.Name $release_url $repo_url}} -

+ -

{{.locale.Tr "mail.release.title" .Release.Title}}

+ + -

$ {{.locale.Tr "mail.release.note"}}

- {{if .Release.RenderedNote}} -
- {{.Release.RenderedNote}} -
- {{end}} + + + -

{{.locale.Tr "mail.release.downloads"}}

-
    - {{if not .DisableDownloadSourceArchives}} -
  • - {{.locale.Tr "mail.release.download.zip"}} -
    • -
  • - {{.locale.Tr "mail.release.download.targz"}} -
    • - {{end}} - {{if .Release.Attachments}} - {{range .Release.Attachments}} -
  • - {{.Name}} ({{.Size | FileSize}}) -
    • + + +

    {{.locale.Tr "mail.release.title" .Release.Title}}

    + +

    $ {{.locale.Tr "mail.release.note"}}

    + {{if .Release.RenderedNote}} +
    + {{.Release.RenderedNote}} +
    {{end}} - {{end}} -
- - - - -
- {{.locale.Tr "mail.view_it_on" AppName}} -
- -
-

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

{{.locale.Tr "mail.release.downloads"}}

+

-

- ┌─
- │ {{.Link}}
- └─ + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
-
-
-

- # © {{AppName}} -

-

- # if (!$expecting) { ignore(); } -

-
+ -
+ + + +
- \ No newline at end of file diff --git a/themes/terminal/mail/repo/transfer.tmpl b/themes/terminal/mail/repo/transfer.tmpl index 69e7699..3cea5e3 100644 --- a/themes/terminal/mail/repo/transfer.tmpl +++ b/themes/terminal/mail/repo/transfer.tmpl @@ -2,63 +2,141 @@ - - {{.Subject}} + + + + + {{.Subject}} + + - -
-
+ +
+ -
-
- - - -
- > {{AppName}} -
-
+ + + -
- {{$url := HTMLFormat "%[2]s" .Link .Repo}} -

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

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

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

+ + -

- ┌─
- │ {{.Link}}
- └─ + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
-
-
-

- # © {{AppName}} -

-

- # if (!$expecting) { ignore(); } -

-
+ -
+ + + +
- \ No newline at end of file diff --git a/themes/terminal/mail/user/auth/activate.tmpl b/themes/terminal/mail/user/auth/activate.tmpl index ebd1659..544271f 100644 --- a/themes/terminal/mail/user/auth/activate.tmpl +++ b/themes/terminal/mail/user/auth/activate.tmpl @@ -2,69 +2,146 @@ - - {{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}} + + + + + {{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}} + + - -
-
+ +
+ -
-
- - - -
- > {{AppName}} -
-
+ + + -
-

- {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}} -

-

- {{.locale.Tr "mail.activate_account.text_1" (.DisplayName|DotEscape) AppName}} -

-

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

+ - {{$activate_url := printf "%suser/activate?code=%s" AppUrl (QueryEscape .Code)}} - - - - -
- $ activate_account -
+ + -
-

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

-

- ┌─
- │ {{$activate_url}}
- └─ + +

-
-
-
-

- # © {{AppName}} -

-

- # if (!$expecting) { ignore(); } -

-
+ -
+ + + + + + + + + + + + + {{$activate_url := printf "%suser/activate?code=%s" AppUrl (QueryEscape .Code)}} + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- \ No newline at end of file diff --git a/themes/terminal/mail/user/auth/activate_email.tmpl b/themes/terminal/mail/user/auth/activate_email.tmpl index 319e9e1..249bfa1 100644 --- a/themes/terminal/mail/user/auth/activate_email.tmpl +++ b/themes/terminal/mail/user/auth/activate_email.tmpl @@ -2,66 +2,144 @@ - - {{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}} + + + + + {{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}} + + - -
-
+ +
+ -
-
- - - -
- > {{AppName}} -
-
+ + + -
-

- {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}} -

-

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

+ - {{$activate_url := printf "%suser/activate_email?code=%s&email=%s" AppUrl (QueryEscape .Code) (QueryEscape .Email)}} - - - - -
- $ verify_email -
+ + -
-

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

-

- ┌─
- │ {{$activate_url}}
- └─ + +

-
-
-
-

- # © {{AppName}} -

-

- # if (!$expecting) { ignore(); } -

-
+ -
+ + + + + + + + + + + + + {{$activate_url := printf "%suser/activate_email?code=%s&email=%s" AppUrl (QueryEscape .Code) (QueryEscape .Email)}} + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- \ No newline at end of file diff --git a/themes/terminal/mail/user/auth/register_notify.tmpl b/themes/terminal/mail/user/auth/register_notify.tmpl index 67978f2..c4fb578 100644 --- a/themes/terminal/mail/user/auth/register_notify.tmpl +++ b/themes/terminal/mail/user/auth/register_notify.tmpl @@ -2,73 +2,149 @@ - - {{.locale.Tr "mail.register_notify.title" (.DisplayName|DotEscape) AppName}} + + + + + {{.locale.Tr "mail.register_notify.title" (.DisplayName|DotEscape) AppName}} + + - -
-
+ +
+ -
-
- - - -
- > {{AppName}} -
-
+ + + -
-

- {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}} -

-

- {{.locale.Tr "mail.register_notify.text_1" AppName}} -

-

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

+ - - - - -
- $ ssh user@login -
+ + - {{$set_pwd_url := printf "%suser/forgot_password" AppUrl}} -

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

+ + + -
-

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

-

- ┌─
- │ {{AppUrl}}user/login
- └─ + +

-
-
-
-

- # © {{AppName}} -

-

- # if (!$expecting) { ignore(); } -

-
+ -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- \ No newline at end of file diff --git a/themes/terminal/mail/user/auth/reset_passwd.tmpl b/themes/terminal/mail/user/auth/reset_passwd.tmpl index d8ff987..afd6d4b 100644 --- a/themes/terminal/mail/user/auth/reset_passwd.tmpl +++ b/themes/terminal/mail/user/auth/reset_passwd.tmpl @@ -2,66 +2,144 @@ - - {{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}} + + + + + {{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}} + + - -
-
+ +
+ -
-
- - - -
- > {{AppName}} -
-
+ + + -
-

- {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}} -

-

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

+ - {{$recover_url := printf "%suser/recover_account?code=%s" AppUrl (QueryEscape .Code)}} - - - - -
- $ reset_password -
+ + -
-

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

-

- ┌─
- │ {{$recover_url}}
- └─ + +

-
-
-
-

- # © {{AppName}} -

-

- # if (!$expecting) { ignore(); } -

-
+ -
+ + + + + + + + + + + + + {{$recover_url := printf "%suser/recover_account?code=%s" AppUrl (QueryEscape .Code)}} + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- \ No newline at end of file diff --git a/themes/terra/mail/org/team_invite.tmpl b/themes/terra/mail/org/team_invite.tmpl index 0a11e32..1b284ad 100644 --- a/themes/terra/mail/org/team_invite.tmpl +++ b/themes/terra/mail/org/team_invite.tmpl @@ -4,48 +4,145 @@ - {{AppName}} - Team Invitation + + + {{.locale.Tr "mail.team_invite.subject" (.Inviter.DisplayName|DotEscape) (.Organization.DisplayName|DotEscape)}} + + - -
- - - - - - - - + +
+
-
- logo - {{AppName}} -
-
-
-

{{.locale.Tr "mail.hi_user_x" .Invite.Email}}

-
-

{{.locale.Tr "mail.team_invite.text_1" (DotEscape .Inviter.DisplayName) (DotEscape .Team.Name) (DotEscape .Organization.DisplayName)}}

-

{{.locale.Tr "mail.team_invite.text_2"}}

-
- Activate Your Account -
-
-

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

-

{{.InviteURL}}

-
-

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

-
-

© {{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/terra/mail/repo/actions/workflow_run.tmpl b/themes/terra/mail/repo/actions/workflow_run.tmpl index b7c99cf..de2a20e 100644 --- a/themes/terra/mail/repo/actions/workflow_run.tmpl +++ b/themes/terra/mail/repo/actions/workflow_run.tmpl @@ -4,47 +4,139 @@ - {{.Subject}} + + + {{.Subject}} + + - -
- - - - - - - - + +
+
-
- logo - {{AppName}} -
-
-
-

-
-

{{.Repo.FullName}} - {{.Run.WorkflowID}}: {{.RunStatusText}}

-

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

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

-

{{.Run.HTMLURL}}

-
-
-

© {{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/terra/mail/repo/collaborator.tmpl b/themes/terra/mail/repo/collaborator.tmpl index ae0276f..40a734e 100644 --- a/themes/terra/mail/repo/collaborator.tmpl +++ b/themes/terra/mail/repo/collaborator.tmpl @@ -4,47 +4,132 @@ - {{.Subject}} + + + {{.Subject}} + + - -
- - - - - - - - + +
+
-
- logo - {{AppName}} -
-
-
-

-
-

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

-

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

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

-

{{.Link}}

-
-
-

© {{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/terra/mail/repo/issue/assigned.tmpl b/themes/terra/mail/repo/issue/assigned.tmpl index afb3b7a..6f116c9 100644 --- a/themes/terra/mail/repo/issue/assigned.tmpl +++ b/themes/terra/mail/repo/issue/assigned.tmpl @@ -4,47 +4,138 @@ - {{.Subject}} + + + {{.Subject}} + + - -
- - - - - - - - + +
+
-
- logo - {{AppName}} -
-
-
-

-
-

{{$repo_url := HTMLFormat "%s" .Issue.Repo.HTMLURL .Issue.Repo.FullName}}{{$link := HTMLFormat "#%d" .Link .Issue.Index}}{{if .IsPull}}{{.locale.Tr "mail.issue_assigned.pull" .Doer.Name $link $repo_url}}{{else}}{{.locale.Tr "mail.issue_assigned.issue" .Doer.Name $link $repo_url}}{{end}}

-

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

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

-

{{.Link}}

-
-
-

© {{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/terra/mail/repo/issue/default.tmpl b/themes/terra/mail/repo/issue/default.tmpl index cdb4ba6..e1ad6b3 100644 --- a/themes/terra/mail/repo/issue/default.tmpl +++ b/themes/terra/mail/repo/issue/default.tmpl @@ -4,47 +4,197 @@ - {{.Subject}} + + + {{.Subject}} + + - -
- - - - - - - - + +
+
-
- logo - {{AppName}} -
-
-
-

-
-

{{if .IsMention}}

{{.locale.Tr "mail.issue.x_mentioned_you" .Doer.Name}}

{{end}}{{if eq .ActionName "push"}}

{{if .Comment.IsForcePush}}{{$oldCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.OldCommit}}{{$oldShortSha := ShortSha .Comment.OldCommit}}{{$oldCommitLink := HTMLFormat "%[2]s" $oldCommitUrl $oldShortSha}}{{$newCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.NewCommit}}{{$newShortSha := ShortSha .Comment.NewCommit}}{{$newCommitLink := HTMLFormat "%[2]s" $newCommitUrl $newShortSha}}{{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink}}{{else}}{{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits)}}{{end}}

{{end}}

{{if eq .ActionName "close"}}{{.locale.Tr "mail.issue.action.close" .Doer.Name .Issue.Index}}{{else if eq .ActionName "reopen"}}{{.locale.Tr "mail.issue.action.reopen" .Doer.Name .Issue.Index}}{{else if eq .ActionName "merge"}}{{.locale.Tr "mail.issue.action.merge" .Doer.Name .Issue.Index .Issue.PullRequest.BaseBranch}}{{else if eq .ActionName "approve"}}{{.locale.Tr "mail.issue.action.approve" .Doer.Name}}{{else if eq .ActionName "reject"}}{{.locale.Tr "mail.issue.action.reject" .Doer.Name}}{{else if eq .ActionName "review"}}{{.locale.Tr "mail.issue.action.review" .Doer.Name}}{{else if eq .ActionName "review_dismissed"}}{{.locale.Tr "mail.issue.action.review_dismissed" .Doer.Name .Comment.Review.Reviewer.Name}}{{else if eq .ActionName "ready_for_review"}}{{.locale.Tr "mail.issue.action.ready_for_review" .Doer.Name}}{{end}}{{- if eq .Body ""}}{{if eq .ActionName "new"}}{{.locale.Tr "mail.issue.action.new" .Doer.Name .Issue.Index}}{{end}}{{else}}{{.Body}}{{end -}}

{{- range .ReviewComments}}

{{$.locale.Tr "mail.issue.in_tree_path" .TreePath}}

{{.Patch}}
{{.RenderedContent}}
{{end -}}{{if eq .ActionName "push"}}{{end}}

-

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

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

-

{{.Link}}

-
-
-

© {{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/terra/mail/repo/release.tmpl b/themes/terra/mail/repo/release.tmpl index 9cac088..4d00a32 100644 --- a/themes/terra/mail/repo/release.tmpl +++ b/themes/terra/mail/repo/release.tmpl @@ -4,51 +4,155 @@ - {{.Subject}} + + + {{.Subject}} + + - -
- - - - - - - - + +
+
-
- logo - {{AppName}} -
-
-
-

-
-

{{$release_url := HTMLFormat "%s" .Release.HTMLURL .Release.TagName}}{{$repo_url := HTMLFormat "%s" .Release.Repo.HTMLURL .Release.Repo.FullName}}{{.locale.Tr "mail.release.new.text" .Release.Publisher.Name $release_url $repo_url}} -

{{.locale.Tr "mail.release.title" .Release.Title}}

-{{if .Release.RenderedNote}}{{.locale.Tr "mail.release.note"}}
{{.Release.RenderedNote}}
{{end}} -

{{.locale.Tr "mail.release.downloads"}}

-

-

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

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

-

{{.Link}}

-
-
-

© {{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/terra/mail/repo/transfer.tmpl b/themes/terra/mail/repo/transfer.tmpl index 1478ea5..22af680 100644 --- a/themes/terra/mail/repo/transfer.tmpl +++ b/themes/terra/mail/repo/transfer.tmpl @@ -4,47 +4,133 @@ - {{.Subject}} + + + {{.Subject}} + + - -
- - - - - - - - + +
+
-
- logo - {{AppName}} -
-
-
-

-
-

{{$url := HTMLFormat "%[2]s" .Link .Repo}}{{.Subject}}. {{.locale.Tr "mail.repo.transfer.body" $url}}

-

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

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

-

{{.Link}}

-
-
-

© {{AppName}} — Gitea Mail Templates

-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/themes/terra/mail/user/auth/activate.tmpl b/themes/terra/mail/user/auth/activate.tmpl index 1ae4836..82b843a 100644 --- a/themes/terra/mail/user/auth/activate.tmpl +++ b/themes/terra/mail/user/auth/activate.tmpl @@ -4,47 +4,143 @@ - {{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}} + + + {{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}} + + - + +
- - -
- - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + +
- logo - {{AppName}} + + + + + -
-

{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}

-
-

{{.locale.Tr "mail.activate_account.text_1" (.DisplayName|DotEscape) AppName}}

-

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

- {{$activate_url := printf "%suser/activate?code=%s" AppUrl (QueryEscape .Code)}} -
- Activate Your Account -
-
-

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

-

{{$activate_url}}

-
-
-

© {{AppName}} — Gitea Mail Templates

-
diff --git a/themes/terra/mail/user/auth/activate_email.tmpl b/themes/terra/mail/user/auth/activate_email.tmpl index 79d4432..02130d7 100644 --- a/themes/terra/mail/user/auth/activate_email.tmpl +++ b/themes/terra/mail/user/auth/activate_email.tmpl @@ -4,47 +4,141 @@ - {{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}} + + + {{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}} + + - + +
- - -
- - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + +
- logo - {{AppName}} + + + + + -
-

{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}

-
-

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

-

- {{$activate_url := printf "%suser/activate_email?code=%s&email=%s" AppUrl (QueryEscape .Code) (QueryEscape .Email)}} -
- Activate Your Account -
-
-

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

-

{{$activate_url}}

-
-
-

© {{AppName}} — Gitea Mail Templates

-
diff --git a/themes/terra/mail/user/auth/register_notify.tmpl b/themes/terra/mail/user/auth/register_notify.tmpl index cac1c34..63f2424 100644 --- a/themes/terra/mail/user/auth/register_notify.tmpl +++ b/themes/terra/mail/user/auth/register_notify.tmpl @@ -4,49 +4,146 @@ - {{.locale.Tr "mail.register_notify.title" (.DisplayName|DotEscape) AppName}} + + + {{.locale.Tr "mail.register_notify.title" (.DisplayName|DotEscape) AppName}} + + - + +
- - -
- - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + +
- logo - {{AppName}} + + + + + -
-

{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}

-
-

{{.locale.Tr "mail.register_notify.text_1" AppName}}

-

{{.locale.Tr "mail.register_notify.text_2" .Username}} -{{$set_pwd_url := printf "%suser/forgot_password" AppUrl}} -{{.locale.Tr "mail.register_notify.text_3" $set_pwd_url}}

- -
- Activate Your Account -
-
-

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

-

{{AppUrl}}user/login

-
-
-

© {{AppName}} — Gitea Mail Templates

-
diff --git a/themes/terra/mail/user/auth/reset_passwd.tmpl b/themes/terra/mail/user/auth/reset_passwd.tmpl index ffff185..94a18f0 100644 --- a/themes/terra/mail/user/auth/reset_passwd.tmpl +++ b/themes/terra/mail/user/auth/reset_passwd.tmpl @@ -4,47 +4,141 @@ - {{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}} + + + {{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}} + + - + +
- - -
- - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + +
- logo - {{AppName}} + + + + + -
-

{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}

-
-

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

-

- {{$recover_url := printf "%suser/recover_account?code=%s" AppUrl (QueryEscape .Code)}} -
- Activate Your Account -
-
-

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

-

{{$recover_url}}

-
-
-

© {{AppName}} — Gitea Mail Templates

-