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

Replaced h3+div with fieldsets on my account and user form. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6165 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2011-07-03 12:21:37 +00:00
parent 247a6f304e
commit c19e3e0627
2 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/views/my/account.rhtml
View File

@ -2,43 +2,43 @@
<%= link_to(l(:button_change_password), {:action => 'password'}, :class => 'icon icon-passwd') if @user.change_password_allowed? %> <%= link_to(l(:button_change_password), {:action => 'password'}, :class => 'icon icon-passwd') if @user.change_password_allowed? %>
<%= call_hook(:view_my_account_contextual, :user => @user)%> <%= call_hook(:view_my_account_contextual, :user => @user)%>
</div> </div>
<h2><%=l(:label_my_account)%></h2> <h2><%=l(:label_my_account)%></h2>
<%= error_messages_for 'user' %>
<% form_for :user, @user, :url => { :action => "account" }, <% form_for :user, @user, :url => { :action => "account" },
:builder => TabularFormBuilder, :builder => TabularFormBuilder,
:lang => current_language, :lang => current_language,
:html => { :id => 'my_account_form' } do |f| %> :html => { :id => 'my_account_form' } do |f| %>
<div class="splitcontentleft"> <div class="splitcontentleft">
<h3><%=l(:label_information_plural)%></h3> <fieldset class="box tabular">
<div class="box tabular"> <legend><%=l(:label_information_plural)%></legend>
<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>
<p><%= f.text_field :mail, :required => true %></p> <p><%= f.text_field :mail, :required => true %></p>
<p><%= f.select :language, lang_options_for_select %></p> <p><%= f.select :language, lang_options_for_select %></p>
<% if Setting.openid? %> <% if Setting.openid? %>
<p><%= f.text_field :identity_url %></p> <p><%= f.text_field :identity_url %></p>
<% end %> <% end %>
<% @user.custom_field_values.select(&:editable?).each do |value| %> <% @user.custom_field_values.select(&:editable?).each do |value| %>
<p><%= custom_field_tag_with_label :user, value %></p> <p><%= custom_field_tag_with_label :user, value %></p>
<% end %> <% end %>
<%= call_hook(:view_my_account, :user => @user, :form => f) %> <%= call_hook(:view_my_account, :user => @user, :form => f) %>
</div> </fieldset>
<%= submit_tag l(:button_save) %> <%= submit_tag l(:button_save) %>
</div> </div>
<div class="splitcontentright"> <div class="splitcontentright">
<h3><%=l(:field_mail_notification)%></h3> <fieldset class="box">
<div class="box"> <legend><%=l(:field_mail_notification)%></legend>
<%= render :partial => 'users/mail_notifications' %> <%= render :partial => 'users/mail_notifications' %>
</div> </fieldset>
<h3><%=l(:label_preferences)%></h3> <fieldset class="box tabular">
<div class="box tabular"> <legend><%=l(:label_preferences)%></legend>
<%= render :partial => 'users/preferences' %> <%= render :partial => 'users/preferences' %>
</div> </fieldset>
</div> </div>
<% end %> <% end %>

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

@ -3,48 +3,48 @@
<div id="user_form"> <div id="user_form">
<!--[form:user]--> <!--[form:user]-->
<div class="splitcontentleft"> <div class="splitcontentleft">
<h3><%=l(:label_information_plural)%></h3> <fieldset class="box tabular">
<div class="box tabular"> <legend><%=l(:label_information_plural)%></legend>
<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>
<p><%= f.text_field :mail, :required => true %></p> <p><%= f.text_field :mail, :required => true %></p>
<p><%= f.select :language, lang_options_for_select %></p> <p><%= f.select :language, lang_options_for_select %></p>
<% if Setting.openid? %> <% if Setting.openid? %>
<p><%= f.text_field :identity_url %></p> <p><%= f.text_field :identity_url %></p>
<% end %> <% end %>
<% @user.custom_field_values.each do |value| %>
<p><%= custom_field_tag_with_label :user, value %></p>
<% end %>
<p><%= f.check_box :admin, :disabled => (@user == User.current) %></p>
<%= call_hook(:view_users_form, :user => @user, :form => f) %>
</fieldset>
<% @user.custom_field_values.each do |value| %> <fieldset class="box tabular">
<p><%= custom_field_tag_with_label :user, value %></p> <legend><%=l(:label_authentication)%></legend>
<% end %> <% 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.check_box :admin, :disabled => (@user == User.current) %></p> <% end %>
<%= call_hook(:view_users_form, :user => @user, :form => f) %> <div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
</div> <p><%= f.password_field :password, :required => true, :size => 25 %><br />
<em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
<h3><%=l(:label_authentication)%></h3> <p><%= f.password_field :password_confirmation, :required => true, :size => 25 %></p>
<div class="box tabular"> </div>
<% unless @auth_sources.empty? %> </fieldset>
<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>
<% end %>
<div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
<p><%= f.password_field :password, :required => true, :size => 25 %><br />
<em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
<p><%= f.password_field :password_confirmation, :required => true, :size => 25 %></p>
</div>
</div>
</div> </div>
<div class="splitcontentright"> <div class="splitcontentright">
<h3><%=l(:field_mail_notification)%></h3> <fieldset class="box">
<div class="box"> <legend><%=l(:field_mail_notification)%></legend>
<%= render :partial => 'users/mail_notifications' %> <%= render :partial => 'users/mail_notifications' %>
</div> </fieldset>
<h3><%=l(:label_preferences)%></h3> <fieldset class="box tabular">
<div class="box tabular"> <legend><%=l(:label_preferences)%></legend>
<%= render :partial => 'users/preferences' %> <%= render :partial => 'users/preferences' %>
</div> </fieldset>
</div> </div>
</div> </div>
<div style="clear:left;"></div> <div style="clear:left;"></div>