diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss index 45289a5..d38248c 100644 --- a/app/assets/stylesheets/_application.scss +++ b/app/assets/stylesheets/_application.scss @@ -1779,6 +1779,11 @@ table.schedule { tbody { border: 0.1rem solid $light-gray; + + th { + white-space: nowrap; + text-align: right; + } } &.locations-1 td.workshop.filled { @@ -1804,6 +1809,7 @@ table.schedule { &.locations-6 td.workshop.filled { width: 16.66667%; } + td { text-align: center; border: 0; diff --git a/app/views/conference_administration/_schedule.html.haml b/app/views/conference_administration/_schedule.html.haml index 1061070..1426370 100644 --- a/app/views/conference_administration/_schedule.html.haml +++ b/app/views/conference_administration/_schedule.html.haml @@ -7,7 +7,7 @@ - add_inline_script :schedule if @entire_page #schedule-preview - @schedule.each do |day, data| - %h4=date(day, :weekday) + %h4=date(day, :weekday).html_safe %table.schedule{class: [data[:locations].present? ? 'has-locations' : 'no-locations', "locations-#{data[:num_locations]}"]} - if data[:locations].present? && data[:locations].values.first != :add %thead @@ -19,7 +19,7 @@ - data[:times].each do |time, time_data| %tr - rowspan = (time_data[:length] * 2).to_i - %th=time(time) + %th=time(time).html_safe - if time_data[:type] == :workshop - data[:locations].each do |id, location| - if time_data[:item][:workshops][id].present? diff --git a/config/locales/en.yml b/config/locales/en.yml index 1bfade5..b450457 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -19,6 +19,7 @@ en: default: "%a, %d %b %Y %H:%M" long: "%l%P, %B %e, %Y" short: "%l %M %P" + pm: pm datetime: distance_in_words: about_x_hours: