##// END OF EJS Templates
jro_apps » redmine
RSS
Replaced h3+div with fieldsets on my account and user form....
Jean-Philippe Lang -
r6045:c19e3e0627d6
parent child
Show More
Side by Side Unified
Context file:
r6045:c19e3e0627d6 Loading diff...:
Show file before | Show file after | Hide comments
@@ -2,43 +2,43
2 <%= link_to(l(:button_change_password), {:action => 'password'}, :class => 'icon icon-passwd') if @user.change_password_allowed? %>
2 <%= link_to(l(:button_change_password), {:action => 'password'}, :class => 'icon icon-passwd') if @user.change_password_allowed? %>
3 <%= call_hook(:view_my_account_contextual, :user => @user)%>
3 <%= call_hook(:view_my_account_contextual, :user => @user)%>
4 </div>
4 </div>
5
5 <h2><%=l(:label_my_account)%></h2>
6 <h2><%=l(:label_my_account)%></h2>
6 <%= error_messages_for 'user' %>
7
7
8 <% form_for :user, @user, :url => { :action => "account" },
8 <% form_for :user, @user, :url => { :action => "account" },
9 :builder => TabularFormBuilder,
9 :builder => TabularFormBuilder,
10 :lang => current_language,
10 :lang => current_language,
11 :html => { :id => 'my_account_form' } do |f| %>
11 :html => { :id => 'my_account_form' } do |f| %>
12 <div class="splitcontentleft">
12 <div class="splitcontentleft">
13 <h3><%=l(:label_information_plural)%></h3>
13 <fieldset class="box tabular">
14 <div class="box tabular">
14 <legend><%=l(:label_information_plural)%></legend>
15 <p><%= f.text_field :firstname, :required => true %></p>
15 <p><%= f.text_field :firstname, :required => true %></p>
16 <p><%= f.text_field :lastname, :required => true %></p>
16 <p><%= f.text_field :lastname, :required => true %></p>
17 <p><%= f.text_field :mail, :required => true %></p>
17 <p><%= f.text_field :mail, :required => true %></p>
18 <p><%= f.select :language, lang_options_for_select %></p>
18 <p><%= f.select :language, lang_options_for_select %></p>
19 <% if Setting.openid? %>
19 <% if Setting.openid? %>
20 <p><%= f.text_field :identity_url %></p>
20 <p><%= f.text_field :identity_url %></p>
21 <% end %>
21 <% end %>
22
22
23 <% @user.custom_field_values.select(&:editable?).each do |value| %>
23 <% @user.custom_field_values.select(&:editable?).each do |value| %>
24 <p><%= custom_field_tag_with_label :user, value %></p>
24 <p><%= custom_field_tag_with_label :user, value %></p>
25 <% end %>
25 <% end %>
26 <%= call_hook(:view_my_account, :user => @user, :form => f) %>
26 <%= call_hook(:view_my_account, :user => @user, :form => f) %>
27 </div>
27 </fieldset>
28
28
29 <%= submit_tag l(:button_save) %>
29 <%= submit_tag l(:button_save) %>
30 </div>
30 </div>
31
31
32 <div class="splitcontentright">
32 <div class="splitcontentright">
33 <h3><%=l(:field_mail_notification)%></h3>
33 <fieldset class="box">
34 <div class="box">
34 <legend><%=l(:field_mail_notification)%></legend>
35 <%= render :partial => 'users/mail_notifications' %>
35 <%= render :partial => 'users/mail_notifications' %>
36 </div>
36 </fieldset>
37
37
38 <h3><%=l(:label_preferences)%></h3>
38 <fieldset class="box tabular">
39 <div class="box tabular">
39 <legend><%=l(:label_preferences)%></legend>
40 <%= render :partial => 'users/preferences' %>
40 <%= render :partial => 'users/preferences' %>
41 </div>
41 </fieldset>
42
42
43 </div>
43 </div>
44 <% end %>
44 <% end %>
Show file before | Show file after | Hide comments
@@ -3,48 +3,48
3 <div id="user_form">
3 <div id="user_form">
4 <!--[form:user]-->
4 <!--[form:user]-->
5 <div class="splitcontentleft">
5 <div class="splitcontentleft">
6 <h3><%=l(:label_information_plural)%></h3>
6 <fieldset class="box tabular">
7 <div class="box tabular">
7 <legend><%=l(:label_information_plural)%></legend>
8 <p><%= f.text_field :login, :required => true, :size => 25 %></p>
8 <p><%= f.text_field :login, :required => true, :size => 25 %></p>
9 <p><%= f.text_field :firstname, :required => true %></p>
9 <p><%= f.text_field :firstname, :required => true %></p>
10 <p><%= f.text_field :lastname, :required => true %></p>
10 <p><%= f.text_field :lastname, :required => true %></p>
11 <p><%= f.text_field :mail, :required => true %></p>
11 <p><%= f.text_field :mail, :required => true %></p>
12 <p><%= f.select :language, lang_options_for_select %></p>
12 <p><%= f.select :language, lang_options_for_select %></p>
13 <% if Setting.openid? %>
13 <% if Setting.openid? %>
14 <p><%= f.text_field :identity_url %></p>
14 <p><%= f.text_field :identity_url %></p>
15 <% end %>
15 <% end %>
16
17 <% @user.custom_field_values.each do |value| %>
18 <p><%= custom_field_tag_with_label :user, value %></p>
19 <% end %>
20
21 <p><%= f.check_box :admin, :disabled => (@user == User.current) %></p>
22 <%= call_hook(:view_users_form, :user => @user, :form => f) %>
23 </fieldset>
16
24
17 <% @user.custom_field_values.each do |value| %>
25 <fieldset class="box tabular">
18 <p><%= custom_field_tag_with_label :user, value %></p>
26 <legend><%=l(:label_authentication)%></legend>
19 <% end %>
27 <% unless @auth_sources.empty? %>
20
28 <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>
21 <p><%= f.check_box :admin, :disabled => (@user == User.current) %></p>
29 <% end %>
22 <%= call_hook(:view_users_form, :user => @user, :form => f) %>
30 <div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
23 </div>
31 <p><%= f.password_field :password, :required => true, :size => 25 %><br />
24
32 <em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
25 <h3><%=l(:label_authentication)%></h3>
33 <p><%= f.password_field :password_confirmation, :required => true, :size => 25 %></p>
26 <div class="box tabular">
34 </div>
27 <% unless @auth_sources.empty? %>
35 </fieldset>
28 <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>
29 <% end %>
30 <div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
31 <p><%= f.password_field :password, :required => true, :size => 25 %><br />
32 <em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
33 <p><%= f.password_field :password_confirmation, :required => true, :size => 25 %></p>
34 </div>
35 </div>
36 </div>
36 </div>
37
37
38 <div class="splitcontentright">
38 <div class="splitcontentright">
39 <h3><%=l(:field_mail_notification)%></h3>
39 <fieldset class="box">
40 <div class="box">
40 <legend><%=l(:field_mail_notification)%></legend>
41 <%= render :partial => 'users/mail_notifications' %>
41 <%= render :partial => 'users/mail_notifications' %>
42 </div>
42 </fieldset>
43
43
44 <h3><%=l(:label_preferences)%></h3>
44 <fieldset class="box tabular">
45 <div class="box tabular">
45 <legend><%=l(:label_preferences)%></legend>
46 <%= render :partial => 'users/preferences' %>
46 <%= render :partial => 'users/preferences' %>
47 </div>
47 </fieldset>
48 </div>
48 </div>
49 </div>
49 </div>
50 <div style="clear:left;"></div>
50 <div style="clear:left;"></div>
General Comments 0
You need to be logged in to leave comments. Login now