disabled mem cache

[selectricity-live] / app / views / election / show.rhtml

diff --git a/app/views/election/show.rhtml b/app/views/election/show.rhtml
index ff06521da1dbb997e55b118babd2aeade7985748..3e636281fcccbbb099d294ea624d0e84d7aded53 100644 (file)
--- a/app/views/election/show.rhtml
+++ b/app/views/election/show.rhtml
@@ -1,5 +1,7 @@
-<%= render_partial 'progress', 'review' %>
-<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


@@ -9,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>


@@ -33,7 +33,10 @@
 <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.candidates.empty? %>
   <%= render :partial => 'candidate_list' %>


@@ -45,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' %>


@@ -55,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>


@@ -65,7 +75,7 @@
     <% end %>
     </ul>
   <% else %>
     <% end %>
     </ul>
   <% else %>

-    <p>Please check eveything carefully on this page before starting this
+    <p>Please check everything carefully on this page before starting this

     vote. Once you begin the vote, you will <em>not</em> be able to add or
     change candidates, modify the voting lists, or change the end
     time.</p>
     vote. Once you begin the vote, you will <em>not</em> be able to add or
     change candidates, modify the voting lists, or change the end
     time.</p>