merged fixes from devel

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

diff --git a/app/views/quickvote/create.rhtml b/app/views/quickvote/create.rhtml
index 57df1ed24970a7bd9d9b182190ca404cc2047aef..eecb4fb8ca4f44bb6e0d65142a0efd24e00f243d 100644 (file)
--- a/app/views/quickvote/create.rhtml
+++ b/app/views/quickvote/create.rhtml
@@ -1,8 +1,9 @@
-<h2>Create QuickVote</h2>
-
-<%= error_messages_for 'quickvote' %>
+<div id="title-header">
+       <span class="header">Quickvote</span>
+       <span class="subheader">Create New QuickVote</span>
+</div>
 
-<h3><label for="quickvote_candidate_names">Choices</h3>
+<p><label for="quickvote_candidate_names">Choices</p>
 
 <!-- the list of candidates -->
 <div id="candidate_names">
@@ -11,32 +12,61 @@
 
 <% form_tag(:action => 'create') do %>
 <!--[form:election]-->
+<p><label for="quickvote_name">One Word Description (for URL)</label></p>
 
-<h3><label for="quickvote_name">One Word Description (for URL)</label></h3>
-
-<p><em><font size="-1">required; 5-12 characters; only letters and numbers; no spaces</font></em></p>
+<p>required; 5-12 characters; only letters and numbers; no spaces</p>
 
 <p><%= text_field 'quickvote', 'name', :size => 15, :maxsize => 12  %></p>
 
-<h3><label for="quickvote_description">Description</label></h3>
+<p><label for="quickvote_description">Description</label></p>
 
-<p><font size="-1">required; one line summary on the first line</font></em><br/>
+<p><font size="-1">required; free-form</font></em><br/>
 
-<%= text_area 'quickvote', 'description', :cols => 50, :rows => 4 %></p>
-
-<%= check_box('options', 'advanced', 
-    :onclick => 'Element.toggle($("advanced")); false;' )%>Advanced
+<%= text_field 'quickvote', 'description', :size => 50 %></p>
 
 <div id="advanced" style="display: none">
-<%= render :partial => 'advanced', :locals => {:quickvote => @quickvote} %>
-</div>
-<br />
+  <div class="normal-header">
+    <span class="header">Advanced Options</span>
+    <span class="subheader"></span>
+  </div>
+  <div class="clear-div"></div>
 
-<p><%= submit_tag "Create Quickvote" -%></p>
+  <% fields_for 'quickvote', @quickvote do |quickform| %>
 
-<% end %>
+    <p><label for="quickvote_election_method">Election Method</label></p>
+
+<!--
+<% type_hash = {}; ELECTION_TYPES.each {|k,v| type_hash[v] = k} %>
+<%= select_tag 'election_election_method', options_for_select(type_hash, @quickvote.election_method) %></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><label for="quickvote_visibility">Visibility</label></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>
+
+      <p>Yes <%= quickform.radio_button(:notices, 1)%>
+         No  <%= quickform.radio_button(:notices, 0)%></p>
+    <% end -%>
+
+  <% end %>
+
+</div>
+<br />
+
+<p><%= submit_tag "Create Quickvote" -%></p>
+
+<% end %>