tyrel/vidpush
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged pretty styling

Browse Source
This commit is contained in:
Tyrel Souza 2014-04-25 12:15:23 -04:00
commit f7bd18de33
9 changed files with 315 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
app/assets/stylesheets/campaign.css.scss
View File

@ -1,3 +1,17 @@
section {
margin-top: 70px;
}
ul {
list-style: none;
padding-left: 0;
}
.help-block {
font-size: .85em;
}
$medgray: #3A9AC9; $medgray: #3A9AC9;
.videolisting { .videolisting {
@ -5,61 +19,68 @@ $medgray: #3A9AC9;
color: #fff; color: #fff;
} }
input { // input {
border: 2px inset; // 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){ .nested-fields:nth-of-type(odd){
background-color: #395C84; background-color: #395C84;
padding: 10px;
.help-block{
color: #ccc;
}
} }
.nested-fields:nth-of-type(even) { .nested-fields:nth-of-type(even) {
background-color: lighten(#456A92, 10); background-color: lighten(#395C84, 10%);
padding: 10px;
} }
.even, .odd { .blah {
.help-block{ a {
color: #ccc; color: #ffffff;
font-weight: bold;
} }
} }
} }
.campaigns { .campaigns {
input { input, select, textarea {
width: 100%; width: 100%;
} }
input[type="submit"] { input[type="submit"] {
width: 131px margin-bottom: 1em;
width: auto;
} }
textarea { textarea {
width: 100%;
height: 5em; height: 5em;
} }
.control-group {
select { margin-bottom: 1em;
width: 100%;
} }
.campaign-item, .videolisting-item { // .campaign-item, .videolisting-item {
display: block; // display: block;
strong { // strong {
display: block; // display: block;
} // }
span { // span {
padding-left: 2em; // padding-left: 2em;
} // }
span.list-item { // span.list-item {
display: block; // display: block;
} // }
} // }
span.tag.label.label-info { span.tag.label.label-info {
display: block; display: block;
margin-bottom: 1px; margin-bottom: 1px;

10
app/views/campaigns/_form.html.erb
View File

@ -6,7 +6,7 @@
}) do |frm| %> }) do |frm| %>
<% if @campaign.errors.any? %> <% if @campaign.errors.any? %>
<div class="row"> <div class="row">
<div class="col-md-10 error_explanation"> <div class="col-md-12 error_explanation">
<h2><%= pluralize(@campaign.errors.count, "error") %> prohibited this campaign from being saved:</h2> <h2><%= pluralize(@campaign.errors.count, "error") %> prohibited this campaign from being saved:</h2>
<ul> <ul>
<% @campaign.errors.full_messages.each do |msg| %> <% @campaign.errors.full_messages.each do |msg| %>
@ -17,9 +17,8 @@
</div> </div>
<% end %> <% end %>
<div class="row"> <div class="row">
<div class="col-md-5"> <div class="col-md-6">
<%= frm.input :advertisername, <%= frm.input :advertisername,
label: 'Advertiser Name', label: 'Advertiser Name',
hint: "The name of the company." %> hint: "The name of the company." %>
@ -86,17 +85,16 @@
hint: "Toll-free phone number of business. Used in video creation." %> hint: "Toll-free phone number of business. Used in video creation." %>
</div> </div>
<div class="col-md-5 videolisting"> <div class="col-md-6 videolisting">
<%= frm.simple_fields_for(:videolistings, html: {class: 'form-horizontal'}) do |videolisting| %> <%= frm.simple_fields_for(:videolistings, html: {class: 'form-horizontal'}) do |videolisting| %>
<%= render 'videolisting_fields', :f => videolisting %> <%= render 'videolisting_fields', :f => videolisting %>
<% end %> <% end %>
<div class="links"> <div class="links">
[<%= link_to_add_association 'Add Videolisting', frm, :videolistings %>] <%= link_to_add_association 'Add Video Listing', frm, :videolistings %>
</div> </div>
</div> </div>
</div> </div>
<div class="actions"> <div class="actions">
<%= frm.submit %> <%= frm.submit %>
</div> </div>

59
app/views/campaigns/_videolisting.html.erb
View File

