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

Makes the user form look like account form. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5172 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2011-03-20 11:49:29 +00:00
parent 50cb77cfbb
commit 6424155f59
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,9 @@
<%= error_messages_for 'user' %> <%= error_messages_for 'user' %>
<div id="user_form">
<!--[form:user]--> <!--[form:user]-->
<div class="splitcontentleft">
<h3><%=l(:label_information_plural)%></h3>
<div class="box tabular"> <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>
@ -19,8 +22,8 @@
<%= call_hook(:view_users_form, :user => @user, :form => f) %> <%= call_hook(:view_users_form, :user => @user, :form => f) %>
</div> </div>
<div class="box tabular">
<h3><%=l(:label_authentication)%></h3> <h3><%=l(:label_authentication)%></h3>
<div class="box tabular">
<% 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>
<% end %> <% end %>
@ -30,14 +33,19 @@
<p><%= f.password_field :password_confirmation, :required => true, :size => 25 %></p> <p><%= f.password_field :password_confirmation, :required => true, :size => 25 %></p>
</div> </div>
</div> </div>
</div>
<div class="box"> <div class="splitcontentright">
<h3><%=l(:field_mail_notification)%></h3> <h3><%=l(:field_mail_notification)%></h3>
<div class="box">
<%= render :partial => 'users/mail_notifications' %> <%= render :partial => 'users/mail_notifications' %>
</div> </div>
<div class="box tabular">
<h3><%=l(:label_preferences)%></h3> <h3><%=l(:label_preferences)%></h3>
<div class="box tabular">
<%= render :partial => 'users/preferences' %> <%= render :partial => 'users/preferences' %>
</div> </div>
</div>
</div>
<div style="clear:left;"></div>
<!--[eoform:user]--> <!--[eoform:user]-->

2
public/stylesheets/application.css
View File

@ -364,7 +364,7 @@ ul.properties li span {font-style:italic;}
.total-hours span.hours-int { font-size: 120%; } .total-hours span.hours-int { font-size: 120%; }
.autoscroll {overflow-x: auto; padding:1px; margin-bottom: 1.2em;} .autoscroll {overflow-x: auto; padding:1px; margin-bottom: 1.2em;}
#user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; } #user_login, #user_firstname, #user_lastname, #user_mail, #my_account_form select, #user_form select { width: 90%; }
#workflow_copy_form select { width: 200px; } #workflow_copy_form select { width: 200px; }