Fix errors when viewing results as election creator before election close.

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

diff --git a/app/views/embed/results.rhtml b/app/views/embed/results.rhtml
index b9b1eb48260ddc11553858d13c88ad92ba41af26..a4ea4c1d210f4b42441465220b57f5d2f18ae0e1 100644 (file)
--- a/app/views/embed/results.rhtml
+++ b/app/views/embed/results.rhtml
@@ -1,8 +1,11 @@
 <div id="header">
-<img id="header_icon" src="/images/embed_header_icon.png" />
+<%= link_to '<img id="header_icon" src="/images/embed_header_icon.png" />',
+            {:controller => 'front'}, {:target => "_parent"} %>
 <h2>Current Standings</h2>
 </div>
-<div id="voting-box">
+<div id="voting-box" height="<%=(@election.candidates.length + 2)*53 %>px">
+       
+       <%= render :partial => '/embed/backdrop' %>
        
        <ul id="rankings-list">
       <% @election.ssd_result.ranked_candidates.flatten.each do |ranking_id| %>
@@ -23,7 +26,12 @@
        
        <div style="clear:both;"></div>
        
-       <div id="results-bottom">
+       <div id="results-bottom" style="
+       <% if @election.candidates.length%2 == 0 %>
+       background-image:url(/images/bottom_dark.png)
+       <%else%>
+       background-image:url(/images/bottom_light.png)
+       <%end%>">
                <div id="container">
                 <a href="<%= votepassword_url :urlpassword => "open." + @voter.election.id.to_s, 'embed' => 'true' %>"><h2>Results</h2></a>