Replace more Commercials with Materials

app/controllers/admin/commercials_controller.rb

@@ -17,10 +17,10 @@ module Admin
 
       if @commercial.save
         redirect_to admin_conference_commercials_path,
-                    notice: 'Commercial was successfully created.'
+                    notice: 'Materials were successfully created.'
       else
         redirect_to admin_conference_commercials_path,
-                    error: 'An error prohibited this Commercial from being saved: '\
+                    error: 'An error prohibited materials from being saved: '\
                     "#{@commercial.errors.full_messages.join('. ')}."
 
       end
@@ -29,17 +29,17 @@ module Admin
     def update
       if @commercial.update(commercial_params)
         redirect_to admin_conference_commercials_path,
-                    notice: 'Commercial was successfully updated.'
+                    notice: 'Materials were successfully updated.'
       else
         redirect_to admin_conference_commercials_path,
-                    error: 'An error prohibited this Commercial from being saved: '\
+                    error: 'An error prohibited materials from being saved: '\
                     "#{@commercial.errors.full_messages.join('. ')}."
       end
     end
 
     def destroy
       @commercial.destroy
-      redirect_to admin_conference_commercials_path, notice: 'Materaisl were successfully removed.'
+      redirect_to admin_conference_commercials_path, notice: 'Materials were successfully removed.'
     end
 
     def render_commercial

app/controllers/admin/venue_commercials_controller.rb

@@ -12,10 +12,10 @@ module Admin
 
       if @commercial.save
         redirect_to admin_conference_venue_path,
-                    notice: 'Commercial was successfully created.'
+                    notice: 'Materials successfully created.'
       else
         redirect_to admin_conference_venue_path,
-                    error: 'An error prohibited this Commercial from being saved: '\
+                    error: 'An error prohibited materials from being saved: '\
                     "#{@commercial.errors.full_messages.join('. ')}."
 
       end
@@ -24,17 +24,17 @@ module Admin
     def update
       if @commercial.update(commercial_params)
         redirect_to admin_conference_venue_path,
-                    notice: 'Commercial was successfully updated.'
+                    notice: 'Materials successfully updated.'
       else
         redirect_to admin_conference_venue_path,
-                    error: 'An error prohibited this Commercial from being saved: '\
+                    error: 'An error prohibited materials from being saved: '\
                     "#{@commercial.errors.full_messages.join('. ')}."
       end
     end
 
     def destroy
       @commercial.destroy
-      redirect_to admin_conference_venue_path, notice: 'Commercial was successfully destroyed.'
+      redirect_to admin_conference_venue_path, notice: 'Materials successfully destroyed.'
     end
 
     def render_commercial

app/controllers/commercials_controller.rb

@@ -12,27 +12,27 @@ class CommercialsController < ApplicationController
 
     if @commercial.save
       redirect_to edit_conference_program_proposal_path(conference_id: @conference.short_title, id: @event.id, anchor: 'commercials-content'),
-                  notice: 'Commercial was successfully created.'
+                  notice: 'Materials were successfully created.'
     else
       redirect_to edit_conference_program_proposal_path(conference_id: @conference.short_title, id: @event.id, anchor: 'commercials-content'),
-                  error: "An error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
+                  error: "An error prohibited these materials from being saved: #{@commercial.errors.full_messages.join('. ')}."
     end
   end
 
   def update
     if @commercial.update(commercial_params)
       redirect_to edit_conference_program_proposal_path(conference_id: @conference.short_title, id: @event.id, anchor: 'commercials-content'),
-                  notice: 'Commercial was successfully updated.'
+                  notice: 'Materials were successfully updated.'
     else
       redirect_to edit_conference_program_proposal_path(conference_id: @conference.short_title, id: @event.id, anchor: 'commercials-content'),
-                  error: "An error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
+                  error: "An error prohibited materials from being saved: #{@commercial.errors.full_messages.join('. ')}."
     end
   end
 
   def destroy
     @commercial.destroy
     redirect_to edit_conference_program_proposal_path(conference_id: @conference.short_title, id: @event.id),
