search: added narrow result links for global search.

rhodecode/public/css/summary.less

@@ -1,285 +1,291 b''
 // summary.less
 // For use in RhodeCode applications;
 // Used for headers and file detail summary screens.
 
 .summary {
     float: left;
     position: relative;
     width: 100%;
     margin: 0;
     padding: 0;
 
     .summary-detail-header {
         float: left;
         display: block;
         width: 100%;
         margin-bottom: @textmargin;
         padding: 0 0 .5em 0;
         border-bottom: @border-thickness solid @border-default-color;
 
         .breadcrumbs {
             float: left;
             display: inline;
             margin: 0;
             padding: 0;
         }
         h4 {
             float: left;
             margin: 0 1em 0 0;
             padding: 0;
             line-height: 1.2em;
             font-size: @basefontsize;
         }
 
         .action_link {
             float: right;
         }
 
         .new-file {
             float: right;
             margin-top: -1.5em;
         }
     }
 
     .summary-detail {
         float: left;
         position: relative;
         width: 73%;
         margin: 0 3% @space 0;
         padding: 0;
 
         .file_diff_buttons {
             margin-top: @space;
         }
 
         // commit message
         .commit {
           white-space: pre-wrap;
         }
 
         .left-clone {
             float: left;
             height: 30px;
             margin: 0;
             padding: 0;
             font-weight: @text-semibold-weight;
             font-family: @text-semibold;
         }
 
         .right-clone {
             float: right;
             width: 83%;
         }
 
         .clone_url_input {
             width: ~"calc(100% - 35px)";
             padding:  5px;
         }
 
         &.directory {
             margin-bottom: 0;
         }
 
         .desc {
             white-space: pre-wrap;
         }
         .disabled {
             opacity: .5;
             cursor: inherit;
         }
         .help-block {
             color: inherit;
             margin: 0;
         }
     }
 
     .sidebar-right {
         float: left;
         width: 24%;
         margin: 0;
         padding: 0;
 
         ul {
             margin-left: 0;
             padding-left: 0;
 
             li {
                 list-style-type: none;
             }
         }
     }
 
     #clone_by_name, #clone_by_id{
         display: inline-block;
         margin-left: 0px;
     }
 
     .codeblock {
         border: none;
         background-color: transparent;
     }
 
     .code-body {
         border: @border-thickness solid @border-default-color;
         .border-radius(@border-radius);
     }
 }
 
 // this is used outside of just the summary
 .fieldset, // similar to form fieldset
 .summary .sidebar-right-content { // these have to match
     clear: both;
     float: left;
     position: relative;
     display:block;
     width: 100%;
     min-height: 1em;
     margin-bottom: @textmargin;
     padding: 0;
     line-height: 1.2em;
 
     &:after { // clearfix
         content: "";
         clear: both;
         width: 100%;
         height: 1em;
     }
 }
 
 .summary .sidebar-right-content {
     margin-bottom: @space;
 
     .rc-user {
         min-width: 0;
     }
 }
 
 .fieldset {
 
     .left-label { // similar to form legend
         float: left;
         display: block;
         width: 25%;
         margin: 0;
         padding: 0;
         font-weight: @text-semibold-weight;
         font-family: @text-semibold;
     }
 
     .left-label-summary {
         .left-label;
         width: 150px;
     }
     
     .right-content { // similar to form fields
         float: left;
         display: block;
         width: 75%;
         margin: 0 0 0 -15%;
         padding: 0 0 0 15%;
 
         .truncate-wrap,
         .truncate {
             max-width: 100%;
             width: 100%;
         }
 
         .commit-long {
             overflow-x: auto;
         }
     }
     .commit.truncate-wrap {
         overflow:hidden;
         text-overflow: ellipsis;
     }
 }
 
 // expand commit message
 #message_expand {
     clear: both;
     display: block;
     color: @rcblue;
     cursor: pointer;
 }
 
 #trimmed_message_box {
     max-height: floor(2 * @basefontsize * 1.2);  // 2 lines * line-height
     overflow: hidden;
 }
 
 // show/hide comments button
 .show-inline-comments {
     display: inline;
     cursor: pointer;
 
     .comments-show { display: inline; }
     .comments-hide { display: none; }
     
     &.comments-visible {
         .comments-show { display: none; }
         .comments-hide { display: inline; }
     }
 }
     
 // Quick Start section
 .quick_start {
     float: left;
     display: block;
     position: relative;
     width: 100%;
 
     // adds some space to make copy and paste easier
     .left-label,
     .right-content {
         line-height: 1.6em;
     }
 }
 
 .submodule {
     .summary-detail {
         width: 100%;
 
         .btn-collapse {
             display: none;
         }
     }
 }
 
 .codeblock-header {
     float: left;
     display: block;
     width: 100%;
     margin: 0;
     padding: @space 0 10px 0;
     border-top: @border-thickness solid @border-default-color; 
 
     .stats {
         float: left;
     }
     .stats-filename {
         font-size: 120%;
     }
     .stats-first-item {
         padding: 0px 0px 0px 3px;
     }
 
     .buttons {
         float: right;
         text-align: right;
         color: @grey4;
     }
+
+    .file-container {
+        display: inline-block;
+        width: 100%;
+    }
+
 }
 
 #summary-menu-stats {
 
     .stats-bullet {
         color: @grey3;
         min-width: 3em;
     }
 
     .repo-size {
         margin-bottom: .5em;
     }
     
 }
 

