artfully_ose 1.1.0 → 1.2.0.alpha.1

data/app/views/people/_convert_to_company_modal.html.haml

@@ -0,0 +1,42 @@
+#convert-to-company.modal
+  = form_for(@person, :html => {:class => 'form-horizontal'}) do |form|
+    = form.hidden_field :type, value: "Company"
+    .modal-header
+      = link_to '×'.html_safe, '#', :class => 'close', 'data-dismiss' => 'modal'
+      %h3 Convert #{@person} Into a Company
+    .modal-body
+      %p
+        This will convert an individual's record into a company record.
+        %strong You cannot reverse this change.
+
+      %fieldset
+        = form.hidden_field :subtype, value: "{{data.subtype}}"
+        = form.label :subtype, "Company Type"
+        .btn-group
+          %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Business'}", "ng-click" => "data.subtype = 'Business'"} Business
+          %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Foundation'}", "ng-click" => "data.subtype = 'Foundation'"} Foundation
+          %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Government'}", "ng-click" => "data.subtype = 'Government'"} Government
+          %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Nonprofit'}", "ng-click" => "data.subtype = 'Nonprofit'"} Nonprofit
+          %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Other'}", "ng-click" => "data.subtype = 'Other'"} Other
+        = form.label :company_name, "Company Name"
+        = form.text_field :company_name, "ng-model" => "data.company_name", "ng-init" => "data.company_name = '#{@person.company_name}'"
+    .modal-footer
+      = form.submit 'Convert', :class => 'btn btn-primary save-person', "ng-disabled" => "!data.subtype || !data.company_name"
+      = link_to 'Cancel', '#', :class => 'btn', 'data-dismiss' => 'modal'
+
+
+- content_for :custom_js do
+  // change modal based on tab
+  :javascript
+    $(document).ready(function() {
+      $('.tab-merge a, .tab-delete a').click(function (e) {
+        e.preventDefault();
+        $(this).tab('show');
+        $('#edit-person .save-person').hide();
+      })
+      $('.tab a').click(function (e) {
+        e.preventDefault();
+        $(this).tab('show');
+        $('#edit-person .save-person').show();
+      })
+    });

data/app/views/people/_edit_modal.html.haml

