artfully_ose 1.0.0.rc4 → 1.1.0.rc1

data/app/views/imports/{_approved.html.haml → people/_approved.html.haml}

@@ -3,7 +3,6 @@
     %h3 Pending Contacts
 
     %p This import was created at: <br> #{l import.created_at}
-    %p #{pluralize @import.rows.count, "contact"} found in this import file
 
     %p= link_to "Back to imports/exports", imports_path, :class => "btn"
 

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

@@ -0,0 +1,5 @@
+.row
+  .span4
+    =render :partial => 'imports/shared/sidebar', :locals => {:import => import}
+  .span8
+    =render :partial => 'imports/shared/failed', :locals => {:import => import}

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

@@ -0,0 +1,25 @@
+.row
+  .span4
+    %p This import was created at: <br> #{l import.created_at}
+    %p= link_to "Back to imports/exports", imports_path, :class => "btn"
+
+  .span8
+    .well
+      %h3 This file has been imported into Artful.ly.
+      %p #{pluralize @import.rows.count, "people"} were imported.  
+    
+    - unless @people.empty?
+      %table.table.table-bordered.table-striped
+        %tr
+          %th Email
+          %th First
+          %th Last
+          %th 
+        - @people.each_with_index do |row, index|
+          %tr
+            %td=row.email
+            %td=row.first_name
+            %td=row.last_name
+            %td=icon_link_to "", person_path(row), 'icon-share-alt', '', ''
+            
+      = will_paginate @people

data/app/views/imports/{_importing.html.haml → people/_importing.html.haml}

@@ -4,10 +4,9 @@
     %h3 Importing Contacts
 
     %p This import was created at #{@import.created_at}
-    %p #{pluralize @import.rows.count, "contact"} found in this import file
 
     %p= link_to "Back to imports/exports", imports_path, :class => "btn"
 
   .span8
 
-    %h3 This file is currently being imported into Artful.ly.
+    %h3 This file is being imported into Artful.ly.

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

@@ -0,0 +1,5 @@
+.row
+  .span4
+    =render :partial => 'imports/shared/sidebar', :locals => {:import => import}
+  .span8
+    =render :partial => 'imports/shared/invalid', :locals => {:import => import}

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

@@ -0,0 +1,120 @@
+- in_section :imports
+- content_for :header do
+  %h1 Import People
+
+.row
+  .span3
+    %h2
+      %span.badge.badge-big.badge-info 1
+      Template
+    #{link_to 'Download an empty CSV file', template_imports_path(:type => "people")} with these headers already filled in.
+  
+  .span6
+    %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 
+        %td.field-slim Email
+        %td The email address of the person  
+    
+    %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
+      %tr
+        %td.field-slim Company
+        %td The person's company name
+      %tr
+        %td.field-slim Address1
+        %td First line of the person's address
+      %tr
+        %td.field-slim Address2
+        %td Second line of the person's address
+      %tr
+        %td.field-slim City
+        %td The person's city
+      %tr
+        %td.field-slim State
+        %td The person's state
+      %tr
+        %td.field-slim Zip
+        %td The person's zip code
+      %tr
+        %td.field-slim Country
+        %td The person's country
+      %tr
+        %td.field-slim Phone 1 type
+        %td Work, Home, Cell or Fax
+      %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
+      %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
+      %tr
+        %td.field-slim Phone 3
+        %td The person's third phone number
+      %tr
+        %td.field-slim Website
+        %td The person's website
+      %tr
+        %td.field-slim Twitter
+        %td The person's handle on Twitter
+      %tr
+        %td.field-slim Facebook
+        %td The person's web address on Facebook
+      %tr
+        %td.field-slim LinkedIn 
+        %td The person's web address on LinkedIn
+      %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.
+      %tr
+        %td.field-slim Tags
+        %td
+          %span.label.label-success
+            Important!
+          &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
+    
+  .span3  
+    %h2
+      %span.badge.badge-big.badge-info 3
+      Upload
+    %p
+      Please only upload
+      %b Comma Separated Values (CSV)
+      files.  We cannot process 
+      %b XLS
+      or
+      %b XLSX
+      files.
+    %p
+      = render :partial => "shared/error_messages", :locals => { :target => @import }
+      = raw s3_http_upload_tag :key => "imports/#{UUID.new.generate}",
+          :content_type => "text/csv",
+          :redirect => new_import_url,
+          :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>'

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

