diff .svn/pristine/e8/e8fc419080a0a4bab2022b5cb881a3e0c59a807b.svn-base @ 935:fe0249c097f6 live

Merge from the default branch

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/e8/e8fc419080a0a4bab2022b5cb881a3e0c59a807b.svn-base	Wed Jul 11 13:33:14 2012 +0100
@@ -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 %>