@ -1,29 +1,34 @@
<ul>
<li> <li>
<span class="videolisting-item"> <p><strong>Video Code</strong><br>
<strong>Video Code</strong> <%= videolisting.videocode %></p>
<span><%= videolisting.videocode %></span>
</span>
<span class="videolisting-item">
<strong>Voiceover Selection</strong>
<span><%= voiceoverselection_list item:videolisting.voiceoverselection %></span>
</span>
<span class="videolisting-item">
<strong>Music Selection</strong>
<span><%= musicselection_list item:videolisting.musicselection %></span>
</span>
<span class="videolisting-item">
<strong>Client Provided Script</strong>
<span><%= videolisting.clientprovidedscript %></span>
</span>
<span class="videolisting-item">
<strong>Production Notes</strong>
<span><%= videolisting.notes %></span>
</span>
<span class="videolisting-item">
<strong>Asset URLs</strong>
<% videolisting.asseturls_array.each do |asset| %>
<span class="list-item"><%= asset[:asseturl] %></span>
<% end %>
</span>
</li> </li>
<li>
<p><strong>Voiceover Selection</strong><br>
<%= voiceoverselection_list item:videolisting.voiceoverselection %></p>
</li>
<li>
<p><strong>Music Selection</strong><br>
<%= musicselection_list item:videolisting.musicselection %></p>
</li>
<% unless videolisting.clientprovidedscript.empty? %>
<li>
<p><strong>Client Provided Script</strong><br>
<%= videolisting.clientprovidedscript %></p>
</li>
<% end %>
<% unless videolisting.notes.empty? %>
<li>
<p><strong>Production Notes</strong><br>
<%= videolisting.notes %></p>
</li>
<% end %>
<% unless videolisting.asseturls.empty? %>
<li>
<p><strong>asseturls</strong><br>
<% videolisting.asseturls_array.each do |asset| %>
<%= asset[:asseturl] %></p>
<% end %>
</li>
<% end %>
</ul>

2
app/views/campaigns/_videolisting_fields.html.erb
View File

@ -21,5 +21,5 @@
label: 'Asset Urls', label: 'Asset Urls',
hint: "A list of all file assets. Comma Separated, (press backspace or click the x to remove)", hint: "A list of all file assets. Comma Separated, (press backspace or click the x to remove)",
input_html: {data: {role: "tagsinput" }, value: ""} %> input_html: {data: {role: "tagsinput" }, value: ""} %>
{<%= link_to_remove_association "Remove Videolisting", f %>} <div class="blah"><%= link_to_remove_association "Remove Video Listing", f %></div>
</div> </div>

15
app/views/campaigns/edit.html.erb
View File

@ -1,6 +1,11 @@
<%= link_to 'Show', campaign_path(@campaign.listingcode) %> | <div class="container">
<%= link_to 'Back', campaigns_path %> <section>
<div class="pull-right">
<h1>Editing <%= @campaign.advertisername %></h1> <%= link_to 'Cancel Edit Campaign', campaign_path(@campaign.listingcode) %> |
<%= link_to 'Back to Campaigns', campaigns_path %>
</div>
<h1>Edit <%= @campaign.advertisername %></h1>
<hr>
<%= render 'form' %> <%= render 'form' %>
</section>
</div>

11
app/views/campaigns/index.html.erb
View File

@ -1,4 +1,7 @@
<h1>Listing campaigns</h1> <div class="container">
<section>
<h1>Campaigns</h1>
<hr>
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
@ -13,7 +16,6 @@
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<% @campaigns.each do |campaign| %> <% @campaigns.each do |campaign| %>
<tr> <tr>
@ -30,7 +32,6 @@
<% end %> <% end %>
</tbody> </tbody>
</table> </table>
<br>
<%= link_to 'New Campaign', new_campaign_path %> <%= link_to 'New Campaign', new_campaign_path %>
</section>
</div>

16
app/views/campaigns/new.html.erb
View File

@ -1,8 +1,10 @@
<%= link_to 'Back', campaigns_path %> <div class="container">
<div class="col-md-offset-1 col-md-10"> <section>
<div class="pull-right">
<h1>New campaign</h1> <%= link_to 'Cancel New Campaign', campaigns_path %>
</div>
<%= render 'form' %> <h1>New Campaign</h1>
<hr>
<%= render 'form' %>
</section>
</div> </div>

