artfully_ose 1.1.0 → 1.2.0.alpha.1

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

@@ -1,5 +1,5 @@
 - if current_user.current_organization.has_active_fiscally_sponsored_project?
-  %p Use this form for recording contributions received outside of Fractured Atlas.  Donations to Fractured Atlas Fiscally Sponsored Projects should be made through Fractured Atlas.  Please <a href='mailto:support@artful.ly'>contact support</a> with any questions.
+  %p Use this form for recording donations received outside of Fractured Atlas.  Donations to Fractured Atlas Fiscally Sponsored Projects should be made through Fractured Atlas.  Please <a href='mailto:support@artful.ly'>contact support</a> with any questions.
 
 = form_for(contribution, :html=>{ :class=>'form-horizontal' }) do |form|
   = form.hidden_field :person_id
@@ -8,7 +8,7 @@
   .control-group
     = form.label :subtype, "Type", :class => 'control-label'
     .controls
-      = form.select :subtype, options_for_select(Action::GIVE_TYPES, contribution.subtype)
+      = form.select :subtype, options_for_select(GiveAction.subtypes, contribution.subtype)
       
   .control-group
     = form.label :payment_method, "Payment method", :class => 'control-label'
@@ -33,7 +33,7 @@
   .control-group
     = form.label :details, "Notes", :class => 'control-label'
     .controls 
-      = form.text_area :details, :size => "20x5" 
+      = form.text_area :details, :size => "20x3"
   
   .form-actions
     = submit_tag "Save", :class => "btn"

data/app/views/contributions/find_person.html.haml

@@ -16,7 +16,7 @@
         %li
           .label= form.label :email, "Email"
           .element= form.text_field :email
-      = form.submit "Save", :class => "btn"
+      = form.submit "Save", :class => "btn btn-primary"
     .hidden-target
       %span.name
       = form_for(@contribution, :url => new_contribution_path, :html => {:method => :get}) do |form|

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

@@ -1,15 +1,17 @@
 - in_section :transactions
 - content_for :header do
-  %h1 Contributions
+  %h1 Donations
 
 #donations-search
   = form_tag contributions_path, :method => :get, :class => 'well form-inline' do
-    = label_tag :start, "From", :class => "control-label"
-    = text_field_tag :start,"#{l @search.start, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
-    = label_tag :stop, "To", :class => "control-label"
-    = text_field_tag :stop, "#{l @search.stop, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
+    .pull-left
+      = label_tag :start, "From", :class => "control-label"
+      = text_field_tag :start,"#{l @search.start, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
+      = label_tag :stop, "To", :class => "control-label"
+      = text_field_tag :stop, "#{l @search.stop, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
     .pull-right
       = submit_tag "Search", :class => "btn"
+      = submit_tag "Download", :class => "btn"
 
 - unless @search.results.empty?
   #donations
@@ -32,4 +34,4 @@
               %td= number_as_cents item.nongift_amount
     = will_paginate(@search.results)
 - else
-  %h4= "No contributions found between #{l @search.start} and #{l @search.stop}"
+  %h4= "No donations found between #{l @search.start} and #{l @search.stop}"

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

@@ -1,10 +1,6 @@
-- in_section :transactions
-- content_for :header do
-  %h1 Record Contribution
+.modal-header
+  .close{'data-dismiss'=>'modal'} x
+  %h3 New Contribution
 
-.row
-  .span3  
-    =render :partial => "sidebar", :locals => {:contribution => @contribution}
-    
-  .span9
-    =render :partial => "form", :locals => {:contribution => @contribution, :cancel_path => person_path(@contribution.person_id)}
+.modal-body
+  =render :partial => "form", :locals => {:contribution => @contribution, :cancel_path => person_path(@contribution.person_id)}

data/app/views/discounts/_discount_section_fields.html.haml

@@ -13,7 +13,7 @@
       - if show_remove_links
         %span.remove-fields-link
           = f.hidden_field :_destroy
-          %i.icon-minus-sign.icon-gray
+          %i.fa.fa-minus-circle.icon-gray
           = link_to_remove_fields "remove Ticket Type", f
 
   .control-group.custom-discount-price{:style => 'display:none;'}

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

