Fix validation of candidate names

[selectricity] / app / views / quickvote / create.rhtml

diff --git a/app/views/quickvote/create.rhtml b/app/views/quickvote/create.rhtml
index 7074218ecd17e5a336b9b4cd9195986a2d84f837..6b6ada8b6488acfcd8fe3f797c8e051726b378d8 100644 (file)
--- a/app/views/quickvote/create.rhtml
+++ b/app/views/quickvote/create.rhtml
@@ -3,44 +3,28 @@
 
 <%= error_messages_for 'quickvote' %>
 
-<% if @quickvote %>
-<p>Please review the data you've entered and confirm. The candidates for
-the election submitted include:</p>
+<p><label for="quickvote_candidatelist">Choices</p>
 
-<ul>
-<% for candidate in @quickvote.raw_candidates %>
-  <li><%= candidate %></li>
-<% end %>
-</ul>
-
-<% end %>
+<!-- the list of candidates -->
+<div id="candlist">
+<%= render :partial => 'candidate_list' %>
+</div>
 
 <%= form_tag :action => 'create' %>
 <!--[form:election]-->
 
-<p><label for="quickvote_name">Vote Name<br />
-
-<em><font size="-1">Required; 5-12 characters; only letters and numbers; no spaces</font></em></label><br/>
-
-<%= text_field 'quickvote', 'name'  %></p>
+<p><label for="quickvote_name">One Word Description (for URL)<br />
 
-<p><label for="quickvote_description">Description <em><font
-size="-1">Optional</font></em></label><br/>
+<em><font size="-1">required; 5-12 characters; only letters and numbers; no spaces</font></em></label><br/>
 
-<%= text_area 'quickvote', 'description', :rows => 2 %></p>
+<%= text_field 'quickvote', 'name', :size => 15, :maxsize => 12  %></p>
 
-<p><label for="quickvote_candidatelist">Choices/Candidates<em><br />
-<font size="-1">Seperate choices with a ";". At least two are required.</font></em></label><br/>
+<p><label for="quickvote_description">Description<em><br />
+<font size="-1">required; one line summary on the first line</font></em></label><br/>
 
-<%= text_area 'quickvote', 'candidatelist', :rows => 3 %></p>
+<%= text_area 'quickvote', 'description', :cols => 50, :rows => 4 %></p>
 
-<p><% if @quickvote -%>
-     <%= submit_tag "Confirm" -%>
-     <%= hidden_field :quickvote, :reviewed, :value => 1 %>
-   <% else %>
-     <%= submit_tag "Create QuickVote" -%>
-   <%- end -%>
-</p>
+<%= submit_tag "Create Quickvote" -%>
 
 <%= end_form_tag %>