Merge from Justin

[selectricity-live] / app / views / site / _basic_login.rhtml

diff --git a/app/views/site/_basic_login.rhtml b/app/views/site/_basic_login.rhtml
old mode 100755 (executable)
new mode 100644 (file)
index 17184b2..f02d362
--- a/app/views/site/_basic_login.rhtml
+++ b/app/views/site/_basic_login.rhtml
@@ -1,21 +1,26 @@
 <% -%>
-  <%= start_form_tag :controller => 'user', :action => 'login'  %>
+ <% form_tag :controller => 'account', :action => 'login'  do %>
     <table>
-      <%= form_input :text_field, "Login ID", "login", :size => 30 %>
-      <%= form_input :password_field, "Password", "password", :size => 30 %>
+         <label for="login">Login</label>
+      <%= text_field "Login", "login", :size => 30 %><br />
+      <label for="password">Password</label>
+      <%= password_field "Password", "password", :size => 30 %><br />
     </table>
 
     <div class="button-bar">
       <p><%= submit_tag 'Login' %></p>
-<!--      <p><%= link_to 'Register for an account', :controller =>
-'user', :action => 'signup' %></p> -->
-      <p><%= link_to 'Lost or forgot your password?', :controller => 'user', :action => 'forgot_password' %></p>
+<% end %>
+     <p><%= link_to 'Register for an account', :controller =>
+'account', :action => 'signup' %></p>
 
-      <p>Unfortunately, HyperChad is currently being tested and new
+      <p><%= link_to 'Lost or forgot your password?', :controller => 'account', :action => 'forgot_password' %></p>
+
+      <p>Unfortunately, Selectricity is currently being tested and new
       accounts for full votes (i.e., non-<em>QuickVotes</em>) can not
-      be automatically created. If you are interested in using HyperChad to
+      be automatically created. If you are interested in using
+      Selectricity to
       run an organizational election, contact <a
       href="http://mako.cc/contact.html">Benjamin Mako Hill</a>.</p>
 
     </div>
-  <%= end_form_tag %>
+