@@ -0,0 +1,186 @@
+-# This modal is used in both person editing and member editing
+
+- except    ||= {}
+- return_to ||= nil
+- url       ||= person_path(@person)
+#edit-person.modal
+  .modal-header
+    = link_to '×'.html_safe, '#', :class => 'close', 'data-dismiss' => 'modal'
+    %h3=header
+  = form_for(@person, :url => url, :html => {:class => 'form-horizontal'}) do |form|
+    =hidden_field_tag :return_to, return_to unless return_to.blank?
+    .modal-body
+      .row
+        .span2
+          %ul.nav.nav-accordion
+            %li.active.tab= link_to 'Basics', '#basics', 'data-toggle' => 'tab' unless except.include? :basics
+            %li.tab= link_to 'Address', '#address', 'data-toggle' => 'tab' unless except.include? :address
+            %li.tab= link_to 'Phone', '#phone', 'data-toggle' => 'tab' unless except.include? :phone
+            %li.tab= link_to 'Social Media', '#social-media', 'data-toggle' => 'tab' unless except.include? :social
+            -with_kit(:relationships) do
+              %li.tab-relationships= link_to 'Relationships', '#relationships' unless except.include? :relationships
+            -with_kit(:relationships) do
+              - if @person.individual?
+                %li.tab-households= link_to 'Households', '#households' unless except.include? :households
+        .span7
+          .tab-content
+            - unless except.include? :basics
+              #basics.tab-pane.active
+                - if @person.company?
+                  .controls
+                    = form.hidden_field :subtype, value: "{{data.subtype}}", "ng-init" => "data.subtype = '#{@person.subtype}'"
+                    .control.btn-group
+                      %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Business'}", "ng-click" => "data.subtype = 'Business'"} Business
+                      %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Foundation'}", "ng-click" => "data.subtype = 'Foundation'"} Foundation
+                      %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Government'}", "ng-click" => "data.subtype = 'Government'"} Government
+                      %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Nonprofit'}", "ng-click" => "data.subtype = 'Nonprofit'"} Nonprofit
+                      %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Other'}", "ng-click" => "data.subtype = 'Other'"} Other
+                - if @person.individual?
+                  .controls
+                    = form.label :salutation, :class => 'control-label'
+                    .control= form.text_field :salutation
+                  .controls
+                    = form.label :first_name, "First Name", :class => 'control-label'
+                    .control= form.text_field :first_name
+                  .controls
+                    = form.label :middle_name, "Middle Name", :class => 'control-label'
+                    .control= form.text_field :middle_name
+                  .controls
+                    = form.label :last_name, "Last Name", :class => 'control-label'
+                    .control= form.text_field :last_name
+                  .controls
+                    = form.label :suffix, :class => 'control-label'
+                    .control= form.text_field :suffix
+                  .controls
+                    = form.label :title, :class => 'control-label'
+                    .control= form.text_field :title
+                .controls
+                  = form.label :company_name, "Company Name", :class => 'control-label'
+                  .control= form.text_field :company_name
+                .controls
+                  = form.label :email, :class => 'control-label'
+                  .control= form.text_field :email
+                .controls.control-label Birthday
+                .year{:data => { 'person-birth_year' => @person.birth_year }}
+                .day{:data => { 'person-birth_day' => @person.birth_day }}
+                  .control
+                    = form.select :birth_month, [["January", 1], ["February", 2], ["March", 3], ["April", 4], ["May", 5], ["June", 6], ["July", 7], ["August", 8], ["September", 9], ["October", 10], ["November", 11], ["December", 12]], { :include_blank => true }, { :class => 'span2', :id => 'birth_month' }
+                    = form.select :birth_day, [], { :include_blank => true }, { :class => 'span1', :id => 'birth_day' }
+                    = form.select :birth_year, [], { :include_blank => true }, { :class => 'span1', :id => 'birth_year' }
+                - if @person.individual? && @person.member.nil?
+                  .controls
+                    - unless except.include? :convert
+                      = link_to "Convert to Company", '#convert-to-company', 'data-toggle' => 'modal'
+
+            - unless except.include? :address
+              #address.tab-pane
+                = form.fields_for :address do |address_form|
+                  .controls
+                    = address_form.label :address, :class => 'control-label'
+                    .control
+                      = address_form.text_field :address1
+                  .controls
+                    %label{:class => 'control-label'}
+                    .control
+                      = address_form.text_field :address2
+                  .controls
+                    = address_form.label :country, :class => 'control-label'
+                    .control
+                      = address_form.select :country, [@person.address.country], :selected => @person.address.country
+                  .controls
+                    = address_form.label :state, "State / Province", :class => 'control-label'
+                    .control
+                      = address_form.select :state, [@person.address.state], :selected => @person.address.state, :class => "region"
+                  .controls
+                    = address_form.label :city, :class => 'control-label'
+                    .control
+                      = address_form.text_field :city
+                  .controls
+                    = address_form.label :zip, "Zip / Postal Code", :class => 'control-label'
+                    .control
+                      = address_form.text_field :zip
+
+            - unless except.include? :phone
+              #phone.tab-pane
+                - @person.phones.build if @person.phones.empty?
+                = form.fields_for :phones do |phone_form|
+                  = render "people/phone_fields", :f => phone_form
+
+                .control-group
+                  %label.control-label
+                  .controls
+                    %i.fa.fa-plus-circle.icon-gray
+                    = link_to_add_fields 'Add another number', form, :phones, "people"
+
+            - unless except.include? :social
+              #social-media.tab-pane
+                .controls
+                  = form.label :website, :class => 'control-label'
+                  .control
+                    .input-prepend
+                      %span.add-on http://
+                      = form.text_field :website
+                .controls
+                  = form.label :twitter_handle, 'Twitter', :class => 'control-label'
+                  .control
+                    .input-prepend
+                      %span.add-on @
+                      = form.text_field :twitter_handle
+                .controls
+                  = form.label :facebook_url, 'Facebook', :class => 'control-label'
+                  .control
+                    .input-prepend
+                      %span.add-on http://facebook.com/
+                      = form.text_field :facebook_url
+                .controls
+                  = form.label :linked_in_url, 'LinkedIn', :class => 'control-label'
+                  .control
+                    .input-prepend
+                      %span.add-on http://linkedin.com/in/
+                      = form.text_field :linked_in_url
+
+            - unless except.include? :relationships
+              #relationships.tab-pane
+                - @person.relationships.build
+                = form.fields_for :relationships do |relationship_form|
+                  = render "relationship_fields", :f => relationship_form
+
+                .control-group
+                  %label.control-label
+                  .controls
+                    %i.fa.fa-plus-cirlce.icon-gray
+                    = link_to_add_fields 'Add another relationship', form, :relationships
+
+            - unless except.include? :households
+              - if @person.individual?
+                #households.tab-pane
+                  - if @person.household
+                    %p
+                      == #{@person} is a member of the #{link_to @person.household.name, @person.household} household
+                  - else
+                    %p
+                      = link_to "Add to new household", new_household_url(:individuals => [@person.id]), :class => "btn"
+
+    .modal-footer
+      = form.submit 'Save', :class => 'btn btn-primary save-person'
+      = link_to 'Cancel', '#', :class => 'btn', 'data-dismiss' => 'modal'
+
+
+- content_for :custom_js do
+  // change modal based on tab
+  :javascript
+    $(document).ready(function() {
+      $('.tab-relationships a').click(function (e) {
+        e.preventDefault();
+        $(this).tab('show');
+      })
+      $('.tab-households a').click(function (e) {
+        e.preventDefault();
+        $(this).tab('show');
+      })
+      $('.tab a').click(function (e) {
+        e.preventDefault();
+        $(this).tab('show');
+        $('#edit-person .save-person').show();
+      })
+    });

