Make search cover Entity, Photo and Post, and display results visually …

…#2

app/helpers/application_helper.rb

@@ -1,2 +1,13 @@
 module ApplicationHelper
+  def partial_name(thing)
+    case thing.class.to_s
+    when 'Post'
+      return '/shared/show_post'
+    when 'Entity'
+      return thing.person? ? '/shared/show_person' : '/shared/show_organization'
+    when 'Photo'
+      return '/shared/show_photo'
+    end
+    nil # Shouldn't happen
+  end
 end

app/models/photo.rb

@@ -2,6 +2,9 @@ class Photo < ActiveRecord::Base
   has_many :entity_photo_associations, dependent: :delete_all
   has_many :related_entities, through: :entity_photo_associations, source: :entity
 
+  include PgSearch
+  multisearchable :against => [:footer]
+
   mount_uploader :file, PhotoUploader
 
   acts_as_taggable

app/models/post.rb

@@ -1,6 +1,9 @@
 class Post < ActiveRecord::Base
   belongs_to :author, foreign_key: :author_id, class_name: User
 
+  include PgSearch
+  multisearchable :against => [:title, :content]
+
   acts_as_url :title, url_attribute: :slug, only_when_blank: true
   def to_param
     slug

app/views/organizations/index.html.erb

@@ -13,7 +13,7 @@
   <div id="wall" class="row-fluid">
 
     <% @organizations.each do |organization| %>
-      <%= render 'show_organization', :entity => organization %>
+      <%= render '/shared/show_organization', :item => organization %>
     <% end %>
 
   </div>

app/views/people/index.html.erb

@@ -13,7 +13,7 @@
   <div id="wall" class="row-fluid">
 
     <% @people.each do |person| %>
-      <%= render 'show_person', :entity => person %>
+      <%= render '/shared/show_person', :item => person %>
     <% end %>
 
   </div>

app/views/photos/index.html.erb

@@ -13,7 +13,7 @@
   <div id="wall" class="row-fluid">
 
     <% @photos.each do |photo| %>
-      <%= render 'shared/show_photo', :photo => photo %>
+      <%= render 'shared/show_photo', :item => photo %>
     <% end %>
 
   </div>

app/views/search/search.html.erb

@@ -1,21 +1,25 @@
-<!--start: Wrapper-->
-<div id="wrapper" class="full">       
+<!-- start: Page Title -->
+<div id="page-title">
 
-  <!--start: Row -->
-  <div class="row-fluid">
+  <h2>Resultados para '<%= @query %>'</h2>
 
-    <div class="span8 separate">
-    <h3>Resultados para '<%= @query %>'</h3>
+</div>
+<!-- end: Page Title -->
 
-    <ul>
+<!--start: Wrapper-->
+<div id="wrapper">
+
+  <!-- start: Portfolio -->
+  <div id="wall" class="row-fluid">
+
     <% @results.each do |result| %>
-      <li><%= result.searchable.name %></li>
+      <%= render partial_name(result.searchable), :item => result.searchable %>
     <% end %>
-    </ul>
-
-    <%= paginate @results %>    
-    </div>
 
   </div>
+  <!-- end: Portfolio -->
 
+  <%= paginate @results %>
+
 </div>
+<!-- end: Wrapper  -->

app/views/shared/_show_organization.html.erb

@@ -0,0 +1,19 @@
+<div class="span3 item">
+  <div class="picture">
+    <%= link_to image_tag(item.avatar.url ? item.avatar.url : 'avatar.png'), 
+                organization_path(item), class: 'image' %>
+    <div class="description">
+      <p>
+        <%= link_to item.name, organization_path(item) %>
+        <% if !item.short_name.nil? && !item.short_name.blank? %>
+        (<%= link_to item.short_name, organization_path(item) %>)
+        <% end %>
+      </p>
+      <p>
+        <%= item.description %>
+      </p>
+
+      <%= render 'shared/show_admin_links', :item => item %>
+    </div>
+  </div>  
+</div>

app/views/shared/_show_person.html.erb

@@ -0,0 +1,16 @@
+<div class="span3 item">
+  <div class="picture">
+    <%= link_to image_tag(item.avatar.url ? item.avatar.url : 'avatar.png'), 
+                person_path(item), class: 'image' %>
+    <div class="description">
+      <p>
+        <%= link_to item.short_or_long_name, person_path(item) %>
+      </p>
+      <p>
+        <%= item.description %>
+      </p>
+
+      <%= render 'shared/show_admin_links', :item => item %>
+    </div>
+  </div>  
+</div>

app/views/shared/_show_photo.html.erb

@@ -1,15 +1,15 @@
-<div class="<%= photo.extra_wide? ? 'span6': 'span3' %> item">
+<div class="<%= item.extra_wide? ? 'span6': 'span3' %> item">
   <div class="picture">
-    <%= link_to image_tag(photo.file.url(photo.extra_wide ? :full : :small)), photo, class: 'image' %>
+    <%= link_to image_tag(item.file.url(item.extra_wide ? :full : :small)), item, class: 'image' %>
     <div class="description">
       <p>
-        <%= link_to photo.footer, photo %>
+        <%= link_to item.footer, item %>
       </p>
       <p>
-        &copy; <%= link_to photo.copyright, photo.source %>
+        &copy; <%= link_to item.copyright, item.source %>
       </p>
 
-      <%= render 'shared/show_admin_links', :item => photo %>
+      <%= render 'shared/show_admin_links', :item => item %>
     </div>
   </div>  
 </div>

app/views/shared/_show_post.html.erb

@@ -0,0 +1,10 @@
+<div class="span3 item">
+  <div class="picture">
+    <div class="description">
+      <p>
+        <%= link_to item.title, post_path(item) %>
+      </p>
+      <%= render 'shared/show_admin_links', :item => item %>
+    </div>
+  </div>  
+</div>