fedi/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-18 15:08:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve file history UI and fix URL escaping bug (#27531)

Browse source 
Follow #27354

Major changes:

1. The `right aligned` in `<th class="one wide right aligned">` is a
no-op because it doesn't have any content
2. The `gt-df` in `<td class="sha gt-df">` was wrong, it causes UI
misalignment, a table cell shouldn't be "flex"
3. Use `gt-py-0` for `gt-pt-0 gt-pb-0`
4. Simplify the layout for buttons, because the `text right aligned` is
widely used and good enough, it doesn't make sense to introduce the
`<div class="gt-df gt-je">`
5. Escape the `$.FileName` correctly


Before:


![image](https://github.com/go-gitea/gitea/assets/2114189/eb2ced3f-1dad-4149-9ed2-aee4c0663621)

After:


![image](https://github.com/go-gitea/gitea/assets/2114189/08244b61-416b-4279-b495-029bc0a96f67)
This commit is contained in:
wxiaoguang 2023-10-09 15:19:23 +08:00 committed by GitHub
parent 43632d9d34
commit d1527dac3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
templates/repo/commits_list.tmpl
View file

@ -6,7 +6,7 @@
<th class="two wide sha">SHA1</th> <th class="two wide sha">SHA1</th>
<th class="eight wide message">{{ctx.Locale.Tr "repo.commits.message"}}</th> <th class="eight wide message">{{ctx.Locale.Tr "repo.commits.message"}}</th>
<th class="two wide right aligned">{{ctx.Locale.Tr "repo.commits.date"}}</th> <th class="two wide right aligned">{{ctx.Locale.Tr "repo.commits.date"}}</th>
<th class="one wide right aligned"></th> <th class="one wide"></th>
</tr> </tr>
</thead> </thead>
<tbody class="commit-list"> <tbody class="commit-list">
@ -25,7 +25,7 @@
{{$userName}} {{$userName}}
{{end}} {{end}}
</td> </td>
<td class="sha gt-df"> <td class="sha">
{{$class := "ui sha label"}} {{$class := "ui sha label"}}
{{if .Signature}} {{if .Signature}}
{{$class = (print $class " isSigned")}} {{$class = (print $class " isSigned")}}
@ -76,11 +76,11 @@
{{else}} {{else}}
<td class="text right aligned">{{TimeSince .Author.When ctx.Locale}}</td> <td class="text right aligned">{{TimeSince .Author.When ctx.Locale}}</td>
{{end}} {{end}}
<td class="gt-pt-0 gt-pb-0"> <td class="text right aligned gt-py-0">
<div class="gt-df gt-je"> <button class="btn interact-bg gt-p-3" data-tooltip-content="{{ctx.Locale.Tr "copy_hash"}}" data-clipboard-text="{{.ID}}">{{svg "octicon-copy"}}</button>
<button class="btn interact-bg gt-p-3" data-tooltip-content="{{ctx.Locale.Tr "copy_hash"}}" data-clipboard-text="{{.ID}}">{{svg "octicon-copy"}}</button> {{if $.FileName}}
{{if $.FileName}}<a class="btn interact-bg gt-p-3" data-tooltip-content="{{ctx.Locale.Tr "repo.commits.view_path"}}" href="{{printf "%s/src/commit/%s/%s" $commitRepoLink (PathEscape .ID.String) $.FileName}}">{{svg "octicon-file-code"}}</a>{{end}} <a class="btn interact-bg gt-p-3" data-tooltip-content="{{ctx.Locale.Tr "repo.commits.view_path"}}" href="{{printf "%s/src/commit/%s/%s" $commitRepoLink (PathEscape .ID.String) (PathEscapeSegments $.FileName)}}">{{svg "octicon-file-code"}}</a>
</div> {{end}}
</td> </td>
</tr> </tr>
{{end}} {{end}}