Overrode a number of the new account defaults and added some of my own

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index e4ef59c3bf34e10e5855121fec388e224580fc31..5fce40fe1d51bfeea3c4267c10a7a364c641e3a1 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -5,12 +5,15 @@
 <td width="47%" valign="top">
 <h2>Voters</h2>
 
 <td width="47%" valign="top">
 <h2>Voters</h2>
 

-<p>Please enter your password/token to log in and vote:</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 here.</p>

 
 <%= form_tag :controller => 'voter', :action => 'index' %>
 <%= text_field :vote, :password %>
 <%= submit_tag "Log In" %>
 <%= end_form_tag %>
 
 <%= form_tag :controller => 'voter', :action => 'index' %>
 <%= text_field :vote, :password %>
 <%= submit_tag "Log In" %>
 <%= end_form_tag %>

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

 </td>
 
 <td width="6%"></td>
 </td>
 
 <td width="6%"></td>


@@ -18,6 +21,10 @@
 <td width="47%" valign="top">
 <h2>Vote Administrators</h2>
 
 <td width="47%" valign="top">
 <h2>Vote Administrators</h2>
 

+<p>You must have an account to start a new election or to administer an
+existing vote. You can log in or create a new account below.</p>
+
+<%= render_partial 'basic_login' %>

 </td>
 </tr>
 </table>
 </td>
 </tr>
 </table>