whoops, committed some errant javascript last time, here removed

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

diff --git a/app/views/embed/full_vote.rhtml b/app/views/embed/full_vote.rhtml
index 56715eb064203e78f174e8627b9521e0b3f77f2e..db8f043312f57d8cbf068b93d72ea617ea92ca96 100644 (file)
--- a/app/views/embed/full_vote.rhtml
+++ b/app/views/embed/full_vote.rhtml
@@ -6,14 +6,15 @@
 <div id="voting-box" height="<%=(@election.candidates.length + 2)*53 %>px">
        
        <%= render :partial => '/embed/backdrop' %>
-       
        <ul id="rankings-list">
       <% @voter.vote.rankings.each do |ranking| %>
                <li class="ranking" id="ranking_<%= ranking.candidate.id %>">
                        <img alt="<%= white_list ranking.candidate.name %>"
                  src="<% if ranking.candidate.picture -%>
                       <%= url_for ranking.candidate.picture.public_filename(:thumb) -%>
-                     <%- else -%>
+                                         <% elsif @default_image %>
+                                         <%= url_for @default_image.public_filename %>
+                      <%- else -%>
                      /images/default_icon.png
                      <%- end %>" />
                        <p class="ranking-info">
@@ -26,7 +27,9 @@
        <div style="clear:both;"></div>
        
        <div id="voting-bottom" style="
-       <% if @election.candidates.length%2 == 0 %>
+       <% if @bottom_bar %>
+       background-image:url(<%= url_for @bottom_bar.public_filename %>)
+       <% elsif @election.candidates.length%2 == 0 %>
        background-image:url(/images/bottom_dark.png)
        <%else%>
        background-image:url(/images/bottom_light.png)