summaryrefslogtreecommitdiffstats
path: root/app/views/users
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2007-03-12 17:59:02 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2007-03-12 17:59:02 +0000
commit027bf93849e82ef3c60e4a3024db49d65f0fb3c9 (patch)
treec6bc438fcd50370944b94f605b3f34fe54b73248 /app/views/users
parent071f8e18d02f789149071abb8e052bae7ad01003 (diff)
downloadredmine-027bf93849e82ef3c60e4a3024db49d65f0fb3c9.tar.gz
redmine-027bf93849e82ef3c60e4a3024db49d65f0fb3c9.zip
added svn:eol-style native property on /app files
git-svn-id: http://redmine.rubyforge.org/svn/trunk@333 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/users')
-rw-r--r--app/views/users/_form.rhtml16
-rw-r--r--app/views/users/_memberships.rhtml56
-rw-r--r--app/views/users/list.rhtml66
3 files changed, 69 insertions, 69 deletions
diff --git a/app/views/users/_form.rhtml b/app/views/users/_form.rhtml
index e486c1042..18c849257 100644
--- a/app/views/users/_form.rhtml
+++ b/app/views/users/_form.rhtml
@@ -4,17 +4,17 @@
<div class="box">
<h3><%=l(:label_information_plural)%></h3>
<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 :mail, :required => true %></p>
-<p><%= f.select :language, lang_options_for_select %></p>
-
+<p><%= f.text_field :mail, :required => true %></p>
+<p><%= f.select :language, lang_options_for_select %></p>
+
<% for @custom_value in @custom_values %>
<p><%= custom_field_tag_with_label @custom_value %></p>
-<% end if @custom_values%>
-
-<p><%= f.check_box :admin %></p>
-<p><%= f.check_box :mail_notification %></p>
+<% end if @custom_values%>
+
+<p><%= f.check_box :admin %></p>
+<p><%= f.check_box :mail_notification %></p>
</div>
<div class="box">
diff --git a/app/views/users/_memberships.rhtml b/app/views/users/_memberships.rhtml
index 098ba83b1..2499ba387 100644
--- a/app/views/users/_memberships.rhtml
+++ b/app/views/users/_memberships.rhtml
@@ -1,29 +1,29 @@
-<div class="box" style="margin-top: 16px;">
-<h3><%= l(:label_project_plural) %></h3>
-
-<% @user.memberships.each do |membership| %>
-<% form_tag({ :action => 'edit_membership', :id => @user, :membership_id => membership }, :class => "tabular") do %>
-<p style="margin:0;padding-top:0;">
- <label><%= membership.project.name %></label>
- <select name="membership[role_id]">
- <%= options_from_collection_for_select @roles, "id", "name", membership.role_id %>
- </select>
- <%= submit_tag l(:button_change), :class => "button-small" %>
- <%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-</p>
-<% end %>
-<% end %>
-<hr />
-<p>
-<label><%=l(:label_project_new)%></label><br/>
-<% form_tag({ :action => 'edit_membership', :id => @user }) do %>
-<select name="membership[project_id]">
-<%= options_from_collection_for_select @projects, "id", "name", @membership.project_id %>
-</select>
-<select name="membership[role_id]">
-<%= options_from_collection_for_select @roles, "id", "name", @membership.role_id %>
-</select>
-<%= submit_tag l(:button_add) %>
-<% end %>
-</p>
+<div class="box" style="margin-top: 16px;">
+<h3><%= l(:label_project_plural) %></h3>
+
+<% @user.memberships.each do |membership| %>
+<% form_tag({ :action => 'edit_membership', :id => @user, :membership_id => membership }, :class => "tabular") do %>
+<p style="margin:0;padding-top:0;">
+ <label><%= membership.project.name %></label>
+ <select name="membership[role_id]">
+ <%= options_from_collection_for_select @roles, "id", "name", membership.role_id %>
+ </select>
+ <%= submit_tag l(:button_change), :class => "button-small" %>
+ <%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+</p>
+<% end %>
+<% end %>
+<hr />
+<p>
+<label><%=l(:label_project_new)%></label><br/>
+<% form_tag({ :action => 'edit_membership', :id => @user }) do %>
+<select name="membership[project_id]">
+<%= options_from_collection_for_select @projects, "id", "name", @membership.project_id %>
+</select>
+<select name="membership[role_id]">
+<%= options_from_collection_for_select @roles, "id", "name", @membership.role_id %>
+</select>
+<%= submit_tag l(:button_add) %>
+<% end %>
+</p>
</div> \ No newline at end of file
diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml
index 36d0c438c..87d42391c 100644
--- a/app/views/users/list.rhtml
+++ b/app/views/users/list.rhtml
@@ -3,49 +3,49 @@
</div>
<h2><%=l(:label_user_plural)%></h2>
-
-<table class="list">
+
+<table class="list">
<thead><tr>
- <%= sort_header_tag('login', :caption => l(:field_login)) %>
- <%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
- <%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
- <th><%=l(:field_mail)%></th>
- <%= sort_header_tag('admin', :caption => l(:field_admin)) %>
- <%= sort_header_tag('status', :caption => l(:field_status)) %>
- <%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
- <%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on)) %>
- <th></th>
+ <%= sort_header_tag('login', :caption => l(:field_login)) %>
+ <%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
+ <%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
+ <th><%=l(:field_mail)%></th>
+ <%= sort_header_tag('admin', :caption => l(:field_admin)) %>
+ <%= sort_header_tag('status', :caption => l(:field_status)) %>
+ <%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
+ <%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on)) %>
+ <th></th>
</tr></thead>
<tbody>
<% for user in @users %>
- <tr class="<%= cycle("odd", "even") %>">
- <td><%= link_to user.login, :action => 'edit', :id => user %></td>
- <td><%= user.firstname %></td>
- <td><%= user.lastname %></td>
- <td><%= user.mail %></td>
- <td align="center"><%= image_tag 'true.png' if user.admin? %></td>
- <td align="center"><%= image_tag 'locked.png' if user.locked? %><%= image_tag 'user_new.png' if user.registered? %></td>
- <td align="center"><%= format_time(user.created_on) %></td>
- <td align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
- <td align="center">
- <% form_tag({:action => 'edit', :id => user}) do %>
- <% if user.locked? %>
- <%= hidden_field_tag 'user[status]', User::STATUS_ACTIVE %>
- <%= submit_tag l(:button_unlock), :class => "button-small" %>
+ <tr class="<%= cycle("odd", "even") %>">
+ <td><%= link_to user.login, :action => 'edit', :id => user %></td>
+ <td><%= user.firstname %></td>
+ <td><%= user.lastname %></td>
+ <td><%= user.mail %></td>
+ <td align="center"><%= image_tag 'true.png' if user.admin? %></td>
+ <td align="center"><%= image_tag 'locked.png' if user.locked? %><%= image_tag 'user_new.png' if user.registered? %></td>
+ <td align="center"><%= format_time(user.created_on) %></td>
+ <td align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
+ <td align="center">
+ <% form_tag({:action => 'edit', :id => user}) do %>
+ <% if user.locked? %>
+ <%= hidden_field_tag 'user[status]', User::STATUS_ACTIVE %>
+ <%= submit_tag l(:button_unlock), :class => "button-small" %>
<% elsif user.registered? %>
<%= hidden_field_tag 'user[status]', User::STATUS_ACTIVE %>
<%= submit_tag l(:button_activate), :class => "button-small" %>
- <% else %>
- <%= hidden_field_tag 'user[status]', User::STATUS_LOCKED %>
- <%= submit_tag l(:button_lock), :class => "button-small" %>
- <% end %>
- <% end %>
+ <% else %>
+ <%= hidden_field_tag 'user[status]', User::STATUS_LOCKED %>
+ <%= submit_tag l(:button_lock), :class => "button-small" %>
+ <% end %>
+ <% end %>
</td>
</tr>
<% end %>
</tbody>
</table>
-
-<p><%= pagination_links_full @user_pages %>
-[ <%= @user_pages.current.first_item %> - <%= @user_pages.current.last_item %> / <%= @user_count %> ]
+
+<p><%= pagination_links_full @user_pages %>
+[ <%= @user_pages.current.first_item %> - <%= @user_pages.current.last_item %> / <%= @user_count %> ]
</p> \ No newline at end of file