diff options
| -rw-r--r-- | app/views/users/_form.rhtml | 4 | ||||
| -rw-r--r-- | app/views/users/_general.rhtml | 12 | ||||
| -rw-r--r-- | app/views/users/add.rhtml | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/app/views/users/_form.rhtml b/app/views/users/_form.rhtml index 24e0b912b..4f9a0ff21 100644 --- a/app/views/users/_form.rhtml +++ b/app/views/users/_form.rhtml @@ -1,7 +1,7 @@ <%= error_messages_for 'user' %> <!--[form:user]--> -<div class="box"> +<div class="box tabular"> <p><%= f.text_field :login, :required => true, :size => 25 %></p> <p><%= f.text_field :firstname, :required => true %></p> <p><%= f.text_field :lastname, :required => true %></p> @@ -19,7 +19,7 @@ <%= call_hook(:view_users_form, :user => @user, :form => f) %> </div> -<div class="box"> +<div class="box tabular"> <h3><%=l(:label_authentication)%></h3> <% unless @auth_sources.empty? %> <p><%= f.select :auth_source_id, ([[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] }), {}, :onchange => "if (this.value=='') {Element.show('password_fields');} else {Element.hide('password_fields');}" %></p> diff --git a/app/views/users/_general.rhtml b/app/views/users/_general.rhtml index 9695e4f97..e962056a2 100644 --- a/app/views/users/_general.rhtml +++ b/app/views/users/_general.rhtml @@ -1,7 +1,7 @@ -<% labelled_tabular_form_for :user, @user, :url => { :controller => 'users', :action => "edit", :tab => nil } do |f| %> -<%= render :partial => 'form', :locals => { :f => f } %> -<%= submit_tag l(:button_save) %> -<% if @user.active? %> - <%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %> -<% end %> +<% labelled_tabular_form_for :user, @user, :url => { :controller => 'users', :action => "edit", :tab => nil }, :html => { :class => nil } do |f| %> + <%= render :partial => 'form', :locals => { :f => f } %> + <% if @user.active? -%> + <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label> + <% end -%> + <p><%= submit_tag l(:button_save) %></p> <% end %> diff --git a/app/views/users/add.rhtml b/app/views/users/add.rhtml index 56298455d..9f5320cf2 100644 --- a/app/views/users/add.rhtml +++ b/app/views/users/add.rhtml @@ -1,7 +1,7 @@ <h2><%= link_to l(:label_user_plural), :controller => 'users', :action => 'index' %> » <%=l(:label_user_new)%></h2> -<% labelled_tabular_form_for :user, @user, :url => { :action => "add" } do |f| %> -<%= render :partial => 'form', :locals => { :f => f } %> -<%= submit_tag l(:button_create) %> -<%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %> +<% labelled_tabular_form_for :user, @user, :url => { :action => "add" }, :html => { :class => nil } do |f| %> + <%= render :partial => 'form', :locals => { :f => f } %> + <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p> + <p><%= submit_tag l(:button_create) %></p> <% end %> |