Commit f0fd11db

mo k <m@mokhan.ca>
2011-11-08 03:59:45
update layout for the /my_creations, /creations, /search
master
1 parent 195911b
Changed files (5)
app
controllers
creations_controller.rb
views
categories
show.html.erb
creations
index.html.erb
mine.html.erb
search
index.html.erb
app/controllers/creations_controller.rb
@@ -2,7 +2,7 @@ class CreationsController < ApplicationController
   before_filter :authenticate_user!, :except => [:show, :index]
   # GET /creations
   def index
-    @creations = Creation.page(params[:page]).per(6)
+    @creations = Creation.page(params[:page]).per(8)
   end
 
   # GET /creations/1
app/views/categories/show.html.erb
@@ -2,18 +2,25 @@
   All Creations in <%= @category.name %>
 <% end %>
 
-<div class="grid_9 alpha omega">
-  <h1>All Creations in <em><%= @category.name %></em></h1>
-
-  <% @creations.reverse.each do |creation| %>
-    <div class="product_box">
-      <h2><%= creation.name %></h2>
-      <a href="<%= url_for creation %>"> <%= image_tag creation.image.thumb.url, :alt => creation.name %> </a>
-      <p><%= creation.short_story %> <%= link_to 'more', creation %></p>
+<h1>Category <em><%= @category.name %></em></h1>
+<% @creations.each_with_index do |creation, index| %>
+  <% if index % 4 == 0  %>
+    <div class="grid_2 alpha">
+      <a href="<%= url_for creation %>"><%= image_tag creation.image.thumb.url, :alt => creation.name %></a>
+      <p><%= creation.name %> <br /><%= link_to creation.user.name, creation %></p>
+    </div>
+  <% elsif (index+1) % 4 == 0  %>
+    <div class="grid_2 omega">
+      <a href="<%= url_for creation %>"><%= image_tag creation.image.thumb.url, :alt => creation.name %></a>
+      <p><%= creation.name %> <br /><%= link_to creation.user.name, creation %></p>
+    </div>
+    <div class="clear"></div>
+  <% else %>
+    <div class="grid_2">
+      <a href="<%= url_for creation %>"><%= image_tag creation.image.thumb.url, :alt => creation.name %></a>
+      <p><%= creation.name %> <br /><%= link_to creation.user.name, creation %></p>
     </div>
   <% end %>
-
-  <hr class="clear" />
-  <p> <%= paginate @creations %> </p>
-</div>
+<% end %>
 <div class="clear"></div>
+<p> <%= paginate @creations %> </p>
app/views/creations/index.html.erb
@@ -2,17 +2,28 @@
   Browse All Creations
 <% end %>
 
-<div class="grid_9 alpha omega">
-  <h1>Browse All Creations</h1>
-  <p><em>What time is it? Nana, nana, naaaaana caake time!</em></p>  
-  <p>Check out our communities most recent cake work.</p>
-
-  <% @creations.reverse.each do |creation| %>
-    <h2><%= creation.name %></h2>
-    <a href="<%= url_for creation %>"><%= image_tag creation.image.thumb.url, :class => "photo", :alt => creation.name %></a>
-    <p><%= creation.short_story %> <%= link_to 'more', creation %></p>
+<h1>Browse All Creations</h1>
+<% @creations.each_with_index do |creation, index| %>
+  <% if index % 4 == 0  %>
+    <div class="grid_2 alpha">
+      <a href="<%= url_for creation %>"><%= image_tag creation.image.thumb.url, :alt => creation.name %></a>
+      <p><%= creation.name %> <br /><%= link_to creation.user.name, creation %></p>
+    </div>
+  <% elsif (index+1) % 4 == 0  %>
+    <div class="grid_2 omega">
+      <a href="<%= url_for creation %>"><%= image_tag creation.image.thumb.url, :alt => creation.name %></a>
+      <p><%= creation.name %> <br /><%= link_to creation.user.name, creation %></p>
+    </div>
+    <div class="clear"></div>
+  <% else %>
+    <div class="grid_2">
+      <a href="<%= url_for creation %>"><%= image_tag creation.image.thumb.url, :alt => creation.name %></a>
+      <p><%= creation.name %> <br /><%= link_to creation.user.name, creation %></p>
+    </div>
   <% end %>