@@ -0,0 +1,39 @@
+.row
+  .span3
+    %p="#{pluralize(@import.import_rows.length, 'person')} in this import file."
+    %p This import was created at: <br> #{l import.created_at}
+    %p To discard this import and start over, click "Delete"
+    %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', ''
+      = link_to "Delete", import_path(import), :data => {:confirm => "Are you sure you want to delete this import?"}, :method => :delete, :class => "btn btn-danger"
+
+  .span9
+    .well
+      .row-fluid
+        .span9
+          %h3 This import is pending your approval
+          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|
+        %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

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

@@ -0,0 +1,14 @@
+%br
+%br
+%b DD-MMM-YY HH:MMpm 
+%br
+(Example: 18-Apr-2012 10:59pm)
+%br
+This is the format you should use if you're building the file in Excel. 
+%br
+%br
+%b YYYY/MM/DD HH:MMpm 
+%br
+(Example: 2012/04/18 5:30pm)
+%br
+%br

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

@@ -0,0 +1,18 @@
+.well
+  .row-fluid
+    .span2
+      =icon_tag('184-warning@2x', {:alt => "Import error"})
+    .span10
+      %h3 The was an error during the import
+
+%ul
+  %p
+    We had to stop the import because we found the following errors.  No records have been imported.  Please correct the errors and 
+    =link_to "try your import", imports_path
+    again.
+    
+  - import.import_errors.each do |error|
+    %li
+      %h4= error.error_message
+      - if error.row_data
+        %p= error.row_data.inspect

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

@@ -0,0 +1,11 @@
+.modal{:id => "row#{index}"}
+  .modal-header
+    .close{'data-dismiss'=>'modal'} x
+     
+
+  .modal-body
+    %table.table.table-condensed
+      - keys.each do |field|
+        %tr
+          %td=field.to_s.humanize
+          %td=row.preview(field)

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

@@ -0,0 +1,18 @@
+.well
+  .row-fluid
+    .span2
+      =icon_tag('184-warning@2x', {:alt => "Import error"})
+    .span10
+      %h3 We could not validate your file
+
+%ul
+  %p
+    No records were imported because we found the following errors.  Please correct them and 
+    =link_to "try your import", imports_path
+    again.
+
+  - import.import_errors.each do |error|
+    %li
+      %h4= error.error_message
+      - if error.row_data
+        %p= error.row_data.inspect

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

@@ -0,0 +1,2 @@
+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"

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

@@ -0,0 +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', ''
+  = 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/imports/show.html.haml

@@ -1,6 +1,6 @@
 - in_section :imports
 
 - content_for :header do
-  %h1= t(".heading", :default => "Contact Import")
+  %h1= t(".heading", :default => "Imports")
 
-= render @import.status, :import => @import
+= render :partial => "imports/#{@import.kind}/#{@import.status}", :locals => {:import => @import}

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

@@ -30,6 +30,7 @@
               .span10
                 =link_to_person (action.person)
                 =action.sentence
+                .muted="#{time_ago_in_words(action.occurred_at)} ago"
 
   .span8
     %section
@@ -39,6 +40,7 @@
 
       %h3 Events
       = render :partial => 'events/list', :locals => { :events => @events }
-      - unless @events.blank?
-        .pull-right
+      = 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', '')

data/app/views/layouts/_google_analytics.html.haml

@@ -1,8 +1,8 @@
-- if Rails.env.development? && !ArtfullyOse::Engine.config.google_analytics.account.blank?
+- if Rails.env.production? && !Rails.application.config.google_analytics.account.blank?
   :javascript
     var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', '#{h ArtfullyOse::Engine.config.google_analytics.account}']);
