Merged from jdong

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index bb74bba558278331eb15c27b640e9121bd016cf9..efbb37464de953ed289fd9122246800dd87f35de 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -5,10 +5,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>
 
   <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>
   <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>
 
 
   <p><%= link_to 'Lost or forgot your token?', :controller => 'voter', :action => 'forgot_password' %></p>
 


@@ -21,7 +21,6 @@
 <div id="control-room" class="main-section">
   <div id="control-room-content">
   <h2>Control Room</h2>
 <div id="control-room" class="main-section">
   <div id="control-room-content">
   <h2>Control Room</h2>

-

   <% if session[:user] %>
     <%= render :partial => 'user_summary' %> 
   <% else %>
   <% if session[:user] %>
     <%= render :partial => 'user_summary' %> 
   <% else %>


@@ -46,7 +45,7 @@
 
   <ul>
    <li><%= link_to( "Create a QuickVote", :controller => 'quickvote', :action => 'create') %></li>
 
   <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>
   </ul>
 
   <p>Recently created <em>QuickVotes</em> include:</p>