-                notice: 'Commercial was successfully destroyed.'
+                notice: 'Materials were successfully destroyed.'
   end
 
   def render_commercial

app/models/commercial.rb

@@ -39,7 +39,7 @@ class Commercial < ApplicationRecord
 
       commercial = event.commercials.new(url: url)
       unless commercial.save
-        errors[:validation_errors] << "Could not create commercial for event with ID #{event.id} (" + commercial.errors.full_messages.to_sentence + ')'
+        errors[:validation_errors] << "Could not create materials for event with ID #{event.id} (" + commercial.errors.full_messages.to_sentence + ')'
       end
     end
     errors

app/views/admin/commercials/index.html.haml

@@ -3,9 +3,9 @@
     .page-header
       %h1 Session Materials
       %p.text-muted
-        Conference commercials will be displayed on the events in the
+        Conference materials will be displayed on the events in the
         = link_to 'schedule,', conference_schedule_path(@conference.short_title)
-        if the event speaker didn't add an event commercial.
+        if the event speaker didn't add any event materials.
 - if can? :create, @conference.commercials.new
   .row
     .col-md-6

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

@@ -42,7 +42,7 @@
 
                     - else
                       = general_change_description(version)
-                      =  link_to 'commercial',
+                      =  link_to 'materials',
                                 edit_admin_conference_program_event_path(conference_id: @conference.short_title,
                                         id: @event.id, anchor: 'commercials-content')
 
@@ -82,7 +82,7 @@
             %td{ 'class' => class_for_todo(progress_status['subtitle']) }
               %span{ 'class' => [icon_for_todo(progress_status['subtitle']), 'fa-lg'] }
           %tr
-            %td= link_to 'Add a commercial', edit_admin_conference_program_event_path(@event.program.conference.short_title, @event, anchor: 'commercials-content')
+            %td= link_to 'Add materials', edit_admin_conference_program_event_path(@event.program.conference.short_title, @event, anchor: 'commercials-content')
             %td{ 'class' => class_for_todo(progress_status['commercials']) }
               %span{ 'class' => [icon_for_todo(progress_status['commercials']), 'fa-lg'] }
           - unless progress_status['track'].nil?

app/views/admin/reports/_all_events.html.haml

@@ -14,7 +14,7 @@
       %th Title
       %th Speakers Registered
       %th Speakers Biographies
-      %th Commercial
+      %th Materials
       %th Subtitle
       %th Difficulty Level
       - if @program.tracks.any?

app/views/admin/reports/_events_without_commercials.html.haml

@@ -5,7 +5,7 @@
         Events Without Materials
         = "(#{@events_missing_commercial.length})"
       %p.text-muted
-        All submissions that have no commercial
+        All submissions that have no materials
 .col-md-12
   %table.datatable
     %thead

app/views/admin/reports/index.html.haml

@@ -4,7 +4,7 @@
       = link_to 'All Events', '#all', 'data-toggle' => 'tab'
     %li
       %a{href: '#missing-commercial', 'data-toggle' => 'tab'}
-        Events without Commercials
+        Events without Materials
         %span.label.label-danger{style: 'border-radius: 1em;'}
           = @events_missing_commercial.length
     %li

app/views/admin/venues/_form.html.haml

@@ -56,4 +56,4 @@
             %hr
 
       - else
-        First Create Venue, then update commercial
+        First Create Venue, then update materials

app/views/admin/venues/show.html.haml

@@ -12,7 +12,7 @@
       -else
         - if @venue.commercial.nil?
           .row
-            %img{ "data-src" => "holder.js/500x300?text=No Commercial Set", class: 'img-responsive img-rounded' }
+            %img{ "data-src" => "holder.js/500x300?text=No Materials Set", class: 'img-responsive img-rounded' }
         - else
           - if @venue.commercial.persisted?
             .thumbnail

