projects
/
selectricity-live
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Major integration of Courtland's design into the QuickVotes.
[selectricity-live]
/
app
/
views
/
quickvote
/
results.rhtml
diff --git
a/app/views/quickvote/results.rhtml
b/app/views/quickvote/results.rhtml
index 0383b5e4434c0acfba9b9e391b16e463687b91b5..8b658f77a3c86dcae036916f5c7ddee82322fb6c 100644
(file)
--- a/
app/views/quickvote/results.rhtml
+++ b/
app/views/quickvote/results.rhtml
@@
-1,9
+1,14
@@
-<% %>
-<%require 'whois/whois' %>
-<h1>Results</h1>
+<% require 'whois/whois' %>
+
+<div id="page-title">
+ <span class="header">Quickvote</span>
+ <span class="subheader">Results</span>
+</div>
+
+<div class="main-content">
<% 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,14
+30,21
@@
<%= @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] %>
</div>
<div class="mainresultbox">
<%= render :partial => 'result_' + @election.election_method,
:object => @results[@election.election_method] %>
</div>
-<h3> Other Voting Methods </h3>
+<div class="plain-header">
+ <span class="header">Other Voting Methods</span>
+ <span class="subheader"></span>
+</div>
+
<% for result_type in @election.other_methods %>
<div class="resultbox">
<%= render :partial => 'result_' + result_type,
<% for result_type in @election.other_methods %>
<div class="resultbox">
<%= render :partial => 'result_' + result_type,
@@
-41,7
+53,7
@@
<% 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">
@@
-83,3
+95,4
@@
<%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %><br />
<%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %><br />
+</div>
Benjamin Mako Hill
||
Want to submit a patch?