artfully_ose 1.2.0 → 1.3.0.pre1

data/app/views/imports/memberships/_preview_rows.html.haml

@@ -0,0 +1,38 @@
+.row
+  .span3
+    = render :partial => 'imports/shared/new_sidebar'
+
+  .span9
+    .row-fluid
+      %h2 Membership Type "#{params[:membership_name]}"
+      %p.lead
+        Click
+        <i class="fa fa-search-plus"></i>
+        to view more information about an imported record.
+
+      %table.table.table-bordered.table-hover
+        %tr
+          %th First
+          %th Last
+          %th Type
+          %th Start Date
+          %th End Date
+          %th Period
+          %th Duration
+          %th Price Paid
+          %th
+        - rows.each_with_index do |imported_row, index|
+          - row = ParsedRow.new(import.headers, imported_row.content)
+          %tr{:data => {:toggle => 'modal'}}
+            %td=row.first
+            %td=row.last
+            %td=row.membership_type
+            %td=row.start_date
+            %td=row.end_date
+            %td=row.period
+            %td=row.duration
+            %td=number_as_cents row.amount
+            %td
+              =icon_link_to("", "#row#{index}", ' fa-search-plus', '', '', {'data-toggle' => 'modal'})
+              =render :partial => "imports/shared/inspect_modal", :locals => {:header => "#{row.first} #{row.last}", :row => row, :index => index, :keys => ParsedRow::MEMBERSHIP_FIELDS.merge(ParsedRow::PEOPLE_FIELDS).keys}
+      = will_paginate rows

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

@@ -41,42 +41,108 @@
       %tr
         %td.field-slim Suffix
         %td The person's suffix (MD, Sr, Jr, Esq...)
+      %tr
+        %td.field-slim Nickname
+        %td The person's nickname
+      %tr
+        %td.field-slim Listing Name
+        %td The person's listing name
+      %tr
+        %td.field-slim Maiden Name
+        %td A woman's surname before marriage
       %tr
         %td.field-slim Title
         %td The person's title in the company
       %tr
-        %td.field-slim Address 1
-        %td First line of the person's address
+        %td.field-slim AddressA Address 1
+        %td First line of address for primary address
+      %tr
+        %td.field-slim AddressA Address 2
+        %td Second line of address for primary address
+      %tr
+        %td.field-slim AddressA City
+        %td The person's city for primary address
+      %tr
+        %td.field-slim AddressA State
+        %td
+          %span.label.label-success
+          The person's state for primary address.
+          US state abbreviations will be changed to the full state name.
+          For example, "MD" will be converted to "Maryland"
+      %tr
+        %td.field-slim AddressA Zip
+        %td The person's zip code for primary address
+      %tr
+        %td.field-slim AddressA Country
+        %td The person's country for primary address
+      %tr
+        %td.field-slim AddressA Type
+        %td Home, Work, or Other
+      %tr
+        %td.field-slim AddressB Address 1
+        %td First line of address for second address
       %tr
-        %td.field-slim Address 2
-        %td Second line of the person's address
+        %td.field-slim AddressB Address 2
+        %td Second line of address for second address
       %tr
-        %td.field-slim City
-        %td The person's city
+        %td.field-slim AddressB City
+        %td The person's city for second address
+      %tr
+        %td.field-slim AddressB State
+        %td
+          %span.label.label-success
+          The person's state for second address.
+          US state abbreviations will be changed to the full state name.
+          For example, "MD" will be converted to "Maryland"
+      %tr
+        %td.field-slim AddressB Zip
+        %td The person's zip code for second address
+      %tr
+        %td.field-slim AddressB Country
+        %td The person's country for second address
+      %tr
+        %td.field-slim AddressB Type
+        %td Home, Work, or Other
+      %tr
+        %td.field-slim AddressC Address 1
+        %td First line of address for third address
+      %tr
+        %td.field-slim AddressC Address 2
+        %td Second line of address for third address
+      %tr
+        %td.field-slim AddressC City
+        %td The person's city for third address
+      %tr
+        %td.field-slim AddressC State
+        %td
+          %span.label.label-success
+          The person's state for third address.
+          US state abbreviations will be changed to the full state name.
+          For example, "MD" will be converted to "Maryland"
       %tr
-        %td.field-slim State
-        %td The person's state
+        %td.field-slim AddressC Zip
+        %td The person's zip code for third address
       %tr
-        %td.field-slim Zip
-        %td The person's zip code
+        %td.field-slim AddressC Country
+        %td The person's country for third address
       %tr
-        %td.field-slim Country
-        %td The person's country
+        %td.field-slim AddressC Type
+        %td Home, Work, or Other
       %tr
         %td.field-slim Phone 1 type
