updated db schema

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

diff --git a/app/views/voter/full_vote.rhtml b/app/views/voter/full_vote.rhtml
index 9d4f1d0675042eae322e577a5421c015e07f2941..80ea98676d01b72bb50066677ea6548a85f3fe89 100644 (file)
--- a/app/views/voter/full_vote.rhtml
+++ b/app/views/voter/full_vote.rhtml
@@ -6,10 +6,12 @@
 <p><strong>Description:</strong></p>
 <p><%= @voter.election.description %></p>
 
 <p><strong>Description:</strong></p>
 <p><%= @voter.election.description %></p>
 

+<% if @voter.election.authenticated? %>

 <div class="normal-header">
   <span class="header">Current Voter</span>
   <span class="subheader"></span>
 </div>
 <div class="normal-header">
   <span class="header">Current Voter</span>
   <span class="subheader"></span>
 </div>

+<% end %>

 
 <p><strong><%= @voter.email %></strong></p>
 
 
 <p><strong><%= @voter.email %></strong></p>
 


@@ -30,12 +32,10 @@ vote.</p>
 
 <% @voter.election.candidates.each do |candidate| %>
   <% @current_candidate = candidate %>
 
 <% @voter.election.candidates.each do |candidate| %>
   <% @current_candidate = candidate %>

-

   <div id="cand<%= @current_candidate.id %>">
   <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>
   </div>
     <% end %>
 </ul>

+