projects
/
selectricity
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
first (mostly) working version of full elections.
[selectricity]
/
app
/
views
/
election
/
show.rhtml
diff --git
a/app/views/election/show.rhtml
b/app/views/election/show.rhtml
index 2a2316861f40fb95096ea7ada6b4fd1aee945572..3e636281fcccbbb099d294ea624d0e84d7aded53 100644
(file)
--- a/
app/views/election/show.rhtml
+++ b/
app/views/election/show.rhtml
@@
-1,4
+1,7
@@
-<h1>Vote Information</h1>
+<div id="title-header">
+ <span class="header">Election Overview</span>
+ <span class="subheader"></span>
+</div>
<% if @election.active? %>
<div id="status">Vote is in currently in progress. Return to
<% if @election.active? %>
<div id="status">Vote is in currently in progress. Return to
@@
-8,8
+11,6
@@
:action => 'results', :id => @election.id %>.</div>
<% end %>
:action => 'results', :id => @election.id %>.</div>
<% end %>
-<h2>Overview</h2>
-
<p><strong>Summary</strong></p>
<blockquote>
<p><strong>Summary</strong></p>
<blockquote>
@@
-32,8
+33,11
@@
<p><%= link_to "Edit overview.", :action => 'edit', :id => @election.id %></p>
<% end %>
<p><%= link_to "Edit overview.", :action => 'edit', :id => @election.id %></p>
<% end %>
-<h2>Candidates</h2>
-<% %>
+<div class="normal-header">
+ <span class="header">Candidates</span>
+ <span class="subheader"></span>
+</div>
+
<% unless @election.candidates.empty? %>
<%= render :partial => 'candidate_list' %>
<% unless @election.active %>
<% unless @election.candidates.empty? %>
<%= render :partial => 'candidate_list' %>
<% unless @election.active %>
@@
-44,7
+48,10
@@
<% end %>
<% end %>
-<h2>Voters</h2>
+<div class="normal-header">
+ <span class="header">Voters</span>
+ <span class="subheader"></span>
+</div>
<% unless @election.voters.empty? %>
<%= render :partial => 'voter_list' %>
<% unless @election.voters.empty? %>
<%= render :partial => 'voter_list' %>
@@
-54,7
+61,11
@@
<% end %>
<% unless @election.active? %>
<% end %>
<% unless @election.active? %>
- <h2>Start Election</h2>
+
+<div class="normal-header">
+ <span class="header">Start Election</span>
+ <span class="subheader"></span>
+</div>
<% if @election.start_blockers.length > 0 %>
<p>Your vote cannot be started for the following reasons:</p>
<% if @election.start_blockers.length > 0 %>
<p>Your vote cannot be started for the following reasons:</p>
Benjamin Mako Hill
||
Want to submit a patch?