@@ -16,11 +16,11 @@
   .control-group
     = f.label :show_ids, "Shows", :class => 'control-label'
     .controls
-      = f.select :show_ids, options_for_select(@event.shows.collect {|s| [l(s.datetime_local_to_event, :format => :day_time), s.id] }, @discount.show_ids), {}, {'data-placeholder' => "All Shows", :class => 'input chosen', :multiple => true}
+      = f.select :show_ids, options_for_select(@event.shows.collect {|s| [l(DateTime.parse(s.local_datetime), :format => :day_time), s.id] }, @discount.show_ids), {}, {'data-placeholder' => "All Shows", :class => 'input chosen', :multiple => true}
   .control-group
-    = f.label :sections, "Ticket Types", :class => 'control-label'
+    = f.label :ticket_types, "Ticket Types", :class => 'control-label'
     .controls
-      = f.select :sections, options_for_select(@section_names, @discount.sections.to_a), {}, {'data-placeholder' => "All Prices", :class => 'input chosen', :multiple => true}
+      = f.select :ticket_types, options_for_select(@ticket_type_names, @discount.ticket_types.to_a), {}, {'data-placeholder' => "All Prices", :class => 'input chosen', :multiple => true}
 
 %fieldset
   .control-group

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

@@ -12,7 +12,7 @@
       .span3
         %h3 Discounts
       .span9
-        =icon_link_to("Add", new_event_discount_path(@event), 'icon-plus-sign', 'btn', '')
+        =icon_link_to("Add", new_event_discount_path(@event), 'fa-plus-circle', 'btn', '')
     %table.table
       %thead
         %th Code

data/app/views/events/_day_date_show.html.haml

@@ -12,5 +12,5 @@
       %strong=link_to show.datetime_local_to_event.strftime('%l:%M %P'), event_show_path(@event, show)
       #available="#{show.glance.available_total} tickets available"
       #show-links
-        %p=icon_link_to("Door List", door_list_event_show_path(@event, show), 'icon-list', 'btn', '')
-        %p=icon_link_to("Box Office", new_event_show_sales_path(@event, show), 'icon-shopping-cart', 'btn', '')
+        %p=icon_link_to("Door List", new_event_show_sales_path(@event, show, :render => 'doorlist'), 'fa-list', 'btn', '')
+        %p=icon_link_to("Box Office", new_event_show_sales_path(@event, show, :render => 'boxoffice'), 'fa-shopping-cart', 'btn', '')

data/app/views/events/_discount_section_fields.html.haml

@@ -13,7 +13,7 @@
       - if show_remove_links
         %span.remove-fields-link
           = f.hidden_field :_destroy
-          %i.icon-minus-sign.icon-gray
+          %i.fa.fa-minus-circle.icon-gray
           = link_to_remove_fields "remove Ticket Type", f
 
   .control-group.custom-discount-price{:style => 'display:none;'}

data/app/views/events/_glance.html.haml

@@ -1,37 +1,28 @@
-- if controller.controller_name == "events" && controller.action_name == "show"
-  %h3 Event Overview
-- else
-  %h3 "At a Glance"
-- if report.nil?
-  %p Report not yet available.
-- else
-  %table.table.table-condensed
-    %tbody
-      %tr
-        %td On Sale
-        %td= report.available_total
-        %td
-      %tr
-        %td Comped
-        %td= report.comped_total
-        %td
-      %tr
-        %td Sold
-        %td= report.sold_total
-        %td= number_as_cents(report.sales_total)
-      %tr
-        %td Sold Today
-        %td= report.sold_today
-        %td= number_as_cents(report.sales_today)
-      %tr
-        %td Total Played
-        %td= report.sold_played
-        %td= number_as_cents(report.sales_played)
-      %tr
-        %td Potential Remaining
-        %td
-        %td= number_as_cents(report.potential_remaining)
-      %tr
-        %td Original Potential
-        %td
-        %td= number_as_cents(report.potential_original)
+%h3 Event Overview
+
+%table.table.table-condensed
+  %tbody
+    %tr
+      %td On Sale
+      %td= report.available_total
+      %td
+    %tr
+      %td Comped
+      %td= report.comped_total
+      %td
+    %tr
+      %td Sold
+      %td= report.sold_total
+      %td= number_as_cents(report.sales_total)
+    %tr
+      %td Sold Today
+      %td= report.sold_today
+      %td= number_as_cents(report.sales_today)
+    %tr
+      %td Total Played
+      %td= report.sold_played
+      %td= number_as_cents(report.sales_played)
+    %tr
+      %td Storefront
+      %td
+      %td=link_to "Link", store_old_storefront_event_path(@event)

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

