artfully_ose 1.1.0 → 1.2.0.alpha.1

data/app/views/imports/events/_new.html.haml

@@ -54,7 +54,12 @@
         %td The last name of the person
       %tr 
         %td.field-slim Email
-        %td The email address of the person  
+        %td The email address of the person
+      %tr
+        %td.field-slim Company Name
+        %td
+          If this is a company record, the name of the company. Otherwise,
+          it's the name of the company that the person works for.
       
     %h3 Optional Fields
     %table.table.table-bordered.table-striped.docs
@@ -72,6 +77,7 @@
           &nbsp Show date must be in one of the following formats
           =render :partial => "imports/shared/date_format"
           You may omit the time.  If you omit the date entirely, the order will be recorded with today's date.
+    %p You can also use all of the field names in People imports.
           
   .span3
     %h2

data/app/views/imports/events/_pending.html.haml

@@ -5,7 +5,7 @@
     %p To pause this import and come back later, click "Back"
 
     .btn-group
-      = icon_link_to "Back", new_import_path(:type => import.kind), 'icon-share-alt', 'btn', ''
+      = icon_link_to "Back", new_import_path(:type => import.kind), 'fa-share', 'btn', ''
       = link_to "Delete", import_path(import), :data => {:confirm => "Are you sure you want to delete this import?"}, :method => :delete, :class => "btn btn-danger"
 
   .span9
@@ -17,19 +17,8 @@
         .span3
           = link_to "Approve", approve_import_path(import), :data => {:confirm => "Are you sure you want to approve this import?"}, :class => "btn btn-success btn-large"
     
-    -@import.events_hash.each_with_index do |(event_key, event_rows), event_index|
-      %table.table.table-bordered.table-striped.table-topper
-        %tr
-          %th{:colspan => "3", :style => 'width: 400px'}
-            =event_rows.first.event_name
-            %br
-            =event_rows.first.venue_name
-            %br
-            =l DateTime.parse(@import.eight_pm?(event_rows.first.show_date)), :format => :short
-        -event_rows.each_with_index do |row, index|
-          %tr
-            %td="#{row.first} #{row.last}"
-            %td{:style => 'width:100px'}=number_as_cents row.amount
-            %td{:style => 'width:50px'}
-              =icon_link_to("", "#row#{event_index}_#{index}", ' icon-zoom-in', '', '', {'data-toggle' => 'modal'})
-              =render :partial => "imports/shared/inspect_modal", :locals => {:row => row, :index => "#{event_index}_#{index}", :keys => ParsedRow::EVENT_FIELDS.keys }
+    %center
+      .alert.alert-info
+        Import previews are temporarily not available.  
+        %br
+        You can still apporve your import by clicking the green "Approve" button above.

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

@@ -41,6 +41,9 @@
   .span3       
     .well{:style => "text-align: center"}   
       %h3 Exports
-      %p= link_to "Export People", contacts_export_index_path, :class => "btn btn3"
-      %p= link_to "Export Donations", donations_export_index_path, :class => "btn btn3"
-      %p= link_to "Export Sales", ticket_sales_export_index_path, :class => "btn btn3"
+      =render :partial => "export_links"
+      %div{:style => 'font-weight:bold; text-align:left; font-size:.9em;'}
+        = "Need something more specific?"
+        %br
+          ="Export from"
+          =link_to("Advanced Search", new_search_path)

data/app/views/imports/people/_imported.html.haml

@@ -2,16 +2,37 @@
   .span4
     %p This import was created at: <br> #{l import.created_at}
     %p= link_to "Back to imports/exports", imports_path, :class => "btn"
+    %p= link_to "Recall this import", "#recall", :data => {:toggle => "modal"}, :class => "btn btn-danger"
 
   .span8
     .well
       %h3 This file has been imported into Artful.ly.
-      %p #{pluralize @import.rows.count, "people"} were imported.  
-    
+      %p="This import file had #{pluralize @import.rows.count, "person"}."
+
+    -unless @messages.empty?
+      %h4 Merged
+      %p These people already existed, so we merged the records for you.
+      %table.table.table-bordered.table-striped
+        %tr
+          %th{:width => 250} Email
+          %th First
+          %th Last
+          %th 
+        - @messages.each_with_index do |message, index|
+          - unless message.person.nil?
+            %tr
+              %td=message.person.email
+              %td=message.person.first_name
+              %td=message.person.last_name
+              %td=icon_link_to "", person_path(message.person), 'fa-share', '', ''
+      = will_paginate @messages, :param_name => 'messages_page'
+
     - unless @people.empty?
