Tidy up needs search list and facets

app/assets/stylesheets/application.css.scss

@@ -12,6 +12,13 @@
 .search-filters {
   h2 { font-size: 1.5em; line-height: 1.1em; }
   h3 { font-size: 1em; line-height: 1.1em;  }
+
+  ul.facet li {
+    &.active {
+      padding: 0px 1em;
+      a.remove { display: inline-block; padding: 0.3em 0.5em; margin-left: 0.5em; }
+    }
+  }
 }
 
 ul.filters {

app/helpers/needs_helper.rb

@@ -135,4 +135,14 @@ def accountabilities_for(need)
     (0...Need::MAXIMUM_POLICY_DEPARTMENTS).map { |i| need.accountabilities.all[i] || need.accountabilities.build }
   end
 
+  def label_for(status)
+    case status
+    when 'new' then 'label-inverse'
+    when 'done' then 'label-success'
+    when %w{bin icebox} then ''
+    when 'in-progress' then 'label-warning'
+    when 'format-assigned' then 'label-info'
+    end
+  end
+
 end

app/locales/en.yml

@@ -20,6 +20,7 @@ en:
       status: Status
       priority: Priority
       kind: Format
+  priority_0: Priority 0
   priority_1: Low
   priority_2: Medium
   priority_3: High

app/views/needs/_needs_display.html.erb

@@ -6,14 +6,12 @@
         <%= sortable_heading('title') %>
         <%= sortable_heading('kind') %>
         <%= sortable_heading('priority') %>
-        <th><%= t('field.short.tags') %></th>
         <%= sortable_heading('updated_at') %>
       <% else %>
         <th scope="col">ID</th>
         <th scope="col">Title</th>
         <th scope="col">Format</th>
         <th scope="col">Priority</th>
-        <th scope="col">Tags</th>
         <th scope="col">Last updated</th>
       <% end %>
 
@@ -27,10 +25,9 @@
     <% needs.each do |need| %>
       <tr>
         <td>#<%= need.id %></td>
-        <th scope="row"><%= link_to need.title, need %> <% if !params[:in_state] %><small class="status-label <%= need.status %>"><%= status_name need.status %></small><% end %></th>
-        <td class="need"><%= need.format_assigned? ? need.kind : "-" %></td>
-        <td><%= need.prioritised? ? need.named_priority : '-' %></td>
-        <td><%= need.tag_list %></td>
+        <th scope="row" style="width: 50%"><%= link_to need.title, need %> <% if !params[:in_state] %><span class="label <%= label_for need.status %>"><%= status_name need.status %></small><% end %></th>
+        <td class="need"><%= need.kind || "-" %></td>
+        <td><%= named_priority need.priority %></td>
         <td><%= time_ago_in_words(need.updated_at, true) %></td>
         <% if current_user.is_admin? %>
           <td><%= link_to 'Edit', edit_need_path(need) %></td>

app/views/search/index.html.erb

@@ -11,16 +11,6 @@
   end
 } %>
 
-<% if @search && (params[:query] || params[:filter]) %>
-<div class="results">
-  <p>Your search
-  <% if params[:query].present? %>
-    for <strong><%= params[:query] %></strong>
-  <% end %>
-  returned <%= pluralize(@search.count, 'result') %>. You can filter those results below.</p>
-</div>
-<% end %>
-
 <% if @filters.present? %>
 <ul class="filters well">
   <h3>Filter applied:</h3>
@@ -50,12 +40,12 @@
       <h2>Search Filters</h2>
       <% @facets.each do |facet| %>
         <h3><span class="visuallyhidden">Filter by</span> <%= t("field.long.#{facet}") %></h3>
-        <ul class="nav nav-pills nav-stacked">
+        <ul class="facet nav nav-pills nav-stacked">
           <% @search.facets[facet]['terms'].each do |details| %>
             <% next if details['term'].blank? %>
             <% label = facet == 'priority' ? t("priority_#{details['term']}") : details['term'] %>
             <% if filtering_by?(facet, details['term']) %>
-              <li>
+              <li class="active">
                 <%= label %> (<%= details['count'] %>)
                 <%= link_to('x', search_link_with_removed_filter(params, @filters, facet => details['term']), class: 'remove') %>
               </li>

spec/acceptance/searching_for_a_need_spec.rb

@@ -10,9 +10,9 @@ def create_need(name, options = {})
     visit "/needs/new"
     fill_in "Need", with: name
     fill_in "Tags", with: options[:tags] if options.has_key?(:tags)
-    click_button "Create Need"             
+    click_button "Create Need"
     if options.has_key?(:edit_form_fields)
-      click_link 'Edit'                    
+      click_link 'Edit'
       options[:edit_form_fields].each do |field, value|
         (field == 'Writing team') ? select(value, from: field) : fill_in(field, with: value)
       end
@@ -38,27 +38,27 @@ def survive_es_asynchonicity
     create_need "Replace passport"
     survive_es_asynchonicity
 
-    click_link "View all needs"
+    click_link "All needs"
 
     search_for 'Replace passport'
     page.should have_css "#needs-table", text: 'Replace passport'
 
     search_for "Missing"
-    page.should have_content "Nothing found"
+    page.should have_content "No needs were found which match these criteria."
   end
 
-  it 'works when searching for a word from the Writing department field' do        
-    WritingDepartment.create name: "Ministry of Truth"     
+  it 'works when searching for a word from the Writing department field' do
+    WritingDepartment.create name: "Ministry of Truth"
     create_need "Get a new passport", edit_form_fields: { "Writing team" => "Ministry of Truth"}
     create_need "Get a new driving licence"
     survive_es_asynchonicity
 
-    click_link "View all needs"
+    click_link "All needs"
     search_for 'Truth'
     within '#needs-table' do
       page.should have_content 'Get a new passport'
       page.should have_no_content 'Get a new driving license'
-    end                
+    end
   end
 
   it 'allows filtering by facets' do
@@ -67,15 +67,15 @@ def survive_es_asynchonicity
 
     survive_es_asynchonicity
 
-    click_link "View all needs"
+    click_link "All needs"
     click_link "red"
 
     within '#needs-table' do
       page.should have_content 'Get a new passport'
       page.should have_no_content 'Learn to drive'
     end
 
-    click_link "View all needs"
+    click_link "All needs"
     click_link "blue"
     within '#needs-table' do
       page.should have_no_content 'Get a new passport'
@@ -90,7 +90,7 @@ def survive_es_asynchonicity
 
     survive_es_asynchonicity
 
-    click_link "View all needs"
+    click_link "All needs"
     click_link "blue"
     click_link "red"
     within '#needs-table' do
@@ -137,4 +137,4 @@ def survive_es_asynchonicity
       page.text.should =~ /Carrots.*Bananas.*Apples/m
     end
   end
-end
+end