Refactor table width to have more info shown in file list (#6867)
* Refactor table width to have more info shown in file list * Remove unnecesary semicolon * Fix tests for changed html structure
This commit is contained in:
parent
01ebd52a1f
commit
d9d538c8a1
4 changed files with 454 additions and 143 deletions
|
@ -86,7 +86,7 @@ func TestViewRepoWithSymlinks(t *testing.T) {
|
|||
resp := session.MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
htmlDoc := NewHTMLParser(t, resp.Body)
|
||||
files := htmlDoc.doc.Find("#repo-files-table > TBODY > TR > TD.name")
|
||||
files := htmlDoc.doc.Find("#repo-files-table > TBODY > TR > TD.name > SPAN")
|
||||
items := files.Map(func(i int, s *goquery.Selection) string {
|
||||
cls, _ := s.Find("SPAN").Attr("class")
|
||||
file := strings.Trim(s.Find("A").Text(), " \t\n")
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load diff
|
@ -1,7 +1,7 @@
|
|||
<table id="repo-files-table" class="ui fixed single line table">
|
||||
<table id="repo-files-table" class="ui single line table">
|
||||
<thead>
|
||||
<tr class="commit-list">
|
||||
<th class="four wide">
|
||||
<th colspan="2">
|
||||
{{if .LatestCommitUser}}
|
||||
<img class="ui avatar image img-12" src="{{.LatestCommitUser.RelAvatarLink}}" />
|
||||
{{if .LatestCommitUser.FullName}}
|
||||
|
@ -34,9 +34,7 @@
|
|||
{{end}}
|
||||
{{template "repo/commit_status" .LatestCommitStatus}}</span>
|
||||
</th>
|
||||
<th class="nine wide">
|
||||
</th>
|
||||
<th class="three wide text grey right age">{{if .LatestCommit.Author}}{{TimeSince .LatestCommit.Author.When $.Lang}}{{end}}</th>
|
||||
<th class="text grey right age">{{if .LatestCommit.Author}}{{TimeSince .LatestCommit.Author.When $.Lang}}{{end}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
@ -51,35 +49,41 @@
|
|||
<tr>
|
||||
{{if $entry.IsSubModule}}
|
||||
<td>
|
||||
<span class="octicon octicon-file-submodule"></span>
|
||||
{{$refURL := $commit.RefURL AppUrl $.BranchLink}}
|
||||
{{if $refURL}}
|
||||
<a href="{{$refURL}}">{{$entry.Name}}</a> @ <a href="{{$refURL}}/commit/{{$commit.RefID}}">{{ShortSha $commit.RefID}}</a>
|
||||
{{else}}
|
||||
{{$entry.Name}} @ {{ShortSha $commit.RefID}}
|
||||
{{end}}
|
||||
<span class="truncate">
|
||||
<span class="octicon octicon-file-submodule"></span>
|
||||
{{$refURL := $commit.RefURL AppUrl $.BranchLink}}
|
||||
{{if $refURL}}
|
||||
<a href="{{$refURL}}">{{$entry.Name}}</a> @ <a href="{{$refURL}}/commit/{{$commit.RefID}}">{{ShortSha $commit.RefID}}</a>
|
||||
{{else}}
|
||||
{{$entry.Name}} @ {{ShortSha $commit.RefID}}
|
||||
{{end}}
|
||||
</span>
|
||||
</td>
|
||||
{{else}}
|
||||
<td class="name">
|
||||
{{if $entry.IsDir}}
|
||||
{{$subJumpablePathName := $entry.GetSubJumpablePathName}}
|
||||
{{$subJumpablePath := SubJumpablePath $subJumpablePathName}}
|
||||
<span class="octicon octicon-file-directory"></span>
|
||||
<a href="{{EscapePound $.TreeLink}}/{{EscapePound $subJumpablePathName}}" title="{{$subJumpablePathName}}">
|
||||
{{if eq (len $subJumpablePath) 2}}
|
||||
<span class="jumpable-path">{{index $subJumpablePath 0}}</span>{{index $subJumpablePath 1}}
|
||||
{{else}}
|
||||
{{index $subJumpablePath 0}}
|
||||
{{end}}
|
||||
</a>
|
||||
{{else}}
|
||||
<span class="octicon octicon-{{EntryIcon $entry}}"></span>
|
||||
<a href="{{EscapePound $.TreeLink}}/{{EscapePound $entry.Name}}" title="{{$entry.Name}}">{{$entry.Name}}</a>
|
||||
{{end}}
|
||||
<span class="truncate">
|
||||
{{if $entry.IsDir}}
|
||||
{{$subJumpablePathName := $entry.GetSubJumpablePathName}}
|
||||
{{$subJumpablePath := SubJumpablePath $subJumpablePathName}}
|
||||
<span class="octicon octicon-file-directory"></span>
|
||||
<a href="{{EscapePound $.TreeLink}}/{{EscapePound $subJumpablePathName}}" title="{{$subJumpablePathName}}">
|
||||
{{if eq (len $subJumpablePath) 2}}
|
||||
<span class="jumpable-path">{{index $subJumpablePath 0}}</span>{{index $subJumpablePath 1}}
|
||||
{{else}}
|
||||
{{index $subJumpablePath 0}}
|
||||
{{end}}
|
||||
</a>
|
||||
{{else}}
|
||||
<span class="octicon octicon-{{EntryIcon $entry}}"></span>
|
||||
<a href="{{EscapePound $.TreeLink}}/{{EscapePound $entry.Name}}" title="{{$entry.Name}}">{{$entry.Name}}</a>
|
||||
{{end}}
|
||||
</span>
|
||||
</td>
|
||||
{{end}}
|
||||
<td class="message collapsing has-emoji">
|
||||
<a href="{{$.RepoLink}}/commit/{{$commit.ID}}">{{$commit.Summary}}</a>
|
||||
<td class="message has-emoji">
|
||||
<span class="truncate">
|
||||
<a href="{{$.RepoLink}}/commit/{{$commit.ID}}">{{$commit.Summary}}</a>
|
||||
</span>
|
||||
</td>
|
||||
<td class="text grey right age">{{TimeSince $commit.Committer.When $.Lang}}</td>
|
||||
</tr>
|
||||
|
|
Reference in a new issue