app/views/proposals/_tooltip.html.haml

@@ -20,7 +20,7 @@
       = link_to 'Add a subtitle', edit_conference_program_proposal_path(event.program.conference.short_title, event)
   %li{'class'=>class_for_todo(progress_status['commercials'])}
     %span{'class'=>icon_for_todo(progress_status['commercials'])}
-      = link_to 'Add a commercial', edit_conference_program_proposal_path(event.program.conference.short_title, event, anchor: 'commercials-content')
+      = link_to 'Add materials', edit_conference_program_proposal_path(event.program.conference.short_title, event, anchor: 'commercials-content')
   - unless progress_status['track'].nil?
     %li{'class'=>class_for_todo(progress_status['track'])}
       %span{'class'=>icon_for_todo(progress_status['track'])}

spec/features/commercials_spec.rb

@@ -19,7 +19,7 @@ feature Commercial do
       fill_in 'commercial_url', with: 'https://www.youtube.com/watch?v=M9bq_alk-sw'
       click_button 'Save Materials'
       page.find('#flash')
-      expect(flash).to eq('Commercial was successfully created.')
+      expect(flash).to eq('Materials were successfully created.')
       page.find('#flash .button.close').click
       expect(conference.commercials.count).to eq(1)
 
@@ -28,7 +28,7 @@ feature Commercial do
       fill_in "commercial_url_#{commercial.id}", with: 'https://www.youtube.com/watch?v=VNkDJk5_9eU'
       click_button 'Update'
       page.find('#flash')
-      expect(flash).to eq('Commercial was successfully updated.')
+      expect(flash).to eq('Materials were successfully updated.')
       page.find('#flash .button.close').click
       expect(conference.commercials.count).to eq(1)
       commercial.reload
@@ -39,7 +39,7 @@ feature Commercial do
         click_link 'Delete'
       end
       page.find('#flash')
-      expect(flash).to eq('Commercial was successfully destroyed.')
+      expect(flash).to eq('Materials were successfully destroyed.')
       expect(conference.commercials.count).to eq(0)
     end
   end
@@ -56,7 +56,7 @@ feature Commercial do
 
     scenario 'adds a valid commercial of an event', feature: true, js: true do
       visit edit_conference_program_proposal_path(conference.short_title, event.id)
-      click_link 'Commercials'
+      click_link 'Materials'
       fill_in 'commercial_url', with: 'https://www.youtube.com/watch?v=M9bq_alk-sw'
 
       # Workaround to enable the 'Save Materials' button
@@ -64,12 +64,12 @@ feature Commercial do
 
       click_button 'Save Materials'
       page.find('#flash')
-      expect(flash).to eq('Commercial was successfully created.')
+      expect(flash).to eq('Materials were successfully created.')
     end
 
     scenario 'does not add an invalid commercial of an event', feature: true, js: true do
       visit edit_conference_program_proposal_path(conference.short_title, event.id)
-      click_link 'Commercials'
+      click_link 'Materials'
       fill_in 'commercial_url', with: 'invalid_commercial_url'
       expect(page).to have_content('No embeddable content')
       expect(page).to have_css("button[type='submit']:disabled", text: 'Save Materials')
@@ -80,11 +80,11 @@ feature Commercial do
                           commercialable_id:   event.id,
                           commercialable_type: 'Event')
       visit edit_conference_program_proposal_path(conference.short_title, event.id)
-      click_link 'Commercials'
+      click_link 'Materials'
       fill_in "commercial_url_#{commercial.id}", with: 'https://www.youtube.com/watch?v=M9bq_alk-sw'
       click_button 'Update'
       page.find('#flash')
-      expect(flash).to eq('Commercial was successfully updated.')
+      expect(flash).to eq('Materials were successfully updated.')
       TransactionalCapybara::AjaxHelpers.wait_for_ajax(page)
       expect(event.commercials.count).to eq(1)
       commercial.reload
