artfully_ose 1.2.0.beta.1 → 1.2.0.pre

data/app/views/actions/give/_show.html.haml

@@ -5,4 +5,4 @@
     = link_to "edit", edit_contribution_path(action.subject), :class => 'label edit-order-link', "data-remote" => "true"
 
 -unless action.subject.nil?
-  %p= link_to "View order details <i class='fa fa-share'></i>".html_safe, order_path(action.subject)
+  %p= link_to "View order details <i class='icon-share-alt'></i>".html_safe, order_path(action.subject)

data/app/views/actions/shared/_show.html.haml

@@ -2,4 +2,4 @@
   = action.quip
   = action.full_details
   - if action.editable?
-    = link_to "edit", edit_person_action_path(action.person, action, :format => :html), :class => "label edit-action-link"
+    = link_to "edit", edit_person_action_path(@person, action, :format => :html), :class => "label edit-action-link"

data/app/views/addresses/_address.html.haml

@@ -1,7 +1,6 @@
-- unless address.nil?
-  %address
-    = address.address
-    %br
-    = "#{address.city} #{address.state} #{address.zip}"
-    %br
-    = address.country
+%address
+  = address.address
+  %br
+  = "#{address.city} #{address.state} #{address.zip}"
+  %br
+  = address.country

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

@@ -33,7 +33,7 @@
   .control-group
     = form.label :details, "Notes", :class => 'control-label'
     .controls 
-      = form.text_area :details, :size => "20x3"
+      = form.text_area :details, :size => "20x5" 
   
   .form-actions
     = submit_tag "Save", :class => "btn"

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

@@ -6,9 +6,9 @@
   = form_tag contributions_path, :method => :get, :class => 'well form-inline' do
     .pull-left
       = label_tag :start, "From", :class => "control-label"
-      = text_field_tag :start,"#{l @search.start, :format => :date_for_input}", :class => 'datepicker input-small'
+      = 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}", :class => 'datepicker input-small'
+      = 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"

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.fa.fa-minus-circle.icon-gray
+          %i.icon-minus-sign.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,7 +16,7 @@
   .control-group
     = f.label :show_ids, "Shows", :class => 'control-label'
     .controls
-      = 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}
+      = 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}
   .control-group
     = f.label :ticket_types, "Ticket Types", :class => 'control-label'
     .controls

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

@@ -12,7 +12,7 @@
       .span3
         %h3 Discounts
       .span9
-        =icon_link_to("Add", new_event_discount_path(@event), 'fa-plus-circle', 'btn', '')
+        =icon_link_to("Add", new_event_discount_path(@event), 'icon-plus-sign', '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", 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', '')
+        %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', '')

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.fa.fa-minus-circle.icon-gray
+          %i.icon-minus-sign.icon-gray
           = link_to_remove_fields "remove Ticket Type", f
 
   .control-group.custom-discount-price{:style => 'display:none;'}

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

@@ -1,7 +1,6 @@
 .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,10 +1,5 @@
-%ul#event-list.row-fluid
-  - if events.blank?
-    .well.no-events-found
-      %li
-        %h3 No Events Found
-
-  - else
+- unless events.blank?
+  %ul#event-list.row-fluid
     - events.each do |event|
       %li.span6.row-fluid.event-list-item{:style => "margin-left: 0px; margin-right:10px'"}
         .span12
@@ -14,6 +9,6 @@
             .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"

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

@@ -5,7 +5,7 @@
   .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)}
+    #collapseEventDetails.accordion-body.collapse{:class => in?(:details)}
       .accordion-inner
         %ul.accordion-menu
           = active_link_to 'About', edit_event_path(@event)
@@ -16,11 +16,20 @@
   .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)}
+    #collapseShowList.accordion-body.collapse{:class => in?(: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"
+          %li.add
+            %a{:href => new_event_show_path(@event)}
+              %i.icon-plus-sign.icon-gray
+              Add shows
+          %li.add
+            %a{:href => calendar_event_shows_path(@event)}
+              %i.icon-calendar.icon-gray
+              Calendar
+          %li.add
+            %a{:href => event_shows_path(@event)}
+              %i.icon-list.icon-gray
+              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

@@ -16,5 +16,5 @@
 
 .control-group
   .controls
-    %i.fa.fa-plus-cirlce.icon-gray
+    %i.icon-plus-sign.icon-gray
     = link_to_add_fields 'Add another ticket type', f, :ticket_types, 'events'

data/app/views/events/_share_and_sell.haml

@@ -1,9 +1,8 @@
 .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)}
+  #collapseShareSell.accordion-body.collapse{:class => in?(: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)
+        = active_link_to 'Discounts', event_discounts_path(@event)

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

