app/views/people/_header.html.haml in artfully_ose-1.2.0 vs app/views/people/_header.html.haml in artfully_ose-1.3.0.pre1

- old
+ new

@@ -1,39 +1,34 @@ +- content_for :custom_js do + = javascript_include_tag "relationships" + = javascript_include_tag "baseball_card" .row .span12 - .person-header + .person-header.clearfix .span2 .person-avatar.row = person_avatar_with_fallback(@person, 150) .person-values-and-tags - %ul.person-values - %li#ticket-value - %h3= number_as_cents(@person.lifetime_ticket_value) - %h6= pluralize(@person.tickets.length, 'tickets') - %li#donation-value - %h3= number_as_cents(@person.lifetime_donations) - %h6= pluralize(Item.donations_by(@person).count, 'donation') - - with_kit(:membership) do - %li#membership-value - %h3=number_as_cents(@person.lifetime_memberships) - %h6=pluralize(@person.memberships.size, 'membership') - %li#lifetime-value - %h3= number_as_cents(@person.lifetime_value) - %h6 lifetime + =render :partial => "shared/baseball_card", :locals => { :people => [@person] } %ul.detailed-list.tags#badges -unless @person.member.nil? %li.tag.rounder.tag-member= link_to "Member", person_memberships_path(@person), :style => "color:white" -if @person.any_current_passes? %li.tag.rounder.tag-passholder= link_to "Passholder", person_passes_path(@person), :style => "color:white" + - if @person.outstanding_pledges.any? + %li.tag.rounder.tag-pledges= link_to "Pledge", person_pledges_path(@person), :style => "color:white" + .person-tags = render :partial=>'shared/tags', :locals => { :tags => @person.tag_list, :subject => @person } %h1 #{@person} + - if @person.nickname.present? + %h6.person-and-nickname= 'aka "' + @person.nickname + '"' - unless @person.kind_of? Company %h6.company-and-title= [@person.title, @person.company_name].select {|s| s.present? }.join(', ') %ul.person-links -if @person.email.present? @@ -43,8 +38,8 @@ -if @person.twitter_handle.present? %li= link_to @person.twitter_handle, full_url(@person.twitter_handle, 'http://twitter.com/'), :class => 'twitter' -if @person.facebook_url.present? %li= link_to @person.facebook_url, full_url(@person.facebook_url, 'http://facebook.com/'), :class => 'facebook' -if @person.linked_in_url.present? - %li= link_to @person.linked_in_url, full_url(@person.linked_in_url, 'http://linkedin.com/in/'), :class => 'linked-in' + %li= link_to @person.linked_in_url, full_url(@person.linked_in_url, 'http://linkedin.com/'), :class => 'linked-in' -unless @person.member.blank? %li= link_to @person.member.member_number, person_memberships_path(@person), :class => 'member-number'