From 0d6a2e668c5531e73f69fa9b89b826b0435f4749 Mon Sep 17 00:00:00 2001 From: Arun Date: Mon, 20 Jun 2016 23:23:42 +0530 Subject: [PATCH 1/3] Add fallbacks for venue commercial --- app/assets/stylesheets/osem-splash.css.scss | 25 ++++++++++++++++----- app/views/conference/_venue.html.haml | 10 ++++++++- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/osem-splash.css.scss b/app/assets/stylesheets/osem-splash.css.scss index d378d223..35e91722 100644 --- a/app/assets/stylesheets/osem-splash.css.scss +++ b/app/assets/stylesheets/osem-splash.css.scss @@ -39,7 +39,7 @@ } } } - + #program { h3 { padding-left: 5px; @@ -51,7 +51,7 @@ background-color: #F0FFFF; } } - + #callforpapers { .timer-box{ width: 130px; @@ -60,7 +60,7 @@ border:4px solid #989797; } } - + #venue { padding-top: 0px; padding-bottom: 0px; @@ -134,7 +134,7 @@ } } } - + .scroll-top-wrapper { position: fixed; opacity: 0; @@ -170,4 +170,19 @@ color: white; } } -} \ No newline at end of file +} + +/* Venue icon styles */ +.icon-container { + position: relative; + height: 315px; + .icon-inner { + position:absolute; + top:50%; + left: 50%; + transform:translate(-50%,-50%); + .fa-university { + font-size: 10em; + } + } +} diff --git a/app/views/conference/_venue.html.haml b/app/views/conference/_venue.html.haml index 74dad5a7..60e37fba 100644 --- a/app/views/conference/_venue.html.haml +++ b/app/views/conference/_venue.html.haml @@ -11,7 +11,15 @@ .thumbnail .flexvideo{ id: "resource-content-#{@conference.venue.commercial.id}"} = render partial: 'shared/media_item', locals: { commercial: @conference.venue.commercial } - + - elsif @conference.venue.picture.present? + .col-md-5 + .thumbnail + = image_tag @conference.venue.picture.url, alt: "Venue", size: "560x315" + - else + .col-md-5 + .thumbnail.icon-container + .icon-inner + = fa_icon "university" .col-md-6 %h2.text-center = "#{@conference.venue.city} / #{@conference.venue.country_name}" From a56b992905597fb50b048cf880e0769e7e9e9bef Mon Sep 17 00:00:00 2001 From: Arun Date: Wed, 22 Jun 2016 04:36:56 +0530 Subject: [PATCH 2/3] Make thumbnails responsive --- app/assets/stylesheets/osem-splash.css.scss | 2 +- app/views/conference/_venue.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/osem-splash.css.scss b/app/assets/stylesheets/osem-splash.css.scss index 35e91722..ad7ff109 100644 --- a/app/assets/stylesheets/osem-splash.css.scss +++ b/app/assets/stylesheets/osem-splash.css.scss @@ -175,7 +175,7 @@ /* Venue icon styles */ .icon-container { position: relative; - height: 315px; + height: 60%; .icon-inner { position:absolute; top:50%; diff --git a/app/views/conference/_venue.html.haml b/app/views/conference/_venue.html.haml index 60e37fba..f457272c 100644 --- a/app/views/conference/_venue.html.haml +++ b/app/views/conference/_venue.html.haml @@ -14,7 +14,7 @@ - elsif @conference.venue.picture.present? .col-md-5 .thumbnail - = image_tag @conference.venue.picture.url, alt: "Venue", size: "560x315" + = image_tag @conference.venue.picture.url, alt: @conference.venue.name, class:"img-responsive" - else .col-md-5 .thumbnail.icon-container From ff025a48397590bf6faa01a1222c80424d58649f Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Thu, 30 Jun 2016 17:31:11 +0200 Subject: [PATCH 3/3] Fix the venue display on splash --- app/assets/stylesheets/osem-splash.css.scss | 18 +++---------- app/views/admin/venues/_form.html.haml | 3 --- app/views/conference/_venue.html.haml | 29 ++++++++------------- 3 files changed, 14 insertions(+), 36 deletions(-) diff --git a/app/assets/stylesheets/osem-splash.css.scss b/app/assets/stylesheets/osem-splash.css.scss index ad7ff109..387dfc00 100644 --- a/app/assets/stylesheets/osem-splash.css.scss +++ b/app/assets/stylesheets/osem-splash.css.scss @@ -64,6 +64,9 @@ #venue { padding-top: 0px; padding-bottom: 0px; + #venue-pic { + margin-top: 20px; + } } #lodging { @@ -171,18 +174,3 @@ } } } - -/* Venue icon styles */ -.icon-container { - position: relative; - height: 60%; - .icon-inner { - position:absolute; - top:50%; - left: 50%; - transform:translate(-50%,-50%); - .fa-university { - font-size: 10em; - } - } -} diff --git a/app/views/admin/venues/_form.html.haml b/app/views/admin/venues/_form.html.haml index 5b93cac0..7dd08a2c 100644 --- a/app/views/admin/venues/_form.html.haml +++ b/app/views/admin/venues/_form.html.haml @@ -16,9 +16,6 @@ = f.inputs :name, :website = f.input :description, input_html: { rows: 5, cols: 20, data: { provide: 'markdown-editable' } }, hint: markdown_hint = f.inputs :street, :postalcode, :city, :country, :latitude, :longitude - - if @venue.picture? - = image_tag @venue.picture.thumb.url - = f.input :picture = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' } #commercials-content.tab-pane diff --git a/app/views/conference/_venue.html.haml b/app/views/conference/_venue.html.haml index f457272c..4fd97b90 100644 --- a/app/views/conference/_venue.html.haml +++ b/app/views/conference/_venue.html.haml @@ -6,32 +6,25 @@ -else .container .row - - if @conference.venue.commercial.present? and @conference.venue.commercial.persisted? - .col-md-5 - .thumbnail + .col-md-6 + .thumbnail#venue-pic + - if @conference.venue.commercial.present? and @conference.venue.commercial.persisted? .flexvideo{ id: "resource-content-#{@conference.venue.commercial.id}"} = render partial: 'shared/media_item', locals: { commercial: @conference.venue.commercial } - - elsif @conference.venue.picture.present? - .col-md-5 - .thumbnail + - elsif @conference.venue.picture? = image_tag @conference.venue.picture.url, alt: @conference.venue.name, class:"img-responsive" - - else - .col-md-5 - .thumbnail.icon-container - .icon-inner - = fa_icon "university" - .col-md-6 - %h2.text-center - = "#{@conference.venue.city} / #{@conference.venue.country_name}" - .col-md-6 - .thumbnail + - else + %p.text-center + %span.fa.fa-university.fa-5x .caption + %h3.text-center + = @conference.venue.name - unless @conference.venue.description.blank? = markdown(@conference.venue.description) .col-md-6 + %h2 + = "#{@conference.venue.city} / #{@conference.venue.country_name}" %address - %h1 - = @conference.venue.name = @conference.venue.street %br = "#{@conference.venue.postalcode}, #{@conference.venue.city}"