merge v0.23.0-rc changes

mails/templates/admin_password_reset.go

@@ -1,21 +0,0 @@
-package templates
-
-// Available variables:
-//
-// ```
-// Admin     *models.Admin
-// AppName   string
-// AppUrl    string
-// Token     string
-// ActionUrl string
-// ```
-const AdminPasswordResetBody = `
-{{define "content"}}
-	<p>Hello,</p>
-	<p>Follow this link to reset your admin password for {{.AppName}}.</p>
-	<p>
-		<a class="btn" href="{{.ActionUrl}}" target="_blank" rel="noopener">Reset password</a>
-	</p>
-	<p><i>If you did not request to reset your password, please ignore this email and the link will expire on its own.</i></p>
-{{end}}
-`

mails/templates/html_content.go

@@ -3,6 +3,6 @@ package templates
 // Available variables:
 //
 // ```
-// HtmlContent template.HTML
+// HTMLContent template.HTML
 // ```
-const HtmlBody = `{{define "content"}}{{.HtmlContent}}{{end}}`
+const HTMLBody = `{{define "content"}}{{.HTMLContent}}{{end}}`

mails/templates/layout.go

@@ -53,7 +53,7 @@ const Layout = `
         .btn {
             display: inline-block;
             vertical-align: top;
-            border: 1px solid #e5e5e5;
+            border: 0;
             cursor: pointer;
             color: #fff !important;
             background: #16161a !important;

mails/templates/password_login_alert.go

@@ -1,30 +0,0 @@
-package templates
-
-// Available variables:
-//
-// ```
-// Record        *models.Record
-// AppName       string
-// AppUrl        string
-// ProviderNames []string
-// ```
-const PasswordLoginAlertBody = `
-{{define "content"}}
-	<p>Hello,</p>
-	<p>
-		Just to let you know that someone has logged in to your {{.AppName}} account using a password while you already have
-		OAuth2
-		{{range $index, $provider := .ProviderNames }}
-			{{if $index}}|{{end}}
-		    {{ $provider }}
-		{{ end }}
-		auth linked.
-	</p>
-	<p>If you have recently signed in with a password, you may disregard this email.</p>
-	<p><strong>If you don't recognize the above action, you should immediately change your {{.AppName}} account password.</strong></p>
-	<p>
-	  Thanks,<br/>
-	  {{.AppName}} team
-	</p>
-{{end}}
-`