-    _gaq.push(['_setDomainName', '#{h ArtfullyOse::Engine.config.google_analytics.domain}']);
+    _gaq.push(['_setAccount', '#{h Rails.application.config.google_analytics.account}']);
+    _gaq.push(['_setDomainName', '#{h Rails.application.config.google_analytics.domain}']);
     _gaq.push(['_setAllowHash', false]);
     _gaq.push(['_setAllowLinker', true]);
     _gaq.push(['_trackPageview']);

data/app/views/layouts/_menu.html.haml

@@ -1,7 +1,7 @@
 .navbar.navbar-fixed-top
   .navbar-inner
     .container
-      .brand Artfully
+      .brand Artful.ly
       %ul.nav
         %li{ :class => "dropdown #{active?(:events)}" }
           = nav_dropdown "Events"
@@ -14,12 +14,16 @@
           %ul.dropdown-menu
             %li= link_to "New Contact", new_person_path
             %li= link_to "Search", people_path
+            %li= link_to "Advanced Search", new_search_path
             %li= link_to "List Segments", segments_path
+            %li= link_to "Import", new_import_path(:type => :people)
+            %li= link_to "Export", imports_path
 
         %li{ :class => "dropdown #{active?(:reports)}" }
           = nav_dropdown "Reports"
           %ul.dropdown-menu
             %li= link_to "Statements", statements_path
+            %li= link_to "Discounts", discounts_reports_path
             %li= link_to "Imports / Exports", imports_path
 
         %li{ :class => "dropdown #{active?(:transactions)}"}
@@ -36,5 +40,5 @@
           = nav_dropdown current_user.email
           %ul.dropdown-menu
             -if current_user.is_in_organization? 
-              %li= link_to "My Organization", organization_path(current_user.current_organization)
+              %li= link_to "Account Administration", organization_path(current_user.current_organization)
             %li= link_to "Sign Out", destroy_user_session_path

data/app/views/layouts/application.html.haml

@@ -6,6 +6,7 @@
     = stylesheet_link_tag "bootstrap", :media => :all
     = stylesheet_link_tag "application"
     = stylesheet_link_tag :printing, :media => :print
+    = render 'layouts/custom_css_includes'
     = csrf_meta_tag
     = render :partial => 'layouts/google_analytics'
   %body
@@ -18,4 +19,7 @@
       = render 'layouts/footer'
 
     = javascript_include_tag 'application'
+    = render 'layouts/custom_js_includes'
     = yield :custom_js
+    = render :partial => "shared/preload_assets"
+    #footnotes_holder

data/app/views/order_mailer/confirmation_for.html.haml

@@ -2,12 +2,13 @@
 
 %p="Thank you for your order, #{@person.first_name} #{@person.last_name}!"
 
-%p="This is not a ticket. Please use your order number to check in at the event."
+- unless @order.tickets.empty?
+  %p="This is not a ticket. Please use your order number to check in at the event."
 
 %p
   = "Order number: #{@order.id}"
   %br
-  = "Purchase Date: #{l(@order.created_at)}"
+  = "Purchase Date: #{l(@order.created_at_local_to_organization)}"
   %br
   = "Order total: $#{format("%.2f", (@order.total/100.0))}"
   %br

data/app/views/order_mailer/confirmation_for.text.haml

@@ -2,10 +2,11 @@ Order confirmation
 
 ="Thank you for your order, #{@person.first_name} #{@person.last_name}!"
 
-="This is not a ticket. Please use your order number to check in at the event"
+- unless @order.tickets.empty?
+  ="This is not a ticket. Please use your order number to check in at the event"
 
 = "Order number: #{@order.id}"
-= "Purchase Date: #{l(@order.created_at)}"
+= "Purchase Date: #{l(@order.created_at_local_to_organization)}"
 = "Order total: $#{format("%.2f", (@order.total/100.0))}"
 = "Payment method: #{@order.payment_method}"
 = "Service fee: $#{format("%.2f", (@order.service_fee.to_i/100.0))}"

data/app/views/orders/_grouped_form_help.haml

@@ -0,0 +1,4 @@
+#help.grouped-form
+  SHITTTTT
+  %h3 Help
+  %span.help{'data-title' => 'Publishing', 'data-content' => "Publishing a show means that your show is displayed on your storefront and all on sale tickets are available for purchase".html_safe} ?