Fixed workshop times and schedule

This commit is contained in:
Godwin
2017-02-27 17:26:27 -08:00
parent 89af3c5aae
commit 572e0d6644
5 changed files with 126 additions and 101 deletions
+1 -1
View File
@@ -21,7 +21,7 @@
- if conference.workshop_schedule_published
- add_inline_script :home_schedule
%h3=_'articles.workshops.headings.Schedule'
= render 'conferences/admin/schedule'
= render 'conference_administration/schedule'
- else
%h3=_'articles.workshops.headings.Proposed_Workshops'
%p=_'articles.workshops.paragraphs.Proposed_Workshops'
+1 -1
View File
@@ -2,4 +2,4 @@
= @this_conference.poster.full.url || image_path('default_poster.jpg')
- content_for :title do
=@this_conference.title
= render 'conferences/conference', conference: @this_conference, links: @links
= render 'conferences/conference', conference: @this_conference, links: @links, sections: [:info, :workshops]