mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-22 12:54:53 -05:00
ui fixes - compare view and archieved repo issues (#7345)
* add 'repo archived - comment/pull not possible' message affects #7304 Signed-off-by: Michael Gnehr <michael@gnehr.de> * add navbar to compare view Signed-off-by: Michael Gnehr <michael@gnehr.de> * remove wrong if else Signed-off-by: Michael Gnehr <michael@gnehr.de>
This commit is contained in:
parent
0622e83055
commit
3c3f74988a
3 changed files with 21 additions and 7 deletions
|
@ -5,8 +5,12 @@
|
|||
|
||||
{{if .PageIsComparePull}}
|
||||
<h2 class="ui header">
|
||||
{{.i18n.Tr "repo.pulls.compare_changes"}}
|
||||
<div class="sub header">{{.i18n.Tr "repo.pulls.compare_changes_desc"}}</div>
|
||||
{{if not .Repository.IsArchived}}
|
||||
{{.i18n.Tr "repo.pulls.compare_changes"}}
|
||||
<div class="sub header">{{.i18n.Tr "repo.pulls.compare_changes_desc"}}</div>
|
||||
{{ else }}
|
||||
{{.i18n.Tr "action.compare_commits_general"}}
|
||||
{{ end }}
|
||||
</h2>
|
||||
<div class="ui segment choose branch">
|
||||
<span class="octicon octicon-git-compare"></span>
|
||||
|
@ -60,7 +64,11 @@
|
|||
<div class="ui info message show-form-container">
|
||||
<button class="ui button green show-form">{{.i18n.Tr "repo.pulls.new"}}</button>
|
||||
</div>
|
||||
{{end}}
|
||||
{{ else }}
|
||||
<div class="ui warning message">
|
||||
{{.i18n.Tr "repo.archive.title"}}
|
||||
</div>
|
||||
{{ end }}
|
||||
<div class="pullrequest-form" style="display: none">
|
||||
{{template "repo/issue/new_form" .}}
|
||||
</div>
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
</div><!-- end grid -->
|
||||
</div><!-- end container -->
|
||||
{{end}}
|
||||
{{if not .IsDiffCompare}}
|
||||
|
||||
<div class="ui tabs container">
|
||||
<div class="ui tabular stackable menu navbar">
|
||||
{{if .Permission.CanRead $.UnitTypeCode}}
|
||||
|
@ -103,7 +103,5 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="ui tabs divider"></div>
|
||||
{{else}}
|
||||
<div class="ui divider"></div>
|
||||
{{end}}
|
||||
|
||||
</div>
|
||||
|
|
|
@ -107,6 +107,14 @@
|
|||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{{ else if .Repository.IsArchived }}
|
||||
<div class="ui warning message">
|
||||
{{if .Issue.IsPull}}
|
||||
{{.i18n.Tr "repo.archive.pull.nocomment"}}
|
||||
{{else}}
|
||||
{{.i18n.Tr "repo.archive.issue.nocomment"}}
|
||||
{{end}}
|
||||
</div>
|
||||
{{ end }}
|
||||
{{else}}
|
||||
{{if .Repository.IsArchived}}
|
||||
|
|
Loading…
Reference in a new issue