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

fix div and section in application

Browse Source
This commit is contained in:
Tyrel Souza 2014-05-09 10:53:28 -04:00
parent 18d1893069
commit 279501bfe0
9 changed files with 55 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,6 @@ body {
margin-top: 50px; margin-top: 50px;
} }
h2 {
margin-top: 0;
}
strong, label, th { strong, label, th {
color: #395C84; color: #395C84;
} }

1
app/views/campaigns/_campaign.json.jbuilder
View File

@ -1,4 +1,3 @@
json.key @BETTER_VIDEO_API_KEY
json.address campaign.address if campaign.address json.address campaign.address if campaign.address
json.advertisername campaign.advertisername if campaign.advertisername json.advertisername campaign.advertisername if campaign.advertisername
json.awards campaign.awards if campaign.awards json.awards campaign.awards if campaign.awards

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

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

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

@ -1,39 +1,35 @@
<div class="container"> <h1>Campaigns</h1>
<section> <hr>
<h1>Campaigns</h1> <table class="table table-striped">
<hr> <thead>
<table class="table table-striped"> <tr>
<thead> <th>Listing Code (Form Hash)</th>
<tr> <th>Advertiser</th>
<th>Listing Code (Form Hash)</th> <th>Sent?</th>
<th>Advertiser</th> <th>Percent of Videos Completed</th>
<th>Sent?</th> <th>Address</th>
<th>Percent of Videos Completed</th> <th>City</th>
<th>Address</th> <th>State</th>
<th>City</th> <th>ZIP</th>
<th>State</th> <th></th>
<th>ZIP</th> <th></th>
<th></th> </tr>
<th></th> </thead>
</tr> <tbody>
</thead> <% @campaigns.each do |campaign| %>
<tbody> <tr>
<% @campaigns.each do |campaign| %> <td><%= link_to campaign.listingcode, campaign_path(campaign.listingcode) %></td>
<tr> <td><%= campaign.advertisername %></td>
<td><%= link_to campaign.listingcode, campaign_path(campaign.listingcode) %></td> <td><i class="glyphicon glyphicon-<% if campaign.sent? %>ok<% else %>remove<% end %>"></i> </td>
<td><%= campaign.advertisername %></td> <td><%= number_to_percentage(campaign.video_completion_percent, precision: 0) %></td>
<td><i class="glyphicon glyphicon-<% if campaign.sent? %>ok<% else %>remove<% end %>"></i> </td> <td><%= campaign.address %></td>
<td><%= number_to_percentage(campaign.video_completion_percent, precision: 0) %></td> <td><%= campaign.city %></td>
<td><%= campaign.address %></td> <td><%= campaign.state %></td>
<td><%= campaign.city %></td> <td><%= campaign.zip %></td>
<td><%= campaign.state %></td> <td><%= link_to 'Edit', edit_campaign_path(campaign.listingcode) unless campaign.sent %></td>
<td><%= campaign.zip %></td> <td><%= link_to 'Destroy', campaign_path(campaign.listingcode), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<td><%= link_to 'Edit', edit_campaign_path(campaign.listingcode) unless campaign.sent %></td> </tr>
<td><%= link_to 'Destroy', campaign_path(campaign.listingcode), method: :delete, data: { confirm: 'Are you sure?' } %></td> <% end %>
</tr> </tbody>
<% end %> </table>
</tbody> <%= link_to 'New Campaign', new_campaign_path unless Rails.env.production? %>
</table>
<%= link_to 'New Campaign', new_campaign_path unless Rails.env.production? %>
</section>
</div>

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

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

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

@ -1,5 +1,3 @@
<div class="container">
<section>
<div class="pull-right"> <div class="pull-right">
<%= link_to 'Edit Campaign', edit_campaign_path(@campaign.listingcode) %> | <%= link_to 'Edit Campaign', edit_campaign_path(@campaign.listingcode) %> |
<%= link_to 'Back to Campaigns', campaigns_path %> <%= link_to 'Back to Campaigns', campaigns_path %>
@ -149,5 +147,3 @@
</ul> </ul>
</div> </div>
</div> </div>
</section>
</div>

2
app/views/devise/registrations/edit.html.erb
View File

@ -21,4 +21,4 @@
<% end %> <% end %>
<%= link_to "Back", :back %> <%= link_to "Back", :back %>

7
app/views/layouts/application.html.erb
View File

@ -14,7 +14,12 @@
<div class="col-md-12"> <div class="col-md-12">
<%= render 'flashes' -%> <%= render 'flashes' -%>
<%= render 'layouts/header' %> <%= render 'layouts/header' %>
<%= yield %> <div class="container">
<section>
<%= yield %>
</section>
</div>
</div> </div>
<%= render 'javascript' %> <%= render 'javascript' %>
<%= yield :js_foot %> <%= yield :js_foot %>

4
app/views/videolistings/show.html.erb
View File

@ -3,8 +3,6 @@
<script src="//player.bettervideo.com/plugins/bvPlugins.js"></script> <script src="//player.bettervideo.com/plugins/bvPlugins.js"></script>
<% end %> <% end %>
<div class="container">
<section>
<div class="pull-right"> <div class="pull-right">
<%= link_to 'Back to Campaign', campaign_path(@videolisting.campaign.listingcode) %> | <%= link_to 'Back to Campaign', campaign_path(@videolisting.campaign.listingcode) %> |
<%= link_to 'Back to Campaigns List', campaigns_path %> <%= link_to 'Back to Campaigns List', campaigns_path %>
@ -36,8 +34,6 @@
</ul> </ul>
</div> </div>
</div> </div>
</section>
</div>