Fix testcases and also fix errors the testcase brought up

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

diff --git a/app/views/site/_basic_login.rhtml b/app/views/site/_basic_login.rhtml
index f02d362819f23e478b82705f434d99ab89ea0ded..9c689fcb55f084236dedd595a2c7f95065a11fe5 100644 (file)
--- a/app/views/site/_basic_login.rhtml
+++ b/app/views/site/_basic_login.rhtml
@@ -1,26 +1,13 @@
-<% -%>
- <% form_tag :controller => 'account', :action => 'login'  do %>
-    <table>
-         <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>
+<% form_tag :controller => 'account', :action => 'login'  do %>

 
 

-    <div class="button-bar">
-      <p><%= submit_tag 'Login' %></p>
-<% end %>
-     <p><%= link_to 'Register for an account', :controller =>
-'account', :action => 'signup' %></p>
-
-      <p><%= link_to 'Lost or forgot your password?', :controller => 'account', :action => 'forgot_password' %></p>
+  <p><label for="login">Login</label></p>
+  <p><%= text_field "Login", "login", :size => 30 %></p>
+  <p><label for="password">Password</label></p>
+  <p><%= password_field "Password", "password", :size => 30 %></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
-      Selectricity to
-      run an organizational election, contact <a
-      href="http://mako.cc/contact.html">Benjamin Mako Hill</a>.</p>
+  <p><%= submit_tag 'Login' %></p>
+<% end %>

 
 

-    </div>
+<p><%= link_to 'Register for an account', :controller => 'account', :action => 'signup' %></p>

 
 

+<p><%= link_to 'Lost or forgot your password?', :controller => 'account', :action => 'forgot_password' %></p>