@@ -5,43 +5,6 @@
       .controls
         =f.text_field :name, :class => 'span4'
 
-    -with_kit :membership do
-      - if current_user.current_organization.membership_types.empty?
-        .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", :disabled => "true"
-              Yes
-            %label.radio.inline
-              = f.radio_button :member_ticket, false, :class => "member-ticket-no", :disabled => "true"
-              No  
-            %p.muted
-              You need to create a membership before you can sell member tickets.
-              =link_to "Get started here.", new_membership_type_path
-
-      - else
-        .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
@@ -57,7 +20,7 @@
             %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'
+      =f.label :limit, "Limit", :class => 'control-label'
       .controls
         =f.text_field :limit, :class => 'input-small'
         %p.muted
@@ -68,13 +31,11 @@
       =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'
+      =f.label :availablity, "Availablity", :class => 'control-label'
       .controls
-        - TicketType.channels_for(current_user.current_organization).each do |channel, icon|
+        - TicketType.new.channels.each do |channel, icon|
           =f.check_box channel
           =channel_checkbox channel
           %br
@@ -85,7 +46,7 @@
         - if show_remove_links
           %span.remove-fields-link
             = f.hidden_field :_destroy
-            %i.fa.fa-minus-circle.icon-gray
+            %i.icon-minus-sign.icon-gray
             = link_to_remove_fields "remove", f
 
   #unlimited-help.modal

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

@@ -13,12 +13,7 @@
         =form.label :name, "Event name", :class => 'control-label'
         .controls
           =form.text_field :name, :class => 'input-xlarge', :placeholder=>"Event name"
-
-      .control-group
-        =form.label :subtitle, :class => 'control-label'
-        .controls
-          = form.text_field :subtitle, :class => 'input-xlarge', :placeholder=>"Event subtitle"
-
+          
       .control-group
         =form.label :producer, "Producer", :class => 'control-label'
         .controls

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

@@ -16,10 +16,9 @@
             =icon_tag('266-upload@2x', {:alt => "instructions", :align => "left"})
           .span10
             %p
-              ="Spruce up this event with an image! This image will be displayed on both your #{link_to "Storefront", store_old_storefront_event_path(@event)} (where patrons will purchase tickets) and within your Artful.ly management pages.".html_safe
+              ="Spruce up this event with an image! This image will be displayed on both #{link_to "your Storefront", store_event_url(@event)} (where patrons will purchase tickets) and within your Artful.ly management pages.".html_safe
             %ul{:style => "list-style-type: circle;"}
               %li Image size is limited to 1 MB
-              %li We recommend your image be at least 300 pixels wide
               %li Only .jpg, .jpeg, .gif, and .png file formats are supported
               %li Your image will be displayed with equal height and width
               %li You can come back to this page to change the image at any time

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

@@ -2,25 +2,8 @@
 - content_for :header do
   %h1= t('.heading', :default => "Events")
 
-.event-list-controls.well
-  .row-fluid
-    .span4
-      .btn-group
-        =link_to 'Upcoming', events_path(:query => params[:query]), :class => "btn #{'active' if @upcoming}"
-        =link_to 'All Events', events_path(:range => :all, :query => params[:query]), :class => "btn #{'active' if @all}"
-
-    .span4.center
-      =form_tag(events_path, :method => :get, :id => 'search-events', :class=>"form-search") do
-        = hidden_field_tag :range, params[:range]
-        .input-append
-          = text_field_tag :query, params[:query], :placeholder => 'Search Event Names', :class => 'search-query span10'
-          %button{:type => "submit", :class=>"btn"}
-            Search
-
-    .span4
-      .pull-right
-        = link_to "Create Event", new_event_path, :class => "btn btn-primary"
-
 .row
   .span8.offset2
-    = render :partial => 'list', :locals => { :events => @events }
+    = render :partial => 'list', :locals => { :events => @events }
+  .span8.offset2
+    = link_to "Create Event", new_event_path, :class => "btn btn-primary"

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

@@ -38,9 +38,7 @@
                   =link_to 'Add venue address', edit_event_venue_path(@event)
           .span6
             %strong=@event.venue.name
-            %div=@event.venue.address1
-            -unless @event.venue.address2.blank?
-              %div=@event.venue.address2
+            %div=@event.venue.street_as_string
             %div=@event.venue.city_state_zip_as_string
     - if @event.destroyable?
       .row-fluid

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

@@ -50,7 +50,7 @@
 
       /   .control-group
       /     .controls
-      /       %i.fa.fa-plus-cirlce.icon-gray
+      /       %i.icon-plus-sign.icon-gray
       /       = link_to_add_fields 'Add another Ticket Type', f, :discount_sections, "", "toggleAppropriateFieldsAccordingToPromotionType();"
 
 

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

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

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

