artfully_ose 1.2.0.pre.4 → 1.2.0.pre.5

data/app/views/store/shared/_donate_form.html.haml

@@ -9,4 +9,4 @@
       .input-prepend
         %span.add-on $
         = text_field_tag :donation_amount, '', :class => 'span1'
-      = submit_tag 'Add Donation', :class => 'btn btn-primary'
+      = submit_tag 'Add Donation', :class => 'btn btn-primary', :id => 'add-donation'

data/app/views/store/shows/_show.html.haml

@@ -1,3 +1,4 @@
+
 .title.active
   .date
     .month= show.datetime_local_to_event.strftime("%b")
@@ -11,32 +12,39 @@
 .sections{:style => "#{'display:none' if collapsed}"}
   - if show.chart.sections.storefront.empty?
     No tickets are available for this show
-  - show.sections_for(current_member).each do |section|
-    -section.ticket_types_for(current_member).each do |ticket_type|
-      .section
-        %h4
-          = ticket_type.name
-          %span{:class => 'price'}= number_as_cents(ticket_type.price)
-        -unless ticket_type.description.nil?
-          -description = ticket_type.description
-          -if description.length > 150
-            .toggle-truncated
-              .truncated
-                = simple_format "#{truncate(description, :length => 150)} (#{link_to 'more','#', :class => 'toggle'})"
-              .not-truncated{:style => 'display:none;'}
-                =simple_format "#{description} (#{link_to 'less','#', :class => 'toggle'})"
-          - else
-            =simple_format description
-            
-        = form_tag store_order_path(@store_organization.cached_slug), :class => 'add-tickets-to-cart' do
-          = hidden_field_tag :show_id, show.id
-          = hidden_field_tag :ticket_type_id, ticket_type.id
-          = hidden_field_tag :section_name, ticket_type.name
-          = hidden_field_tag :ticket_price, ticket_type.price
-          - if ticket_type.available == 0
-            %select{:style => "width:140px"}
-              %option
-                SOLD OUT
-          - else
-            = select_tag :quantity, options_for_select((1..[10, ticket_type.available].min).to_a.map {|i| [pluralize(i, 'Ticket'), i]}), :style => "width:140px"
-            = submit_tag 'Add to cart', :class => 'btn btn-primary'
+  - else
+    %table.table.available-ticket-type-table
+      - show.sections_for(current_member).each do |section|
+        -section.ticket_types_for(current_member).each do |ticket_type|
+          %tr
+            %td.ticket-type-name
+              = ticket_type.name
+            %td.right.span2.ticket-type-price
+              %span{:class => 'price'}= number_as_cents(ticket_type.price)
+            %td.right.span4
+              = form_tag store_order_path(@store_organization.cached_slug), :class => 'add-tickets-to-cart' do
+                = hidden_field_tag :show_id, show.id
+                = hidden_field_tag :ticket_type_id, ticket_type.id
+                = hidden_field_tag :section_name, ticket_type.name
+                = hidden_field_tag :ticket_price, ticket_type.price
+
+                - if ticket_type.available == 0
+                  %select{:style => "width:140px", :class => 'ticket-type-quantity'}
+                    %option
+                      SOLD OUT
+                - else
+                  = select_tag :quantity, options_for_select((1..[10, ticket_type.available].min).to_a.map {|i| [pluralize(i, 'Ticket'), i]}), :style => "width:140px", :class => 'ticket-type-quantity'
+
+                = submit_tag 'Add to cart', :class => 'btn btn-primary'
+          %tr.no-border
+            %td.ticket-type-description{:colspan => "4"}
+              -unless ticket_type.description.nil?
+                -description = ticket_type.description
+                -if description.length > 150
+                  .toggle-truncated
+                    .truncated
+                      = simple_format "#{truncate(description, :length => 150)} (#{link_to 'more','#', :class => 'toggle'})"
+                    .not-truncated{:style => 'display:none;'}
+                      =simple_format "#{description} (#{link_to 'less','#', :class => 'toggle'})"
+                - else
+                  =simple_format description

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

@@ -2,7 +2,7 @@
   %h2.span2 Users
   .span10
     - if can? :manage, current_user.current_organization
-      = link_to "Add", "#userForm", 'data-toggle' => 'modal', :class => 'btn'
+      = link_to "Invite User", "#userForm", 'data-toggle' => 'modal', :class => 'btn'
 %ul#memberships.detailed-list.row-fluid
   - organization.users.each do |user|
     %li.span5.row-fluid
