gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'venue-splash-page' of https://github.com/arun1595/osem into arun1595-venue-splash-page

Browse source
This commit is contained in:
Henne Vogelsang 2016-06-30 13:04:28 +02:00
commit 5a0328842e
2 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/views/conference/_venue.html.haml
View file

@ -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: @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}"