+<% end %>
+<div class="clear"></div>
+<div class="grid_3 alpha"> &nbsp; </div>
+<div class="grid_2"> <p> <%= paginate @creations %> </p> </div>
+<div class="grid_3 omega"> &nbsp; </div>
 
-  <p> <%= paginate @creations %> </p>
-</div>
-<div class="clear" />
app/views/creations/mine.html.erb
@@ -2,26 +2,25 @@
   My Creations
 <% end %>
 
-<div class="grid_6 alpha">
-  <h1>My Creations</h1>
-  <% if @creations.length == 0 %>
-    <p> 
-    You have no creations. Would you like to <%= link_to "share your creation?", new_creation_path(@creation) %>
-    </p>
+<h1>My Creations</h1>
+<% @creations.each_with_index do |creation, index| %>
+  <% if index % 4 == 0  %>
+    <div class="grid_2 alpha">
+      <a href="<%= url_for creation %>"><%= image_tag creation.image.thumb.url, :alt => creation.name %></a>
+      <p><%= creation.name %> <br /><%= link_to creation.user.name, creation %></p>
+    </div>
+  <% elsif (index+1) % 4 == 0  %>
+    <div class="grid_2 omega">
+      <a href="<%= url_for creation %>"><%= image_tag creation.image.thumb.url, :alt => creation.name %></a>
+      <p><%= creation.name %> <br /><%= link_to creation.user.name, creation %></p>
+    </div>
+    <div class="clear"></div>
   <% else %>
-    <% @creations.reverse.each do |creation| %>
-      <h2><%= creation.name %></h2>
-      <a href="<%= url_for creation %>"><%= image_tag creation.image.thumb.url, :class => "photo" %></a>
-      <p><%= creation.short_story %> <%= link_to 'more', creation %></p>
-    <% end %>
+    <div class="grid_2">
+      <a href="<%= url_for creation %>"><%= image_tag creation.image.thumb.url, :alt => creation.name %></a>
+      <p><%= creation.name %> <br /><%= link_to creation.user.name, creation %></p>
+    </div>
   <% end %>
-</div>
-<div class="grid_3 omega">
-  <div class="helpbox">
-    <h4>Secondary</h4>
-    <ul>
-      <li><%= link_to "share my creation", new_creation_path %></li>
-    </ul>
-  </div>
-</div>
-<div class="clear" />
+<% end %>
+<div class="clear"></div>
+
app/views/search/index.html.erb
@@ -2,22 +2,26 @@
   Search Results for <%= @search %>
 <% end %>
 
-<div class="grid_9 alpha omega">
-  <h1>Search Results for <em><%= @search %></em></h1>
-  <p><em>What time is it? Nana, nana, naaaaana caake time!</em></p>  
+<h1>Search Results for <em><%= @search %></em></h1>
 
-  <%= form_tag(search_index_path, :method => "get", :name => "search") do %>
-    <input name="q" type="text" value="<%= @search %>" />
-    <%= submit_tag("search") %>
+<% @creations.each_with_index do |creation, index| %>
+  <% if index % 4 == 0  %>
+    <div class="grid_2 alpha">
+      <a href="<%= url_for creation %>"><%= image_tag creation.image.thumb.url, :alt => creation.name %></a>
+      <p><%= creation.name %> <br /><%= link_to creation.user.name, creation %></p>
+    </div>
+  <% elsif (index+1) % 4 == 0  %>
+    <div class="grid_2 omega">
+      <a href="<%= url_for creation %>"><%= image_tag creation.image.thumb.url, :alt => creation.name %></a>
+      <p><%= creation.name %> <br /><%= link_to creation.user.name, creation %></p>
+    </div>
+    <div class="clear"></div>
+  <% else %>
+    <div class="grid_2">
+      <a href="<%= url_for creation %>"><%= image_tag creation.image.thumb.url, :alt => creation.name %></a>
+      <p><%= creation.name %> <br /><%= link_to creation.user.name, creation %></p>
+    </div>
   <% end %>
-  <br />
-
-  <% @creations.reverse.each do |creation| %>
-    <h2><%= creation.name %></h2>
-    <a href="<%= url_for creation %>"><%= image_tag creation.image.thumb.url, :alt => creation.name %></a>
-    <p><%= creation.short_story %> <%= link_to 'more', creation %></p>
-  <% end %>
-
-  <p> <%= paginate @creations %> </p>
-</div>
-<div class="clear" />
+<% end %>
+<div class="clear"></div>
+<p> <%= paginate @creations %> </p>