summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormorilla <mo@mokhan.ca>2011-05-03 18:56:01 -0600
committermorilla <mo@mokhan.ca>2011-05-03 18:56:01 -0600
commitbc6d839cc495bc0cd7f3cca0b31ec0e48dde18be (patch)
tree85130b2d0da1bbe44aa72162620f29e42ece763b
parentedf0bcca3d0b655c7eac6c5429bbe8fd837c8686 (diff)
display the 5 most recent creations.
-rw-r--r--app/controllers/home_controller.rb6
-rw-r--r--app/views/creations/index.html.erb13
-rw-r--r--app/views/home/index.html.erb20
-rw-r--r--public/stylesheets/organic.css4
4 files changed, 26 insertions, 17 deletions
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 95f29929..46746aa3 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,4 +1,10 @@
class HomeController < ApplicationController
def index
+ @creations = Creation.all.take(5).reverse
+
+ respond_to do |format|
+ format.html # index.html.erb
+ format.xml { render :xml => @creations }
+ end
end
end
diff --git a/app/views/creations/index.html.erb b/app/views/creations/index.html.erb
index ce319689..8bbc9096 100644
--- a/app/views/creations/index.html.erb
+++ b/app/views/creations/index.html.erb
@@ -1,13 +1,11 @@
<div class="heading">The most recent creations</div>
-<% @creations.reverse.each_with_index do |creation, index| %>
- <% if index % 3 == 0 %>
<div class="organic">
- <% end %>
+<% @creations.reverse.each_with_index do |creation, index| %>
<div class="organicHolder">
<div class="organicContent">
<a href="#"><img src="/images/img02.jpg" alt="" /></a>
- <h2><%= creation.name %></h2>
+ <h2><%= index %>. <%= creation.name %></h2>
<p><%= creation.story %></p>
<p>
<%= link_to 'more...', creation %>
@@ -16,11 +14,16 @@
</p>
</div>
</div>
- <% if index % 3 == 0 %>
+ <% if index % 3 == 1 %>
</div>
+
+<div class="space"></div>
+<div class="organic">
+
<% end %>
<% end %>
+</div>
<div class="space"></div>
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 680c94ac..3d3f0498 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -15,24 +15,24 @@
<div class="organicHolder">
<div class="organicContent">
<a href="#"><img src="/images/img02.jpg" alt="" /></a>
- <h2>Birthday Day</h2>
- <p>Organic fruit and vegetables Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco </p>
+ <h2><%= @creations[0].name %></h2>
+ <p><%= @creations[0].story %> Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco </p>
</div>
</div>
<div class="organicHolder">
<div class="organicContent">
<img src="/images/img03.jpg" alt="" />
- <h2>Pound Cake</h2>
- <p>Organic fruit and vegetables Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco </p>
+ <h2><%= @creations[1].name %></h2>
+ <p><%= @creations[1].story %>Organic fruit and vegetables Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco </p>
</div>
</div>
<div class="organicHolder">
<div class="organicContent">
<img src="/images/img04.jpg" alt="" />
- <h2>iPad Cake</h2>
- <p>Organic fruit and vegetables Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim </p>
+ <h2><%= @creations[2].name %></h2>
+ <p><%= @creations[2].story %>Organic fruit and vegetables Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim </p>
</div>
</div>
</div>
@@ -43,16 +43,16 @@
<div class="organicHolder">
<div class="organicContent">
<img src="/images/img05.jpg" alt="" />
- <h2>Spiderman Cake</h2>
- <p>Organic fruit and vegetables Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud.</p>
+ <h2><%= @creations[3].name %></h2>
+ <p><%= @creations[3].story %>Organic fruit and vegetables Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud.</p>
</div>
</div>
<div class="organicHolder">
<div class="organicContent">
<img src="/images/img06.jpg" alt="" />
- <h2>My Little Pony Cake</h2>
- <p>Organic fruit and vegetables Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim </p>
+ <h2><%= @creations[4].name %></h2>
+ <p><%= @creations[4].story %>Organic fruit and vegetables Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim </p>
</div>
</div>
diff --git a/public/stylesheets/organic.css b/public/stylesheets/organic.css
index c6c7fe80..e4ba6959 100644
--- a/public/stylesheets/organic.css
+++ b/public/stylesheets/organic.css
@@ -1,7 +1,7 @@
*{
margin:0px;
padding:0px;
-background-color: pink;
+background-color: #f99cf9;
}
img {
@@ -20,7 +20,7 @@ background: none;
}
body{
- background:#2f0f0f;
+ background:#6c3336;
color:#29371d;
font-family:Arial, Helvetica, sans-serif;
font-size:14px;