##// END OF EJS Templates
jro_apps » redmine
RSS
Move checkbox for "Send account information to the user" to be clicked before the "Create" button (#4193)....
Jean-Philippe Lang -
r2923:8c769c546f33
parent child
Show More
Side by Side Unified
Context file:
r2923:8c769c546f33 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,35 +1,35
1 <%= error_messages_for 'user' %>
1 <%= error_messages_for 'user' %>
2
2
3 <!--[form:user]-->
3 <!--[form:user]-->
4 <div class="box">
4 <div class="box tabular">
5 <p><%= f.text_field :login, :required => true, :size => 25 %></p>
5 <p><%= f.text_field :login, :required => true, :size => 25 %></p>
6 <p><%= f.text_field :firstname, :required => true %></p>
6 <p><%= f.text_field :firstname, :required => true %></p>
7 <p><%= f.text_field :lastname, :required => true %></p>
7 <p><%= f.text_field :lastname, :required => true %></p>
8 <p><%= f.text_field :mail, :required => true %></p>
8 <p><%= f.text_field :mail, :required => true %></p>
9 <p><%= f.select :language, lang_options_for_select %></p>
9 <p><%= f.select :language, lang_options_for_select %></p>
10 <% if Setting.openid? %>
10 <% if Setting.openid? %>
11 <p><%= f.text_field :identity_url %></p>
11 <p><%= f.text_field :identity_url %></p>
12 <% end %>
12 <% end %>
13
13
14 <% @user.custom_field_values.each do |value| %>
14 <% @user.custom_field_values.each do |value| %>
15 <p><%= custom_field_tag_with_label :user, value %></p>
15 <p><%= custom_field_tag_with_label :user, value %></p>
16 <% end %>
16 <% end %>
17
17
18 <p><%= f.check_box :admin, :disabled => (@user == User.current) %></p>
18 <p><%= f.check_box :admin, :disabled => (@user == User.current) %></p>
19 <%= call_hook(:view_users_form, :user => @user, :form => f) %>
19 <%= call_hook(:view_users_form, :user => @user, :form => f) %>
20 </div>
20 </div>
21
21
22 <div class="box">
22 <div class="box tabular">
23 <h3><%=l(:label_authentication)%></h3>
23 <h3><%=l(:label_authentication)%></h3>
24 <% unless @auth_sources.empty? %>
24 <% unless @auth_sources.empty? %>
25 <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>
25 <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>
26 <% end %>
26 <% end %>
27 <div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
27 <div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
28 <p><label for="password"><%=l(:field_password)%><span class="required"> *</span></label>
28 <p><label for="password"><%=l(:field_password)%><span class="required"> *</span></label>
29 <%= password_field_tag 'password', nil, :size => 25 %><br />
29 <%= password_field_tag 'password', nil, :size => 25 %><br />
30 <em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
30 <em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
31 <p><label for="password_confirmation"><%=l(:field_password_confirmation)%><span class="required"> *</span></label>
31 <p><label for="password_confirmation"><%=l(:field_password_confirmation)%><span class="required"> *</span></label>
32 <%= password_field_tag 'password_confirmation', nil, :size => 25 %></p>
32 <%= password_field_tag 'password_confirmation', nil, :size => 25 %></p>
33 </div>
33 </div>
34 </div>
34 </div>
35 <!--[eoform:user]-->
35 <!--[eoform:user]-->
Show file before | Show file after | Hide comments
@@ -1,7 +1,7
1 <% labelled_tabular_form_for :user, @user, :url => { :controller => 'users', :action => "edit", :tab => nil } do |f| %>
1 <% labelled_tabular_form_for :user, @user, :url => { :controller => 'users', :action => "edit", :tab => nil }, :html => { :class => nil } do |f| %>
2 <%= render :partial => 'form', :locals => { :f => f } %>
2 <%= render :partial => 'form', :locals => { :f => f } %>
3 <%= submit_tag l(:button_save) %>
3 <% if @user.active? -%>
4 <% if @user.active? %>
4 <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label>
5 <%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %>
5 <% end -%>
6 <% end %>
6 <p><%= submit_tag l(:button_save) %></p>
7 <% end %>
7 <% end %>
Show file before | Show file after | Hide comments
@@ -1,7 +1,7
1 <h2><%= link_to l(:label_user_plural), :controller => 'users', :action => 'index' %> &#187; <%=l(:label_user_new)%></h2>
1 <h2><%= link_to l(:label_user_plural), :controller => 'users', :action => 'index' %> &#187; <%=l(:label_user_new)%></h2>
2
2
3 <% labelled_tabular_form_for :user, @user, :url => { :action => "add" } do |f| %>
3 <% labelled_tabular_form_for :user, @user, :url => { :action => "add" }, :html => { :class => nil } do |f| %>
4 <%= render :partial => 'form', :locals => { :f => f } %>
4 <%= render :partial => 'form', :locals => { :f => f } %>
5 <%= submit_tag l(:button_create) %>
5 <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>
6 <%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %>
6 <p><%= submit_tag l(:button_create) %></p>
7 <% end %>
7 <% end %>
General Comments 0
You need to be logged in to leave comments. Login now