data/app/views/people/_form.html.haml

@@ -1,14 +1,32 @@
 = form_for (person) do |form|
   %ul
     %li
-      =form.label :first_name, "First Name"
-      =form.text_field :first_name
-    %li
+      = form.hidden_field :type, value: "{{data.type}}"
+      .btn-group
+        %button{:type => "button", :class => "btn btn-large", "ng-class" => "{active: data.type == 'Individual'}", "ng-click" => "data.type = 'Individual'"} Person
+        %button{:type => "button", :class => "btn btn-large", "ng-class" => "{active: data.type == 'Company'}", "ng-click" => "data.type = 'Company'"} Company
+    %li{"ng-show" => "data.type == 'Company'", :class => "ng-cloak"}
+      = form.hidden_field :subtype, value: "{{final_subtype()}}"
+      %label Company Type
+      .btn-group
+        %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Business'}", "ng-click" => "data.subtype = 'Business'"} Business
+        %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Foundation'}", "ng-click" => "data.subtype = 'Foundation'"} Foundation
+        %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Government'}", "ng-click" => "data.subtype = 'Government'"} Government
+        %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Nonprofit'}", "ng-click" => "data.subtype = 'Nonprofit'"} Nonprofit
+        %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Other'}", "ng-click" => "data.subtype = 'Other'"} Other
+    %li{"ng-show" => "data.type == 'Company'", :class => "ng-cloak"}
+      = form.label :company_name, "Company Name"
+      = form.text_field :company_name
+    %li{"ng-show" => "data.type == 'Individual'"}
+      = form.label :first_name, "First Name"
+      = form.text_field :first_name
+    %li{"ng-show" => "data.type == 'Individual'"}
       = form.label :last_name, "Last Name"
       = form.text_field :last_name
     %li
-      = form.label :email, "Email"
-      = form.text_field :email
+      = form.label :email, "Contact Email", "ng-show" => "data.type == 'Company'"
+      = form.label :email, "Email", "ng-show" => "data.type == 'Individual'"
+      = form.email_field :email
     - unless person.new_record?
       %li
         = form.label :title, "Title"

data/app/views/people/_header.html.haml

@@ -0,0 +1,50 @@
+.row
+  .span12
+    .person-header
+      .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
+
+        %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"
+
+        .person-tags
+          = render :partial=>'shared/tags', :locals => { :tags => @person.tag_list, :subject => @person }
+
+
+      %h1 #{@person}
+      - 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?
+          %li= mail_to @person.email, @person.email, :class => 'email'
+        -if @person.website.present?
+          %li= link_to @person.website, full_url(@person.website), :target => :blank, :class => 'website' 
+        -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'
+        -unless @person.member.blank?
+          %li= link_to @person.member.member_number, person_memberships_path(@person), :class => 'member-number'

data/app/views/people/_household_fields.html.haml

@@ -0,0 +1,5 @@
+.fields.relationship-fields
+  .control-group
+    .controls
+      = form_for(:household) do |f|
+        = link_to "Add to new household", new_household_url, :class => "btn new-household-lnk"

