From: <jlsharps@mit.edu>
Date: Thu, 22 May 2008 18:29:58 +0000 (-0400)
Subject: The results page should now work for scaling embeddableelections as well.
X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/8e7066ecab24bf4f9795cf624e45804f27c5c005?ds=sidebyside;hp=cdcad04af50c8bb3dce636f097a099ed1da79735

The results page should now work for scaling embeddableelections as well.
---

diff --git a/app/views/embed/_backdrop.rhtml b/app/views/embed/_backdrop.rhtml
new file mode 100644
index 0000000..847f9a3
--- /dev/null
+++ b/app/views/embed/_backdrop.rhtml
@@ -0,0 +1,13 @@
+<%@election.candidates.length.times do |count|-%>
+	<% if (count%2)==0-%>
+		<img src="/images/widget_dark.png" 
+		style="position:absolute;top:<%=(count+1)*53%>px;">
+		<% else -%>
+		<img src="/images/widget_light.png" 
+		style="position:absolute;top:<%=(count+1)*53%>px">
+	<% end -%>
+	<p class="position" style="top:<%=(10+(count+1)*53)%>px;left:10px">
+	<%=count+1 -%>
+	</p>
+	
+<%end%>
\ No newline at end of file
diff --git a/app/views/embed/full_vote.rhtml b/app/views/embed/full_vote.rhtml
index 89e384c..56715eb 100644
--- a/app/views/embed/full_vote.rhtml
+++ b/app/views/embed/full_vote.rhtml
@@ -4,19 +4,8 @@
 </div>
 
 <div id="voting-box" height="<%=(@election.candidates.length + 2)*53 %>px">
-	<%@election.candidates.length.times do |count|%>
-		<% if (count%2)==0%>
-			<img src="/images/widget_dark.png" 
-			style="position:absolute;top:<%=(count+1)*53%>px;">
-			<% else %>
-			<img src="/images/widget_light.png" 
-			style="position:absolute;top:<%=(count+1)*53%>px">
-		<% end %>
-		<p class="position"
-		style="position:absolute;top:<%=(10+(count+1)*53)%>px;left:10px">
-			<%=count+1%>
-		</p>
-	<%end%>
+	
+	<%= render :partial => '/embed/backdrop' %>
 	
 	<ul id="rankings-list">
       <% @voter.vote.rankings.each do |ranking| %>
diff --git a/app/views/embed/results.rhtml b/app/views/embed/results.rhtml
index dea9b61..a4ea4c1 100644
--- a/app/views/embed/results.rhtml
+++ b/app/views/embed/results.rhtml
@@ -3,7 +3,9 @@
             {: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| %>
@@ -24,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>
 			
diff --git a/public/stylesheets/embed.css b/public/stylesheets/embed.css
index 86248c1..164381f 100644
--- a/public/stylesheets/embed.css
+++ b/public/stylesheets/embed.css
@@ -113,6 +113,7 @@ p.position {
 	color: #000000;
 	font-size:32px;
 	font-family:'arial';
+	position:absolute;
 }
 
 ul {
@@ -124,6 +125,7 @@ ul {
 .ranking {
 	margin: 0px;
 	height: 53px;
+	position:relative;
     overflow: hidden !important;
 }
 
@@ -156,6 +158,12 @@ ul {
 	height:53px;
 }
 
+#results-bottom {
+	position: absolute;
+	width: 330px;
+	height:53px;
+}
+
 #container {
 	margin: 0 auto 0 auto;
 	width: 90%;