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 structurerelease/v1.15
parent
01ebd52a1f
commit
d9d538c8a1
|
@ -86,7 +86,7 @@ func TestViewRepoWithSymlinks(t *testing.T) {
|
||||||
resp := session.MakeRequest(t, req, http.StatusOK)
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
||||||
|
|
||||||
htmlDoc := NewHTMLParser(t, resp.Body)
|
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 {
|
items := files.Map(func(i int, s *goquery.Selection) string {
|
||||||
cls, _ := s.Find("SPAN").Attr("class")
|
cls, _ := s.Find("SPAN").Attr("class")
|
||||||
file := strings.Trim(s.Find("A").Text(), " \t\n")
|
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>
|
<thead>
|
||||||
<tr class="commit-list">
|
<tr class="commit-list">
|
||||||
<th class="four wide">
|
<th colspan="2">
|
||||||
{{if .LatestCommitUser}}
|
{{if .LatestCommitUser}}
|
||||||
<img class="ui avatar image img-12" src="{{.LatestCommitUser.RelAvatarLink}}" />
|
<img class="ui avatar image img-12" src="{{.LatestCommitUser.RelAvatarLink}}" />
|
||||||
{{if .LatestCommitUser.FullName}}
|
{{if .LatestCommitUser.FullName}}
|
||||||
|
@ -34,9 +34,7 @@
|
||||||
{{end}}
|
{{end}}
|
||||||
{{template "repo/commit_status" .LatestCommitStatus}}</span>
|
{{template "repo/commit_status" .LatestCommitStatus}}</span>
|
||||||
</th>
|
</th>
|
||||||
<th class="nine wide">
|
<th class="text grey right age">{{if .LatestCommit.Author}}{{TimeSince .LatestCommit.Author.When $.Lang}}{{end}}</th>
|
||||||
</th>
|
|
||||||
<th class="three wide text grey right age">{{if .LatestCommit.Author}}{{TimeSince .LatestCommit.Author.When $.Lang}}{{end}}</th>
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
@ -51,6 +49,7 @@
|
||||||
<tr>
|
<tr>
|
||||||
{{if $entry.IsSubModule}}
|
{{if $entry.IsSubModule}}
|
||||||
<td>
|
<td>
|
||||||
|
<span class="truncate">
|
||||||
<span class="octicon octicon-file-submodule"></span>
|
<span class="octicon octicon-file-submodule"></span>
|
||||||
{{$refURL := $commit.RefURL AppUrl $.BranchLink}}
|
{{$refURL := $commit.RefURL AppUrl $.BranchLink}}
|
||||||
{{if $refURL}}
|
{{if $refURL}}
|
||||||
|
@ -58,9 +57,11 @@
|
||||||
{{else}}
|
{{else}}
|
||||||
{{$entry.Name}} @ {{ShortSha $commit.RefID}}
|
{{$entry.Name}} @ {{ShortSha $commit.RefID}}
|
||||||
{{end}}
|
{{end}}
|
||||||
|
</span>
|
||||||
</td>
|
</td>
|
||||||
{{else}}
|
{{else}}
|
||||||
<td class="name">
|
<td class="name">
|
||||||
|
<span class="truncate">
|
||||||
{{if $entry.IsDir}}
|
{{if $entry.IsDir}}
|
||||||
{{$subJumpablePathName := $entry.GetSubJumpablePathName}}
|
{{$subJumpablePathName := $entry.GetSubJumpablePathName}}
|
||||||
{{$subJumpablePath := SubJumpablePath $subJumpablePathName}}
|
{{$subJumpablePath := SubJumpablePath $subJumpablePathName}}
|
||||||
|
@ -76,10 +77,13 @@
|
||||||
<span class="octicon octicon-{{EntryIcon $entry}}"></span>
|
<span class="octicon octicon-{{EntryIcon $entry}}"></span>
|
||||||
<a href="{{EscapePound $.TreeLink}}/{{EscapePound $entry.Name}}" title="{{$entry.Name}}">{{$entry.Name}}</a>
|
<a href="{{EscapePound $.TreeLink}}/{{EscapePound $entry.Name}}" title="{{$entry.Name}}">{{$entry.Name}}</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
</span>
|
||||||
</td>
|
</td>
|
||||||
{{end}}
|
{{end}}
|
||||||
<td class="message collapsing has-emoji">
|
<td class="message has-emoji">
|
||||||
|
<span class="truncate">
|
||||||
<a href="{{$.RepoLink}}/commit/{{$commit.ID}}">{{$commit.Summary}}</a>
|
<a href="{{$.RepoLink}}/commit/{{$commit.ID}}">{{$commit.Summary}}</a>
|
||||||
|
</span>
|
||||||
</td>
|
</td>
|
||||||
<td class="text grey right age">{{TimeSince $commit.Committer.When $.Lang}}</td>
|
<td class="text grey right age">{{TimeSince $commit.Committer.When $.Lang}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
Loading…
Reference in New Issue