+      %h4 Imported
+      %p These people were imported.
       %table.table.table-bordered.table-striped
         %tr
-          %th Email
+          %th{:width => 250} Email
           %th First
           %th Last
           %th 
@@ -20,6 +41,15 @@
             %td=row.email
             %td=row.first_name
             %td=row.last_name
-            %td=icon_link_to "", person_path(row), 'icon-share-alt', '', ''
+            %td=icon_link_to "", person_path(row), 'fa-share', '', ''
             
-      = will_paginate @people
+      = will_paginate @people
+
+#recall.modal
+  .modal-header
+    .close{'data-dismiss'=>'modal'} x
+    %h3 Recall this import
+  .modal-body
+    %p Recalling deletes all the People records created by this import. If an action, order or ticket has been added to a record since it was imported, that record will be excluded from the recall.
+  .modal-footer
+    = link_to "Recall", recall_import_path(@import), :class => "btn btn-primary"

data/app/views/imports/people/_importing.html.haml

@@ -10,3 +10,11 @@
   .span8
 
     %h3 This file is being imported into Artful.ly.
+    %p This may take a little while. Thank you for your patience.
+
+
+:javascript
+
+  setTimeout(function () {
+    window.location.reload();
+  }, 5000);

data/app/views/imports/people/_new.html.haml

@@ -13,35 +13,42 @@
     %h2
       %span.badge.badge-big.badge-info 2
       Format
-    %h3 Please include one of the following
     .bottom-room= render :partial => "imports/shared/knowledge_base"
     %table.table.table-bordered.table-striped.docs
-      %tr 
-        %td.field-slim First 
-        %td The first name of the person
-      %tr 
-        %td.field-slim Last
-        %td The last name of the person
-      %tr 
+      %tr
         %td.field-slim Email
-        %td The email address of the person  
-    
+        %td="The email address of the person. People records in Artful.ly have unique email addresses, so if you're importing an email address that has already been assigned to a person, we'll merge the data for you. #{link_to "Read more", "#merging", {'data-toggle' => 'modal'}}".html_safe
+      %tr
+        %td.field-slim First Name
+        %td The first name of the person.
+      %tr 
+        %td.field-slim Last Name
+        %td The last name of the person.
+      %tr
+        %td.field-slim Company Name
+        %td
+          If this is a company record, the name of the company. Otherwise,
+          it's the name of the company that the person works for.
+
     %h3 Optional Fields
     %table.table.table-bordered.table-striped.docs
       %tr
         %td.field-slim Salutation
         %td The person's salutation (Mr., Mrs., etc...)
       %tr
-        %td.field-slim Title
-        %td The person's title
+        %td.field-slim Middle Name
+        %td The person's middle name
+      %tr
+        %td.field-slim Suffix
+        %td The person's suffix (MD, Sr, Jr, Esq...)
       %tr
-        %td.field-slim Company
-        %td The person's company name
+        %td.field-slim Title
+        %td The person's title in the company
       %tr
-        %td.field-slim Address1
+        %td.field-slim Address 1
         %td First line of the person's address
       %tr
-        %td.field-slim Address2
+        %td.field-slim Address 2
         %td Second line of the person's address
       %tr
         %td.field-slim City
@@ -57,19 +64,19 @@
         %td The person's country
       %tr
         %td.field-slim Phone 1 type
-        %td Work, Home, Cell or Fax
+        %td Work, Home, Cell, Fax, or Other
       %tr
         %td.field-slim Phone 1
         %td The person's first phone number
       %tr
         %td.field-slim Phone 2 type
-        %td Work, Home, Cell or Fax
+        %td Work, Home, Cell, Fax, or Other
       %tr
         %td.field-slim Phone 2
         %td The person's second phone number
       %tr
         %td.field-slim Phone 3 type
-        %td Work, Home, Cell or Fax
+        %td Work, Home, Cell, Fax, or Other
       %tr
         %td.field-slim Phone 3
         %td The person's third phone number
