Finished organzing preferential vote tables into one partial. Also changed RubyVote...

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

diff --git a/app/views/quickvote/create.rhtml b/app/views/quickvote/create.rhtml
index 0a5d4aab1bb144f684403e6901adddda6c6b1dca..cf91e198a4e15183020a680bea65c51ed49f9241 100644 (file)
--- a/app/views/quickvote/create.rhtml
+++ b/app/views/quickvote/create.rhtml
@@ -1,47 +1,30 @@
 <% -%>
 <% -%>

-<h1><%= @quickvote ? "Review and Confirm" : "Create QuickVote" %></h1>
+<h1>Create QuickVote</h1>

 
 <%= error_messages_for 'quickvote' %>
 
 
 <%= error_messages_for 'quickvote' %>
 

-<% if @quickvote %>
+<p><label for="quickvote_candidatelist">Choices</p>

 
 

-<p>Please review the data you've entered and confirm it. The candidates
-for the vote you've submitted include:</p>
+<!-- the list of candidates -->
+<div id="candlist">
+<%= render :partial => 'candidate_list' %>
+</div>

 
 

-<ul>
-<% for candidate in @quickvote.raw_candidates %>
-  <li><%= candidate.capitalize %></li>
-<% end %>
-</ul>
-
-<% end %>
-
-<%= form_tag :action => 'create' %>
+<% form_tag(:action => 'create') do %>

 <!--[form:election]-->
 
 <!--[form:election]-->
 

-<p><label for="quickvote_name">Super-short name (for URL)<br />
+<p><label for="quickvote_name">One Word Description (for URL)<br />

 
 <em><font size="-1">required; 5-12 characters; only letters and numbers; no spaces</font></em></label><br/>
 
 <%= text_field 'quickvote', 'name', :size => 15, :maxsize => 12  %></p>
 
 <p><label for="quickvote_description">Description<em><br />
 
 <em><font size="-1">required; 5-12 characters; only letters and numbers; no spaces</font></em></label><br/>
 
 <%= text_field 'quickvote', 'name', :size => 15, :maxsize => 12  %></p>
 
 <p><label for="quickvote_description">Description<em><br />

-<font size="-1">optional; one line summary on the first line</font></em></label><br/>
+<font size="-1">required; one line summary on the first line</font></em></label><br/>

 
 <%= text_area 'quickvote', 'description', :cols => 50, :rows => 4 %></p>
 
 
 <%= text_area 'quickvote', 'description', :cols => 50, :rows => 4 %></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/>
+<%= submit_tag "Create Quickvote" -%>

 
 

-<%= text_area 'quickvote', 'candidatelist', :cols => 50, :rows => 2 %></p>
-
-<p><% if @quickvote -%>
-     <%= submit_tag "Confirm" -%>
-     <%= hidden_field :quickvote, :reviewed, :value => 1 %>
-   <% else %>
-     <%= submit_tag "Submit" -%>
-   <%- end -%>
-</p>
-
-<%= end_form_tag %>
+<% end %>