Download as
Browse Code »

Commit 1c8008c154ac4ca60790910a413a42d65c5881bb

Authored by randx
1 parent 385ca60a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Informative search results page

Showing 1 changed file with 58 additions and 47 deletions   Show diff stats
app/views/search/show.html.haml
  Diff comments   View file @1c8008c
... ... @@ -7,55 +7,66 @@
7 7 = submit_tag 'Search', :class => "btn btn-primary"
8 8 - if params[:search].present?
9 9 %br
10   - %h3 Search results
  10 + %h3
  11 + Search results
  12 + %small (#{@projects.count + @merge_requests.count + @issues.count})
11 13 %hr
12 14 .search_results
13   - - if @projects.empty? && @merge_requests.empty?
14   - %h3
15   - %small Nothing here
16   - - else
17   - - if @projects.any?
18   - %h4 Projects
19   - .padded
20   - - @projects.each do |project|
21   - = link_to project do
22   - %h4
23   - %span.ico.project
24   - = project.name
25   - %small
26   - last activity at
27   - = project.last_activity_date.stamp("Aug 25, 2011")
28   - - if @merge_requests.any?
29   - %h4 Merge Requests
30   - .padded
31   - - @merge_requests.each do |merge_request|
32   - = link_to [merge_request.project, merge_request] do
33   - %h5
34   - Merge Request #
35   - = merge_request.id
36   - –
37   - = truncate merge_request.title, :length => 50
38   - %small
39   - updated at
40   - = merge_request.updated_at.stamp("Aug 25, 2011")
41   - %strong
42   - %span.label= merge_request.project.name
43   - - if @issues.any?
44   - %h4 Issues
45   - .padded
46   - - @issues.each do |issue|
47   - = link_to [issue.project, issue] do
48   - %h5
49   - Issue #
50   - = issue.id
51   - –
52   - = truncate issue.title, :length => 50
53   - %small
54   - updated at
55   - = issue.updated_at.stamp("Aug 25, 2011")
56   - %strong
57   - %span.label= issue.project.name
  15 + .row
  16 + .span6
  17 + %table.admin-table
  18 + %tr
  19 + %th Projects
  20 + %tbody
  21 + - @projects.each do |project|
  22 + %tr
  23 + %td
  24 + = link_to project do
  25 + %strong.term= project.name
  26 + %small.cgray
  27 + last activity at
  28 + = project.last_activity_date.stamp("Aug 25, 2011")
  29 + - if @projects.blank?
  30 + %tr
  31 + %td
  32 + %h4.nothing_here_message No Projects
  33 + %br
  34 + %table.admin-table
  35 + %tr
  36 + %th Merge Requests
  37 + %tbody
  38 + - @merge_requests.each do |merge_request|
  39 + %tr
  40 + %td
  41 + = link_to [merge_request.project, merge_request] do
  42 + %span.badge.badge-info ##{merge_request.id}
  43 + –
  44 + %strong.term= truncate merge_request.title, :length => 50
  45 + %strong.right
  46 + %span.label= merge_request.project.name
  47 + - if @merge_requests.blank?
  48 + %tr
  49 + %td
  50 + %h4.nothing_here_message No Merge Requests
  51 + .span6
  52 + %table.admin-table
  53 + %tr
  54 + %th Issues
  55 + %tbody
  56 + - @issues.each do |issue|
  57 + %tr
  58 + %td
  59 + = link_to [issue.project, issue] do
  60 + %span.badge.badge-info ##{issue.id}
  61 + –
  62 + %strong.term= truncate issue.title, :length => 40
  63 + %strong.right
  64 + %span.label= issue.project.name
  65 + - if @issues.blank?
  66 + %tr
  67 + %td
  68 + %h4.nothing_here_message No Issues
58 69 :javascript
59 70 $(function() {
60   - $(".search_results").highlight("#{params[:search]}");
  71 + $(".search_results .term").highlight("#{params[:search]}");
61 72 })
... ...