merged back from production

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

diff --git a/app/views/front/index.rhtml b/app/views/front/index.rhtml
index ee8c2bb51c4930d28cf825a6590648a70c08d396..afdf35d61e9c8217479ad9a9636f2fe44faca55b 100644 (file)
--- a/app/views/front/index.rhtml
+++ b/app/views/front/index.rhtml
@@ -5,15 +5,15 @@
   <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') do %>
+  <% form_tag(:controller => 'voter', :action => 'login') do %>

   <p><%= text_field :vote, :password %></p>
   <p><%= submit_tag "Log In" %></p>
   <% end %>
 
   <p><%= text_field :vote, :password %></p>
   <p><%= submit_tag "Log In" %></p>
   <% 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 => 'reminder' %></p>

 
   <h3>SMS Interface</h3>
 
   <h3>SMS Interface</h3>

-  <p>For information on accessing Selectricity over email or via SMS/text messages from your mobile phone, email <%= link_to "vote\@mako.cc", "mailto:vote@mako.cc" %> with "help" in the body or read the <%= link_to "Selectricity Anywhere documentation", "selectricity-anywhere.html"%>.</p>
+  <p>For information on accessing Selectricity over email or via SMS/text messages from your mobile phone, email <%= link_to "vote\@selectricity.org", "mailto:vote@selectricity.org" %> with "help" in the body or read the <%= link_to "Selectricity Anywhere documentation", :controller => 'about', :action => 'anywhere' %>.</p>

 
   </div>
 </div>
 
   </div>
 </div>


@@ -29,9 +29,14 @@
     existing vote. You can log in <!-- or create a new account -->below.</p>
     
     <%= render :partial => 'basic_login' %>
     existing vote. You can log in <!-- or create a new account -->below.</p>
     
     <%= render :partial => 'basic_login' %>

+  
+    <p>Full elections creation is not yet public. <a
+    href="mailto:team@selectricity.org">Contact us</a> for access.</p>
+    
+    <!-- <p>If you do not yet have an account, you should <%= link_to "create
+    one", :controller => 'account', :action => 'signup' %>.</p> -->

   <% end %>
   <% end %>

-  <p>Full elections creation is not yet public. <%= link_to("Contact us",
-   "mailto:team@selectricity.org") %> for access.</p>
+

 
   </div>
 </div>
 
   </div>
 </div>


@@ -60,43 +65,3 @@
   </div>
 </div>
 
   </div>
 </div>
 

-<!--
-
-<h2>Selectricity <em>Anywhere</em></h2>
-
-<p>You can also access Selectricity entirely over email or via SMS/text
-messages from your mobile phone using Selectricity anywhere. Email <%=
-link_to "vote\@mako.cc", "mailto:vote@mako.cc" %> with <tt>help</tt> in
-the body for more information or read the <%= link_to "documentation
-online", "selectricity-anywhere.html"%>.</p>
-
-</td>
-
-<td width="6%"></td>
-
-<td width="47%" valign="top">
-
-<h2>Voters</h2>
-
-<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" %>
-
-
-<p><%= link_to 'Lost or forgot your token?', :controller => 'voter', :action => 'forgot_password' %></p>
-<% if session[:user] %>
-  <%= render :partial => 'user_summary' %> 
-<% else %>
-  <h2>Vote Administrators</h2>
-  <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' %>
-<% end %>
-</td>
-</tr>
-</table>
--->