Merge jdong

[selectricity] / app / views / election / _progress.rhtml

diff --git a/app/views/election/_progress.rhtml b/app/views/election/_progress.rhtml
index 520894cdb79ec4d2ffd5304cc7f04b88a5b182ad..40beb60b590931d2f62a7c6b1f8bc8638b4a9840 100644 (file)
--- a/app/views/election/_progress.rhtml
+++ b/app/views/election/_progress.rhtml
@@ -2,12 +2,13 @@
                       ['candidates', 'Candidates'],
                       ['voters', 'Voters'],
                       ['review', 'Review'] ] %>
+<h2>Progress</h2>
 <div id="election_creation_progress_bar">
 
 <ul>
 <% progress_steps.each_with_index do |kv, i| -%>
   <% step, description = kv -%>
-  <li class="<%= step == progress ? 'step_selected' : 'step_unselected' -%>
+  <li class="<%= step == page ? 'step_selected' : 'step_unselected' -%>
              <%= " last" if i + 1 == progress_steps.length -%>
              ">Step <%= i + 1 %>: <%= description %></li>
 <% end -%>