@@ -3,11 +3,11 @@
   %h1 Exchanging Tickets
 
 .row
-  .span4#event-select-container
+  .span4
     %h3 1. Choose an Event
     = select_tag "event_selector", options_for_select(@events.collect{ |e| [e.name, url_for(params.merge({:event_id => e.id, :show_id => nil, :ticket_type_id => nil}))] }, url_for(params.merge({:event_id => @event.try(:id), :show_id => nil, :ticket_type_id => nil}))), include_blank: true, class: "visit-on-select span4"
 
-  .span4#show-select-container
+  .span4
     - unless @shows.nil?
       %h3 2. Choose a Show
       - if @shows.empty?
@@ -15,7 +15,7 @@
       - else
         = select_tag "show_selector", options_for_select(@shows.collect{ |show| [l(show.datetime_local_to_event, :format => :short), url_for(params.merge({:show_id => show.id, :ticket_type_id => nil}))] }, url_for(params.merge({:show_id => @show.try(:id), :ticket_type_id => nil}))), include_blank: true, class: "visit-on-select span4"
 
-  .span4#ticket-type-select-container
+  .span4
     - unless @show.nil?
       %h3 3. Choose a Ticket Type
       = select_tag "ticket_type_selector", options_for_select(@show.chart.ticket_types.collect{ |ticket_type| [(truncate(ticket_type.name, :length => 20, :separator => ' ', :omission => '...') + ' ' + number_as_cents(ticket_type.price)), url_for(params.merge({:ticket_type_id => ticket_type.id}))] }, url_for(params.merge({:ticket_type_id => @ticket_type.try(:id)}))), include_blank: true, class: "visit-on-select ticket-type-select span4"
@@ -27,55 +27,32 @@
     = hidden_field_tag :ticket_type_id, params[:ticket_type_id]
     - params[:items].each do |item_id|
       = hidden_field_tag "items[]", item_id
-    #exchange-details
+    #exchange-details.row
       - unless @num_available_tickets < @items.length
-        .row
-          .span3.offset2#outgoing-tickets
-            .well
-              %ol.unstyled
-                - @items.each do |item|
-                  %li.ticket-detail
-                    %h6= item.show.event.name
-                    = l(item.show.datetime_local_to_event, :format => :short)
-                    %br
-                    = item.product.ticket_type.name
-                    .lead=number_as_cents item.total_price
-          #exchange-arrow.span2
-            %i.fa.fa-arrow-right.fa-3x
-
-          .span3#incoming-tickets
-            .well{class: ("negative" if @free_upgrade)}
-              %ol.unstyled
-                - @items.count.times do
-                  %li.ticket-detail
-                    %h6= @event.name
-                    = l(@ticket_type.show.datetime_local_to_event, :format => :short)
-                    %br
-                    = @ticket_type.name
-                    .lead=number_as_cents @ticket_type.price
-
-        .row
-          .span6.offset3
-            %p
-              When you click the "Confirm Exchange" button, The tickets on the left will be immediately exchanged for the tickets on the right. We'll update the show data and door list right away.
-
-            %p
-              Artful.ly will not refund or credit any accounts. If there is money to be collected from or refunded to a patron, please reconcile with the patron directly.
-
-
-            - if @order.skip_confirmation_email?
-              %p="We cannot send an email confirmation because we have no email address for #{@order.person}."
-            - else
-              .center
-                .control-group
-                  .controls
-                    %label.checkbox
-                      = check_box_tag :send_email_confirmation, "1", "", :style => "float:none"
-                      ="Also send an email confirmation to #{@order.person.email}."
-            
-            - unless @ticket_type.nil?
-              .center
-                = submit_tag "Confirm Exchange", :class => "btn btn-large btn-primary", :disable_with => "Exchanging..."
+        .span3.offset2
+          .well
+            %ol.unstyled
+              - @items.each do |item|
+                %li
+                  %h6= item.show.event.name
+                  .lead=number_as_cents item.total_price
+                  = l(item.show.datetime_local_to_event, :format => :short)
+                  %br
+                  = item.product.ticket_type.name
+        #exchange-arrow.span2
+          %i.icon-arrow-right.icon-3x
+          - unless @ticket_type.nil?
+            = submit_tag "Confirm Exchange", :class => "btn btn-large btn-block btn-primary"
+        .span3
+          .well{class: ("negative" if @free_upgrade)}
+            %ol.unstyled
+              - @items.count.times do
+                %li
+                  %h6= @event.name
+                  .lead=number_as_cents @ticket_type.price
+                  = l(@ticket_type.show.datetime_local_to_event, :format => :short)
+                  %br
+                  = @ticket_type.name
 
 - content_for :custom_js do
   :javascript