projects
/
selectricity
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refined the CSS and fixed some of the more recent issues.
[selectricity]
/
app
/
views
/
quickvote
/
results.rhtml
diff --git
a/app/views/quickvote/results.rhtml
b/app/views/quickvote/results.rhtml
index 9727d81289e6690597f298f4d5a0d8bb4a545e5e..a2da83de7c7fee449e26c3ccc46b4d0e0fe51d8a 100644
(file)
--- a/
app/views/quickvote/results.rhtml
+++ b/
app/views/quickvote/results.rhtml
@@
-1,9
+1,12
@@
-<% %>
-<%require 'whois/whois' %>
-<h1>Results</h1>
+<% require 'whois/whois' %>
+
+<div id="page-title">
+ <span class="header">Quickvote</span>
+ <span class="subheader">Results</span>
+</div>
<% if @election.shortdesc %>
<% if @election.shortdesc %>
- <p><strong>Description:</strong></p>
+ <p><strong>
Vote
Description:</strong></p>
<blockquote><em><%=h @election.shortdesc %></em>
<% if @election.longdesc -%>
<br />
<blockquote><em><%=h @election.shortdesc %></em>
<% if @election.longdesc -%>
<br />
@@
-25,20
+28,30
@@
<%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details)
</blockquote>
<%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details)
</blockquote>
-<h2>Winners</h2>
+<div class="plain-header">
+ <span class="header">Winner</span>
+ <span class="subheader"></span>
+</div>
+<div class="mainresultbox">
<%= render :partial => 'result_' + @election.election_method,
:object => @results[@election.election_method] %>
<%= render :partial => 'result_' + @election.election_method,
:object => @results[@election.election_method] %>
+</div>
+<div class="plain-header">
+ <span class="header">Other Voting Methods</span>
+ <span class="subheader"></span>
+</div>
-<h3> Other Voting Methods </h3>
<% for result_type in @election.other_methods %>
<% for result_type in @election.other_methods %>
+<div class="resultbox">
<%= render :partial => 'result_' + result_type,
:object => @results[result_type] %>
<%= render :partial => 'result_' + result_type,
:object => @results[result_type] %>
+</div>
<% end %>
<% end %>
-<div class="clear
box
"></div>
+<div class="clear
-div
"></div>
<h2>Voters <%= link_to "[Stalk Voters]", :controller => "quickvote", :action => "mapvoters", :id => @election.id %></h2>
<table class="voterbox">
<h2>Voters <%= link_to "[Stalk Voters]", :controller => "quickvote", :action => "mapvoters", :id => @election.id %></h2>
<table class="voterbox">
@@
-75,10
+88,9
@@
<% end %>
</table>
<% end %>
</table>
-<%= render :partial => 'pref_tables' %>
-
-<%=image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%>
<br />
<br />
-<%= image_tag( graph_url( :action => 'borda_bar', :id => @election ) ) %><br />
+
+<!--
<%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %><br />
<%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %><br />
-<%= image_tag(graph_url( :action => 'plurality_pie', :id => @election ) )%>
+-->
+
Benjamin Mako Hill
||
Want to submit a patch?