Merge routes change

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 22903d9fcb6b500b941c7c2ec20793e01a250c2c..046228ddb3acba669a94934c12cfb96a56cf8c2c 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,33 +1,73 @@
-<% %>
+<div id="voters" class="main-section">
+  <div id="voters-content">
+  <h2>Voters</h2>

 
 

-<table width="auto" padding="5px">
-<tr>
-<td width="47%" valign="top">
+  <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>

 
 

-<h2>QuickVotes</h2>
+  <% form_tag(:controller => 'voter', :action => 'index') do %>
+  <p><%= text_field :vote, :password %></p>
+  <p><%= submit_tag "Log In" %></p>
+  <% end %>

 
 

-<p><em>QuickVotes</em> are like polls: unstructured, non-anonymous and
-without the complex features of <em>HyperChad</em>. They are the
-quickest way to make a decision or to compare between voting
-methods.</p>
+  <p><%= link_to 'Lost or forgot your token?', :controller => 'voter', :action => 'forgot_password' %></p>

 
 

-<p><%= link_to "Create a QuickVote", :controller => 'quickvote', :action => 'create' %></p>
+  <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>Recent <em>QuickVotes</em> include:</p>
+  </div>
+</div>

 
 

-<ul>
-<% for quickvote in @quickvotes %>
-<li><%= link_to (quickvote.shortdesc || "Unnamed"), quickvote_url(:votename => quickvote.name) %></li>
-<% end %>
-</ul>
+<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' %>
+  <% end %>
+
+  </div>
+</div>
+
+<div id="quickvotes" class="main-section">
+  <div id="quickvotes-content">

 
 

-<h2>HyperChad <em>Anywhere</em></h2>
+  <h2>QuickVotes</h2>
+  <p><em>QuickVotes</em> are like polls: unstructured, non-anonymous and
+  without the complex features of <em>Selectricity</em>. They are the
+  quickest way to make a decision or to compare between voting
+  methods.</p>

 
 

-<p>You can also access HyperChad entirely over email or via SMS/text
-messages from your mobile phone using HyperChad anywhere. Email <%=
+  <ul>
+   <li><%= link_to( "Create a QuickVote", :controller => 'quickvote', :action => 'create') %></li>
+   <li><%= link_to( "Recent QuickVotes", :controller => 'quickvote', :action => 'my_quickvotes')%></li>
+  </ul>
+
+  <p>Recently created <em>QuickVotes</em> include:</p>
+  <ul>
+  <% for quickvote in @quickvotes %>
+    <li><%= link_to (h(quickvote.shortdesc) || "Unnamed"), quickvote_url(:ident => quickvote.name) %></li>
+  <% end %>
+  </ul>
+
+  </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
 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", "hyperchad-anywhere.html"%>.</p>
+online", "selectricity-anywhere.html"%>.</p>

 
 </td>
 
 
 </td>
 


@@ -43,11 +83,11 @@ 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" %>
 <%= 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>
 <% if session[:user] %>
 
 <p><%= link_to 'Lost or forgot your token?', :controller => 'voter', :action => 'forgot_password' %></p>
 <% if session[:user] %>

-  <%= render_partial 'user_summary' %> 
+  <%= render :partial => 'user_summary' %> 

 <% else %>
   <h2>Vote Administrators</h2>
   <p>You must have an account to start a new vote or to administer an
 <% else %>
   <h2>Vote Administrators</h2>
   <p>You must have an account to start a new vote or to administer an


@@ -58,3 +98,4 @@ ongoing election, you can log in to vote using your token here.</p>
 </td>
 </tr>
 </table>
 </td>
 </tr>
 </table>

+-->