projects
/
selectricity-live
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merged in from code from the other master
[selectricity-live]
/
app
/
views
/
election
/
edit_candidates.rhtml
diff --git
a/app/views/election/edit_candidates.rhtml
b/app/views/election/edit_candidates.rhtml
index 7e1f315c9506f86268f94046fedee7c361689ee1..cd0bd5ab7c99b5b05174677ddde9d0d36b26aff9 100644
(file)
--- a/
app/views/election/edit_candidates.rhtml
+++ b/
app/views/election/edit_candidates.rhtml
@@
-5,6
+5,8
@@
<div class="clear-div"></div>
<div class="clear-div"></div>
+<% if @election.active == 0 %>
+
<div class="normal-header">
<span class="header">Enter New Candidate</span>
<span class="subheader"></span>
<div class="normal-header">
<span class="header">Enter New Candidate</span>
<span class="subheader"></span>
@@
-44,3
+46,11
@@
to proceed to the next step.</p>
<%= button_to "Proceed to Next Step", :action => 'new_voters', :id => @election %>
to proceed to the next step.</p>
<%= button_to "Proceed to Next Step", :action => 'new_voters', :id => @election %>
+
+<% else %>
+
+<p>You can not edit the list of candidates once the election has begun.
+please return to the <%= link_to "election overview page", :action =>
+'show', :id => @election.id %>.</p>
+
+<% end %>
Benjamin Mako Hill
||
Want to submit a patch?