From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 24 Aug 2011 04:53:26 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/account/login.rhtml.
X-Git-Tag: 1.3.0~1391
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ad691358cf9b92659de16bca5b51dc9fbb0a4483;p=redmine.git

rename .rhtml to .html.erb of app/views/account/login.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@6570 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
new file mode 100644
index 000000000..fad59e9a4
--- /dev/null
+++ b/app/views/account/login.html.erb
@@ -0,0 +1,42 @@
+<%= call_hook :view_account_login_top %>
+<div id="login-form">
+<% form_tag({:action=> "login"}) do %>
+<%= back_url_hidden_field_tag %>
+<table>
+<tr>
+    <td align="right"><label for="username"><%=l(:field_login)%>:</label></td>
+    <td align="left"><%= text_field_tag 'username', nil, :tabindex => '1' %></td>
+</tr>
+<tr>
+    <td align="right"><label for="password"><%=l(:field_password)%>:</label></td>
+    <td align="left"><%= password_field_tag 'password', nil, :tabindex => '2' %></td>
+</tr>
+<% if Setting.openid? %>
+<tr>
+  <td align="right"><label for="openid_url"><%=l(:field_identity_url)%></label></td>
+  <td align="left"><%= text_field_tag "openid_url", nil, :tabindex => '3' %></td>
+</tr>
+<% end %>
+<tr>
+    <td></td>
+    <td align="left">
+        <% if Setting.autologin? %>
+        <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label>
+        <% end %>
+    </td>
+</tr>
+<tr>
+    <td align="left">
+        <% if Setting.lost_password? %>
+            <%= link_to l(:label_password_lost), :controller => 'account', :action => 'lost_password' %>
+        <% end %>
+    </td>
+    <td align="right">
+        <input type="submit" name="login" value="<%=l(:button_login)%> &#187;" tabindex="5"/>
+    </td>
+</tr>
+</table>
+<%= javascript_tag "Form.Element.focus('username');" %>
+<% end %>
+</div>
+<%= call_hook :view_account_login_bottom %>
diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml
deleted file mode 100644
index fad59e9a4..000000000
--- a/app/views/account/login.rhtml
+++ /dev/null
@@ -1,42 +0,0 @@
-<%= call_hook :view_account_login_top %>
-<div id="login-form">
-<% form_tag({:action=> "login"}) do %>
-<%= back_url_hidden_field_tag %>
-<table>
-<tr>
-    <td align="right"><label for="username"><%=l(:field_login)%>:</label></td>
-    <td align="left"><%= text_field_tag 'username', nil, :tabindex => '1' %></td>
-</tr>
-<tr>
-    <td align="right"><label for="password"><%=l(:field_password)%>:</label></td>
-    <td align="left"><%= password_field_tag 'password', nil, :tabindex => '2' %></td>
-</tr>
-<% if Setting.openid? %>
-<tr>
-  <td align="right"><label for="openid_url"><%=l(:field_identity_url)%></label></td>
-  <td align="left"><%= text_field_tag "openid_url", nil, :tabindex => '3' %></td>
-</tr>
-<% end %>
-<tr>
-    <td></td>
-    <td align="left">
-        <% if Setting.autologin? %>
-        <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label>
-        <% end %>
-    </td>
-</tr>
-<tr>
-    <td align="left">
-        <% if Setting.lost_password? %>
-            <%= link_to l(:label_password_lost), :controller => 'account', :action => 'lost_password' %>
-        <% end %>
-    </td>
-    <td align="right">
-        <input type="submit" name="login" value="<%=l(:button_login)%> &#187;" tabindex="5"/>
-    </td>
-</tr>
-</table>
-<%= javascript_tag "Form.Element.focus('username');" %>
-<% end %>
-</div>
-<%= call_hook :view_account_login_bottom %>