@@ -85,9 +92,21 @@
       %tr
         %td.field-slim LinkedIn 
         %td The person's web address on LinkedIn
+      %tr
+        %td.field-slim Birth month 
+        %td The person's birth month (April, Apr, or 4)
+      %tr
+        %td.field-slim Birth day 
+        %td The person's birth day
+      %tr
+        %td.field-slim Birth year 
+        %td The person's birth year
       %tr
         %td.field-slim Do Not Email 
-        %td Indicate that this person is not to receive email communication from your organization.  This is for your organization's internal use only.  The person will still receive purchase and donation receipts from Artful.ly.
+        %td Indicate that this person is not to receive email communication from your organization.  Use "true" in this column if the person should not be emailed. This is for your organization's internal use only. The person will still receive purchase and donation receipts from Artful.ly.
+      %tr
+        %td.field-slim Do Not Call 
+        %td Indicate that this person is not to receive phone communication from your organization.  Use "true" in this column if the person should not be called. This is for your organization's internal use only.
       %tr
         %td.field-slim Tags
         %td
@@ -96,7 +115,11 @@
           &nbsp Tags you'd like to associate with this person, separated by vertical bars (e.g., "vip|board").
       %tr
         %td.field-slim Type
-        %td Individual, Corporation, Foundation, Government or Other
+        %td
+          Individual, Business, Foundation, Government, Nonprofit or Other (for other kinds of companies). It must be one of those options,
+          or it will automatically be set as Individual. This field also changes what the required fields are: Individuals
+          require first name, last name, or email address, and everything else requires either a company name or
+          email address.
     
   .span3  
     %h2
@@ -118,3 +141,20 @@
           :acl => "public-read",
           :max_filesize => 50.megabytes,
           :submit_button => '<input type="hidden" value="people"/><div class="cancel-submit"><input id="import_submit" class="btn" name="commit" type="submit" value="Import"></div>'
+
+#merging.modal
+  .modal-header
+    .close{'data-dismiss'=>'modal'} x
+    %h3 Merging People
+  .modal-body
+    %p
+      If you're importing a record whose email address already exists in Artful.ly, Artful.ly will record the new information only when it does not exist already in Artful.ly. New data will not overwrite existing data.
+      %p
+      For example, consider that jim@example.com is in Artful.ly with a first name of Jim but no last name. If you import a file with jim@example.com in it, and a first name of Bill and a last name of Smith, the merged record will be:
+      %p
+        %ul
+          %li Email: jim@example.com
+          %li First: Jim
+          %li Last:  Smith
+  .modal-footer
+    %button.btn.btn-success{'data-dismiss'=>'modal'} OK

data/app/views/imports/people/_pending.html.haml

@@ -6,7 +6,7 @@
     %p To pause this import and come back later, click "Back"
 
     .btn-group
-      = icon_link_to "Back", new_import_path(:type => import.kind), 'icon-share-alt', 'btn', ''
+      = icon_link_to "Back", new_import_path(:type => import.kind), 'fa-share', 'btn', ''
       = link_to "Delete", import_path(import), :data => {:confirm => "Are you sure you want to delete this import?"}, :method => :delete, :class => "btn btn-danger"
 
   .span9
@@ -17,23 +17,29 @@
           Click "Approve" to import this data into Artful.ly
         .span3
           = link_to "Approve", approve_import_path(import), :data => {:confirm => "Are you sure you want to approve this import?"}, :class => "btn btn-success btn-large"
-    
-    %table.table.table-bordered.table-striped
-      %tr
-        %th Email
-        %th First
-        %th Last
-        %th Company
-        %th Website
-        %th 
-      - @parsed_rows.each_with_index do |row, index|
+    -if @under_limit
+      %table.table.table-bordered.table-striped
         %tr
