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 94081e6389490df425db021ebb6cf8866c309380..eecb4fb8ca4f44bb6e0d65142a0efd24e00f243d 100644 (file)
--- a/app/views/quickvote/create.rhtml
+++ b/app/views/quickvote/create.rhtml
@@ -1,7 +1,6 @@
-<div id="page-title">
+<div id="title-header">

        <span class="header">Quickvote</span>
        <span class="subheader">Create New QuickVote</span>
        <span class="header">Quickvote</span>
        <span class="subheader">Create New QuickVote</span>

-       <div style="clear:both;"></div>

 </div>
 
 <p><label for="quickvote_candidate_names">Choices</p>
 </div>
 
 <p><label for="quickvote_candidate_names">Choices</p>


@@ -26,9 +25,9 @@
 <%= text_field 'quickvote', 'description', :size => 50 %></p>
 
 <div id="advanced" style="display: none">
 <%= text_field 'quickvote', 'description', :size => 50 %></p>
 
 <div id="advanced" style="display: none">

-  <div class="plain-header">
-  <span class="header">Advanced Options</span>
-  <span class="subheader"></span>
+  <div class="normal-header">
+    <span class="header">Advanced Options</span>
+    <span class="subheader"></span>

   </div>
   <div class="clear-div"></div>
 
   </div>
   <div class="clear-div"></div>
 


@@ -36,6 +35,10 @@
 
     <p><label for="quickvote_election_method">Election Method</label></p>
 
 
     <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><%= quickform.select('election_method', 
         %w(ssd condorcet plurality approval borda) ) %></p>