find_person.html.haml in artfully_ose-1.2.0.alpha.1

- old
+ new

@@ -1,8 +1,8 @@
 - in_section :people
 - content_for :header do
-  %h1 People
+  %h1 Merge #{@loser}
 
 .row
   .span4
     = form_tag new_merge_path, {:method => :get, :class => 'form-search'} do
       = hidden_field_tag :commit, "Search"
@@ -11,15 +11,15 @@
         %li
           = text_field_tag :search, "", :placeholder => "Email address or name", :class => "input-medium search-query"
           = submit_tag "Search", :class => 'btn'
     %p
       All notes, actions, phone numbers, and tags from 
-      %strong="#{@loser.first_name} #{@loser.last_name}"
-      will be merged into the person record you select on this screen.  
+      %strong= @loser
+      will be merged into the #{@loser.type.downcase} record you select on this screen.
     %p
       Mailing address, email, company name, and website for
-      %strong="#{@loser.first_name} #{@loser.last_name}"
+      %strong= @loser
       will be discarded.
     %p
       You'll have a chance to confirm all of this before we perform the merge.
   .span8.super-search-results
     - if @people.empty?
@@ -28,10 +28,10 @@
       %table.table.people-list
         - @people.each do |person|
           %tr
             %td=link_to "Select", new_merge_path(:loser => @loser, :winner => person.id), :class=>'btn btn-small'
             %td.name
-              = link_to "#{person.first_name} #{person.last_name}", person_url(person)
+              = link_to "#{person}", person_url(person)
               %br
               = person.email
             %td.tags
               = render :partial => 'shared/tags_uneditable', :locals => { :tag_list => person.tag_list }
 
\ No newline at end of file