merged changes back from live

[selectricity] / app / views / election / _voters_form.rhtml

diff --git a/app/views/election/_voters_form.rhtml b/app/views/election/_voters_form.rhtml
index 620b508be4841444c215b4abc65ec05863b72d2c..8130ade671508151d596998c08af3aaa4ab110a2 100644 (file)
--- a/app/views/election/_voters_form.rhtml
+++ b/app/views/election/_voters_form.rhtml
@@ -1,10 +1,15 @@
-<p>Please enter a list of new email addresses of potential voters.</p>
+<p>Please enter a list of new email addresses of voters (one email
+address per line).</p>

 
 

-<%= text_area :raw_voter_list, :input_addresses %>
+<%= text_area :raw_voter_list, :input_addresses, :cols => 60, :rows => 8 %>

 
 

+<!-- 

 <p>Email voters:
 <%= select :raw_voter_list, :email, [ [ 'Never', 0 ],
                               [ 'Now', 1 ],
                               [ 'Vote Start', 2 ] ]  %>
 <p>Email voters:
 <%= select :raw_voter_list, :email, [ [ 'Never', 0 ],
                               [ 'Now', 1 ],
                               [ 'Vote Start', 2 ] ]  %>

+-->
+<%= hidden_field :raw_voter_list, :email, :value => 2 %>

 </p>
 </p>

-<%= submit_tag "Add" %>
+
+<p><%= submit_tag "Add Voters" %></p>