Commit d618a5fec361b85fafffd5cf4a53d044e82bdb5a
1 parent
593b05ea
Exists in
master
and in
4 other branches
Refactor search views
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
10 changed files
with
74 additions
and
73 deletions
Show diff stats
app/views/search/_blob.html.haml
| @@ -1,10 +0,0 @@ | @@ -1,10 +0,0 @@ | ||
| 1 | -%li | ||
| 2 | - .file-holder | ||
| 3 | - .file-title | ||
| 4 | - = link_to project_blob_path(@project, tree_join(blob.ref, blob.filename), :anchor => "L" + blob.startline.to_s) do | ||
| 5 | - %i.icon-file | ||
| 6 | - %strong | ||
| 7 | - = blob.filename | ||
| 8 | - .file-content.code.term | ||
| 9 | - %div{class: user_color_scheme_class} | ||
| 10 | - = raw blob.colorize( formatter: :gitlab, options: { first_line_number: blob.startline } ) |
| @@ -0,0 +1,17 @@ | @@ -0,0 +1,17 @@ | ||
| 1 | +%ul.nav.nav-pills | ||
| 2 | + %li{class: ("active" if params[:search_code].present?)} | ||
| 3 | + = link_to search_path(params.merge(search_code: true)) do | ||
| 4 | + Repository Code | ||
| 5 | + %li{class: ("active" if params[:search_code].blank?)} | ||
| 6 | + = link_to search_path(params.merge(search_code: nil)) do | ||
| 7 | + Everything else | ||
| 8 | + | ||
| 9 | +.search_results | ||
| 10 | + - if params[:search_code].present? | ||
| 11 | + .blob-results | ||
| 12 | + = render partial: "search/results/blob", collection: @blobs | ||
| 13 | + = paginate @blobs, theme: 'gitlab' | ||
| 14 | + - else | ||
| 15 | + %ul.bordered-list | ||
| 16 | + = render partial: "search/results/merge_request", collection: @merge_requests | ||
| 17 | + = render partial: "search/results/issue", collection: @issues |
app/views/search/_result.html.haml
| @@ -1,62 +0,0 @@ | @@ -1,62 +0,0 @@ | ||
| 1 | -%fieldset | ||
| 2 | - %legend | ||
| 3 | - Search results | ||
| 4 | - %span.cgray (#{@total_results}) | ||
| 5 | - | ||
| 6 | -- if @project | ||
| 7 | - %ul.nav.nav-pills | ||
| 8 | - %li{class: ("active" if params[:search_code].present?)} | ||
| 9 | - = link_to search_path(params.merge(search_code: true)) do | ||
| 10 | - Repository Code | ||
| 11 | - %li{class: ("active" if params[:search_code].blank?)} | ||
| 12 | - = link_to search_path(params.merge(search_code: nil)) do | ||
| 13 | - Everything else | ||
| 14 | - | ||
| 15 | -.search_results | ||
| 16 | - %ul.bordered-list | ||
| 17 | - - @projects.each do |project| | ||
| 18 | - %li | ||
| 19 | - project: | ||
| 20 | - = link_to project do | ||
| 21 | - %strong.term= project.name_with_namespace | ||
| 22 | - - @merge_requests.each do |merge_request| | ||
| 23 | - %li | ||
| 24 | - merge request: | ||
| 25 | - = link_to [merge_request.target_project, merge_request] do | ||
| 26 | - %span ##{merge_request.iid} | ||
| 27 | - %strong.term | ||
| 28 | - = truncate merge_request.title, length: 50 | ||
| 29 | - - if merge_request.for_fork? | ||
| 30 | - %span.light (#{merge_request.source_project.name_with_namespace}:#{merge_request.source_branch} → #{merge_request.target_project.name_with_namespace}:#{merge_request.target_branch}) | ||
| 31 | - - else | ||
| 32 | - %span.light (#{merge_request.source_branch} → #{merge_request.target_branch}) | ||
| 33 | - - if merge_request.closed? | ||
| 34 | - %span.label Closed | ||
| 35 | - | ||
| 36 | - - @issues.each do |issue| | ||
| 37 | - %li | ||
| 38 | - issue: | ||
| 39 | - = link_to [issue.project, issue] do | ||
| 40 | - %span ##{issue.iid} | ||
| 41 | - %strong.term | ||
| 42 | - = truncate issue.title, length: 50 | ||
| 43 | - %span.light (#{issue.project.name_with_namespace}) | ||
| 44 | - - if issue.closed? | ||
| 45 | - %span.label Closed | ||
| 46 | - | ||
| 47 | - - @wiki_pages.each do |wiki_page| | ||
| 48 | - %li | ||
| 49 | - wiki: | ||
| 50 | - = link_to project_wiki_path(wiki_page.project, wiki_page) do | ||
| 51 | - %strong.term | ||
| 52 | - = truncate wiki_page.title, length: 50 | ||
| 53 | - %span.light (#{wiki_page.project.name_with_namespace}) | ||
| 54 | - | ||
| 55 | - - @blobs.each do |blob| | ||
| 56 | - = render 'blob', blob: blob | ||
| 57 | - | ||
| 58 | - = paginate @blobs, theme: 'gitlab' | ||
| 59 | - | ||
| 60 | -:javascript | ||
| 61 | - $(".search_results .term").highlight("#{escape_javascript(params[:search])}"); | ||
| 62 | - |
| @@ -0,0 +1,13 @@ | @@ -0,0 +1,13 @@ | ||
| 1 | +%fieldset | ||
| 2 | + %legend | ||
| 3 | + Search results | ||
| 4 | + %span.cgray (#{@total_results}) | ||
| 5 | + | ||
| 6 | +- if @project | ||
| 7 | + = render "project_results" | ||
| 8 | +- else | ||
| 9 | + = render "global_results" | ||
| 10 | + | ||
| 11 | +:javascript | ||
| 12 | + $(".search_results .term").highlight("#{escape_javascript(params[:search])}"); | ||
| 13 | + |
| @@ -0,0 +1,10 @@ | @@ -0,0 +1,10 @@ | ||
| 1 | +.blob-result | ||
| 2 | + .file-holder | ||
| 3 | + .file-title | ||
| 4 | + = link_to project_blob_path(@project, tree_join(blob.ref, blob.filename), :anchor => "L" + blob.startline.to_s) do | ||
| 5 | + %i.icon-file | ||
| 6 | + %strong | ||
| 7 | + = blob.filename | ||
| 8 | + .file-content.code.term | ||
| 9 | + %div{class: user_color_scheme_class} | ||
| 10 | + = raw blob.colorize( formatter: :gitlab, options: { first_line_number: blob.startline } ) |
| @@ -0,0 +1,12 @@ | @@ -0,0 +1,12 @@ | ||
| 1 | +%li | ||
| 2 | + merge request: | ||
| 3 | + = link_to [merge_request.target_project, merge_request] do | ||
| 4 | + %span ##{merge_request.iid} | ||
| 5 | + %strong.term | ||
| 6 | + = truncate merge_request.title, length: 50 | ||
| 7 | + - if merge_request.for_fork? | ||
| 8 | + %span.light (#{merge_request.source_project.name_with_namespace}:#{merge_request.source_branch} → #{merge_request.target_project.name_with_namespace}:#{merge_request.target_branch}) | ||
| 9 | + - else | ||
| 10 | + %span.light (#{merge_request.source_branch} → #{merge_request.target_branch}) | ||
| 11 | + - if merge_request.closed? | ||
| 12 | + %span.label Closed |
app/views/search/show.html.haml