projects
/
selectricity-live
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The results page should now work for scaling embeddableelections as well.
[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 70a6825283a5fad7993e1e9de25eb462e1de8aa7..56715eb064203e78f174e8627b9521e0b3f77f2e 100644
(file)
--- a/
app/views/embed/full_vote.rhtml
+++ b/
app/views/embed/full_vote.rhtml
@@
-1,8
+1,11
@@
<div id="header">
<div id="header">
-<
img id="header_icon" src="/images/embed_header_icon.png" />
-<h2>Vote Now</h2>
+<
%= link_to '<img id="header_icon" src="/images/embed_header_icon.png" />',
+
{:controller => 'front'}, {:target => "_parent"} %>
<h2>Vote Now</h2>
</div>
</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| %>
<ul id="rankings-list">
<% @voter.vote.rankings.each do |ranking| %>
@@
-22,10
+25,15
@@
<div style="clear:both;"></div>
<div style="clear:both;"></div>
- <div id="voting-bottom">
+ <div id="voting-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="<%= url_for :action => :confirm, :id => @password, :embed => 'true' %>"><h2 id="submit_vote_button">Submit Vote</h2></a>
<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
your favorite videos
</p>
+ <p><b>Drag and drop</b> to rank
the choices.
</p>
</div>
</div>
</div>
</div>
</div>
</div>
Benjamin Mako Hill
||
Want to submit a patch?