artfully_ose 1.2.0.beta.1 → 1.2.0.pre

data/app/views/imports/donations/_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), 'fa-share', 'btn', ''
+      = 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

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), 'fa-share', 'btn', ''
+      = 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

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

@@ -41,9 +41,6 @@
   .span3       
     .well{:style => "text-align: center"}   
       %h3 Exports
-      =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)
+      %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"

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

@@ -24,7 +24,7 @@
               %td=message.person.email
               %td=message.person.first_name
               %td=message.person.last_name
-              %td=icon_link_to "", person_path(message.person), 'fa-share', '', ''
+              %td=icon_link_to "", person_path(message.person), 'icon-share-alt', '', ''
       = will_paginate @messages, :param_name => 'messages_page'
 
     - unless @people.empty?
@@ -41,7 +41,7 @@
             %td=row.email
             %td=row.first_name
             %td=row.last_name
-            %td=icon_link_to "", person_path(row), 'fa-share', '', ''
+            %td=icon_link_to "", person_path(row), 'icon-share-alt', '', ''
             
       = will_paginate @people
 

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

@@ -19,10 +19,10 @@
         %td.field-slim Email
         %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.field-slim First 
         %td The first name of the person.
       %tr 
-        %td.field-slim Last Name
+        %td.field-slim Last
         %td The last name of the person.
       %tr
         %td.field-slim Company Name
@@ -36,7 +36,7 @@
         %td.field-slim Salutation
         %td The person's salutation (Mr., Mrs., etc...)
       %tr
-        %td.field-slim Middle Name
+        %td.field-slim Middle
         %td The person's middle name
       %tr
         %td.field-slim Suffix
@@ -45,10 +45,10 @@
         %td.field-slim Title
         %td The person's title in the company
       %tr
-        %td.field-slim Address 1
+        %td.field-slim Address1
         %td First line of the person's address
       %tr
-        %td.field-slim Address 2
+        %td.field-slim Address2
         %td Second line of the person's address
       %tr
         %td.field-slim City
@@ -64,19 +64,19 @@
         %td The person's country
       %tr
         %td.field-slim Phone 1 type
-        %td Work, Home, Cell, Fax, or Other
+        %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, Fax, or Other
+        %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, Fax, or Other
+        %td Work, Home, Cell or Fax
       %tr
         %td.field-slim Phone 3
         %td The person's third phone number
@@ -92,21 +92,9 @@
       %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.  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

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), 'fa-share', 'btn', ''
+      = 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
@@ -34,7 +34,7 @@
             %td=row.company
             %td=row.website
             %td
-              =icon_link_to("", "#row#{index}", ' fa-search-plus', '', '', {'data-toggle' => 'modal'})
+              =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.merge(ParsedRow::ADDRESS_FIELDS).keys}
       = will_paginate @parsed_rows
     -else    

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

@@ -21,5 +21,5 @@
               %td=message.person.email
               %td=message.person.first_name
               %td=message.person.last_name
-              %td=icon_link_to "", person_path(message.person), 'fa-share', '', ''
+              %td=icon_link_to "", person_path(message.person), 'icon-share-alt', '', ''
       = will_paginate @messages, :param_name => 'messages_page'

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), 'fa-share', 'btn', ''
+  = 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/index/dashboard.html.haml

@@ -31,9 +31,9 @@
                 .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"
+                    %li= "#{pluralize event.glance.sold.total, 'ticket'} sold"
+                    %li= "#{pluralize event.glance.available.total, 'ticket'} on sale"
+                    %li= "#{number_as_cents(event.glance.sales.total)} total sales"
 
     -if @events.blank?
       .no-image#add-a-description
@@ -44,7 +44,7 @@
     -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', '')
+        =icon_link_to("View All Events", events_path, 'icon-arrow-right', 'btn', '')
 
   .span8
     =render :partial => 'recent_activity'

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

