deac/photomix
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

rails 3 blocking

Browse source
This commit is contained in:
Espen Antonsen 2011-04-25 13:54:40 +08:00
parent d7451970e8
commit 945173d294
10 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/users/edit.html.erb
View file

@ -8,7 +8,7 @@
<% content_for :action_links do %> <%= content_for :action_links do %>
<%= link_to("Delete user", { :action => "destroy", :id => @user }, <%= link_to("Delete user", { :action => "destroy", :id => @user },
:confirm => "Are you sure you want to delete this user?", :confirm => "Are you sure you want to delete this user?",
:method => :delete) %> :method => :delete) %>

2
app/views/admin/users/index.html.erb
View file

@ -2,6 +2,6 @@
<h2><%= link_to user.name || user.email , user %></h2> <h2><%= link_to user.name || user.email , user %></h2>
<% end %> <% end %>
<% content_for :action_links do %> <%= content_for :action_links do %>
<%= link_to "New user", new_user_path %> <%= link_to "New user", new_user_path %>
<% end %> <% end %>

2
app/views/admin/users/show.html.erb
View file

@ -40,6 +40,6 @@
</p> </p>
<% content_for :action_links do %> <%= content_for :action_links do %>
<%= link_to 'Edit', edit_user_path(@user) %> <%= link_to 'Edit', edit_user_path(@user) %>
<% end %> <% end %>

2
app/views/albums/_form.html.erb
View file

@ -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 "http://maps.google.com/maps/api/js?sensor=true" -%>
<%= javascript_include_tag "tag/tag" -%> <%= javascript_include_tag "tag/tag" -%>
<% end %> <% end %>

2
app/views/albums/edit.html.erb
View file

@ -7,7 +7,7 @@
<% end %> <% end %>
<% content_for :action_links do %> <%= content_for :action_links do %>
<% if has_role?("admin") %> <% if has_role?("admin") %>
<%= link_to("Delete album", { :action => "destroy", :id => @album, :collection_id => params[:collection_id] }, <%= link_to("Delete album", { :action => "destroy", :id => @album, :collection_id => params[:collection_id] },

2
app/views/albums/index.html.erb
View file

@ -10,7 +10,7 @@
</div> </div>
<% end %> <% 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] %> <%= link_to "Show just the photos tagged with #{params[:q]}", photos_path(:q => params[:q]) if params[:q] %>
<% if has_role?("admin") %> <% if has_role?("admin") %>
<%= " |&nbsp;" if params[:q] %> <%= " |&nbsp;" if params[:q] %>

2
app/views/albums/show.html.erb
View file

@ -40,7 +40,7 @@
<% content_for :action_links do %> <%= content_for :action_links do %>
<% if has_role?("admin") %> <% if has_role?("admin") %>
<% if params[:collection_id] %> <% if params[:collection_id] %>
<%= link_to "PDF", collection_album_path(params[:collection_id],@album, :format => 'pdf') %> |&nbsp; <%= link_to "PDF", collection_album_path(params[:collection_id],@album, :format => 'pdf') %> |&nbsp;

2
app/views/collections/edit.html.erb
View file

@ -6,7 +6,7 @@
<%= f.submit "Update" %> <%= f.submit "Update" %>
<% end %> <% end %>
<% content_for :action_links do %> <%= content_for :action_links do %>
<%= link_to("Delete this collection", { :action => "destroy", :id => @collection }, <%= link_to("Delete this collection", { :action => "destroy", :id => @collection },
:confirm => "Are you sure you want to delete this collection?", :confirm => "Are you sure you want to delete this collection?",
:method => :delete) %> :method => :delete) %>

2
app/views/collections/index.html.erb
View file

@ -7,7 +7,7 @@
<% end %> <% end %>
</div> </div>
<% content_for :action_links do %> <%= content_for :action_links do %>
<% if has_role?("admin") %> <% if has_role?("admin") %>
<%= link_to "New collection", new_collection_path %> <%= link_to "New collection", new_collection_path %>
<% end %> <% end %>

2
app/views/collections/show.html.erb
View file

@ -13,7 +13,7 @@
</div> </div>
<% end %> <% end %>
<% content_for :action_links do %> <%= content_for :action_links do %>
<% if has_role?("admin") %> <% if has_role?("admin") %>
<%= link_to "PDF", collection_path(@collection, :format => 'pdf') %> |&nbsp; <%= link_to "PDF", collection_path(@collection, :format => 'pdf') %> |&nbsp;
<%= link_to "Edit collection", edit_collection_path(@collection) %> | <%= link_to "Edit collection", edit_collection_path(@collection) %> |