From 3c45cf8494fcd29e1a99b0ee6f253808eb607053 Mon Sep 17 00:00:00 2001
From: Lauris BH <lauris@nix.lv>
Date: Thu, 20 Feb 2020 21:53:55 +0200
Subject: 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
---
 templates/explore/code.tmpl | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'templates/explore/code.tmpl')

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}}
+                                &nbsp;
+								{{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}} &nbsp;</span>
+								{{end}}
+							</div>
                         </div>
                     {{end}}
                 </div>
-- 
cgit v1.2.3