created current scope in event_schedule model and conference info link name and path changed

This commit is contained in:
AnithaPal 2016-08-23 10:23:26 -04:00
parent e8d3177ec1
commit e82a3e1727
17 changed files with 53 additions and 65 deletions

View file

@ -2,12 +2,12 @@
.row
.col-md-12.text-center
%h2 Current Events
- @current_events.each do |event|
- @current_event_schedules.each do |es|
%div
%h3
= event.title
= es.event.title
%h4
presented by
= event.speaker_names
= es.event.speaker_names
in
= event.room.name
= es.event.room.name

View file

@ -6,10 +6,10 @@
- if @conference.description.present?
%h3
= @conference.description
- if @current_events.present?
- if @current_event_schedules.present?
.row#current-events
= render 'current_events'
- if @conference.contact.social_tag.present? && @tweets.present?
- if @conference.contact.social_tag.present? && @tweets.any?
.row#conference-tweets
= render 'conference_tweets'
- if @sponsors.any?

View file

@ -138,7 +138,7 @@
Roles
- if can? :show, @conference
%li{:class=> active_nav_li(conference_wide_screen_admin_conference_path(@conference.short_title))}
= link_to(conference_wide_screen_admin_conference_path(@conference.short_title)) do
%li{:class=> active_nav_li(conference_info_admin_conference_path(@conference.short_title))}
= link_to(conference_info_admin_conference_path(@conference.short_title)) do
%span.fa.fa-expand
Conference Wide Information
Conference Info