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

Merge pull request #946 from Shriyanshagro/venue_commercial

Browse source 
Defined Venue has_one Commercial nice new relationship
This commit is contained in:
Henne Vogelsang 2016-04-26 14:32:54 +02:00
commit 1fdc2f8efe
7 changed files with 129 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,12 +6,17 @@
-else
.container
.row
.col-md-12
- if @conference.venue.commercial.present? and @conference.venue.commercial.persisted?
.col-md-5
.thumbnail
.flexvideo{ id: "resource-content-#{@conference.venue.commercial.id}"}
= render partial: 'shared/media_item', locals: { commercial: @conference.venue.commercial }
.col-md-6
%h2.text-center
= "#{@conference.venue.city} / #{@conference.venue.country_name}"
.col-md-6
.thumbnail
=image_tag(@conference.venue.photo, class: 'img-responsive img-rounded') unless @conference.venue.photo.blank?
.caption
- unless @conference.venue.description.blank?
= markdown(@conference.venue.description)