merged in changes from live version

[selectricity-live] / app / views / election / _candidate_form.rhtml

diff --git a/app/views/election/_candidate_form.rhtml b/app/views/election/_candidate_form.rhtml
old mode 100755 (executable)
new mode 100644 (file)
index ed14dff..75e5c3e
--- a/app/views/election/_candidate_form.rhtml
+++ b/app/views/election/_candidate_form.rhtml
@@ -1,11 +1,11 @@
-<% %>
-
-<p>New candidate name:<br />
+<p><label for="candidate_name">Name</label><br />
 <%= text_field :candidate, :name, :size => 60 %></p>
  
-<p>Candidate description/platform (optional):<br />
+<p><label for="candidate_description">Description/Platform</label> (optional)<br />
 <%= text_area :candidate, :description, :cols => 60, :rows => 5 %></p>
 
-<p>Candidate picture (optional and < 100x100 pixels):<br />
-<%= file_field :candidate, :picture %></p>
 
+<p style="float: left;"><label for="candidate_picture">Picture</label> (optional and &lt; 100x100 pixels)<br />
+<%= file_field :picture, :uploaded_data%></p>
+
+<div class="clear-div"></div>