data/app/views/people/_phone_fields.html.haml

@@ -0,0 +1,10 @@
+.fields.phone-fields
+  .control-group
+    = f.label :number, 'Number', :class => 'control-label'
+    .controls
+      = f.select :kind, options_for_select(Phone.kinds), {}, {:class => 'input-small'}
+      = f.text_field :number, :placeholder => "555-123-1234", :class => 'input-medium'
+      %span.remove-fields-link
+        = f.hidden_field :_destroy
+        %i.fa.fa-minus-circle.icon-gray
+        = link_to_remove_fields "remove", f

data/app/views/people/_relationship_fields.html.haml

@@ -0,0 +1,14 @@
+.fields.relationship-fields
+  .control-group
+    = label_tag nil, @person, :class => 'control-label', :style => 'width: 120px;'
+    .controls
+      = f.select :relation_id, options_from_collection_for_select(Relation.for_type(@person.type).order(:description).uniq(:description), :id, :description, f.object.relation_id), {}, {:class => 'input-medium',:readonly => (!f.object.nil? && f.object.persisted?)}
+      - if !f.object.nil? && f.object.persisted?
+        = text_field_tag :other, f.object.other, :class => 'input-medium other-input', :readonly => true
+      - else
+        = text_field_tag "", "", :placeholder => "Individual or Company", :class => 'input-medium other-input'
+      = f.hidden_field(:other_id, :class => 'other-id')
+      %span.remove-fields-link
+        = f.hidden_field :_destroy
+        %i.fa.fa-minus-circle.icon-gray
+        = link_to_remove_fields "remove", f

data/app/views/people/_work_with_menu.html.haml

@@ -0,0 +1,39 @@
+.dropdown
+  =icon_link_to('Work with...', "#menu#bulkactions", 'fa-asterisk', 'dropdown-toggle dropdown btn', '')
+
+  %ul.dropdown-menu
+    %li= link_to "Edit #{@person.possessive} Info", '#edit-person', 'data-toggle' => 'modal', :id => "edit_link"
+    -with_kit (:membership) do
+      -if person.email.blank? || person.company?
+        %li= link_to "Comp Membership", "#comp-membership", 'data-toggle' => 'modal'
+      -else
+        %li= link_to "Comp Membership", new_person_membership_comp_path(person)
+      
+      -unless @person.member.nil?
+        %li= link_to "View Memberships", person_memberships_path(@person)
+
+    -with_kit(:passes) do
+      -unless @person.passes.empty?
+        %li= link_to "View Passes", person_passes_path(@person)
+
+    %li= link_to "Merge", new_merge_path(:loser => person.id)
+
+    - if @person.destroyable?
+      %li= link_to "Delete", @person, :method => :delete, :confirm => "Are you sure you want to delete #{@person}?"
+
+    %li= link_to "Sell To", new_console_sale_path(:person_id => person.id)
+
+-if person.email.blank? || person.company?
+  -with_kit (:membership) do
+    #comp-membership.modal
+      .modal-header
+        .close{'data-dismiss'=>'modal'} x
+        %h3 Comp Membership
+      .modal-body
+        -if person.email.blank?
+          Sorry! We can't comp memberships to patrons who don't have an email.
+        -elsif person.company?
+          Sorry! We can't comp memberships to companies or institutions.
+      .modal-footer
+        = button_tag "Close", :class => "btn", 'data-dismiss' => 'modal'
+

data/app/views/people/index.html.haml

@@ -6,19 +6,31 @@
 
 .row
   .span4
-    = form_tag people_path, {:method => :get, :remote => true, :class => 'super-search form-search'} do
+    = form_tag people_path, {:method => :get, :class => 'super-search form-search'} do
       = hidden_field_tag :commit, "Search"
       %ul
         %li
-          = text_field_tag :search, "", :placeholder => "Email, name, or tag...", :class => "input-medium search-query"
+          = text_field_tag :search, params[:search], :placeholder => "Email, name, or tag...", :class => "input-medium search-query"
       .control
         = submit_tag "Search", :class => 'btn'
         = link_to "Advanced Search", new_search_path
   .span8.super-search-results
+
     - if @people.empty?
        
