SchedulesController introduced
The actions #schedule and #events were moved from conference controller to the new controller
This commit is contained in:
parent
b037a5eb7c
commit
71dab6b79c
18 changed files with 87 additions and 69 deletions
|
|
@ -4,7 +4,7 @@
|
|||
%h1 Commercials
|
||||
%p.text-muted
|
||||
Conference commercials will be displayed on the events in the
|
||||
= link_to "schedule,", schedule_conference_path(@conference.short_title)
|
||||
= link_to "schedule,", conference_schedule_path(@conference.short_title)
|
||||
if the event speaker didn't add an event commercial.
|
||||
- if can? :create, @conference.commercials.new
|
||||
.row
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
- if conference.splashpage && conference.splashpage.public
|
||||
= link_to "View Conference", conference_path(conference.short_title), :class =>"btn btn-default"
|
||||
- if conference.program and conference.program.schedule_public
|
||||
= link_to "Schedule", schedule_conference_path(conference.short_title), :class =>"btn btn-default"
|
||||
= link_to "Schedule", conference_schedule_path(conference.short_title), :class =>"btn btn-default"
|
||||
- if conference.registration_open?
|
||||
- if conference.user_registered?(current_user)
|
||||
= link_to "My Registration", conference_conference_registration_path(conference.short_title), :class =>"btn btn-default"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
.row
|
||||
.col-md-12
|
||||
%p.cta-button.text-center
|
||||
= link_to(schedule_conference_path(@conference.short_title), class: 'btn btn-default btn-lg') do
|
||||
= link_to(conference_schedule_path(@conference.short_title), class: 'btn btn-default btn-lg') do
|
||||
Full Schedule
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
- if can? :edit, @event
|
||||
= link_to "Edit", edit_conference_program_proposal_path(@conference.short_title, @event), :class => "btn btn-mini btn-primary"
|
||||
- if can? :schedule, @conference
|
||||
= link_to "Schedule", schedule_conference_path(@conference.short_title), :class =>"btn btn-success"
|
||||
= link_to "Schedule", conference_schedule_path(@conference.short_title), :class =>"btn btn-success"
|
||||
|
||||
- if @event.state == 'canceled' || @event.state == 'withdrawn'
|
||||
%span.label.label-danger CANCELED
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
/ Nav tabs
|
||||
%ul.nav.nav-tabs{ role: "tablist" }
|
||||
%li{ class: "schedule #{ 'active' if active == 'schedule' }", role: "presentation" }
|
||||
= link_to('Schedule', schedule_conference_path(@conference.short_title))
|
||||
= link_to('Schedule', conference_schedule_path(@conference.short_title))
|
||||
%li{ class: "program #{ 'active' if active == 'program' }", role: "presentation" }
|
||||
= link_to('All events', events_conference_path(@conference.short_title))
|
||||
= link_to('All events', events_conference_schedule_path(@conference.short_title))
|
||||
Loading…
Add table
Add a link
Reference in a new issue