merged changed in from devel to activate voting in full elections

[selectricity] / app / views / quickvote / _result.rhtml

diff --git a/app/views/quickvote/_result.rhtml b/app/views/quickvote/_result.rhtml
index e10890a7a92d80d5fbe11534eeb944d95e2b2828..b0a3a8522363fcdd8dde2eb70eb7c261ca7e6cb2 100644 (file)
--- a/app/views/quickvote/_result.rhtml
+++ b/app/views/quickvote/_result.rhtml
@@ -1,10 +1,12 @@
-<% %>
-<% if result.winner? and result.winners.length == 1%>
-  <p><em>The winner is:
-     <strong><%= @candidates[result.winner].name.capitalize %></strong></em></p>
+<div class="winner">
+<p class="winner_text">
+<% if result.winner? and result.winners.length == 1 -%>
+  The winner is:
+     <strong><%=h @candidates[result.winner].name.capitalize %></strong>
 <% elsif result.winner? and result.winners.length > 1 %>
-  <p><em>There was a tie. The winners are: <strong><%=
-  result.winners.collect {|w| @candidates[w].to_s.capitalize}.join(", ") %></strong></em></p>
+  There was a tie. The winners are: <strong><%=h( result.winners.collect {|w| @candidates[w].to_s.capitalize}.join(", ") )%></strong>
 <% else %>
-  <p><em>There is no winner using this method. </em></strong></p>
+  <p>There is no winner using this method. </strong>
 <% end %>
+</p>
+</div>