@@ -1,6 +1,7 @@
 .row
   .span8
     %h1= @event.name
+    %h3.subtitle= @event.subtitle if @event.subtitle.present?
   .span4#event-header-logo-container
     -if @event.image?
       =image_tag(@event.image.url(:thumb), :id => 'event-header-logo', :width => 75, :height => 75)

data/app/views/events/_list.html.haml

@@ -1,5 +1,10 @@
-- unless events.blank?
-  %ul#event-list.row-fluid
+%ul#event-list.row-fluid
+  - if events.blank?
+    .well.no-events-found
+      %li
+        %h3 No Events Found
+
+  - else
     - events.each do |event|
       %li.span6.row-fluid.event-list-item{:style => "margin-left: 0px; margin-right:10px'"}
         .span12
@@ -7,7 +12,8 @@
             .span4.event-icon-container
               = render :partial => 'shared/event_image_icon', :locals => { :event => event }
             .span8
-              %h4= link_to event.name, event_path(event), :title => 'event-name'
+              %h4.event-link= link_to event.name, event_path(event), :title => 'event-name'
               %ul.mini-stats
-                %li= "#{number_as_cents(event.glance.sales_played)} total played"
-                %li= "#{number_as_cents(event.glance.sales_advance)} advance sales"
+                %li= "#{pluralize event.sold, 'ticket'} sold"
+                %li= "#{pluralize event.on_sale, 'ticket'} on sale"
+                %li= "#{number_as_cents(event.sales_total)} total sales"

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

@@ -1,21 +1,26 @@
-.nav.nav-accordian
-  = active_link_to 'Event Overview', event_path(@event)
-  %li.accordian{:class => active?(:details)}
-    = link_to 'Event Details', edit_event_path(@event)
-    %ul.accordian-menu
-      = active_link_to 'About', edit_event_path(@event)
-      = active_link_to 'Venue', edit_event_venue_path(@event)
-      = active_link_to 'Prices', prices_event_path(@event)
-      = active_link_to 'Image', image_event_path(@event)
-      = active_link_to 'Messages', messages_event_path(@event)
-  %li.accordian{:class => active?(:shows)}
-    = link_to 'Shows List', event_shows_path(@event)
-    %ul.accordian-menu
-      %li.add
-        %a{:href => new_event_show_path(@event)}
-          %i.icon-plus-sign.icon-gray
-          Add show
-      - @event.shows.each do |show|
-        = active_link_to l(show.datetime_local_to_event, :format => :day_time), event_show_path(@event, show)
+.nav.accordion#event-accordion
+  .accordion-group
+    .accordion-heading
+      = link_to 'Event Overview', event_path(@event), :class => 'accordion-toggle'
+  .accordion-group
+    .accordion-heading
+      = link_to "Event Details", '#collapseEventDetails', :class => 'accordion-toggle', 'data-toggle' => 'collapse', 'data-parent'=>'#event-accordion'
+    #collapseEventDetails.accordion-body.collapse{:class => in_section?(:details)}
+      .accordion-inner
+        %ul.accordion-menu
+          = active_link_to 'About', edit_event_path(@event)
+          = active_link_to 'Venue', edit_event_venue_path(@event)
+          = active_link_to 'Prices', prices_event_path(@event)
+          = active_link_to 'Image', image_event_path(@event)
+          = active_link_to 'Messages', messages_event_path(@event)
+  .accordion-group
+    .accordion-heading
+      = link_to 'Shows', "#collapseShowList", :class => 'accordion-toggle', 'data-toggle' => 'collapse', 'data-parent'=>'#event-accordion'
+    #collapseShowList.accordion-body.collapse{:class => in_section?(:shows)}
+      .accordion-inner
+        %ul.accordion-menu
+          = calendar_active_link_to "Add shows", new_event_show_path(@event), nil, "fa-plus-circle"
+          = calendar_active_link_to "Calendar", calendar_event_shows_path(@event), nil, "fa-calendar"
+          = calendar_active_link_to "List", event_shows_path(@event), nil, "fa-list"
 
