diff --git a/app/views/admin/users/edit.html.erb b/app/views/admin/users/edit.html.erb index 21b47ca..4092d1c 100644 --- a/app/views/admin/users/edit.html.erb +++ b/app/views/admin/users/edit.html.erb @@ -8,7 +8,7 @@ -<% content_for :action_links do %> +<%= content_for :action_links do %> <%= link_to("Delete user", { :action => "destroy", :id => @user }, :confirm => "Are you sure you want to delete this user?", :method => :delete) %> diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb index 4c74ef2..401a5e2 100644 --- a/app/views/admin/users/index.html.erb +++ b/app/views/admin/users/index.html.erb @@ -2,6 +2,6 @@

<%= link_to user.name || user.email , user %>

<% end %> -<% content_for :action_links do %> +<%= content_for :action_links do %> <%= link_to "New user", new_user_path %> <% end %> \ No newline at end of file diff --git a/app/views/admin/users/show.html.erb b/app/views/admin/users/show.html.erb index 507e2cc..77e999f 100644 --- a/app/views/admin/users/show.html.erb +++ b/app/views/admin/users/show.html.erb @@ -40,6 +40,6 @@

-<% content_for :action_links do %> +<%= content_for :action_links do %> <%= link_to 'Edit', edit_user_path(@user) %> <% end %> \ No newline at end of file diff --git a/app/views/albums/_form.html.erb b/app/views/albums/_form.html.erb index 5c2c804..66a9827 100644 --- a/app/views/albums/_form.html.erb +++ b/app/views/albums/_form.html.erb @@ -1,4 +1,4 @@ -<% content_for :javascript do %> +<%= content_for :javascript do %> <%= javascript_include_tag "http://maps.google.com/maps/api/js?sensor=true" -%> <%= javascript_include_tag "tag/tag" -%> <% end %> diff --git a/app/views/albums/edit.html.erb b/app/views/albums/edit.html.erb index 0ea8c5a..3586707 100644 --- a/app/views/albums/edit.html.erb +++ b/app/views/albums/edit.html.erb @@ -7,7 +7,7 @@ <% end %> -<% content_for :action_links do %> +<%= content_for :action_links do %> <% if has_role?("admin") %> <%= link_to("Delete album", { :action => "destroy", :id => @album, :collection_id => params[:collection_id] }, diff --git a/app/views/albums/index.html.erb b/app/views/albums/index.html.erb index 95cd78b..5c1e490 100644 --- a/app/views/albums/index.html.erb +++ b/app/views/albums/index.html.erb @@ -10,7 +10,7 @@ <% end %> -<% content_for :action_links do %> +<%= content_for :action_links do %> <%= link_to "Show just the photos tagged with #{params[:q]}", photos_path(:q => params[:q]) if params[:q] %> <% if has_role?("admin") %> <%= " | " if params[:q] %> diff --git a/app/views/albums/show.html.erb b/app/views/albums/show.html.erb index 2730752..84a5cf7 100644 --- a/app/views/albums/show.html.erb +++ b/app/views/albums/show.html.erb @@ -40,7 +40,7 @@ -<% content_for :action_links do %> +<%= content_for :action_links do %> <% if has_role?("admin") %> <% if params[:collection_id] %> <%= link_to "PDF", collection_album_path(params[:collection_id],@album, :format => 'pdf') %> |  diff --git a/app/views/collections/edit.html.erb b/app/views/collections/edit.html.erb index 48e886b..b13bac9 100644 --- a/app/views/collections/edit.html.erb +++ b/app/views/collections/edit.html.erb @@ -6,7 +6,7 @@ <%= f.submit "Update" %> <% end %> -<% content_for :action_links do %> +<%= content_for :action_links do %> <%= link_to("Delete this collection", { :action => "destroy", :id => @collection }, :confirm => "Are you sure you want to delete this collection?", :method => :delete) %> diff --git a/app/views/collections/index.html.erb b/app/views/collections/index.html.erb index b07fafd..25d1207 100644 --- a/app/views/collections/index.html.erb +++ b/app/views/collections/index.html.erb @@ -7,7 +7,7 @@ <% end %> -<% content_for :action_links do %> +<%= content_for :action_links do %> <% if has_role?("admin") %> <%= link_to "New collection", new_collection_path %> <% end %> diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb index 35a15bf..90e2feb 100644 --- a/app/views/collections/show.html.erb +++ b/app/views/collections/show.html.erb @@ -13,7 +13,7 @@ <% end %> -<% content_for :action_links do %> +<%= content_for :action_links do %> <% if has_role?("admin") %> <%= link_to "PDF", collection_path(@collection, :format => 'pdf') %> |  <%= link_to "Edit collection", edit_collection_path(@collection) %> |