From 3d02e098075120f71c8927dae512fac435dc8094 Mon Sep 17 00:00:00 2001 From: Godwin Date: Mon, 21 Aug 2017 19:56:00 -0700 Subject: [PATCH 1/2] z-index fix for schedule notes --- app/assets/stylesheets/_admin.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/_admin.scss b/app/assets/stylesheets/_admin.scss index 9952771..37fe3d3 100644 --- a/app/assets/stylesheets/_admin.scss +++ b/app/assets/stylesheets/_admin.scss @@ -795,6 +795,7 @@ nav.sub-menu { margin-top: -0.2em; margin-right: 0.25em; cursor: pointer; + z-index: 2; @include after { content: $note-icon; From 5f2add7f6420e94f438e536b1e55cf577bf731f6 Mon Sep 17 00:00:00 2001 From: Godwin Date: Tue, 22 Aug 2017 12:24:41 -0700 Subject: [PATCH 2/2] Set location title to link text on the schedule (#263) * Added optional text attribute to location link * Set location title to link text on the schedule --- app/helpers/geocoder_helper.rb | 8 ++++++-- app/views/conference_administration/_schedule.html.haml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb index ed1507f..60a93e5 100644 --- a/app/helpers/geocoder_helper.rb +++ b/app/helpers/geocoder_helper.rb @@ -84,9 +84,13 @@ module GeocoderHelper return hash.length > 1 ? _("geography.formats.#{hash.keys.join('_')}", locale: locale, vars: hash) : hash.values.first end - def location_link(location) + def location_link(location, text = nil) return '' unless location.present? - address = if location.is_a?(Location) + address = if text is_a?(Symbol) + location.send(text) + elsif location.is_a?(String) + text + elsif location.is_a?(Location) location.street else location.address diff --git a/app/views/conference_administration/_schedule.html.haml b/app/views/conference_administration/_schedule.html.haml index 20e3687..17c9210 100644 --- a/app/views/conference_administration/_schedule.html.haml +++ b/app/views/conference_administration/_schedule.html.haml @@ -15,7 +15,7 @@ %tr %th.corner - data[:locations].each do |id, location| - %th.location-header=location.is_a?(Symbol) ? '' : location_link(location) + %th.location-header=location.is_a?(Symbol) ? '' : location_link(location, :title) %tbody - data[:times].each do |time, time_data| %tr{class: "row-type-#{time_data[:type] || 'nil'}"}