From ca2c204b67b7e030b5df0fa85147e64edcb6ff71 Mon Sep 17 00:00:00 2001 From: Bret Haynie Date: Thu, 24 Apr 2014 21:32:32 -0400 Subject: [PATCH 1/4] added default bootstrap navbar --- app/assets/stylesheets/campaign.css.scss | 7 +++ app/views/campaigns/index.html.erb | 72 ++++++++++++------------ app/views/campaigns/show.html.erb | 1 + app/views/layouts/_header.html.erb | 30 +++++++--- 4 files changed, 67 insertions(+), 43 deletions(-) diff --git a/app/assets/stylesheets/campaign.css.scss b/app/assets/stylesheets/campaign.css.scss index 0009ae7..d8f8046 100644 --- a/app/assets/stylesheets/campaign.css.scss +++ b/app/assets/stylesheets/campaign.css.scss @@ -1,3 +1,10 @@ +nav { + background: #f9f9f9; +} +section { + margin-top: 70px; +} + $medgray: #3A9AC9; .videolisting { diff --git a/app/views/campaigns/index.html.erb b/app/views/campaigns/index.html.erb index ba4d950..1cf657c 100644 --- a/app/views/campaigns/index.html.erb +++ b/app/views/campaigns/index.html.erb @@ -1,36 +1,36 @@ -

Listing campaigns

- - - - - - - - - - - - - - - - - <% @campaigns.each do |campaign| %> - - - - - - - - - - - - <% end %> - -
Listing Code(Form Hash)Processed?Billing CodeAddressCityStateZIP
<%= link_to campaign.listingcode, campaign_path(campaign.listingcode) %> <%= campaign.billingcode %><%= campaign.address %><%= campaign.city %><%= campaign.state %><%= campaign.zip %><%= link_to 'Edit', edit_campaign_path(campaign.listingcode) %><%= link_to 'Destroy', campaign_path(campaign.listingcode), method: :delete, data: { confirm: 'Are you sure?' } %>
- -
- -<%= link_to 'New Campaign', new_campaign_path %> +
+
+

Listing Campaigns

+ + + + + + + + + + + + + + + + <% @campaigns.each do |campaign| %> + + + + + + + + + + + + <% end %> + +
Listing Code (Form Hash)Processed?Billing CodeAddressCityStateZIP
<%= link_to campaign.listingcode, campaign_path(campaign.listingcode) %> <%= campaign.billingcode %><%= campaign.address %><%= campaign.city %><%= campaign.state %><%= campaign.zip %><%= link_to 'Edit', edit_campaign_path(campaign.listingcode) %><%= link_to 'Destroy', campaign_path(campaign.listingcode), method: :delete, data: { confirm: 'Are you sure?' } %>
+ <%= link_to 'Add New Campaign', new_campaign_path %> +
+
\ No newline at end of file diff --git a/app/views/campaigns/show.html.erb b/app/views/campaigns/show.html.erb index 3d1c7d1..d38a6d3 100644 --- a/app/views/campaigns/show.html.erb +++ b/app/views/campaigns/show.html.erb @@ -1,3 +1,4 @@ +


<%= link_to 'Edit', edit_campaign_path(@campaign.listingcode) %> | <%= link_to 'Back', campaigns_path %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 88bd735..28e821d 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,7 +1,23 @@ -<% if user_signed_in? %> - <%= link_to "Profile", edit_user_registration_path %> - <%= link_to "Logout", destroy_user_session_path, :method => :delete %> -<% else %> - <%= link_to "Sign in", new_user_session_path %> -<% end %> ------ + \ No newline at end of file From 4ae85e69b4a98b13690ebc93d98fe1943c8bd9cd Mon Sep 17 00:00:00 2001 From: Bret Haynie Date: Thu, 24 Apr 2014 22:02:21 -0400 Subject: [PATCH 2/4] changed some subnav wording around --- app/views/campaigns/edit.html.erb | 12 +- app/views/campaigns/index.html.erb | 2 +- app/views/campaigns/show.html.erb | 193 +++++++++++++++-------------- 3 files changed, 106 insertions(+), 101 deletions(-) diff --git a/app/views/campaigns/edit.html.erb b/app/views/campaigns/edit.html.erb index 8be9899..a691abe 100644 --- a/app/views/campaigns/edit.html.erb +++ b/app/views/campaigns/edit.html.erb @@ -1,6 +1,10 @@ -<%= link_to 'Show', campaign_path(@campaign.listingcode) %> | -<%= link_to 'Back', campaigns_path %> +
+
+ <%= link_to 'Cancel Edit', campaign_path(@campaign.listingcode) %> + -

Editing <%= @campaign.advertisername %>

+

Edit <%= @campaign.advertisername %>

-<%= render 'form' %> \ No newline at end of file + <%= render 'form' %> +
+
\ No newline at end of file diff --git a/app/views/campaigns/index.html.erb b/app/views/campaigns/index.html.erb index 1cf657c..2e05b41 100644 --- a/app/views/campaigns/index.html.erb +++ b/app/views/campaigns/index.html.erb @@ -1,6 +1,6 @@
-

Listing Campaigns

+

Campaigns

diff --git a/app/views/campaigns/show.html.erb b/app/views/campaigns/show.html.erb index d38a6d3..dbe6a56 100644 --- a/app/views/campaigns/show.html.erb +++ b/app/views/campaigns/show.html.erb @@ -1,8 +1,7 @@ -


-<%= link_to 'Edit', edit_campaign_path(@campaign.listingcode) %> | -<%= link_to 'Back', campaigns_path %> - - +
+
+ <%= link_to 'Edit Campaign', edit_campaign_path(@campaign.listingcode) %> +

<%= @campaign.advertisername %> @@ -10,96 +9,98 @@

<%= notice %>

-
- - Listing Code - <%= @campaign.listingcode %> - - - Description - <%= @campaign.description %> - - - Products & Services - <%= @campaign.productsandservices %> - - - Websiteurl - <%= @campaign.websiteurl %> - - - Client Services Rep - <%= @campaign.vpa %> - - - Billing Code - <%= @campaign.billingcode %> - - - Email Address - <%= @campaign.emailaddress %> - - - Business Phone - <%= number_to_phone @campaign.businessphone %> - - - Contact Phone - <%= number_to_phone @campaign.contactphone %> - - - Customer First Name - <%= @campaign.customerfirstname %> - - - Customer Last Name - <%= @campaign.customerlastname %> - - - Address - <%= @campaign.address %> - - - City, State, Zip - <%= @campaign.city %>, <%= us_states item: @campaign.state %>, <%= @campaign.zip %> - - - Awards - <%= @campaign.awards %> - - - Background - <%= @campaign.background %> - - - Industry Categories - <%= @campaign.categories %> - - - Company Colors - <%= @campaign.companycolors %> - - - Facebook URL - <%= @campaign.facebookurl %> - - - Target Audience - <%= @campaign.targetaudience %> - - - Tollfree Phone - <%= @campaign.tollfreephone %> - -
-
-
    - <% @campaign.videolistings.each do |videolisting| %> - <%= render 'videolisting', videolisting: videolisting %> - <% end %> - <% if @campaign.videolistings.empty? %> -
  • No Video Listings for this Campaign.
  • - <% end %> -
+
+ + Listing Code + <%= @campaign.listingcode %> + + + Description + <%= @campaign.description %> + + + Products & Services + <%= @campaign.productsandservices %> + + + Websiteurl + <%= @campaign.websiteurl %> + + + Client Services Rep + <%= @campaign.vpa %> + + + Billing Code + <%= @campaign.billingcode %> + + + Email Address + <%= @campaign.emailaddress %> + + + Business Phone + <%= number_to_phone @campaign.businessphone %> + + + Contact Phone + <%= number_to_phone @campaign.contactphone %> + + + Customer First Name + <%= @campaign.customerfirstname %> + + + Customer Last Name + <%= @campaign.customerlastname %> + + + Address + <%= @campaign.address %> + + + City, State, Zip + <%= @campaign.city %>, <%= us_states item: @campaign.state %>, <%= @campaign.zip %> + + + Awards + <%= @campaign.awards %> + + + Background + <%= @campaign.background %> + + + Industry Categories + <%= @campaign.categories %> + + + Company Colors + <%= @campaign.companycolors %> + + + Facebook URL + <%= @campaign.facebookurl %> + + + Target Audience + <%= @campaign.targetaudience %> + + + Tollfree Phone + <%= @campaign.tollfreephone %> +
+
+
    + <% @campaign.videolistings.each do |videolisting| %> + <%= render 'videolisting', videolisting: videolisting %> + <% end %> + <% if @campaign.videolistings.empty? %> +
  • No Video Listings for this Campaign.
  • + <% end %> +
+
+
+
\ No newline at end of file From 80f47a210de396c0223e4a09bfdced211aed27a4 Mon Sep 17 00:00:00 2001 From: Bret Haynie Date: Fri, 25 Apr 2014 11:50:37 -0400 Subject: [PATCH 3/4] made campaigns, show, and edit pages consistent --- app/assets/stylesheets/campaign.css.scss | 82 ++++--- app/views/campaigns/_form.html.erb | 12 +- app/views/campaigns/_videolisting.html.erb | 48 ++--- .../campaigns/_videolisting_fields.html.erb | 2 +- app/views/campaigns/edit.html.erb | 9 +- app/views/campaigns/index.html.erb | 3 +- app/views/campaigns/new.html.erb | 16 +- app/views/campaigns/show.html.erb | 201 +++++++++--------- 8 files changed, 192 insertions(+), 181 deletions(-) diff --git a/app/assets/stylesheets/campaign.css.scss b/app/assets/stylesheets/campaign.css.scss index d8f8046..d91030a 100644 --- a/app/assets/stylesheets/campaign.css.scss +++ b/app/assets/stylesheets/campaign.css.scss @@ -1,10 +1,17 @@ -nav { - background: #f9f9f9; -} section { margin-top: 70px; } +ul { + list-style: none; + padding-left: 0; +} + +.help-block { + font-size: .85em; +} + + $medgray: #3A9AC9; .videolisting { @@ -12,61 +19,68 @@ $medgray: #3A9AC9; color: #fff; } - input { - border: 2px inset; + // input { + // border: 2px inset; + // } + + .nested-fields { + -webkit-border-radius: 1em; + -moz-border-radius: 1em; + border-radius: 1em; + margin-bottom: 1em; + padding: 1em; + .help-block, strong, p { + color: #ffffff; + } } .nested-fields:nth-of-type(odd){ background-color: #395C84; - padding: 10px; - .help-block{ - color: #ccc; - } } + .nested-fields:nth-of-type(even) { - background-color: lighten(#456A92, 10); - padding: 10px; + background-color: lighten(#395C84, 10%); } - .even, .odd { - .help-block{ - color: #ccc; + .blah { + a { + color: #ffffff; + font-weight: bold; } } + } .campaigns { - input { + input, select, textarea { width: 100%; } - input[type="submit"] { - width: 131px + margin-bottom: 1em; + width: auto; } - textarea { - width: 100%; height: 5em; } - - select { - width: 100%; + .control-group { + margin-bottom: 1em; } - .campaign-item, .videolisting-item { - display: block; - strong { - display: block; - } - span { - padding-left: 2em; - } - span.list-item { - display: block; - } - } + // .campaign-item, .videolisting-item { + // display: block; + // strong { + // display: block; + // } + // span { + // padding-left: 2em; + // } + // span.list-item { + // display: block; + // } + // } + span.tag.label.label-info { display: block; margin-bottom: 1px; diff --git a/app/views/campaigns/_form.html.erb b/app/views/campaigns/_form.html.erb index cf6b752..0cf07c6 100644 --- a/app/views/campaigns/_form.html.erb +++ b/app/views/campaigns/_form.html.erb @@ -6,7 +6,7 @@ }) do |frm| %> <% if @campaign.errors.any? %>
-
+

<%= pluralize(@campaign.errors.count, "error") %> prohibited this campaign from being saved:

    <% @campaign.errors.full_messages.each do |msg| %> @@ -17,9 +17,8 @@
<% end %> -
-
+
<%= frm.input :advertisername, label: 'Advertiser Name', hint: "The name of the company." %> @@ -86,18 +85,17 @@ hint: "Toll-free phone number of business. Used in video creation." %>
-
+
<%= frm.simple_fields_for(:videolistings, html: {class: 'form-horizontal'}) do |videolisting| %> <%= render 'videolisting_fields', :f => videolisting %> <% end %>
-
<%= frm.submit %>
-<% end %> +<% end %> \ No newline at end of file diff --git a/app/views/campaigns/_videolisting.html.erb b/app/views/campaigns/_videolisting.html.erb index d4eaa13..d82612f 100644 --- a/app/views/campaigns/_videolisting.html.erb +++ b/app/views/campaigns/_videolisting.html.erb @@ -1,29 +1,23 @@ -
  • - - Video Code - <%= videolisting.videocode %> - - - Voiceover Selection - <%= voiceoverselection_list item:videolisting.voiceoverselection %> - - - Music Selection - <%= musicselection_list item:videolisting.musicselection %> - - - Client Provided Script - <%= videolisting.clientprovidedscript %> - - - Production Notes - <%= videolisting.notes %> - - - asseturls - +
      +
    • +

      Video Code
      + <%= videolisting.videocode %>

      +
    • +

      Voiceover Selection
      + <%= voiceoverselection_list item:videolisting.voiceoverselection %>

      +
    • +

      Music Selection
      + <%= musicselection_list item:videolisting.musicselection %>

      +
    • +

      Client Provided Script
      + <%= videolisting.clientprovidedscript %>

      +
    • +

      Production Notes
      + <%= videolisting.notes %>

      +
    • +

      asseturls
      <% videolisting.asseturls_array.each do |asset| %> - <%= asset[:asseturl] %> + <%= asset[:asseturl] %>

      <% end %> - -
    • \ No newline at end of file + +
    \ No newline at end of file diff --git a/app/views/campaigns/_videolisting_fields.html.erb b/app/views/campaigns/_videolisting_fields.html.erb index ea5a1a1..9f99c19 100644 --- a/app/views/campaigns/_videolisting_fields.html.erb +++ b/app/views/campaigns/_videolisting_fields.html.erb @@ -21,5 +21,5 @@ label: 'Asset Urls', hint: "A list of all file assets. Comma Separated, (press backspace or click the x to remove)", input_html: {data: {role: "tagsinput" }, value: ""} %> - {<%= link_to_remove_association "Remove Videolisting", f %>} +
    <%= link_to_remove_association "Remove Video Listing", f %>
  • diff --git a/app/views/campaigns/edit.html.erb b/app/views/campaigns/edit.html.erb index a691abe..8fb8d22 100644 --- a/app/views/campaigns/edit.html.erb +++ b/app/views/campaigns/edit.html.erb @@ -1,10 +1,11 @@
    - <%= link_to 'Cancel Edit', campaign_path(@campaign.listingcode) %> - - +
    + <%= link_to 'Cancel Edit Campaign', campaign_path(@campaign.listingcode) %> | + <%= link_to 'Back to Campaigns', campaigns_path %> +

    Edit <%= @campaign.advertisername %>

    - +
    <%= render 'form' %>
    \ No newline at end of file diff --git a/app/views/campaigns/index.html.erb b/app/views/campaigns/index.html.erb index 2e05b41..ed50382 100644 --- a/app/views/campaigns/index.html.erb +++ b/app/views/campaigns/index.html.erb @@ -1,6 +1,7 @@

    Campaigns

    +
    @@ -31,6 +32,6 @@ <% end %>
    - <%= link_to 'Add New Campaign', new_campaign_path %> + <%= link_to 'New Campaign', new_campaign_path %>
    \ No newline at end of file diff --git a/app/views/campaigns/new.html.erb b/app/views/campaigns/new.html.erb index 03c4e13..1f2a274 100644 --- a/app/views/campaigns/new.html.erb +++ b/app/views/campaigns/new.html.erb @@ -1,8 +1,10 @@ -<%= link_to 'Back', campaigns_path %> -
    - -

    New campaign

    - -<%= render 'form' %> - +
    +
    +
    + <%= link_to 'Cancel New Campaign', campaigns_path %> +
    +

    New Campaign

    +
    + <%= render 'form' %> +
    \ No newline at end of file diff --git a/app/views/campaigns/show.html.erb b/app/views/campaigns/show.html.erb index dbe6a56..6b81f34 100644 --- a/app/views/campaigns/show.html.erb +++ b/app/views/campaigns/show.html.erb @@ -1,106 +1,107 @@
    - <%= link_to 'Edit Campaign', edit_campaign_path(@campaign.listingcode) %> - -
    -

    - <%= @campaign.advertisername %> -

    -

    <%= notice %>

    +
    + <%= link_to 'Edit Campaign', edit_campaign_path(@campaign.listingcode) %> | + <%= link_to 'Back to Campaigns', campaigns_path %>
    - -
    - - Listing Code - <%= @campaign.listingcode %> - - - Description - <%= @campaign.description %> - - - Products & Services - <%= @campaign.productsandservices %> - - - Websiteurl - <%= @campaign.websiteurl %> - - - Client Services Rep - <%= @campaign.vpa %> - - - Billing Code - <%= @campaign.billingcode %> - - - Email Address - <%= @campaign.emailaddress %> - - - Business Phone - <%= number_to_phone @campaign.businessphone %> - - - Contact Phone - <%= number_to_phone @campaign.contactphone %> - - - Customer First Name - <%= @campaign.customerfirstname %> - - - Customer Last Name - <%= @campaign.customerlastname %> - - - Address - <%= @campaign.address %> - - - City, State, Zip - <%= @campaign.city %>, <%= us_states item: @campaign.state %>, <%= @campaign.zip %> - - - Awards - <%= @campaign.awards %> - - - Background - <%= @campaign.background %> - - - Industry Categories - <%= @campaign.categories %> - - - Company Colors - <%= @campaign.companycolors %> - - - Facebook URL - <%= @campaign.facebookurl %> - - - Target Audience - <%= @campaign.targetaudience %> - - - Tollfree Phone - <%= @campaign.tollfreephone %> - -
    - -
    -
      - <% @campaign.videolistings.each do |videolisting| %> - <%= render 'videolisting', videolisting: videolisting %> - <% end %> - <% if @campaign.videolistings.empty? %> -
    • No Video Listings for this Campaign.
    • - <% end %> -
    +

    <%= @campaign.advertisername %>

    +
    +

    <%= notice %>

    +
    +
    +
      +
    • +

      Listing Code
      + <%= @campaign.listingcode %>

      +
    • +
    • +

      Description
      + <%= @campaign.description %>

      +
    • +
    • +

      Products & Services
      + <%= @campaign.productsandservices %>

      +
    • +
    • +

      Websiteurl
      + <%= @campaign.websiteurl %>

      +
    • +
    • +

      Client Services Rep
      + <%= @campaign.vpa %>

      +
    • +
    • +

      Billing Code
      + <%= @campaign.billingcode %>

      +
    • +
    • +

      Email Address
      + <%= @campaign.emailaddress %>

      +
    • +
    • +

      Business Phone
      + <%= number_to_phone @campaign.businessphone %>

      +
    • +
    • +

      Contact Phone
      + <%= number_to_phone @campaign.contactphone %>

      +
    • +
    • +

      Customer First Name
      + <%= @campaign.customerfirstname %>

      +
    • +
    • +

      Customer Last Name
      + <%= @campaign.customerlastname %>

      +
    • +
    • +

      Address
      + <%= @campaign.address %>

      +
    • +
    • +

      City, State, Zip
      + <%= @campaign.city %>, <%= us_states item: @campaign.state %>, <%= @campaign.zip %>

      +
    • +
    • +

      Awards
      + <%= @campaign.awards %>

      +
    • +
    • +

      Background
      + <%= @campaign.background %>

      +
    • +
    • +

      Industry Categories
      + <%= @campaign.categories %>

      +
    • +
    • +

      Company Colors
      + <%= @campaign.companycolors %>

      +
    • +
    • +

      Facebook URL
      + <%= @campaign.facebookurl %>

      +
    • +
    • +

      Target Audience
      + <%= @campaign.targetaudience %>

      +
    • +
    • +

      Tollfree Phone
      + <%= @campaign.tollfreephone %>

      +
    • +
    +
    +
    +
      + <% @campaign.videolistings.each do |videolisting| %> +
    • <%= render 'videolisting', videolisting: videolisting %>
    • + <% end %> + <% if @campaign.videolistings.empty? %> +
    • No Video Listings for this Campaign.

    • + <% end %> +
    +
    \ No newline at end of file From 5e1bd186a760938b17fbc4f0f21a6ab4a793fdbd Mon Sep 17 00:00:00 2001 From: Tyrel Souza Date: Fri, 25 Apr 2014 12:13:44 -0400 Subject: [PATCH 4/4] changes for bret --- app/views/campaigns/_videolisting.html.erb | 33 ++-- app/views/campaigns/show.html.erb | 200 ++++++++++++--------- 2 files changed, 142 insertions(+), 91 deletions(-) diff --git a/app/views/campaigns/_videolisting.html.erb b/app/views/campaigns/_videolisting.html.erb index d82612f..cd9f4ff 100644 --- a/app/views/campaigns/_videolisting.html.erb +++ b/app/views/campaigns/_videolisting.html.erb @@ -2,22 +2,33 @@
  • Video Code
    <%= videolisting.videocode %>

    +
  • Voiceover Selection
    <%= voiceoverselection_list item:videolisting.voiceoverselection %>

    +
  • Music Selection
    <%= musicselection_list item:videolisting.musicselection %>

    -
  • -

    Client Provided Script
    - <%= videolisting.clientprovidedscript %>

    -
  • -

    Production Notes
    - <%= videolisting.notes %>

    -
  • -

    asseturls
    - <% videolisting.asseturls_array.each do |asset| %> - <%= asset[:asseturl] %>

    - <% end %>
  • + <% unless videolisting.clientprovidedscript.empty? %> +
  • +

    Client Provided Script
    + <%= videolisting.clientprovidedscript %>

    +
  • + <% end %> + <% unless videolisting.notes.empty? %> +
  • +

    Production Notes
    + <%= videolisting.notes %>

    +
  • + <% end %> + <% unless videolisting.asseturls.empty? %> +
  • +

    asseturls
    + <% videolisting.asseturls_array.each do |asset| %> + <%= asset[:asseturl] %>

    + <% end %> +
  • + <% end %> \ No newline at end of file diff --git a/app/views/campaigns/show.html.erb b/app/views/campaigns/show.html.erb index 6b81f34..0ee610e 100644 --- a/app/views/campaigns/show.html.erb +++ b/app/views/campaigns/show.html.erb @@ -10,86 +10,126 @@
      -
    • -

      Listing Code
      - <%= @campaign.listingcode %>

      -
    • -
    • -

      Description
      - <%= @campaign.description %>

      -
    • -
    • -

      Products & Services
      - <%= @campaign.productsandservices %>

      -
    • -
    • -

      Websiteurl
      - <%= @campaign.websiteurl %>

      -
    • -
    • -

      Client Services Rep
      - <%= @campaign.vpa %>

      -
    • -
    • -

      Billing Code
      - <%= @campaign.billingcode %>

      -
    • -
    • -

      Email Address
      - <%= @campaign.emailaddress %>

      -
    • -
    • -

      Business Phone
      - <%= number_to_phone @campaign.businessphone %>

      -
    • -
    • -

      Contact Phone
      - <%= number_to_phone @campaign.contactphone %>

      -
    • -
    • -

      Customer First Name
      - <%= @campaign.customerfirstname %>

      -
    • -
    • -

      Customer Last Name
      - <%= @campaign.customerlastname %>

      -
    • -
    • -

      Address
      - <%= @campaign.address %>

      -
    • -
    • -

      City, State, Zip
      - <%= @campaign.city %>, <%= us_states item: @campaign.state %>, <%= @campaign.zip %>

      -
    • -
    • -

      Awards
      - <%= @campaign.awards %>

      -
    • -
    • -

      Background
      - <%= @campaign.background %>

      -
    • -
    • -

      Industry Categories
      - <%= @campaign.categories %>

      -
    • -
    • -

      Company Colors
      - <%= @campaign.companycolors %>

      -
    • -
    • -

      Facebook URL
      - <%= @campaign.facebookurl %>

      -
    • -
    • -

      Target Audience
      - <%= @campaign.targetaudience %>

      -
    • -
    • -

      Tollfree Phone
      - <%= @campaign.tollfreephone %>

      -
    • + <% unless @campaign.listingcode.empty? %> +
    • +

      Listing Code
      + <%= @campaign.listingcode %>

      +
    • + <% end %> + <% unless @campaign.description.empty? %> +
    • +

      Description
      + <%= @campaign.description %>

      +
    • + <% end %> + <% unless @campaign.productsandservices.empty? %> +
    • +

      Products & Services
      + <%= @campaign.productsandservices %>

      +
    • + <% end %> + <% unless @campaign.websiteurl.empty? %> +
    • +

      Websiteurl
      + <%= @campaign.websiteurl %>

      +
    • + <% end %> + <% unless @campaign.vpa.empty? %> +
    • +

      Client Services Rep
      + <%= @campaign.vpa %>

      +
    • + <% end %> + <% unless @campaign.billingcode.empty? %> +
    • +

      Billing Code
      + <%= @campaign.billingcode %>

      +
    • + <% end %> + <% unless @campaign.emailaddress.empty? %> +
    • +

      Email Address
      + <%= @campaign.emailaddress %>

      +
    • + <% end %> + <% unless @campaign.businessphone.empty? %> +
    • +

      Business Phone
      + <%= number_to_phone @campaign.businessphone %>

      +
    • + <% end %> + <% unless @campaign.contactphone.empty? %> +
    • +

      Contact Phone
      + <%= number_to_phone @campaign.contactphone %>

      +
    • + <% end %> + <% unless @campaign.customerfirstname.empty? %> +
    • +

      Customer First Name
      + <%= @campaign.customerfirstname %>

      +
    • + <% end %> + <% unless @campaign.customerlastname.empty? %> +
    • +

      Customer Last Name
      + <%= @campaign.customerlastname %>

      +
    • + <% end %> + <% unless @campaign.address.empty? %> +
    • +

      Address
      + <%= @campaign.address %>

      +
    • + <% end %> + <% if @campaign.city.empty? || @campaign.state || @campaign.zip %> +
    • +

      City, State, Zip
      + <%= @campaign.city %>, <%= us_states item: @campaign.state %>, <%= @campaign.zip %>

      +
    • + <% end %> + <% unless @campaign.awards %>.empty? +
    • +

      Awards
      + <%= @campaign.awards %>

      +
    • + <% end %> + <% unless @campaign.background.empty? %> +
    • +

      Background
      + <%= @campaign.background %>

      +
    • + <% end %> + <% unless @campaign.categories.empty? %> +
    • +

      Industry Categories
      + <%= @campaign.categories %>

      +
    • + <% end %> + <% unless @campaign.companycolors.empty? %> +
    • +

      Company Colors
      + <%= @campaign.companycolors %>

      +
    • + <% end %> + <% unless @campaign.facebookurl.empty? %> +
    • +

      Facebook URL
      + <%= @campaign.facebookurl %>

      +
    • + <% end %> + <% unless @campaign.targetaudience.empty? %> +
    • +

      Target Audience
      + <%= @campaign.targetaudience %>

      +
    • + <% end %> + <% unless @campaign.tollfreephone.empty? %> +
    • +

      Tollfree Phone
      + <%= @campaign.tollfreephone %>

      +
    • + <% end %>