@@ -27,5 +27,3 @@
       = text_field_tag :user_email, "", :placeholder => "Enter an email address..."
     .modal-footer
       = submit_tag "Add", :class => 'btn'
-      
-    

data/app/views/users/invitations/edit.html.haml

@@ -2,18 +2,67 @@
 
 .instructions.well
   The administrator for
-  %strong=resource.user_memberships.first.organization.name 
+  %strong=resource.user_memberships.first.organization.name
   has invited you to join their organization.  Enter a password for your account and click 'Sign Up' to begin using Artfully!
 
-.account-details
-  = form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :put } do |f|
+%fieldset.ng-cloak{"ng-controller" => "SignInCtrl"}
+  %ul.nav.nav-tabs
+    %li{"ng-class" => "{active: signinform == 'artfully'}"}
+      %a{href: "#", "ng-click" => "signinform = 'artfully'"} Create Account
+    %li{"ng-class" => "{active: signinform == 'fa'}"}
+      %a{href: "#", "ng-click" => "signinform = 'fa'"} Sign In with Fractured Atlas
+
+  = form_for resource, as: resource_name, url: invitation_path(resource_name), html: {method: :put, class: "form-horizontal", "ng-show" => "signinform == 'artfully'"} do |f|
     = devise_error_messages!
     = f.hidden_field :invitation_token
+
+    .control-group
+      = f.label :first_name, 'First Name', :class => 'control-label'
+      .controls= f.text_field :first_name, :required => true, tabindex: "1"
+    .control-group
+      = f.label :last_name, 'Last Name', :class => 'control-label'
+      .controls= f.text_field :last_name, :required => true, tabindex: "2"
     .control-group
-      = f.label :password, :class=>'control-label'
-      .controls= f.password_field :password
+      = f.label :email, :class => 'control-label'
+      .controls= f.text_field :email, :placeholder => 'example@fracturedatlas.org', :required => true, tabindex: "3"
     .control-group
-      = f.label :password_confirmation, :class=>'control-label'
-      .controls= f.password_field :password_confirmation
+      = f.label :password, :class => 'control-label'
+      .controls= f.password_field :password, :required => true, tabindex: "4"
+    .control-group
+      = f.label :password_confirmation, "Retype Password", :class => 'control-label'
+      .controls= f.password_field :password_confirmation, :required => true, tabindex: "5"
+    .control-group
+      .controls
+        %label.checkbox
+          = f.check_box :user_agreement, required: true, tabindex: "6"
+          I have read, understand and accept the terms and conditions of the #{link_to "User Agreement", user_agreement_path, :target => "_blank"}
+    .form-actions
+      %p= f.submit "Sign Up", class: "btn btn-primary btn-large", tabindex: "7"
 
-    = f.submit "Sign Up", :class => "btn"
+  = form_for resource, as: resource_name, url: invitation_path(resource_name), html: {method: :put, class: 'form-horizontal', "ng-show" => "signinform == 'fa'"} do |f|
+    = devise_error_messages!
+    = hidden_field_tag :fa, 'true'
+    = f.hidden_field :invitation_token
+
+    .control-group
+      = f.label :email, 'Fractured Atlas Username', class: 'control-label'
+      .controls
+        = f.text_field :email, required: true, tabindex: "8", value: nil
+    .control-group
+      = f.label :password, class: 'control-label'
+      .controls
+        = f.password_field :password, required: true, tabindex: "9"
+        %p.help-block= link_to "Forgot your password?", "http://www.fracturedatlas.org/site/login/forgotten", :target => "_blank"
+
+    .control-group
+      .controls
+        %label.checkbox
+          = f.check_box :user_agreement, required: true, tabindex: "10"
+          I have read, understand and accept the terms and conditions of the #{link_to "User Agreement", user_agreement_path, :target => "_blank"}
+    .form-actions
+      = f.submit "Sign Up", :class => "btn btn-primary btn-large", tabindex: "11"
+:javascript
+  var SignInCtrl = function($scope) {
+    console.log(window);
+    $scope.signinform = window.location.hash.slice(1) || 'artfully';
+  };

data/app/views/users/mailer/invitation_instructions.html.haml

@@ -0,0 +1,14 @@
+- @organization = @resource.invited_by.user_memberships.first.organization
+%h1 Hi #{@resource.email}.
+
+%p #{@organization.name} has invited you to their Artful.ly account! Artful.ly is a new web-app that helps artists sell tickets, take donations, and manage contacts.
+
+%p
+  To check it out, accept #{@organization.name}’s invitation and set up your login info,
+  = link_to 'follow this link.', accept_invitation_url(@resource, :invitation_token => @resource.invitation_token)
+
+%p
+  If you do not want to join this organization, just ignore this email. Your account won’t be created until you click the link above and set your password.
+
+%p
+  If you have any question about #{@organization.name}’s invitation, please contact #{mail_to @organization.email}.

