Mercurial > hg > soundsoftware-site
diff app/views/users/.svn/text-base/index.rhtml.svn-base @ 37:94944d00e43c
* Update to SVN trunk rev 4411
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Fri, 19 Nov 2010 13:24:41 +0000 |
| parents | 513646585e45 |
| children | 07fa8a8b56a8 |
line wrap: on
line diff
--- a/app/views/users/.svn/text-base/index.rhtml.svn-base Fri Sep 24 14:06:04 2010 +0100 +++ b/app/views/users/.svn/text-base/index.rhtml.svn-base Fri Nov 19 13:24:41 2010 +0000 @@ -1,5 +1,5 @@ <div class="contextual"> -<%= link_to l(:label_user_new), {:action => 'add'}, :class => 'icon icon-add' %> +<%= link_to l(:label_user_new), {:action => 'new'}, :class => 'icon icon-add' %> </div> <h2><%=l(:label_user_plural)%></h2> @@ -30,7 +30,7 @@ <tbody> <% for user in @users -%> <tr class="user <%= cycle("odd", "even") %> <%= %w(anon active registered locked)[user.status] %>"> - <td class="username"><%= avatar(user, :size => "14") %><%= link_to h(user.login), :action => 'edit', :id => user %></td> + <td class="username"><%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %></td> <td class="firstname"><%= h(user.firstname) %></td> <td class="lastname"><%= h(user.lastname) %></td> <td class="email"><%= mail_to(h(user.mail)) %></td>