From 01fe0de615212f94c49d706313425d0615e1b815 Mon Sep 17 00:00:00 2001 From: Michael Gnehr Date: Wed, 3 Jul 2019 03:21:53 +0200 Subject: [PATCH 1/3] add 'repo archived - comment/pull not possible' message affects #7304 Signed-off-by: Michael Gnehr --- templates/repo/diff/compare.tmpl | 18 +++++++++++++++--- templates/repo/issue/view_content.tmpl | 8 ++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index 877241fb390a..fd187d3f2900 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -5,8 +5,12 @@ {{if .PageIsComparePull}}

- {{.i18n.Tr "repo.pulls.compare_changes"}} -
{{.i18n.Tr "repo.pulls.compare_changes_desc"}}
+ {{if not .Repository.IsArchived}} + {{.i18n.Tr "repo.pulls.compare_changes"}} +
{{.i18n.Tr "repo.pulls.compare_changes_desc"}}
+ {{ else }} + {{.i18n.Tr "action.compare_commits_general"}} + {{ end }}

@@ -60,7 +64,15 @@
- {{end}} + {{ else }} +
+ {{if .Issue.IsPull}} + {{.i18n.Tr "repo.archive.title"}} + {{else}} + {{.i18n.Tr "repo.archive.title"}} + {{end}} +
+ {{ end }} diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index cb85c5be9782..92ea42b05e48 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -99,6 +99,14 @@
+ {{ else if .Repository.IsArchived }} +
+ {{if .Issue.IsPull}} + {{.i18n.Tr "repo.archive.pull.nocomment"}} + {{else}} + {{.i18n.Tr "repo.archive.issue.nocomment"}} + {{end}} +
{{ end }} {{else}} {{if .Repository.IsArchived}} From 979a355d3e07ceaba08ad61027629f89792c04c8 Mon Sep 17 00:00:00 2001 From: Michael Gnehr Date: Wed, 3 Jul 2019 03:48:53 +0200 Subject: [PATCH 2/3] add navbar to compare view Signed-off-by: Michael Gnehr --- templates/repo/header.tmpl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index f4eefd3fde1d..f264a9b55956 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -46,7 +46,7 @@ {{end}} -{{if not .IsDiffCompare}} +
-{{else}} -
-{{end}} + From 57f341af6e2185e597c75e801def1a7519897cf2 Mon Sep 17 00:00:00 2001 From: Michael Gnehr Date: Mon, 8 Jul 2019 14:35:59 +0200 Subject: [PATCH 3/3] remove wrong if else Signed-off-by: Michael Gnehr --- templates/repo/diff/compare.tmpl | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index fd187d3f2900..1c8942d42fef 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -66,11 +66,7 @@ {{ else }}
- {{if .Issue.IsPull}} - {{.i18n.Tr "repo.archive.title"}} - {{else}} - {{.i18n.Tr "repo.archive.title"}} - {{end}} + {{.i18n.Tr "repo.archive.title"}}
{{ end }}