third_party
/
gitea
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore history button and hide add button when unable to add (#20718)

Browse Source 
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>
tokarchuk/v1.18
silverwind 2 years ago committed by GitHub
parent 871082bc7b
commit 33b03e851f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 27 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 56
      templates/repo/home.tmpl

56
templates/repo/home.tmpl
Unescape View File

@ -73,34 +73,31 @@
</a> </a>
{{end}} {{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> <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"> {{if or .CanAddFile .CanUploadFile}}
<span class="text">{{.locale.Tr "repo.editor.add_file"}}</span> <button class="ui basic small compact dropdown jump icon button mr-2">
<div class="menu"> <span class="text">{{.locale.Tr "repo.editor.add_file"}}</span>
{{if .Repository.CanEnableEditor}} <div class="menu">
{{if .CanAddFile}} {{if .Repository.CanEnableEditor}}
<a class="item" href="{{.RepoLink}}/_new/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}"> {{if .CanAddFile}}
{{.locale.Tr "repo.editor.new_file"}} <a class="item" href="{{.RepoLink}}/_new/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}">
</a> {{.locale.Tr "repo.editor.new_file"}}
{{end}} </a>
{{if .CanUploadFile}} {{end}}
<a class="item" href="{{.RepoLink}}/_upload/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}"> {{if .CanUploadFile}}
{{.locale.Tr "repo.editor.upload_file"}} <a class="item" href="{{.RepoLink}}/_upload/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}">
</a> {{.locale.Tr "repo.editor.upload_file"}}
{{end}} </a>
{{if .CanAddFile}} {{end}}
<a class="item" href="{{.RepoLink}}/_diffpatch/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}"> {{if .CanAddFile}}
{{.locale.Tr "repo.editor.patch"}} <a class="item" href="{{.RepoLink}}/_diffpatch/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}">
</a> {{.locale.Tr "repo.editor.patch"}}
</a>
{{end}}
{{end}} {{end}}
{{end}} </div>
{{if and (ne $n 0) (not .IsViewFile) (not .IsBlame) }} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
<a class="item"href="{{.RepoLink}}/commits/{{.BranchNameSubURL}}/{{.TreePath | PathEscapeSegments}}"> </button>
{{.locale.Tr "repo.file_history"}} {{end}}
</a>
{{end}}
</div>
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
</button>
{{else}} {{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> <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}} {{end}}
@ -133,6 +130,11 @@
{{end}} {{end}}
</div> </div>
{{end}} {{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>
</div> </div>
{{if .IsViewFile}} {{if .IsViewFile}}

Write Preview
Loading…
Cancel
Save