-    -else
+    -else    
+      - if @show_advanced_search_message 
+        .well
+          .row-fluid
+            .span2
+              .center
+                =icon_tag '06-magnify@2x'
+            .span10
+              %strong
+                Looks like you've got a lot of results here so we only returned the top 40. 
+                %br
+                Try 
+                =link_to "Advanced Search", new_search_path 
+                for more refined searching and results.
       = render :partial => 'list', :locals => { :people => @people } unless @people.empty?
-      = will_paginate @people, :inner_window => 2, :outer_window => 0
-
-
+      = will_paginate @people, :inner_window => 2, :outer_window => 0

data/app/views/people/new.html.haml

@@ -4,7 +4,7 @@
 - content_for :header do
   %h1 Create a New Contact
 
-.row
+.row{"ng-controller" => "NewPersonCtrl"}
   .span6.offset3
     = render :partial => "shared/error_messages", :locals => { :target => @person }
-    = render :partial => 'form', :locals => { :person => @person }
+    = render :partial => 'form', :locals => { :person => @person }

data/app/views/people/show.html.haml

@@ -1,37 +1,158 @@
+- content_for :custom_js do
+  = javascript_include_tag "relationships"
 - in_section :people
 - content_for :title do
   #{@person}
 
+=render "header"
+
 .row
   .span4