rhodecode/templates/search/search.mako

@@ -1,214 +1,222 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
     %if c.repo_name:
         ${_('Search inside repository {repo_name}').format(repo_name=c.repo_name)}
     %elif c.repo_group_name:
         ${_('Search inside repository group {repo_group_name}').format(repo_group_name=c.repo_group_name)}
     %else:
         ${_('Search inside all accessible repositories')}
     %endif
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
   %if c.repo_name:
     ${_('Search inside repository {repo_name}').format(repo_name=c.repo_name)}
   %elif c.repo_group_name:
     ${_('Search inside repository group {repo_group_name}').format(repo_group_name=c.repo_group_name)}
   %else:
     ${_('Search inside all accessible repositories')}
   %endif
 
 </%def>
 
 <%def name="menu_bar_nav()">
     %if c.repo_name:
     ${self.menu_items(active='search')}
     %elif c.repo_group_name:
     ${self.menu_items(active='search')}
     %else:
     ${self.menu_items(active='search')}
     %endif
 </%def>
 
 <%def name="menu_bar_subnav()">
     %if c.repo_name:
         ${self.repo_menu(active='search')}
     %elif c.repo_group_name:
         ${self.repo_group_menu(active='search')}
     %endif
 </%def>
 
+<%def name="repo_icon(db_repo)">
+    %if h.is_hg(db_repo):
+        <i class="icon-hg"></i>
+    %endif
+    %if h.is_git(db_repo):
+        <i class="icon-git"></i>
+    %endif
+    %if h.is_svn(db_repo):
+        <i class="icon-svn"></i>
+    %endif
+</%def>
+
+<%def name="repo_group_icon()">
+    <i class="icon-folder-close"></i>
+</%def>
+
 <%def name="main()">
 <div class="box">
     %if c.repo_name:
         <!-- box / title -->
         <div class="title">
             ${self.repo_page_title(c.rhodecode_db_repo)}
         </div>
         ${h.form(h.route_path('search_repo',repo_name=c.repo_name),method='get')}
     %elif c.repo_group_name:
         <!-- box / title -->
         <div class="title">
             ${self.repo_group_page_title(c.repo_group)}
         </div>
         ${h.form(h.route_path('search_repo_group',repo_group_name=c.repo_group_name),method='get')}
     %else:
         <!-- box / title -->
         <div class="title">
             ${self.breadcrumbs()}
             <ul class="links">&nbsp;</ul>
         </div>
         <!-- end box / title -->
         ${h.form(h.route_path('search'), method='get')}
     %endif
     <div class="form search-form">
         <div class="fields">
 
             ${h.text('q', c.cur_query, placeholder="Enter query...")}
 
             ${h.select('type',c.search_type,[('content',_('Files')), ('path',_('File path')),('commit',_('Commits'))],id='id_search_type')}
             ${h.hidden('max_lines', '10')}
 
             <input type="submit" value="${_('Search')}" class="btn"/>
             <br/>
 
             <div class="search-tags">
                 <span class="tag tag8">
                     %if c.repo_name:
