diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index 01f70e4cc2e5c..0b57720c96820 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -39,32 +39,26 @@ {{.locale.Tr "settings.manage_emails"}}
-
+
{{if $.EnableNotifyMail}}
+
{{.locale.Tr "settings.email_desc"}}
- {{.locale.Tr "settings.email_desc"}} -
-
- -
-
-
- {{$.CsrfTokenHtml}} - -
- @@ -102,7 +96,7 @@
{{end}} -
+
{{.Email}} {{if .IsPrimary}}
{{$.locale.Tr "settings.primary"}}
diff --git a/templates/user/settings/applications_oauth2_list.tmpl b/templates/user/settings/applications_oauth2_list.tmpl index e18c7f56b833c..3ffe317512b07 100644 --- a/templates/user/settings/applications_oauth2_list.tmpl +++ b/templates/user/settings/applications_oauth2_list.tmpl @@ -22,7 +22,19 @@
{{end}}
+ +
+
{{.locale.Tr "settings.create_oauth2_application"}} @@ -46,14 +58,3 @@
- - diff --git a/templates/user/settings/grants_oauth2.tmpl b/templates/user/settings/grants_oauth2.tmpl index 8dd9ca21193db..b769020c629a4 100644 --- a/templates/user/settings/grants_oauth2.tmpl +++ b/templates/user/settings/grants_oauth2.tmpl @@ -26,15 +26,15 @@
{{end}}
-
- {{end}}
- - - {{end}} - - - - -