@@ -1,5 +1,5 @@
-- [:notice, :success, :error, :alert, :info].each do |type|
-  - if flash[type].present?
+- [:notice, :error, :alert, :info].each do |type|
+  - if flash[type]
     .flash{ "data-alert" => "alert", :class => [bootstrapped_type(type), type, 'alert'] }
       .close{ "data-dismiss" => "alert"} ×
-      = [flash[type]].flatten.join('<br/>').html_safe
+      = flash[type]  

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

@@ -1,10 +1,7 @@
--if (Rails.env.production? || Rails.env.staging?) && !Rails.application.config.google_analytics.account.blank?
-  - segment = "" if local_assigns[:segment].nil?
-  - segment = (segment + "_") unless segment.blank?
-  - segment_account = segment + "account"
+- if Rails.env.production? && !Rails.application.config.google_analytics.account.blank?
   :javascript
     var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', '#{h Rails.application.config.google_analytics.send(segment_account)}']);
+    _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]);

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

@@ -4,13 +4,10 @@
       .brand Artful.ly
       %ul.nav
         %li{ :class => "dropdown #{active?(:events)}" }
-          = nav_dropdown "Sell"
+          = nav_dropdown "Events"
           %ul.dropdown-menu
-            %li= link_to "New Event", new_event_path
             %li= link_to "All Events", events_path
-            %li= link_to "Memberships", membership_types_path
-            %li= link_to "Passes", pass_types_path
-            %li= link_to "Sales Console", new_console_sale_path
+            %li= link_to "Create Event", new_event_path
 
         %li{ :class => "dropdown #{active?(:people)}" }
           = nav_dropdown "People"
@@ -30,12 +27,11 @@
             %li= link_to "Imports / Exports", imports_path
 
         %li{ :class => "dropdown #{active?(:transactions)}"}
-          = nav_dropdown "Orders"
+          = nav_dropdown "Transactions"
           %ul.dropdown-menu
-            %li= link_to "Tickets", sales_orders_path
+            %li= link_to "Sales", sales_orders_path
             %li= link_to "Donations", contributions_path
-            %li= link_to "Memberships", membership_orders_path
-            %li= link_to "Search All", orders_path
+            %li= link_to "Search", orders_path
 
         %li.divider-vertical
         %li.dropdown

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

