Merge from jdong; new webstats

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

diff --git a/app/views/quickvote/_advanced.rhtml b/app/views/quickvote/_advanced.rhtml
index 5699fd06b82a60fa41a35f8647fd1d4ac158032f..609e84a28ec324ac82a7f56c9b2f50d5bc69ac75 100644 (file)
--- a/app/views/quickvote/_advanced.rhtml
+++ b/app/views/quickvote/_advanced.rhtml
@@ -1,11 +1,27 @@
-
 <% 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 />
+<h3><label for="quickvote_election_method">Election Method</label></h3>
+
+<p><%= quickform.select('election_method', 
+    %w(ssd condorcet plurality approval borda) ) %></p>
+
+<h3><label for="quickvote_enddate">End Time</label></h3>
+<p><%= quickform.date_select(:enddate, :start_year => Time.now.year) %></p>
+
+<h3>Visibility</h3>
+
+<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] %>
+<h3>Notification</h3>
+
+<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) %><br />
+<p>Yes <%= quickform.radio_button(:notices, 1)%>
+No  <%= quickform.radio_button(:notices, 0)%></p>
+<% end -%>
 
 <% end %>