-  = render :partial => 'events/share_and_sell', :locals => { :event => @event }
+  = render :partial => 'events/share_and_sell', :locals => { :event => @event }

data/app/views/events/_section_fields.html.haml

@@ -1,50 +1,20 @@
-.fields.section-fields
-  .control-group
-    =f.label :name, "Name", :class => 'control-label'
-    .controls
-      =f.text_field :name
-      
-  .control-group
-    =f.label :description, "Description", :class => 'control-label'
-    .controls
-      =f.text_area :description, :size => '10x5'
-  -no_editing = false if no_editing.nil?
-  - unless no_editing
-    .control-group
-      =f.label :price, "Price", :class => 'control-label'
-      .controls
-        .input-prepend
-          %span.add-on $
-          - if can? :create, :paid_events
-            =f.text_field :price, :placeholder => '0.00', :class => 'input-small section-price', :value => number_as_cents(f.object.price, :format => "%n")
-          - else
-            %span.section-price-disabled{'data-toggle' => "modal", 'data-target' => "#request-paid-ticket-kit"}
-              =f.text_field :price, :placeholder => '0.00', :class => 'input-small disabled section-price-disabled', :value => number_as_cents(f.object.price, :format => "%n"), :disabled => 'disabled'
-              %p
-                %a{:href=>"#"} Paid Ticketing Kit not enabled.
+-no_editing = false if no_editing.nil?
+-new_show   = false if new_show.nil? 
 
-
-    .control-group
-      =f.label :capacity, "Capacity", :class => 'control-label'
-      .controls
-        =f.text_field :capacity, :class => 'span1', :disabled => no_editing
-  
-  .control-group
-    =f.label :availablity, "Availablity", :class => 'control-label'
-    
-    - Section.new.channels.each do |channel, icon|
-      .controls
-        =f.check_box channel
-        =channel_checkbox channel
-  
+=f.hidden_field :name
+- unless no_editing
   .control-group
+    =f.label :capacity, :class => 'control-label'
     .controls
-      - show_remove_links = true if show_remove_links.nil?
-      - if show_remove_links
-        %span.remove-fields-link
-          = f.hidden_field :_destroy
-          %i.icon-minus-sign.icon-gray
-          = link_to_remove_fields "remove", f
+      =f.text_field :capacity, :class => 'span3', :disabled => no_editing
+
+%fieldset
+  -unless new_show
+    %legend Ticket Types
+  = f.fields_for :ticket_types do |builder|
+    = render 'events/ticket_type_fields', :f => builder
 
-:javascript
-  $('.help').popover()
+.control-group
+  .controls
+    %i.fa.fa-plus-cirlce.icon-gray
+    = link_to_add_fields 'Add another ticket type', f, :ticket_types, 'events'

data/app/views/events/_share_and_sell.haml

@@ -1,5 +1,9 @@
-%li.accordian{:class => active?(:share)}
-  = link_to 'Share & Sell', storefront_link_event_path(event)
-  %ul.accordian-menu
-    = active_link_to 'Storefront', storefront_link_event_path(event)
-    = active_link_to 'Discounts', event_discounts_path(@event)
+.accordion-group
+  .accordion-heading
+    = link_to 'Share & Sell', "#collapseShareSell", :class => 'accordion-toggle', 'data-toggle' => 'collapse', 'data-parent'=>'#event-accordion'
+  #collapseShareSell.accordion-body.collapse{:class => in_section?(:share)}
+    .accordion-inner
+      %ul.accordion-menu
+        = active_link_to 'Storefront', storefront_link_event_path(event)
+        = active_link_to 'Discounts', event_discounts_path(@event)
+        = active_link_to 'Passes', event_events_pass_types_path(@event)

