From 88805f1eec3be87307b81805dc997fe981a28649 Mon Sep 17 00:00:00 2001 From: Gerben Date: Tue, 11 Sep 2018 21:31:59 +0200 Subject: [PATCH] Incorporate some changes from upstream (up to e64aa18) --- templates/base/footer.tmpl | 4 +++- templates/base/head.tmpl | 4 +++- templates/repo/branch/list.tmpl | 6 ++---- templates/repo/header.tmpl | 6 +++--- templates/repo/view_list.tmpl | 4 ++-- templates/user/profile.tmpl | 2 +- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 47d642d..ac93779 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -39,6 +39,9 @@ {{if .RequireDropzone}} {{end}} +{{if .RequireU2F}} + +{{end}} {{if .RequireTribute}} @@ -107,4 +110,3 @@ {{template "custom/footer" .}} - diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index b34fd7d..8f5d725 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -121,6 +121,9 @@ {{end}} {{end}} +{{if ne DefaultTheme "gitea"}} + +{{end}} {{template "custom/header" .}} @@ -135,4 +138,3 @@ */}} - diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index cd6afce..2ef96de 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -69,12 +69,10 @@
- {{.i18n.Tr "repo.branch.delete_html"| Safe}} + {{.i18n.Tr "repo.branch.delete_html"}}
-

{{.i18n.Tr "repo.branch.delete_desc" | Safe}}

- {{.i18n.Tr "repo.branch.delete_notices_1" | Safe}}
- {{.i18n.Tr "repo.branch.delete_notices_html" | Safe}}
+

{{.i18n.Tr "repo.branch.delete_desc" | Str2html}}

{{template "base/delete_modal_actions" .}}
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 6f872b5..01ee295 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -4,7 +4,7 @@
- {{if .IsMirror}}
{{$.i18n.Tr "repo.mirror_from"}} {{$.Mirror.Address}}
{{end}} + {{if .IsMirror}}
{{$.i18n.Tr "repo.mirror_from"}} {{$.Mirror.Address}}
{{end}} {{if .IsFork}}
{{$.i18n.Tr "repo.forked_from"}} {{SubStr .BaseRepo.RelLink 1 -1}}
{{end}} {{.Owner.Name}}
/
@@ -23,13 +23,13 @@
{{if .Repository.UnitEnabled $.UnitTypeCode}} - + {{.i18n.Tr "repo.code"}} {{end}} {{if .Repository.UnitEnabled $.UnitTypeIssues}} - + {{.i18n.Tr "repo.issues"}} {{.Repository.NumOpenIssues}} {{end}} diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index 04e0f94..36467e9 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -63,7 +63,7 @@ {{end}} {{else}} - + {{$entry.Name}} {{end}} @@ -75,4 +75,4 @@ {{if .ReadmeExist}} {{template "repo/view_file" .}} -{{end}} \ No newline at end of file +{{end}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 0d6312b..95d99ae 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -17,7 +17,7 @@ {{template "user/dashboard/feeds" .}}
{{else}} - {{template "explore/search" .}} + {{template "explore/repo_search" .}} {{template "explore/repo_list" .}} {{template "base/paginate" .}} {{end}}