data/app/views/users/passwords/edit.html.haml

@@ -6,11 +6,11 @@
 
     .control-group
       = f.label :password, :class=>'control-label'
-      .controls= f.password_field :password
+      .controls= f.password_field :password, autocomplete: 'off'
 
     .control-group
       = f.label :password_confirmation, "Retype Password", :class=>'control-label'
-      .controls= f.password_field :password_confirmation
+      .controls= f.password_field :password_confirmation, autocomplete: 'off'
 
     = f.hidden_field :reset_password_token
 

data/app/views/users/registrations/edit.html.erb

@@ -7,13 +7,13 @@
   <%= f.text_field :email %></p>
 
   <p><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
-  <%= f.password_field :password %></p>
+  <%= f.password_field :password, autocomplete: 'off' %></p>
 
   <p><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></p>
+  <%= f.password_field :password_confirmation, autocomplete: 'off' %></p>
 
   <p><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
-  <%= f.password_field :current_password %></p>
+  <%= f.password_field :current_password, autocomplete: 'off' %></p>
 
   <p><%= f.submit "Update", :class => "btn" %></p>
 <% end %>

data/app/views/users/sessions/new.html.haml

@@ -1,6 +1,6 @@
 = devise_error_messages!
 
-= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'form-horizontal'}) do |f|  
+= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'form-horizontal'}) do |f|
 
   %fieldset
     %legend Sign In
@@ -13,7 +13,7 @@
     .control-group
       = f.label :password, :class=>'control-label', :tabindex => "2"
       .controls
-        = f.password_field :password
+        = f.password_field :password, autocomplete: 'off'
         %p.help-block= link_to "Forgot your password?", new_password_path(resource_name)
 
     .form-actions

data/config/initializers/devise.rb

@@ -8,9 +8,6 @@ Devise.setup do |config|
   config.use_salt_as_remember_token = true
   config.reset_password_within = 24.hours
 
-  # Configure the class responsible to send e-mails.
-  # config.mailer = "Devise::Mailer"
-
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and
   # :mongoid (bson_ext recommended) by default. Other ORMs may be

data/config/locales/devise.en.yml

@@ -10,7 +10,7 @@ en:
       unauthenticated: 'Please sign in.'
       unconfirmed: 'You have to confirm your account before continuing.'
       locked: 'Your account is locked.'
-      invalid: 'Invalid email or password.'
+      invalid: 'Invalid username or password.'
       invalid_token: 'Invalid authentication token.'
       timeout: 'Your session expired, please sign in again to continue.'
       inactive: 'Your account has been suspended.'

data/config/routes.rb

@@ -34,7 +34,7 @@ Rails.application.routes.draw do
   end
 
   devise_for :members
-  devise_for :users
+  devise_for :users, :controllers => {:sessions => "users/sessions"}
   devise_scope :user do
     get "sign_up", :to => "devise/registrations#new"
   end
@@ -85,6 +85,8 @@ Rails.application.routes.draw do
     end
   end
 
+  resources :memberships, :only => :index
+
   def people_actions
     resources :actions
     resources :memberships do
@@ -175,7 +177,7 @@ Rails.application.routes.draw do
         put :validated
         put :unvalidated
       end
-      
+
       collection do
         delete :delete
         put :on_sale

data/db/migrate/20130411162346_add_country_zip_state_phone_number_discipline_to_organizations.rb

@@ -0,0 +1,9 @@
+class AddCountryZipStatePhoneNumberDisciplineToOrganizations < ActiveRecord::Migration
+  def change
+    add_column :organizations, :country, :string
+    add_column :organizations, :zip, :string
+    add_column :organizations, :state, :string
+    add_column :organizations, :phone_number, :string
+    add_column :organizations, :discipline, :string
+  end
+end

data/db/migrate/20130412184415_add_first_name_and_last_name_to_users.rb

@@ -0,0 +1,6 @@
+class AddFirstNameAndLastNameToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :first_name, :string
+    add_column :users, :last_name, :string
+  end
+end

data/lib/artfully_ose/version.rb

@@ -1,3 +1,3 @@
 module ArtfullyOse
