Merge routes change

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

diff --git a/app/views/election/_overview_form.rhtml b/app/views/election/_overview_form.rhtml
index 4a76b81269ca3d4715c0eba797832c31a3c3bca2..d5d7b6cde07e4a4d1ee96146d6d0ec41213f0b16 100644 (file)
--- a/app/views/election/_overview_form.rhtml
+++ b/app/views/election/_overview_form.rhtml
@@ -1,20 +1,23 @@
 <%= error_messages_for 'election' %>
 
 <!--[form:election]-->
 <%= error_messages_for 'election' %>
 
 <!--[form:election]-->

-<p><label for="election_name">Name</label><br/>
-<%= text_field 'election', 'name'  %></p>
+<p><label for="election_name">Summary</label><br/>
+<%= text_field 'election', 'name', :size => 60 %></p>

 
 <p><label for="election_description">Description</label><br/>
 
 <p><label for="election_description">Description</label><br/>

-<%= text_area 'election', 'description'  %></p>
+<%= text_area 'election', 'description', :rows => 5, :cols => 60 %></p>

 
 

+<!--

 <p><label for="election_anonymous">Anonymous Vote</label>
 <%= check_box 'election', 'anonymous', {}, 1, 0  %></p>
 
 <p>Election/Voting Start Date<br />
 <%= datetime_select :election, :startdate %></p>
 <p><label for="election_anonymous">Anonymous Vote</label>
 <%= check_box 'election', 'anonymous', {}, 1, 0  %></p>
 
 <p>Election/Voting Start Date<br />
 <%= datetime_select :election, :startdate %></p>

+--> 

 
 

-<p>Election/Voting End Date<br />
-<%= datetime_select :election, :enddate %></p>
+<p>Election End Date<br />
+<font size="-1"><em>All elections end at 23:59.</em></font><br />
+<%= date_select :election, :enddate %></p>

 
 <!--[eoform:election]-->
 
 
 <!--[eoform:election]-->