projects
/
selectricity-live
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Major integration of Courtland's design into the QuickVotes.
[selectricity-live]
/
app
/
controllers
/
election_controller.rb
diff --git
a/app/controllers/election_controller.rb
b/app/controllers/election_controller.rb
index 4ad8bacb354b5cac24a320b994f74427d2809a23..570f1fc3687a4162428555d06829544074d74b93 100644
(file)
--- a/
app/controllers/election_controller.rb
+++ b/
app/controllers/election_controller.rb
@@
-16,6
+16,8
@@
class ElectionController < ApplicationController
end
def general_information
end
def general_information
+ @sidebar_content = render_to_string :partial => 'progress',
+ :locals => { :page => 'overview' }
@election = Election.new
render :action => 'general_information'
end
@election = Election.new
render :action => 'general_information'
end
@@
-81,6
+83,8
@@
class ElectionController < ApplicationController
# information for elections
####################################################################
def edit_candidates
# information for elections
####################################################################
def edit_candidates
+ @sidebar_content = render_to_string :partial => 'progress',
+ :locals => { :page => 'candidates' }
@election = Election.find( params[:id] )
end
@election = Election.find( params[:id] )
end
Benjamin Mako Hill
||
Want to submit a patch?