gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'final_volunteers' of https://github.com/differentreality/osem into differentreality-final_volunteers

Browse source 
Conflicts:
	app/models/conference.rb
	app/models/registration.rb
	app/views/admin/conference/_sidebar.html.haml
	app/views/conference_registration/register.html.haml
This commit is contained in:
Henne Vogelsang 2014-03-03 10:52:24 +01:00
commit 14a896842b
31 changed files with 342 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/admin/conference/_sidebar.html.haml
View file

@ -51,3 +51,7 @@
%li.active= link_to "Questions", "#"
- else
%li= link_to "Questions", admin_conference_questions_path(@conference.short_title)
- if activated == "volunteers"
%li.active= link_to "Volunteer Options", "#"
- else
%li= link_to "Volunteer Options", admin_conference_volunteer_options_path(@conference.short_title)