From 96337ed081f4e903c640ca2f73a3f2406010c180 Mon Sep 17 00:00:00 2001 From: Ana Date: Wed, 10 Aug 2016 17:11:08 +0200 Subject: [PATCH] Make the whole event panel clickable in all events Make the whole event panel clickable in all events in the public schedule. It didn't work properly when having links inside the panel. It also works with ctrl + click openning the event page in a new tab. --- app/assets/stylesheets/osem-schedule.css.scss | 10 +-- app/views/conference/_event.html.haml | 76 +++++++++++-------- 2 files changed, 47 insertions(+), 39 deletions(-) diff --git a/app/assets/stylesheets/osem-schedule.css.scss b/app/assets/stylesheets/osem-schedule.css.scss index 872c368a..debd7640 100644 --- a/app/assets/stylesheets/osem-schedule.css.scss +++ b/app/assets/stylesheets/osem-schedule.css.scss @@ -63,12 +63,6 @@ background-image: -webkit-gradient( color: rgb(185, 74, 72); } -a.unstyled-link { - text-decoration: none; - color: #333333; - outline: 0; -} - .program-dropdown, .schedule-dropdown{ margin-left: 20%; margin-right: 20%; @@ -175,6 +169,10 @@ td.no-padding{ display: inline-block; } +.event-panel{ + cursor: pointer; + } + .program-dropdown{ margin-left: 20%; margin-right: 20%; diff --git a/app/views/conference/_event.html.haml b/app/views/conference/_event.html.haml index 98c835d3..fe849737 100644 --- a/app/views/conference/_event.html.haml +++ b/app/views/conference/_event.html.haml @@ -1,33 +1,43 @@ -%a.unstyled-link{href: url_for(conference_program_proposal_path(@conference.short_title, event.id))} - .panel.panel-default - .panel-body - - if speaker = event.speakers.first - = image_tag speaker.gravatar_url, :class => "img-circle pull-right all-speaker-pic", | - :alt => speaker.name, | - :title => speaker.name | - %span.h3 - = event.title - %br - %small - = event.subtitle - %h4 - presented by #{event.speaker_names} - %p - = truncate(event.abstract, :length => 400) - = link_to 'more', conference_program_proposal_path(@conference.short_title, event.id) if event.abstract.length > 400 - - if event.scheduled? - %span.track - %span.fa.fa-clock-o - %span.label{ style: "background-color: grey" } - = event.start_time.strftime('%H:%M') - \- - = event.end_time.strftime('%H:%M') - %span.track - %span.fa.fa-map-marker - %span.label{ style: "background-color: grey" } - = event.room.name - - if event.track - %span.track - %span.fa.fa-road - %span.label{ style: "background-color: #{event.track.color}; color: #{ contrast_color(event.track.color) }" } - = event.track.name +.panel.panel-default.event-panel{ id: "link-#{event.id}" } + .panel-body + - if speaker = event.speakers.first + = image_tag speaker.gravatar_url, :class => "img-circle pull-right all-speaker-pic", | + :alt => speaker.name, | + :title => speaker.name | + %span.h3 + = event.title + %br + %small + = event.subtitle + %h4 + presented by #{event.speaker_names} + %p + = truncate(event.abstract, :length => 400) + = link_to 'more', conference_program_proposal_path(@conference.short_title, event.id) if event.abstract.length > 400 + - if event.scheduled? + %span.track + %span.fa.fa-clock-o + %span.label{ style: "background-color: grey" } + = event.start_time.strftime('%H:%M') + \- + = event.end_time.strftime('%H:%M') + %span.track + %span.fa.fa-map-marker + %span.label{ style: "background-color: grey" } + = event.room.name + - if event.track + %span.track + %span.fa.fa-road + %span.label{ style: "background-color: #{event.track.color}; color: #{ contrast_color(event.track.color) }" } + = event.track.name + +:javascript + + $("#link-#{event.id}").click(function(e) { + var url = "#{url_for(conference_program_proposal_path(@conference.short_title, event.id))}"; + + if(e.ctrlKey) + window.open(url,'_blank'); + else + window.location = url; + });