two minor changes that fix bugs with the quickvote

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

diff --git a/app/views/election/_progress.rhtml b/app/views/election/_progress.rhtml
index 98ee63d3fdfbce471fe5ff5b41ae38eafa549814..e95ccd214087ec995a2c3b62c853d76c447bdf4b 100644 (file)
--- a/app/views/election/_progress.rhtml
+++ b/app/views/election/_progress.rhtml
@@ -1,3 +1,7 @@
+<% progress_steps = [ ['overview', 'General Information'],
+                      ['candidates', 'Candidates'],
+                      ['voters', 'Voters'],
+                      ['review', 'Review'] ] %>

 <h2>Progress</h2>
 
 <div id="progress_bar">
 <h2>Progress</h2>
 
 <div id="progress_bar">


@@ -7,7 +11,7 @@
   <% step, description = kv -%>
   <li class="<%= step == page ? 'step_selected' : 'step_unselected' -%>
              <%= " last" if i + 1 == progress_steps.length -%>
   <% step, description = kv -%>
   <li class="<%= step == page ? 'step_selected' : 'step_unselected' -%>
              <%= " last" if i + 1 == progress_steps.length -%>

-             ">Step <%= {i + 1 %>: <%= description %></li>
+             ">Step <%= i + 1 %>: <%= description %></li>

 <% end -%>
 </ul>
 
 <% end -%>
 </ul>