diff options
Diffstat (limited to 'app/views/search/results')
-rw-r--r-- | app/views/search/results/_blob.html.haml | 2 | ||||
-rw-r--r-- | app/views/search/results/_blob_data.html.haml | 2 | ||||
-rw-r--r-- | app/views/search/results/_empty.html.haml | 2 | ||||
-rw-r--r-- | app/views/search/results/_filters.html.haml | 7 | ||||
-rw-r--r-- | app/views/search/results/_issue.html.haml | 5 |
5 files changed, 12 insertions, 6 deletions
diff --git a/app/views/search/results/_blob.html.haml b/app/views/search/results/_blob.html.haml index 6e17a25c713..aeb37022f99 100644 --- a/app/views/search/results/_blob.html.haml +++ b/app/views/search/results/_blob.html.haml @@ -1,5 +1,5 @@ - project = blob.project - return unless project -- blob_link = project_blob_path(project, tree_join(blob.ref, blob.path)) +- blob_link = project_blob_path(project, tree_join(repository_ref(project), blob.path)) = render partial: 'search/results/blob_data', locals: { blob: blob, project: project, path: blob.path, blob_link: blob_link } diff --git a/app/views/search/results/_blob_data.html.haml b/app/views/search/results/_blob_data.html.haml index 27d4dbe1085..d873a15d051 100644 --- a/app/views/search/results/_blob_data.html.haml +++ b/app/views/search/results/_blob_data.html.haml @@ -2,7 +2,7 @@ .file-holder .js-file-title.file-title{ data: { qa_selector: 'file_title_content' } } = link_to blob_link, data: {track_event: 'click_text', track_label: 'blob_path', track_property: 'search_result'} do - %i.fa.fa-file + = sprite_icon('document') %strong = search_blob_title(project, path) - if blob.data diff --git a/app/views/search/results/_empty.html.haml b/app/views/search/results/_empty.html.haml index 6c7c6de1178..3cd1c901f8e 100644 --- a/app/views/search/results/_empty.html.haml +++ b/app/views/search/results/_empty.html.haml @@ -1,5 +1,5 @@ .search_box .search_glyph %h4 - = icon('search') + = sprite_icon('search', size: 24, css_class: 'gl-vertical-align-text-bottom') = search_entries_empty_message(@scope, @search_term) diff --git a/app/views/search/results/_filters.html.haml b/app/views/search/results/_filters.html.haml new file mode 100644 index 00000000000..632d3dfd58c --- /dev/null +++ b/app/views/search/results/_filters.html.haml @@ -0,0 +1,7 @@ +.d-lg-flex.align-items-end + #js-search-filter-by-state{ 'v-cloak': true } + - if Feature.enabled?(:search_filter_by_confidential, @group) + #js-search-filter-by-confidential{ 'v-cloak': true } + + - if %w(issues merge_requests).include?(@scope) + %hr.gl-mt-4.gl-mb-4 diff --git a/app/views/search/results/_issue.html.haml b/app/views/search/results/_issue.html.haml index e0336d98f04..a101e60f297 100644 --- a/app/views/search/results/_issue.html.haml +++ b/app/views/search/results/_issue.html.haml @@ -9,6 +9,5 @@ %span.term.str-truncated.gl-font-weight-bold.gl-ml-2= issue.title .gl-text-gray-500.gl-my-3 = sprintf(s_(' %{project_name}#%{issue_iid} · opened %{issue_created} by %{author}'), { project_name: issue.project.full_name, issue_iid: issue.iid, issue_created: time_ago_with_tooltip(issue.created_at, placement: 'bottom'), author: link_to_member(@project, issue.author, avatar: false) }).html_safe - - if issue.description.present? - .description.term.col-sm-10.gl-px-0 - = truncate(issue.description, length: 200) + .description.term.col-sm-10.gl-px-0 + = highlight_and_truncate_issue(issue, @search_term, @search_highlight) |