From a820896b51a6fbf0216b616fb77495677a390190 Mon Sep 17 00:00:00 2001 From: Stephanie Wilkinson Date: Fri, 29 Sep 2017 14:34:38 -0700 Subject: [PATCH] remove sillier text --- app/views/conferences/_schedule_splashpage.html.haml | 6 ------ app/views/conferences/show.html.haml | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/app/views/conferences/_schedule_splashpage.html.haml b/app/views/conferences/_schedule_splashpage.html.haml index aa4db703..936b7e03 100644 --- a/app/views/conferences/_schedule_splashpage.html.haml +++ b/app/views/conferences/_schedule_splashpage.html.haml @@ -3,12 +3,6 @@ .col-md-12 %h2.text-center Program - %p.lead.text-center - %span.notranslate - = @conference.short_title - has the most awesome program ever! - - if @conference.splashpage and @conference.program.tracks.any? and @conference.splashpage.include_tracks - See rock-star speakers cover the topics of - if @conference.splashpage and @conference.splashpage.include_tracks - @conference.program.tracks.confirmed.each_slice(3) do |slice| .row.row-centered diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml index cc2026e1..e584ddf7 100644 --- a/app/views/conferences/show.html.haml +++ b/app/views/conferences/show.html.haml @@ -24,7 +24,7 @@ = @conference.title %p.lead - if @conference.venue - = "#{@conference.venue.city} / #{@conference.venue.country_name}" + = "#{@conference.venue.name} / #{@conference.venue.city}" - if @conference.start_date && @conference.end_date %br = date_string(@conference.start_date, @conference.end_date)