-          %td=row.email
-          %td=row.first
-          %td=row.last
-          %td=row.company
-          %td=row.website
-          %td
-            =icon_link_to("", "#row#{index}", ' icon-zoom-in', '', '', {'data-toggle' => 'modal'})
-            =render :partial => "imports/shared/inspect_modal", :locals => {:row => row, :index => index, :keys => ParsedRow::PEOPLE_FIELDS.keys}
-    = will_paginate @parsed_rows
+          %th Email
+          %th First
+          %th Last
+          %th Company
+          %th Website
+          %th 
+        - @parsed_rows.each_with_index do |row, index|
+          %tr
+            %td=row.email
+            %td=row.first
+            %td=row.last
+            %td=row.company
+            %td=row.website
+            %td
+              =icon_link_to("", "#row#{index}", ' fa-search-plus', '', '', {'data-toggle' => 'modal'})
+              =render :partial => "imports/shared/inspect_modal", :locals => {:row => row, :index => index, :keys => ParsedRow::PEOPLE_FIELDS.merge(ParsedRow::ADDRESS_FIELDS).keys}
+      = will_paginate @parsed_rows
+    -else    
+      %center
+        .alert.alert-info
+          Import previews are temporarily not available.  
+          %br
+          You can still apporve your import by clicking the green "Approve" button above.

data/app/views/imports/people/_recalled.html.haml

@@ -0,0 +1,25 @@
+.row
+  .span4
+    %p This import was created at #{l import.created_at}, but has since been recalled.
+    %p= link_to "Back to imports/exports", imports_path, :class => "btn"
+
+  .span8
+    .well
+      %h3 This import has been recalled.
+
+    -unless @messages.empty?
+      %h4 These people had actions or orders, so we weren't able to delete them.
+      %table.table.table-bordered.table-striped
+        %tr
+          %th{:width => 250} Email
+          %th First
+          %th Last
+          %th 
+        - @messages.each_with_index do |message, index|
+          - unless message.person.nil?
+            %tr
+              %td=message.person.email
+              %td=message.person.first_name
+              %td=message.person.last_name
+              %td=icon_link_to "", person_path(message.person), 'fa-share', '', ''
+      = will_paginate @messages, :param_name => 'messages_page'

data/app/views/imports/people/_recalling.html.haml

@@ -0,0 +1,15 @@
+.row
+
+  .span4
+    %h3 Recalling Contacts
+    %p= link_to "Back to imports/exports", imports_path, :class => "btn"
+
+  .span8
+    %h3 This import is currently being recalled.
+    %p This may take a little while. Thank you for your patience.
+
+:javascript
+
+  setTimeout(function () {
+    window.location.reload();
+  }, 5000);

data/app/views/imports/shared/_knowledge_base.haml

@@ -1,2 +1,11 @@
-Your CSV file must include all of the following required fields and use only the valid data options described below.  For more help with importing please consult the 
-=link_to "Knowledge Base", "https://artfully.zendesk.com/entries/22368622-importing-and-exporting-data"
+%p
+  Your CSV file must use only the valid data options described below. The required fields change
+  depending on the type of the record. People must include at least a first name, last
+  name, and/or email address. Companies (like foundations or nonprofits) must include either a
+  company name or an email address.
+
+%p The order of the CSV columns does not matter.
+
+%p
+  For more help with importing, please consult the
+  = link_to "Knowledge Base", "https://artfully.zendesk.com/entries/22368622-importing-and-exporting-data"

data/app/views/imports/shared/_sidebar.html.haml

@@ -1,5 +1,5 @@
 %p This import was created at: <br> #{l import.created_at_local_to_organization}
 
 .btn-group
-  = icon_link_to "Back", new_import_path(:type => import.kind), 'icon-share-alt', 'btn', ''
+  = icon_link_to "Back", new_import_path(:type => import.kind), 'fa-share', 'btn', ''
   = link_to "Delete", import_path(import), :data => {:confirm => "Are you sure you want to delete this import?"}, :method => :delete, :class => "btn btn-danger"

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

@@ -0,0 +1,7 @@
+%li.row-fluid
+  .span1
+    = image_tag "actions/#{action.action_type.downcase}.png"
+  .span11.recent-activity-text
+    =link_to_person (action.person)
+    =action.sentence
+    .recent-action-time.muted="#{time_ago_sentence(action.occurred_at)}"

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

@@ -0,0 +1,11 @@
+.span7
+  %section.recent-actions
+    %h3 Recent Activity
+    - if @recent_actions.blank?
+      %p= t(".no-actions", :default => "When someone buys a ticket, makes a donation, or updates a record, it will be noted here. Get started by adding some new contacts to your People database.")
+      = link_to "Add a Contact", new_person_path, :class => 'btn'
+    - else
+      %ul#recent-list
+        - @recent_actions.each do |action|
+          =render :partial => 'action', :locals => {:action => action}
+      = will_paginate @recent_actions, :id => 'endless-scroll-pagination', :params => { :action => 'recent_activity' }

