From 1e802bc3c68ed9fb000bbe3f3aceeec3024b4642 Mon Sep 17 00:00:00 2001 From: Gopesh Tulsyan Date: Wed, 28 May 2014 14:49:00 +0530 Subject: [PATCH] Added description to conference and program segment to splash Added tracks to program component Rebased and updated the new navigation for splash --- app/models/conference.rb | 2 +- app/views/conference/_program.html.haml | 3 +++ app/views/conference/_tracks.html.haml | 9 +++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 app/views/conference/_tracks.html.haml diff --git a/app/models/conference.rb b/app/models/conference.rb index fb3e14ae..8b7f586a 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -74,7 +74,7 @@ class Conference < ActiveRecord::Base # Checks if the user is registered to the conference # # ====Args - # * +user+ -> The user we check for + # * +user+ -> The user we check for # ====Returns # * +nil+ -> If the user doesn't exist # * +false+ -> If the user is registered diff --git a/app/views/conference/_program.html.haml b/app/views/conference/_program.html.haml index 26d0d6de..81206952 100644 --- a/app/views/conference/_program.html.haml +++ b/app/views/conference/_program.html.haml @@ -13,3 +13,6 @@ %span You can find the complete schedule in our %span = link_to 'Master Schedule', conference_schedule_path(@conference.short_title), target: '_blank' + -if !@conference.tracks.blank? + = render 'tracks' + diff --git a/app/views/conference/_tracks.html.haml b/app/views/conference/_tracks.html.haml new file mode 100644 index 00000000..45cf6aa0 --- /dev/null +++ b/app/views/conference/_tracks.html.haml @@ -0,0 +1,9 @@ +%div.row + %div.col-md-12 + %h2 Tracks + - @conference.tracks.each do |t| + %div.col-md-4 + %h4 + = t.name + %p + = t.description \ No newline at end of file