-                        <a href="${h.route_path('search', _query={'q': c.cur_query})}">${_('Global Search')}</a>
+                        <a href="${h.route_path('search', _query={'q': c.cur_query, 'type': request.GET.get('type', 'content')})}">${_('Global Search')}</a>
                     %elif c.repo_group_name:
-                        <a href="${h.route_path('search', _query={'q': c.cur_query})}">${_('Global Search')}</a>
+                        <a href="${h.route_path('search', _query={'q': c.cur_query, 'type': request.GET.get('type', 'content')})}">${_('Global Search')}</a>
                     % else:
                         ${_('Global Search')}
                     %endif
                 </span>
 
             %if c.repo_name:
                 »
                 <span class="tag tag8">
-                    %if h.is_hg(c.rhodecode_db_repo):
-                        <i class="icon-hg"></i>
-                    %endif
-                    %if h.is_git(c.rhodecode_db_repo):
-                        <i class="icon-git"></i>
-                    %endif
-                    %if h.is_svn(c.rhodecode_db_repo):
-                        <i class="icon-svn"></i>
-                    %endif
+                    ${repo_icon(c.rhodecode_db_repo)}
                     ${c.repo_name}
                 </span>
 
             %elif c.repo_group_name:
                 »
                 <span class="tag tag8">