data/app/views/index/_recent_activity.js.haml

@@ -0,0 +1,5 @@
+$('#recent-list').append("#{j render(:partial => 'action', :collection => @recent_actions)}");
+- if @recent_actions.next_page
+  $('#endless-scroll-pagination').replaceWith("#{j will_paginate(@recent_actions, :id => 'endless-scroll-pagination', :params => { :action => 'recent_activity' })}");
+- else
+  $('#endless-scroll-pagination').remove();

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

@@ -1,46 +1,50 @@
 - in_section :dashboard
 
-- content_for :header do
-  %h1 Dashboard
-
 = render :partial => 'layouts/admin_messages'
 
 .row
   .span4
-    %section
-      %h3 My Organization
-      %p
-        - if current_user.is_in_organization?
-          =link_to current_user.current_organization.name, organization_path(current_user.current_organization)
-        - else
-          You are not in an organization yet.  Ask your organization administrator to add you, or
-          =link_to "create your own.", new_organization_path
+    .well
+      .row-fluid
+        .span4
+          = gravatar_image_tag(current_user.email, :alt => 'User icon', :class => 'dashboard-grav', :gravatar => { :size => 64 })
+        .span8
+          - if current_user.is_in_organization?          
+            .email
+              %b= "#{truncate(current_user.email, :length => 28, :separator => ' ', :omission => '...')}"
 
-    %section
-      %h3 Recent Activity
-      - if @recent_actions.blank?
-        %p= t(".no-actions", :default => "When someone buys a ticket, makes a donation, or updates a record, it will be noted here. Get started by adding some new contacts to your People database.")
-        = link_to "Add a Contact", new_person_path, :class => 'btn'
-      - else
-        %ul#recent-list
-          - @recent_actions.each do |action|
-            %li.row-fluid
-              .span2
-                = image_tag "actions/#{action.action_type.downcase}.png"
-              .span10
-                =link_to_person (action.person)
-                =action.sentence
-                .muted="#{time_ago_in_words(action.occurred_at)} ago"
+            .link= link_to "Account Administration", organization_path(current_user.current_organization)
+            .link= link_to "Sign Out", destroy_user_session_path
+          - else
+            You are not in an organization yet.  Ask your organization administrator to add you, or
+            =link_to "create your own.", new_organization_path
 
-  .span8
-    %section
+    %h3 Events
+    - unless @events.blank?
+      %ul#event-list.row-fluid
+        - @events.each do |event|
+          %li.row-fluid.event-list-item{:style => "margin-left: 0px; margin-right:10px'"}
+            .span12
+              .row-fluid
+                .span4.event-icon-container
+                  = render :partial => 'shared/event_image_icon', :locals => { :event => event }
+                .span8
+                  %h4.event-link= link_to event.name, event_path(event), :title => 'event-name'
+                  %ul.mini-stats
+                    %li= "#{pluralize event.sold, 'ticket'} sold"
+                    %li= "#{pluralize event.on_sale, 'ticket'} on sale"
+                    %li= "#{number_as_cents(event.sales_total)} total sales"
 
-      -if @ticket_offers
-        = render :partial => "ticket_offers/list", :locals => { :ticket_offers => @ticket_offers }
+    -if @events.blank?
+      .no-image#add-a-description
+        #text
+          =link_to 'Create a new event', new_event_path
+          %p
+            Creating an event is the first step toward scheduling shows and selling tickets. 
+    -else
+      = link_to "Create Event", new_event_path, :class => "btn btn-primary"
+      %span.pull-right
+        =icon_link_to("View All Events", events_path, 'fa-arrow-right', 'btn', '')
 
-      %h3 Events
-      = render :partial => 'events/list', :locals => { :events => @events }
-      = link_to "Create New Event", new_event_path, :class => "btn btn-primary"
-      .pull-right
-        - unless @events.blank?
-          =icon_link_to("View All Events", events_path, 'icon-arrow-right', 'btn', '')
+  .span8
+    =render :partial => 'recent_activity'