From 316d7f974e2a9ad26a890cf510885157eab6e555 Mon Sep 17 00:00:00 2001
From: Espen Antonsen <espen@inspired.no>
Date: Mon, 25 Apr 2011 13:50:07 +0800
Subject: [PATCH] rails 3 style blocks

---
 app/views/photos/_form.html.erb | 2 +-
 app/views/photos/edit.html.erb  | 2 +-
 app/views/photos/index.html.erb | 2 +-
 app/views/photos/show.html.erb  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/photos/_form.html.erb b/app/views/photos/_form.html.erb
index 3201554..39702ca 100644
--- a/app/views/photos/_form.html.erb
+++ b/app/views/photos/_form.html.erb
@@ -1,4 +1,4 @@
-<% content_for :javascript do %>
+<%= content_for :javascript do %>
 <%= javascript_include_tag "tag/tag"  -%>
 <% end %>
 <%= hidden_field_tag :all_tags, @tags %>
diff --git a/app/views/photos/edit.html.erb b/app/views/photos/edit.html.erb
index d09697a..6341f62 100644
--- a/app/views/photos/edit.html.erb
+++ b/app/views/photos/edit.html.erb
@@ -10,7 +10,7 @@
   <%= f.submit "Update" %>
 <% end %>
 
-<% content_for :action_links do %>
+<%= content_for :action_links do %>
 <%= link_to("Delete photo", { :action => "destroy", :id => @photo, :collection_id => params[:collection_id] },
   :confirm => "Are you sure you want to delete this photo?",
   :method => :delete) %>
diff --git a/app/views/photos/index.html.erb b/app/views/photos/index.html.erb
index 8340239..a748a1d 100644
--- a/app/views/photos/index.html.erb
+++ b/app/views/photos/index.html.erb
@@ -1,6 +1,6 @@
 <ul><%= render :partial => 'photos/thumb',:collection => @photos, :as => :photo %></ul>
 
-<% content_for :action_links do %>
+<%= content_for :action_links do %>
 <%= link_to "Show albums containing photos tagged with #{params[:q]}", albums_path(:q => params[:q]) if params[:q] %>
 <%= link_to "Show all photos tagged with #{params[:tag_id]}", tag_photos_path(params[:tag_id]) if params[:tag_id] && params[:album_id] %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/photos/show.html.erb b/app/views/photos/show.html.erb
index 10b1341..8399e47 100644
--- a/app/views/photos/show.html.erb
+++ b/app/views/photos/show.html.erb
@@ -23,7 +23,7 @@
 <%= link_to tag, tag_photos_path(tag) %>
 <% end %>
 
-<% content_for :action_links do %>
+<%= content_for :action_links do %>
 <% if has_role?("admin") %>
 <% if params[:collection_id] %>
 <%= link_to "Edit photo", edit_collection_album_photo_path(params[:collection_id], params[:album_id], @photo) %>