From 55e6cde7c123f73d7ad4e90f798b0ec5c695c58f Mon Sep 17 00:00:00 2001 From: zeripath Date: Thu, 15 Apr 2021 16:24:30 +0100 Subject: [PATCH] Use subdir for URL (#15446) (#15493) Backport #15446 Fixes #15444 Co-authored-by: KN4CK3R Co-authored-by: KN4CK3R --- templates/repo/create.tmpl | 2 +- templates/repo/issue/labels/label_list.tmpl | 2 +- templates/user/auth/activate.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 4aabcb6bb377..3b76e0ace630 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -10,7 +10,7 @@
{{template "base/alert" .}} -

{{.i18n.Tr "repo.new_repo_helper" "/repo/migrate" | Safe}}

+

{{.i18n.Tr "repo.new_repo_helper" (printf "%s%s" AppSubUrl "/repo/migrate") | Safe}}

{{if not .CanCreateRepo}}
diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index 5b50620b611e..134aff5db933 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -40,7 +40,7 @@
{{if $.PageIsOrgSettingsLabels}} - {{svg "octicon-issue-opened"}} {{$.i18n.Tr "repo.issues.label_open_issues" .NumOpenIssues}} + {{svg "octicon-issue-opened"}} {{$.i18n.Tr "repo.issues.label_open_issues" .NumOpenIssues}} {{else}} {{svg "octicon-issue-opened"}} {{$.i18n.Tr "repo.issues.label_open_issues" .NumOpenIssues}} {{end}} diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl index 7f9021ae4fa2..cc6f52b57139 100644 --- a/templates/user/auth/activate.tmpl +++ b/templates/user/auth/activate.tmpl @@ -19,7 +19,7 @@ {{end}} {{else}} {{if .NeedsPassword}} -
+