Merge trunk

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

diff --git a/app/views/quickvote/_advanced.rhtml b/app/views/quickvote/_advanced.rhtml
index 3037ccc7c6b70e5a0d45adf846b9ac0a2b513d3b..d8228cf431a0144fe9f6bc0a8bc7ad8a14e27b9a 100644 (file)
--- a/app/views/quickvote/_advanced.rhtml
+++ b/app/views/quickvote/_advanced.rhtml
@@ -1,11 +1,27 @@
-

 <% fields_for 'quickvote', quickvote do |quickform| %>
 
 <% fields_for 'quickvote', quickvote do |quickform| %>
 

-<span><label for="quickvote_election_method">Election Method</span><br />
-<%= quickform.select('election_method', 
-    %w(ssd condorcet plurality approval borda) ) %><br />
+<p><label for="quickvote_election_method">Election Method</label></p>
+
+<p><%= quickform.select('election_method', 
+    %w(ssd condorcet plurality approval borda) ) %></p>
+
+<p><label for="quickvote_enddate">End Time</label></p>
+<p><%= quickform.date_select(:enddate, :start_year => Time.now.year) %></p>
+
+<p>Visibility</p>
+
+<p>Do you want the results to be visible while the election is active?</p>
+
+<p>Yes <%= quickform.radio_button(:viewable, 1)%>
+No  <%= quickform.radio_button(:viewable, 0)%></p>
+
+<% if session[:user] %>
+<p>Notification</p>
+
+<p>Would you like to be e-mailed when this QuickVote concludes?</p>

 
 

-<span><label for="quickvote_enddate">End Time</span><br />
-<%= quickform.date_select(:enddate, :start_year => Time.now.year) %><br />
+<p>Yes <%= quickform.radio_button(:notices, 1)%>
+No  <%= quickform.radio_button(:notices, 0)%></p>
+<% end -%>

 
 <% end %>
 
 <% end %>