merge everything back from mainline branch

[selectricity] / app / views / election / _overview_form.rhtml

diff --git a/app/views/election/_overview_form.rhtml b/app/views/election/_overview_form.rhtml
index eed92da7181a180612cb918debc641010b005473..be90de6593f3944d0c87accd0dff4e792f6dec2a 100644 (file)
--- a/app/views/election/_overview_form.rhtml
+++ b/app/views/election/_overview_form.rhtml
@@ -23,11 +23,11 @@
 <% type_hash = {}; ELECTION_TYPES.each {|k,v| type_hash[v] = k} %>
 <%= select_tag 'election[election_method]', options_for_select(type_hash, @election.election_method) %></p>
 
-<!-- <p><label for="election_election_method">Enable Embeddable Elections?</label>
+<p><label for="election_election_method">Enable Embeddable Elections?</label>
 <%= check_box :election, :embeddable %></p>
 
 <p><label for="election_election_method">Should results be visible before end of election?</label>
 <%= check_box :election, :early_results%></p>
--->
+
 <!--[eoform:election]-->