diff options
| author | silverwind <me@silverwind.io> | 2022-08-09 12:32:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-09 18:32:41 +0800 |
| commit | 33b03e851f1a99f8d7fb682fec4bcba4f20ff6a8 (patch) | |
| tree | aba7e1097d8e5781a24d333cdc439780217d8ca8 | |
| parent | 871082bc7b757bf9e1b5e2e389e7cd2f897608e5 (diff) | |
| download | gitea-33b03e851f1a99f8d7fb682fec4bcba4f20ff6a8.tar.gz gitea-33b03e851f1a99f8d7fb682fec4bcba4f20ff6a8.zip | |
Restore history button and hide add button when unable to add (#20718)
Fix two regressions from #20602:
- Restore the 'History' button that was previously unable to render
because it's show condition was never hit
- Hide the 'Add File' button when there would be no items in the
dropdown.
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
| -rw-r--r-- | templates/repo/home.tmpl | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 1ff2ec5bc5..d7ce2240a0 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -73,34 +73,31 @@ </a> {{end}} <a href="{{.Repository.Link}}/find/{{.BranchNameSubURL}}" class="ui compact basic button tooltip" data-content="{{.locale.Tr "repo.find_file.go_to_file"}}">{{svg "octicon-file-moved" 15}}</a> - <button class="ui basic small compact dropdown jump icon button mr-2"> - <span class="text">{{.locale.Tr "repo.editor.add_file"}}</span> - <div class="menu"> - {{if .Repository.CanEnableEditor}} - {{if .CanAddFile}} - <a class="item" href="{{.RepoLink}}/_new/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}"> - {{.locale.Tr "repo.editor.new_file"}} - </a> - {{end}} - {{if .CanUploadFile}} - <a class="item" href="{{.RepoLink}}/_upload/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}"> - {{.locale.Tr "repo.editor.upload_file"}} - </a> - {{end}} - {{if .CanAddFile}} - <a class="item" href="{{.RepoLink}}/_diffpatch/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}"> - {{.locale.Tr "repo.editor.patch"}} - </a> + {{if or .CanAddFile .CanUploadFile}} + <button class="ui basic small compact dropdown jump icon button mr-2"> + <span class="text">{{.locale.Tr "repo.editor.add_file"}}</span> + <div class="menu"> + {{if .Repository.CanEnableEditor}} + {{if .CanAddFile}} + <a class="item" href="{{.RepoLink}}/_new/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}"> + {{.locale.Tr "repo.editor.new_file"}} + </a> + {{end}} + {{if .CanUploadFile}} + <a class="item" href="{{.RepoLink}}/_upload/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}"> + {{.locale.Tr "repo.editor.upload_file"}} + </a> + {{end}} + {{if .CanAddFile}} + <a class="item" href="{{.RepoLink}}/_diffpatch/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}"> + {{.locale.Tr "repo.editor.patch"}} + </a> + {{end}} {{end}} - {{end}} - {{if and (ne $n 0) (not .IsViewFile) (not .IsBlame) }} - <a class="item"href="{{.RepoLink}}/commits/{{.BranchNameSubURL}}/{{.TreePath | PathEscapeSegments}}"> - {{.locale.Tr "repo.file_history"}} - </a> - {{end}} - </div> - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - </button> + </div> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + </button> + {{end}} {{else}} <span class="ui breadcrumb repo-path"><a class="section" href="{{.RepoLink}}/src/{{.BranchNameSubURL}}" title="{{.Repository.Name}}">{{EllipsisString .Repository.Name 30}}</a>{{range $i, $v := .TreeNames}}<span class="divider">/</span>{{if eq $i $l}}<span class="active section" title="{{$v}}">{{EllipsisString $v 30}}</span>{{else}}{{ $p := index $.Paths $i}}<span class="section"><a href="{{$.BranchLink}}/{{PathEscapeSegments $p}}" title="{{$v}}">{{EllipsisString $v 30}}</a></span>{{end}}{{end}}</span> {{end}} @@ -133,6 +130,11 @@ {{end}} </div> {{end}} + {{if and (ne $n 0) (not .IsViewFile) (not .IsBlame) }} + <a class="ui button" href="{{.RepoLink}}/commits/{{.BranchNameSubURL}}/{{.TreePath | PathEscapeSegments}}"> + {{svg "octicon-history" 16 "mr-3"}}{{.locale.Tr "repo.file_history"}} + </a> + {{end}} </div> </div> {{if .IsViewFile}} |