merged in changes from live version

[selectricity] / app / views / voter / full_vote.rhtml

diff --git a/app/views/voter/full_vote.rhtml b/app/views/voter/full_vote.rhtml
index 9d4f1d0675042eae322e577a5421c015e07f2941..5e8a8d1695669256b4a963212fd0eb6e0c1332dc 100644 (file)
--- a/app/views/voter/full_vote.rhtml
+++ b/app/views/voter/full_vote.rhtml
@@ -30,12 +30,10 @@ vote.</p>
 
 <% @voter.election.candidates.each do |candidate| %>
   <% @current_candidate = candidate %>
-
   <div id="cand<%= @current_candidate.id %>">
-  <h3><%=h @current_candidate.name -%></h3>
-      <blockquote>
-      <%=h (@current_candidate.description) %>
-      </blockquote>
+  <h3><%= h @current_candidate.name %></h3>
+  <%= render :partial => 'election/candidate_box_info' %>
   </div>
     <% end %>
 </ul>
+