egtyl/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix LFS object list style (#26133) (#26147)

Browse source 
Backport #26133 by @wxiaoguang

Close #26104 . Only a quick fix, the UI is not perfect.

Before:

<details>

![image](https://github.com/go-gitea/gitea/assets/2114189/7b10d42d-8317-4d99-80f9-b6c5fe05c17e)

![image](https://github.com/go-gitea/gitea/assets/2114189/b43f1242-61a0-45e3-98b7-aa74b29f3813)

</details>

After:

<details>

![image](https://github.com/go-gitea/gitea/assets/2114189/a8d27f70-781d-4702-866f-a56df6dd6c0a)

![image](https://github.com/go-gitea/gitea/assets/2114189/379274e7-c67b-4c11-9cee-28a298b4ff5a)

</details>

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 0f73be0ae3)
This commit is contained in:
Giteabot 2023-07-26 00:58:48 -04:00 committed by Earl Warren
parent b217ce3e9f
commit f20cfc291c
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
templates/repo/settings/lfs.tmpl
View file

@ -12,11 +12,9 @@
{{range .LFSFiles}} {{range .LFSFiles}}
<tr> <tr>
<td> <td>
<span class="text sha label"> <a href="{{$.Link}}/show/{{.Oid}}" title="{{.Oid}}" class="ui brown button gt-mono">
<a href="{{$.Link}}/show/{{.Oid}}" title="{{.Oid}}" class="ui detail icon button brown truncate">
{{ShortSha .Oid}} {{ShortSha .Oid}}
</a> </a>
</span>
</td> </td>
<td>{{FileSize .Size}}</td> <td>{{FileSize .Size}}</td>
<td>{{TimeSince .CreatedUnix.AsTime $.locale}}</td> <td>{{TimeSince .CreatedUnix.AsTime $.locale}}</td>

22
templates/repo/settings/lfs_pointers.tmpl
View file

@ -22,41 +22,31 @@
<tr> <tr>
<th class="three wide">{{.locale.Tr "repo.settings.lfs_pointers.sha"}}</th> <th class="three wide">{{.locale.Tr "repo.settings.lfs_pointers.sha"}}</th>
<th class="four wide">{{.locale.Tr "repo.settings.lfs_pointers.oid"}}</th> <th class="four wide">{{.locale.Tr "repo.settings.lfs_pointers.oid"}}</th>
<th class="three wide"></th>
<th class="two wide">{{.locale.Tr "repo.settings.lfs_pointers.inRepo"}}</th> <th class="two wide">{{.locale.Tr "repo.settings.lfs_pointers.inRepo"}}</th>
<th class="two wide">{{.locale.Tr "repo.settings.lfs_pointers.exists"}}</th> <th class="two wide">{{.locale.Tr "repo.settings.lfs_pointers.exists"}}</th>
<th class="two wide">{{.locale.Tr "repo.settings.lfs_pointers.accessible"}}</th> <th class="two wide">{{.locale.Tr "repo.settings.lfs_pointers.accessible"}}</th>
<th class="three wide"></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{{range .Pointers}} {{range .Pointers}}
<tr> <tr>
<td> <td>
<span class="text sha label" title="{{.SHA}}"> <a href="{{$.RepoLink}}/raw/blob/{{.SHA}}" rel="nofollow" target="_blank" title="{{.SHA}}" class="ui button gt-mono">
<a href="{{$.RepoLink}}/raw/blob/{{.SHA}}" rel="nofollow" target="_blank" class="ui detail icon button truncate">
{{ShortSha .SHA}} {{ShortSha .SHA}}
</a> </a>
</span>
</td> </td>
<td> <td>
<span class="text sha label" title="{{.Oid}}"> <a {{if and .Exists .InRepo}}href="{{$.LFSFilesLink}}/show/{{.Oid}}" rel="nofollow" target="_blank"{{end}} title="{{.Oid}}" class="ui brown button gt-mono">
{{if and .Exists .InRepo}}
<a href="{{$.LFSFilesLink}}/show/{{.Oid}}" rel="nofollow" target="_blank" class="ui text detail icon button brown truncate">
{{ShortSha .Oid}} {{ShortSha .Oid}}
</a> </a>
{{else}}
<button class="ui detail icon button brown disabled truncate">
{{ShortSha .Oid}}
</button>
{{end}}
</span>
</td>
<td>
<a class="ui primary button" href="{{$.LFSFilesLink}}/find?oid={{.Oid}}&size={{.Size}}&sha={{.SHA}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
</td> </td>
<td>{{if .InRepo}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td> <td>{{if .InRepo}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
<td>{{if .Exists}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td> <td>{{if .Exists}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
<td>{{if .Accessible}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td> <td>{{if .Accessible}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
<td class="gt-text-right">
<a class="ui primary button" href="{{$.LFSFilesLink}}/find?oid={{.Oid}}&size={{.Size}}&sha={{.SHA}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
</td>
</tr> </tr>
{{end}} {{end}}
</tbody> </tbody>