<%= error_messages_for 'election' %>
<!--[form:election]-->
-<p><label for="election_name">Name</label><br/>
-<%= text_field 'election', 'name' %></p>
+<p><label for="election_name">Title</label><br/>
+<%= text_field :election, :name, :size => 60 %></p>
<p><label for="election_description">Description</label><br/>
-<%= text_area 'election', 'description' %></p>
+<%= text_area :election, :description, :rows => 5, :cols => 60 %></p>
<!--
<p><label for="election_anonymous">Anonymous Vote</label>
-<%= check_box 'election', 'anonymous', {}, 1, 0 %></p>
+<%= check_box :election, :anonymous, {}, 1, 0 %></p>
<p>Election/Voting Start Date<br />
<%= datetime_select :election, :startdate %></p>
-->
-<p>Election End Date<br />
-<%= datetime_select :election, :enddate %></p>
+<p><label for="election_enddate">Election End Date</label><br />
+<font size="-1"><em>All elections end at 23:59.</em></font><br />
+<%= date_select :election, :enddate %></p>
+
+<p><label for="election_election_method">Election Method</label><br />
+<% type_hash = {}; ELECTION_TYPES.each {|k,v| type_hash[v] = k} %>
+<%= select_tag 'election[election_method]', options_for_select(type_hash, @election.election_method) %></p>
+
+<p><label for="election_verifiable">Enable voter verifiable
+elections?</label>
+<%= check_box :election, :verifiable%></p>
+
+<p><label for="election_early_results">Should results be visible before end of election?</label>
+<%= check_box :election, :early_results%></p>
+
+<p><label for="election_embeddable">Enable embeddable elections?</label>
+<%= check_box :election, :embeddable %></p>
+
+<p><label for="election_kiosk">Enable kiosk mode?</label>
+<em><strong>Warning:</strong> This will let users vote multiple times
+from the same computer!</em>
+<%= check_box :election, :kiosk%></p>
<!--[eoform:election]-->