Merge efdb2cd63b into 4b6895f31d

app/views/schedules/_carousel.html.haml

@@ -29,9 +29,10 @@
               %td.room{ style: "height: #{ td_height(@rooms) }px;" }
                 .room.elipsis.break-words{ style: "-webkit-line-clamp: #{ room_lines(@rooms) }; height: #{ room_height(@rooms) }px;" }
                   = room.name
-
                 - event_schedules = (@event_schedules_by_room_id[room.id] || []).select{ |e| (e.end_time > start_time) && (e.start_time <= (start_time + hrs_per_slide.hour)) }
 
+                - event_schedules = event_schedules.select{ |e| e.event.favourite_users.exists?(current_user.id) } if current_user && @favourites
+
                 - interval_count.times do |offset|
                   - if span > 1
                     - span -= 1

app/views/schedules/_event.html.haml

@@ -4,11 +4,15 @@
       = image_tag speaker.gravatar_url, :class => "img-circle pull-right all-speaker-pic", |
                                         :alt => speaker.name, |
                                         :title => speaker.name |
-
     %p
       = canceled_replacement_event_label(event, event_schedule)
       = replacement_event_notice(event_schedule)
-
+    - if current_user
+      = link_to('#', onClick: 'starClicked();') do
+        %span#star-events{ class: "fa fa-lg #{ event.favourite_users.exists?(current_user.id) ? 'fa-star' : 'fa-star-o' }", |
+                           "aria-hidden" => "true", |
+                           "data-url" => toggle_favorite_conference_program_proposal_path(@conference.short_title, event.id), |
+                           "data-user" => current_user.id }
     %span.h3
       = event.title
       %br

app/views/schedules/_schedule_item.html.haml

@@ -1,12 +1,18 @@
 %td.event{ width: "#{ width * span }%" , |
            colspan: span, |
            role: "button" }
-  %a.unstyled-link{href: url_for(conference_program_proposal_path(@conference.short_title, event.id))}
+  %div{ onClick: 'eventClicked(event, this);', "data-url" => "#{url_for(conference_program_proposal_path(@conference.short_title, event.id))}" }
     %div{ class: "elipsis break-words event-title", |
           style: "-webkit-line-clamp: #{ event_lines(@rooms) }; height: #{ event_height(@rooms) }px;"} |
 
       = canceled_replacement_event_label(event, event_schedule, 'schedule-label')
 
+      - if current_user
+        = link_to('#', onClick: 'starClicked();') do
+          %span#star{ class: "fa fa-lg #{ event.favourite_users.exists?(current_user.id) ? 'fa-star' : 'fa-star-o' }", |
+                      "aria-hidden" =>"true", |
+                      "data-url" => toggle_favorite_conference_program_proposal_path(@conference.short_title, event.id), |
+                      "data-user" => current_user.id }
       = event.title
 
     - event.speakers_ordered.each do |speaker|
@@ -14,4 +20,3 @@
                                         :alt => speaker.name, |
                                         :title => speaker.name, |
                                         :style => "height: #{ speaker_height(@rooms) }px; width: #{ speaker_width(@rooms) }px;"
-

app/views/schedules/_schedule_tabs.html.haml

@@ -2,6 +2,6 @@
   / Nav tabs
   %ul.nav.nav-tabs{ role: "tablist" }
     %li{ class: "schedule #{ 'active' if active == 'schedule' }", role: "presentation" }
-      = link_to('Schedule', conference_schedule_path(@conference.short_title))
+      = link_to('Schedule', conference_schedule_path(@conference.short_title, favourites: @favourites))
     %li{ class: "program #{ 'active' if active == 'program' }", role: "presentation" }
-      = link_to('All events', events_conference_schedule_path(@conference.short_title))
+      = link_to('All events', events_conference_schedule_path(@conference.short_title, favourites: @favourites))

app/views/schedules/events.html.haml

@@ -5,6 +5,13 @@
   %h1.text-center
     Program for
     = @conference.title
+  - if current_user
+    .row
+      .col-md-12.text-center
+        = button_to (@favourites ? 'All events' : 'Only favourites events'),
+                    events_conference_schedule_path(@conference.short_title),
+                    params: { favourites: !@favourites },
+                    method: :get, class: 'btn btn-success'
   .dropdown.program-dropdown
     %button{ type: "button", class: "btn btn-default dropdown-toggle", 'data-toggle' => "dropdown" }
       Dates

app/views/schedules/show.html.haml

@@ -5,6 +5,13 @@
     %h1.text-center
       Schedule for
       = @conference.title
+    - if current_user
+      .row
+        .col-md-12.text-center
+          = button_to (@favourites ? 'All events' : 'Only favourites events'),
+                      conference_schedule_path(@conference.short_title),
+                      params: { favourites: !@favourites },
+                      method: :get, class: 'btn btn-success'
     .dropdown.schedule-dropdown
       %button{ type: "button", class: "btn btn-default dropdown-toggle", 'data-toggle' => "dropdown" }
         = @day