Commit 9e56db16
Changed files (2)
app
views
creations
layouts
app/views/creations/index.html.erb
@@ -1,9 +1,4 @@
<% provide(:description, "CakeSide is a free site to share your cake creations and ideas with other cake fanatics like yourself") -%>
-<% content_for :javascript do -%>
-<script type="text/javascript">
- $(function(){ new Masonry('#creations-div').load(); });
-</script>
-<% end -%>
<% unless user_signed_in? -%>
<div class="row-fluid">
<div class="span6">
@@ -41,27 +36,25 @@
</div>
<% end -%>
<div class="row-fluid">
- <div class="span12">
- <div id="creations-div" class="row-fluid">
- <div class="span12">
- <ul class="thumbnails">
- <% @creations.each do |creation| %>
- <div class="span4">
- <div class="thumbnail">
- <%= link_to creation do %>
- <%= image_tag creation.primary_image.url_for(:large) %>
- <% end %>
- <div class="caption">
- <h3><%= link_to creation.name, creation %> <em><small>by <%= link_to shrink(creation.user.name, 20), profile_path(creation.user) %></small></em></h3>
- <p><%= creation.story %></p>
- <p><small><%= time_ago_in_words(creation.created_at) %> ago.</small></p>
- </div>
+ <% @creations.each_slice(6).each do |batch| %>
+ <ul class='thumbnails'>
+ <% batch.each do |creation| %>
+ <li class="span2">
+ <div class="thumbnail">
+ <%= link_to creation do %>
+ <%= image_tag creation.primary_image.url_for(:thumb) %>
+ <% end %>
+ <div class="caption">
+ <h4><%= link_to shrink(creation.name, 12), creation %></h4>
+ <p><%= link_to shrink(creation.user.name, 20), profile_path(creation.user) %></p>
+ <p><small><%= time_ago_in_words(creation.created_at) %> ago.</small></p>
</div>
</div>
- <% end %>
- </ul>
- </div>
- </div>
- <%= render "shared/paging", items: @creations %>
- </div>
+ </li>
+ <% end %>
+ </ul>
+ <% end %>
+</div>
+<div class="row-fluid">
+ <%= render "shared/paging", items: @creations %>
</div>
app/views/layouts/_header.html.erb
@@ -7,7 +7,7 @@
<span class="icon-bar"></span>
</button>
<%= link_to root_path, class: 'brand', style: 'color:hotpink;' do %>
- Cake<em>Side</em>
+ Cakeside
<% end %>
<div class="nav-collapse collapse">
<p class="navbar-text pull-right">