@@ -1,5 +1,5 @@
-!!! 5
-%html{:lang => "en", "ng-app" => "artfully"}
+!!!
+%html{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en", :lang => "en", "ng-app" => "artfully"}
   %head
     %title= "#{yield :title} : #{t 'artfully.page_title'}"
     :plain

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

@@ -1,5 +1,5 @@
-!!! 5
-%html{:lang => "en", "ng-app" => "artfully"}
+!!!
+%html{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en", :lang => "en"}
   %head
     %title= "#{yield :title} : Artful.ly"
     %link{ :rel => "shortcut icon", :href => "/favicon.ico", :type => "image/x-icon"}

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

@@ -3,7 +3,7 @@
   %head
     %title= "#{yield :title}"
     = stylesheet_link_tag :storefront
-    = render :partial => 'layouts/google_analytics', :locals => { :segment => "storefront" }
+    = render :partial => 'layouts/google_analytics'
   %body
     .container
       = render :partial => 'layouts/flash.html', :locals => { :flash => flash }

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

@@ -3,36 +3,24 @@
   %head
     %title= "#{yield :title}"
     = stylesheet_link_tag :storefront
-    = render :partial => 'layouts/google_analytics', :locals => { :segment => "storefront" }
+    = render :partial => 'layouts/google_analytics'
   %body
     .navbar.navbar-fixed-top
       .navbar-inner
-        .container
-          = link_to @store_organization.name, store_organization_events_url(@store_organization.cached_slug), :class => 'brand'
-          %ul.nav#main-menu-options
+        .container   
+          = link_to @store_organization.name, root_path, :class => 'brand'
+          %ul.nav
             %li= link_to "Buy Tickets", store_events_path(@store_organization.cached_slug)
-            - if @store_organization.has_kit?(:passes)
-              %li= link_to "Buy Passes", store_passes_path(@store_organization.cached_slug)
-            - if @store_organization.has_kit?(:membership)
-              -if member_signed_in?
-                %li= link_to "Buy Memberships", store_memberships_path(@store_organization.cached_slug)
-              -else
-                %li= link_to "Become a Member", store_memberships_path(@store_organization.cached_slug)
-            - if @store_organization.has_active_donation_only_storefront?
-              -if @store_organization.kit(:regular_donation).donate_now_text.present?
-                %li= link_to @store_organization.kit(:regular_donation).donate_now_text, store_donate_path(@store_organization.cached_slug), :class => "btn btn-small btn-warning primary"
-              -else
-                %li= link_to "Donate Now", store_donate_path(@store_organization.cached_slug), :class => "btn btn-small btn-warning primary"
-          - if @store_organization.has_kit?(:membership)
-            %ul.nav.pull-right#menu-member-login
-              -if member_signed_in?
-                %li.dropdown
-                  = nav_dropdown member_menu_caption
-                  %ul.dropdown-menu
-                    %li= link_to "My Membership", members_root_path
-                    %li= link_to "Sign Out", destroy_member_session_path
-              -else
-                %li= link_to "Member Login", new_member_session_path
+            %li= link_to "Become a Member", store_memberships_path(@store_organization.cached_slug)
+            -# %li= link_to "Passes"
+            %li= link_to "Donate Now", store_donate_path(@store_organization.cached_slug), :class => "btn btn-small btn-warning primary"
+          %ul.nav.pull-right
+            -if member_signed_in?
+              %li.dropdown
+                = nav_dropdown member_menu_caption
+                %ul.dropdown-menu
+                  %li= link_to "My Membership", members_root_path
+                  %li= link_to "Sign Out", destroy_member_session_path
 
 
     .content.container
@@ -40,7 +28,7 @@
         .pull-right
           %ul.nav.nav-pills
             %li.active
-              =icon_link_to("#{current_cart.items.size}    Checkout Now", store_order_path(@store_organization.cached_slug), 'fa-shopping-cart', '', '')
+              =icon_link_to("#{current_cart.items.size}    Checkout Now", store_order_path(@store_organization.cached_slug), 'icon-shopping-cart', '', '')
 
       = render :partial => 'layouts/flash', :locals => { :flash => flash }
       - flash.discard

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

@@ -7,18 +7,23 @@
         %tr
           %td Member Number
           %td=current_member.member_number
+        %tr
+          %td Member Since
+          %td TODO
         %tr
           %td Member Through
-          %td=l current_member.member_through, :format => :date
+          %td=l current_member.active_memberships.first.ends_at, :format => :date
         %tr
           %td Membership
-          %td=current_member.memberships.current.first.membership_type.name
+          %td=current_member.active_memberships.first.membership_type.name
         %tr
-          %td Memberships
-          %td=current_member.memberships.current.count
+          %td Memberhsips
+          %td=current_member.active_memberships.length
         %tr
-          %td Membership Card
-          %td=link_to "download", current_member.download_link_for(:pdf)
+          %td Auto-renewal
+          %td 
+            On
+            =link_to "change", "", :class => "btn btn-small"
     .side-section
       %h6 Member Information
       =current_member.person
@@ -33,9 +38,10 @@
 
     .side-section
       %h6 Contact Us
+      %br
       =current_member.organization.email
       %br
       -# =current_member.organization.phone
 
 #edit-address-modal.modal.hide
-  =render :partial => 'people/edit_modal', :locals => { :url => members_person_path(current_member.person), :header => "Edit Your Information", :except => [:convert, :relationships, :households, :social, :merge, :delete], :return_to => members_root_path } 
+  =render :partial => 'people/edit_modal', :locals => { :header => "Edit Your Information", :except => [:convert, :social, :merge, :delete], :return_to => members_root_path } 

data/app/views/membership_awards/confirm.html.haml

@@ -0,0 +1,59 @@
+.row
+  .span4
+    %h3 People
+    %table.table.people-list
+      - @membership_award.people.each do |person|
+        %tr
+          %td.name
+            = person
+            %br
+            = person.email
+  .span8
+    %h3 Details
+    %table.table
+      =form_for @membership_award do |form|  
+        %tr
+          %td Type
+          %td=@membership_award.membership_type.name
+        %tr
+          %td Number of Memberships
+          %td=@membership_award.number_of_memberships
+        %tr
+          %td Price
+          %td=number_as_cents @membership_award.sold_price
+        %tr
+          %td Expires On
+          %td=@membership_award.ends_at
+        %tr
+          %td Send Email
+          %td=@membership_award.send_email ? "Yes" : "No"
+        %tr
+          %td Email Preview
+          %td=link_to "Preview Now", "#email-preview", 'data-toggle' => 'modal'
+
+    %h3 What Happens Now?
+    %p These people will become members of your organization. 
+    -if @membership_award.send_email
+      %p 
+        They will get an email to setup an account with your orgnaization if they have not already done so.
+        =link_to "Click here to see a preview of this email", "#email-preview", 'data-toggle' => 'modal'
+
+    =form_for @membership_award do |form| 
+      =form.hidden_field :membership_type, :value => @membership_award.membership_type.id
+      =form.hidden_field :number_of_memberships
+      =form.hidden_field :sold_price
+      =form.hidden_field :ends_at
+      =form.hidden_field :send_email
+      =form.hidden_field :message
+      =form.hidden_field :confirm, :value => true
+      .form-actions
+        =form.submit "Next", :class => 'btn'
+
+    #email-preview.modal
+      .modal-header
+        .close{'data-dismiss'=>'modal'} x
+        %h3 Email Preview
+      .modal-body
+        =@membership_award.message
+      .modal-footer
+        %button.btn{'data-dismiss'=>'modal'} Close

data/app/views/membership_awards/create.html.haml

@@ -0,0 +1 @@
+success!

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

@@ -0,0 +1,74 @@
+.row
+  .span4
+    %h3 People
+    %table.table.people-list
+      - @membership_award.people.each do |person|
+        %tr
+          %td.name
+            = person
+            %br
+            = person.email
+  .span8
+    %h3 Membership
+    =form_for @membership_award do |form| 
+      .control-group
+        = form.label "Membership Type", :class => 'control-label'
+        .controls
+          = form.select :membership_type, options_from_collection_for_select(@membership_types, 'id', 'name', @membership_award.membership_type)
+
+      .control-group
+        = form.label "Number of Memberships", :class => 'control-label'
+        .controls
+          = form.text_field :number_of_memberships
+      
+      .control-group
+        = form.label "Paid Per Membership", :class => 'control-label'
+        .controls
+          .input-prepend
+            %span.add-on $
+            = form.text_field :sold_price, :class => 'span1'
+          
+      .control-group
+        = form.label "Expires On", :class => 'control-label'
+        .controls
+          = form.text_field :ends_at, :class => :datepicker
+
+      .control-group
+        .controls
+          %label.radio
+            = form.radio_button :send_email, false
+            Do not notify these patrons.
+          %label.radio
+            = form.radio_button :send_email, true
+            Notify these patrons by email and include the following message:
+
+      .control-group
+        .controls
+          = form.text_area :message, :rows => 10, :class => "span6"
+
+
+      .form-actions
+        =form.submit "Next", :class => 'btn'
+
+- content_for :custom_js do 
+  :javascript
+    var ends_at_data = #{@membership_types_hash.to_json}
+    $('#membership_award_membership_type').change(function () {
+      $('#membership_award_ends_at').val(ends_at_data[$('#membership_award_membership_type').val()])
+    })
+
+    $('#membership_award_send_email_false').click(function () {
+      $('#membership_award_message').hide()
+    })
+
+    $('#membership_award_send_email_true').click(function () {
+      $('#membership_award_message').show()
+    })
+
+    $(document).ready(function() {
+      if ($('input[name="membership_award[send_email]"]:checked').val() == true) {
+        $('#membership_award_message').show()
+      } else {
+        $('#membership_award_message').false()
+      }
+    })