From 6b5f096c5774e37c037e66e558a2627a6755635e Mon Sep 17 00:00:00 2001 From: Tyrel Souza Date: Wed, 23 Apr 2014 17:59:19 -0400 Subject: [PATCH] Remove fields --- app/views/campaigns/_form.html.erb | 8 +++----- app/views/campaigns/_videolisting.html.erb | 18 +++++------------- app/views/campaigns/show.html.erb | 2 +- ...ove_keywords_and_focus_from_videolisting.rb | 6 ++++++ db/schema.rb | 4 +--- spec/factories/videolistings.rb | 2 -- 6 files changed, 16 insertions(+), 24 deletions(-) create mode 100644 db/migrate/20140423215738_remove_keywords_and_focus_from_videolisting.rb diff --git a/app/views/campaigns/_form.html.erb b/app/views/campaigns/_form.html.erb index 3b60592..2d21a6a 100644 --- a/app/views/campaigns/_form.html.erb +++ b/app/views/campaigns/_form.html.erb @@ -46,7 +46,7 @@ hint: "Used for script research and may be used in the video if they are including websites in the video graphics." %> <%= frm.input :vpa, label: 'Client Service Rep', - hint: "This is the full name of the client services representative, as entered in the BetteVideo system associated with this order. This feature is designed for sales reps that are well known to the system. This feature is typically used for automated communication." %> + hint: "This is the full name of the client services representative, as entered in the BetterVideo system associated with this order. This feature is designed for sales reps that are well known to the system. This feature is typically used for automated communication." %> <%= frm.input :billingcode, label: 'Billing Code', hint: "Market or billing code. Should match a billing code in the BetterVideo system so it can be associated." %> @@ -77,17 +77,15 @@ label: 'Background', hint: "This is the background of the company and is used for script research." %> <%= frm.input :categories, - label: 'Categories', + label: 'Industry Categories', hint: "Used in script and video research." %> <%= frm.input :companycolors, label: 'Company Colors', hint: "Comma separated.", placeholder: "ex: red, white, blue" %> - <%= frm.input :facebookurl, label: 'Facebook URL', hint: "Used for script and photo research." %> - <%= frm.input :targetaudience, label: 'Target Audience', hint: "Used in script and video research." %> @@ -126,7 +124,7 @@ label: 'Focus', hint: "Information used to guide BetterVideo in creating the video." %> <%= vidlist.input :notes, - label: 'Notes', + label: 'Production Notes', hint: "Notes and/or instructions sent in this field are used by the editors to aid in production of the video." %> <%= vidlist.input :asseturls, label: 'Asset Urls', diff --git a/app/views/campaigns/_videolisting.html.erb b/app/views/campaigns/_videolisting.html.erb index 5b8d3d8..d5c85b3 100644 --- a/app/views/campaigns/_videolisting.html.erb +++ b/app/views/campaigns/_videolisting.html.erb @@ -4,31 +4,23 @@ <%= videolisting.videocode %> - producttypeid + Video Type <%= producttypeid_list item:videolisting.producttypeid %> - voiceoverselection + Voiceover Selection <%= voiceoverselection_list item:videolisting.voiceoverselection %> - musicselection + Music Selection <%= musicselection_list item:videolisting.musicselection %> - clientprovidedscript + Client Provided Script <%= videolisting.clientprovidedscript %> - keywords - <%= videolisting.keywords %> - - - focus - <%= videolisting.focus %> - - - notes + Production Notes <%= videolisting.notes %> diff --git a/app/views/campaigns/show.html.erb b/app/views/campaigns/show.html.erb index 7fdc902..c93c555 100644 --- a/app/views/campaigns/show.html.erb +++ b/app/views/campaigns/show.html.erb @@ -75,7 +75,7 @@ <%= @campaign.background %> - Categories + Industry Categories <%= @campaign.categories %> diff --git a/db/migrate/20140423215738_remove_keywords_and_focus_from_videolisting.rb b/db/migrate/20140423215738_remove_keywords_and_focus_from_videolisting.rb new file mode 100644 index 0000000..e5545ab --- /dev/null +++ b/db/migrate/20140423215738_remove_keywords_and_focus_from_videolisting.rb @@ -0,0 +1,6 @@ +class RemoveKeywordsAndFocusFromVideolisting < ActiveRecord::Migration + def change + remove_column :videolistings, :keywords + remove_column :videolistings, :focus + end +end diff --git a/db/schema.rb b/db/schema.rb index ea25404..03a355b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140421171931) do +ActiveRecord::Schema.define(version: 20140423215738) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -106,8 +106,6 @@ ActiveRecord::Schema.define(version: 20140421171931) do t.integer "voiceoverselection" t.integer "musicselection" t.string "clientprovidedscript" - t.string "keywords" - t.string "focus" t.string "notes" t.string "asseturls", default: "{}" t.datetime "created_at" diff --git a/spec/factories/videolistings.rb b/spec/factories/videolistings.rb index 7364d26..ef15d4f 100644 --- a/spec/factories/videolistings.rb +++ b/spec/factories/videolistings.rb @@ -4,8 +4,6 @@ FactoryGirl.define do factory :videolisting do asseturls "http://s3.amazon.com/555555/catering.jpg,http://s3.amazon.com/555555/bbq.jpg,http://s3.amazon.com/555555/bob.jpg,http://s3.amazon.com/555555/party.jpg" clientprovidedscript "Bob's BBQ knows how to cater your next event..." - focus "Catering and Bob's abilityto serve large crowds" - keywords "Catering, Large Parties, Birthdays, Celebrations" musicselection 5 notes "Bob would like to focus on family gatherings" producttypeid 720