From c03ab56663e8856e2dbe2c2b345b9c609d0b6f64 Mon Sep 17 00:00:00 2001
From: Andrew Davidson <amdavidson@localhost.(none)>
Date: Mon, 9 Nov 2009 04:12:37 -0800
Subject: [PATCH] moving divs outside of partials to be able to control the
 title.

---
 app/views/flickr/_grid.html.erb       | 10 +++-------
 app/views/flickr/_single.html.erb     | 12 ++++--------
 app/views/flickr/home.html.erb        |  6 +++++-
 app/views/flickr/interesting.html.erb |  6 +++++-
 app/views/flickr/photo.html.erb       |  6 +++++-
 app/views/flickr/recent.html.erb      |  6 +++++-
 6 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/app/views/flickr/_grid.html.erb b/app/views/flickr/_grid.html.erb
index b6f601e..3488111 100644
--- a/app/views/flickr/_grid.html.erb
+++ b/app/views/flickr/_grid.html.erb
@@ -1,7 +1,3 @@
-<div class="box">
-	<div class="border" style="width:450px;height:550;">
-		<% for p in @parray do %>
-			<div class="thumb"><%= link_to image_tag(p[:source], :alt => p[:id]), :action => 'photo', :id => p[:id] %></div>
-		<% end %>
-	</div>
-</div>
\ No newline at end of file
+<% for p in @parray do %>
+	<div class="thumb"><%= link_to image_tag(p[:source], :alt => p[:id]), :action => 'photo', :id => p[:id] %></div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/flickr/_single.html.erb b/app/views/flickr/_single.html.erb
index 7efc78b..70f427b 100644
--- a/app/views/flickr/_single.html.erb
+++ b/app/views/flickr/_single.html.erb
@@ -1,8 +1,4 @@
-<div class="box">
-	<% if (@psize && @pinfo && @pid ) then %>
-		<div class="border" style="width:<%= @psize.width %>;">
-			<%= link_to image_tag(@psize.source, :alt => @pinfo.title), :controller => "flickr", :action => "photo", :id => @pid %>
-			<p><%= @pinfo.title %></p>
-		</div>
-	<% end %>
-</div>
+<% if (@psize && @pinfo && @pid ) then %>
+		<%= link_to image_tag(@psize.source, :alt => @pinfo.title), :controller => "flickr", :action => "photo", :id => @pid %>
+		<p><%= @pinfo.title %></p>
+<% end %>
diff --git a/app/views/flickr/home.html.erb b/app/views/flickr/home.html.erb
index 921f58f..beb1c25 100644
--- a/app/views/flickr/home.html.erb
+++ b/app/views/flickr/home.html.erb
@@ -1 +1,5 @@
-<%= render :partial => 'single' %>
\ No newline at end of file
+<div class="box">
+	<div class="border" style="width:<%= @psize.width %>;">
+		<%= render :partial => 'single' %>
+	</div>
+</div>
\ No newline at end of file
diff --git a/app/views/flickr/interesting.html.erb b/app/views/flickr/interesting.html.erb
index d0ca19c..f73ef49 100644
--- a/app/views/flickr/interesting.html.erb
+++ b/app/views/flickr/interesting.html.erb
@@ -1 +1,5 @@
-<%= render :partial => "grid" %>
\ No newline at end of file
+<div class="box">
+	<div class="border" style="width:450px;height:550px;">
+		<%= render :partial => "grid" %>
+	</div>
+</div>
\ No newline at end of file
diff --git a/app/views/flickr/photo.html.erb b/app/views/flickr/photo.html.erb
index 921f58f..beb1c25 100644
--- a/app/views/flickr/photo.html.erb
+++ b/app/views/flickr/photo.html.erb
@@ -1 +1,5 @@
-<%= render :partial => 'single' %>
\ No newline at end of file
+<div class="box">
+	<div class="border" style="width:<%= @psize.width %>;">
+		<%= render :partial => 'single' %>
+	</div>
+</div>
\ No newline at end of file
diff --git a/app/views/flickr/recent.html.erb b/app/views/flickr/recent.html.erb
index 0d57587..888249e 100644
--- a/app/views/flickr/recent.html.erb
+++ b/app/views/flickr/recent.html.erb
@@ -1 +1,5 @@
-<%= render :partial => 'grid' %>
\ No newline at end of file
+<div class="box">
+	<div class="border" style="width:450px;height:550px;">
+		<%= render :partial => 'grid' %>
+	</div>
+</div>
\ No newline at end of file