-                    <i class="icon-folder-close"></i>
+                    ${repo_group_icon()}
                     ${c.repo_group_name}
                 </span>
             %endif
 
 
             % for search_tag in c.search_tags:
                 <br/><span class="tag disabled" style="margin-top: 3px">${search_tag}</span>
             % endfor
 
             </div>
 
             <div class="search-feedback-items">
             % for error in c.errors:
               <span class="error-message">
                   % for k,v in error.asdict().items():
                     ${k} - ${v}
                   % endfor
               </span>
             % endfor
             <div class="field">
                 <p class="filterexample" style="position: inherit" onclick="$('#search-help').toggle()">${_('Query Langague examples')}</p>
 <pre id="search-help" style="display: none">\
 
 % if c.searcher.name == 'whoosh':
 Example filter terms for `Whoosh` search:
 query lang: <a href="${c.searcher.query_lang_doc}">Whoosh Query Language</a>
 Whoosh has limited query capabilities. For advanced search use ElasticSearch 6 from RhodeCode EE edition.
 
 Generate wildcards using '*' character:
   "repo_name:vcs*" - search everything starting with 'vcs'
   "repo_name:*vcs*" - search for repository containing 'vcs'
 
 Optional AND / OR operators in queries
   "repo_name:vcs OR repo_name:test"
   "owner:test AND repo_name:test*" AND extension:py
 
 Move advanced search is available via ElasticSearch6 backend in EE edition.
 % elif c.searcher.name == 'elasticsearch' and c.searcher.es_version == '2':
 Example filter terms for `ElasticSearch-${c.searcher.es_version}`search:
 ElasticSearch-2 has limited query capabilities. For advanced search use ElasticSearch 6 from RhodeCode EE edition.
 
 search type: content (File Content)
   indexed fields: content
 
   # search for `fix` string in all files
   fix
 
 search type: commit (Commit message)
   indexed fields: message
 
 search type: path (File name)
   indexed fields: path
 
 % else:
 Example filter terms for `ElasticSearch-${c.searcher.es_version}`search:
 query lang: <a href="${c.searcher.query_lang_doc}">ES 6 Query Language</a>
 The reserved characters needed espace by `\`: + - = && || > < ! ( ) { } [ ] ^ " ~ * ? : \ /
 % for handler in c.searcher.get_handlers().values():
 
 search type: ${handler.search_type_label}
   *indexed fields*: ${', '.join( [('\n    ' if x[0]%4==0 else '')+x[1] for x in enumerate(handler.es_6_field_names)])}
   % for entry in handler.es_6_example_queries:
   ${entry.rstrip()}
   % endfor
 % endfor
 
 % endif
 </pre>
             </div>
 
             <div class="field">${c.runtime}</div>
             </div>
         </div>
     </div>
 
     ${h.end_form()}
     <div class="search">
     % if c.search_type == 'content':
         <%include file='search_content.mako'/>
     % elif c.search_type == 'path':
         <%include file='search_path.mako'/>
     % elif c.search_type == 'commit':
         <%include file='search_commit.mako'/>
     % elif c.search_type == 'repository':
         <%include file='search_repository.mako'/>
     % endif
     </div>
 </div>
 <script>
     $(document).ready(function(){
         $("#id_search_type").select2({
             'containerCssClass': "drop-menu",
             'dropdownCssClass': "drop-menu-dropdown",
             'dropdownAutoWidth': true,
             'minimumResultsForSearch': -1
         });
 
         $('#q').autoGrowInput({maxWidth: 920});
 
         setTimeout(function() {
             $('#q').keyup()
         }, 1);
     })
 </script>
 </%def>

rhodecode/templates/search/search_commit.mako

@@ -1,103 +1,98 b''
 <%namespace name="base" file="/base/base.mako"/>
+<%namespace name="search" file="/search/search.mako"/>
 
 % if c.formatted_results:
 
 <table class="rctable search-results">
     <tr>
         <th>${_('Repository')}</th>
         <th>${_('Commit')}</th>
         <th></th>
         <th>${_('Commit message')}</th>
         <th>
         %if c.sort == 'newfirst':
             <a href="${c.url_generator(sort='oldfirst')}">${_('Age (new first)')}</a>
         %else:
             <a href="${c.url_generator(sort='newfirst')}">${_('Age (old first)')}</a>
         %endif
         </th>
         <th>${_('Author')}</th>
     </tr>
     %for entry in c.formatted_results:
         ## search results are additionally filtered, and this check is just a safe gate
         % if c.rhodecode_user.is_admin or h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(entry['repository'], 'search results commit check'):
             <tr class="body">
                 <td class="td-componentname">
                     <% repo_type = entry.get('repo_type') or h.get_repo_type_by_name(entry.get('repository')) %>
-                    %if repo_type == 'hg':
-                        <i class="icon-hg"></i>
-                    %elif repo_type == 'git':
-                        <i class="icon-git"></i>
-                    %elif repo_type == 'svn':
-                        <i class="icon-svn"></i>
-                    %endif
+                    ${search.repo_icon(repo_type)}
                     ${h.link_to(entry['repository'], h.route_path('repo_summary',repo_name=entry['repository']))}
                 </td>
                 <td class="td-commit">
                     ${h.link_to(h._shorten_commit_id(entry['commit_id']),
                       h.route_path('repo_commit',repo_name=entry['repository'],commit_id=entry['commit_id']))}
                 </td>
                 <td class="td-message expand_commit search open" data-commit-id="${h.md5_safe(entry['repository'])+entry['commit_id']}" id="t-${h.md5_safe(entry['repository'])+entry['commit_id']}" title="${_('Expand commit message')}">
                     <div>
                     <i class="icon-expand-linked"></i>&nbsp;
                     </div>
                 </td>
                 <td data-commit-id="${h.md5_safe(entry['repository'])+entry['commit_id']}" id="c-${h.md5_safe(entry['repository'])+entry['commit_id']}" class="message td-description open">
                     %if entry.get('message_hl'):
                         ${h.literal(entry['message_hl'])}
                     %else:
                         ${h.urlify_commit_message(entry['message'], entry['repository'])}
                     %endif
                 </td>
                 <td class="td-time">
                     ${h.age_component(h.time_to_utcdatetime(entry['date']))}
                 </td>
 
                 <td class="td-user author">
                     <%
                     ## es6 stores this as object
                     author = entry['author']
                     if isinstance(author, dict):
                         author = author['email']
                     %>
                     ${base.gravatar_with_user(author)}
                 </td>
             </tr>
         % endif
     %endfor
 </table>
 
 %if c.cur_query:
 <div class="pagination-wh pagination-left">
     ${c.formatted_results.pager('$link_previous ~2~ $link_next')}
 </div>
 %endif
 
 <script>
     $('.expand_commit').on('click',function(e){
       var target_expand = $(this);
       var cid = target_expand.data('commit-id');
 
       if (target_expand.hasClass('open')){
         $('#c-'+cid).css({'height': '1.5em', 'white-space': 'nowrap', 'text-overflow': 'ellipsis', 'overflow':'hidden'});
         $('#t-'+cid).css({'height': 'auto', 'line-height': '.9em', 'text-overflow': 'ellipsis', 'overflow':'hidden'});
         target_expand.removeClass('open');
       }
       else {
         $('#c-'+cid).css({'height': 'auto', 'white-space': 'normal', 'text-overflow': 'initial', 'overflow':'visible'});
         $('#t-'+cid).css({'height': 'auto', 'max-height': 'none', 'text-overflow': 'initial', 'overflow':'visible'});
         target_expand.addClass('open');
       }
     });
 
     $(".message.td-description").mark(
         "${c.searcher.query_to_mark(c.cur_query, 'message')}",
         {
             "className": 'match',
             "accuracy": "complementary",
             "ignorePunctuation": ":._(){}[]!'+=".split("")
         }
     );
 
 </script>
 
 % endif

rhodecode/templates/search/search_content.mako

@@ -1,152 +1,180 b''
+<%namespace name="search" file="/search/search.mako"/>
 
 <%def name="highlight_text_file(has_matched_content, file_content, lexer, html_formatter, matching_lines, shown_matching_lines, url, use_hl_filter)">
 % if has_matched_content:
     ${h.code_highlight(file_content, lexer, html_formatter, use_hl_filter=use_hl_filter)|n}
 % else:
     ${_('No content matched')} <br/>
 % endif
 
 %if len(matching_lines) > shown_matching_lines:
 <a href="${url}">
   ${len(matching_lines) - shown_matching_lines} ${_('more matches in this file')}
 </a>
 %endif
 </%def>
 
 <div class="search-results">
 <% query_mark = c.searcher.query_to_mark(c.cur_query, 'content') %>
 
 %for entry in c.formatted_results:
 
   <%
     file_content = entry['content_highlight'] or entry['content']
     mimetype = entry.get('mimetype')
     filepath = entry.get('path')
     max_lines = h.safe_int(request.GET.get('max_lines', '10'))
     line_context = h.safe_int(request.GET.get('line_contenxt', '3'))
 
     match_file_url=h.route_path('repo_files',repo_name=entry['repository'], commit_id=entry.get('commit_id', 'tip'),f_path=entry['f_path'], _query={"mark": query_mark})
     terms = c.cur_query
 
     if c.searcher.is_es_6:
         # use empty terms so we default to markers usage
         total_lines, matching_lines = h.get_matching_line_offsets(file_content, terms=None)
     else:
         total_lines, matching_lines = h.get_matching_line_offsets(file_content, terms)
 
     shown_matching_lines = 0
     lines_of_interest = set()
     for line_number in matching_lines:
         if len(lines_of_interest) < max_lines:
             lines_of_interest |= set(range(
                 max(line_number - line_context, 0),
                 min(line_number + line_context, total_lines + 1)))
             shown_matching_lines += 1
     lexer = h.get_lexer_safe(mimetype=mimetype, filepath=filepath)
 
     html_formatter = h.SearchContentCodeHtmlFormatter(
         linenos=True,
         cssclass="code-highlight",
         url=match_file_url,
         query_terms=terms,
         only_line_numbers=lines_of_interest
     )
 
     has_matched_content = len(lines_of_interest) >= 1
 
   %>
   ## search results are additionally filtered, and this check is just a safe gate
   % if c.rhodecode_user.is_admin or h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(entry['repository'], 'search results content check'):
       <div id="codeblock" class="codeblock">
         <div class="codeblock-header">
           <h1>
             <% repo_type = entry.get('repo_type') or h.get_repo_type_by_name(entry.get('repository')) %>
-            %if repo_type == 'hg':
-                <i class="icon-hg"></i>
-            %elif repo_type == 'git':
-                <i class="icon-git"></i>
-            %elif repo_type == 'svn':
-                <i class="icon-svn"></i>
-            %endif
+            ${search.repo_icon(repo_type)}
             ${h.link_to(entry['repository'], h.route_path('repo_summary',repo_name=entry['repository']))}
           </h1>
+          ## level 1
+          <div class="file-container">
 
-          <div class="stats">
+            <div class="pull-left">
             <span class="stats-filename">
                 <strong>
                     <i class="icon-file-text"></i>
                     ${h.link_to(h.literal(entry['f_path']), h.route_path('repo_files',repo_name=entry['repository'],commit_id=entry.get('commit_id', 'tip'),f_path=entry['f_path']))}
                 </strong>
             </span>
-            <span class="item last"><i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${entry['f_path']}" title="${_('Copy the full path')}"></i></span>
-            <br/>
-            <span class="stats-first-item">
-                ${len(matching_lines)} ${_ungettext('search match', 'search matches', len(matching_lines))}
+                <span class="item last">
+                    <i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${entry['f_path']}" title="${_('Copy the full path')}"></i>
             </span>
+            </div>
 
-            <span >
+            <div class="pull-right">
+              <div class="buttons">
+                <a id="file_history_overview_full" href="${h.route_path('repo_changelog_file',repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path',''))}">
+                   ${_('Show Full History')}
+                </a>
+                 | ${h.link_to(_('Annotation'), h.route_path('repo_files:annotated', repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path','')))}
+                 | ${h.link_to(_('Raw'), h.route_path('repo_file_raw', repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path','')))}
+                 | ${h.link_to(_('Download'), h.route_path('repo_file_download',repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path','')))}
+              </div>
+            </div>
+
+          </div>
+          ## level 2
+          <div class="file-container">
+
+            <div class="pull-left">
+                <span class="stats-first-item">
                 %if entry.get('lines'):
-                  | ${entry.get('lines', 0.)} ${_ungettext('line', 'lines', entry.get('lines', 0.))}
+                      ${entry.get('lines', 0.)} ${_ungettext('line', 'lines', entry.get('lines', 0.))}
+                      (${len(matching_lines)} ${_ungettext('matched', 'matched', len(matching_lines))})
                 %endif
             </span>
 
             <span>
                 %if entry.get('size'):
                   | ${h.format_byte_size_binary(entry['size'])}
                 %endif
             </span>
 
             <span>
                 %if entry.get('mimetype'):
                   | ${entry.get('mimetype', "unknown mimetype")}
                 %endif
             </span>
+            </div>
+
+            <div class="pull-right">
+                <div class="search-tags">
+
+                    <% repo_group = entry.get('repository_group')%>
+                    ## hiden if in repo group view
+                    % if repo_group and not c.repo_group_name:
+                    <span class="tag tag8">
+                        ${search.repo_group_icon()}
+                        <a href="${h.route_path('search_repo_group', repo_group_name=repo_group, _query={'q': c.cur_query})}">${_('Narrow to this repository group')}</a>
+                    </span>
+                    % endif
+                    ## hiden if in repo view
+                    % if not c.repo_name:
+                    <span class="tag tag8">
+                        ${search.repo_icon(repo_type)}
+                        <a href="${h.route_path('search_repo', repo_name=entry.get('repo_name'), _query={'q': c.cur_query})}">${_('Narrow to this repository')}</a>
+                    </span>
+                    % endif
+                </div>
+            </div>
 
           </div>
-          <div class="buttons">
-            <a id="file_history_overview_full" href="${h.route_path('repo_changelog_file',repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path',''))}">
-               ${_('Show Full History')}
-            </a>
-             | ${h.link_to(_('Annotation'), h.route_path('repo_files:annotated', repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path','')))}
-             | ${h.link_to(_('Raw'), h.route_path('repo_file_raw', repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path','')))}
-             | ${h.link_to(_('Download'), h.route_path('repo_file_download',repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path','')))}
-          </div>
+
         </div>
         <div class="code-body search-code-body">
 
             ${highlight_text_file(
                 has_matched_content=has_matched_content,
                 file_content=file_content,
                 lexer=lexer,
                 html_formatter=html_formatter,
                 matching_lines=matching_lines,
                 shown_matching_lines=shown_matching_lines,
                 url=match_file_url,
                 use_hl_filter=c.searcher.is_es_6
             )}
         </div>
 
       </div>
     % endif
 %endfor
 </div>
 %if c.cur_query and c.formatted_results:
 <div class="pagination-wh pagination-left" >
     ${c.formatted_results.pager('$link_previous ~2~ $link_next')}
 </div>
 %endif
 
 %if c.cur_query:
 <script type="text/javascript">
 $(function(){
   $(".search-code-body").mark(
       "${query_mark}",
           {
               "className": 'match',
               "accuracy": "complementary",
               "ignorePunctuation": ":._(){}[]!'+=".split("")
           }
   );
 })
 </script>
 %endif

rhodecode/templates/search/search_path.mako

@@ -1,50 +1,46 b''
+<%namespace name="search" file="/search/search.mako"/>
+
 % if c.formatted_results:
 
 <table class="rctable search-results">
     <tr>
         <th>${_('Repository')}</th>
         <th>${_('File')}</th>
         <th>${_('Size')}</th>
         <th>${_('Lines')}</th>
     </tr>
     %for entry in c.formatted_results:
         ## search results are additionally filtered, and this check is just a safe gate
         % if c.rhodecode_user.is_admin or h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(entry['repository'], 'search results path check'):
             <tr class="body">
                 <td class="td-componentname">
                     <% repo_type = entry.get('repo_type') or h.get_repo_type_by_name(entry.get('repository')) %>
-                    %if repo_type == 'hg':
-                        <i class="icon-hg"></i>
-                    %elif repo_type == 'git':
-                        <i class="icon-git"></i>
-                    %elif repo_type == 'svn':
-                        <i class="icon-svn"></i>
-                    %endif
+                    ${search.repo_icon(repo_type)}
                     ${h.link_to(entry['repository'], h.route_path('repo_summary',repo_name=entry['repository']))}
                 </td>
                 <td class="td-componentname">
                     ${h.link_to(h.literal(entry['f_path']),
                         h.route_path('repo_files',repo_name=entry['repository'],commit_id='tip',f_path=entry['f_path']))}
                 </td>
                 <td>
                     %if entry.get('size'):
                       ${h.format_byte_size_binary(entry['size'])}
                     %endif
                 </td>
                 <td>
                     %if entry.get('lines'):
                       ${entry.get('lines', 0.)} ${_ungettext('line', 'lines', entry.get('lines', 0.))}
                     %endif
                 </td>
             </tr>
         % endif
     %endfor
 </table>
 
 %if c.cur_query:
 <div class="pagination-wh pagination-left">
     ${c.formatted_results.pager('$link_previous ~2~ $link_next')}
 </div>
 %endif
 
 % endif