Merge remote branch 'remotes/deployment/master' into live

[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 170b1f55c42ebbda23f70981002b21468e9906ac..919b442c34af6fb88a8b3c7235149ac8f56c602a 100644 (file)
--- a/app/views/embed/full_vote.rhtml
+++ b/app/views/embed/full_vote.rhtml
@@ -1,16 +1,24 @@
-<div id="header">
+<div id="header" style="background-image:url(<%if @top_bar%>
+                                               <%=url_for @top_bar.public_filename%>)
+                                               <% else %>
+                                               /images/embed_basic_bg.png)
+                                               <% end %>">
 <%= link_to '<img id="header_icon" src="/images/embed_header_icon.png" />',
             {:controller => 'front'}, {:target => "_parent"} %><h2>Vote Now</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">
       <% @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">
@@ -22,7 +30,14 @@
        
        <div style="clear:both;"></div>
        
-       <div id="voting-bottom">
+       <div id="voting-bottom" style="
+       <% 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)
+       <%end%>" >
                <div id="container">
                        <a href="<%= url_for :action => :confirm, :id => @password, :embed => 'true' %>"><h2 id="submit_vote_button">Submit Vote</h2></a>
                        <p><b>Drag and drop</b> to rank the choices.</p>