rails 3 blocking
This commit is contained in:
parent
d7451970e8
commit
945173d294
10 changed files with 10 additions and 10 deletions
|
@ -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) %>
|
||||
|
|
|
@ -2,6 +2,6 @@
|
|||
<h2><%= link_to user.name || user.email , user %></h2>
|
||||
<% end %>
|
||||
|
||||
<% content_for :action_links do %>
|
||||
<%= content_for :action_links do %>
|
||||
<%= link_to "New user", new_user_path %>
|
||||
<% end %>
|
|
@ -40,6 +40,6 @@
|
|||
</p>
|
||||
|
||||
|
||||
<% content_for :action_links do %>
|
||||
<%= content_for :action_links do %>
|
||||
<%= link_to 'Edit', edit_user_path(@user) %>
|
||||
<% end %>
|
|
@ -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 %>
|
||||
|
|
|
@ -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] },
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
</div>
|
||||
<% 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] %>
|
||||
|
|
|
@ -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') %> |
|
||||
|
|
|
@ -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) %>
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<% end %>
|
||||
</div>
|
||||
|
||||
<% content_for :action_links do %>
|
||||
<%= content_for :action_links do %>
|
||||
<% if has_role?("admin") %>
|
||||
<%= link_to "New collection", new_collection_path %>
|
||||
<% end %>
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
</div>
|
||||
<% 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) %> |
|
||||
|
|
Loading…
Reference in a new issue