Download as
Browse Code »

Commit fc60c391ae93e0a9ef9a5123ee7d71cd504e4366

Authored by Dmitriy Zaporozhets
1 parent b49ebf57
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Improve search page UX 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 10 additions and 6 deletions   Show diff stats
app/views/search/_project_results.html.haml
  Diff comments   View file @fc60c39
1 -%ul.nav.nav-pills.append-bottom-20 1 +%ul.nav.nav-tabs.append-bottom-10
2 %li{class: ("active" if params[:search_code].present?)} 2 %li{class: ("active" if params[:search_code].present?)}
3 = link_to search_path(params.merge(search_code: true)) do 3 = link_to search_path(params.merge(search_code: true)) do
4 Repository Code 4 Repository Code
5 %li{class: ("active" if params[:search_code].blank?)} 5 %li{class: ("active" if params[:search_code].blank?)}
6 = link_to search_path(params.merge(search_code: nil)) do 6 = link_to search_path(params.merge(search_code: nil)) do
7 - Everything else 7 + Issues and Merge requests
8 8
9 .search_results 9 .search_results
10 - if params[:search_code].present? 10 - if params[:search_code].present?
app/views/search/_results.html.haml
  Diff comments   View file @fc60c39
1 -%fieldset  
2 - %legend  
3 - Search results  
4 - %span.cgray (#{@search_results[:total_results]}) 1 +%h4
  2 + #{@search_results[:total_results]} results found
  3 + - if @project
  4 + for #{link_to @project.name_with_namespace, @project}
  5 + - elsif @group
  6 + for #{link_to @group.name, @group}
  7 +
  8 +%hr
5 9
6 - if @project 10 - if @project
7 = render "project_results" 11 = render "project_results"