diff --git a/app/assets/stylesheets/campaign.css.scss b/app/assets/stylesheets/campaign.css.scss index c87ccd1..1440076 100644 --- a/app/assets/stylesheets/campaign.css.scss +++ b/app/assets/stylesheets/campaign.css.scss @@ -2,10 +2,6 @@ body { margin-top: 50px; } -h2 { - margin-top: 0; -} - strong, label, th { color: #395C84; } diff --git a/app/views/campaigns/_campaign.json.jbuilder b/app/views/campaigns/_campaign.json.jbuilder index dc20361..9ec7b20 100644 --- a/app/views/campaigns/_campaign.json.jbuilder +++ b/app/views/campaigns/_campaign.json.jbuilder @@ -1,4 +1,3 @@ -json.key @BETTER_VIDEO_API_KEY json.address campaign.address if campaign.address json.advertisername campaign.advertisername if campaign.advertisername json.awards campaign.awards if campaign.awards diff --git a/app/views/campaigns/edit.html.erb b/app/views/campaigns/edit.html.erb index 8fb8d22..6ae81bb 100644 --- a/app/views/campaigns/edit.html.erb +++ b/app/views/campaigns/edit.html.erb @@ -1,11 +1,7 @@ -
-
-
- <%= 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 +
+ <%= link_to 'Cancel Edit Campaign', campaign_path(@campaign.listingcode) %> | + <%= link_to 'Back to Campaigns', campaigns_path %> +
+

Edit <%= @campaign.advertisername %>

+
+<%= render 'form' %> diff --git a/app/views/campaigns/index.html.erb b/app/views/campaigns/index.html.erb index c3156a1..9d0db2a 100644 --- a/app/views/campaigns/index.html.erb +++ b/app/views/campaigns/index.html.erb @@ -1,39 +1,35 @@ -
-
-

Campaigns

-
- - - - - - - - - - - - - - - - - <% @campaigns.each do |campaign| %> - - - - - - - - - - - - - <% end %> - -
Listing Code (Form Hash)AdvertiserSent?Percent of Videos CompletedAddressCityStateZIP
<%= link_to campaign.listingcode, campaign_path(campaign.listingcode) %><%= campaign.advertisername %> <%= number_to_percentage(campaign.video_completion_percent, precision: 0) %><%= campaign.address %><%= campaign.city %><%= campaign.state %><%= campaign.zip %><%= link_to 'Edit', edit_campaign_path(campaign.listingcode) unless campaign.sent %><%= link_to 'Destroy', campaign_path(campaign.listingcode), method: :delete, data: { confirm: 'Are you sure?' } %>
- <%= link_to 'New Campaign', new_campaign_path unless Rails.env.production? %> -
-
\ No newline at end of file +

Campaigns

+
+ + + + + + + + + + + + + + + + + <% @campaigns.each do |campaign| %> + + + + + + + + + + + + + <% end %> + +
Listing Code (Form Hash)AdvertiserSent?Percent of Videos CompletedAddressCityStateZIP
<%= link_to campaign.listingcode, campaign_path(campaign.listingcode) %><%= campaign.advertisername %> <%= number_to_percentage(campaign.video_completion_percent, precision: 0) %><%= campaign.address %><%= campaign.city %><%= campaign.state %><%= campaign.zip %><%= link_to 'Edit', edit_campaign_path(campaign.listingcode) unless campaign.sent %><%= link_to 'Destroy', campaign_path(campaign.listingcode), method: :delete, data: { confirm: 'Are you sure?' } %>
+<%= link_to 'New Campaign', new_campaign_path unless Rails.env.production? %> diff --git a/app/views/campaigns/new.html.erb b/app/views/campaigns/new.html.erb index 1f2a274..4c8dfe7 100644 --- a/app/views/campaigns/new.html.erb +++ b/app/views/campaigns/new.html.erb @@ -1,10 +1,6 @@ -
-
-
- <%= link_to 'Cancel New Campaign', campaigns_path %> -
-

New Campaign

-
- <%= render 'form' %> -
-
\ No newline at end of file +
+ <%= link_to 'Cancel New Campaign', campaigns_path %> +
+

New Campaign

+
+<%= render 'form' %> diff --git a/app/views/campaigns/show.html.erb b/app/views/campaigns/show.html.erb index 816b752..cac9f5d 100644 --- a/app/views/campaigns/show.html.erb +++ b/app/views/campaigns/show.html.erb @@ -1,5 +1,3 @@ -
-
<%= link_to 'Edit Campaign', edit_campaign_path(@campaign.listingcode) %> | <%= link_to 'Back to Campaigns', campaigns_path %> @@ -149,5 +147,3 @@
- - \ No newline at end of file diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index 4896b8e..234c197 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -21,4 +21,4 @@ <% end %> -<%= link_to "Back", :back %> +<%= link_to "Back", :back %> \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9042e52..1a4cbc3 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -14,7 +14,12 @@
<%= render 'flashes' -%> <%= render 'layouts/header' %> - <%= yield %> +
+
+ <%= yield %> +
+
+
<%= render 'javascript' %> <%= yield :js_foot %> diff --git a/app/views/videolistings/show.html.erb b/app/views/videolistings/show.html.erb index ef3ef46..90a3fd3 100644 --- a/app/views/videolistings/show.html.erb +++ b/app/views/videolistings/show.html.erb @@ -3,8 +3,6 @@ <% end %> -
-
<%= link_to 'Back to Campaign', campaign_path(@videolisting.campaign.listingcode) %> | <%= link_to 'Back to Campaigns List', campaigns_path %> @@ -36,8 +34,6 @@
- -