-  VERSION = "1.2.0.pre.4"
+  VERSION = "1.2.0.pre.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.4
+  version: 1.2.0.pre.5
 platform: ruby
 authors:
 - Artful.ly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -444,20 +444,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.1
-- !ruby/object:Gem::Dependency
-  name: angularjs-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: swiper
   requirement: !ruby/object:Gem::Requirement
@@ -1773,6 +1759,7 @@ files:
 - app/assets/images/glyphish/white/99-umbrella.png
 - app/assets/images/glyphish/white/99-umbrella@2x.png
 - app/assets/images/government-default-avatar.png
+- app/assets/images/household-default-avatar.png
 - app/assets/images/loading.gif
 - app/assets/images/nonprofit-default-avatar.png
 - app/assets/images/other-default-avatar.png
@@ -1809,6 +1796,8 @@ files:
 - app/assets/images/ui-smoothness/ui-icons_888888_256x240.png
 - app/assets/images/ui-smoothness/ui-icons_cd0a0a_256x240.png
 - app/assets/javascripts/angular-bootstrap-ui.js
+- app/assets/javascripts/angular-resource.min.js
+- app/assets/javascripts/angular.min.js
 - app/assets/javascripts/application.js
 - app/assets/javascripts/bootstrap.js
 - app/assets/javascripts/box-office.js
@@ -2207,6 +2196,13 @@ files:
 - app/views/people/new.html.haml
 - app/views/people/show.html.haml
 - app/views/people/show.js.haml
+- app/views/producer_mailer/donation_kit_notification.html.haml
+- app/views/producer_mailer/donation_kit_notification.text.erb
+- app/views/producer_mailer/mailchimp_kit_initial_sync_notification.html.haml
+- app/views/producer_mailer/ticket_offer_accepted.html.haml
+- app/views/producer_mailer/ticket_offer_accepted.text.erb
+- app/views/producer_mailer/ticket_offer_rejected.html.haml
+- app/views/producer_mailer/ticket_offer_rejected.text.erb
 - app/views/refunds/_grouped_form.html.haml
 - app/views/refunds/new.html.haml
 - app/views/reports_mailer/_fine_print.html.haml
@@ -2263,8 +2259,10 @@ files:
 - app/views/store/checkouts/thanks.html.haml
 - app/views/store/donations/index.html.haml
 - app/views/store/events/_calendar.html.haml
+- app/views/store/events/_venue.html.haml
 - app/views/store/events/index.html.haml
 - app/views/store/events/show.html.haml
+- app/views/store/events/single_show.html.haml
 - app/views/store/memberships/index.html.haml
 - app/views/store/orders/show.html.haml
 - app/views/store/shared/_donate_form.html.haml
@@ -2277,7 +2275,7 @@ files:
 - app/views/users/invitations/edit.html.haml
 - app/views/users/invitations/new.html.haml
 - app/views/users/mailer/confirmation_instructions.html.erb
-- app/views/users/mailer/invitation_instructions.html.erb
+- app/views/users/mailer/invitation_instructions.html.haml
 - app/views/users/mailer/reset_password_instructions.html.erb
 - app/views/users/mailer/unlock_instructions.html.erb
 - app/views/users/passwords/edit.html.haml
@@ -2346,7 +2344,9 @@ files:
 - db/migrate/20130325190110_add_indexes_to_actions.rb
 - db/migrate/20130326173653_add_lifetime_donations_to_people_and_searches.rb
 - db/migrate/20130329201707_clean_geographic_data.rb
+- db/migrate/20130411162346_add_country_zip_state_phone_number_discipline_to_organizations.rb
 - db/migrate/20130412145428_massage_action_subtypes.rb
+- db/migrate/20130412184415_add_first_name_and_last_name_to_users.rb
 - db/migrate/20130415190224_make_nongift_amount0_by_default.rb
 - db/migrate/20130415193118_add_settings_to_kits.rb
 - db/migrate/20130420232537_add_starred_to_note.rb

data/app/views/users/mailer/invitation_instructions.html.erb

@@ -1,8 +0,0 @@
-<p>Hello <%= @resource.email %>!</p>
-
-<p><%= @resource.invited_by.email %> has invited you to join <%= link_to(@resource.invited_by.user_memberships.first.organization.name, root_url) %>. You can accept it through the link below.</p>
-
-<p><%= link_to 'Accept invitation', accept_invitation_url(@resource, :invitation_token => @resource.invitation_token) %></p>
-
-<p>If you don't want to accept the invitation, please ignore this email.<br />
-Your account won't be created until you access the link above and set your password.</p>