Remove fields

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',

app/views/campaigns/_videolisting.html.erb

@@ -4,31 +4,23 @@
     <span><%= videolisting.videocode %></span>
   </span>
   <span class="videolisting-item">
-    <strong>producttypeid</strong>
+    <strong>Video Type</strong>
     <span><%= producttypeid_list item:videolisting.producttypeid %></span>
   </span>
   <span class="videolisting-item">
-    <strong>voiceoverselection</strong>
+    <strong>Voiceover Selection</strong>
     <span><%= voiceoverselection_list item:videolisting.voiceoverselection %></span>
   </span>
   <span class="videolisting-item">
-    <strong>musicselection</strong>
+    <strong>Music Selection</strong>
     <span><%= musicselection_list item:videolisting.musicselection %></span>
   </span>
   <span class="videolisting-item">
-    <strong>clientprovidedscript</strong>
+    <strong>Client Provided Script</strong>
     <span><%= videolisting.clientprovidedscript %></span>
   </span>
   <span class="videolisting-item">
-    <strong>keywords</strong>
+    <strong>Production Notes</strong>
-    <span><%= videolisting.keywords %></span>
-  </span>
-  <span class="videolisting-item">
-    <strong>focus</strong>
-    <span><%= videolisting.focus %></span>
-  </span>
-  <span class="videolisting-item">
-    <strong>notes</strong>
     <span><%= videolisting.notes %></span>
   </span>
   <span class="videolisting-item">

app/views/campaigns/show.html.erb

@@ -75,7 +75,7 @@
           <span><%= @campaign.background %></span>
         </span>
         <span class="campaign-item">
-          <strong>Categories</strong>
+          <strong>Industry Categories</strong>
           <span><%= @campaign.categories %></span>
         </span>
         <span class="campaign-item">

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

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"

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