data/app/views/events/_ticket_type_fields.html.haml

@@ -0,0 +1,86 @@
+.fields.ticket-type-fields
+  .well
+    .control-group
+      =f.label :name, "Name", :class => 'control-label'
+      .controls
+        =f.text_field :name, :class => 'span4'
+
+    -with_kit :membership do
+      .control-group
+        =label_tag "Member ticket?", "Member ticket?", :class => 'control-label'
+        .controls
+          %label.radio.inline
+            = f.radio_button :member_ticket, true, :class => "member-ticket-yes"
+            Yes
+          %label.radio.inline
+            = f.radio_button :member_ticket, false, :class => "member-ticket-no"
+            No
+
+      .membership-fields{:style => "display: none"}
+        .control-group
+          =f.label :membership_type_id, "Membership", :class => 'control-label'
+          .controls
+            =f.select :membership_type_id, options_from_collection_for_select(MembershipType.in_play(current_user.current_organization), 'id', 'name', f.object.membership_type_id), {}, :class => 'span4'
+
+        .control-group
+          =f.label :tickets_per_membership, "Tickets per Membership", :class => 'control-label'
+          .controls
+            =f.text_field :tickets_per_membership, :class => 'input-small'
+
+    .control-group
+      =f.label :price, "Price", :class => 'control-label'
+      .controls
+        .input-prepend
+          %span.add-on $
+          - if can? :create, :paid_events
+            =f.text_field :price, :placeholder => '0.00', :class => 'input-small section-price', :value => number_as_cents(f.object.price, :format => "%n")
+          - else
+            %span.section-price-disabled{'data-toggle' => "modal", 'data-target' => "#request-paid-ticket-kit"}
+              =f.text_field :price, :placeholder => '0.00', :class => 'input-small disabled section-price-disabled', :value => number_as_cents(f.object.price, :format => "%n"), :disabled => 'disabled'
+        - unless can? :create, :paid_events
+          %p.muted
+            %a{:href=>"#request-paid-ticket-kit", 'data-toggle' => "modal"} Paid Ticketing Kit not enabled.
+
+    .control-group
+      =f.label :limit, "Ticket Type Limit", :class => 'control-label'
+      .controls
+        =f.text_field :limit, :class => 'input-small'
+        %p.muted
+          Leave blank for unlimited.
+          %a{:href=>"#unlimited-help", 'data-toggle' => "modal"} Learn more.
+        
+    .control-group
+      =f.label :description, "Description", :class => 'control-label'
+      .controls
+        =f.text_area :description, :class => 'span4', :size => '10x2'
+        %p.muted
+          This description will appear on your storefront as well as on patron receipts.
+    
+    .control-group
+      =f.label :visibility, "Visibility", :class => 'control-label'
+      .controls
+        - TicketType.channels_for(current_user.current_organization).each do |channel, icon|
+          =f.check_box channel
+          =channel_checkbox channel
+          %br
+    
+    .control-group.pull-right
+      .controls
+        - show_remove_links = true if show_remove_links.nil?
+        - if show_remove_links
+          %span.remove-fields-link
+            = f.hidden_field :_destroy
+            %i.fa.fa-minus-circle.icon-gray
+            = link_to_remove_fields "remove", f
+
+  #unlimited-help.modal
+    .modal-header
+      .close{'data-dismiss'=>'modal'} x
+      %h3 Ticket Type Limits
+    .modal-body
+      %p
+        You can set a limit on how many tickets will be sold at this price. If you prefer not to limit the number of tickets sold at this price, leave the "Limit" field blank.
+      %p
+        Of course, across all prices, we won't sell more tickets than you specified in the "Capacity" field.
+    .modal-footer
+      = button_tag "Close", :class => "btn", 'data-dismiss' => 'modal'