Revision 441:cbce1fd3b1b7 app/views/users/.svn/text-base

View differences:

app/views/users/.svn/text-base/_form.rhtml.svn-base
1 1
<%= error_messages_for 'user' %>
2 2

  
3
<div id="user_form">
3 4
<!--[form:user]-->
5
<div class="splitcontentleft">
6
<h3><%=l(:label_information_plural)%></h3>
4 7
<div class="box tabular">
5 8
<p><%= f.text_field :login, :required => true, :size => 25  %></p>
6 9
<p><%= f.text_field :firstname, :required => true %></p>
......
19 22
<%= call_hook(:view_users_form, :user => @user, :form => f) %>
20 23
</div>
21 24

  
25
<h3><%=l(:label_authentication)%></h3>
22 26
<div class="box tabular">
23
<h3><%=l(:label_authentication)%></h3>
24 27
<% unless @auth_sources.empty? %>
25 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>
26 29
<% end %>
......
30 33
<p><%= f.password_field :password_confirmation, :required => true, :size => 25  %></p>
31 34
</div>
32 35
</div>
36
</div>
33 37

  
38
<div class="splitcontentright">
39
<h3><%=l(:field_mail_notification)%></h3>
34 40
<div class="box">
35
<h3><%=l(:field_mail_notification)%></h3>
36 41
<%= render :partial => 'users/mail_notifications' %>
37 42
</div>
38 43

  
44
<h3><%=l(:label_preferences)%></h3>
39 45
<div class="box tabular">
40
<h3><%=l(:label_preferences)%></h3>
41 46
<%= render :partial => 'users/preferences' %>
42 47
</div>
48
</div>
49
</div>
50
<div style="clear:left;"></div>
43 51
<!--[eoform:user]-->
app/views/users/.svn/text-base/index.rhtml.svn-base
8 8
<fieldset><legend><%= l(:label_filter_plural) %></legend>
9 9
<label><%= l(:field_status) %>:</label>
10 10
<%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
11

  
12
<% if @groups.present? %>
13
<label><%= l(:label_group) %>:</label>
14
<%= select_tag 'group_id', '<option></option>' + options_from_collection_for_select(@groups, :id, :name, params[:group_id].to_i), :onchange => "this.form.submit(); return false;"  %>
15
<% end %>
16

  
11 17
<label><%= l(:label_user) %>:</label>
12 18
<%= text_field_tag 'name', params[:name], :size => 30 %>
13 19
<%= submit_tag l(:button_apply), :class => "small", :name => nil %>
20
<%= link_to l(:button_clear), users_path, :class => 'icon icon-reload' %>
14 21
</fieldset>
15 22
<% end %>
16 23
&nbsp;

Also available in: Unified diff