-    = render :partial=>'person_summary_sidebar', :locals => { :person => @person }
+
+    -unless @person.dummy?
+      %p= render :partial => 'work_with_menu', :locals => {:person => @person}
+      = render @person.address unless @person.address.new_record?
+
+      %ul
+        - @person.phones.each do |phone|
+          %li
+            %span.muted= phone.kind
+            = phone.number
+
+      -with_kit(:relationships) do
+        %section
+          - if @person.household.present?
+            %h5
+              == Household (#{link_to "view", @person.household})
+            %ul
+              - @person.household.individuals.where('id != ?', @person.id).each do |individual|
+                %li
+                  %span.starable-spacer
+                    ✭
+                  %span.muted
+                  = link_to(individual, polymorphic_url(individual))
+
+          %h5 Relationships
+          - struct = relationships_struct(@person)
+          %ul
+            - struct[:starred].each do |relationship|
+              %li
+                %span.starred.starable{"data-person-id" => relationship.person.id, "data-type" => 'relationship', "data-action-id" => relationship.id, :class => (relationship.starred? ? "active" : "not-active") }
+                  ✭
+                %span.muted= relationship.relation.description.humanize
+                = link_to(relationship.other(@person), polymorphic_url(relationship.other(@person)))
+
+            - @person.relationships.unstarred.where(:relation_id => struct[:single]).each do |relationship|
+              %li
+                %span.starred.starable{"data-person-id" => relationship.person.id, "data-type" => 'relationship', "data-action-id" => relationship.id, :class => (relationship.starred? ? "active" : "not-active") }
+                  ✭
+                %span.muted= relationship.relation.description.humanize
+                = link_to(relationship.other(@person), polymorphic_url(relationship.other(@person)))
+            - struct[:grouped].each do |group|
+              %li
+                %span.starable-spacer
+                  ✭
+                %span.muted
+                  == #{Relation.find(group[:relation]).description.titleize.pluralize} (#{group[:count]}) #{link_to("View All", polymorphic_url([@person, :relationships], :relation_id => group[:relation]))} >
+
+      %h5 Preferences
+      %section#communication-preference
+        = form_for @person do |form|
+          .do-not-call
+            = form.label :do_not_call, :class => "checkbox" do
+              = form.check_box :do_not_call
+              %span Do Not Call
+          .do-not-email
+            = form.label :do_not_email, :class => "checkbox" do
+              = form.check_box :do_not_email
+              %span Do Not Email
+          = form.submit "Save", :class => 'btn btn-primary hidden'
+
+      %h5 Email Lists
+      %section#subscription-listing
+        = form_for @person do |form|
+          - if @person.organization.kits.mailchimp
+            .mailchimp-list
+              - mailchimp_kit = @person.organization.kits.mailchimp
+              = hidden_field_tag "person[subscribed_lists][]", nil, :id => "person_subscribed_lists_empty"
+              - mailchimp_kit.attached_lists.each do |list|
+                = label_tag "", :class => "checkbox" do
+                  = check_box_tag "person[subscribed_lists][]", list[:list_id], @person.subscribed_lists.include?(list[:list_id]), :class => "mail-chimp-list", :disabled => @person.do_not_email
+                  %span= list[:list_name]
+          = form.submit "Save", :class => 'btn btn-primary hidden'
 
   .span8
-    %section#actions
-      .row-fluid.form-actions
-        .span2
-          %h3 Actions
-        .span10
-          =icon_link_to("Hear", new_person_action_path(@person, :format => :html, :type => :hear), 'icon-volume-up', 'btn', 'hear-action-link', {"data-remote" => "true"})
-          =icon_link_to("Give", new_contribution_path("contribution[person_id]" => @person.id), 'icon-gift', 'btn', '')
-      = render :partial => 'actions/list', :locals => { :person => @person, :actions => (@person.starred_actions + @person.unstarred_actions ) }
-
-    %section#notes
-      .row-fluid.form-actions
-        .span2
-          %h3 Notes
-        .span10=icon_link_to("Add", new_person_note_path(@person, :format => :html), 'icon-plus-sign', 'btn new-note-link', '', {"data-remote" => "true"})
-
-    = render :partial=>'notes/list', :locals => { :person => @person, :notes => @person.notes, :subject => @person }
-    
-
-    %section#orders
-      .row-fluid.form-actions
-        .span2
-          %h3 Sales
-
-    = render :partial=>'orders/by_person', :locals => { :orders => @orders }
-
-    #hear-action-modal.modal
-    #new-note-popup.modal
+    #notes
+    .row-fluid
+      .span3
+        %h3 Notes
+      .span9
+        = icon_link_to("Add", new_person_note_path(@person, :format => :html), 'fa-plus-circle', 'btn new-note-link', '')
+    .person-inline-form.new-note-form{:style => 'display:none;'}
+      = form_for [@person, Note.new] do |form|
+        = form.text_area :text, :size => "125x5", :class => 'input-xxlarge', :placeholder => "This is a good place for little nuggets about #{@person} you don't want to forget..."
+        = form.submit "Save", :class => "btn btn-primary"
+        = link_to 'Cancel', '#', :onclick => "$('.new-note-form').hide()", :class => 'btn'
+
+    %table.table-condensed.table#notes-list
+      %tbody
+        - if @notes.empty?
+          %tr
+            %td
+              No notes for this
+              = @person.individual? ? "individual." : "record."
+        - else
+          = render @notes[0..2]
+        - if @notes[3]
+          %tr#more-notes-link
+            %td.triangle ▸
+            %td= link_to pluralize(@notes.length-3, 'more note'), "#"
+          %tbody#more-notes{:style => 'display:none'}
+            = render @notes[3..-1]
+
+    #actions
+      .row-fluid
+        .span3
+          %h3 Action Feed
+        .span9
+          = icon_link_to("Add", new_person_action_path(@person, :format => :html, :type => :hear), 'fa-plus-circle', 'btn new-action-link', '')
+
+      .person-inline-form.action-form.new-action-form{:style => 'display:none;'}
+        = render :partial => 'actions/inline', :locals => {:target => @person, :action => @new_action}
+
+      %table.table-condensed.sortedstar.table#action-list
+        %thead
+          %tr
+            %th
+            %th{:style => 'width:60px;'} Date
+            %th{:style => 'width:25px'}
+            %th #{@person}...
+        %tbody
+          - if @actions.empty?
+            %tr
+              %td
+              %td
+              %td
+              %td
+                No actions for this
+                = @person.individual? ? "individual." : "record."
+          - else
+            = render :partial => 'actions/action', :collection => @actions
+
+      = will_paginate @actions, :id => 'endless-scroll-pagination'
+
+%div{"ng-controller" => "EditPersonCtrl"}
+  = render 'edit_modal', :header => "Edit #{@person.possessive} Info"
+  = render 'convert_to_company_modal'
+  #edit-order-popup.modal
 
+- if current_user.current_organization.kits.mailchimp
+  .modal#subscribe-modal(role="dialog")
+    .modal-header
+      %button(type="button" class="close" data-dismiss="modal" aria-hidden="true") ×
+      %h3 MailChimp List Subscription
+    .modal-body
+      %p #{@person} will receive an email from MailChimp confirming their addition to this list
+    .modal-footer
+      %button(class="btn" data-dismiss="modal" aria-hidden="true") Cancel
+      %button(class="btn btn-primary") OK