diff options
| author | Lauris BH <lauris@nix.lv> | 2020-02-20 21:53:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-20 16:53:55 -0300 |
| commit | 3c45cf8494fcd29e1a99b0ee6f253808eb607053 (patch) | |
| tree | cd0e6347bcd2bfc42c18408169a8757ca1dda920 /templates | |
| parent | efbd7ca39bde69ff84d4b309bee99edfe2977521 (diff) | |
| download | gitea-3c45cf8494fcd29e1a99b0ee6f253808eb607053.tar.gz gitea-3c45cf8494fcd29e1a99b0ee6f253808eb607053.zip | |
Add detected file language to code search (#10256)
Move langauge detection to separate module to be more reusable
Add option to disable vendored file exclusion from file search
Allways show all language stats for search
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/explore/code.tmpl | 22 | ||||
| -rw-r--r-- | templates/repo/search.tmpl | 22 |
2 files changed, 40 insertions, 4 deletions
diff --git a/templates/explore/code.tmpl b/templates/explore/code.tmpl index 742ed59442..eb7da976b8 100644 --- a/templates/explore/code.tmpl +++ b/templates/explore/code.tmpl @@ -16,13 +16,22 @@ <h3> {{.i18n.Tr "explore.code_search_results" (.Keyword|Escape) | Str2html }} </h3> + <div> + {{range $term := .SearchResultLanguages}} + <a class="ui {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{$.AppSubURL}}/explore/code?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}"> + <i class="color-icon" style="background-color: {{$term.Color}}"></i> + {{$term.Language}} + <div class="detail">{{$term.Count}}</div> + </a> + {{end}} + </div> <div class="repository search"> {{range $result := .SearchResults}} {{$repo := (index $.RepoMaps .RepoID)}} <div class="diff-file-box diff-box file-content non-diff-file-content repo-search-result"> <h4 class="ui top attached normal header"> <span class="file"><a rel="nofollow" href="{{EscapePound $repo.HTMLURL}}">{{$repo.FullName}}</a> - {{.Filename}}</span> - <a class="ui basic grey tiny button" rel="nofollow" href="{{EscapePound $repo.HTMLURL}}/src/branch/{{$repo.DefaultBranch}}/{{EscapePound .Filename}}">{{$.i18n.Tr "repo.diff.view_file"}}</a> + <a class="ui basic grey tiny button" rel="nofollow" href="{{EscapePound $repo.HTMLURL}}/src/commit/{{$result.CommitID}}/{{EscapePound .Filename}}">{{$.i18n.Tr "repo.diff.view_file"}}</a> </h4> <div class="ui attached table segment"> <div class="file-body file-code code-view"> @@ -31,7 +40,7 @@ <tr> <td class="lines-num"> {{range .LineNumbers}} - <a href="{{EscapePound $repo.HTMLURL}}/src/branch/{{$repo.DefaultBranch}}/{{EscapePound $result.Filename}}#L{{.}}"><span>{{.}}</span></a> + <a href="{{EscapePound $repo.HTMLURL}}/src/commit/{{$result.CommitID}}/{{EscapePound $result.Filename}}#L{{.}}"><span>{{.}}</span></a> {{end}} </td> <td class="lines-code"><pre><code class="{{.HighlightClass}}"><ol class="linenums">{{.FormattedLines}}</ol></code></pre></td> @@ -40,6 +49,15 @@ </table> </div> </div> + <div class="ui bottom attached table segment"> + {{if $result.Language}} + <i class="color-icon" style="background-color: {{$result.Color}}"></i>{{$result.Language}} + {{end}} + + {{if not $result.UpdatedUnix.IsZero}} + <span class="ui small grey text pull right">{{$.i18n.Tr "explore.code_last_indexed_at" (TimeSinceUnix $result.UpdatedUnix $.i18n.Lang) | Safe}} </span> + {{end}} + </div> </div> {{end}} </div> diff --git a/templates/repo/search.tmpl b/templates/repo/search.tmpl index c4413e7884..5aa2f8983e 100644 --- a/templates/repo/search.tmpl +++ b/templates/repo/search.tmpl @@ -16,12 +16,21 @@ <h3> {{.i18n.Tr "repo.search.results" (.Keyword|Escape) .RepoLink .RepoName | Str2html }} </h3> + <div> + {{range $term := .SearchResultLanguages}} + <a class="ui {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{EscapePound $.SourcePath}}/search?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}"> + <i class="color-icon" style="background-color: {{$term.Color}}"></i> + {{$term.Language}} + <div class="detail">{{$term.Count}}</div> + </a> + {{end}} + </div> <div class="repository search"> {{range $result := .SearchResults}} <div class="diff-file-box diff-box file-content non-diff-file-content repo-search-result"> <h4 class="ui top attached normal header"> <span class="file">{{.Filename}}</span> - <a class="ui basic grey tiny button" rel="nofollow" href="{{EscapePound $.SourcePath}}/{{EscapePound .Filename}}">{{$.i18n.Tr "repo.diff.view_file"}}</a> + <a class="ui basic grey tiny button" rel="nofollow" href="{{EscapePound $.SourcePath}}/src/commit/{{$result.CommitID}}/{{EscapePound .Filename}}">{{$.i18n.Tr "repo.diff.view_file"}}</a> </h4> <div class="ui attached table segment"> <div class="file-body file-code code-view"> @@ -30,7 +39,7 @@ <tr> <td class="lines-num"> {{range .LineNumbers}} - <a href="{{EscapePound $.SourcePath}}/{{EscapePound $result.Filename}}#L{{.}}"><span>{{.}}</span></a> + <a href="{{EscapePound $.SourcePath}}/src/commit/{{$result.CommitID}}/{{EscapePound $result.Filename}}#L{{.}}"><span>{{.}}</span></a> {{end}} </td> <td class="lines-code"><pre><code class="{{.HighlightClass}}"><ol class="linenums">{{.FormattedLines}}</ol></code></pre></td> @@ -39,6 +48,15 @@ </table> </div> </div> + <div class="ui bottom attached table segment"> + {{if $result.Language}} + <i class="color-icon" style="background-color: {{$result.Color}}"></i>{{$result.Language}} + {{end}} + + {{if not $result.UpdatedUnix.IsZero}} + <span class="ui small grey text pull right">{{$.i18n.Tr "explore.code_last_indexed_at" (TimeSinceUnix $result.UpdatedUnix $.i18n.Lang) | Safe}} </span> + {{end}} + </div> </div> {{end}} </div> |