-        %td Work, Home, Cell, Fax, or Other
+        %td Cell, Home, Fax, Work, 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, Fax, or Other
+        %td Cell, Home, Fax, Work, 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, Fax, or Other
+        %td Cell, Home, Fax, Work, or Other
       %tr
         %td.field-slim Phone 3
         %td The person's third phone number

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

@@ -1,10 +1,19 @@
+- header ||= nil
+
 .modal{:id => "row#{index}"}
   .modal-header
     .close{'data-dismiss'=>'modal'} x
      
 
+    -if header.present?
+      %h3=header
+
   .modal-body
-    %table.table.table-condensed
+    %table.table.table-condensed.table-bordered
+      %tr
+        %th Field name
+        %th Imported value
+
       - keys.each do |field|
         %tr
           %td=field.to_s.humanize

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

@@ -0,0 +1,12 @@
+%h2= t(".heading", :default => "Import")
+
+%p
+  %span.label.label-info Created
+  %span.muted= @import.created_at.strftime('%b %d, %Y %l:%M%P')
+
+%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", url_for(:back), '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/imports/show.html.haml

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

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

@@ -1,7 +1,8 @@
 %li.row-fluid
   .span1
-    = image_tag "actions/#{action.action_type.downcase}.png"
+    %img{:src => "/assets/actions/#{action.action_type.downcase}.png"}
   .span11.recent-activity-text
-    =link_to_person (action.person)
+    %a{:href => "/people/#{action.person_id}"}
+      =action.person
     =action.sentence
-    .recent-action-time.muted="#{time_ago_sentence(action.occurred_at)}"
+    .recent-action-time.muted.timeago{:title => "#{action.occurred_at.iso8601}"}="#{action.occurred_at.iso8601}"

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

@@ -1,11 +1,18 @@
 .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
+    - # HACK: This is a cheap way to failover. Refactor.
+    - if @feed.blank?
+      - 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.")
+        -if current_user.can? :manage, new_person_path 
+          = 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' }
+    - 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' }
+        - @feed.each do |feed|
+          =feed.html_safe

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

@@ -2,9 +2,21 @@
 
 = render :partial => 'layouts/admin_messages'
 
+- if @mailchimp_kit
+  - content_for :custom_js do
+    :javascript
+      $(document).on("close", ".alert.mailchimp-alert", function() {
+        $.post("#{hide_alert_mailchimp_kit_path(@mailchimp_kit)}")
+      });
+
+- if @show_default_list_nag
+  .alert.mailchimp-alert
+    %button.close(type="button" data-dismiss="alert") ×
+    Please set your MailChimp default list. You can do that #{link_to "here", lists_mailchimp_kit_path(@mailchimp_kit)}.
+
 .row
   .span4
-    .well
+    .well#dashboard-user-info
       .row-fluid
         .span4
           = gravatar_image_tag(current_user.email, :alt => 'User icon', :class => 'dashboard-grav', :gravatar => { :size => 64 })
@@ -12,7 +24,7 @@
           - if current_user.is_in_organization?          
             .email
               %b= "#{truncate(current_user.email, :length => 28, :separator => ' ', :omission => '...')}"
-
+            =current_role
             .link= link_to "Account Administration", organization_path(current_user.current_organization)
             .link= link_to "Sign Out", destroy_user_session_path
           - else
@@ -29,22 +41,23 @@
                 .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'
+                  %h4.event-link= link_to truncate(event.name, :length => 35), 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 @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', '')
+    -if current_user.can? :manage, Event
+      -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', '')
 
   .span8
-    =render :partial => 'recent_activity'
+    =render :partial => 'recent_activity'

data/app/views/job_monitors/_job_monitor_show.html.haml

@@ -0,0 +1,34 @@
+.row
+  .span6.offset3
+    .well
+      .row-fluid
+        .span2
+          %h1=icon_tag('20-gear-2@2x', {:alt => "Working"})
+        .span10
+          %h1#head-message We're Working On It
+          %p#detail-message Your download will be ready in a few moments. We'll change this message when it is ready.
+
+    =link_to "Return to the previous page", @job_monitor.return_url
+
+-content_for :custom_js do
+  :javascript
+    $(document).ready(function () {
+      setTimeout(checkDone, 1000)
+    })
+
+    function checkDone() {
+      $.ajax({
+        url: "#{monitor_url(@job_monitor)}",
+      })
+      .done(function( data ) {
+        if (data.finished == true) {
+          $('#head-message').html("All Set!")
+          $('#detail-message').html("<a class='btn btn-success btn-large' href='" + data.file_url + "'>Download your file now</a>")
+        } else if (data.failed == true) {
+          $('#head-message').html("Oh No!")
+          $('#detail-message').html("We had a problem generating your file. We've been notified about the issue and will get it fixed.")
+        } else {
+          setTimeout(checkDone, 1000)
+        }
+      });    
+    }

data/app/views/job_monitors/_linking_job_monitor_show.html.haml