@@ -97,12 +97,12 @@ feature Commercial do
                           commercialable_type: 'Event',
                           url:                 'https://www.youtube.com/watch?v=BTTygyxuGj8')
       visit edit_conference_program_proposal_path(conference.short_title, event.id)
-      click_link 'Commercials'
+      click_link 'Materials'
       fill_in "commercial_url_#{commercial.id}", with: 'invalid_commercial_url'
       click_button 'Update'
       find('#flash')
       expect(current_path).to eq edit_conference_program_proposal_path(conference.short_title, event.id)
-      expect(flash).to include('An error prohibited this Commercial from being saved:')
+      expect(flash).to include('An error prohibited materials from being saved:')
       commercial.reload
       expect(commercial.url).to eq('https://www.youtube.com/watch?v=BTTygyxuGj8')
     end
@@ -112,12 +112,12 @@ feature Commercial do
              commercialable_id:   event.id,
              commercialable_type: 'Event')
       visit edit_conference_program_proposal_path(conference.short_title, event.id)
-      click_link 'Commercials'
+      click_link 'Materials'
       page.accept_alert do
         click_link 'Delete'
       end
       page.find('#flash')
-      expect(flash).to eq('Commercial was successfully destroyed.')
+      expect(flash).to eq('Materials were successfully destroyed.')
       TransactionalCapybara::AjaxHelpers.wait_for_ajax(page)
       expect(event.commercials.count).to eq(0)
     end

spec/features/info_desk_ability_spec.rb

@@ -21,7 +21,7 @@ feature 'Has correct abilities' do
       expect(page).to_not have_link('Basics', href: "/admin/conferences/#{conference.short_title}/edit")
       expect(page).to have_text('Basics')
       expect(page).to_not have_link('Contact', href: "/admin/conferences/#{conference.short_title}/contact/edit")
-      expect(page).to have_link('Commercials', href: "/admin/conferences/#{conference.short_title}/commercials")
+      expect(page).to have_link('Materials', href: "/admin/conferences/#{conference.short_title}/commercials")
       expect(page).to_not have_link('Splashpage', href: "/admin/conferences/#{conference.short_title}/splashpage")
       expect(page).to_not have_link('Lodgings', href: "/admin/conferences/#{conference.short_title}/lodgings")
       expect(page).to_not have_link('Registration Period', href: "/admin/conferences/#{conference.short_title}/registration_period")

spec/features/organization_admin_ability_spec.rb

@@ -32,7 +32,7 @@ feature 'Has correct abilities' do
       expect(page).to have_selector('li.nav-header.nav-header-bigger a', text: 'Dashboard')
       expect(page).to have_link('Basics', href: "/admin/conferences/#{conference.short_title}/edit")
       expect(page).to have_link('Contact', href: "/admin/conferences/#{conference.short_title}/contact/edit")
-      expect(page).to have_link('Commercials', href: "/admin/conferences/#{conference.short_title}/commercials")
+      expect(page).to have_link('Materials', href: "/admin/conferences/#{conference.short_title}/commercials")
       expect(page).to have_link('Splashpage', href: "/admin/conferences/#{conference.short_title}/splashpage")
       expect(page).to have_link('Venue', href: "/admin/conferences/#{conference.short_title}/venue")
       expect(page).to have_link('Rooms', href: "/admin/conferences/#{conference.short_title}/venue/rooms")

spec/features/organizer_ability_spec.rb

@@ -35,7 +35,7 @@ feature 'Has correct abilities' do
       expect(page).to have_selector('li.nav-header.nav-header-bigger a', text: 'Dashboard')
       expect(page).to have_link('Basics', href: "/admin/conferences/#{conference.short_title}/edit")
       expect(page).to have_link('Contact', href: "/admin/conferences/#{conference.short_title}/contact/edit")
