diff options
| author | silverwind <me@silverwind.io> | 2022-11-19 12:08:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-19 13:08:06 +0200 |
| commit | eec1c718806797b21ba5f6c1ceddf711e9d4801a (patch) | |
| tree | 646d71d535db4b00a09916b1d321e01536799f6f /templates | |
| parent | 044c754ea53f5b81f451451df53aea366f6f700a (diff) | |
| download | gitea-eec1c718806797b21ba5f6c1ceddf711e9d4801a.tar.gz gitea-eec1c718806797b21ba5f6c1ceddf711e9d4801a.zip | |
Show syntax lexer name in file view/blame (#21814)
Show which Chroma Lexer is used to highlight the file in the file
header. It's useful for development to see what was detected, and I
think it's not bad info to have for the user:
<img width="233" alt="Screenshot 2022-11-14 at 22 31 16"
src="https://user-images.githubusercontent.com/115237/201770854-44933dfc-70a4-487c-8457-1bb3cc43ea62.png">
<img width="226" alt="Screenshot 2022-11-14 at 22 36 06"
src="https://user-images.githubusercontent.com/115237/201770856-9260ce6f-6c0f-442c-92b5-201e5b113188.png">
<img width="194" alt="Screenshot 2022-11-14 at 22 36 26"
src="https://user-images.githubusercontent.com/115237/201770857-6f56591b-80ea-42cc-8ea5-21b9156c018b.png">
Also, I improved the way this header overflows on small screens:
<img width="354" alt="Screenshot 2022-11-14 at 22 44 36"
src="https://user-images.githubusercontent.com/115237/201774828-2ddbcde1-da15-403f-bf7a-6248449fa2c5.png">
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/blame.tmpl | 13 | ||||
| -rw-r--r-- | templates/repo/file_info.tmpl | 28 | ||||
| -rw-r--r-- | templates/repo/view_file.tmpl | 30 |
3 files changed, 36 insertions, 35 deletions
diff --git a/templates/repo/blame.tmpl b/templates/repo/blame.tmpl index b697573d24..e4a10ee57d 100644 --- a/templates/repo/blame.tmpl +++ b/templates/repo/blame.tmpl @@ -1,14 +1,9 @@ <div class="{{TabSizeClass .Editorconfig .FileName}} non-diff-file-content"> - <h4 class="file-header ui top attached header df ac sb"> - <div class="file-header-left df ac"> - <div class="file-info text grey normal mono"> - <div class="file-info-entry"> - {{.NumLines}} {{.locale.TrN .NumLines "repo.line" "repo.lines"}} - </div> - <div class="file-info-entry">{{FileSize .FileSize}}</div> - </div> + <h4 class="file-header ui top attached header df ac sb fw"> + <div class="file-header-left df ac py-3 pr-4"> + {{template "repo/file_info" .}} </div> - <div class="file-header-right file-actions df ac"> + <div class="file-header-right file-actions df ac fw"> <div class="ui buttons"> <a class="ui tiny button" href="{{$.RawFileLink}}">{{.locale.Tr "repo.file_raw"}}</a> {{if not .IsViewCommit}} diff --git a/templates/repo/file_info.tmpl b/templates/repo/file_info.tmpl new file mode 100644 index 0000000000..90a831fb8e --- /dev/null +++ b/templates/repo/file_info.tmpl @@ -0,0 +1,28 @@ +<div class="file-info text grey normal mono"> + {{if .FileIsSymlink}} + <div class="file-info-entry"> + {{.locale.Tr "repo.symbolic_link"}} + </div> + {{end}} + {{if .NumLinesSet}}{{/* Explicit attribute needed to show 0 line changes */}} + <div class="file-info-entry"> + {{.NumLines}} {{.locale.TrN .NumLines "repo.line" "repo.lines"}} + </div> + {{end}} + {{if .FileSize}} + <div class="file-info-entry"> + {{FileSize .FileSize}}{{if .IsLFSFile}} ({{.locale.Tr "repo.stored_lfs"}}){{end}} + </div> + {{end}} + {{if .LFSLock}} + <div class="file-info-entry ui tooltip" data-content="{{.LFSLockHint}}"> + {{svg "octicon-lock" 16 "mr-2"}} + <a href="{{.LFSLockOwnerHomeLink}}">{{.LFSLockOwner}}</a> + </div> + {{end}} + {{if .LexerName}} + <div class="file-info-entry"> + {{.LexerName}} + </div> + {{end}} +</div> diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 60d2a812de..321600a997 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -6,38 +6,16 @@ </div> </div> {{end}} - <h4 class="file-header ui top attached header df ac sb"> - <div class="file-header-left df ac pr-4"> + <h4 class="file-header ui top attached header df ac sb fw"> + <div class="file-header-left df ac py-3 pr-4"> {{if .ReadmeInList}} {{svg "octicon-book" 16 "mr-3"}} <strong>{{.FileName}}</strong> {{else}} - <div class="file-info text grey normal mono"> - {{if .FileIsSymlink}} - <div class="file-info-entry"> - {{.locale.Tr "repo.symbolic_link"}} - </div> - {{end}} - {{if .NumLinesSet}} - <div class="file-info-entry"> - {{.NumLines}} {{.locale.TrN .NumLines "repo.line" "repo.lines"}} - </div> - {{end}} - {{if .FileSize}} - <div class="file-info-entry"> - {{FileSize .FileSize}}{{if .IsLFSFile}} ({{.locale.Tr "repo.stored_lfs"}}){{end}} - </div> - {{end}} - {{if .LFSLock}} - <div class="file-info-entry ui tooltip" data-content="{{.LFSLockHint}}"> - {{svg "octicon-lock" 16 "mr-2"}} - <a href="{{.LFSLockOwnerHomeLink}}">{{.LFSLockOwner}}</a> - </div> - {{end}} - </div> + {{template "repo/file_info" .}} {{end}} </div> - <div class="file-header-right file-actions df ac"> + <div class="file-header-right file-actions df ac fw"> {{if .HasSourceRenderedToggle}} <div class="ui compact icon buttons two-toggle-buttons"> <a href="{{$.Link}}?display=source" class="ui mini basic button tooltip {{if .IsDisplayingSource}}active{{end}}" data-content="{{.locale.Tr "repo.file_view_source"}}" data-position="bottom center">{{svg "octicon-code" 15}}</a> |