Users can now login form the site homepage (previously the front login page

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index bb74bba558278331eb15c27b640e9121bd016cf9..9e2f7b51a3ab78a0213e0650ff457614da656706 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,3 +1,4 @@
+<% %>
 <div id="voters" class="main-section">
   <div id="voters-content">
   <h2>Voters</h2>
@@ -5,10 +6,10 @@
   <p>If you have received an email with a token inviting you to vote in
   an ongoing election, you can log in to vote using your token below.</p>
 
-  <%= form_tag :controller => 'voter', :action => 'index' %>
+  <% form_tag(:controller => 'voter', :action => 'index') do %>
   <p><%= text_field :vote, :password %></p>
   <p><%= submit_tag "Log In" %></p>
-  <%= end_form_tag %>
+  <% end %>
 
   <p><%= link_to 'Lost or forgot your token?', :controller => 'voter', :action => 'forgot_password' %></p>
 
@@ -21,15 +22,14 @@
 <div id="control-room" class="main-section">
   <div id="control-room-content">
   <h2>Control Room</h2>
-
   <% if session[:user] %>
     <%= render :partial => 'user_summary' %> 
   <% else %>
     
     <p>You must have an account to start a new vote or to administer an
     existing vote. You can log in or create a new account below.</p>
-
-    <%= render_partial 'basic_login' %>
+    
+    <%= render :partial => 'basic_login' %>
   <% end %>
 
   </div>
@@ -46,7 +46,7 @@
 
   <ul>
    <li><%= link_to( "Create a QuickVote", :controller => 'quickvote', :action => 'create') %></li>
-   <li><%= link_to( "Recent QuickVotes", :controller => 'quickvote', :action => 'my_quickvotes')%></li>
+   <li><%= link_to( "My Recent QuickVotes", :controller => 'quickvote', :action => 'my_quickvotes')%></li>
   </ul>
 
   <p>Recently created <em>QuickVotes</em> include:</p>