-      expect(page).to have_link('Commercials', href: "/admin/conferences/#{conference.short_title}/commercials")
+      expect(page).to have_link('Materials', href: "/admin/conferences/#{conference.short_title}/commercials")
       expect(page).to have_link('Splashpage', href: "/admin/conferences/#{conference.short_title}/splashpage")
       expect(page).to have_link('Venue', href: "/admin/conferences/#{conference.short_title}/venue")
       expect(page).to have_link('Rooms', href: "/admin/conferences/#{conference.short_title}/venue/rooms")

spec/features/track_organizer_ability_spec.rb

@@ -23,7 +23,7 @@ feature 'Has correct abilities' do
       expect(page).to_not have_link('Basics', href: "/admin/conferences/#{conference.short_title}/edit")
       expect(page).to have_text('Basics')
       expect(page).to_not have_link('Contact', href: "/admin/conferences/#{conference.short_title}/contact/edit")
-      expect(page).to have_link('Commercials', href: "/admin/conferences/#{conference.short_title}/commercials")
+      expect(page).to have_link('Materials', href: "/admin/conferences/#{conference.short_title}/commercials")
       expect(page).to_not have_link('Splashpage', href: "/admin/conferences/#{conference.short_title}/splashpage")
       expect(page).to_not have_link('Venue', href: "/admin/conferences/#{conference.short_title}/venue")
       expect(page).to_not have_link('Rooms', href: "/admin/conferences/#{conference.short_title}/venue/rooms")

spec/features/versions_spec.rb

@@ -277,9 +277,9 @@ feature 'Version' do
     conference_commercial.destroy
 
     visit admin_revision_history_path
-    expect(page).to have_text("Someone (probably via the console) created new commercial in conference #{conference.short_title}")
+    expect(page).to have_text("Someone (probably via the console) created new materials in conference #{conference.short_title}")
-    expect(page).to have_text("Someone (probably via the console) updated url of commercial in conference #{conference.short_title}")
+    expect(page).to have_text("Someone (probably via the console) updated url of materials in conference #{conference.short_title}")
-    expect(page).to have_text("Someone (probably via the console) deleted commercial in conference #{conference.short_title}")
+    expect(page).to have_text("Someone (probably via the console) deleted materials in conference #{conference.short_title}")
   end
 
   scenario 'display changes in event commercials', feature: true, versioning: true, js: true do
@@ -288,9 +288,9 @@ feature 'Version' do
     event_commercial.destroy
 
     visit admin_revision_history_path
-    expect(page).to have_text("Someone (probably via the console) created new commercial in event #{event_with_commercial.title} in conference #{conference.short_title}")
+    expect(page).to have_text("Someone (probably via the console) created new materals in event #{event_with_commercial.title} in conference #{conference.short_title}")
-    expect(page).to have_text("Someone (probably via the console) updated url of commercial in event #{event_with_commercial.title} in conference #{conference.short_title}")
+    expect(page).to have_text("Someone (probably via the console) updated url of materials in event #{event_with_commercial.title} in conference #{conference.short_title}")
-    expect(page).to have_text("Someone (probably via the console) deleted commercial in event #{event_with_commercial.title} in conference #{conference.short_title}")
+    expect(page).to have_text("Someone (probably via the console) deleted materials in event #{event_with_commercial.title} in conference #{conference.short_title}")
   end
 
   scenario 'display changes in event commercials in event history', feature: true, versioning: true, js: true do
@@ -299,10 +299,10 @@ feature 'Version' do
 
     visit admin_conference_program_event_path(conference.short_title, event_with_commercial)
     click_link 'History'
-    expect(page).to have_text('Someone (probably via the console) created new commercial')
+    expect(page).to have_text('Someone (probably via the console) created new materials')
     visit admin_conference_program_event_path(conference.short_title, event_without_commercial)
     click_link 'History'
-    expect(page).to have_no_text('Someone (probably via the console) created new commercial')
+    expect(page).to have_no_text('Someone (probably via the console) created new materials')
   end
 
   scenario 'display changes in organization', feature: true, versioning: true, js: true do