Diff
Modified: trunk/app/controllers/profiles_controller.rb (2721 => 2722)
--- trunk/app/controllers/profiles_controller.rb 2011-10-19 15:51:52 UTC (rev 2721)
+++ trunk/app/controllers/profiles_controller.rb 2011-10-20 14:52:58 UTC (rev 2722)
@@ -54,7 +54,7 @@
respond_to do |format|
if @profile.save
flash[:notice] = 'Profile was successfully created.'
- format.html { redirect_to profile_url(@profile) }
+ format.html { redirect_to user_profile_url(@profile) }
else
format.html { render :action ="" "new" }
end
Modified: trunk/app/views/profiles/_table.rhtml (2721 => 2722)
--- trunk/app/views/profiles/_table.rhtml 2011-10-19 15:51:52 UTC (rev 2721)
+++ trunk/app/views/profiles/_table.rhtml 2011-10-20 14:52:58 UTC (rev 2722)
@@ -13,10 +13,10 @@
<td width="100"><%= contributor(profile.user_id, "User", true, 60) %></td>
<td><%=datetime profile.updated_at, false %></td>
<td class="actions">
- <%= icon "show", profile_path(profile.user_id) %>
+ <%= icon "show", user_profile_path(profile.user_id) %>
<% if mine? profile %>
- <%= icon "edit", edit_profile_path(profile.user_id) %>
- <%= icon "destroy", profile_path(profile.user_id), nil, :confirm => 'Are you sure?', :method => :delete %>
+ <%= icon "edit", edit_user_profile_path(profile.user_id) %>
+ <%= icon "destroy", user_profile_path(profile.user_id), nil, :confirm => 'Are you sure?', :method => :delete %>
<% end %>
</td>
</tr>
Modified: trunk/app/views/profiles/show.rhtml (2721 => 2722)
--- trunk/app/views/profiles/show.rhtml 2011-10-19 15:51:52 UTC (rev 2721)
+++ trunk/app/views/profiles/show.rhtml 2011-10-20 14:52:58 UTC (rev 2722)
@@ -9,7 +9,7 @@
<% if mine? @user %>
<ul class="sectionIcons">
- <li><%= icon('edit', edit_profile_path(@profile.user_id), nil, nil, 'Edit profile') %></li>
+ <li><%= icon('edit', edit_user_profile_path(@profile.user_id), nil, nil, 'Edit profile') %></li>
</ul>
<% end -%>
Modified: trunk/app/views/users/show.rhtml (2721 => 2722)
--- trunk/app/views/users/show.rhtml 2011-10-19 15:51:52 UTC (rev 2721)
+++ trunk/app/views/users/show.rhtml 2011-10-20 14:52:58 UTC (rev 2722)
@@ -54,7 +54,7 @@
<% if mine? @user %>
<li><%= icon('manage', edit_user_path(@user), nil, nil, 'Manage Account') %></li>
<% unless @user.profile.nil? %>
- <li><%= icon('edit', edit_profile_path(@user), nil, nil, 'Edit Profile') %></li>
+ <li><%= icon('edit', edit_user_profile_path(@user), nil, nil, 'Edit Profile') %></li>
<% end %>
<li><%= icon('history', userhistory_path(@user), nil, nil, 'View My History')%></li>
<% end %>
@@ -101,7 +101,7 @@
<%= avatar @user, 160, pictures_path(@user) -%>
<br/>
<span style="text-align: center; margin-top: 0.5em; font-size: 85%; color: #666666;">
- [ <%= link_to "Edit Profile Picture", edit_profile_path(@user) %> ]
+ [ <%= link_to "Edit Profile Picture", edit_user_profile_path(@user) %> ]
</span>
<% else -%>
<%= avatar @user, 160 -%>
@@ -348,7 +348,7 @@
<% if mine? @user %>
<p style="text-align: right; margin-top: 0.5em; color: #666666;">
- [ <%= link_to "Edit Profile", edit_profile_path(@user) %> ]
+ [ <%= link_to "Edit Profile", edit_user_profile_path(@user) %> ]
</p>
<% end %>