239
app/views/campaigns/show.html.erb
View File

@ -1,104 +1,147 @@
<%= link_to 'Edit', edit_campaign_path(@campaign.listingcode) %> | <div class="container">
<%= link_to 'Back', campaigns_path %> <section>
<div class="pull-right">
<%= link_to 'Edit Campaign', edit_campaign_path(@campaign.listingcode) %> |
<div class="col-md-12"> <%= link_to 'Back to Campaigns', campaigns_path %>
<h1> </div>
<%= @campaign.advertisername %> <h1><%= @campaign.advertisername %></h1>
</h1> <hr>
<p id="notice"><%= notice %></p> <p id="notice"><%= notice %></p>
</div> <div class="row">
<div class="col-md-6">
<div class="col-md-4 col-md-offset-1 col-xs-6">
<span class="campaign-item">
<strong>Listing Code</strong>
<span><%= @campaign.listingcode %></span>
</span>
<span class="campaign-item">
<strong>Description</strong>
<span><%= @campaign.description %></span>
</span>
<span class="campaign-item">
<strong>Products & Services</strong>
<span><%= @campaign.productsandservices %></span>
</span>
<span class="campaign-item">
<strong>Websiteurl</strong>
<span><%= @campaign.websiteurl %></span>
</span>
<span class="campaign-item">
<strong>Client Services Rep</strong>
<span><%= @campaign.vpa %></span>
</span>
<span class="campaign-item">
<strong>Billing Code</strong>
<span><%= @campaign.billingcode %></span>
</span>
<span class="campaign-item">
<strong>Email Address</strong>
<span><%= @campaign.emailaddress %></span>
</span>
<span class="campaign-item">
<strong>Business Phone</strong>
<span><%= number_to_phone @campaign.businessphone %></span>
</span>
<span class="campaign-item">
<strong>Contact Phone</strong>
<span><%= number_to_phone @campaign.contactphone %></span>
</span>
<span class="campaign-item">
<strong>Customer First Name</strong>
<span><%= @campaign.customerfirstname %></span>
</span>
<span class="campaign-item">
<strong>Customer Last Name</strong>
<span><%= @campaign.customerlastname %></span>
</span>
<span class="campaign-item">
<strong>Address</strong>
<span><%= @campaign.address %></span>
</span>
<span class="campaign-item">
<strong>City, State, Zip</strong>
<span><%= @campaign.city %>, <%= us_states item: @campaign.state %>, <%= @campaign.zip %></span>
</span>
<span class="campaign-item">
<strong>Awards</strong>
<span><%= @campaign.awards %></span>
</span>
<span class="campaign-item">
<strong>Background</strong>
<span><%= @campaign.background %></span>
</span>
<span class="campaign-item">
<strong>Industry Categories</strong>
<span><%= @campaign.categories %></span>
</span>
<span class="campaign-item">
<strong>Company Colors</strong>
<span><%= @campaign.companycolors %></span>
</span>
<span class="campaign-item">
<strong>Facebook URL</strong>
<span><%= @campaign.facebookurl %></span>
</span>
<span class="campaign-item">
<strong>Target Audience</strong>
<span><%= @campaign.targetaudience %></span>
</span>
<span class="campaign-item">
<strong>Tollfree Phone</strong>
<span><%= @campaign.tollfreephone %></span>
</span>
</div>
<div class="col-md-4 col-xs-6">
<ul> <ul>
<% @campaign.videolistings.each do |videolisting| %> <% unless @campaign.listingcode.empty? %>
<%= render 'videolisting', videolisting: videolisting %> <li>
<p><strong>Listing Code</strong><br>
<%= @campaign.listingcode %></p>
</li>
<% end %> <% end %>
<% if @campaign.videolistings.empty? %> <% unless @campaign.description.empty? %>
<li>No Video Listings for this Campaign.</li> <li>
<p><strong>Description</strong><br>
<%= @campaign.description %></p>
</li>
<% end %>
<% unless @campaign.productsandservices.empty? %>
<li>
<p><strong>Products & Services</strong><br>
<%= @campaign.productsandservices %></p>
</li>
<% end %>
<% unless @campaign.websiteurl.empty? %>
<li>
<p><strong>Websiteurl</strong><br>
<%= @campaign.websiteurl %></p>
</li>
<% end %>
<% unless @campaign.vpa.empty? %>
<li>
<p><strong>Client Services Rep</strong><br>
<%= @campaign.vpa %></p>
</li>
<% end %>
<% unless @campaign.billingcode.empty? %>
<li>
<p><strong>Billing Code</strong><br>
<%= @campaign.billingcode %></p>
</li>
<% end %>
<% unless @campaign.emailaddress.empty? %>
<li>
<p><strong>Email Address</strong><br>
<%= @campaign.emailaddress %></p>
</li>
<% end %>
<% unless @campaign.businessphone.empty? %>
<li>
<p><strong>Business Phone</strong><br>
<%= number_to_phone @campaign.businessphone %></p>
</li>
<% end %>
<% unless @campaign.contactphone.empty? %>
<li>
<p><strong>Contact Phone</strong><br>
<%= number_to_phone @campaign.contactphone %></p>
</li>
<% end %>
<% unless @campaign.customerfirstname.empty? %>
<li>
<p><strong>Customer First Name</strong><br>
<%= @campaign.customerfirstname %></p>
</li>
<% end %>
<% unless @campaign.customerlastname.empty? %>
<li>
<p><strong>Customer Last Name</strong><br>
<%= @campaign.customerlastname %></p>
</li>
<% end %>
<% unless @campaign.address.empty? %>
<li>
<p><strong>Address</strong><br>
<%= @campaign.address %></p>
</li>
<% end %>
<% if @campaign.city.empty? || @campaign.state || @campaign.zip %>
<li>
<p><strong>City, State, Zip</strong><br>
<%= @campaign.city %>, <%= us_states item: @campaign.state %>, <%= @campaign.zip %></p>
</li>
<% end %>
<% unless @campaign.awards %>.empty?
<li>
<p><strong>Awards</strong><br>
<%= @campaign.awards %></p>
</li>
<% end %>
<% unless @campaign.background.empty? %>
<li>
<p><strong>Background</strong><br>
<%= @campaign.background %></p>
</li>
<% end %>
<% unless @campaign.categories.empty? %>
<li>
<p><strong>Industry Categories</strong><br>
<%= @campaign.categories %></p>
</li>
<% end %>
<% unless @campaign.companycolors.empty? %>
<li>
<p><strong>Company Colors</strong><br>
<%= @campaign.companycolors %></p>
</li>
<% end %>
<% unless @campaign.facebookurl.empty? %>
<li>
<p><strong>Facebook URL</strong><br>
<%= @campaign.facebookurl %></p>
</li>
<% end %>
<% unless @campaign.targetaudience.empty? %>
<li>
<p><strong>Target Audience</strong><br>
<%= @campaign.targetaudience %></p>
</li>
<% end %>
<% unless @campaign.tollfreephone.empty? %>
<li>
<p><strong>Tollfree Phone</strong><br>
<%= @campaign.tollfreephone %></p>
</li>
<% end %> <% end %>
</ul> </ul>
</div> </div>
<div class="col-md-6 videolisting">
<ul class="nested-fields">
<% @campaign.videolistings.each do |videolisting| %>
<li><%= render 'videolisting', videolisting: videolisting %></li>
<% end %>
<% if @campaign.videolistings.empty? %>
<li><p>No Video Listings for this Campaign.</p></li>
<% end %>
</ul>
</div>
</div>
</section>
</div>

24
app/views/layouts/_header.html.erb
View File

@ -1,7 +1,23 @@
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">VidPush</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<% if user_signed_in? %> <% if user_signed_in? %>
<%= link_to "Profile", edit_user_registration_path %> <li><%= link_to "Profile", edit_user_registration_path %></li>
<%= link_to "Logout", destroy_user_session_path, :method => :delete %> <li><%= link_to "Logout", destroy_user_session_path, :method => :delete %></li>
<% else %> <% else %>
<%= link_to "Sign in", new_user_session_path %> <li><%= link_to "Sign in", new_user_session_path %></li>
<% end %> <% end %>
----- </ul>
</div>
</div>
</div>