@@ -0,0 +1,31 @@
+.row
+  .span6.offset3
+    .well
+      .row-fluid
+        .span2
+          %h1=icon_tag('20-gear-2@2x', {:alt => "Working"})
+        .span10
+          %h1#head-message We're Working On It
+          %p#detail-message Your job will be ready in a few moments and we'll send you along when it's done.
+
+-content_for :custom_js do
+  :javascript
+    $(document).ready(function () {
+      setTimeout(checkDone, 1000)
+    })
+
+    function checkDone() {
+      $.ajax({
+        url: "#{monitor_url(@job_monitor)}",
+      })
+      .done(function( data ) {
+        if (data.finished == true) {
+          window.location.replace(data.file_url)
+        } else if (data.failed == true) {
+          $('#head-message').html("Oh No!")
+          $('#detail-message').html("We had a problem with this job. We've been notified about the issue and will get it fixed.")
+        } else {
+          setTimeout(checkDone, 1000)
+        }
+      });    
+    }

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

@@ -0,0 +1 @@
+=render :partial => "#{@job_monitor.class.name.underscore}_show"

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

@@ -3,15 +3,13 @@
   - segment = (segment + "_") unless segment.blank?
   - segment_account = segment + "account"
   :javascript
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', '#{h Rails.application.config.google_analytics.send(segment_account)}']);
-    _gaq.push(['_setDomainName', '#{h Rails.application.config.google_analytics.domain}']);
-    _gaq.push(['_setAllowHash', false]);
-    _gaq.push(['_setAllowLinker', true]);
-    _gaq.push(['_trackPageview']);
 
-    (function() {
-      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
+
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', '#{h Rails.application.config.google_analytics.send(segment_account)}', 'auto');
+    ga('send', ['_setAllowLinker', true]); 
+    ga('send', 'pageview');

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

@@ -11,14 +11,16 @@
             %li= link_to "Memberships", membership_types_path
             %li= link_to "Passes", pass_types_path
             %li= link_to "Sales Console", new_console_sale_path
+            -if current_user.is_in_organization? 
+              %li= link_to "Central Storefront", store_organization_events_url(current_user.current_organization.cached_slug), :target => '_blank'
 
         %li{ :class => "dropdown #{active?(:people)}" }
           = nav_dropdown "People"
           %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 "Advanced Search", new_advanced_search_path
+            %li= link_to "List Segments", advanced_search_segments_path
             %li= link_to "Import", new_import_path(:type => :people)
             %li= link_to "Export", imports_path
 
@@ -43,6 +45,6 @@
         %li.dropdown
           = nav_dropdown current_user.email
           %ul.dropdown-menu
-            -if current_user.is_in_organization? 
+            -if current_user.is_in_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

@@ -2,9 +2,12 @@
 %html{:lang => "en", "ng-app" => "artfully"}
   %head
     %title= "#{yield :title} : #{t 'artfully.page_title'}"
+    = stylesheet_link_tag "#{ENV['CAS_ASSET_HOST'] || ENV['CAS_BASE_URL']}/assets/memberbar.css"
+    = javascript_include_tag "#{ENV['CAS_ASSET_HOST'] || ENV['CAS_BASE_URL']}/assets/memberbar.js"
+
     :plain
-      <link href='http://fonts.googleapis.com/css?family=Open+Sans+Condensed:300' rel='stylesheet' type='text/css'>
-      <link href='http://fonts.googleapis.com/css?family=Sanchez' rel='stylesheet' type='text/css'>
+      <link href='//fonts.googleapis.com/css?family=Open+Sans+Condensed:300' rel='stylesheet' type='text/css'>
+      <link href='//fonts.googleapis.com/css?family=Sanchez' rel='stylesheet' type='text/css'>
     = favicon_link_tag
     = stylesheet_link_tag "bootstrap", :media => :all
     = stylesheet_link_tag "application"
@@ -13,16 +16,21 @@
     = csrf_meta_tag
     = render :partial => 'layouts/google_analytics'
   %body{'data-controller' => controller.controller_path, 'data-action' => controller.action_name}
+    #fa-memberbar.fa-sso{'data-fa-program' => 'artfully', 'data-fa-authenticated' => "#{current_user ? 1 : 0}"}
+
     = render :partial => 'layouts/menu'
-    .container
+    .container.container-main
       #heading= yield :header
       = render :partial => 'layouts/flash', :locals => { :flash => flash }
       - flash.discard
       = content_for?(:menu_sub_template) ? yield(:menu_sub_template) : yield
+    .container
       = render 'layouts/footer'
 
     = javascript_include_tag 'application'
     = render 'layouts/custom_js_includes'
     = yield :custom_js
     = render :partial => "shared/preload_assets"
-    #footnotes_holder
+    #footnotes_holder
+
+    #fa-footer.fa-sso