diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-28 11:06:19 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-28 11:06:19 +0300 |
| commit | 1056d91c67750e11973064932de28d49ea1debec (patch) | |
| tree | 3e17ebe8f76123fa72cef26a9d5182485428570e /app/views/search/_results.html.haml | |
| parent | c9054319c8f64e7f91cf062e36434da78979fa76 (diff) | |
| download | gitlab-ce-1056d91c67750e11973064932de28d49ea1debec.tar.gz | |
Improve search results output. Fixes some markup issues
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/search/_results.html.haml')
| -rw-r--r-- | app/views/search/_results.html.haml | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml index 93bbe9cf7e9..f9c0a6d61ff 100644 --- a/app/views/search/_results.html.haml +++ b/app/views/search/_results.html.haml @@ -7,10 +7,19 @@ %hr -- if @project - = render "project_results" -- else - = render "global_results" +.row + .col-sm-3 + - if @project + = render "project_filter" + - else + = render "global_filter" + .col-sm-9 + .search-results + - if @search_results.empty? + = render partial: "search/results/empty", locals: { message: "We couldn't find any matching results" } + - else + = render partial: "search/results/#{@scope.singularize}", collection: @objects + = paginate @objects, theme: 'gitlab' :javascript - $(".search_results .term").highlight("#{escape_javascript(params[:search])}"); + $(".search-results .term").highlight("#{escape_javascript(params[:search])}"); |