From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Fri, 2 Sep 2011 04:42:28 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/users/index.rhtml.
X-Git-Tag: 1.3.0~911
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b3869e00fc5842c9dcca23625e0f261436f2d3b0;p=redmine.git

rename .rhtml to .html.erb of app/views/users/index.rhtml.

:rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7055 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
new file mode 100644
index 000000000..80c83cb8d
--- /dev/null
+++ b/app/views/users/index.html.erb
@@ -0,0 +1,58 @@
+<div class="contextual">
+<%= link_to l(:label_user_new), {:action => 'new'}, :class => 'icon icon-add' %>
+</div>
+
+<h2><%=l(:label_user_plural)%></h2>
+
+<% form_tag({}, :method => :get) do %>
+<fieldset><legend><%= l(:label_filter_plural) %></legend>
+<label><%= l(:field_status) %>:</label>
+<%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
+
+<% if @groups.present? %>
+<label><%= l(:label_group) %>:</label>
+<%= 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;"  %>
+<% end %>
+
+<label><%= l(:label_user) %>:</label>
+<%= text_field_tag 'name', params[:name], :size => 30 %>
+<%= submit_tag l(:button_apply), :class => "small", :name => nil %>
+<%= link_to l(:button_clear), users_path, :class => 'icon icon-reload' %>
+</fieldset>
+<% end %>
+&nbsp;
+
+<div class="autoscroll">
+<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)) %>
+	<%= sort_header_tag('mail', :caption => l(:field_mail)) %>
+	<%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
+	<%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
+	<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
+    <th></th>
+  </tr></thead>
+  <tbody>
+<% for user in @users -%>
+  <tr class="user <%= cycle("odd", "even") %> <%= %w(anon active registered locked)[user.status] %>">
+	<td class="username"><%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %></td>
+	<td class="firstname"><%= h(user.firstname) %></td>
+	<td class="lastname"><%= h(user.lastname) %></td>
+	<td class="email"><%= mail_to(h(user.mail)) %></td>
+	<td align="center"><%= checked_image user.admin? %></td>
+	<td class="created_on" align="center"><%= format_time(user.created_on) %></td>
+	<td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
+    <td class="buttons">
+    	<%= change_status_link(user) %>
+    	<%= link_to(l(:button_delete), user, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del') unless User.current == user %>
+    </td>
+  </tr>
+<% end -%>
+  </tbody>
+</table>
+</div>
+<p class="pagination"><%= pagination_links_full @user_pages, @user_count %></p>
+
+<% html_title(l(:label_user_plural)) -%>
diff --git a/app/views/users/index.rhtml b/app/views/users/index.rhtml
deleted file mode 100644
index 80c83cb8d..000000000
--- a/app/views/users/index.rhtml
+++ /dev/null
@@ -1,58 +0,0 @@
-<div class="contextual">
-<%= link_to l(:label_user_new), {:action => 'new'}, :class => 'icon icon-add' %>
-</div>
-
-<h2><%=l(:label_user_plural)%></h2>
-
-<% form_tag({}, :method => :get) do %>
-<fieldset><legend><%= l(:label_filter_plural) %></legend>
-<label><%= l(:field_status) %>:</label>
-<%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
-
-<% if @groups.present? %>
-<label><%= l(:label_group) %>:</label>
-<%= 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;"  %>
-<% end %>
-
-<label><%= l(:label_user) %>:</label>
-<%= text_field_tag 'name', params[:name], :size => 30 %>
-<%= submit_tag l(:button_apply), :class => "small", :name => nil %>
-<%= link_to l(:button_clear), users_path, :class => 'icon icon-reload' %>
-</fieldset>
-<% end %>
-&nbsp;
-
-<div class="autoscroll">
-<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)) %>
-	<%= sort_header_tag('mail', :caption => l(:field_mail)) %>
-	<%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
-	<%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
-	<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
-    <th></th>
-  </tr></thead>
-  <tbody>
-<% for user in @users -%>
-  <tr class="user <%= cycle("odd", "even") %> <%= %w(anon active registered locked)[user.status] %>">
-	<td class="username"><%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %></td>
-	<td class="firstname"><%= h(user.firstname) %></td>
-	<td class="lastname"><%= h(user.lastname) %></td>
-	<td class="email"><%= mail_to(h(user.mail)) %></td>
-	<td align="center"><%= checked_image user.admin? %></td>
-	<td class="created_on" align="center"><%= format_time(user.created_on) %></td>
-	<td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
-    <td class="buttons">
-    	<%= change_status_link(user) %>
-    	<%= link_to(l(:button_delete), user, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del') unless User.current == user %>
-    </td>
-  </tr>
-<% end -%>
-  </tbody>
-</table>
-</div>
-<p class="pagination"><%= pagination_links_full @user_pages, @user_count %></p>
-
-<% html_title(l(:label_user_plural)) -%>