kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move checkbox for "Send account information to the user" to be clicked before the "Create" button (#4193). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3037 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2009-11-13 18:11:10 +00:00
parent 28f0b5ce4a
commit 8c769c546f
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/users/_form.rhtml
View File

@ -1,7 +1,7 @@
<%= error_messages_for 'user' %> <%= error_messages_for 'user' %>
<!--[form:user]--> <!--[form:user]-->
<div class="box"> <div class="box tabular">
<p><%= f.text_field :login, :required => true, :size => 25 %></p> <p><%= f.text_field :login, :required => true, :size => 25 %></p>
<p><%= f.text_field :firstname, :required => true %></p> <p><%= f.text_field :firstname, :required => true %></p>
<p><%= f.text_field :lastname, :required => true %></p> <p><%= f.text_field :lastname, :required => true %></p>
@ -19,7 +19,7 @@
<%= call_hook(:view_users_form, :user => @user, :form => f) %> <%= call_hook(:view_users_form, :user => @user, :form => f) %>
</div> </div>
<div class="box"> <div class="box tabular">
<h3><%=l(:label_authentication)%></h3> <h3><%=l(:label_authentication)%></h3>
<% unless @auth_sources.empty? %> <% 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> <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>

10
app/views/users/_general.rhtml
View File

@ -1,7 +1,7 @@
<% labelled_tabular_form_for :user, @user, :url => { :controller => 'users', :action => "edit", :tab => nil } do |f| %> <% labelled_tabular_form_for :user, @user, :url => { :controller => 'users', :action => "edit", :tab => nil }, :html => { :class => nil } do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%= submit_tag l(:button_save) %> <% if @user.active? -%>
<% if @user.active? %> <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label>
<%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %> <% end -%>
<% end %> <p><%= submit_tag l(:button_save) %></p>
<% end %> <% end %>

6
app/views/users/add.rhtml
View File

@ -1,7 +1,7 @@
<h2><%= link_to l(:label_user_plural), :controller => 'users', :action => 'index' %> &#187; <%=l(:label_user_new)%></h2> <h2><%= link_to l(:label_user_plural), :controller => 'users', :action => 'index' %> &#187; <%=l(:label_user_new)%></h2>
<% labelled_tabular_form_for :user, @user, :url => { :action => "add" } do |f| %> <% labelled_tabular_form_for :user, @user, :url => { :action => "add" }, :html => { :class => nil } do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%= submit_tag l(:button_create) %> <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>
<%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %> <p><%= submit_tag l(:button_create) %></p>
<% end %> <% end %>