Merge trunk

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

diff --git a/app/views/quickvote/create.rhtml b/app/views/quickvote/create.rhtml
index 0a5d4aab1bb144f684403e6901adddda6c6b1dca..b1b6004ec7a75d60b76244a58f74138cf63576d2 100644 (file)
--- a/app/views/quickvote/create.rhtml
+++ b/app/views/quickvote/create.rhtml
@@ -1,47 +1,69 @@
-<% -%>
-<h1><%= @quickvote ? "Review and Confirm" : "Create QuickVote" %></h1>
+<div id="voters-title">
+       <span class="header">Title</span>
+       <span class="subheader">Subtitle</span>
+       <div style="clear:both;"></div>
+</div>
+
+<div id="controlroom-title">
+       <span class="header">Title</span>
+       <span class="subheader">Subtitle</span>
+       <div style="clear:both;"></div>
+</div>
+
+<div id="quickvote-title">
+       <span class="header">Quickvote</span>
+       <span class="subheader"></span>
+       <div style="clear:both;"></div>
+</div>

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

-<% if @quickvote %>
+<span class="header">Header</span>
+<span class="subheader">Subheader</span>
+<div style="clear:both;"></div>

 
 

-<p>Please review the data you've entered and confirm it. The candidates
-for the vote you've submitted include:</p>
+<span class="header">Header</span>
+<span class="subheader"></span>
+<div style="clear:both;"></div>

 
 

-<ul>
-<% for candidate in @quickvote.raw_candidates %>
-  <li><%= candidate.capitalize %></li>
-<% end %>
-</ul>
+<span class="header">Header</span>
+<div style="clear:both;"></div>

 
 

-<% end %>
+<p><label for="quickvote_candidate_names">Choices</p>
+
+<!-- the list of candidates -->
+<div id="candidate_names">
+<%= render :partial => 'candidate_list' %>
+</div>

 
 

-<%= 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)</label></p>

 
 

-<em><font size="-1">required; 5-12 characters; only letters and numbers; no spaces</font></em></label><br/>
+<p><em><font size="-1">required; 5-12 characters; only letters and numbers; no spaces</font></em></p>

 
 

-<%= text_field 'quickvote', 'name', :size => 15, :maxsize => 12  %></p>
+<p><%= 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/>
+<p><label for="quickvote_description">Description</label></p>
+
+<p><font size="-1">required; one line summary on the first line</font></em><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/>
+<%= check_box('options', 'advanced', 
+    :onclick => 'Element.toggle($("advanced")); false;' )%>Advanced
+
+<div id="advanced" style="display: none">
+<%= render :partial => 'advanced', :locals => {:quickvote => @quickvote} %>
+</div>
+<br />
+
+<p><%= submit_tag "Create Quickvote" -%></p>
+
+<% end %>
+

 
 

-<%= 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 %>