diff options
| -rw-r--r-- | app/views/users/_general.html.erb | 2 | ||||
| -rw-r--r-- | app/views/users/edit.html.erb | 2 | ||||
| -rw-r--r-- | app/views/users/index.html.erb | 2 | ||||
| -rw-r--r-- | app/views/users/new.html.erb | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app/views/users/_general.html.erb b/app/views/users/_general.html.erb index 9ba9b4567..de81e0365 100644 --- a/app/views/users/_general.html.erb +++ b/app/views/users/_general.html.erb @@ -1,4 +1,4 @@ -<% labelled_tabular_form_for :user, @user, :url => { :controller => 'users', :action => "update", :tab => nil }, :html => { :method => :put, :class => nil } do |f| %> +<% form_for @user, :builder => TabularFormBuilder do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> <% if @user.active? && email_delivery_enabled? -%> <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p> diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 0c5883e8b..b56f12c27 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -4,7 +4,7 @@ <%= link_to(l(:button_delete), @user, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del') if User.current != @user %> </div> -<h2><%= link_to l(:label_user_plural), :controller => 'users', :action => 'index' %> » <%=h @user.login %></h2> +<h2><%= link_to l(:label_user_plural), users_path %> » <%=h @user.login %></h2> <%= render_tabs user_settings_tabs %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 8832d8624..6def80646 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,5 +1,5 @@ <div class="contextual"> -<%= link_to l(:label_user_new), {:action => 'new'}, :class => 'icon icon-add' %> +<%= link_to l(:label_user_new), new_user_path, :class => 'icon icon-add' %> </div> <h2><%=l(:label_user_plural)%></h2> diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 9fe9f8093..fc58b0988 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -1,6 +1,6 @@ -<h2><%= link_to l(:label_user_plural), :controller => 'users', :action => 'index' %> » <%=l(:label_user_new)%></h2> +<h2><%= link_to l(:label_user_plural), users_path %> » <%=l(:label_user_new)%></h2> -<% labelled_tabular_form_for :user, @user, :url => { :action => "create" }, :html => { :class => nil } do |f| %> +<% form_for @user, :builder => TabularFormBuilder do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> <% if email_delivery_enabled? %> <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p> |